fix skit2

app/Http/Controllers/LaporanController.php

@@ -440,7 +440,7 @@ class LaporanController extends Controller
         $rekodkoopquery = Gadai::on($cawangan['mysql'])
                             ->where('tagpalsu','=',0)
                             ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
-                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]);
+                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]]);
                             // ->sum('pinjaman');
 
         $rekodkoop = $rekodkoopquery->sum('pinjaman');
@@ -463,18 +463,13 @@ class LaporanController extends Controller
         $daterequest->addDays(1);
 
             $bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
-            // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-            // ->where('db2.sttebus','=','')
-            // ->where('db2.hargajualan','<>','null')
             ->where('tarikh_bayaran' ,'<=', $daterequest)
             ->where('kodcaw',$request->kodcaw)
-            // ->sum('bayaran_pembiayaan');
-            // ->get();
             ->pluck('norujukan');
         
         $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bayaranpendahuluan_data)
-            ->where('sttebus' , '')
+            ->where([['sttebus',''],['hargajualan','<>','null']])
-            ->whereNotNull('hargajualan')
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
             ->pluck('norujukan');
          
         $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')

app/Http/Controllers/TacExpressPaymentController.php

@@ -21,13 +21,13 @@ class TacExpressPaymentController extends Controller
             'expired_at' => $expired_at
         ]);
 
-        $mobileno = '6'.$request->mobileno;
+        // $mobileno = '6'.$request->mobileno;
-        // $mobileno = '60189025461';
+        $mobileno = '60139321786';
-        $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request';
+        $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.au:10001/api.aspx',[
+        $status = Http::get('http://gateway.onewaysms.com.my:10001/api.aspx',[
-            'apiusername' => 'APIQ4LP5EMKXM',
+            'apiusername' => 'APIUK330HDAFO',
-            'apipassword' => 'APIQ4LP5EMKXM7CQOX',
+            'apipassword' => 'APIUK330HDAFOUK330',
             'senderid' => 'INFO',
             'mobileno' => $mobileno,
             'message'=> $messages,

app/Http/Controllers/TebusController.php

@@ -1297,9 +1297,9 @@ class TebusController extends Controller
                 // ->get();
                 ->pluck('norujukan');
 
-            $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
+            $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
 
-            $keuntungan = TransaksiKeuntungan::on('mysql7')
+            $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
                 ->whereIn('norujukan',$gadaiData)
                 ->whereDate('tarikh_bayaran' ,'<=', $request->tarikh)
                 ->whereDate('tarikh_bayaran','>=', $dateSM)

routes/web.php

@@ -22,6 +22,14 @@ $router->group(['namespace' => '\Rap2hpoutre\LaravelLogViewer'], function() use
     $router->get('logs', 'LogViewerController@index');
 });
 
+$router->get('_/phpinfo', function () {
+        ob_start();
+        phpinfo();
+        $response = ob_get_contents();
+        ob_get_clean();
+        return $response;
+    });
+
 $router->group(['prefix'=>'api'], function () use ($router){
     //Customer API
     $router->get('customers',['uses'=>'CustomerController@showAllCustomers']);
@@ -566,6 +574,8 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
     $router->get('nilaimarhun/semasa',['uses'=>'GadaiController@nilaiMarhunSemasa']);
     $router->get('vault/semasa',['uses'=>'GadaiController@petiBesiSemasa']);
 
+    $router->get('oneweekdata',['uses'=>'GadaiController@oneWeekData']);
+
     $router->post('prestasi/cawangan',['uses'=>'GadaiController@prestasiCawangan']);
 
     $router->post('peti_besi',['uses'=>'GadaiController@petiBesiCawangan']);