diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 7848fe0..edcf021 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2118,7 +2118,7 @@ class GadaiController extends Controller if($gadaiDouble){ Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); - $this->batalKomuditi($gadaiDouble); + $this->batalKomuditi($gadai[0]['historygadaian']); } return response('Deleted Successfully', 200); @@ -2166,9 +2166,11 @@ class GadaiController extends Controller public function batalKomuditi($norujukan){ + $gadaiDouble = Gadai::on($cawangan['mysql'])->where([['historygadaian',$norujukan],['norujukan','<>',$norujukan]])->pluck('norujukan'); + $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first(); - $transaksi_asal = KomuditiTransaksi::on('mysql7')->whereIn('norujukan','=',$norujukan)->sum('unit_komuditi'); + $transaksi_asal = KomuditiTransaksi::on('mysql7')->whereIn('norujukan','=',$gadaiDouble)->sum('unit_komuditi'); $update_unit = $unit_current + $transaksi_asal['unit_komuditi']; @@ -2177,7 +2179,7 @@ class GadaiController extends Controller 'unit_komuditi' => $update_unit ]); - $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->whereIn('norujukan',$norujukan)->delete(); + $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->whereIn('norujukan',$gadaiDouble)->delete(); return 'success'; }