Xinon mobile/improve

application/WarehouseShippingNote/WarehouseShippingNoteController.php

@@ -6,7 +6,7 @@ class WarehouseShippingNoteController extends TTCrud {
 
     //@formatter:off
     protected array $columns = [
-        ['key' => 'id', 'text' => 'LS-Nr.', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-nowrap']],
+        ['key' => 'shippingNoteNumber', 'text' => 'LS-Nr.', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-nowrap', 'filter' => 'search']],
         ['key' => 'note', 'text' => 'Art der Arbeit', 'required' => true],
         ['key' => 'billingAddressId', 'text' => 'Rechnungsadresse', 'type' => 'autocomplete', 'table' => false, 'modal' => ['apiUrl' => 'Address/api?do=findAddress', 'items' => '/Address/Api?do=findAddress', 'type' => 'autocomplete']],
         ['key' => 'status', 'text' => 'Status', 'required' => true, 'table' => ['filter' => 'iconSelect'], 'modal' => ['type' => 'iconSelect', 'items' => [
@@ -56,6 +56,7 @@ class WarehouseShippingNoteController extends TTCrud {
         ]);
         $this->postData['positions'] = json_encode($this->postData['positions']);
         if (isset($this->postData['metadata'])) $this->postData['metadata'] = json_encode($this->postData['metadata']);
+        $this->postData['shippingNoteNumber'] = WarehouseShippingNoteModel::generateShippingNoteNumber();
         return true;
     }
 
@@ -486,10 +487,6 @@ class WarehouseShippingNoteController extends TTCrud {
                      "bank_bank" => TT_INVOICE_BANK_BANK,
                      "bank_owner" => TT_INVOICE_BANK_OWNER];
 
-        // Replace placeholders in header
-        // create shipping note in this format LS2024-X0001
-        // pad number on the left side with zeros
-        $shippingNoteNumber = "LS" . date("Y", $shippingNote->create) . "-" . str_pad($shippingNote->id, 4, "0", STR_PAD_LEFT);
         $headerHtml = file_get_contents(BASEDIR . "/Layout/default/WarehouseShippingNote/PDF_HEADER.html");
         $headerHtml = str_replace("{{ basedir }}", BASEDIR, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_1 }}", $shippingNote->deliveryAddressName, $headerHtml);
@@ -504,7 +501,7 @@ class WarehouseShippingNoteController extends TTCrud {
         $headerHtml = str_replace("{{ billingAddressLine_4 }}", "", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_5 }}", "", $headerHtml);
         $headerHtml = str_replace("{{ customerNumber }}", !isset($address) ? '' : $address->customer_number, $headerHtml);
-        $headerHtml = str_replace("{{ shippingNoteNumber }}", $shippingNoteNumber, $headerHtml);
+        $headerHtml = str_replace("{{ shippingNoteNumber }}", $shippingNote->shippingNoteNumber, $headerHtml);
         $headerHtml = str_replace("{{ shippingNoteDate }}", date("d.m.Y", $shippingNote->create), $headerHtml);
 
         $headerFile = BASEDIR . "/var/temp/shipping-note_header-" . date("U") . "-" . rand(1000, 9999) . ".html";