Merge remote-tracking branch 'origin/master'

2025-01-24 21:01:27 +01:00 · 2020-11-13 18:40:16 +01:00 · 2020-11-13 18:40:16 +01:00 · 7fb85edb78
commit 7fb85edb78
parent fc4af97dab b5c784daec
3 changed files with 3 additions and 1 deletions
--- a/modules/anagrafiche/src/API/v1/Anagrafiche.php
+++ b/modules/anagrafiche/src/API/v1/Anagrafiche.php
@ -93,11 +93,13 @@ class Anagrafiche extends Resource implements RetrieveInterface, CreateInterface
            $query = $query->havingRaw($having);
        }

+        $total_count = $query->count();
+        
        return [
            'results' => $query->skip($request['page'] * $request['length'])
                ->limit($request['length'])
                ->get()->toArray(),
-            'total-count' => $query->count(),
+            'total-count' => $total_count,
        ];
    }

--- a/modules/piano_sconto/add.php
+++ b/modules/piano_sconto/add.php
--- a/modules/piano_sconto/edit.php
+++ b/modules/piano_sconto/edit.php