Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn into adminapi

app/Http/Controllers/GadaiController.php

@@ -3246,8 +3246,12 @@ class GadaiController extends Controller
         return $upah_semasa;
     }
 
-    public function updateJBGsemasa(){
+    public function updateJBGsemasa(Request $request){
-        $cawangan = Cawangan::on('mysql7')->get();
+        if($request->zone == 'all'){
+            $cawangan = Cawangan::on('mysql7')->get();
+        }else{
+            $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get();
+        }
         $current = Carbon::now();
 
         foreach($cawangan as $cawangan_mysql){
@@ -3260,33 +3264,40 @@ class GadaiController extends Controller
                 }
                 $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
 
-                $diff_gadai = date_diff($tarikh_gadai,$current);
+                $diff_carbon = $tarikh_gadai->diffInDays($current);
-                $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){
+                $year = floor($diff_carbon/356);
+                $day_year_minus = $year * 356;
+                $diff_carbon = $diff_carbon - $day_year_minus;
+
+                $month = floor($diff_carbon/30);
+                $day_month_minus = $month * 30;
+                $diff_carbon = $diff_carbon - $day_month_minus;
+
+                $extensivemonth_gadai = 0;
+                if($diff_carbon >= 1 && $diff_carbon <= 15){
                     $extensivemonth_gadai = 0.5;
                 }
-                else if($days_gadai >= 16){
+                else if($diff_carbon >= 16){
                     $extensivemonth_gadai = 1;
                 }
-                $tempoh_gadai = $year_gadai + $month_gadai + $extensivemonth_gadai;
+                $tempoh_gadai = ($year*12) + $month + $extensivemonth_gadai;
 
-                $diff = date_diff($tarikh_update,$current);
+                if($gadai['t_gadai'] == $current->toDateString()){
-                $year = $diff->format("%y") * 12;
+                    $tempoh_gadai = 0.5;
-                $month = $diff->format("%m");
-                $days = $diff->format("%d");
-                $days = $days + 1;
-                if($days >= 1 && $days <= 15){
-                    $extensivemonth = 0.5;
                 }
-                else if($days >= 16){
+                if($tempoh_gadai >= 6.0){
-                    $extensivemonth = 1;
+                    if($gadai['t_matang'] >= $current->toDateString()){
+                        $tempoh_gadai = 6.0;
+                    }
+                }else if($tempoh_gadai >= 12){
+                    if($gadai['t_matang1'] >= $current->toDateString()){
+                        $tempoh_gadai = 12.0;
+                    }
                 }
+
                 $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']);
-                $tempoh_update = $year + $month + $extensivemonth;
+
                 Gadai::on($cawangan_mysql['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(
                     'jbg' => $tempoh_gadai,
                     'tempoh' => $tempoh_gadai,

app/Http/Controllers/MarhunController.php

@@ -29,10 +29,21 @@ class MarhunController extends Controller
                 array_push($marhun_all,$marhun);
             }
         }
-        
+
         return response()->json($marhun_all);
     }
 
+    public function getMutuMarhun(Request $request){
+        $norujukan = $request->norujukan;
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
+
+        $marhun = Marhun::on($cawangan['mysql'])->where('norujukan',$request->norujukan)->distinct()->pluck('karat')->toArray();
+
+        $mutu = HargaEmas::on('mysql7')->whereIn('karat',$marhun)->pluck('keterangan')->toArray();
+
+        return response()->json($mutu);
+    }
+
     public function getMarhunName (Request $request){
         $jemas = Jemas::on('mysql7')->where('marhun','=',$request->marhun)->first();
 
@@ -144,7 +155,7 @@ class MarhunController extends Controller
             ]);
 
         $new_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
-        
+
         $audit = new Audit();
         $audit->users = $request->teller;
         $audit->actions = 'Ubah Marhun';
@@ -165,11 +176,11 @@ class MarhunController extends Controller
         $marhun = Marhun::on($cawangan['mysql'])
                 ->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai')
                 ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
-                ->rightJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') 
+                ->rightJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
                 ->where('marhun.t_gadai','=',$tarikh)
                 ->orderBy('marhun.t_gadai')
                 ->get();
-        
+
         return response()->json($marhun);
     }
 
@@ -177,19 +188,19 @@ class MarhunController extends Controller
 
         $current = Carbon::now();
         $current = new Carbon();
-        
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $marhun = Marhun::on($cawangan['mysql'])
                 ->select('marhun.norujukan','gadai.sttebus','gadai.pinjaman','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai')
                 ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
-                ->rightJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') 
+                ->rightJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
                 ->where('marhun.t_gadai','<=',$tarikh)
                 ->whereYear('marhun.t_gadai','=',$current->year)
                 ->where('gadai.sttebus','=','')
                 ->orderBy('marhun.norujukan')
                 ->get();
-        
+
         return response()->json($marhun);
     }
 }

routes/web.php

@@ -149,7 +149,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('marhun/{id}', ['uses' => 'MarhunController@update']);
     $router->get('marhun/laporan/{kodcaw}/{tarikh}',['uses'=>'MarhunController@getLaporanMarhunHarian']);
     $router->get('marhunterkumpul/laporan/{kodcaw}/{tarikh}',['uses'=>'MarhunController@getLaporanMarhunTerkumpul']);
-
+    $router->get('marhun/mutu/sag',['uses'=>'MarhunController@getMutuMarhun']);
 
 
     $router->get('jemas',['uses'=>'MarhunController@getAllJemas']);