Merge branch 'next' into 'master'

feat: search in the panel, searches everything. Same behavior as with Invoice

See merge request !16

ajax/backend/addPayment.php

@@ -18,7 +18,7 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_addPayment',
     function ($orderId, $amount, $paymentMethod, $date) {
-        $Orders  = QUI\ERP\Order\Handler::getInstance();
+        $Orders = QUI\ERP\Order\Handler::getInstance();
         $Payment = Payments::getInstance()->getPayment($paymentMethod);
 
         try {

ajax/backend/createInvoice.php

@@ -19,7 +19,7 @@ function ($orderId) {
         QUI\ERP\Order\Settings::getInstance()->forceCreateInvoiceOn();
 
         $Handler = QUI\ERP\Order\Handler::getInstance();
-        $Order   = $Handler->get($orderId);
+        $Order = $Handler->get($orderId);
         $Invoice = $Order->createInvoice();
 
         QUI\ERP\Order\Settings::getInstance()->forceCreateInvoiceOff();

ajax/backend/createSalesOrder.php

@@ -6,14 +6,15 @@
  * @param int $orderId
  * @return string
  */
+
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_createSalesOrder',
     function (int $orderId) {
         // check if invoice is installed
         QUI::getPackage('quiqqer/salesorders');
 
-        $Handler    = QUI\ERP\Order\Handler::getInstance();
-        $Order      = $Handler->get($orderId);
+        $Handler = QUI\ERP\Order\Handler::getInstance();
+        $Order = $Handler->get($orderId);
         $SalesOrder = $Order->createSalesOrder();
 
         return $SalesOrder->getHash();

ajax/backend/getArticleHtml.php

@@ -14,8 +14,8 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_getArticleHtml',
     function ($orderId) {
-        $Order    = Handler::getInstance()->get($orderId);
-        $View     = $Order->getView();
+        $Order = Handler::getInstance()->get($orderId);
+        $View = $Order->getView();
         $Articles = $View->getArticles();
 
         return $Articles->render();

ajax/backend/getHistory.php

@@ -49,8 +49,8 @@ function ($orderId) {
             /* @var $Tx \QUI\ERP\Accounting\Payments\Transactions\Transaction */
             $history[] = [
                 'message' => $Tx->parseToText(),
-                'time'    => \strtotime($Tx->getDate()),
-                'type'    => 'transaction',
+                'time' => \strtotime($Tx->getDate()),
+                'type' => 'transaction',
             ];
         }
 

ajax/backend/list.php

@@ -17,7 +17,7 @@
     'package_quiqqer_order_ajax_backend_list',
     function ($params) {
         $Search = Search::getInstance();
-        $Grid   = new QUI\Utils\Grid();
+        $Grid = new QUI\Utils\Grid();
 
         // query params
         $query = $Grid->parseDBParams(json_decode($params, true));

ajax/backend/payments/format.php

@@ -13,18 +13,18 @@
     'package_quiqqer_order_ajax_backend_payments_format',
     function ($payments) {
         $payments = \json_decode($payments, true);
-        $result   = [];
+        $result = [];
 
-        $Locale   = QUI::getLocale();
+        $Locale = QUI::getLocale();
         $Currency = QUI\ERP\Defaults::getCurrency();
         $Payments = QUI\ERP\Accounting\Payments\Payments::getInstance();
 
         foreach ($payments as $payment) {
             $paymentTitle = '';
-            $txid         = '';
+            $txid = '';
 
             try {
-                $Payment      = $Payments->getPaymentType($payment['payment']);
+                $Payment = $Payments->getPaymentType($payment['payment']);
                 $paymentTitle = $Payment->getTitle();
             } catch (QUI\Exception $Exception) {
             }
@@ -34,10 +34,10 @@ function ($payments) {
             }
 
             $result[] = [
-                'date'    => $Locale->formatDate($payment['date']),
-                'amount'  => $Currency->format($payment['amount']),
+                'date' => $Locale->formatDate($payment['date']),
+                'amount' => $Currency->format($payment['amount']),
                 'payment' => $paymentTitle,
-                'txid'    => $txid
+                'txid' => $txid
             ];
         }
 

ajax/backend/post.php

@@ -17,7 +17,7 @@
     function ($orderId) {
         QUI\ERP\Order\Settings::getInstance()->forceCreateInvoiceOn();
 
-        $Order   = QUI\ERP\Order\Handler::getInstance()->get($orderId);
+        $Order = QUI\ERP\Order\Handler::getInstance()->get($orderId);
         $Invoice = $Order->createInvoice();
 
         QUI\ERP\Order\Settings::getInstance()->forceCreateInvoiceOff();

ajax/backend/processingStatus/create.php

 <?php
 
-use QUI\ERP\Order\ProcessingStatus\Factory;
-use QUI\ERP\Order\ProcessingStatus\Handler;
-use QUI\Utils\Security\Orthos;
-
 /**
  * Create a new  processing status
  *
@@ -12,6 +8,11 @@
  * @param array $title - (multilignual) titel
  * @param bool $notification - send auto-notification on status change
  */
+
+use QUI\ERP\Order\ProcessingStatus\Factory;
+use QUI\ERP\Order\ProcessingStatus\Handler;
+use QUI\Utils\Security\Orthos;
+
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_processingStatus_create',
     function ($id, $color, $title, $notification) {

ajax/backend/processingStatus/getNotificationText.php

@@ -4,8 +4,8 @@
  * This file contains package_quiqqer_order_ajax_backend_processingStatus_get
  */
 
-use QUI\ERP\Order\ProcessingStatus\Handler;
 use QUI\ERP\Order\Handler as Orders;
+use QUI\ERP\Order\ProcessingStatus\Handler;
 
 /**
  * Get status change notification text for a specific order

ajax/backend/processingStatus/list.php

@@ -14,10 +14,10 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_processingStatus_list',
     function () {
-        $Grid    = new QUI\Utils\Grid();
+        $Grid = new QUI\Utils\Grid();
         $Handler = Handler::getInstance();
 
-        $list   = $Handler->getProcessingStatusList();
+        $list = $Handler->getProcessingStatusList();
         $result = \array_map(function ($Status) {
             /* @var $Status \QUI\ERP\Accounting\Invoice\ProcessingStatus\Status */
             return $Status->toArray(QUI::getLocale());

ajax/backend/processingStatus/update.php

 <?php
 
-use QUI\ERP\Order\ProcessingStatus\Handler;
-use QUI\Utils\Security\Orthos;
-
 /**
  * Update a processing status
  *
@@ -11,10 +8,14 @@
  * @param array $title - (multilignual) titel
  * @param bool $notification - send auto-notification on status change
  */
+
+use QUI\ERP\Order\ProcessingStatus\Handler;
+use QUI\Utils\Security\Orthos;
+
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_processingStatus_update',
     function ($id, $color, $title, $notification) {
-        $id      = (int)$id;
+        $id = (int)$id;
         $Handler = Handler::getInstance();
 
         $Handler->updateProcessingStatus(

ajax/backend/search.php

@@ -17,15 +17,15 @@
     'package_quiqqer_order_ajax_backend_search',
     function ($params, $filter) {
         $Search = Search::getInstance();
-        $Grid   = new QUI\Utils\Grid();
-        $params = \json_decode($params, true);
+        $Grid = new QUI\Utils\Grid();
+        $params = json_decode($params, true);
 
         if (isset($params['sortOn']) && $params['sortOn'] === 'prefixed-id') {
             $params['sortOn'] = 'id';
         }
 
         // filter
-        $filter = \json_decode($filter);
+        $filter = json_decode($filter);
 
         foreach ($filter as $entry => $value) {
             $Search->setFilter($entry, $value);
@@ -35,7 +35,7 @@ function ($params, $filter) {
         $query = $Grid->parseDBParams($params);
 
         if (isset($query['limit'])) {
-            $limit = \explode(',', $query['limit']);
+            $limit = explode(',', $query['limit']);
 
             $Search->limit($limit[0], $limit[1]);
         }

ajax/backend/settings/paymentChangeable/list.php

@@ -4,7 +4,6 @@
  * This file contains package_quiqqer_order_ajax_backend_settings_paymentChangeable_list
  */
 
-use QUI\ERP\Order\ProcessingStatus\Handler;
 use QUI\ERP\Accounting\Payments\Payments;
 use QUI\ERP\Accounting\Payments\Types\Payment;
 
@@ -16,9 +15,9 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_settings_paymentChangeable_list',
     function () {
-        $Config   = QUI::getPackage('quiqqer/order')->getConfig();
+        $Config = QUI::getPackage('quiqqer/order')->getConfig();
         $payments = Payments::getInstance()->getPayments();
-        $section  = $Config->getSection('paymentChangeable');
+        $section = $Config->getSection('paymentChangeable');
 
         $result = [];
 

ajax/backend/settings/paymentChangeable/save.php

@@ -4,7 +4,6 @@
  * This file contains package_quiqqer_order_ajax_backend_settings_paymentChangeable_save
  */
 
-use QUI\ERP\Order\ProcessingStatus\Handler;
 use QUI\ERP\Accounting\Payments\Payments;
 use QUI\ERP\Accounting\Payments\Types\Payment;
 
@@ -16,10 +15,10 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order_ajax_backend_settings_paymentChangeable_save',
     function ($data) {
-        $data     = \json_decode($data, true);
-        $Config   = QUI::getPackage('quiqqer/order')->getConfig();
+        $data = \json_decode($data, true);
+        $Config = QUI::getPackage('quiqqer/order')->getConfig();
         $payments = Payments::getInstance()->getPayments();
-        $section  = $Config->getSection('paymentChangeable');
+        $section = $Config->getSection('paymentChangeable');
 
         $result = [];
 

ajax/backend/update.php

@@ -21,7 +21,7 @@
     'package_quiqqer_order_ajax_backend_update',
     function ($orderId, $data) {
         $Order = QUI\ERP\Order\Handler::getInstance()->get((int)$orderId);
-        $data  = json_decode($data, true);
+        $data = json_decode($data, true);
 
         // customer
         $Customer = null;
@@ -44,15 +44,11 @@ function ($orderId, $data) {
         }
 
         if (!$Customer && isset($data['customer'])) {
-            if (isset($data['customerId'])
-                && !isset($data['customer']['id'])
-            ) {
+            if (isset($data['customerId']) && !isset($data['customer']['id'])) {
                 $data['customer']['id'] = (int)$data['customerId'];
             }
 
-            if (isset($data['addressInvoice']['country'])
-                && !isset($data['customer']['country'])
-            ) {
+            if (isset($data['addressInvoice']['country']) && !isset($data['customer']['country'])) {
                 $data['customer']['country'] = $data['addressInvoice']['country'];
             }
 
@@ -60,17 +56,13 @@ function ($orderId, $data) {
                 $data['customer']['username'] = '';
             }
 
-            if (!isset($data['customer']['firstname'])
-                && isset($data['addressInvoice']['firstname'])
-            ) {
+            if (!isset($data['customer']['firstname']) && isset($data['addressInvoice']['firstname'])) {
                 $data['customer']['firstname'] = $data['addressInvoice']['firstname'];
             } elseif (!isset($data['customer']['firstname'])) {
                 $data['customer']['firstname'] = '';
             }
 
-            if (!isset($data['customer']['lastname'])
-                && isset($data['addressInvoice']['lastname'])
-            ) {
+            if (!isset($data['customer']['lastname']) && isset($data['addressInvoice']['lastname'])) {
                 $data['customer']['lastname'] = $data['addressInvoice']['lastname'];
             } elseif (!isset($data['customer']['lastname'])) {
                 $data['customer']['lastname'] = '';
@@ -202,7 +194,7 @@ function ($orderId, $data) {
             /* @var $Articles \QUI\ERP\Accounting\ArticleList */
             /* @var $FactorList FactorList */
             $Articles = $Order->getArticles();
-            $factors  = [];
+            $factors = [];
 
             foreach ($data['priceFactors'] as $priceFactor) {
                 $factors[] = new Factor($priceFactor);

ajax/frontend/basket/addProductToBasketOrder.php

@@ -31,7 +31,7 @@ function ($orderHash, $productId, $fields, $quantity) {
 
         try {
             $Product = new QUI\ERP\Order\Basket\Product($productId, ['fields' => $fields]);
-            $Real    = QUI\ERP\Products\Handler\Products::getProduct((int)$productId); // check if active
+            $Real = QUI\ERP\Products\Handler\Products::getProduct((int)$productId); // check if active
 
             if (!$Real->isActive()) {
                 return;
@@ -44,7 +44,6 @@ function ($orderHash, $productId, $fields, $quantity) {
             $OrderBasket->addProduct($Product);
         } catch (QUI\Exception $Exception) {
             QUI\System\Log::writeDebugException($Exception);
-
             // @todo message an benutzer - Product konnte nicht aufgenommen werden
         }
     },

ajax/frontend/basket/addProductToOrderInProcess.php

@@ -15,7 +15,7 @@
     'package_quiqqer_order_ajax_frontend_basket_addProductToOrderInProcess',
     function ($productId, $fields, $quantity) {
         $fields = json_decode($fields, true);
-        $Order  = QUI\ERP\Order\Factory::getInstance()->createOrderInProcess();
+        $Order = QUI\ERP\Order\Factory::getInstance()->createOrderInProcess();
         $Order->setData('basketConditionOrder', 2);
 
         if (!is_array($fields)) {
@@ -24,7 +24,7 @@ function ($productId, $fields, $quantity) {
 
         try {
             $Product = new QUI\ERP\Order\Basket\Product($productId, ['fields' => $fields]);
-            $Real    = QUI\ERP\Products\Handler\Products::getProduct((int)$productId); // check if active
+            $Real = QUI\ERP\Products\Handler\Products::getProduct((int)$productId); // check if active
 
             if (!$Real->isActive()) {
                 return false;

ajax/frontend/basket/addProductsToBasketOrder.php

@@ -31,8 +31,8 @@ function ($orderHash, $products) {
             }
 
             $productId = $product['id'];
-            $fields    = [];
-            $quantity  = 1;
+            $fields = [];
+            $quantity = 1;
 
             if (isset($product['quantity'])) {
                 $quantity = (int)$product['quantity'];
@@ -41,7 +41,7 @@ function ($orderHash, $products) {
 
             try {
                 $Product = new QUI\ERP\Order\Basket\Product($productId, ['fields' => $fields]);
-                $Real    = QUI\ERP\Products\Handler\Products::getProduct((int)$productId); // check if active
+                $Real = QUI\ERP\Products\Handler\Products::getProduct((int)$productId); // check if active
 
                 if (!$Real->isActive()) {
                     return;

ajax/frontend/basket/controls/basketGuest.php

@@ -27,7 +27,7 @@ function ($products, $options = '', $editable = true) {
         }
 
         $products = \json_decode($products, true);
-        $Basket   = new QUI\ERP\Order\Basket\BasketGuest();
+        $Basket = new QUI\ERP\Order\Basket\BasketGuest();
         $Basket->import($products);
 
         $Control = new QUI\ERP\Order\Controls\Basket\Basket([