Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!128

app/Http/Controllers/GadaiController.php

@@ -2885,42 +2885,83 @@ class GadaiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
-        $transaksi_data = TransaksiKeuntungan::on('mysql7')
+        // $arraylejer = array();
-            ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-            ->where('kodcaw',$kodcaw)
-            ->pluck('norujukan');
-        
-        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
-            ->where([['sttebus',''],['hargajualan','<>','null']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']])
-            ->pluck('norujukan');
-
-        $transaksi = TransaksiKeuntungan::on('mysql7')
-            ->whereIn('norujukan',$gadaiData)
-            ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-            ->sum('bayaran_pembiayaan');
-
 
         // $transaksi_data = TransaksiKeuntungan::on('mysql7')
-        //             // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+        //     ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //             ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        //     ->where('kodcaw',$kodcaw)
-        //             ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+        //     ->pluck('norujukan');
-        //             ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //             ->sum('bayaran_pembiayaan');
-        //             // ->get();
         
-        // dd($transaksi_data);
+        // $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
-        // $transaksi = 0;
+        //     ->where([['sttebus',''],['hargajualan','<>','null']])
-        // if($transaksi_data){
+        //     ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']])
-        //     foreach($transaksi_data as $index=>$transaksiData){
+        //     ->pluck('norujukan');
-        //         $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first();
-        //         if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->mula && $gadaiData['hargajualan'] != null))){
-        //             $transaksi += $transaksiData['bayaran_pembiayaan'];
-        //         }
-        //     }
-        // }
 
-        return response($transaksi);
+        // $transaksi = TransaksiKeuntungan::on('mysql7')
+        //     ->whereIn('norujukan',$gadaiData)
+        //     ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+        //     ->sum('bayaran_pembiayaan');
+
+        $from = date($request->mula);
+        $to = date($request->hingga);
+
+        $transaksi_data = TransaksiKeuntungan::on('mysql7')
+                            // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                            ->whereDate('tarikh_bayaran','<=', $request->hingga)
+                            ->whereDate('tarikh_bayaran','>=', $request->mula)
+                            ->where('kodcaw',$kodcaw)
+                            ->pluck('norujukan');
+
+        $transaksi_kredit_gadai =  Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
+                            ->where([['sttebus',''],['hargajualan','<>','null']])
+                            ->pluck('norujukan');
+
+        $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
+            ->whereIn('norujukan',$transaksi_kredit_gadai)
+            ->whereDate('tarikh_bayaran','<=', $request->hingga)
+            ->whereDate('tarikh_bayaran','>=', $request->mula)
+            // ->whereBetween('tarikh_bayaran',[$from,$to])
+            ->sum('bayaran_pembiayaan');
+
+        // $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
+        //                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        //                     ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+        //                     ->sum('bayaran_pembiayaan');
+
+
+        $tebus = Gadai::on($cawangan['mysql'])
+                    ->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan')
+                    ->join('tebus as t','gadai.norujukan','=','t.norujukan')
+                    ->where('gadai.sttebus','T')
+                    ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]])
+                    ->groupBy('gadai.norujukan')
+                    ->get();
+
+        $arraytebus = array();
+
+        foreach($tebus as $index => $t)
+        {
+            if($t['hargajualan'] != $t['bakihargajualan'])
+            {
+                array_push($arraytebus,$t['norujukan']);
+            }
+        }
+
+        // dd($arraytebus);
+
+        $transaksi_debit = 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')
+                            ->where('trans.norujukan',$arraytebus)
+                            ->sum('bayaran_pembiayaan');
+
+        $arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit];
+        
+        return response($arraylejer);
     }
 
     public function LaporanAuditAktif($kodcaw,Request $request)
@@ -2929,7 +2970,9 @@ class GadaiController extends Controller
 
         $audit = Gadai::on($cawangan['mysql'])
             ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
+            ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->orderBy('t_gadai', 'ASC')
+            ->orderBy('sirig', 'ASC');
 
         $rekodaudit = $audit->get();
         $totalrekod = $audit->sum('pinjaman');
@@ -2947,7 +2990,9 @@ class GadaiController extends Controller
 
         $audit = Gadai::on($cawangan['mysql'])
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->orderBy('t_gadai', 'ASC')
+            ->orderBy('sirig', 'ASC');
 
         $rekodaudit = $audit->get();
         $totalrekod = $audit->sum('pinjaman');

app/Http/Controllers/HargaEmasController.php

@@ -106,4 +106,17 @@ class HargaEmasController extends Controller
         }
         return response()->json($hargaemas);
     }
+
+    public function laporanhargaemas(Request $request)
+    {
+        $rekod = HistoryEmasSandaran::on('mysql7')
+                ->where('t_efektif','>=',$request->mula)
+                ->where('t_efektif','<=',$request->hingga)
+                ->orderBy('t_efektif','desc')
+                ->orderBy('m_efektif','desc')
+                ->get();
+
+        return response()->json($rekod);
+    }
+
 }

app/Http/Controllers/LaporanController.php

@@ -19,8 +19,11 @@ use App\Denominasi;
 use App\HapusKira;
 use App\GlCode;
 use App\GlDetail;
+use App\Audit;
 use Carbon\Carbon;
 
+use DateTime;
+
 class LaporanController extends Controller
 {
     public function laporanHarian(Request $request){
@@ -244,7 +247,7 @@ class LaporanController extends Controller
         $upahsimpankaunter = $keuntungan_kaunter + $upahtebus + $upahlelong + $upahansurKaunter + $total_keuntunganbukanansuran_kaunter;
         $keuntungansebenarkaunter = $total_keuntunganansuran_kaunter;
 
-        $upahsimpanonline = $upahtebus + $upahlelong + $upahansurOnline;
+        $upahsimpanonline = $upahansurOnline;
         $keuntungansebenaronline = $total_keuntunganansuran_online + $total_keuntunganbukanansuran_online;
 
         $total_keuntungan_kaunter = floatval($upahsimpankaunter) + floatval($keuntungansebenarkaunter);
@@ -259,6 +262,10 @@ class LaporanController extends Controller
                 ->where('tebus.t_tebus','=',$request->tarikh)
                 ->get();
 
+        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','=',$request->tarikh)
+                ->sum('pinjaman');
+
         $totalpenebusan = 0;
 
         foreach($tebus as $index1=>$teb)
@@ -271,6 +278,8 @@ class LaporanController extends Controller
             }
         }
 
+        //Lelongan Pembiayaan
+        $totalpenebusan += $pembiayaanlelong;
 
         //b
         $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->where('pinjaman','>',0)->count();
@@ -910,4 +919,48 @@ class LaporanController extends Controller
         return response()->json($arrayxtra);
     }
 
+    public function LaporanAuditTrail(Request $request)
+    {
+        $atarray = array();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $audittrail = Audit::on('mysql7')
+                        ->where('kodcaw','=',$request->kodcaw)
+                        ->whereDate('created_at','=',$request->tarikh)
+                        ->get();
+
+        foreach($audittrail as $index=>$at)
+        {
+            $datetime = new DateTime($at['created_at']);
+            
+            $tarikh = $datetime->format('n/j/Y');
+            $masa = $datetime->format('H:i');
+
+            $atnewdata = json_decode($at['new_data'],true);
+            $atolddata = json_decode($at['old_data'],true);
+
+            $nokp = Gadai::on($cawangan['mysql'])->where('norujukan',$at['norujukan'])->pluck('nokp');
+
+            array_push($atarray,[
+                'tarikh' => $tarikh,
+                'masa' => $masa,
+                'users' => $at['users'],
+                'pelulus' => isset($atnewdata['namapelulus']) ? $atnewdata['namapelulus'] : '-',
+                'actions' => $at['actions'],
+                'norujukan' => $at['norujukan'],
+                'kodcaw' => $at['kodcaw'],
+                'oldpinjaman' => isset($atolddata['pinjaman']) ? $atolddata['pinjaman'] : 0,
+                'oldupah' => isset($atolddata['bakiupah']) ? $atolddata['bakiupah'] : 0,
+                'newpinjaman' => isset($atnewdata['pinjaman']) ? $atnewdata['pinjaman'] : 0,
+                'newupah' => isset($atnewdata['bakiupah']) ? $atnewdata['bakiupah'] : 0,
+                'nota' => isset($atnewdata['nota']) ? $atnewdata['nota'] : '-',
+                'nokp' => isset($nokp[0]) ? $nokp[0] : '-',
+                'norujukanasal' => isset($atnewdata['norujukan']) ? $atnewdata['norujukan'] : '-' 
+            ]);
+        }
+
+        return response()->json($atarray);
+    }
+
 }

app/Http/Controllers/LelongController.php

@@ -234,26 +234,42 @@ class LelongController extends Controller
 
     public function BakiLelongCalculationLejer($kodcaw,Request $request)
     {
+        $cas_lelong = 0;
+        $jumlah_lelong = 0;
+        $baki_lelong = 0;
+        $rugi_lelong = 0;
 
         $tarikhbaru = $request->mula;
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         
         $bakilelong = Lelong::on($cawangan['mysql'])
-        ->where('trkhtuntut','>=',$request->mula)
+            ->where('trkhtuntut','>=',$request->mula)
-        ->where('trkhtuntut','<=',$request->hingga)
+            ->where('trkhtuntut','<=',$request->hingga)
-        ->where('baki','>=',0)
+            ->where('baki','>=',0)
-        ->sum('baki');
+            ->sum('baki');
                 
         $rugilelong = Lelong::on($cawangan['mysql'])
             ->where('trkhtuntut','>=',$request->mula)
             ->where('trkhtuntut','<=',$request->hingga)
             ->where('baki','<',0)
             ->sum('baki');
+
+        $data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])->get();
             
-        $rugitotal = $rugilelong;  
+        foreach($data_lelong as $index=>$lelong){
+            if($lelong['baki'] >= 0){
+                $cas_lelong += $lelong['cajlelong'];
+                $jumlah_lelong += $lelong['hargajual'];
+                $baki_lelong += $lelong['baki'];
+            }elseif($lelong['baki'] < 0){
+                $cas_lelong += $lelong['cajlelong'];
+                $jumlah_lelong += $lelong['hargajual'];
+                $rugi_lelong += abs($lelong['baki']);
+            }
+        }
         
-        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
+        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong, 'baki' => $baki_lelong, 'rugi' => $rugi_lelong, 'jumlahlelong' => $jumlah_lelong, 'caslelong' => $cas_lelong];
 
         return response()->json($arraylelong,200);
     }
@@ -479,6 +495,19 @@ class LelongController extends Controller
         return response()->json($cajlelong,200);
     }
 
+    public function cajlelongcalculationLejer($kodcaw,Request $request)
+    {
+        
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $cajlelong = Lelong::on($cawangan['mysql'])
+        ->whereNotNull('t_jual')
+        ->where([['t_jual','<=', $request->mula],['t_jual','>=',$request->hingga]])
+        ->sum('cajlelong');
+
+        return response()->json($cajlelong,200);
+    }
+
     public function cajperkhidmatancalculation($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

app/Http/Controllers/PendahuluanSerahanController.php

@@ -94,7 +94,7 @@ class PendahuluanSerahanController extends Controller
                 ->where('pendahuluan','>',0)
                 ->orderby('tarikh','desc')
                 ->get();
-       }else{
+       }else if($request->jenis == 'serahan'){
 
             $gldetail=GlDetail::on($cawangan['mysql'])
                 ->where('kodcaw','=',$kodcaw)
@@ -103,6 +103,14 @@ class PendahuluanSerahanController extends Controller
                 ->where('serahan','>',0)
                 ->orderby('tarikh','desc')
                 ->get();
+       }else{
+            $gldetail=GlDetail::on($cawangan['mysql'])
+                ->where('kodcaw','=',$kodcaw)
+                ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                ->where('descpt','LIKE','SERAHAN BAYAR ONLINE%')
+                ->where('serahan','>',0)
+                ->orderby('tarikh','desc')
+                ->get();
        }
       
  

app/Http/Controllers/TransactionController.php

@@ -6,6 +6,7 @@ use App\Transaction;
 use App\TransaksiKeuntungan;
 use App\Pengguna;
 use App\Cawangan;
+use App\Advansur;
 
 use Illuminate\Http\Request;
 
@@ -118,4 +119,15 @@ class TransactionController extends Controller
 
         return response()->json($transaction);
     }
+
+    public function TransaksiUpah(Request $request){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('norujukan','=',$request->norujukan)
+        ->orderBy('tarikh','desc')
+        ->get();
+
+        return response()->json($listadvansur,200);
+    }
 }

app/Http/Controllers/TransactionOnlineController.php

@@ -223,4 +223,17 @@ class TransactionOnlineController extends Controller
 
         return response()->json($transactionOnline);
     }
+
+    public function searchSAGOnline(Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $transaction_online = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','PAID'],['update_status',0],['tarikh',$current->toDateString()]])->first();
+        if($transaction_online){
+            return response()->json(true);
+        }else{
+            return response()->json(false);
+        }
+    }
 }

app/Http/Controllers/VaultController.php

@@ -667,6 +667,21 @@ class VaultController extends Controller
       return response()->json($arraypend);
    }
 
+   public function laporanPetiBesiRange($kodcaw,Request $request)
+   {
+     $current = Carbon::now();
+     $current = new Carbon();    
+  
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $vault=Vault::on($cawangan['mysql'])
+              ->where('kodcaw','=',$kodcaw)
+              ->where('tarikh','>=', $request->mula)
+              ->where('tarikh','<=', $request->hingga)
+              ->orderby('tarikh','desc')->get();
+  
+      return response()->json($vault);
+   }
+
 
 
 }

routes/web.php

@@ -156,6 +156,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('harga_emas/create',['uses'=>'HargaEmasController@createhargaemas']);
     $router->put('harga_emas/delete/{id}', ['uses' => 'HargaEmasController@deletehargaemas']);
     $router->get('harga_emas/rekod/sandaran',['uses'=>'HargaEmasController@rekodEmasSandaran']);
+    $router->get('harga_emas/laporan/sandaran',['uses'=>'HargaEmasController@laporanhargaemas']);
+
 
 
     //Cawangan API
@@ -281,6 +283,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); 
     $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); 
     $router->get('GetTunaiSemalam/{kodcaw}',['uses' =>'TunaiController@getTunaiSemalam']);
+    $router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']); 
+    $router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']); 
+
 
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
@@ -449,6 +454,7 @@ $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBa
     $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); 
     $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); 
     $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); 
+    $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculationLejer']);
 
     // //-- Harta Semasa --//
     $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); 
@@ -576,6 +582,8 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
 $router->group(['prefix'=>'portal'], function () use ($router){
     $router->get('financeMonth',['uses'=>'GadaiController@PembiayaanBulanan']);
     $router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']);
+    $router->get('transaksipelanggan/upah',['uses'=>'TransactionController@TransaksiUpah']);
+    $router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']);
 });