From 7c266a5f616bcf2c8888c94c41898d8d650fff2d Mon Sep 17 00:00:00 2001
From: izzatizulkifli <izzatizulkifli@users.noreply.github.com>
Date: Thu, 28 Jan 2021 14:34:11 +0800
Subject: [PATCH 01/10] ubah totalPinjamanGadaian

---
 app/Http/Controllers/GadaiController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 6a8e6f5..61c8811 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1350,7 +1350,7 @@ class GadaiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         foreach($cawangan_all as $index=>$cawangan){
-            $gadai = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=','2020-10-05']])->sum('pinjaman');
+            $gadai = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=',$current->toDateString()]])->sum('pinjaman');
             array_push($array_cawangan,['cawangan'=>$cawangan['details_caw'],'total_gadai'=>$gadai]);
             $total_gadaian_cawangan += $gadai;
            

From e8820e6459552af7a90a1d2adcb15f1198ee62b5 Mon Sep 17 00:00:00 2001
From: Fiza Ali <norhafizaali96@outlook.com>
Date: Sat, 30 Jan 2021 14:53:05 +0800
Subject: [PATCH 02/10] New API Mobile (Gadaian)

---
 app/Http/Controllers/CustomerController.php | 77 +++++++++++++--------
 routes/web.php                              | 37 +++++-----
 2 files changed, 71 insertions(+), 43 deletions(-)

diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index edf4c2c..9a84468 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -197,39 +197,62 @@ class CustomerController extends Controller
         return response()->json($gadai_all);
     }
 
-    public function showOneCustomerGadaiByCawanganMobile($ic,$status,$kodcaw){
-        if($status == 'belum_tebus'){
-            $gadai_status = '';
-        }elseif($status == 'sudah_tebus'){
-            $gadai_status = 'T';
-        }elseif($status == 'lelong'){
-            $gadai_status = 'L';
-        }
+    public function gadaiTebusLelongByCawanganMobile($ic,$kodcaw){
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        $gadai_all = [];
-        if($status == 'belum_tebus' || $status == 'sudah_tebus'){
-            $gadai = Gadai::on($cawangan['mysql'])
-                ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
-                ->get();
-            if(sizeof($gadai) != 0){
-                foreach($gadai as $index => $gadai_detail){
-                    array_push($gadai_all,['norujukan'=>$gadai_detail['norujukan'],'hargajualan'=>$gadai_detail['hargajualan'],'bakihargajualan'=>$gadai_detail['bakihargajualan']]);
+        $sttebus_ = [];
+        $sttebus_T = [];
+        $sttebus_L = [];
+        $array_all = [];
+
+        $gadai = Gadai::on($cawangan['mysql'])->where([['nokp','=',$ic]])->get();
+        
+        //to check if gadai has data
+        if(!empty($gadai))
+        {
+            //loop each array
+            foreach($gadai as $gd){
+
+                if($gd->sttebus == '' || empty($gd->sttebus)){
+
+                    array_push($sttebus_, array(
+                        'norujukan' => $gd->norujukan,
+                        'hargajualan' => $gd->hargajualan,
+                        'bakihargajualan' => $gd->bakihargajualan,  
+                  ));
+
                 }
-            }
-        }elseif($status == 'lelong'){
-            $gadai = Gadai::on($cawangan['mysql'])
-                ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
-                ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
-                ->get();
-            if(sizeof($gadai) != 0){
-                foreach($gadai as $index => $gadai_detail){
-                    array_push($gadai_all,['norujukan'=>$gadai_detail['norujukan'],'hargajualan'=>$gadai_detail['hargajualan'],'bakihargajualan'=>$gadai_detail['bakihargajualan']]);
+                elseif($gd->sttebus == 'T')
+                {
+                    array_push($sttebus_T, array(
+                        'norujukan' => $gd->norujukan,
+                        'hargajualan' => $gd->hargajualan,
+                        'bakihargajualan' => $gd->bakihargajualan,  
+                  ));
+
                 }
+                elseif($gd->sttebus == 'L')
+                {
+                    array_push($sttebus_L, array(
+                        'norujukan' => $gd->norujukan,
+                        'hargajualan' => $gd->hargajualan,
+                        'bakihargajualan' => $gd->bakihargajualan,  
+                  ));
+
+                }  
             }
         }
-        
-        return response()->json($gadai_all);
+        else
+        {
+            return response()->json('Data Not Found');
+        }
+
+        array_push($array_all, array(
+            'gadai' => $sttebus_,
+            'tebus' => $sttebus_T,
+            'lelong' => $sttebus_L
+        ));
+        return response()->json($array_all);
     }
 
     public function getLaporanCustomers($kodcaw, $tarikh)
diff --git a/routes/web.php b/routes/web.php
index cd3f505..f84a3b1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -257,23 +257,28 @@ $router->group(['prefix'=>'e-arrahn'], function () use ($router){
 });
 
 $router->group(['prefix'=>'mobile'], function () use ($router){
+    
     $router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']);
-    $router->get('customers/{ic}/gadai/{status}/{kodcaw}',['uses'=>'CustomerController@showOneCustomerGadaiByCawanganMobile']);
-    $router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
-
-    $router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
-
-    $router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
-    $router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
-    $router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
-
-    $router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
-
-    $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
-    $router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
-    $router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
-
-    $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
+   
+       //utama
+       $router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
+       $router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
+       $router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
+       $router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
+   
+       //gadaian
+       $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
+       $router->get('customers/{ic}/gadaitebuslelong/{kodcaw}',['uses'=>'CustomerController@gadaiTebusLelongByCawanganMobile']);
+       
+       $router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
+       $router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
+   
+       //register
+       $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
+       $router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
+       $router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
+   
+   
 });
 
 $router->group(['prefix'=>'dashboard'], function () use ($router){

From 428a41dae1883ceecbf0f67c2ab291f35f6e5c62 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Sun, 31 Jan 2021 08:33:26 +0800
Subject: [PATCH 03/10] masuk aging

---
 app/Http/Controllers/GadaiController.php     | 29 ++++++++++++++++++++
 app/Http/Controllers/KelulusanController.php |  3 ++
 app/Http/Controllers/TunaiController.php     | 19 +++++++++++++
 routes/web.php                               |  8 ++++--
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 6a8e6f5..ebc338f 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1468,6 +1468,7 @@ class GadaiController extends Controller
     }
 
     public function statistikGadaian(){
+        
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -1485,4 +1486,32 @@ class GadaiController extends Controller
 
         return response()->json($array_total);
     }
+
+    public function carian_AgingBulanan($kodcaw,$tarikh,$num)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $db=$cawangan['mysql'];
+            
+        $gadai_aging=DB::connection($db)->select("SELECT count(norujukan) as a,sum(pinjaman)as b From gadai where (((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1)=".$num.") and((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."'and t_gadai<='".$tarikh."'))");
+        return response()->json($gadai_aging);
+    }
+
+    public function carian_agingLebih12_Bulan($kodcaw,$tarikh)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $db=$cawangan['mysql'];
+        $gadai_aging=DB::connection($db)->select("SELECT count(norujukan) as a,sum(pinjaman)as b From gadai where (((period_diff(DATE_FORMAT('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1)>'12') and((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."' and t_gadai<='".$tarikh."'))");
+        return response()->json($gadai_aging);
+    }
+
+    public function carian_Seluruh_AgingBulanan($kodcaw,$tarikh)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $db=$cawangan['mysql'];
+    
+        $gadai_aging=DB::connection($db)->select("SELECT kodcaw,count(norujukan) as a,sum(pinjaman)as b,((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1) AS bln From gadai where ((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."' and t_gadai<='".$tarikh."'))");
+        return response()->json($gadai_aging);
+    }
 }
diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php
index 04fd5dc..266bb45 100644
--- a/app/Http/Controllers/KelulusanController.php
+++ b/app/Http/Controllers/KelulusanController.php
@@ -57,6 +57,9 @@ class KelulusanController extends Controller
 
       $kelulusan=Mohon::on($cawangan['mysql'])
                ->where('tarikh','<',$harini->toDateString())
+               ->where('pelulus','=','khazanah')
+               ->where('peloperasi','=','')
+               ->where('masalulus','<>','')
                ->get();
 
       return response()->json($kelulusan);
diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index 9a62a2f..47bbdd2 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -81,6 +81,25 @@ class TunaiController extends Controller
 
     }
 
+    public function UpdateTunaiGadaianTebus($kodcaw, $kodlaluan, Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+       
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $kodlaluan] ])->
+        update(array(
+             'keluar'=>$request->keluar,
+              'masuk'=>$request->masuk,
+              'baki'=>$request->bakiakhir
+        ));
+           
+        return response()->json($updatetunai, 200);
+    
+
+    }
+
     
 
 
diff --git a/routes/web.php b/routes/web.php
index 3498c0f..10bec55 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -171,7 +171,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
     $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
-
+    $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']);
+    $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);
+    $router->get('gadai/JumlahagingBulanan/test/{kodcaw}/{tarikh}',['uses'=>'GadaiController@carian_Seluruh_AgingBulanan']);
 
     //API BARU
     $router->get('Dashboard_all/{kodcaw}',['uses'=>'GadaiController@dashboardall']);
@@ -182,6 +184,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
     $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
     $router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']);
+    $router->put('updateTunaiGT/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunaiGadaianTebus']);
     $router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']);
     $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
     $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
@@ -205,6 +208,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //API KELULUSAN
     $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']);
+    $router->get('RekodDahLepas/{kodcaw}',['uses'=>'KelulusanController@rekodlepas']);
     $router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']);
     $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']);
     $router->post('CreateKelulusan/{kodcaw}/{norujukan}/roles/{roles}',['uses'=>'KelulusanController@create']);
@@ -214,8 +218,6 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('GetLulusAll/{kodcaw}/',['uses'=>'KelulusanController@listkepohonan']);
     $router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']);
     
-
-
     //API REQUEST TELLER
     $router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']);
     $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);

From 586c63ef56cf17456659f2e19733e5f9586555fa Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Sun, 31 Jan 2021 08:53:56 +0800
Subject: [PATCH 04/10] pukal

---
 app/Http/Controllers/KomuditiController.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php
index 11f199d..3a698c6 100644
--- a/app/Http/Controllers/KomuditiController.php
+++ b/app/Http/Controllers/KomuditiController.php
@@ -13,8 +13,10 @@ use Carbon\Carbon;
 class KomuditiController extends Controller
 {
     public function checkKomuditi(){
+        $current = Carbon::now();
+        $current = new Carbon();
 
-        $komuditi = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first();
+        $komuditi = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first();
         return response()->json($komuditi);
     }
 
@@ -22,9 +24,9 @@ class KomuditiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
-        $komuditi = Komuditi::on('mysql7')->select('unit_komuditi')->where('date_purchase','=',$current->toDateString())->first();
-        $unit_komuditi = $komuditi['unit_komuditi'];
-        return response()->json($unit_komuditi);
+        $komuditi = KomuditiPurchase::on('mysql7')->select('unit_komuditi')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first();
+
+        return response()->json($komuditi['unit_komuditi']);
     }
 
     public function beliKomuditi(Request $request){
@@ -71,7 +73,7 @@ class KomuditiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
-        $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first();
+        $komuditi_current = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first();
         // dd($komuditi_current);
         $unit_current = $komuditi_current['unit_komuditi'];
 

From 578e55263ee7c22b4033e5136373a8c4193d525b Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Mon, 1 Feb 2021 08:38:39 +0800
Subject: [PATCH 05/10] otp

---
 app/Http/Controllers/OtpController.php | 9 +++++++++
 app/OtpToken.php                       | 2 +-
 routes/web.php                         | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/OtpController.php b/app/Http/Controllers/OtpController.php
index 1505398..e2698b5 100644
--- a/app/Http/Controllers/OtpController.php
+++ b/app/Http/Controllers/OtpController.php
@@ -31,6 +31,15 @@ class OtpController extends Controller
         return response()->json($otp);
     }
 
+    public function getOtpUsed($nokp){
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $otp = OtpToken::on('mysql7')->where([['nokp','=',$nokp],['used','=',1]])->get();
+
+        return response()->json($otp);
+    }
+
     public function checkToken($otp_token){
         $current = Carbon::now();
         $current = new Carbon();
diff --git a/app/OtpToken.php b/app/OtpToken.php
index 2f28079..ac95949 100644
--- a/app/OtpToken.php
+++ b/app/OtpToken.php
@@ -15,7 +15,7 @@ class OtpToken extends Model
      * @var array
      */
     protected $fillable = [
-        'nokp','token','used','expired'
+        'nokp','token','used','expired','kodcaw'
     ];
 
     /**
diff --git a/routes/web.php b/routes/web.php
index b3062af..552afcd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -156,6 +156,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //OTP API
     $router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
     $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
+    $router->get('otp/used/{nokp}',['uses'=>'OtpController@getOtpUsed']);
     $router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
     $router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
 

From ca32f71a2cb9e13f8b7283d369474eba48a4605d Mon Sep 17 00:00:00 2001
From: Fiza Ali <norhafizaali96@outlook.com>
Date: Mon, 1 Feb 2021 09:52:12 +0800
Subject: [PATCH 06/10] changes on route Mobile

---
 routes/web.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 552afcd..16c4247 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -262,7 +262,8 @@ $router->group(['prefix'=>'e-arrahn'], function () use ($router){
 $router->group(['prefix'=>'mobile'], function () use ($router){
     
     $router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']);
-   
+    $router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
+
        //utama
        $router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
        $router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
@@ -272,15 +273,16 @@ $router->group(['prefix'=>'mobile'], function () use ($router){
        //gadaian
        $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
        $router->get('customers/{ic}/gadaitebuslelong/{kodcaw}',['uses'=>'CustomerController@gadaiTebusLelongByCawanganMobile']);
-       
-       $router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
-       $router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
+
+       //profile
+       $router->post('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
    
        //register
        $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
        $router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
        $router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
    
+       $router->post('send-email', ['uses' => 'CustomerController@sendEmail']);
    
 });
 

From f5b1234e2757b6ce3d423db708747a1a0bdef05d Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Mon, 1 Feb 2021 13:15:40 +0800
Subject: [PATCH 07/10] change gldetail and request teller

---
 app/GlDetail.php                         |  2 +-
 app/Http/Controllers/TunaiController.php | 34 ++++++++++++++++++------
 app/Http/Controllers/VaultController.php | 28 +++++++++++++++++++
 app/RequestTeller.php                    |  3 ++-
 routes/web.php                           |  7 ++---
 5 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/app/GlDetail.php b/app/GlDetail.php
index fbab872..1f41f7f 100644
--- a/app/GlDetail.php
+++ b/app/GlDetail.php
@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class AnsRugi extends Model
+class GlDetail extends Model
 {
     protected $table = 'gldetail';
     public $timestamps = false;
diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index 47bbdd2..b6feb95 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -132,7 +132,7 @@ class TunaiController extends Controller
 
     }
 
-    public function getCurrentTunai($kodcaw,$kodlaluan)
+    public function getCurrentTunai($kodcaw,Request $request)
     {
 
         $current = Carbon::now();
@@ -141,7 +141,7 @@ class TunaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $tunai=Tunai::on($cawangan['mysql'])
-        ->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$kodlaluan]])
+        ->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
         ->orderBy('tarikh','desc')
         ->first();
         return response()->json($tunai);
@@ -205,16 +205,16 @@ class TunaiController extends Controller
         return response()->json($requestteller);
     }
 
-    public function updateRequestTeller($kodcaw,$kodlaluan,Request $request)
+    public function updateRequestTeller($kodcaw,Request $request)
     {
-        $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$kodlaluan],['update','=',0]])->update(array(
+        $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
 
             'update' => 1
       
          ) );
     }
 
-    public function createRequestTeller($kodcaw,$kodlaluan,Request $request)
+    public function createRequestTeller($kodcaw,Request $request)
     {
     
         $current = Carbon::now();
@@ -224,9 +224,27 @@ class TunaiController extends Controller
               
              'tarikh' => $current->toDateString(),
              'kodcaw' => $kodcaw,
-             'kodlaluan'=> $kodlaluan,
-             'modal'=>$request->modal,
-             'serahan'=>$request->serahan,
+             'kodlaluan' => $request->kodlaluan,
+             'modal' => $request->modal,
+             'serahan' => $request->serahan,
+             'bd1' => $request->bd1,
+             'bd5' => $request->bd5,
+             'bd10' => $request->bd10,
+             'bd20' => $request->bd20,
+             'bd50' => $request->bd50,
+             'bd100' => $request->bd100,
+             'txtring1' => $request->txtring1,
+             'txtring5' => $request->txtring5,
+             'txtring10' => $request->txtring10,
+             'txtring20' => $request->txtring20,
+             'txtring50' => $request->txtring50,
+             'txtring100' => $request->txtring100,
+             'txtring1000' => $request->txtring1000,
+             'txtsen1' => $request->txtsen1,
+             'txtsen5' => $request->txtsen5,
+             'txtsen10' => $request->txtsen10,
+             'txtsen20' => $request->txtsen20,
+             'txtsen50' => $request->txtsen50,
              'update' => '0'
         ]);
 
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index aed4aa8..172ff5f 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -5,6 +5,7 @@ use App\Vault;
 use App\Cawangan;
 use App\Tunai;
 use App\AddTunai;
+use App\GlDetail;
 
 use Illuminate\Http\Request;
 use Carbon\Carbon;
@@ -92,4 +93,31 @@ class VaultController extends Controller
     return response()->json($vaultcreate,201);
  }
 
+//GLDETAIL ONLINE
+
+public function creategldetailonline($kodcaw,Request $request)
+{
+    $current = Carbon::now();
+    $current = new Carbon();
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+    $gldetail=GlDetail::on($cawangan['mysql'])->create([ 
+        'kodcaw' => $request->kodcaw,
+        'tarikh' => $current->toDateString(),
+        'dtacct' => '1000/020',
+        'ktacct' => '1000/010',
+        'descpt' => 'SERAHAN BAYAR ONLINE',
+        'acttype' => 'A',
+        'fracttype' => 'A',
+        'amaun' => $request->amaun,
+        'teller' => 'ONLINE',
+        'terima' => '*'
+    ]);
+
+    return response()->json($gldetail,201);
+
+}
+
+
+
 }
\ No newline at end of file
diff --git a/app/RequestTeller.php b/app/RequestTeller.php
index c9879f5..d38a7e9 100644
--- a/app/RequestTeller.php
+++ b/app/RequestTeller.php
@@ -13,7 +13,8 @@ class RequestTeller extends Model
      *
      * @var array
      */
-    protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw'];
+    protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
+	                        'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50'];
 
     /**
      * The attributes excluded from the model's JSON form.
diff --git a/routes/web.php b/routes/web.php
index 16c4247..fa8358d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -190,13 +190,14 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
     $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
     $router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
-    $router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']);
+    $router->get('GetCurrentTunai/{kodcaw}',['uses' =>'TunaiController@getCurrentTunai']);
     $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
     $router->get('getAddTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
     $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
     $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
     $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit
     $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit
+    $router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); //Gldetail Online
 
 
     //API PANJAR KHAZANAH
@@ -220,9 +221,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']);
     
     //API REQUEST TELLER
-    $router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']);
+    $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']);
     $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
-    $router->put('requestTeller/update/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@updateRequestTeller']);
+    $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
     
     //API WAKIL
     $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);

From 1dabcdb0867e5fc5f80d72c135ac9b5e8b040283 Mon Sep 17 00:00:00 2001
From: Fiza Ali <norhafizaali96@outlook.com>
Date: Tue, 2 Feb 2021 18:57:04 +0800
Subject: [PATCH 08/10] API Mobile

---
 app/BankMaster.php                          | 29 ++++++++
 app/Customer.php                            | 43 ++++++++++++
 app/Http/Controllers/CustomerController.php | 78 ++++++++++++++++++++-
 routes/web.php                              |  3 +
 4 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 app/BankMaster.php

diff --git a/app/BankMaster.php b/app/BankMaster.php
new file mode 100644
index 0000000..394d7c2
--- /dev/null
+++ b/app/BankMaster.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BankMaster extends Model
+{
+    protected $connection = 'mysql7';
+    protected $table = 'bank';
+    protected $primaryKey = 'BANKCODE';
+    
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    // protected $fillable = [
+        
+    // ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/app/Customer.php b/app/Customer.php
index 91923fb..2e9257b 100644
--- a/app/Customer.php
+++ b/app/Customer.php
@@ -3,9 +3,11 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
 
 class Customer extends Model
 {
+
     protected $table = 'customer';
     public $timestamps = false;
     /**
@@ -13,6 +15,8 @@ class Customer extends Model
      *
      * @var array
      */
+    protected $primaryKey = ['kplama','kpbaru'];
+    public $incrementing = false;
     protected $fillable = [
         'ahli',
         'kodcaw',
@@ -65,4 +69,43 @@ class Customer extends Model
      * @var array
      */
     // protected $hidden = [];
+
+        /**
+     * Set the keys for a save update query.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function setKeysForSaveQuery(Builder $query)
+    {
+        $keys = $this->getKeyName();
+        if(!is_array($keys)){
+            return parent::setKeysForSaveQuery($query);
+        }
+
+        foreach($keys as $keyName){
+            $query->where($keyName, '=', $this->getKeyForSaveQuery($keyName));
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get the primary key value for a save query.
+     *
+     * @param mixed $keyName
+     * @return mixed
+     */
+    protected function getKeyForSaveQuery($keyName = null)
+    {
+        if(is_null($keyName)){
+            $keyName = $this->getKeyName();
+        }
+
+        if (isset($this->original[$keyName])) {
+            return $this->original[$keyName];
+        }
+
+        return $this->getAttribute($keyName);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index 9a84468..44bda6d 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\BankMaster;
 use App\Customer;
 use App\Gadai;
 use App\Lelong;
@@ -418,4 +419,79 @@ class CustomerController extends Controller
 
         return response('Deleted Successfully', 200);
     }
-}
\ No newline at end of file
+
+    public function akaunBankMobile($nokp)
+    {
+        $array_cust = [];
+        $cawangan_all = Cawangan::on('mysql7')->get();
+
+        foreach($cawangan_all as $cawangan)
+        {
+           $customer = Customer::on($cawangan['mysql'])
+            ->where('kplama','=',$nokp)
+            ->orWhere('kpbaru','=',$nokp)
+            ->rightJoin('online_arrahn.bank', 'bank.id', '=', 'customer.kodbank')
+            ->first(); 
+
+            if(!empty($customer))
+            {
+                $customer_detail['noakaun'] = $customer['noakaun'];
+                $customer_detail['namabank'] = $customer['name'];
+                $customer_detail['kodbank'] = $customer['id'];
+
+                return response()->json($customer_detail);
+            } 
+            else
+            {
+                return response()->json('Data Not Found');
+            }
+        }
+    }
+    
+    public function bankListMobile()
+    {
+        $bank_array = [];
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        foreach($cawangan_all as $cawangan)
+        {
+            $bank = BankMaster::get();
+                if(!empty($bank))
+                {
+                    //loop each array
+                    foreach($bank as $banklist)
+                    {
+                        array_push($bank_array, array(
+                            'kodbank' => $banklist->id,
+                            'namabank' => $banklist->name,                     
+                        ));         
+                    }
+                    return response()->json($bank_array);
+                }
+                else
+                {
+                    return response()->json('Data Not Found');
+                }         
+        }
+    }
+
+
+    public function insertAkaunBankMobile(Request $request)
+    {
+        $cawangan_all = Cawangan::on('mysql7')->get(); //return all 8 branches 
+        foreach($cawangan_all as $index=>$cawangan)
+        {
+            $customer = Customer::on($cawangan['mysql'])    //search Customer on dtabase cawangan (1-8)
+            ->where('kplama','=',$request->nokp)
+            ->orWhere('kpbaru','=',$request->nokp)
+            ->first();
+
+            if(!empty($customer))
+            { 
+                $customer->kodbank = $request->kodbank;
+                $customer->noakaun = $request->noakaun;
+                $customer->save();     
+            }
+        }   
+        return response()->json($customer, 200);
+    }
+}
diff --git a/routes/web.php b/routes/web.php
index fa8358d..8ec6d82 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -270,6 +270,9 @@ $router->group(['prefix'=>'mobile'], function () use ($router){
        $router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
        $router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
        $router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
+       $router->get('akaun-bank/{nokp}',['uses'=>'CustomerController@akaunBankMobile']);
+       $router->get('bank-listing/{nokp}',['uses'=>'CustomerController@bankListMobile']);
+       $router->post('insert/akaun-bank',['uses'=>'CustomerController@insertAkaunBankMobile']);
    
        //gadaian
        $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);

From 42d2f46e282264731272de486b6de28c1fbf9281 Mon Sep 17 00:00:00 2001
From: Fiza Ali <norhafizaali96@outlook.com>
Date: Wed, 3 Feb 2021 09:18:38 +0800
Subject: [PATCH 09/10] correction at route

---
 routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 8ec6d82..9b96488 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -271,7 +271,7 @@ $router->group(['prefix'=>'mobile'], function () use ($router){
        $router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
        $router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
        $router->get('akaun-bank/{nokp}',['uses'=>'CustomerController@akaunBankMobile']);
-       $router->get('bank-listing/{nokp}',['uses'=>'CustomerController@bankListMobile']);
+       $router->get('bank-listing',['uses'=>'CustomerController@bankListMobile']);
        $router->post('insert/akaun-bank',['uses'=>'CustomerController@insertAkaunBankMobile']);
    
        //gadaian

From 22a1bfa082b13b5685ed8f7393e2ef5f844d367d Mon Sep 17 00:00:00 2001
From: Fiza Ali <norhafizaali96@outlook.com>
Date: Wed, 3 Feb 2021 11:48:20 +0800
Subject: [PATCH 10/10] edit code for Mobile

---
 app/Http/Controllers/CustomerController.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index 44bda6d..1df046f 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -443,7 +443,7 @@ class CustomerController extends Controller
             } 
             else
             {
-                return response()->json('Data Not Found');
+                return $array_cust;
             }
         }
     }
@@ -474,13 +474,12 @@ class CustomerController extends Controller
         }
     }
 
-
     public function insertAkaunBankMobile(Request $request)
     {
-        $cawangan_all = Cawangan::on('mysql7')->get(); //return all 8 branches 
+        $cawangan_all = Cawangan::on('mysql7')->get(); 
         foreach($cawangan_all as $index=>$cawangan)
         {
-            $customer = Customer::on($cawangan['mysql'])    //search Customer on dtabase cawangan (1-8)
+            $customer = Customer::on($cawangan['mysql'])  
             ->where('kplama','=',$request->nokp)
             ->orWhere('kpbaru','=',$request->nokp)
             ->first();