Browse Source

fix: mutation-master

Muhammad Iqbal Afandi 3 years ago
parent
commit
1df9c87654

+ 10
- 14
app/Services/MutationService.php View File

9
 {
9
 {
10
     public function totalIncome(EloquentCollection $collections)
10
     public function totalIncome(EloquentCollection $collections)
11
     {
11
     {
12
-        foreach ($collections->chunk(100) as $chunk) {
13
-            return $chunk->sum(function ($collect) {
14
-                if ($collect->getRawOriginal('type') == 1) {
15
-                    return $collect->getRawOriginal('amount');
16
-                }
17
-            });
18
-        }
12
+        return $collections->sum(function ($collect) {
13
+            if ($collect->getRawOriginal('type') == 1) {
14
+                return $collect->getRawOriginal('amount');
15
+            }
16
+        });
19
     }
17
     }
20
 
18
 
21
     public function totalExpense(EloquentCollection $collections)
19
     public function totalExpense(EloquentCollection $collections)
22
     {
20
     {
23
-        foreach ($collections->chunk(100) as $chunk) {
24
-            return $chunk->sum(function ($collect) {
25
-                if ($collect->getRawOriginal('type') == 2) {
26
-                    return $collect->getRawOriginal('amount');
27
-                }
28
-            });
29
-        }
21
+        return $collections->sum(function ($collect) {
22
+            if ($collect->getRawOriginal('type') == 2) {
23
+                return $collect->getRawOriginal('amount');
24
+            }
25
+        });
30
     }
26
     }
31
 
27
 
32
     public function totalIncomeAsString(EloquentCollection $collections)
28
     public function totalIncomeAsString(EloquentCollection $collections)

+ 2
- 2
public/js/resources_js_pages_mutation_Report_vue.js View File

370
     };
370
     };
371
 
371
 
372
     var linkReference = function linkReference(data) {
372
     var linkReference = function linkReference(data) {
373
-      if (data.topupId) {
373
+      if (data.topUpId) {
374
         return route('top-ups.show', data.topUpId);
374
         return route('top-ups.show', data.topUpId);
375
       } else if (data.expenseId) {
375
       } else if (data.expenseId) {
376
         return route('expenses.show', data.expenseId);
376
         return route('expenses.show', data.expenseId);
377
       } else {
377
       } else {
378
-        alert('under construction'); //  return route('out-transactions.show', data.outTransactionId)
378
+        return route('out-transactions.show', data.outTransactionId);
379
       }
379
       }
380
     };
380
     };
381
 
381
 

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

58466
 /******/ 		// This function allow to reference async chunks
58466
 /******/ 		// This function allow to reference async chunks
58467
 /******/ 		__webpack_require__.u = (chunkId) => {
58467
 /******/ 		__webpack_require__.u = (chunkId) => {
58468
 /******/ 			// return url for filenames based on template
58468
 /******/ 			// return url for filenames based on template
58469
-/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"74f4887defbb689e","resources_js_pages_auth_Login_vue":"abf55209018d263a","resources_js_pages_auth_ResetPassword_vue":"d4572fc618f299fe","resources_js_pages_auth_VerifyEmail_vue":"65315aea571ed892","resources_js_pages_expense_Create_vue":"c82eb18dc32fdf38","resources_js_pages_expense_Index_vue":"75b9f7e6f168bfb0","resources_js_pages_expense_Show_vue":"1db667b969b71f3c","resources_js_pages_expense_tableHeader_js":"5b2c3a80fb697fff","resources_js_pages_home_Index_vue":"6b421dd0c04c75c2","resources_js_pages_member_Create_vue":"b6a07f25d8539cc8","resources_js_pages_member_Edit_vue":"5e575dd8b0864bf8","resources_js_pages_member_Index_vue":"d710f338dd56ae28","resources_js_pages_member_tableHeader_js":"04203ba8e978ad6d","resources_js_pages_member_useVehicle_js":"ac8f621505df8bfa","resources_js_pages_mutation_Report_vue":"3ea7731834065b51","resources_js_pages_mutation_tableHeader_js":"2c25ede9c3d1ff83","resources_js_pages_parkingfee_Create_vue":"c0a2b790a42d41e7","resources_js_pages_topup_Create_vue":"2310e4c8bd2fad2c","resources_js_pages_topup_Index_vue":"4d481a75cdaed121","resources_js_pages_topup_Show_vue":"9b73199120898d40","resources_js_pages_topup_tableHeader_js":"03d60ae1a3c0ef0b","resources_js_pages_typemember_Create_vue":"5f759167147879fa","resources_js_pages_typemember_Edit_vue":"d49fc9ba8eda2b51","resources_js_pages_typemember_Index_vue":"c7e58013eba73189","resources_js_pages_typemember_tableHeader_js":"02f8a6c57093a7fe","resources_js_pages_typemember_useVehicle_js":"4172632bbd2a9293","resources_js_pages_typevehicle_Create_vue":"c2f24b454bd99d88","resources_js_pages_typevehicle_Edit_vue":"8013adb9d29599a2","resources_js_pages_typevehicle_Index_vue":"71d8baba5386388f","resources_js_pages_typevehicle_tableHeader_js":"9616b18c4a750c3f","resources_js_pages_user_Create_vue":"7558ff245cf36e6b","resources_js_pages_user_Edit_vue":"e9c0253e1674ab61","resources_js_pages_user_Index_vue":"587ba6e5c9a532db","resources_js_pages_user_Show_vue":"c26cdd4b9cd18198","resources_js_pages_user_tableHeader_js":"21d48ec8ebf81ea7"}[chunkId] + "";
58469
+/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"74f4887defbb689e","resources_js_pages_auth_Login_vue":"abf55209018d263a","resources_js_pages_auth_ResetPassword_vue":"d4572fc618f299fe","resources_js_pages_auth_VerifyEmail_vue":"65315aea571ed892","resources_js_pages_expense_Create_vue":"c82eb18dc32fdf38","resources_js_pages_expense_Index_vue":"75b9f7e6f168bfb0","resources_js_pages_expense_Show_vue":"1db667b969b71f3c","resources_js_pages_expense_tableHeader_js":"5b2c3a80fb697fff","resources_js_pages_home_Index_vue":"6b421dd0c04c75c2","resources_js_pages_member_Create_vue":"b6a07f25d8539cc8","resources_js_pages_member_Edit_vue":"5e575dd8b0864bf8","resources_js_pages_member_Index_vue":"d710f338dd56ae28","resources_js_pages_member_tableHeader_js":"04203ba8e978ad6d","resources_js_pages_member_useVehicle_js":"ac8f621505df8bfa","resources_js_pages_mutation_Report_vue":"af2a4ca0e6e249ab","resources_js_pages_mutation_tableHeader_js":"2c25ede9c3d1ff83","resources_js_pages_parkingfee_Create_vue":"c0a2b790a42d41e7","resources_js_pages_topup_Create_vue":"2310e4c8bd2fad2c","resources_js_pages_topup_Index_vue":"4d481a75cdaed121","resources_js_pages_topup_Show_vue":"9b73199120898d40","resources_js_pages_topup_tableHeader_js":"03d60ae1a3c0ef0b","resources_js_pages_typemember_Create_vue":"5f759167147879fa","resources_js_pages_typemember_Edit_vue":"d49fc9ba8eda2b51","resources_js_pages_typemember_Index_vue":"c7e58013eba73189","resources_js_pages_typemember_tableHeader_js":"02f8a6c57093a7fe","resources_js_pages_typemember_useVehicle_js":"4172632bbd2a9293","resources_js_pages_typevehicle_Create_vue":"c2f24b454bd99d88","resources_js_pages_typevehicle_Edit_vue":"8013adb9d29599a2","resources_js_pages_typevehicle_Index_vue":"71d8baba5386388f","resources_js_pages_typevehicle_tableHeader_js":"9616b18c4a750c3f","resources_js_pages_user_Create_vue":"7558ff245cf36e6b","resources_js_pages_user_Edit_vue":"e9c0253e1674ab61","resources_js_pages_user_Index_vue":"587ba6e5c9a532db","resources_js_pages_user_Show_vue":"c26cdd4b9cd18198","resources_js_pages_user_tableHeader_js":"21d48ec8ebf81ea7"}[chunkId] + "";
58470
 /******/ 		};
58470
 /******/ 		};
58471
 /******/ 	})();
58471
 /******/ 	})();
58472
 /******/ 	
58472
 /******/ 	

+ 2
- 3
resources/js/pages/mutation/Report.vue View File

43
 }
43
 }
44
 
44
 
45
 const linkReference = (data) => {
45
 const linkReference = (data) => {
46
-  if (data.topupId) {
46
+  if (data.topUpId) {
47
     return route('top-ups.show', data.topUpId)
47
     return route('top-ups.show', data.topUpId)
48
   } else if (data.expenseId) {
48
   } else if (data.expenseId) {
49
     return route('expenses.show', data.expenseId)
49
     return route('expenses.show', data.expenseId)
50
   } else {
50
   } else {
51
-    alert('under construction')
52
-    //  return route('out-transactions.show', data.outTransactionId)
51
+    return route('out-transactions.show', data.outTransactionId)
53
   }
52
   }
54
 }
53
 }
55
 
54