fix(Invoice): search for the first execution with limit

Related: #141

ajax/invoices/search.php

@@ -22,13 +22,14 @@ function ($params, $filter) {
 
         // filter
         $filter = json_decode($filter);
+        $params = json_decode($params, true);
 
         foreach ($filter as $entry => $value) {
             $Search->setFilter($entry, $value);
         }
 
         // query params
-        $query = $Grid->parseDBParams(json_decode($params, true));
+        $query = $Grid->parseDBParams($params);
 
         if (isset($query['limit'])) {
             $limit = explode(',', $query['limit']);
@@ -44,6 +45,12 @@ function ($params, $filter) {
             $Search->order($query['sortOn'] . ' ' . $query['sortBy']);
         }
 
+        if (!empty($params['calcTotal'])) {
+            $Search->enableCalcTotal();
+        } else {
+            $Search->disableCalcTotal();
+        }
+
         try {
             return $Search->searchForGrid();
         } catch (Exception $Exception) {

bin/backend/controls/panels/Journal.js

@@ -52,6 +52,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Journal', [
             'toggleTotal',
             'showTotal',
             'closeTotal',
+            'search',
             '$onCreate',
             '$onDestroy',
             '$onShow',
@@ -141,7 +142,8 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Journal', [
                 perPage: this.$Grid.options.perPage,
                 page: this.$Grid.options.page,
                 sortBy: this.$Grid.options.sortBy,
-                sortOn: this.$Grid.options.sortOn
+                sortOn: this.$Grid.options.sortOn,
+                calcTotal: this.$totalsOpen ? 1 : 0
             }, {
                 from: from,
                 to: to,
@@ -362,7 +364,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Journal', [
                     'float': 'right'
                 },
                 events: {
-                    onClick: this.refresh
+                    onClick: this.search
                 }
             });
 
@@ -1295,6 +1297,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Journal', [
             this.getContent().setStyle('overflow', 'hidden');
 
             this.$totalsOpen = true;
+            this.refresh();
 
             return new Promise(function(resolve) {
                 this.$Total.setStyles({
@@ -1361,6 +1364,12 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Journal', [
             this.$Status.enable();
         },
 
+        search: function() {
+            this.hideTotal().then(() => {
+                this.refresh();
+            });
+        },
+
         /**
          * key up event at the search input
          *
@@ -1380,7 +1389,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Journal', [
                 (() => {
                     if (this.$currentSearch !== this.$Search.value) {
                         this.$searchDelay = (function() {
-                            this.refresh();
+                            this.search();
                         }).delay(250, this);
                     }
                 }).delay(100);
@@ -1392,7 +1401,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Journal', [
 
             if (event.key === 'enter') {
                 this.$searchDelay = (function() {
-                    this.refresh();
+                    this.search();
                 }).delay(250, this);
             }
         }

src/QUI/ERP/Accounting/Invoice/Search/InvoiceSearch.php

@@ -76,6 +76,8 @@ class InvoiceSearch extends Singleton
      */
     protected array $cache = [];
 
+    protected bool $calcTotal = true;
+
     /**
      * Set a filter
      *
@@ -173,6 +175,26 @@ public function clearFilter(): void
         $this->filter = [];
     }
 
+    /**
+     * Enables the calculation of the total value.
+     *
+     * @return void
+     */
+    public function enableCalcTotal(): void
+    {
+        $this->calcTotal = true;
+    }
+
+    /**
+     * Disables the calculation of the total value.
+     *
+     * @return void
+     */
+    public function disableCalcTotal(): void
+    {
+        $this->calcTotal = false;
+    }
+
     /**
      * Set the limit
      *
@@ -258,17 +280,7 @@ public function searchForGrid(): array
         $count = $this->executeQueryParams($countQuery);
         $count = (int)$count[0]['count'];
 
-
-        // quiqqer/invoice#38
-        // total - calculation is without limit
-        $oldLimit = $this->limit;
-
-        $this->limit = false;
-        $calc = $this->parseListForGrid($this->executeQueryParams($this->getQuery()));
-
-        //$this->filter = $oldFiler;
-        $this->limit = $oldLimit;
-
+        // currency
         $Currency = null;
 
         if (!empty($this->currency) && $this->currency !== '---') {
@@ -278,15 +290,33 @@ public function searchForGrid(): array
             }
         }
 
-        // result
-        $result = $this->parseListForGrid($invoices);
+        $result = [];
+
+        // total calculation
+        if ($this->calcTotal) {
+            // quiqqer/invoice#38
+            // total - calculation is without limit
+            $oldLimit = $this->limit;
+
+            $this->limit = false;
+            $calc = $this->parseListForGrid($this->executeQueryParams($this->getQuery()));
+
+            //$this->filter = $oldFiler;
+            $this->limit = $oldLimit;
+
+            $result['total'] = QUI\ERP\Accounting\Calc::calculateTotal($calc, $Currency);
+        } else {
+            $result['total'] = QUI\ERP\Accounting\Calc::calculateTotal([], $Currency);
+        }
+
+        // grid data
         $Grid = new QUI\Utils\Grid();
         $Grid->setAttribute('page', ($this->limit[0] / $this->limit[1]) + 1);
 
-        return [
-            'grid' => $Grid->parseResult($result, $count),
-            'total' => QUI\ERP\Accounting\Calc::calculateTotal($calc, $Currency)
-        ];
+        $parsedInvoices = $this->parseListForGrid($invoices);
+        $result['grid'] = $Grid->parseResult($parsedInvoices, $count);
+
+        return $result;
     }
 
     /**