From e1c5bff294261d390ec35189d9754ac024a6c8bc Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Tue, 18 Jan 2022 15:43:12 +0800
Subject: [PATCH] fix calculate akru

---
 app/Http/Controllers/GadaiController.php | 54 +++++++++++-------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 6ed5c06..9aeaaaa 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -3430,40 +3430,36 @@ class GadaiController extends Controller
     }
 
     public function calculateAkru(Request $request){
-        $cawangan_all = Cawangan::on('mysql7')->get();
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
         $akru_by_cawangan = [];
         $date_request = Carbon::parse($request->date. ' 00:00:00');
-        foreach($cawangan_all as $index=>$cawangan){
-            $gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus',''],['t_gadai','<=',$request->date]])->get();
-            $akru_cawangan = 0;
-            foreach($gadai_all as $index_gadai=>$gadai){
-                if($gadai['t_update'] == null){
-                    $tarikh_update = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
-                }else{
-                    $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' );
-                }
-                $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
-
-                $diff_gadai = date_diff($tarikh_gadai,$date_request);
-                $year_gadai = $diff_gadai->format("%y") * 12;
-                $month_gadai = $diff_gadai->format("%m");
-                $days_gadai = $diff_gadai->format("%d");
-                $days_gadai = $days_gadai + 1;
-
-                if($days_gadai >= 1 && $days_gadai <= 15){
-                    $extensivemonth_gadai = 0.5;
-                }
-                else if($days_gadai >= 16){
-                    $extensivemonth_gadai = 1;
-                }
-                $tempoh_gadai = $year_gadai + $month_gadai + $extensivemonth_gadai;
-
-                $akru_cawangan = $akru_cawangan + ($gadai['pinjaman'] * ($gadai['kadarupah']/100) * $tempoh_gadai);
+        $gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus',''],['t_gadai','<=',$request->date]])->get();
+        $akru_cawangan = 0;
+        foreach($gadai_all as $index_gadai=>$gadai){
+            if($gadai['t_update'] == null){
+                $tarikh_update = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
+            }else{
+                $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' );
             }
+            $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
 
-            array_push($akru_by_cawangan,[$cawangan['details_caw']=>number_format($akru_cawangan,2)]);
+            $diff_gadai = date_diff($tarikh_gadai,$date_request);
+            $year_gadai = $diff_gadai->format("%y") * 12;
+            $month_gadai = $diff_gadai->format("%m");
+            $days_gadai = $diff_gadai->format("%d");
+            $days_gadai = $days_gadai + 1;
+
+            if($days_gadai >= 1 && $days_gadai <= 15){
+                $extensivemonth_gadai = 0.5;
+            }
+            else if($days_gadai >= 16){
+                $extensivemonth_gadai = 1;
+            }
+            $tempoh_gadai = $year_gadai + $month_gadai + $extensivemonth_gadai;
+
+            $akru_cawangan = $akru_cawangan + ($gadai['pinjaman'] * ($gadai['kadarupah']/100) * $tempoh_gadai);
         }
 
-        return response()->json($akru_by_cawangan);
+        return response()->json(number_format($akru_cawangan,2));
     }
 }