Merge branch 'improve-warehouse' into 'master'

Updated Warehouse

See merge request fronk/thetool!1017

application/WarehouseOffer/WarehouseOfferController.php

@@ -30,6 +30,10 @@ class WarehouseOfferController extends TTCrud {
         ['key' => 'sendOffer', 'title' => 'Angebot senden', 'class' => 'fas fa-paper-plane text-success']
     ];
 
+    protected array $additionalJS = ['
+    https://cdn.jsdelivr.net/npm/sortablejs@1.14.0/Sortable.min.js
+    https://cdn.jsdelivr.net/npm/vue-draggable-next@2.1.0'];
+
     protected array $infoMessages = [
         'create' => 'Angebot wurde erfolgreich erstellt.',
         'update' => 'Angebot wurde aktualisiert.',

application/WarehouseOrder/WarehouseOrderController.php

@@ -9,18 +9,18 @@ class WarehouseOrderController extends TTCrud {
     protected array $columns = [
         ['key' => 'id', 'text' => 'ID', 'modal' => false, 'table' => false],
         ['key' => 'orderNumber', 'text' => 'Bestellnummer', 'required' => true, 'modal' => false],
-        ['key' => 'distributor', 'text' => 'Lieferant', 'required' => false, 'modal' => false, 'table' => ['filter' => false]],
+        ['key' => 'distributorId', 'text' => 'Lieferant', 'required' => false, 'modal' => ['type' => 'select', 'items' => []], 'table' => ['filter' => 'select']],
         ['key' => 'delAddrCity', 'text' => 'Stadt', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrEMail', 'text' => 'E-Mail', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrLine', 'text' => 'Adresse', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrName', 'text' => 'Name', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'delAddrPLZ', 'text' => 'PLZ', 'required' => true, 'modal' => false, 'table' => false],
         ['key' => 'editor', 'text' => 'Bearbeiter', 'required' => true, 'modal' => ['type' => 'select'], 'table' => ['filter' => 'select']],
-        ['key' => 'note', 'text' => 'Notiz', 'required' => true, 'modal' => false, 'table' => false],
+        ['key' => 'note', 'text' => 'Notiz', 'required' => false, 'modal' => false, 'table' => false],
         ['key' => 'sum', 'text' => 'Summe', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-right']],
         ['key' => 'status', 'text' => 'Status', 'required' => false, 'modal' => ['type' => 'select', 'items' => []], 'table' => ['filter' => 'select']],
         ['key' => 'positions', 'text' => 'Positionen', 'required' => true, 'modal' => false, 'table' => false],
-        ['key' => 'extReference', 'text' => 'Externe Referenz', 'required' => true, 'modal' => false],
+        ['key' => 'extReference', 'text' => 'Externe Referenz', 'required' => false, 'modal' => false],
         ['key' => 'createBy', 'text' => 'Erstellt von', 'required' => true, 'modal' => ['type' => 'select'], 'table' => ['filter' => 'select']],
         ['key' => 'create', 'text' => 'Erstellt', 'required' => true, 'modal' => false],
         ['key' => 'actions', 'text' => 'Aktionen', 'required' => false, 'modal' => false, 'table' => ['filter' => false, 'sortable' => false, 'class' => 'text-center']],
@@ -32,6 +32,8 @@ class WarehouseOrderController extends TTCrud {
                                      'delete' => 'Bestellung wurde gelöscht',
                                      'noChanges' => 'Keine Änderungen',];
 
+    protected array $additionalActions = [['key' => 'openpdf', 'title' => 'PDF öffnen', 'class' => 'fas fa-file-pdf', 'color' => 'primary']];
+
     protected function prepareCrudConfig(): void {
         $editorColumnIndex = array_search('editor', array_column($this->columns, 'key'));
         $this->columns[$editorColumnIndex]['modal']['items'] = array_map(function ($user) {
@@ -48,6 +50,11 @@ class WarehouseOrderController extends TTCrud {
             ['value' => 'fullyDelivered', 'text' => 'Geliefert'],
             ['value' => 'cancelled', 'text' => 'Storniert'],
         ];
+
+        $distributorIndex = array_search('distributorId', array_column($this->columns, 'key'));
+        $this->columns[$distributorIndex]['modal']['items'] = array_map(function ($distributor) {
+            return ['value' => intval($distributor->id), 'text' => $distributor->name];
+        }, WarehouseDistributorModel::getAll());
     }
 
     protected function beforeCreate(): bool {
@@ -91,40 +98,43 @@ class WarehouseOrderController extends TTCrud {
             // we need to get the article name and distributor name for the pdf
             $position['distributorName'] = WarehouseDistributorModel::get($position['distributorId'])->name;
             $position['articleName'] = WarehouseArticleModel::get($position['article'])->title;
+            $position['articleDescription'] = WarehouseArticleModel::get($position['article'])->description;
 
             $order['positions'][$key] = $position;
         }
 
         $pdf_vars = ['order' => $order,
                      'distributor' => WarehouseDistributorModel::get($distributorId),
+                     'distributorCountryText' => (new Country(WarehouseDistributorModel::get($distributorId)->countryId))->name,
                      "bank_iban" => TT_INVOICE_BANK_IBAN,
                      "bank_bic" => TT_INVOICE_BANK_BIC,
                      "bank_bank" => TT_INVOICE_BANK_BANK,
                      "bank_owner" => TT_INVOICE_BANK_OWNER];
 
-
-        $countryText = CountryModel::search(['id' => WarehouseDistributorModel::get($distributorId)->countryId])[0]->name;
+        $countryText = (new Country(WarehouseDistributorModel::get($distributorId)->countryId))->name;
+        $shouldGenerateEnglisch = !in_array($countryText, ['Österreich', 'Deutschland', 'Schweiz']);
 
         $headerHtml = file_get_contents(BASEDIR . "/Layout/default/WarehouseOrder/PDF_HEADER.html");
         $headerHtml = str_replace("{{ basedir }}", BASEDIR, $headerHtml);
-        $headerHtml = str_replace("{{ externalReference }}","<strong>Ihre Referenz:</strong> ". $order['extReference'], $headerHtml);
+        $headerHtml = str_replace("{{ externalReference }}", count($order['extReference']) > 0 ? "<strong>Ext. Ref.:</strong> ". $order['extReference'] : "", $headerHtml);
 
+        $headerHtml = str_replace("{{ addressLine_header }}", $shouldGenerateEnglisch ? "Supplier" : "Lieferant", $headerHtml);
         $headerHtml = str_replace("{{ addressLine_1 }}", WarehouseDistributorModel::get($distributorId)->name, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_2 }}", WarehouseDistributorModel::get($distributorId)->address, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_3 }}", WarehouseDistributorModel::get($distributorId)->plz . " " . WarehouseDistributorModel::get($distributorId)->city, $headerHtml);
         $headerHtml = str_replace("{{ addressLine_4 }}", $countryText, $headerHtml);
 
+        $headerHtml = str_replace("{{ billingAddressLine_header }}", $shouldGenerateEnglisch ? "Billing Address" : "Rechnungsadresse", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_1 }}", "Xinon GmbH", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_2 }}", "Fladnitz im Raabtal 150", $headerHtml);
-        $headerHtml = str_replace("{{ billingAddressLine_3 }}", "8322 Studenzen", $headerHtml);
-        $headerHtml = str_replace("{{ billingAddressLine_4 }}", "Österreich", $headerHtml);
-        $headerHtml = str_replace("{{ billingAddressLine_5 }}", "einkauf@xinon.at", $headerHtml);
+        $headerHtml = str_replace("{{ billingAddressLine_3 }}", "A-8322 Studenzen", $headerHtml);
+        $headerHtml = str_replace("{{ billingAddressLine_4 }}", "UID: ATU68711968", $headerHtml);
+        $headerHtml = str_replace("{{ billingAddressLine_5 }}", "EORI-Nr.: ATEOS1000085074", $headerHtml);
         $headerHtml = str_replace("{{ billingAddressLine_6 }}", "<strong>Referenz: ". $order["orderNumber"] . "</strong>", $headerHtml);
 
-        // if order dellAddrLine is Fladnitz im Raabtal 150 we need to set all template strings to empty
-
         $chk = $order['delAddrLine'] == "Fladnitz im Raabtal 150";
 
+        $headerHtml = str_replace("{{ shippingAddressLine_header }}", $chk ? "" : ($shouldGenerateEnglisch ? "Shipping Address" : "Lieferadresse"), $headerHtml);
         $headerHtml = str_replace("{{ shippingAddressLine_1 }}", $chk ? "" : $order['delAddrName'], $headerHtml);
         $headerHtml = str_replace("{{ shippingAddressLine_2 }}", $chk ? "" : $order['delAddrLine'], $headerHtml);
         $headerHtml = str_replace("{{ shippingAddressLine_3 }}", $chk ? "" : $order['delAddrPLZ'] . " " . $order['delAddrCity'], $headerHtml);