Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

app/Http/Controllers/GadaiController.php

@@ -2843,7 +2843,7 @@ class GadaiController extends Controller
             ->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
             ->where('gadai.tagpalsu','=',0)
             ->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']])
-            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
+	    ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
             ->sum('teb.pinjaman');
 
        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
@@ -3040,29 +3040,31 @@ class GadaiController extends Controller
                             ->pluck('norujukan');
 
         $transaksi_kredit_gadai =  Gadai::on($cawangan['mysql'])
-                            ->whereIn('gadai.norujukan',$transaksi_data)
-                            ->join('tebus as t','gadai.norujukan','=','t.norujukan')
+			    ->whereIn('norujukan',$transaksi_data)
+			    //->join('tebus as t','gadai.norujukan','=','t.norujukan')
                             ->where([['hargajualan','<>','null']])
-                            ->pluck('gadai.norujukan');
+			    //->orWhere([['sttebus','!=',''],['hargajualan','<>','null'],['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]])
+                            ->pluck('norujukan');
 
         $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
-        ->leftJoin('transaction as trans', function($join)
-                    {
-                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
-                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
-                    })
-        ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
-        ->where('trans.trans_type','=','A')
-        ->whereDate('tarikh_bayaran','<=', $request->hingga)
-        ->whereDate('tarikh_bayaran','>=', $request->mula)
-        // ->whereBetween('tarikh_bayaran',[$from,$to])
-        ->sum('bayaran_pembiayaan');
+	      ->leftJoin('transaction as trans', function($join)
+                            {
+                                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                            })
+            ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
+            ->where('trans.trans_type','=','A')
+	    ->whereDate('tarikh_bayaran','<=', $request->hingga)
+            ->whereDate('tarikh_bayaran','>=', $request->mula)
+            // ->whereBetween('tarikh_bayaran',[$from,$to])
+            ->sum('bayaran_pembiayaan');
 
-        // $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
-        //                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-        //                     ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //                     ->sum('bayaran_pembiayaan');
 
+         //$transaksi_kredit = TransaksiKeuntungan::on('mysql7')
+         //                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+         //                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+         //                    ->sum('bayaran_pembiayaan');
+	//dd($transaksi_kredit);
 
         $tebus = Gadai::on($cawangan['mysql'])
                     ->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan')
@@ -3082,7 +3084,7 @@ class GadaiController extends Controller
             }
         }
 
-        // dd($arraytebus);
+        //dd($arraytebus);
 
         $transaksi_debit = TransaksiKeuntungan::on('mysql7')
                             ->leftJoin('transaction as trans', function($join)
@@ -3091,7 +3093,7 @@ class GadaiController extends Controller
                                 $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                             })
                             ->where('trans.trans_type','=','A')
-                            ->where('trans.norujukan',$arraytebus)
+                            ->whereIn('trans.norujukan',$arraytebus)
                             ->sum('bayaran_pembiayaan');
 
         $arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit];

app/Http/Controllers/TacExpressPaymentController.php

@@ -21,9 +21,9 @@ class TacExpressPaymentController extends Controller
             'expired_at' => $expired_at
         ]);
 
-        $mobileno = '6'.$request->mobileno;
-        // $mobileno = '60189025461';
-        $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';
+        // $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',[
             'apiusername' => 'APIUK330HDAFO',

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']);