From cfd7ae0f0ea7d43c6c93f2e4338a5005445e2e03 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Fri, 28 May 2021 18:32:40 +0800
Subject: [PATCH] fix tebus separuh dan tambah pinjaman

---
 app/Http/Controllers/TebusController.php | 18 ++++++++++++++++--
 routes/web.php                           |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 9e7a4e6..c8cc9bb 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -38,7 +38,13 @@ class TebusController extends Controller
 
         $harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
 
-        return response()->json($harga_tebus);
+        $hargatebus = bcdiv(round($harga_tebus,2),1,1);
+        $hargatebus = number_format($hargatebus,2);
+        if(strpos($hargatebus,',')){
+            $hargatebus = str_replace(',','',$hargatebus);
+        }
+
+        return response()->json($hargatebus);
     }
 
     public function kiraupahTawarruq($kodcaw,$norujukan){
@@ -86,6 +92,13 @@ class TebusController extends Controller
         return response()->json(number_format($upah_semasa,2));
     }
 
+    public function upahRebetTawarruq($kodcaw,$norujukan){
+        
+        $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
+
+        return response()->json(number_format($upah_rebet,2));
+    }
+
     public function tebusSeparuhTawarruq($kodcaw,$norujukan,Request $request){
 
         $cawangan = Cawangan::on('mysql7')
@@ -269,7 +282,8 @@ class TebusController extends Controller
 
         $rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
 
-        $rebet_round = number_format($rebet_raw,2);
+        $rebet_round = bcdiv(round($rebet_raw,2),1,1);
+        $rebet_round = number_format($rebet_round,2);
 
         if(strpos($rebet_round,',')){
             $rebet_round = str_replace(',','',$rebet_round);
diff --git a/routes/web.php b/routes/web.php
index ae52bb8..56022a4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,6 +86,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //Tebus API
     $router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);
     $router->get('upahtawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahTawarruq']);
+    $router->get('upahrebettawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahRebetTawarruq']);
     $router->get('tebusseparuhtawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusSeparuhTawarruq']);
     $router->get('tebusseparuhbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusSeparuhNotTawarruq']);
     $router->get('tebusbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusNotTawarruq']);