From 4a8d10b7a9004b3dbf625c32a64fe0ada2dd6d91 Mon Sep 17 00:00:00 2001 From: Afiq Date: Wed, 2 Mar 2022 22:57:56 +0800 Subject: [PATCH] fix tebus --- app/Cawangan.php | 5 ++-- app/Http/Controllers/TebusController.php | 33 ++++++++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/app/Cawangan.php b/app/Cawangan.php index c17b0b1..61ef694 100644 --- a/app/Cawangan.php +++ b/app/Cawangan.php @@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; class Cawangan extends Model { protected $table = 'arrahn_master_db'; + protected $connection = 'mysql7'; /** * The attributes that are mass assignable. @@ -14,7 +15,7 @@ class Cawangan extends Model * @var array */ // protected $fillable = [ - + // ]; /** @@ -23,4 +24,4 @@ class Cawangan extends Model * @var array */ // protected $hidden = []; -} \ No newline at end of file +} diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 14c45db..4571b34 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -50,6 +50,28 @@ class TebusController extends Controller return response()->json($hargatebus); } + public function hargaTebusTawarruq($kodcaw,$norujukan){ + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw','=',$kodcaw) + ->first(); + + $gadai_data = Gadai::on($cawangan['mysql']) + ->where('norujukan','=',$norujukan) + ->first(); + + $rebet = $this->rebetselepastawarruq($kodcaw,$norujukan); + + $harga_tebus = $gadai_data['bakihargajualan'] - $rebet; + + $hargatebus = bcdiv(round($harga_tebus,2),1,1); + $hargatebus = number_format($hargatebus,2); + if(strpos($hargatebus,',')){ + $hargatebus = str_replace(',','',$hargatebus); + } + + return $hargatebus; + } + public function kiraupahTawarruq($kodcaw,$norujukan){ $cawangan = Cawangan::on('mysql7') ->where('kodcaw','=',$kodcaw) @@ -388,11 +410,7 @@ class TebusController extends Controller $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); - $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( - 'sttebus' => "T", - 't_update' => $current->toDateString(), - )); - $harga_tebus = $this->tebusTawarruq($kodcaw,$norujukan); + $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan); $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan); $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan); $upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm']; @@ -472,6 +490,11 @@ class TebusController extends Controller ]); } + $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( + 'sttebus' => "T", + 't_update' => $current->toDateString(), + )); + $audit = new Audit(); $audit->users = $request->teller; if($request->jenistebus == 'P'){