Merge remote-tracking branch 'origin' into afiqhamzah-feat-mykad-reader-registration-backend

app/Http/Controllers/AdminPageController.php

@@ -44,6 +44,8 @@ use App\StokAudit10;
 use App\StokAudit11;
 use App\StokAudit12;
 use App\AuditCustomer;
+use App\imbangdugalama;
+use App\HapusKira;
 
 use DB;
 use DateTime;
@@ -189,12 +191,12 @@ class AdminPageController extends Controller
                 ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
                 ->where('bajettahunan.kodcaw','=', $request->kodcaw)
                 ->where('jenisbajet','=','Gadai')
-                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->whereYear('bajettahunan.tahun', '=', $request->year)
                 ->sum('nilaibajet');
 
         $gadai = Gadai::on($cawangan['mysql'])
                 ->selectRaw('SUM(pinjaman) AS totalpinjaman')
-                ->whereYear('t_gadai',$current->year)
+                ->whereYear('t_gadai',$request->year)
                 ->sum('pinjaman');
 
 
@@ -216,11 +218,11 @@ class AdminPageController extends Controller
                 ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
                 ->where('bajettahunan.kodcaw','=', $request->kodcaw)
                 ->where('jenisbajet','=','Penebusan')
-                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->whereYear('bajettahunan.tahun', '=', $request->year)
                 ->sum('nilaibajet');
 
         $tebus = Gadai::on($cawangan['mysql'])
-                ->whereYear('t_update',$current->year)
+                ->whereYear('t_update',$request->year)
                 ->where('sttebus','!=','')
                 ->sum('pinjaman');
 
@@ -249,7 +251,7 @@ class AdminPageController extends Controller
                 ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
                 ->where('bajettahunan.kodcaw','=', $request->kodcaw)
                 ->where('jenisbajet','=','Keuntungan')
-                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->whereYear('bajettahunan.tahun', '=', $request->year)
                 ->sum('nilaibajet');
 
         $tebus_arrahn = Tebus::on($cawangan['mysql'])
@@ -259,7 +261,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
-                ->whereYear('t_tebus',$current->year)
+                ->whereYear('t_tebus',$request->year)
                 ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()]])
                 ->orderBy('t_tebus','asc')
                 ->get()->toArray();
@@ -270,7 +272,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(tarikh,'%Y%m')"))
-                ->whereYear('tarikh',$current->year)
+                ->whereYear('tarikh',$request->year)
                 ->where([['tarikh','<=',$current->toDateString()]])
                 ->get()->toArray();
 
@@ -280,7 +282,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -297,7 +299,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -315,7 +317,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(t_jual,'%Y%m')"))
-                ->whereYear('t_jual',$current->year)
+                ->whereYear('t_jual',$request->year)
                 ->orderBy('t_jual','asc')
                 ->get()->toArray();
 
@@ -385,45 +387,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
 
                     }
@@ -438,7 +440,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Gadai')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -456,7 +458,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
-                        ->whereYear('t_gadai',$current->year)
+                        ->whereYear('t_gadai',$request->year)
                         ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
                         ->orderBy('t_gadai','asc')
                         ->get();
@@ -498,45 +500,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
 
                     }
@@ -551,7 +553,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Bilangan-Gadai')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -569,7 +571,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
-                        ->whereYear('t_gadai',$current->year)
+                        ->whereYear('t_gadai',$request->year)
                         ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
                         ->orderBy('t_gadai','asc')
                         ->get();
@@ -612,45 +614,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
 
                     }
@@ -663,7 +665,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Penebusan')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -683,7 +685,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_update,'%Y%m')"))
-                        ->whereYear('t_update',$current->year)
+                        ->whereYear('t_update',$request->year)
                         ->where([['sttebus','!=',''],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
                         ->orderBy('t_update','asc')
                         ->get()->toArray();
@@ -694,7 +696,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                        ->whereYear('transaction.created_at',$current->year)
+                        ->whereYear('transaction.created_at',$request->year)
                         ->leftJoin('transaksi_keuntungan as trans', function($join)
                         {
                                 $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -745,45 +747,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
 
                     }
@@ -798,7 +800,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Bilangan-Tebus')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -818,7 +820,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_update,'%Y%m')"))
-                        ->whereYear('t_update',$current->year)
+                        ->whereYear('t_update',$request->year)
                         ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
                         ->orderBy('t_update','asc')
                         ->get();
@@ -863,45 +865,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
 
                     }
@@ -917,7 +919,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Keuntungan')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -937,7 +939,7 @@ class AdminPageController extends Controller
                     ->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh'))
                     ->groupBy(DB::connection($cawangan['mysql'])
                     ->raw("DATE_FORMAT(t_jual,'%Y%m')"))
-                    ->whereYear('t_jual',$current->year)
+                    ->whereYear('t_jual',$request->year)
                     ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
                     ->orderBy('t_jual','asc')
                     ->get()->toArray();
@@ -951,7 +953,7 @@ class AdminPageController extends Controller
                     ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh'))
                     ->groupBy(DB::connection($cawangan['mysql'])
                     ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
-                    ->whereYear('t_tebus',$current->year)
+                    ->whereYear('t_tebus',$request->year)
                     ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
                     ->orderBy('t_tebus','asc')
                     ->get()->toArray();
@@ -962,7 +964,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(tarikh,'%Y%m')"))
-                ->whereYear('tarikh',$current->year)
+                ->whereYear('tarikh',$request->year)
                 ->where([['tarikh','<=',$current->toDateString()],['tarikh','>=',$monthly_date]])
                 ->get()->toArray();
 
@@ -972,7 +974,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -989,7 +991,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -1684,9 +1686,10 @@ class AdminPageController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $request->tarikh],['kodlaluan','=', $request->kodlaluan] ])->
         update(array(
-             'keluar'=>$request->keluar,
+                'bakiawal'=>$request->bakiawal,
-              'masuk'=>$request->masuk,
+                'keluar'=>$request->keluar,
-              'baki'=>$request->bakiakhir
+                'masuk'=>$request->masuk,
+                'baki'=>$request->bakiakhir
         ));
 
         return response()->json($updatetunai, 200);
@@ -2374,7 +2377,7 @@ class AdminPageController extends Controller
         $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->where('kodcaw','=',$request->kodcaw)->pluck('norujukan');
 
         $lelong = Lelong::on($cawangan['mysql'])
-        ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki')
+        ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki','lelong.t_jual')        
         ->whereIn('lelong.norujukan',$wtdnorujukan)
         ->join('gadai','lelong.norujukan','=','gadai.norujukan')
         ->get();
@@ -2398,10 +2401,10 @@ class AdminPageController extends Controller
 
         $lelong = Lelong::on($cawangan['mysql'])
          ->where([['baki','>',0],['trkhtuntut',null]])
-         ->whereMonth('t_lelong','>=',$mula[0])
+         ->whereMonth('t_jual','>=',$mula[0])
-         ->whereMonth('t_lelong','<=',$hingga[0])
+         ->whereMonth('t_jual','<=',$hingga[0])
-         ->whereYear('t_lelong','>=',$mula[1])
+         ->whereYear('t_jual','>=',$mula[1])
-         ->whereYear('t_lelong','<=',$hingga[1]);
+         ->whereYear('t_jual','<=',$hingga[1]);
 
         $lelongdetails = $lelong->get()->toArray();
         $lelongcount = $lelong->count();
@@ -2410,10 +2413,10 @@ class AdminPageController extends Controller
         $draft = WTDDraft::on('mysql7')
                 ->whereIn('norujukan',$lelongpluck)
                 ->where('kodcaw',$kodcaw)
-                ->whereMonth('t_lelong','>=',$mula[0])
+                ->whereMonth('t_jual','>=',$mula[0])
-                ->whereMonth('t_lelong','<=',$hingga[0])
+                ->whereMonth('t_jual','<=',$hingga[0])
-                ->whereYear('t_lelong','>=',$mula[1])
+                ->whereYear('t_jual','>=',$mula[1])
-                ->whereYear('t_lelong','<=',$hingga[1]);
+                ->whereYear('t_jual','<=',$hingga[1]);
 
         $draftcount = $draft->count();
         $draftpluck = $draft->pluck('norujukan');
@@ -3223,4 +3226,338 @@ class AdminPageController extends Controller
 
         return response()->json($array_akru,200);
     }
+
+    public function LaporanOnline(Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        if($request->jenis == 'portal')
+        {
+             $online=GlDetail::on($cawangan['mysql'])
+                 ->where('kodcaw','=',$request->kodcaw)
+                 ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                 ->where('descpt','LIKE','SERAHAN BAYAR ONLINE%')
+                 ->where('serahan','>',0)
+                 ->orderby('tarikh','desc')
+                 ->get();
+        }else if($request->jenis == 'mobile'){
+
+             $online=GlDetail::on($cawangan['mysql'])
+                 ->where('kodcaw','=',$request->kodcaw)
+                 ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                 ->where('descpt','LIKE','Serahan Mobile Payment%')
+                 ->where('serahan','>',0)
+                 ->orderby('tarikh','desc')
+                 ->get();
+        }else{
+             $online=GlDetail::on($cawangan['mysql'])
+                 ->where('kodcaw','=',$request->kodcaw)
+                 ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                 ->where('descpt','LIKE','SERAHAN LELONG ONLINE%')
+                 ->where('teller','=','LELONG ONLINE')
+                 ->where('serahan','>',0)
+                 ->orderby('tarikh','desc')
+                 ->get();
+        }
+
+
+        return response()->json($online,200);
+    }
+
+    public function calculationUntungTerkumpulAkru($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $current = new Carbon($request->tarikh);
+
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        $total = 0;
+
+        //Untung Rugi Terkumpul Sebelum 01.12.2013
+        $utgrugilama = imbangdugalama::on($cawangan['mysql']) //--masuk
+            ->sum('untung_t');
+
+        //Yuran Ahli
+        $yuranTlama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('yuran_t');
+
+        $yuranbaru = Customer::on('mysql7')
+            ->where('tarikhdaftar','>','2013-12-31')
+            ->whereYear('tarikhdaftar','<',$current->year)
+            ->sum('yuranahli');
+
+        //Caj Lelong
+        $lelong = Lelong::on($cawangan['mysql']) //--masuk
+            ->whereNotNull('t_jual')
+            ->where('t_jual','>','2013-12-31')
+            ->whereYear('t_jual','<',$current->year)
+            ->sum('cajlelong');
+
+        $cajlelonglama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('cajlelong_t');
+
+
+        //Upah Simpan Tebus
+        $upahsimpantebus = Tebus::on($cawangan['mysql']) //--masuk
+            ->where('t_tebus','>','2013-12-31')
+            ->whereYear('t_tebus','<',$current->year)
+            ->sum('upahdibayar');
+
+        //Upah Simpan Lelong
+        $upahsimpanlelong = Lelong::on($cawangan['mysql']) //--masuk
+            ->where('t_jual','>','2013-12-31')
+            ->whereYear('t_jual','<','2022')
+            ->sum('bakiupah');
+
+        //Upah Simpan Advansur
+        $upahsimpanansur = Advansur::on($cawangan['mysql']) //--masuk
+            ->whereYear('tarikh','<',$current->year)
+            ->sum('upahdibayar');
+
+        //Upah Tawarruq
+
+        $keuntungan_data = TransaksiKeuntungan::on('mysql7')
+        ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+        ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022')
+        ->where('kodcaw',$kodcaw)
+        ->pluck('norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
+
+        $upahsimpankeuntungansebelumtawarruq = TransaksiKeuntungan::on('mysql7')
+            ->where('tarikh_bayaran' ,'<=', $daterequest)
+            ->whereYear('tarikh_bayaran','<','2022')
+            ->whereIn('norujukan',$gadaiData)
+            ->sum('bayaran_keuntungan');
+
+        $upahsimpanlama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('upah_t');
+
+        //GST Caj Lelong
+        $gstcajlelong = Lelong::on($cawangan['mysql']) //--masuk
+            ->where('t_jual','<=',$request->tarikh)
+            ->whereYear('t_jual','<',$current->year)
+            ->sum('gst_cl');
+
+        //Upah Hapus Kira
+        $upahhapuskira = HapusKira::on($cawangan['mysql'])
+            ->where('tarikh','>','2013-12-31')
+            ->whereYear('tarikh','<',$current->year)
+            ->sum('bakiupah');
+
+        $panjar1 = Panjar::on($cawangan['mysql'])
+            ->whereYear('tarikh','<',$current->year)
+            ->where('tag','=','1')
+            ->sum('bayaran');
+
+        $panjar2 = Panjar::on($cawangan['mysql'])
+            ->whereYear('tarikh','<',$current->year)
+            ->where('tag','=','2')
+            ->sum('bayaran');
+
+        $panjar3 = Panjar::on($cawangan['mysql'])
+            ->whereYear('tarikh','<',$current->year)
+            ->where('tag','=','3')
+            ->sum('bayaran');
+
+        $parameter = ($panjar1*-1) + ($panjar2*-1) + ($panjar3*-1);
+
+        // $parameter = Parameter::on($cawangan['mysql']) //--masuk
+        //     ->sum('sumpanjarlama');
+
+        //Keuntungan Tawarruq Sebenar
+        $keuntungansebenar = 0;
+        $dateSM = '2021-04-24';
+
+        $keuntungan_data = TransaksiKeuntungan::on('mysql7')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
+                    ->whereYear('tarikh_bayaran','<','2022')
+                    ->where('kodcaw',$kodcaw)
+                    ->pluck('norujukan');
+
+
+        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
+
+        $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->whereYear('tarikh_bayaran','<','2022')
+                    ->where('kodcaw',$kodcaw)
+                    ->pluck('norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
+            ->whereIn('norujukan',$gadaiData)
+            ->whereDate('tarikh_bayaran' ,'<', '2021-06-09')
+            ->whereDate('tarikh_bayaran','>=', $dateSM)
+            ->sum('keuntungan_rebet');
+
+        $bukanansuran_data = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','!=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+                    ->whereYear('tarikh_bayaran','<','2022')
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('transaksi_keuntungan.norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])
+                    ->whereIn('norujukan',$bukanansuran_data)
+                    ->whereNotNull('hargajualan')
+                    ->pluck('norujukan');
+
+        $bukanansuran = TransaksiKeuntungan::on('mysql7')
+                    ->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','!=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+                    ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022')
+                    ->sum('transaksi_keuntungan.keuntungan_rebet');
+
+        $ansuran_data = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+                    ->whereYear('tarikh_bayaran','<','2022')
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('transaksi_keuntungan.norujukan');
+
+
+        $gadaiData = Gadai::on($cawangan['mysql'])
+            ->whereIn('norujukan',$ansuran_data)
+            ->whereNotNull('hargajualan')
+            ->pluck('norujukan');
+
+        $ansuran = TransaksiKeuntungan::on('mysql7')
+            ->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
+            ->leftJoin('transaction as trans', function($join)
+            {
+                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+            })
+            ->where('trans.trans_type','=','A')
+            ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+            ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022')
+            ->sum('transaksi_keuntungan.bayaran_keuntungan');
+
+        $keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
+
+        $get_norujukan = Gadai::on($cawangan['mysql'])
+        ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
+        ->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','=','2022')->where('sttebus','<>','')->pluck('norujukan');
+
+        $sum_keun = Transaction::on('mysql7')
+        ->selectRaw("trans.norujukan,SUM(CASE WHEN (transaction.trans_type) = 'T' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
+        ->leftJoin('transaksi_keuntungan as trans', function($join)
+        {
+            $join->on('transaction.norujukan', '=', 'trans.norujukan');
+            $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+        })
+        ->whereIn('trans.norujukan',$get_norujukan)->get()->toArray();
+
+        $sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0;
+        $sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0;
+
+        $total_keuntungan_sebenar =  $sum_keuntungan + $sum_bayaran;
+
+        $previousYear = Carbon::now()->subYears(1);
+        $available_akru = AkruNet::on($cawangan['mysql'])
+                ->where('tahun',$previousYear->year)
+                ->sum('jumlah');
+
+        $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru + $total_keuntungan_sebenar) + $parameter;
+
+        if($kodcaw == '011229')
+            $total -= 45390.37;
+
+
+        return response()->json($total,200);
+    }
+
+    public function getTarikhTunaiSebelum($kodcaw,Request $request){
+        $current = Carbon::now();
+        $current = new Carbon();
+
+         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+         $tunai = Tunai::on($cawangan['mysql'])
+                ->where([['kodcaw','=',$kodcaw],['tarikh','<',$request->tarikh],['kodlaluan','=',$request->kodlaluan]])
+                 ->orderby('tarikh','desc')->limit(1)->first();
+
+         return response()->json($tunai);
+    }
+
+    public function LaporanTuntutBaki(Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        if($request->sort == 'tuntut'){
+                $sortBy = '>';
+        }else if($request->sort == 'rugi'){
+                $sortBy = '<';
+        }else{
+                $sortBy = null;
+        }
+         
+        if($request->jenistuntut == 'belumtuntut'){
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->whereNull('lelong.trkhtuntut')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }else if($request->jenistuntut == 'sudahtuntut'){
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->whereNotNull('lelong.trkhtuntut')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }else{
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }
+        
+        return response()->json($batchleltuntutbaki);
+    }
 }

app/Http/Controllers/BackupStokAuditController.php

@@ -172,10 +172,164 @@ class BackupStokAuditController extends Controller
         return 'success';
     }
 
+    public function backupStokAuditProblem(Request $request){
+        // if($request->zone == 'all'){
+        //     $cawangan = Cawangan::on('mysql7')->get();
+        // }else{
+        //     $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get();
+        // }
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
+        // $tarikh = Carbon::now();
+        // $tarikh = $tarikh->subDay(1);
+        $tarikh = Carbon::parse($request->dateProblem . ' 00:00:00');
+        $month = $tarikh->month;
+        $year = $tarikh->year;
+
+        $all_gadai = Gadai::on($cawangan['mysql'])
+            ->where([['tagpalsu','=',0],['sttebus','=','']])
+            ->orderBy('t_gadai', 'ASC')
+            ->orderBy('sirig', 'ASC')->get();
+        $data = [];
+        foreach($all_gadai as $gadai){
+            $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
+            // $current = Carbon::now();
+            // $current = $current->subDay(1);
+            $current = Carbon::parse($request->dateProblem . ' 00:00:00');
+
+            $tahun_gadai = $tarikh_gadai->year;
+            $bulan_gadai = $tarikh_gadai->month;
+            $hari_gadai = $tarikh_gadai->day;
+
+            $tahun_semasa = $current->year;
+            $bulan_semasa = $current->month;
+            $hari_semasa = $current->day;
+
+            if($hari_semasa >= $hari_gadai){
+                $beza_hari = $hari_semasa - $hari_gadai + 1;
+            }else if($hari_semasa < $hari_gadai){
+                $bulan_semasa = $bulan_semasa - 1;
+                $beza_hari = ($hari_semasa + 30) - $hari_gadai + 1;
+            }
+
+            $extensivemonth_gadai = 0;
+
+            if($beza_hari >= 1 && $beza_hari <= 15){
+                $extensivemonth_gadai = 0.5;
+            }else if($beza_hari >= 16){
+                $extensivemonth_gadai = 1;
+            }else{
+                $extensivemonth_gadai = 0;
+            }
+
+            $beza_tahun = $tahun_semasa - $tahun_gadai;
+
+            $beza_bulan = ($bulan_semasa + ($beza_tahun * 12)) - $bulan_gadai;
+
+            $tempoh_gadai = $beza_bulan + $extensivemonth_gadai;
+
+            $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']);
+
+            Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(
+                'jbg' => $tempoh_gadai,
+                'tempoh' => $tempoh_gadai,
+                'tunggakan' => $upah_semasa
+            ));
+
+            $data_gadai = [
+                'tahun' => $year,
+                'bulan' => $month,
+                'norujukan' => $gadai['norujukan'],
+                'tempoh' => $tempoh_gadai,
+                'nokp' => $gadai['nokp'],
+                'berat' => $gadai['berat'],
+                'nilaimarhun' => $gadai['nilaimarhun'],
+                'pinjaman' => $gadai['pinjaman'],
+                'bakipjm' => $gadai['bakipjm'],
+                'kadarupah' => $gadai['kadarupah'],
+                'tempohblmbyar' => $gadai['tempoh'] - $gadai['tempohbayar'],
+                'upahblmbyar' => $upah_semasa,
+                'lanjutan' => $gadai['lelong_tawarruq']
+            ];
+
+            array_push($data,$data_gadai);
+        }
+
+        if($month == 1){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit1::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 2){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit2::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 3){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit3::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 4){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit4::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 5){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit5::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 6){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit6::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 7){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit7::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 8){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit8::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 9){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit9::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 10){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit10::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 11){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit11::on($cawangan['mysql'])->insert($t);
+            }
+        }elseif($month == 12){
+            foreach (array_chunk($data,1000) as $t)
+            {
+                StokAudit12::on($cawangan['mysql'])->insert($t);
+            }
+        }
+        // foreach($cawangan as $cawangan_mysql){
+            
+        // }
+
+        return 'success';
+    }
+
     public function kiraupahTawarruqStokAudit($tempoh,$tempohbayar,$kadarupah,$bakipinjaman){
 
         $bilang_bln = $tempoh - $tempohbayar;
 
+        if($bilang_bln > 12){
+            $bilang_bln = 12;
+        }
+
         $upahsemasa_raw = $bilang_bln * (($kadarupah/100 )* $bakipinjaman);
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);

app/Http/Controllers/GadaiController.php

@@ -459,6 +459,7 @@ class GadaiController extends Controller
             'duit_masuk' => $request->bayaran,
             'created_at' => $current,
             'bakiharga' => $baki_hargajualan,
+            'nowakil' => (int)$request->nowakil
         ]);
 
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([

app/Http/Controllers/LaporanController.php

@@ -1244,6 +1244,9 @@ class LaporanController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
+        $mulaCarbon = new Carbon($request->mula);
+        $hinggaCarbon = new Carbon($request->hingga);
+        
         /* Start Keuntungan Sebenar Calculation */
         $get_norujukan = Gadai::on($cawangan['mysql'])
         ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
@@ -1278,13 +1281,13 @@ class LaporanController extends Controller
         ->whereIn('trans.norujukan',$get_norujukan)
         ->whereDate('trans.tarikh_bayaran' ,'>=', $request->mula)
         ->whereDate('trans.tarikh_bayaran' ,'<=', $request->hingga)
-        ->whereYear('tarikh_bayaran','=',$current->year)
+        ->whereYear('tarikh_bayaran','=',$mulaCarbon->year)
         ->where('trans.kodcaw',$request->kodcaw)
         ->get()->toArray();
 
         $upahlelong = Lelong::on($cawangan['mysql'])
         ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2022-07-24']])
-        ->whereYear('t_jual','=',$current->year)
+        ->whereYear('t_jual','=',$mulaCarbon->year)
         ->sum('bakiupah');
 
         $sum_keuntungan = ($summation) ? $summation[0]['sum_keun'] : 0;
@@ -1386,10 +1389,15 @@ class LaporanController extends Controller
 
     public function GenerateMonthlyAkrual(Request $request){
 
-        $firstmonth_behind = Carbon::now()->startOfMonth()->subMonthsNoOverflow(1);
+        $tarikh = $request->tahun . '-' . $request->bulan . '-01';
-        $secondmonth_behind = Carbon::now()->startOfMonth()->subMonthsNoOverflow(2);
+        $month_request = $current = new Carbon($tarikh);
+        $firstmonth_behind = clone $month_request;
+        $secondmonth_behind = clone $month_request;
+        $firstmonth_behind_end = clone $month_request;
 
-        $firstmonth_behind_end = Carbon::now()->endOfMonth()->subMonthsNoOverflow(1);
+        $firstmonth_behind->startOfMonth();
+        $secondmonth_behind->startOfMonth()->subMonthsNoOverflow(1);
+        $firstmonth_behind_end->endOfMonth();
 
         $firstmonth_behind_month = $firstmonth_behind->format('m');
         $secondmonth_behind_month = $secondmonth_behind->format('m');
@@ -1408,7 +1416,9 @@ class LaporanController extends Controller
 
             if($secondmonth_behind_year == 2022 && (int)$secondmonth_behind_month > 4){
                 $audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
-            }
+            }else if($secondmonth_behind_year > 2022){
+		$audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
+	    }
 
             $result_audit_stated = $tebuscontroller->StokAuditGenerateTerakru($firstmonth_behind_month,$caw,$firstmonth_behind_year);
 
@@ -1431,13 +1441,16 @@ class LaporanController extends Controller
 
             $available_akru = AkruNet::on($caw['mysql'])
             ->where('bulan',(int)$firstmonth_behind_month)
+	    ->where('tahun',(int)$firstmonth_behind_year)
             ->first();
             
             try{
                 if($available_akru){
                     if($available_akru['jumlah'] !== $accrual_net){
-                        AkruNet::on($caw['mysql'])->where('bulan','=',(int)$firstmonth_behind_month)
+                        AkruNet::on($caw['mysql'])
-                        ->update(['jumlah' => $accrual_net]);
+			->where('bulan','=',(int)$firstmonth_behind_month)
+                        ->where('tahun','=',(int)$firstmonth_behind_year)
+			->update(['jumlah' => $accrual_net]);
                     }
                 }else{
                     $akrunet = new AkruNet();
@@ -1525,4 +1538,91 @@ class LaporanController extends Controller
             return response('notfound');
         }
     }
+
+    public function UpdateDailyImbangDuga(Request $request){
+
+        // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->get();
+        $tarikh = new Carbon($request->tarikh);
+        $firstmonth_behind = clone $tarikh;
+        $secondmonth_behind = clone $tarikh;
+        $firstmonth_behind_end = clone $tarikh;
+
+        $firstmonth_behind->startOfMonth();
+        $secondmonth_behind->startOfMonth()->subMonthsNoOverflow(1);
+        $firstmonth_behind_end->endOfMonth();
+
+        $firstmonth_behind_month = $firstmonth_behind->format('m');
+        $secondmonth_behind_month = $secondmonth_behind->format('m');
+        $firstmonth_behind_year = $firstmonth_behind->format('Y');
+        $secondmonth_behind_year = $secondmonth_behind->format('Y');
+
+        $firstmonth_behind_extension = $firstmonth_behind->toDateString();
+        $firstmonth_behind_extension_end = $firstmonth_behind_end->toDateString();
+
+        $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get();
+
+        $tebuscontroller = new TebusController();
+
+        foreach($cawangan as $index=>$caw){
+            DB::connection($caw['mysql'])->beginTransaction();
+
+            if($secondmonth_behind_year == 2022 && (int)$secondmonth_behind_month > 4){
+                $audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
+            }else if($secondmonth_behind_year > 2022){
+                $audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year);
+            }
+
+            $result_audit_stated = $tebuscontroller->StokAuditGenerateTerakru($firstmonth_behind_month,$caw,$firstmonth_behind_year);
+
+            $totaltunggakan_now = $result_audit_stated->sum('upahblmbyar');
+            $totaltunggakan_past = $audit_backdate->sum('upahblmbyar');
+
+            $request_generate = new \Illuminate\Http\Request([
+                'mula' => $firstmonth_behind_extension,
+                'hingga' => $firstmonth_behind_extension_end,
+                'kodcaw' => $caw['kodcaw'],
+            ]);
+
+            $keuntungan = $this->SemakanKeuntunganLejer($caw['kodcaw'],$request_generate);
+
+            $data_keuntungan = $keuntungan->getContent();
+            $data = json_decode($data_keuntungan, true);
+
+            $calculation = $totaltunggakan_past - $data['keuntungan_semasa'];
+            $accrual_net = $totaltunggakan_now - $calculation;
+
+            $ab = imbangdugabackup::on($caw['mysql'])
+            ->where('tarikh',$request->tarikh)
+            ->first();
+
+            $total_akru = AkruNet::on($caw['mysql'])
+            ->where('bulan','<',(int)$firstmonth_behind_month)
+            ->where('tahun',(int)$firstmonth_behind_year)
+            ->sum('jumlah');
+
+            $totalpend_terakru = ($total_akru + $accrual_net);
+            $totalharta = $ab['tunaiditangan'] + $ab['pembiayaantawarruq'] + $ab['bayaranpendahuluan'] + $ab['pinjamankoop'] + $ab['emaspalsu'] + $ab['pindahkekpkb'] + $ab['penghutangkaki'] + $ab['phapuskira'] + $ab['belian1stop'] + $totaltunggakan_now + $ab['serahan'];
+            $totaltanggungan = $totalpend_terakru + $ab['bds'] + $ab['perubatan'] + $ab['keraian'] + $ab['rugilelong'] + $ab['bakilelong'] + $ab['wtd'] + $ab['untungrugiterkumpul'] + $ab['keun_sebenar'] + $ab['pendahuluan'] + $ab['cajlelong'] + $ab['cajperkhidmatan'] + $ab['cajlelongxtra'] + $ab['upahsimpanxtra'] + $ab['bakilelongxtra'] + $ab['rugilelongxtra'] + $ab['utgterkumpulxtra'] + $ab['jualan1stop'] + $ab['hapuskira'];
+            $tally = (round($totalharta,2) == round($totaltanggungan,2)) ? 1 : 0;
+
+            try{
+                if($ab){
+                    imbangdugabackup::on($caw['mysql'])->where('tarikh',$request->tarikh)->update([
+                        'tagtally' => $tally,
+                        'totalharta' => $totalharta,
+                        'totaltanggungan' => $totaltanggungan,
+                        'keun_penggadai' => $totaltunggakan_now,
+                        'pend_terakru' => ($total_akru + $accrual_net)
+                    ]);
+                }
+            
+                DB::connection($caw['mysql'])->commit();
+            }catch (\Throwable $e){
+                DB::connection($caw['mysql'])->rollBack();
+                return response($e);
+            }
+        }
+
+        return response('succesfully generated!');
+    }
 }

app/Http/Controllers/LelongController.php

@@ -27,7 +27,9 @@ use App\Audit;
 use App\GlDetail;
 use App\Pembeli;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
 
+use Log;
 use DB;
     use Carbon\Carbon;
 
@@ -560,10 +562,17 @@ class LelongController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $lelong = Lelong::on($cawangan['mysql'])
+        if($cawangan['tagarrahnbid'] == 1){
-        ->where('norujukan', '=', $request->norujukan)
+            $lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',[
-        //->where('t_lelong', '<=', $current->toDateString())
+                'norujukan' => $request->norujukan
-        ->first();
+            ])->json();
+            $lelong = ($lelong != null) ? $lelong['lelong'] : [];
+        }else{
+            $lelong = Lelong::on($cawangan['mysql'])
+            ->where('norujukan', '=', $request->norujukan)
+            //->where('t_lelong', '<=', $current->toDateString())
+            ->first();
+        }
 
         if($lelong)
         {
@@ -577,7 +586,7 @@ class LelongController extends Controller
                 $diff = -$diff;
             }
 
-            if($diff <= 0)
+            if($diff <= 1)
             {
                 return response(1);
             }else{
@@ -636,7 +645,13 @@ class LelongController extends Controller
     public function searchBlockLelong(Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
 
-        $lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first();
+        if($cawangan['tagarrahnbid'] == 1)
+        {
+            $lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $request->norujukan])->json();
+            $lelong = ($lelong != null) ? $lelong['lelong'] : [];
+        }else{
+            $lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first();
+        }
 
         return response()->json($lelong);
     }
@@ -780,9 +795,12 @@ class LelongController extends Controller
                     ->where('poskod','=',$customer['poskod'])
                     ->first();
 
+	if($poskod)
             $daerah = Daerah::on('mysql7')
                     ->where('koddaerah','=',$poskod['koddaerah'])
                     ->first();
+	else
+		Log::debug('poskod tiada' . $lel['nokp']);
 
             $negeri = Negeri::on('mysql7')
                 ->where('kodnegeri','=',$poskod['kodnegeri'])
@@ -1016,7 +1034,7 @@ class LelongController extends Controller
             
             $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$index['norujukan'])->update(array(
                 'sttebus' => "L",
-                't_update' => $currentDate
+                't_update' => $request->tarikh
             ));
 
             $lelong_to_be_inserted = new Lelong();
@@ -1096,6 +1114,19 @@ class LelongController extends Controller
             ]);
         }
 
+        if ($request->gldetailcdm != null) {
+            GlDetail::on($cawangan['mysql'])->create([
+                'kodcaw' => $request->kodcaw,
+                'tarikh' => $request->tarikh,
+                'dtacct' => "1000/010",
+                'ktacct' => "1000/020",
+                'descpt' => "SERAHAN LELONG CDM, " . $request->tarikh,
+                'amaun' => $request->gldetailcdm,
+                'teller' => "LELONG ONLINE",
+                'serahan' => $request->gldetailcdm,
+            ]);
+        }
+
         return response()->json("success");
     }
 

app/Http/Controllers/TebusController.php

@@ -543,6 +543,7 @@ class TebusController extends Controller
                 'duit_masuk' => $harga_tebus,
                 'created_at' => $current,
                 'bakiharga' => $baki_hargajualan,
+                'nowakil' => (int)$request->nowakil
             ]);
         }
 
@@ -1731,7 +1732,7 @@ class TebusController extends Controller
 
         $upahlelong = Lelong::on($cawangan['mysql'])
         ->where([['t_jual','<=',$request->tarikh],['t_jual','>','2022-07-24']])
-        ->whereYear('t_jual','=',$current->year)
+        ->whereYear('t_jual','=',$tarikhyear->year)
         ->sum('bakiupah');
 
 
@@ -2026,6 +2027,11 @@ class TebusController extends Controller
         if($year_generate == 2022 && $intmonth_sebelum > 4)
         {
             $result_audit_backdate = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate);
+        }else if($year_generate > 2022 && $intmonth_sekarang == 1){
+            $previousYear = Carbon::now()->subYears(1);
+            $result_audit_backdate = $this->StokAuditGenerateTerakru('12',$cawangan,$previousYear->year);
+        }else{
+            $result_audit_backdate = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate);
         }
 
         $get_norujukan = Gadai::on($cawangan['mysql'])
@@ -2060,26 +2066,36 @@ class TebusController extends Controller
 
         $total = $sum_keun_tebus + $sum_keun_ansuran;
 
-        $calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan;
+        if(!$determine_past->isToday()){
+            $calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan;
         
-        if($calculate_month > 1){
+            if($calculate_month > 1){
-            return 'ERR_MONTH_SEBELUM';
+                return 'ERR_MONTH_SEBELUM';
-        }else if($calculate_month == 1){
+            }else if($calculate_month == 1){
-            $jumlahakru = AkruNet::on($cawangan['mysql'])
+                $jumlahakru = AkruNet::on($cawangan['mysql'])
-            ->sum('jumlah');
+                ->sum('jumlah');
-        }else if($calculate_month < 0){
+            }else if($calculate_month < 0){
-            $jumlahakru = AkruNet::on($cawangan['mysql'])
+                $jumlahakru = AkruNet::on($cawangan['mysql'])
-            ->where('bulan','<=',$intmonth_sekarang)
+                ->where('bulan','<=',$intmonth_sekarang)
-            ->sum('jumlah');
+                ->sum('jumlah');
+    
+                return response()->json($jumlahakru);
+            }else if($calculate_month == 0)
+            {
+                $jumlahakru = AkruNet::on($cawangan['mysql'])
+                ->where('bulan','<',$intmonth_sekarang)
+                ->sum('jumlah');
+            }
+        }else{
+            $calculate_month = 0;
 
-            return response()->json($jumlahakru);
-        }else if($calculate_month == 0)
-        {
             $jumlahakru = AkruNet::on($cawangan['mysql'])
             ->where('bulan','<',$intmonth_sekarang)
+            ->where('tahun', $current->year)
             ->sum('jumlah');
         }
 
+
         if($determine_past->isToday())
         {
             $audit_now = Gadai::on($cawangan['mysql'])
@@ -2105,6 +2121,7 @@ class TebusController extends Controller
             if($calculate_month <= 1){ 
                 $available_akru = AkruNet::on($cawangan['mysql'])
                 ->where('bulan', (int)$month_sekarang)
+                ->where('tahun', $current->year)
                 ->get()->toArray();
                 
                 if(sizeof($available_akru) == 0)
@@ -2118,7 +2135,7 @@ class TebusController extends Controller
                 }else{
                     if($available_akru[0]['jumlah'] !== ($accrual_net - $total))
                     {
-                        AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)
+                        AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)->where('tahun',$current->year)
                         ->update(['jumlah' => ($accrual_net - $total)]);
                     }
                     

app/Http/Controllers/TransactionOnlineController.php

@@ -292,10 +292,17 @@ class TransactionOnlineController extends Controller
                 }
             }
 
-            $akanlelong = Gadai::on($cawangan['mysql'])
+            if($cawangan['tagarrahnbid'] == 1){
-            ->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic],['hargajual','=', 0]])
+                $akanlelong = Gadai::on($cawangan['mysql'])
-            ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+                ->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic]])
-            ->get()->toArray();
+                ->get()->toArray();
+            }
+            else{
+                $akanlelong = Gadai::on($cawangan['mysql'])
+                ->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic]])
+                ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+                ->get()->toArray();
+            }
 
             if(sizeof($akanlelong) != 0){
                 foreach($akanlelong as $lelong)

app/Transaction.php

@@ -14,7 +14,7 @@ class Transaction extends Model
      * @var array
      */
     protected $fillable = [
-      'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at','bakiharga'
+      'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at','bakiharga','nowakil'
     ];
 
     /**

routes/web.php

@@ -567,6 +567,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('keluar/lelong/tawarruq',['uses'=>'LelongController@keluarLelongTawarruq']);
 
     $router->get('backup/stok/audit',['uses'=>'BackupStokAuditController@backupStokAudit']);
+    $router->get('backup/stok/audit/problem',['uses'=>'BackupStokAuditController@backupStokAuditProblem']);
     $router->get('stokaudit/backdate',['uses'=>'BackupStokAuditController@LaporanAuditBackdate']);
 });
 
@@ -654,6 +655,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->get('getTunaiPaginate/{kodcaw}',['uses' => 'AdminPageController@TunaiPaginateforAdmin']);
     $router->get('getPetiBesiPaginate/{kodcaw}',['uses' => 'AdminPageController@PetiBesiPaginateforAdmin']);
     $router->get('GetTunaiByTarikh/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunai']);
+    $router->get('GetTunaiByTarikhSebelum/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunaiSebelum']);
     $router->get('getAddTunaiDateKodlaluan/{kodcaw}/',['uses' =>'AdminPageController@getAddTunaiDateKodlaluan']);
     $router->get('AdvansurSearchByTarikh/{kodcaw}',['uses'=>'AdminPageController@SenaraiAdvansurTarikh']);
     $router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']);
@@ -745,6 +747,12 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->get('laporan/akrual/generateDaily',['uses'=>'LaporanController@GenerateDailyAkrual']);
     $router->get('laporan/akrual/generateMonthly',['uses'=>'LaporanController@GenerateMonthlyAkrual']);
     $router->get('laporan/akrual/insertImbangDuga',['uses'=>'LaporanController@InsertDailyImbangDuga']);
+    $router->get('laporan/akrual/UntungRugiTerkumpul/{kodcaw}',['uses' => 'AdminPageController@calculationUntungTerkumpulAkru']);
+    $router->get('laporan/akrual/updateImbangDuga',['uses'=>'LaporanController@UpdateDailyImbangDuga']);
+
+    $router->get('laporan/online',['uses'=>'AdminPageController@LaporanOnline']);
+    $router->get('laporan/tuntutbaki',['uses'=>'AdminPageController@LaporanTuntutBaki']);
+
 });
 
 $router->group(['prefix'=>'lelong'], function () use ($router){