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

app/Http/Controllers/AdminPageController.php

@@ -986,7 +986,7 @@ class AdminPageController extends Controller
 
         $tebuslatest = Gadai::on($cawangan['mysql'])
                 ->whereYear('t_update',$current->year)
-                ->where([['sttebus','=','T'],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
+                ->where([['sttebus','!=',''],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
                 ->orderBy('t_update','asc')
                 ->sum('pinjaman');
 
@@ -1039,9 +1039,10 @@ class AdminPageController extends Controller
         }
 
 
-        $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm');
+        $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('pinjaman');
+        $lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$harini)->sum('pinjaman');
         
-        $tebusToday += $tebus;
+        $tebusToday = $tebus + $lelong;
         
         $diffTebusPercent = 0;
         
@@ -1140,11 +1141,31 @@ class AdminPageController extends Controller
         $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah');
         $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar');
         
-        $upahToday = $upahToday + $upah_tebus_today + $upah_today;
+        $upahToday += $upah_today;
         
-        $ansuran_today = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$harini . ' 00:00:00'],['tarikh_bayaran','<=',$harini . ' 23:59:59']])->where('kodcaw','=',$request->kodcaw)->sum('bayaran_keuntungan');
+        $ansuran_today = Transaction::on('mysql7')
+                        ->leftJoin('transaksi_keuntungan as trans', function($join)
+                        {
+                                $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                        })
+                        ->where('transaction.trans_type','=','A')
+                        ->where([['trans.tarikh_bayaran','>=',$harini . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
+                        ->where('trans.kodcaw','=',$request->kodcaw)
+                        ->sum('bayaran_keuntungan');
 
-        $upahToday = $upahToday + $ansuran_today;
+        $upah_tebus_today = Transaction::on('mysql7')
+                        ->leftJoin('transaksi_keuntungan as trans', function($join)
+                        {
+                                $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                        })
+                        ->where('transaction.trans_type','!=','A')
+                        ->where([['trans.tarikh_bayaran','>=',$harini . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
+                        ->where('trans.kodcaw','=',$request->kodcaw)
+                        ->sum('keuntungan_rebet');
+
+        $upahToday = $upah_tebus_today + $ansuran_today;
 
         $diffUpah = 0;
 
@@ -1446,4 +1467,16 @@ class AdminPageController extends Controller
         return response()->json($blacklist, 201);
     }
 
+    public function DeleteBlackList(Request $request)
+    {
+            
+        $customer = Customer::on('mysql7')
+                ->where('kpbaru','=', $request->nokp)
+                ->orWhere('kplama','=', $request->nokp)
+                ->first();
+
+        $blacklist = Blacklist::where('id',$id)->delete();
+
+        return response()->json($blacklist, 201);
+    }
 }

routes/web.php

@@ -660,6 +660,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->post('simpanStatus',['uses'=>'AdminPageController@SimpanStatus']);
 
     $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']);
+    $router->get('DeleteBlacklist/{kodcaw}',['uses'=>'AdminPageController@DeleteBlackList']);
     $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);