Merge branch 'new-pipi' of https://gitlab.com/online-sistem1/kaunter into new-pipi

app/Http/Controllers/KhazanahController.php

@@ -1268,7 +1268,6 @@ class KhazanahController extends Controller
         ]);
 
         return redirect()->route('khazanah.serahan');
-
     }
 
     public function kemaskiniPendahuluan(Request $request)       //Daftar Pendahuluan kepada Kaunter
@@ -1430,9 +1429,6 @@ class KhazanahController extends Controller
 
       $amount = $request->amt;
 
-//      if($amount>$baki_awal){
-//        return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
-//      }else{
         $tarikh=$request->tarikh;
         $kodlaluan=$request->teller;
     
@@ -1544,8 +1540,6 @@ class KhazanahController extends Controller
 
         }    
 
-  //    }
-
       $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
       $sumBaki=$GetLatestBakiTunai;
 
@@ -2316,6 +2310,7 @@ class KhazanahController extends Controller
 
     public function pendahuluanserahanHQ(Request $request)
     {
+
         $auth_user = Auth::user();
 
         $gldetail = Http::post(config('api.url').'/api/gldetailkaunter/'. $auth_user['cawangan'],[

app/Http/Controllers/PenebusanController.php

@@ -544,8 +544,12 @@ class PenebusanController extends Controller
             'marhun' => $request->marhun,
             'jenisbayarantebus' => $request->jenisbayarantebus,
             'teller' => $request->teller
-        ])->json();
+        ])->successful();
 
+        if(!$updatetebus)
+        {
+            return response('fail');
+        }
 
         //////////////////////
        /// MAKING NEW SAG////
@@ -566,7 +570,12 @@ class PenebusanController extends Controller
             'nopelanggan' => $request->nopelanggan,
             'nokp' => $request->noic,
             'sirig' => $new_sirig
-        ]);
+        ])->successful();
+
+        if(!$gadai)
+        {
+            return response('fail');
+        }
 
             
         //////////////////////
@@ -596,7 +605,7 @@ class PenebusanController extends Controller
             'upah12' => $keuntungan12bulan,
             'hargajualan' => $hargajualan,
             'kuantiti_marhun' => $request->kuantiti_marhun
-        ])->json();
+        ])->successful();
 
         $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
             'unit_komuditi' => round($request->pinjaman, 2),
@@ -611,7 +620,7 @@ class PenebusanController extends Controller
 
         $updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
             'historygadaian' => $request->norujukan
-        ])->json();
+        ])->successful();
     
         ///////////////////////////
        /// MARHUN UPDATE TABLE////
@@ -648,7 +657,7 @@ class PenebusanController extends Controller
                 'berat_emas' => $array1['berat'],
                 'harga' => $array1['harga'],
                 'nilai_marhun' => $array1['n_marhun']
-            ])->json();
+            ])->successful();
    
         }