merge

app/Http/Controllers/GadaiController.php

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

@@ -467,6 +467,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();
 
@@ -488,6 +501,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/Http/Controllers/TransaksiKeuntunganController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
 
 use App\TransaksiKeuntungan;
 use Illuminate\Http\Request;
+use Carbon\Carbon;
+use DB;
 
 class TransaksiKeuntunganController extends Controller
 {
@@ -33,7 +35,7 @@ class TransaksiKeuntunganController extends Controller
     public function createTransaksiKeuntungan(Request $request){
         $transaksi = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $request->norujukan,
-            'bayaran_keuntungan' => $request->bayaran_keuntungan,
+            'bayaran_keuntungan' =>$request->bayaran_keuntungan,
             'tarikh_bayaran'=> $request->tarikh_bayaran,
             'tempoh'=> $request->tempoh,
             'kodcaw'=> $request->kodcaw