diff --git a/modules/receipt/src/Controller/PrintController.php b/modules/receipt/src/Controller/PrintController.php
index a774c4b..badc131 100644
--- a/modules/receipt/src/Controller/PrintController.php
+++ b/modules/receipt/src/Controller/PrintController.php
@@ -10,9 +10,7 @@ use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\HtmlCommand;
 use Drupal\Core\Ajax\SettingsCommand;
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Class PrintController.
@@ -20,32 +18,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class PrintController extends ControllerBase {
 
   /**
-   * The date formatter.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * Creates a new PrintController object.
-   *
-   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
-   *   The date formatter.
-   */
-  public function __construct(DateFormatterInterface $date_formatter) {
-    $this->dateFormatter = $date_formatter;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('date.formatter')
-    );
-  }
-
-  /**
    * A controller callback.
    */
   public function ajaxReceipt(OrderInterface $commerce_order, $print_or_email) {
@@ -147,15 +119,11 @@ class PrintController extends ControllerBase {
         'class' => ['use-ajax', 'button'],
       ],
     ]);
-    $order_date = $this->dateFormatter->format($commerce_order->getCompletedTime());
     $config = \Drupal::config('commerce_pos_receipt.settings');
-    if ($is_gift) {
-      $gift_order = '<strong>' . $this->t('GIFT ORDER') . '</strong>';
-    }
     $build = ['#theme' => 'commerce_pos_receipt'];
     $build['#receipt'] = [
       'header' => [
-        '#markup' => check_markup($config->get('header'), $config->get('header_format')) . "<br>$order_date<br><strong>Order# {$commerce_order->id()}</strong><br>$gift_order<hr>",
+        '#markup' => check_markup($config->get('header'), $config->get('header_format')),
       ],
       'body' => [
         '#type' => 'table',
diff --git a/modules/receipt/templates/commerce-pos-receipt.html.twig b/modules/receipt/templates/commerce-pos-receipt.html.twig
index eb696de..5f5a62c 100644
--- a/modules/receipt/templates/commerce-pos-receipt.html.twig
+++ b/modules/receipt/templates/commerce-pos-receipt.html.twig
@@ -17,10 +17,13 @@
     <div class="receipt-print">
         {{ receipt.print }}
         {% if receipt.is_gift == true %}
+            <br>{{ order.getCompletedTime|format_date() }}<br>
+            <strong>{% trans %}Order# {{ order.id|placeholder }}{% endtrans %}</strong>
+            <br><strong>{{ 'GIFT ORDER'|t }}</strong><br>
         {% endif %}
     </div>
     <div class="receipt-header">{{ receipt.header }}</div>
     <div class="receipt-body">{{ receipt.body }}</div>
-    <hr />
+    <hr>
     <div class="receipt-footer">{{ receipt.footer }}</div>
 </div>