Merge branch 'master' of github.com:mvannakpanha/NexoPOS

Author: mvannakpanha

app/Services/OrdersService.php

@@ -2479,7 +2479,8 @@ public function orderTemplateMapping($option, Order $order)
             'order_code' => $order->code,
             'order_type' => $this->getTypeLabel($order->type),
             'order_date' => ns()->date->getFormatted($order->created_at),
-            'customer_name' => $order->customer->name,
+            'customer_first_name' => $order->customer->first_name,
+            'customer_last_name' => $order->customer->last_name,
             'customer_email' => $order->customer->email,
             'shipping_' . 'first_name' => $order->shipping_address->first_name,
             'shipping_' . 'last_name' => $order->shipping_address->last_name,

app/Settings/invoice-settings/receipts.php

@@ -62,7 +62,8 @@
                 __('{order_code}: displays the order code.'), '<br>',
                 __('{order_date}: displays the order date.'), '<br>',
                 __('{order_type}: displays the order type.'), '<br>',
-                __('{customer_name}: displays the customer name.'), '<br>',
+                __('{customer_first_name}: displays the customer first name.'), '<br>',
+                __('{customer_last_name}: displays the customer last name.'), '<br>',
                 __('{customer_email}: displays the customer email.'), '<br>',
                 __('{shipping_first_name}: displays the shipping first name.'), '<br>',
                 __('{shipping_last_name}: displays the shipping last name.'), '<br>',
@@ -100,7 +101,8 @@
                 __('{order_code}: displays the order code.') . '<br>',
                 __('{order_date}: displays the order date.') . '<br>',
                 __('{order_type}: displays the order type.'), '<br>',
-                __('{customer_name}: displays the customer name.') . '<br>',
+                __('{customer_first_name}: displays the customer first name.') . '<br>',
+                __('{customer_last_name}: displays the customer last name.') . '<br>',
                 __('{customer_email}: displays the customer email.') . '<br>',
                 __('{shipping_first_name}: displays the shipping first name.') . '<br>',
                 __('{shipping_last_name}: displays the shipping last name.') . '<br>',