Browse Source

fix: pagination

Muhammad Iqbal Afandi 3 years ago
parent
commit
e6f922a283

+ 2
- 3
app/Http/Controllers/TransactionController.php View File

@@ -47,10 +47,9 @@ class TransactionController extends Controller
47 47
 
48 48
         return inertia('transaction/Index', [
49 49
             'filters' => request()->all('search', 'startDate', 'endDate', 'outlet'),
50
-            'transactions' => Transaction::latest()
51
-                ->filter(request()->only('search', 'startDate', 'endDate', 'outlet'))
50
+            'transactions' => fn() => Transaction::filter(request()->only('search', 'startDate', 'endDate', 'outlet'))
52 51
                 ->latest()
53
-                ->paginate(10)
52
+                ->paginate(3)
54 53
                 ->withQueryString()
55 54
                 ->through(fn($transaction) => [
56 55
                     'id' => $transaction->id,

+ 8
- 7
public/js/resources_js_pages_transaction_Index_vue.js View File

@@ -859,13 +859,14 @@ __webpack_require__.r(__webpack_exports__);
859 859
         filterForm.startDate = null;
860 860
       }
861 861
 
862
-      _inertiajs_inertia__WEBPACK_IMPORTED_MODULE_1__.Inertia.get('/transactions', lodash_pickBy__WEBPACK_IMPORTED_MODULE_4___default()({
863
-        search: filterForm.search,
864
-        startDate: filterForm.startDate,
865
-        endDate: filterForm.endDate,
866
-        outlet: filterForm.outlet
867
-      }), {
868
-        preserveState: true
862
+      _inertiajs_inertia__WEBPACK_IMPORTED_MODULE_1__.Inertia.reload({
863
+        data: lodash_pickBy__WEBPACK_IMPORTED_MODULE_4___default()({
864
+          search: filterForm.search,
865
+          startDate: filterForm.startDate,
866
+          endDate: filterForm.endDate,
867
+          outlet: filterForm.outlet
868
+        }),
869
+        only: ['transactions']
869 870
       });
870 871
     });
871 872
 

+ 1
- 1
public/js/vue.js View File

@@ -58088,7 +58088,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
58088 58088
 /******/ 		// This function allow to reference async chunks
58089 58089
 /******/ 		__webpack_require__.u = (chunkId) => {
58090 58090
 /******/ 			// return url for filenames based on template
58091
-/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"06e3fde2f6b5dfa3","resources_js_pages_auth_Login_vue":"0d70b4f828bb2ae3","resources_js_pages_auth_ResetPassword_vue":"2ba70d514b47ecff","resources_js_pages_auth_VerifyEmail_vue":"ebac28cf5fb51cfc","resources_js_pages_customer_Create_vue":"f1fab5a9dcdebf22","resources_js_pages_customer_Edit_vue":"f18af0d92b373a00","resources_js_pages_customer_Index_vue":"0c0bfc5f63564930","resources_js_pages_customer_TableHeader_js":"71be5afdca048a9c","resources_js_pages_discount_Index_vue":"109bd85e722549c2","resources_js_pages_error_Error_vue":"39121f9961877130","resources_js_pages_expense_Create_vue":"7cfe7af0a9ac8088","resources_js_pages_expense_Index_vue":"68221d61c46376d1","resources_js_pages_expense_Show_vue":"fa22dc28fe1b8a5b","resources_js_pages_expense_TableHeader_js":"72e3dee74175b1c0","resources_js_pages_home_Index_vue":"3b5befceaa4dbdd9","resources_js_pages_laundry_Create_vue":"9e4068dad9b7a5e7","resources_js_pages_laundry_Edit_vue":"5c41bf4251b52e4b","resources_js_pages_laundry_Index_vue":"d02fed56a4259328","resources_js_pages_laundry_TableHeader_js":"494e577855bbcaf6","resources_js_pages_mutation_Report_vue":"8041efab45cc901a","resources_js_pages_mutation_TableHeader_js":"82c2999bd7d098a1","resources_js_pages_outlet_Create_vue":"6237ecf36188c4f2","resources_js_pages_outlet_Edit_vue":"d5a1ee954050c0d5","resources_js_pages_outlet_Index_vue":"5e2d2eb88627333a","resources_js_pages_outlet_TableHeader_js":"498bf7e64bc0d0c4","resources_js_pages_product_Create_vue":"e9988318889ddc87","resources_js_pages_product_Edit_vue":"2df65735cf9f9634","resources_js_pages_product_Index_vue":"040dcbb6b512d86d","resources_js_pages_product_TableHeader_js":"b8eaaa9de25a2322","resources_js_pages_transaction_Create_vue":"067ea54d77baab6c","resources_js_pages_transaction_Index_vue":"8df9597099cf4721","resources_js_pages_transaction_Report_vue":"e771426ea97e423b","resources_js_pages_transaction_Show_vue":"f5c998d5c4675215","resources_js_pages_transaction_TableHeader_js":"be63e672e103818b","resources_js_pages_user_Create_vue":"c3150d6751c77f7f","resources_js_pages_user_Edit_vue":"72177085b229b041","resources_js_pages_user_Index_vue":"695bf2fe8df4df7b","resources_js_pages_user_Show_vue":"d4bcf2a420b51436","resources_js_pages_user_TableHeader_js":"5653ecbcd70fd235"}[chunkId] + "";
58091
+/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"06e3fde2f6b5dfa3","resources_js_pages_auth_Login_vue":"0d70b4f828bb2ae3","resources_js_pages_auth_ResetPassword_vue":"2ba70d514b47ecff","resources_js_pages_auth_VerifyEmail_vue":"ebac28cf5fb51cfc","resources_js_pages_customer_Create_vue":"f1fab5a9dcdebf22","resources_js_pages_customer_Edit_vue":"f18af0d92b373a00","resources_js_pages_customer_Index_vue":"0c0bfc5f63564930","resources_js_pages_customer_TableHeader_js":"71be5afdca048a9c","resources_js_pages_discount_Index_vue":"109bd85e722549c2","resources_js_pages_error_Error_vue":"39121f9961877130","resources_js_pages_expense_Create_vue":"7cfe7af0a9ac8088","resources_js_pages_expense_Index_vue":"68221d61c46376d1","resources_js_pages_expense_Show_vue":"fa22dc28fe1b8a5b","resources_js_pages_expense_TableHeader_js":"72e3dee74175b1c0","resources_js_pages_home_Index_vue":"3b5befceaa4dbdd9","resources_js_pages_laundry_Create_vue":"9e4068dad9b7a5e7","resources_js_pages_laundry_Edit_vue":"5c41bf4251b52e4b","resources_js_pages_laundry_Index_vue":"d02fed56a4259328","resources_js_pages_laundry_TableHeader_js":"494e577855bbcaf6","resources_js_pages_mutation_Report_vue":"8041efab45cc901a","resources_js_pages_mutation_TableHeader_js":"82c2999bd7d098a1","resources_js_pages_outlet_Create_vue":"6237ecf36188c4f2","resources_js_pages_outlet_Edit_vue":"d5a1ee954050c0d5","resources_js_pages_outlet_Index_vue":"5e2d2eb88627333a","resources_js_pages_outlet_TableHeader_js":"498bf7e64bc0d0c4","resources_js_pages_product_Create_vue":"e9988318889ddc87","resources_js_pages_product_Edit_vue":"2df65735cf9f9634","resources_js_pages_product_Index_vue":"040dcbb6b512d86d","resources_js_pages_product_TableHeader_js":"b8eaaa9de25a2322","resources_js_pages_transaction_Create_vue":"067ea54d77baab6c","resources_js_pages_transaction_Index_vue":"e8096ff8b715e8ae","resources_js_pages_transaction_Report_vue":"e771426ea97e423b","resources_js_pages_transaction_Show_vue":"f5c998d5c4675215","resources_js_pages_transaction_TableHeader_js":"be63e672e103818b","resources_js_pages_user_Create_vue":"c3150d6751c77f7f","resources_js_pages_user_Edit_vue":"72177085b229b041","resources_js_pages_user_Index_vue":"695bf2fe8df4df7b","resources_js_pages_user_Show_vue":"d4bcf2a420b51436","resources_js_pages_user_TableHeader_js":"5653ecbcd70fd235"}[chunkId] + "";
58092 58092
 /******/ 		};
58093 58093
 /******/ 	})();
58094 58094
 /******/ 	

+ 4
- 7
resources/js/pages/transaction/Index.vue View File

@@ -51,18 +51,15 @@ watch(filterForm, () => {
51 51
     filterForm.startDate = null
52 52
   }
53 53
 
54
-  Inertia.get(
55
-    '/transactions',
56
-    pickBy({
54
+  Inertia.reload({
55
+    data: pickBy({
57 56
       search: filterForm.search,
58 57
       startDate: filterForm.startDate,
59 58
       endDate: filterForm.endDate,
60 59
       outlet: filterForm.outlet,
61 60
     }),
62
-    {
63
-      preserveState: true,
64
-    }
65
-  )
61
+    only: ['transactions'],
62
+  })
66 63
 })
67 64
 
68 65
 const filterReset = () => {