enhance invoice display

app/Repositories/Shop/Invoices.php

@@ -62,6 +62,7 @@ class Invoices
     {
         InvoiceStats::increase($data['total_taxed']);
         $data['uuid'] = Str::uuid()->toString();
+        $data['ref'] = self::getNewRef();
 
         return Invoice::create($data);
     }
@@ -77,7 +78,7 @@ class Invoices
     public static function getNewRef()
     {
         $ref = date('ymd').'00000';
-        $lastRef = Invoice::orderBy('id', 'desc')->first();
+        $lastRef = Invoice::where($ref, '>', $ref)->orderBy('id', 'desc')->first();
 
         return $lastRef ? $lastRef->ref + 1 : $ref + 1;
     }

app/Repositories/Shop/Orders.php

@@ -34,7 +34,6 @@ class Orders
 
     public static function saveOrder($data)
     {
-        $data += $data['basket'];
         $basket = $data['basket'];
         unset($data['basket']);
         $order = self::store($data);
@@ -42,10 +41,8 @@ class Orders
         $data['ref'] = $order->ref;
         unset($data['comment']);
         unset($data['agree']);
-        unset($data['customer_id']);
-        unset($data['delivery_id']);
+        unset($data['delivery_address_id']);
         unset($data['detail']);
-        unset($data['payment_type']);
         unset($data['sale_channel_id']);
 
         return ($order && $detail) ? Invoices::saveInvoice($order->id, $data) : false;
@@ -54,7 +51,14 @@ class Orders
     public static function edit($id)
     {
         return [
-            'order' => self::get($id, ['customer', 'invoice.address', 'delivery', 'delivery_address', 'detail'])->toArray(),
+            'order' => self::get($id, [
+                'customer',
+                'invoice.address',
+                'delivery',
+                'delivery_address',
+                'detail',
+                'sale_channel',
+            ])->toArray(),
             'statuses' => self::statuses(),
             'delivery_types' => DeliveryTypes::getOptions(),
             'payment_types' => self::paymentTypes(),
@@ -107,7 +111,7 @@ class Orders
     public static function getNewRef()
     {
         $ref = date('ymd').'00000';
-        $lastRef = Order::orderBy('id', 'desc')->first();
+        $lastRef = Order::where($ref, '>', $ref)->orderBy('id', 'desc')->first();
 
         return $lastRef ? $lastRef->ref + 1 : $ref + 1;
     }