Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!83

app/Http/Controllers/GadaiController.php

@@ -1939,16 +1939,16 @@ class GadaiController extends Controller
 
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
             ->sum('pinjaman');
 
-            $gadaibaru = Gadai::on($cawangan['mysql'])
+            // $gadaibaru = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
+            // ->where('tagpalsu','=',0)
-            ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
+            // ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('pinjaman');
+            // ->sum('pinjaman');
 
-            $rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
+            // $rekod_pinjamandiberi;
 
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
@@ -1962,10 +1962,12 @@ class GadaiController extends Controller
 
         if($request->tarikh > '2021-04-13'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
-        ->where('tagpalsu','=',0)
+            ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
+            // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
-        // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
+            ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
-        ->sum('pinjaman');
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            ->sum('pinjaman');
         }
 
         return response()->json($rekod_pinjamandiberi);

app/Http/Controllers/TebusController.php

@@ -436,6 +436,19 @@ class TebusController extends Controller
         return response()->json($wakil_create ,201);
     }
 
+    public function UbahWakil($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $wakil = $request->nowakil;
+
+        $update_wakil = Tebus::on($cawangan['mysql'])->where('norujukan','=',$request->norujukan)->update(array(
+            "nowakil" => $wakil
+        ));
+
+        return response()->json($update_wakil ,201);
+    }
+
     public function listhistorypenebusan($kodcaw,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -457,6 +470,37 @@ class TebusController extends Controller
         return response()->json($listadvansur,200);
     }
 
+    public function SenaraiAdvansur($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('teller','=',$request->kodlaluan)
+        ->where('tarikh','=',$current->toDateString())
+        ->orderBy('tarikh','desc')
+        ->get();
+
+        return response()->json($listadvansur,200);
+    }
+
+    public function getAdvansurByKodlaluan($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+            ->where('teller','=',$request->kodlaluan)
+            ->where('tarikh','=',$current->toDateString())
+            ->sum('upahdibayar');
+
+        return response()->json($listadvansur,200);
+    }
+
     public function createAdvansur($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();

app/Http/Controllers/TransactionController.php

@@ -3,6 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\Transaction;
+use App\Pengguna;
+use App\Cawangan;
+
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;
@@ -68,4 +71,15 @@ class TransactionController extends Controller
 
         return response()->json($transaction);
     }
+
+    public function GetPengguna($kodcaw,Request $request)
+    {
+        $namateller = $request->namateller;
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $pengguna=Pengguna::on($cawangan['mysql'])
+                ->where('nama','=',$namateller)->limit(1)->get();
+
+        return response()->json($pengguna);
+    }
 }

app/Pengguna.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Pengguna extends Model
+{
+    protected $table = 'pengguna';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+      'kodcaw',
+      'kodlaluan',
+      'katalaluan',
+      'taraf', 
+      'nama',
+      'kplama',
+      'kpbaru',
+      'pinjmax',
+      'limittunait',
+      'limittunaip',
+      'status',
+      't_luput',
+      'flag',
+      'created_by',
+      'last_modified_by',
+      't_daftar',
+      'date_created',
+      'pinjmaxxtra',
+      'pengganti',
+      'khazanahtemp',
+      'ppo',
+      'settingtetap',
+      'autoberat',
+      'perubatan',
+      'tagperubatan',
+      'pptetap',
+      'kktetap',
+      'mmtetap',
+      'tellertetap'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

routes/web.php

@@ -177,9 +177,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']);
     
 
-    //ANSURAN API
+    //ANSURAN UPAH API
     $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
     $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
+    $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
+    $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
 
     //LAPORAN API
@@ -255,7 +257,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
     $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
     $router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']);
-    
+    $router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);
     $router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']);
 
     //update tagterima Tebus
@@ -320,6 +322,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']);  //transaction kira sum  all bayaran online cawangan
     
 
+    //NAMA PENGGUNA TAMBAH KODLALUAN
+    $router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']);
+
     //IMBANG DUGA//
 
     //Dua-Dua Table