From fc6401dc097b179140f06aca2b42d1707794f0a2 Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Wed, 1 Dec 2021 08:15:07 +0800
Subject: [PATCH] server

---
 app/Http/Controllers/GadaiController.php             |  5 +++--
 app/Http/Controllers/LelongController.php            |  2 +-
 app/Http/Controllers/TacExpressPaymentController.php |  4 ++--
 app/Http/Controllers/TebusController.php             |  2 +-
 config/database.php                                  | 12 ++++++++++++
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 307a505..734b23a 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -24,6 +24,7 @@ use App\Moratorium;
 use App\Audit;
 use App\Customer;
 use App\KomuditiPurchase;
+use App\Advansur;
 use App\KomuditiTransaksi;
 use App\Advansur;
 use App\HistoryEmasSandaran;
@@ -310,8 +311,8 @@ class GadaiController extends Controller
         $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
-        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-
+        $upah_semasa = substr($upah_semasa_round, 0, -1);
+	$upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
         return $upah_semasa;
     }
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 3d99470..93921d8 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -543,7 +543,7 @@ class LelongController extends Controller
 
         $lelong = Lelong::on($cawangan['mysql'])
         ->where('norujukan', '=', $request->norujukan)
-        ->where('t_lelong', '=', $current->toDateString())
+        ->where('t_lelong', '<=', $current->toDateString())
         ->first();
 
         if($lelong)
diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php
index d857b52..9e09311 100644
--- a/app/Http/Controllers/TacExpressPaymentController.php
+++ b/app/Http/Controllers/TacExpressPaymentController.php
@@ -21,8 +21,8 @@ class TacExpressPaymentController extends Controller
             'expired_at' => $expired_at
         ]);
 
-        // $mobileno = '6'.$request->mobileno;
-        $mobileno = '60139321786';
+        $mobileno = '6'.$request->mobileno;
+        //$mobileno = '60139321786';
         $messages = 'AR-RAHN PKB ' . $request->cawangan . ' : TAC: ' . $request->otp_token . ' ' . $currentDateTime . '. AR-RAHN CARELINE CENTRE 1300-22-4343';
 
         $status = Http::get('http://gateway.onewaysms.com.my:10001/api.aspx',[
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index aa1a00b..cc20d97 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1315,7 +1315,7 @@ class TebusController extends Controller
             //         }
             //     }
             // }
-
+	    
             $total = ($keuntungan + $keuntunganreducing);
 
 
diff --git a/config/database.php b/config/database.php
index da7a044..82bd470 100644
--- a/config/database.php
+++ b/config/database.php
@@ -413,6 +413,18 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+	'mysql34' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_34'),
+            'port'      => env('DB_PORT_34'),
+            'database'  => env('DB_DATABASE_34'),
+            'username'  => env('DB_USERNAME_34'),
+            'password'  => env('DB_PASSWORD_34'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
     ],
 ];