Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!108

app/Http/Controllers/CustomerController.php

@@ -391,13 +391,7 @@ class CustomerController extends Controller
     }
 
     public function customerUpdateKaunter($nokp,Request $request){
-        // $cawangan_all = Cawangan::on('mysql7')->get();
+ 
-        // foreach($cawangan_all as $index=>$cawangan){
-        //     $customer = Customer::on($cawangan['mysql'])
-        //     ->where('kplama','=',$nokp)
-        //     ->orWhere('kpbaru','=',$nokp)
-        //     ->first();
-        //     if($customer != null){
                 $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
                 $customer_update = Customer::on('mysql7')
                 ->where('kplama','=',$nokp)
@@ -407,10 +401,12 @@ class CustomerController extends Controller
                     'telefon2' => $request->telefon2,
                     'kodbank' => $request->kodbank,
                     'noakaun' => $request->noakaun,
-                    'nota' => $request->nota
+                    'nota' => $request->nota,
+                    'alamat1' => $request->alamat,
+                    'poskod' => $request->poskod,
+                    'koddaerah' => $poskod['koddaerah'],
+                    'kodnegeri' => $poskod['kodnegeri']
                 ));
-        //     }
-        // }
         
         return response()->json($customer_update, 200);
     }

app/Http/Controllers/LelongController.php

@@ -437,7 +437,7 @@ class LelongController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $lelong = Lelong::on($cawangan['mysql'])
-        ->select('tuntutbaki.batchno','tuntutbaki.tarikh','tuntutbaki.bakipjm','tuntutbaki.bakiupah','tuntutbaki.recno','lelong.t_lelong','tuntutbaki.norujukan','customer.nama','customer.kpbaru','tuntutbaki.hargajual','tuntutbaki.jumlah','tuntutbaki.cajlelong','lelong.pinjaman')
+        ->select('tuntutbaki.batchno','tuntutbaki.nowakil','tuntutbaki.tarikh','tuntutbaki.bakipjm','tuntutbaki.bakiupah','tuntutbaki.recno','lelong.t_lelong','tuntutbaki.norujukan','customer.nama','customer.kpbaru','tuntutbaki.hargajual','tuntutbaki.jumlah','tuntutbaki.cajlelong','lelong.pinjaman')
         ->where('lelong.norujukan','=',$norujukan)
         ->whereNotNull('lelong.trkhtuntut')
         ->leftJoin('tuntutbaki', 'tuntutbaki.norujukan', '=', 'lelong.norujukan')

app/Http/Controllers/TunaiController.php

@@ -214,6 +214,17 @@ class TunaiController extends Controller
         return response()->json($addtunai);
     }
 
+    public function getAddTunaiDate($kodcaw,Request $request)
+    {
+       
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $addtunai=AddTunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$request->tarikh]])->get();
+        return response()->json($addtunai);
+    }
+
 
     public function getAddTunaibyKodlaluan($kodcaw,Request $request)
     {
@@ -375,6 +386,19 @@ class TunaiController extends Controller
         
         return response()->json($tunai);
     }
+
+    public function GetTellerWork($kodcaw)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $teller = Tunai::on($cawangan['mysql'])
+                    ->select('kodlaluan')
+                    ->whereRaw('LENGTH(kodlaluan) > 14')
+                    ->distinct()
+                    ->get();
+                    
+        return response()->json($teller);
+    }
 }
 
 

routes/web.php

@@ -259,6 +259,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('getPastTunai/{kodcaw}',['uses' =>'TunaiController@getTunaiPast']);
     $router->get('GetLatestTunai/{kodcaw}',['uses' =>'TunaiController@getLatestTunai']);
     $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
+    $router->get('getAddTunaiDate/{kodcaw}/',['uses' =>'TunaiController@getAddTunaiDate']);
     $router->get('getAddTunai/{kodcaw}/kodlaluan/',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
     $router->get('getAddTunaiLatest/{kodcaw}',['uses' =>'TunaiController@getAddTunaibyKodlaluanLatest']);
     $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
@@ -386,6 +387,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //NAMA PENGGUNA TAMBAH KODLALUAN
     $router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']);
 
+    //NAMA SETIAP TELLER DALAM TUNAI
+    $router->get('get/tellerwork/{kodcaw}',['uses'=>'TunaiController@GetTellerWork']);
+
     //IMBANG DUGA//
 
     //Dua-Dua Table