diff --git a/.github/workflows/update-pot.yml b/.github/workflows/update-pot.yml
index 5283215..752382b 100644
--- a/.github/workflows/update-pot.yml
+++ b/.github/workflows/update-pot.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
diff --git a/includes/API/Orders.php b/includes/API/Orders.php
deleted file mode 100644
index fc5945b..0000000
--- a/includes/API/Orders.php
+++ /dev/null
@@ -1,454 +0,0 @@
-<?php
-
-namespace WCPOS\WooCommercePOS\API;
-
-use Exception;
-use WC_Data_Exception;
-use WC_Order;
-use WC_Order_Item;
-use WC_Order_Query;
-use WC_Product_Variation;
-use WCPOS\WooCommercePOS\Logger;
-use const WCPOS\WooCommercePOS\PLUGIN_NAME;
-use WP_Error;
-use WP_HTTP_Response;
-use WP_Query;
-use WP_REST_Request;
-use WP_REST_Response;
-
-class Orders extends Abstracts\WC_Rest_API_Modifier {
-	use Traits\Uuid_Handler;
-
-	private $posted;
-
-	/**
-	 * Orders constructor.
-	 *
-	 * @param $request WP_REST_Request
-	 */
-	public function __construct( WP_REST_Request $request ) {
-		$this->request = $request;
-		$this->posted  = $this->request->get_json_params();
-
-		if ( 'POST' == $request->get_method() ) {
-			$this->incoming_shop_order();
-		}
-
-		add_filter( 'rest_request_before_callbacks', array( $this, 'rest_request_before_callbacks' ), 10, 3 );
-		add_filter( 'woocommerce_rest_shop_order_object_query', array( $this, 'order_query' ), 10, 2 );
-		add_filter(
-			'woocommerce_rest_pre_insert_shop_order_object',
-			array(
-				$this,
-				'pre_insert_shop_order_object',
-			),
-			10,
-			3
-		);
-		add_filter( 'woocommerce_rest_prepare_shop_order_object', array( $this, 'order_response' ), 10, 3 );
-		add_filter( 'woocommerce_order_get_items', array( $this, 'order_get_items' ), 10, 3 );
-
-		add_action( 'woocommerce_rest_set_order_item', array( $this, 'rest_set_order_item' ), 10, 2 );
-		add_filter(
-			'woocommerce_product_variation_get_attributes',
-			array(
-				$this,
-				'product_variation_get_attributes',
-			),
-			10,
-			2
-		);
-		add_action( 'woocommerce_before_order_object_save', array( $this, 'before_order_object_save' ), 10, 2 );
-		add_filter( 'posts_clauses', array( $this, 'orderby_additions' ), 10, 2 );
-		add_filter( 'option_woocommerce_tax_based_on', array( $this, 'tax_based_on' ), 10, 2 );
-	}
-
-	/**
-	 * Filters the response before executing any REST API callbacks.
-	 *
-	 * We can use this filter to bypass data validation checks
-	 *
-	 * @param mixed|WP_Error|WP_HTTP_Response|WP_REST_Response $response Result to send to the client.
-	 *                                                                   Usually a WP_REST_Response or WP_Error.
-	 * @param array                                            $handler  Route handler used for the request.
-	 * @param WP_REST_Request                                  $request  Request used to generate the response.
-	 */
-	public function rest_request_before_callbacks( $response, $handler, $request ) {
-		if ( is_wp_error( $response ) ) {
-			// Check if the error code 'rest_invalid_param' exists
-			if ( $response->get_error_message( 'rest_invalid_param' ) ) {
-				// Get the error data for 'rest_invalid_param'
-				$error_data = $response->get_error_data( 'rest_invalid_param' );
-
-				// Check if the invalid parameter was 'line_items'
-				if ( \array_key_exists( 'line_items', $error_data['params'] ) ) {
-					// Get the 'line_items' details
-					$line_items_details = $error_data['details']['line_items'];
-
-					// Check if 'line_items[X][quantity]' has 'rest_invalid_type'
-					// Use a regular expression to match 'line_items[X][quantity]', where X is a number
-					if ( 'rest_invalid_type' === $line_items_details['code'] &&
-						preg_match( '/^line_items\[\d+\]\[quantity\]$/', $line_items_details['data']['param'] ) ) {
-						if ( woocommerce_pos_get_settings( 'general', 'decimal_qty' ) ) {
-							unset( $error_data['params']['line_items'], $error_data['details']['line_items'] );
-						}
-					}
-
-					// Check if 'line_items[X][parent_name]' has 'rest_invalid_type'
-					// Use a regular expression to match 'line_items[X][parent_name]', where X is a number
-					if ( 'rest_invalid_type' === $line_items_details['code'] &&
-						preg_match( '/^line_items\[\d+\]\[parent_name\]$/', $line_items_details['data']['param'] ) ) {
-						unset( $error_data['params']['line_items'], $error_data['details']['line_items'] );
-					}
-				}
-
-				// Check if the invalid parameter was 'billing'
-				if ( \array_key_exists( 'billing', $error_data['params'] ) ) {
-					// Get the 'billing' details
-					$billing_details = $error_data['details']['billing'];
-
-					// Check if 'billing' has 'rest_invalid_email'
-					if ( 'rest_invalid_email' === $billing_details['code'] ) {
-						unset( $error_data['params']['billing'], $error_data['details']['billing'] );
-					}
-				}
-
-				// Check if the invalid parameter was 'orderby'
-				if ( \array_key_exists( 'orderby', $error_data['params'] ) ) {
-					// Get the 'orderby' details
-					$orderby_details = $error_data['details']['orderby'];
-
-					// Get the 'orderby' request
-					$orderby_request = $request->get_param( 'orderby' );
-
-					// Extended 'orderby' values
-					$orderby_extended = array(
-						'status',
-						'customer_id',
-						'payment_method',
-						'total',
-					);
-
-					// Check if 'orderby' has 'rest_not_in_enum', but is in the extended 'orderby' values
-					if ( 'rest_not_in_enum' === $orderby_details['code'] && \in_array( $orderby_request, $orderby_extended, true ) ) {
-						unset( $error_data['params']['orderby'], $error_data['details']['orderby'] );
-					}
-				}
-
-				// Check if $error_data['params'] is empty
-				if ( empty( $error_data['params'] ) ) {
-					return null;
-				}
-				// Remove old error data and add new error data
-				$error_message = 'Invalid parameter(s): ' . implode( ', ', array_keys( $error_data['params'] ) ) . '.';
-
-				$response->remove( 'rest_invalid_param' );
-				$response->add( 'rest_invalid_param', $error_message, $error_data );
-			}
-		}
-
-		return $response;
-	}
-
-
-
-	public function incoming_shop_order(): void {
-		$raw_data = $this->request->get_json_params();
-
-		/*
-		 * WC REST validation enforces email address for orders
-		 * this hack allows guest orders to bypass this validation
-		 */
-		if ( isset( $raw_data['customer_id'] ) && 0 == $raw_data['customer_id'] ) {
-			add_filter(
-				'is_email',
-				function ( $result, $email ) {
-					if ( ! $email ) {
-						return true;
-					}
-
-					return $result;
-				},
-				10,
-				2
-			);
-		}
-	}
-
-	/**
-	 * Filters the value of the woocommerce_tax_based_on option.
-	 *
-	 * @param mixed  $value  Value of the option.
-	 * @param string $option Option name.
-	 */
-	public function tax_based_on( $value, $option ) {
-		$tax_based_on = 'base'; // default value is base
-
-		// try to get POS tax settings from order meta
-		$raw_data = $this->request->get_json_params();
-		if ( isset( $raw_data['meta_data'] ) ) {
-			foreach ( $raw_data['meta_data'] as $meta ) {
-				if ( '_woocommerce_pos_tax_based_on' == $meta['key'] ) {
-					$tax_based_on = $meta['value'];
-				}
-			}
-		}
-
-		return $tax_based_on;
-	}
-
-	/**
-	 * Filter the query arguments for a request.
-	 *
-	 * @param array           $args    Key value array of query var to query value.
-	 * @param WP_REST_Request $request The request used.
-	 *
-	 * @return array $args Key value array of query var to query value.
-	 */
-	public function order_query( $args, WP_REST_Request $request ) {
-		return $args;
-	}
-
-	/**
-	 * @param $order
-	 * @param $request
-	 * @param $creating
-	 */
-	public function pre_insert_shop_order_object( $order, $request, $creating ) {
-		return $order;
-	}
-
-	/**
-	 * @param WP_REST_Response $response The response object.
-	 * @param WC_Order         $order    Object data.
-	 * @param WP_REST_Request  $request  Request object.
-	 *
-	 * @return WP_REST_Response
-	 */
-	public function order_response( WP_REST_Response $response, WC_Order $order, WP_REST_Request $request ): WP_REST_Response {
-		$data = $response->get_data();
-
-		// Add UUID to order
-		$this->maybe_add_post_uuid( $order );
-
-		// Add payment link to the order.
-		$pos_payment_url = add_query_arg(
-			array(
-				'pay_for_order' => true,
-				'key'           => $order->get_order_key(),
-			),
-			get_home_url( null, '/wcpos-checkout/order-pay/' . $order->get_id() )
-		);
-
-		$response->add_link( 'payment', $pos_payment_url, array( 'foo' => 'bar' ) );
-
-		// Add receipt link to the order.
-		$pos_receipt_url = get_home_url( null, '/wcpos-checkout/wcpos-receipt/' . $order->get_id() );
-		$response->add_link( 'receipt', $pos_receipt_url );
-
-		// Make sure we parse the meta data before returning the response
-		$order->save_meta_data(); // make sure the meta data is saved
-		$data['meta_data'] = $this->parse_meta_data( $order );
-
-		$response->set_data( $data );
-		// $this->log_large_rest_response( $response, $order->get_id() );
-
-		return $response;
-	}
-
-	/**
-	 * @param $items WC_Order_Item[]
-	 * @param $order WC_Order
-	 * @param $item_type string[] ['line_item' | 'fee' | 'shipping' | 'tax' | 'coupon']
-	 *
-	 * @return WC_Order_Item[]
-	 */
-	public function order_get_items( array $items, WC_Order $order, array $item_type ): array {
-		foreach ( $items as $item ) {
-			$this->maybe_add_order_item_uuid( $item );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * @param $item
-	 * @param $posted
-	 *
-	 * @throws Exception
-	 */
-	public function rest_set_order_item( $item, $posted ): void {
-		/*
-		 * fixes two problems wth WC REST API
-		 * - variation meta_data with 'any' are not being saved
-		 * - default variation meta_data is always added (not unique)
-		 */
-		if ( isset( $posted['variation_id'] ) && 0 !== $posted['variation_id'] ) {
-			$variation  = wc_get_product( (int) $posted['variation_id'] );
-			$valid_keys = array();
-
-			if ( \is_callable( array( $variation, 'get_variation_attributes' ) ) ) {
-				foreach ( $variation->get_variation_attributes() as $attribute_name => $attribute ) {
-					$valid_keys[] = str_replace( 'attribute_', '', $attribute_name );
-				}
-
-				if ( isset( $posted['meta_data'] ) && \is_array( $posted['meta_data'] ) ) {
-					foreach ( $posted['meta_data'] as $meta ) {
-						// fix initial item creation
-						if ( isset( $meta['attr_id'] ) ) {
-							if ( 0 == $meta['attr_id'] ) {
-								// not a taxonomy
-								if ( \in_array( strtolower( $meta['display_key'] ), $valid_keys, true ) ) {
-									$item->add_meta_data( strtolower( $meta['display_key'] ), $meta['display_value'], true );
-								}
-							} else {
-								$taxonomy = wc_attribute_taxonomy_name_by_id( $meta['attr_id'] );
-
-								$terms = get_the_terms( (int) $posted['product_id'], $taxonomy );
-								if ( ! empty( $terms ) ) {
-									foreach ( $terms as $term ) {
-										if ( $term->name === $meta['display_value'] ) {
-											$item->add_meta_data( $taxonomy, $term->slug, true );
-										}
-									}
-								}
-							}
-						}
-						// fix subsequent overwrites
-						if ( wc_attribute_taxonomy_id_by_name( $meta['key'] ) || \in_array( $meta['key'], $valid_keys, true ) ) {
-							$item->add_meta_data( $meta['key'], $meta['value'], true );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param $value
-	 * @param WC_Product_Variation $variation
-	 *
-	 * @return void
-	 */
-	public function product_variation_get_attributes( $value, WC_Product_Variation $variation ) {
-		/*
-		 * - could fix 'any' options here using raw posted data
-		 * - may be useful for product title generation
-		 */
-
-		return $value;
-	}
-
-	/**
-	 * Add custom 'created_via' prop for POS orders, used in WC Admin display.
-	 *
-	 * @param WC_Order $order The object being saved.
-	 *
-	 * @throws WC_Data_Exception
-	 */
-	public function before_order_object_save( WC_Order $order ): void {
-		if ( 0 === $order->get_id() ) {
-			$order->set_created_via( PLUGIN_NAME );
-		}
-
-		/**
-		 * Add cashier user id to order meta
-		 * Note: There should only be one cashier per order, currently this will overwrite previous cashier id.
-		 */
-		$user_id    = get_current_user_id();
-		$cashier_id = $order->get_meta( '_pos_user' );
-
-		if ( ! $cashier_id ) {
-			$order->update_meta_data( '_pos_user', $user_id );
-		}
-	}
-
-	/**
-	 * Filters all query clauses at once, for convenience.
-	 *
-	 * Covers the WHERE, GROUP BY, JOIN, ORDER BY, DISTINCT,
-	 * fields (SELECT), and LIMIT clauses.
-	 *
-	 * @param string[] $clauses {
-	 *                          Associative array of the clauses for the query.
-	 *
-	 *     @var string    The WHERE clause of the query.
-	 *     @var string  The GROUP BY clause of the query.
-	 *     @var string     The JOIN clause of the query.
-	 *     @var string  The ORDER BY clause of the query.
-	 *     @var string The DISTINCT clause of the query.
-	 *     @var string   The SELECT clause of the query.
-	 *     @var string   The LIMIT clause of the query.
-	 * }
-	 *
-	 * @param WP_Query $wp_query The WP_Query instance (passed by reference).
-	 */
-	public function orderby_additions( array $clauses, WP_Query $wp_query ): array {
-		global $wpdb;
-
-		$order = $wp_query->query_vars['order'] ?? 'DESC';
-
-		if ( isset( $wp_query->query_vars['orderby'] ) ) {
-
-			// add option to order by status
-			if ( 'status' === $wp_query->query_vars['orderby'] ) {
-				$clauses['join'] .= " LEFT JOIN {$wpdb->prefix}posts AS order_posts ON {$wpdb->prefix}posts.ID = order_posts.ID ";
-				$clauses['orderby'] = ' order_posts.post_status ' . $order;
-			}
-
-			// add option to order by customer_id
-			if ( 'customer_id' === $wp_query->query_vars['orderby'] ) {
-				$clauses['join']  .= " LEFT JOIN {$wpdb->prefix}postmeta AS customer_meta ON {$wpdb->prefix}posts.ID = customer_meta.post_id ";
-				$clauses['where'] .= " AND customer_meta.meta_key = '_customer_user' ";
-				$clauses['orderby'] = ' customer_meta.meta_value ' . $order;
-			}
-
-			// add option to order by payment_method
-			if ( 'payment_method' === $wp_query->query_vars['orderby'] ) {
-				$clauses['join']  .= " LEFT JOIN {$wpdb->prefix}postmeta AS payment_method_meta ON {$wpdb->prefix}posts.ID = payment_method_meta.post_id ";
-				$clauses['where'] .= " AND payment_method_meta.meta_key = '_payment_method' ";
-				$clauses['orderby'] = ' payment_method_meta.meta_value ' . $order;
-			}
-
-			// add option to order by total
-			if ( 'total' === $wp_query->query_vars['orderby'] ) {
-				$clauses['join']  .= " LEFT JOIN {$wpdb->prefix}postmeta AS total_meta ON {$wpdb->prefix}posts.ID = total_meta.post_id ";
-				$clauses['where'] .= " AND total_meta.meta_key = '_order_total' ";
-				$clauses['orderby'] = ' total_meta.meta_value+0 ' . $order;
-			}
-		}
-
-		return $clauses;
-	}
-
-	/**
-	 * Returns array of all order ids.
-	 *
-	 * @param array $fields
-	 *
-	 * @return array|WP_Error
-	 */
-	public function get_all_posts( array $fields = array() ): array {
-		$args = array(
-			'limit'  => -1,
-			'return' => 'ids',
-			'status' => array_keys( wc_get_order_statuses() ), // Get valid order statuses
-		);
-
-		$order_query = new WC_Order_Query( $args );
-
-		try {
-			$order_ids = $order_query->get_orders();
-
-			return array_map( array( $this, 'format_id' ), $order_ids );
-		} catch ( Exception $e ) {
-			Logger::log( 'Error fetching order IDs: ' . $e->getMessage() );
-
-			return new WP_Error(
-				'woocommerce_pos_rest_cannot_fetch',
-				'Error fetching order IDs.',
-				array( 'status' => 500 )
-			);
-		}
-	}
-}
diff --git a/includes/i18n.php b/includes/i18n.php
index 9bd837a..07d6b92 100644
--- a/includes/i18n.php
+++ b/includes/i18n.php
@@ -14,4 +14,11 @@
 namespace WCPOS\WooCommercePOS;
 
 class i18n {
+
+	/**
+	 * Load the plugin text domain for translation.
+	 */
+	public function construct() {
+		load_plugin_textdomain( 'woocommerce-pos', false, PLUGIN_PATH . '/languages/' );
+	}
 }
diff --git a/templates/legacy-receipt.php b/templates/legacy-receipt.php
deleted file mode 100644
index 3136b01..0000000
--- a/templates/legacy-receipt.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<html>
-<head>
-	<meta charset="utf-8">
-	<title><?php _e( 'Receipt', 'woocommerce-pos' ); ?></title>
-	<style>
-		/* Reset */
-		* {
-			background: transparent !important;
-			color: #000 !important;
-			box-shadow: none !important;
-			text-shadow: none !important;
-		}
-
-		body, table {
-			font-family: 'Arial', sans-serif;
-			line-height: 1.4;
-			font-size: 14px;
-		}
-
-		h1, h2, h3, h4, h5, h6 {
-			margin: 0;
-		}
-
-		table {
-			border-collapse: collapse;
-			border-spacing: 0;
-		}
-
-		/* Spacing */
-		.order-branding, .order-addresses, .order-info, .order-items, .order-notes, .order-thanks {
-			margin-bottom: 40px;
-		}
-
-		/* Branding */
-		.order-branding h1 {
-			font-size: 2em;
-			font-weight: bold;
-		}
-
-		/* Addresses */
-		.order-addresses {
-			display: table;
-			width: 100%;
-		}
-
-		.billing-address, .shipping-address {
-			display: table-cell;
-		}
-
-		/* Order */
-		table {
-			width: 100%;
-		}
-
-		table tr {
-			border-bottom: 1px solid #dddddd;
-		}
-
-		table th, table td {
-			padding: 6px 12px;
-		}
-
-		table.order-info {
-			border-top: 3px solid #000;
-		}
-
-		table.order-info th {
-			text-align: left;
-			width: 30%;
-		}
-
-		table.order-items {
-			border-bottom: 3px solid #000;
-		}
-
-		table.order-items thead tr {
-			border-bottom: 3px solid #000;
-		}
-
-		table.order-items tbody tr:last-of-type {
-			border-bottom: 1px solid #000;
-		}
-
-		.product {
-			text-align: left;
-		}
-
-		.product dl {
-			margin: 0;
-		}
-
-		.product dt {
-			font-weight: 600;
-			padding-right: 6px;
-			float: left;
-			clear: left;
-		}
-
-		.product dd {
-			float: left;
-			margin: 0;
-		}
-
-		.price {
-			text-align: right;
-		}
-
-		.qty {
-			text-align: center;
-		}
-
-		tfoot {
-			text-align: right;
-		}
-
-		tfoot th {
-			width: 70%;
-		}
-
-		tfoot tr.order-total {
-			font-weight: bold;
-		}
-
-		tfoot tr.pos_cash-tendered th, tfoot tr.pos_cash-tendered td {
-			border-top: 1px solid #000;
-		}
-	</style>
-</head>
-
-<body>
-<div class="order-branding">
-	<h1><?php bloginfo( 'name' ); ?></h1>
-</div>
-<div class="order-addresses">
-	<div class="billing-address">
-		{{#formatAddress billing_address title="<?php _e( 'Billing Address', 'woocommerce-pos' ); ?>"}}
-	</div>
-	<div class="shipping-address">
-		{{formatAddress shipping_address title="<?php _e( 'Shipping Address', 'woocommerce-pos' ); ?>"}}
-	</div>
-</div>
-<table class="order-info">
-	<tr>
-		<th><?php _e( 'Order Number', 'woocommerce-pos' ); ?></th>
-		<td>{{order_number}}</td>
-	</tr>
-	<tr>
-		<th><?php _e( 'Order Date', 'woocommerce-pos' ); ?></th>
-		<td>{{formatDate completed_at format="MMMM Do YYYY, h:mm:ss a"}}</td>
-	</tr>
-	{{#if cashier}}
-	<tr>
-		<th><?php _e( 'Cashier', 'woocommerce-pos' ); ?></th>
-		<td>{{cashier.first_name}} {{cashier.last_name}}</td>
-	</tr>
-	{{/if}}
-	<tr>
-		<th><?php _e( 'Payment Method', 'woocommerce-pos' ); ?></th>
-		<td>{{payment_details.method_title}}</td>
-	</tr>
-	{{#if billing_address.email}}
-	<tr>
-		<th>
-        <?php 
-        // translators: woocommerce
-			_e( 'Email', 'woocommerce' ); 
-		?>
-            </th>
-		<td>{{billing_address.email}}</td>
-	</tr>
-	{{/if}}
-	{{#if billing_address.phone}}
-	<tr>
-		<th>
-        <?php 
-        // translators: woocommerce
-			_e( 'Telephone', 'woocommerce' ); 
-		?>
-            </th>
-		<td>{{billing_address.phone}}</td>
-	</tr>
-	{{/if}}
-</table>
-<table class="order-items">
-	<thead>
-	<tr>
-		<th class="product">
-        <?php 
-        // translators: woocommerce
-			_e( 'Product', 'woocommerce' ); 
-		?>
-            </th>
-		<th class="qty"><?php _ex( 'Qty', 'Abbreviation of Quantity', 'woocommerce-pos' ); ?></th>
-		<th class="price">
-        <?php 
-        // translators: woocommerce
-			_e( 'Price', 'woocommerce' ); 
-		?>
-            </th>
-	</tr>
-	</thead>
-	<tbody>
-	{{#each line_items}}
-	<tr>
-		<td class="product">
-			{{name}}
-			{{#with meta}}
-			<dl class="meta">
-				{{#each meta}}
-				<dt>{{#if label}}{{label}}{{else}}{{key}}{{/if}}:</dt>
-				<dd>{{value}}</dd>
-				{{/each}}
-			</dl>
-			{{/with}}
-		</td>
-		<td class="qty">{{number quantity precision="auto"}}</td>
-		<td class="price">
-			{{#if on_sale}}
-			<del>{{{money subtotal}}}</del>
-			{{{money total}}}
-			{{else}}
-			{{{money total}}}
-			{{/if}}
-		</td>
-	</tr>
-	{{/each}}
-	</tbody>
-	<tfoot>
-	<tr class="subtotal">
-		<th colspan="2"><?php _e( 'Subtotal', 'woocommerce-pos' ); ?>:</th>
-		<td colspan="1">{{{money subtotal}}}</td>
-	</tr>
-	{{#if has_discount}}
-	<tr class="cart-discount">
-		<th colspan="2"><?php _e( 'Discount', 'woocommerce-pos' ); ?>:</th>
-		<td colspan="1">{{{money cart_discount negative=true}}}</td>
-	</tr>
-	{{/if}}
-	{{#each shipping_lines}}
-	<tr class="shipping">
-		<th colspan="2">{{method_title}}:</th>
-		<td colspan="1">{{{money total}}}</td>
-	</tr>
-	{{/each}}
-	{{#each fee_lines}}
-	<tr class="fee">
-		<th colspan="2">{{name}}:</th>
-		<td colspan="1">{{{money total}}}</td>
-	</tr>
-	{{/each}}
-	{{#if has_tax}}
-	{{#if itemized}}
-	{{#each tax_lines}}
-	{{#if has_tax}}
-	<tr class="tax">
-		<th colspan="2">
-			{{#if ../../incl_tax}}<small>(<?php _ex( 'incl.', 'abbreviation for includes (tax)', 'woocommerce-pos' ); ?>
-				)</small>{{/if}}
-			{{title}}:
-		</th>
-		<td colspan="1">{{{money total}}}</td>
-	</tr>
-	{{/if}}
-	{{/each}}
-	{{else}}
-	<tr class="tax">
-		<th colspan="2">
-			{{#if incl_tax}}<small>(<?php _ex( 'incl.', 'abbreviation for includes (tax)', 'woocommerce-pos' ); ?>
-				)</small>{{/if}}
-			<?php echo esc_html( WC()->countries->tax_or_vat() ); ?>
-		</th>
-		<td colspan="1">{{{money total_tax}}}</td>
-	</tr>
-	{{/if}}
-	{{/if}}
-	<!-- order_discount removed in WC 2.3, included for backwards compatibility -->
-	{{#if has_order_discount}}
-	<tr class="order-discount">
-		<th colspan="2"><?php _e( 'Discount', 'woocommerce-pos' ); ?>:</th>
-		<td colspan="1">{{{money order_discount negative=true}}}</td>
-	</tr>
-	{{/if}}
-	<!-- end order_discount -->
-	<tr class="order-total">
-		<th colspan="2">
-        <?php 
-        // translators: woocommerce
-			_e( 'Order total', 'woocommerce' ); 
-		?>
-            :
-		</th>
-		<td colspan="1">{{{money total}}}</td>
-	</tr>
-	{{#if payment_details.method_pos_cash}}
-	<tr class="pos_cash-tendered">
-		<th colspan="2"><?php _e( 'Amount Tendered', 'woocommerce-pos' ); ?>:</th>
-		<td colspan="1">{{{money payment_details.method_pos_cash.tendered}}}</td>
-	</tr>
-	<tr class="pos_cash-change">
-		<th colspan="2"><?php _ex( 'Change', 'Money returned from cash sale', 'woocommerce-pos' ); ?>:</th>
-		<td colspan="1">{{{money payment_details.method_pos_cash.change}}}</td>
-	</tr>
-	{{/if}}
-	</tfoot>
-</table>
-<div class="order-notes">{{note}}</div>
-</body>
-</html>
diff --git a/templates/payment.php b/templates/payment.php
index e6366c3..bb63178 100644
--- a/templates/payment.php
+++ b/templates/payment.php
@@ -59,48 +59,48 @@
 			background-color: #ffffff !important;
 		}
 
-    .woocommerce-pos-troubleshooting {
-        border-left: 4px solid #007cba; /* For the blue vertical line */
-        padding: 5px 10px; /* Padding around the text */
-        background: #fff; /* White background */
-        box-shadow: 0 1px 1px rgba(0,0,0,.04); /* Subtle shadow effect */
-    }
+	.woocommerce-pos-troubleshooting {
+		border-left: 4px solid #007cba; /* For the blue vertical line */
+		padding: 5px 10px; /* Padding around the text */
+		background: #fff; /* White background */
+		box-shadow: 0 1px 1px rgba(0,0,0,.04); /* Subtle shadow effect */
+	}
 
 		.woocommerce-pos-troubleshooting p.link {
 				margin: 0;
 		}
 
-    .woocommerce-pos-troubleshooting h3 {
-        margin: 0.5em 0;
-        padding: 0;
-        font-size: 1em;
-        font-weight: 600;
-    }
-
-    .woocommerce-pos-troubleshooting div {
-        flex: 1;
-        margin-right: 20px;
-    }
-
-    .woocommerce-pos-troubleshooting input[type="checkbox"] {
-        margin-right: 5px;
-    }
-
-    .woocommerce-pos-troubleshooting button {
-        margin-top: 20px;
-        background: #007cba;
-        border: none;
-        color: #fff;
-        padding: 10px 15px;
-        border-radius: 3px;
-        cursor: pointer;
-    }
-
-    .woocommerce-pos-troubleshooting button:hover {
-        background: #005a87;
-    }
-
-    .woocommerce-error {
+	.woocommerce-pos-troubleshooting h3 {
+		margin: 0.5em 0;
+		padding: 0;
+		font-size: 1em;
+		font-weight: 600;
+	}
+
+	.woocommerce-pos-troubleshooting div {
+		flex: 1;
+		margin-right: 20px;
+	}
+
+	.woocommerce-pos-troubleshooting input[type="checkbox"] {
+		margin-right: 5px;
+	}
+
+	.woocommerce-pos-troubleshooting button {
+		margin-top: 20px;
+		background: #007cba;
+		border: none;
+		color: #fff;
+		padding: 10px 15px;
+		border-radius: 3px;
+		cursor: pointer;
+	}
+
+	.woocommerce-pos-troubleshooting button:hover {
+		background: #005a87;
+	}
+
+	.woocommerce-error {
 			background-color: #f8d7da;
 			color: #721c24;
 			border-color: #f5c6cb;
@@ -264,7 +264,8 @@
 </head>
 
 <body <?php body_class(); ?>>
-<div class="woocommerce"><?php
+<div class="woocommerce">
+<?php
 	global $wp_styles, $wp_scripts;
 $styleHandles  = $wp_styles->queue;
 $scriptHandles = $wp_scripts->queue;
@@ -279,53 +280,55 @@
 	woocommerce_pos_get_settings( 'checkout', 'dequeue_script_handles' )
 );
 
-$mergedStyleHandles  = array_unique(array_merge($styleHandles, $style_exclude_list));
-$mergedScriptHandles = array_unique(array_merge($scriptHandles, $script_exclude_list));
+$mergedStyleHandles  = array_unique( array_merge( $styleHandles, $style_exclude_list ) );
+$mergedScriptHandles = array_unique( array_merge( $scriptHandles, $script_exclude_list ) );
 ?>
 
 	<div class="woocommerce-pos-troubleshooting notice notice-warning is-dismissible">
 		<p class="link">
-			<a href="#" class="toggle-troubleshooting"><?php _e('Having problems with the checkout?', 'woocommerce-pos'); ?></a>
+			<a href="#" class="toggle-troubleshooting"><?php _e( 'Having problems with the checkout?', 'woocommerce-pos' ); ?></a>
 		</p>
 		<form id="troubleshooting-form" method="POST" style="display: none;">
-			<p><?php _e('Scripts and styles may interfere with the custom payment template, use this form to dequeue any problematic scripts.', 'woocommerce-pos'); ?></p>
+			<p><?php _e( 'Scripts and styles may interfere with the custom payment template, use this form to dequeue any problematic scripts.', 'woocommerce-pos' ); ?></p>
 			<div style="display: flex; justify-content: space-between;">
 				<div>
-					<h3><?php _e('Styles', 'woocommerce-pos'); ?></h3>
-            <?php foreach ($mergedStyleHandles as $handle) {
-            	$checked = ! \in_array($handle, $style_exclude_list, true) ? 'checked' : '';
-            	?>
+					<h3><?php _e( 'Styles', 'woocommerce-pos' ); ?></h3>
+			<?php
+			foreach ( $mergedStyleHandles as $handle ) {
+				$checked = ! \in_array( $handle, $style_exclude_list, true ) ? 'checked' : '';
+				?>
 							<input type="checkbox" id="<?php echo $handle; ?>" name="styles[]" value="<?php echo $handle; ?>" <?php echo $checked; ?>>
 							<label for="<?php echo $handle; ?>"><?php echo $handle; ?></label>
 							<input type="hidden" name="all_styles[]" value="<?php echo $handle; ?>"><br>
-            <?php } ?>
+			<?php } ?>
 				</div>
 				<div>
-					<h3><?php _e('Scripts', 'woocommerce-pos'); ?></h3>
-            <?php foreach ($mergedScriptHandles as $handle) {
-            	$checked = ! \in_array($handle, $script_exclude_list, true) ? 'checked' : '';
-            	?>
+					<h3><?php _e( 'Scripts', 'woocommerce-pos' ); ?></h3>
+			<?php
+			foreach ( $mergedScriptHandles as $handle ) {
+				$checked = ! \in_array( $handle, $script_exclude_list, true ) ? 'checked' : '';
+				?>
 							<input type="checkbox" id="<?php echo $handle; ?>" name="scripts[]" value="<?php echo $handle; ?>" <?php echo $checked; ?>>
 							<label for="<?php echo $handle; ?>"><?php echo $handle; ?></label>
 							<input type="hidden" name="all_scripts[]" value="<?php echo $handle; ?>"><br>
-            <?php } ?>
+			<?php } ?>
 				</div>
 			</div>
 			<input type="hidden" name="troubleshooting_form_nonce" value="<?php echo $troubleshooting_form_nonce; ?>" />
-			<button type="submit"><?php _e('Submit', 'woocommerce-pos'); ?></button>
-			<a href="#" class="toggle-troubleshooting"><?php _e('Close', 'woocommerce-pos'); ?></a>
+			<button type="submit"><?php _e( 'Submit', 'woocommerce-pos' ); ?></button>
+			<a href="#" class="toggle-troubleshooting"><?php _e( 'Close', 'woocommerce-pos' ); ?></a>
 		</form>
 	</div>
 
 	<?php woocommerce_output_all_notices(); ?>
 
 	<div class="cashier">
-		<span><?php esc_html_e( 'Cashier: ', 'woocommerce-pos' ); ?></span>
+		<span><?php esc_html_e( 'Cashier', 'woocommerce-pos' ); ?>: </span>
 		<span class="cashier-name"><?php echo esc_html( $cashier->display_name ); ?></span>
 	</div>
 
 	<div class="current-user">
-		<span><?php esc_html_e( 'Paying as customer: ', 'woocommerce-pos' ); ?></span>
+		<span><?php esc_html_e( 'Paying as customer', 'woocommerce-pos' ); ?>: </span>
 		<?php $woocommerce_pos_customer = wp_get_current_user(); ?>
 		<span class="user-name"><?php echo 0 === $woocommerce_pos_customer->ID ? esc_html__( 'Guest', 'woocommerce-pos' ) : esc_html( $woocommerce_pos_customer->display_name ); ?></span>
 	</div>
@@ -383,19 +386,28 @@
 
 			<?php
 			$coupons = $order->get_items( 'coupon' );
-if ( $coupons ) {
-	echo '<h3>' . __('Applied coupons', 'woocommerce') . '</h3>';
-	echo '<ul>';
-	foreach ( $coupons as $coupon ) {
-		echo '<li>' . esc_html( $coupon->get_code() ) . ' <button type="submit" class="button" name="pos_remove_coupon" value="' . esc_attr( $coupon->get_code() ) . '">' . esc_html__( 'Remove', 'woocommerce' ) . '</button></li>';
-	}
-	echo '</ul>';
-}
-?>
+			if ( $coupons ) {
+				echo '<h3>' . __( 'Applied coupons', 'woocommerce' ) . '</h3>';
+				echo '<ul>';
+				foreach ( $coupons as $coupon ) {
+					echo '<li>' . esc_html( $coupon->get_code() ) . ' <button type="submit" class="button" name="pos_remove_coupon" value="' . esc_attr( $coupon->get_code() ) . '">' . esc_html__( 'Remove', 'woocommerce' ) . '</button></li>';
+				}
+				echo '</ul>';
+			}
+			?>
 		</form>
 	</div>
 
-	<?php wc_get_template( 'checkout/form-pay.php', array( 'order' => $order, 'available_gateways' => $available_gateways, 'order_button_text' => $order_button_text ) ); ?>
+	<?php
+	wc_get_template(
+		'checkout/form-pay.php',
+		array(
+			'order' => $order,
+			'available_gateways' => $available_gateways,
+			'order_button_text' => $order_button_text,
+		)
+	);
+	?>
 
 </div>
 
diff --git a/templates/receipt.php b/templates/receipt.php
index 874b889..881041d 100644
--- a/templates/receipt.php
+++ b/templates/receipt.php
@@ -178,7 +178,7 @@
 		if ( $pos_user ) {
 			$user      = get_user_by( 'id', $pos_user );
 			$user_name = $user->display_name;
-			echo '<li class="cashier">' . esc_html__( 'Cashier:', 'woocommerce-pos' ) . ' <strong>' . esc_html( $user_name ) . '</strong></li>';
+			echo '<li class="cashier">' . esc_html__( 'Cashier', 'woocommerce-pos' ) . ':<strong> ' . esc_html( $user_name ) . '</strong></li>';
 		}
 		?>
 		<?php if ( $order->get_payment_method_title() ) { ?>