diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 3a698c6..ee16a7f 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -49,24 +49,22 @@ class KomuditiController extends Controller $current = Carbon::now(); $current = new Carbon(); - $komuditi_current = Komuditi::on('mysql7')->where('date_purchase','=',$current->toDateString())->first(); - - $unit_current = $komuditi_current['unit_komuditi']; + $komuditi = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first(); - $update_unit = $unit_current + $request->unit_komuditi; + $transaksi_asal = KomuditiTransaksi::on('mysql7')->where('norujukan','=',$request->norujukan)->first(); + $unit_baru = $transaksi_asal['unit_komuditi'] - $request->unit_komuditi; + $unit_current = $komuditi['unit_komuditi']; + $update_unit = $unit_current + $unit_baru; - $update_komuditi = Komuditi::on('mysql7')->where('date_purchase','=',$current->toDateString())->update([ - 'unit_komuditi' => $update_unit, - 'purchased_by' => $request->purchased_by + $komuditi_purchase = KomuditiPurchase::on('mysql7')->where('id','=',$komuditi['id'])->update([ + 'unit_komuditi' => $update_unit ]); - $komuditi_purchase = KomuditiPurchase::on('mysql7')->create([ - 'unit_komuditi' => $request->unit_komuditi, - 'date_purchase' => $current->toDateString(), - 'purchased_by' => $request->purchased_by + $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->where('norujukan','=',$request->norujukan)->update([ + 'unit_komuditi' => $request->unit_komuditi ]); - return response()->json($update_komuditi); + return response()->json($komuditi_transaksi); } public function transaksiKomuditi(Request $request){ @@ -74,7 +72,7 @@ class KomuditiController extends Controller $current = new Carbon(); $komuditi_current = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first(); - // dd($komuditi_current); + $unit_current = $komuditi_current['unit_komuditi']; $update_unit = $unit_current - $request->unit_komuditi; @@ -95,21 +93,15 @@ class KomuditiController extends Controller return response()->json($komuditi_transaksi); } - public function ubahKomuditi(Request $request){ - $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first(); - // dd($komuditi_current); - $unit_current = $komuditi_current['unit_komuditi']; - - $update_unit = $unit_current + $request->unit_komuditi; - } - public function batalKomuditi(Request $request){ $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first(); - // dd($komuditi_current); + + $transaksi_asal = KomuditiTransaksi::on('mysql7')->where('norujukan','=',$request->norujukan)->first(); + $unit_current = $komuditi_current['unit_komuditi']; - $update_unit = $unit_current + $request->unit_komuditi; + $update_unit = $unit_current + $transaksi_asal['unit_komuditi']; $update_komuditi = KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([ 'unit_komuditi' => $update_unit @@ -128,7 +120,7 @@ class KomuditiController extends Controller public function getKomuditiProductUnit(Request $request){ $produk = KomuditiProduk::on('mysql7')->where('kodproduk','=',$request->kodproduk)->first(); - // dd($produk['unit']); + return response()->json($produk['unit']); } diff --git a/routes/web.php b/routes/web.php index cb52cb2..3aa9278 100644 --- a/routes/web.php +++ b/routes/web.php @@ -254,6 +254,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']); $router->put('komuditi/update',['uses'=>'KomuditiController@updateKomuditi']); $router->put('komuditi/transaksi',['uses'=>'KomuditiController@transaksiKomuditi']); + $router->put('komuditi/batal',['uses'=>'KomuditiController@batalKomuditi']); $router->get('komuditi/produk',['uses'=>'KomuditiController@getKomuditiProduct']); $router->get('komuditi/unit',['uses'=>'KomuditiController@getKomuditiProductUnit']);