From d77043b134495a183b70e2a918509b3d5c8c1d3c Mon Sep 17 00:00:00 2001 From: "LAPTOP-DGCU80CH\\user1" Date: Sun, 29 Nov 2020 08:46:35 +0800 Subject: [PATCH] add baki harga jualan in transaction --- app/Http/Controllers/GadaiController.php | 22 ++++++++++++++++++++++ app/Transaction.php | 2 +- routes/web.php | 3 +++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index cef4ef8..77179d4 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -151,6 +151,7 @@ class GadaiController extends Controller 'kodcaw' => 'online', 'duit_masuk' => $request->bayaran, 'created_at' => $current, + 'bakiharga' => $baki_hargajualan, ]); $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ @@ -199,6 +200,27 @@ class GadaiController extends Controller return response()->json($harga_tebus); } + public function getGadaianSemasa($kodcaw){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon(); + $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$current->toDateString()],['cetak','=',0]])->get(); + + return response()->json($gadai); + } + + public function getGadaianBelumSerah($kodcaw){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon(); + + $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$current->toDateString()],['cetak','=',1]])->get(); + + return response()->json($gadai); + } + public function delete($id) { Gadai::findOrFail($id)->delete(); diff --git a/app/Transaction.php b/app/Transaction.php index e675515..cbb58a8 100644 --- a/app/Transaction.php +++ b/app/Transaction.php @@ -14,7 +14,7 @@ class Transaction extends Model * @var array */ protected $fillable = [ - 'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at' + 'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at','bakiharga' ]; /** diff --git a/routes/web.php b/routes/web.php index c7e5b77..230dda9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -43,6 +43,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']); $router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']); + $router->get('gadaiansemasa/{kodcaw}',['uses'=>'GadaiController@getGadaianSemasa']); + $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']); + //Tebus API $router->get('tebusonline/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showTebusToday']);