diff --git a/modules/receipt/commerce_pos_receipt.module b/modules/receipt/commerce_pos_receipt.module
index 4943b32..1e8246a 100644
--- a/modules/receipt/commerce_pos_receipt.module
+++ b/modules/receipt/commerce_pos_receipt.module
@@ -92,7 +92,7 @@ function commerce_pos_receipt_form_commerce_pos_alter(&$form, FormStateInterface
     $form['#attached']['library'][] = 'commerce_pos_receipt/jQuery.print';
 
     $form['#attached']['drupalSettings']['commercePosReceipt'] = [
-      'orderId' => $form_state->getValue('order_id'),
+      'orderId' => $form['order_id']['#value'],
     ];
 
     $form['receipt']['contents'] = [
diff --git a/modules/receipt/src/Controller/PrintController.php b/modules/receipt/src/Controller/PrintController.php
index badc131..e41cca9 100644
--- a/modules/receipt/src/Controller/PrintController.php
+++ b/modules/receipt/src/Controller/PrintController.php
@@ -66,7 +66,6 @@ class PrintController extends ControllerBase {
     $number_formatter = $number_formatter_factory->createInstance();
     $is_gift = $commerce_order->getData('gift_order');
     $totals = [];
-    $gift_order = '';
 
     $sub_total_price = $commerce_order->getSubtotalPrice();
     $currency = Currency::load($sub_total_price->getCurrencyCode());
diff --git a/modules/receipt/templates/commerce-pos-receipt.html.twig b/modules/receipt/templates/commerce-pos-receipt.html.twig
index 5f5a62c..3c1fa2a 100644
--- a/modules/receipt/templates/commerce-pos-receipt.html.twig
+++ b/modules/receipt/templates/commerce-pos-receipt.html.twig
@@ -17,7 +17,7 @@
     <div class="receipt-print">
         {{ receipt.print }}
         {% if receipt.is_gift == true %}
-            <br>{{ order.getCompletedTime|format_date() }}<br>
+            <br>{{ order.getChangedTime|format_date('medium') }}<br>
             <strong>{% trans %}Order# {{ order.id|placeholder }}{% endtrans %}</strong>
             <br><strong>{{ 'GIFT ORDER'|t }}</strong><br>
         {% endif %}