From 229f319d17a12cb9bb88cd0e80ed563eb67321c5 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Sun, 17 Apr 2022 11:24:13 +0800
Subject: [PATCH] fix

---
 app/Http/Controllers/AdminPageController.php  | 85 +++++++++++--------
 .../TransactionOnlineController.php           | 33 +++++++
 app/Pengesahan.php                            |  2 +-
 app/Permohonan.php                            |  2 +-
 app/Status.php                                |  2 +-
 routes/web.php                                |  4 +-
 6 files changed, 86 insertions(+), 42 deletions(-)

diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 6589287..637344c 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -1838,12 +1838,26 @@ class AdminPageController extends Controller
         $current_day = sprintf("%02d", $current->day);
 
         try {
+
+                $transaksipermohonan = Permohonan::whereYear('tarikh_permohonan','=', $current->year)->where('kodcaw',$kodcaw)->orderBy('mohonid','desc')->first();
+                $mohonid = 0;
+
+                if($transaksipermohonan)
+                {
+                        $mohonid = $transaksipermohonan['mohonid'] + 1;
+                }else{
+                        $mohonid = 1;
+                }
+
+                $transbaru = sprintf("%04d",$mohonid);
+
                 $permohonan = new Permohonan;
                 $pengesahan = new Pengesahan;
                 $status = new Status;
 
-                $nopermohonan = 'AR' . strtoupper($kodcaw) . $curent_year . $curent_month . $current_day . '-000' .rand(1,9);
+                $nopermohonan = 'AR' . strtoupper($kodcaw) . $curent_year . $curent_month . $current_day . '-' . $transbaru;
                 
+                $permohonan->mohonid = $mohonid;
                 $permohonan->kodcaw = $kodcaw;
                 $permohonan->jenismohon = $request->jenismohon;
                 $permohonan->baki_petibesi = $request->bakipetibesi;
@@ -1853,13 +1867,12 @@ class AdminPageController extends Controller
                 $permohonan->outstandingsemasa = $request->outstanding;
                 $permohonan->nopermohonan = $nopermohonan;
                 $permohonan->save();
-
             
-                $pengesahan->mohonid = $permohonan->id;
+                $pengesahan->nopermohonan = $permohonan->nopermohonan;
                 $pengesahan->kodcaw = $kodcaw;
                 $pengesahan->save();
                 
-                $status->mohonid = $permohonan->id;
+                $status->nopermohonan = $permohonan->nopermohonan;
                 $status->statusid = 1;
                 $status->tarikhmasa = $timeloni->toDateTimeString();
                 $status->save();
@@ -1875,7 +1888,7 @@ class AdminPageController extends Controller
     {
         if($kodcaw === 'admin')
         {
-                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
+                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
                 ->where('tagterima',1)
                 ->orWhere('tagoperasi','=',2)
                 ->orWhere('tagakaun','=',2)
@@ -1886,7 +1899,7 @@ class AdminPageController extends Controller
                 ->orderBy('tarikh_permohonan','desc')->paginate(5);
 
         }else{
-                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
+                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
                 ->where('pengesahan.kodcaw', $kodcaw)
                 ->where('tagterima',1)
                 ->orWhere('tagoperasi','=',2)
@@ -1907,7 +1920,7 @@ class AdminPageController extends Controller
         
         if($kodcaw === 'admin')
         {
-                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
+                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
                 ->where('tagterima',0)
                 ->where('tagoperasi','!=',2)
                 ->where('tagakaun','!=',2)
@@ -1922,7 +1935,7 @@ class AdminPageController extends Controller
                 ->orderBy('tarikh_permohonan','desc')->paginate(5);
 
         }else{
-                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
+                $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
                 ->where('pengesahan.kodcaw', $kodcaw)
                 ->where('tagterima',0)
                 ->where('tagoperasi','!=',2)
@@ -1944,10 +1957,10 @@ class AdminPageController extends Controller
     public function GetPermohonanById($kodcaw,$mohonid)
     {
         $permohonanstatus = [];
-        $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
-        ->where([['permohonan.kodcaw', $kodcaw],['permohonan.mohonid',$mohonid]])->first()->toArray();
+        $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
+        ->where([['permohonan.kodcaw', $kodcaw],['permohonan.nopermohonan',$mohonid]])->first()->toArray();
         
-        $status = Status::where('mohonid',$mohonid)->get()->toArray();
+        $status = Status::where('nopermohonan',$mohonid)->get()->toArray();
 
         array_push($listpermohonan,(["status" => $status]));
 
@@ -1958,9 +1971,9 @@ class AdminPageController extends Controller
     {
         $statusarray = [];
         $statusdetails = [];
-        $status = Status::join('pengesahan', 'status.mohonid', '=', 'pengesahan.mohonid')
-                ->join('permohonan', 'status.mohonid', '=', 'permohonan.mohonid')
-                ->where('status.mohonid',$mohonid)->get()->toArray();
+        $status = Status::join('pengesahan', 'status.nopermohonan', '=', 'pengesahan.nopermohonan')
+                ->join('permohonan', 'status.nopermohonan', '=', 'permohonan.nopermohonan')
+                ->where('status.nopermohonan',$mohonid)->get()->toArray();
 
         foreach($status as $index=>$stat)
         {
@@ -2001,12 +2014,12 @@ class AdminPageController extends Controller
 
                 if($request->kelulusan == 'Lulus')
                 {
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 2;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
 
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagoperasi',0]])
                         ->update(array(
                                 'tagoperasi' => 1,
                                 'nama_operasi' => $request->namaoperasi,
@@ -2015,12 +2028,12 @@ class AdminPageController extends Controller
 
                 }else{
 
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 7;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
 
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagoperasi',0]])
                         ->update(array(
                                 'tagoperasi' => 2,
                                 'komen_batal' => $request->komen,
@@ -2048,12 +2061,12 @@ class AdminPageController extends Controller
 
                 if($request->kelulusan == 'Lulus')
                 {
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 3;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
 
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',0]])
                         ->update(array(
                                 'tagakaun' => 1,
                                 'nama_akaun' => $request->namaakaun,
@@ -2062,12 +2075,12 @@ class AdminPageController extends Controller
 
                 }else
                 {
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 7;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
 
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',0]])
                         ->update(array(
                                 'tagakaun' => 2,
                                 'komen_batal' => $request->komen,
@@ -2089,7 +2102,7 @@ class AdminPageController extends Controller
         $timeloni = Carbon::now();
 
         try{
-                $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',1]])
+                $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',1]])
                 ->update(array(
                         'tagprint' => 1,
                         'nama_print' => $request->namaprint,
@@ -2112,7 +2125,7 @@ class AdminPageController extends Controller
 
                 if($request->kelulusan == 'Lulus')
                 {
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 4;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
@@ -2123,24 +2136,24 @@ class AdminPageController extends Controller
                         $ar_files->tarikhmasa = $timeloni->toDateTimeString();
                         $ar_files->save();
                         
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]])
                         ->update(array(
                                 'tagpb' => 1,
                                 'files_id' => $ar_files->id
                         ));
 
-                        $permohonan = Permohonan::where('mohonid',$request->mohonid)
+                        $permohonan = Permohonan::where('nopermohonan',$request->mohonid)
                         ->update(array(
                                 'tarikh_diluluskan' => $timeloni->toDateTimeString(),
                                 'jumlah_diluluskan' => $request->amaun_lulus
                         ));
                 }else{
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 7;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
 
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]])
                         ->update(array(
                                 'tagpb' => 2,
                                 'komen_batal' => $request->komen
@@ -2164,12 +2177,12 @@ class AdminPageController extends Controller
 
                 if($request->kelulusan == 'Lulus')
                 {
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 5;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
 
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagdeposit',0]])
                         ->update(array(
                                 'tagdeposit' => 1,
                                 'tarikh_bankin' => $timeloni->toDateString(),
@@ -2179,12 +2192,12 @@ class AdminPageController extends Controller
                                 'nama_cit' => $request->namacit
                         ));
                 }else{
-                        $status->mohonid = $request->mohonid;
+                        $status->nopermohonan = $request->mohonid;
                         $status->statusid = 7;
                         $status->tarikhmasa = $timeloni->toDateTimeString();
                         $status->save();
 
-                        $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]])
+                        $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagdeposit',0]])
                         ->update(array(
                                 'tagdeposit' => 2,
                                 'komen_batal' => $request->komen
@@ -2206,12 +2219,12 @@ class AdminPageController extends Controller
 
         try{
 
-                $status->mohonid = $request->mohonid;
+                $status->nopermohonan = $request->mohonid;
                 $status->statusid = 6;
                 $status->tarikhmasa = $timeloni->toDateTimeString();
                 $status->save();
 
-                $pengesahan = Permohonan::where([['mohonid',$request->mohonid],['tagterima',0]])
+                $pengesahan = Permohonan::where([['nopermohonan',$request->mohonid],['tagterima',0]])
                 ->update(array(
                         'tagterima' => 1,
                         'tarikh_terima' => $timeloni->toDateString(),
@@ -2233,7 +2246,7 @@ class AdminPageController extends Controller
 
         try{
 
-                $status->mohonid = $request->mohonid;
+                $status->nopermohonan = $request->mohonid;
                 $status->statusid = 8;
                 $status->tarikhmasa = $timeloni->toDateTimeString();
                 $status->save();
@@ -2252,7 +2265,7 @@ class AdminPageController extends Controller
                 $ar_files2->tarikhmasa = $timeloni->toDateTimeString();
                 $ar_files2->save();
 
-                $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagcit',0]])
+                $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagcit',0]])
                 ->update(array(
                         'tagcit' => 1,
                         'resit_cit' => $request->resitcit,
diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php
index cea278e..abb448b 100644
--- a/app/Http/Controllers/TransactionOnlineController.php
+++ b/app/Http/Controllers/TransactionOnlineController.php
@@ -267,4 +267,37 @@ class TransactionOnlineController extends Controller
 
         return response()->json($transaction,200);
     }
+    
+    public function CustomerInfo(Request $request){
+
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $gadai_all = [];
+        $akanlelongarray = [];
+
+
+        foreach($cawangan_all as $index=>$cawangan){
+            $gadai = Gadai::on($cawangan['mysql'])
+            ->where([['sttebus','=',''],['nokp','=',$request->ic]])
+            ->orderBy('t_gadai','desc')
+            ->get()->toArray();
+            if(sizeof($gadai) != 0){
+                $gadai_all += $gadai;
+            }
+
+            $akanlelong = Gadai::on($cawangan['mysql'])
+            ->where([['sttebus','=', ''],['nokp','=',$request->ic],['hargajual','=', 0]])
+            ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+            ->get()->toArray();
+
+            if(sizeof($akanlelong) != 0){
+                $akanlelongarray += $akanlelong;
+            }
+        }
+
+        return response()->json(
+            array(
+                'gadai' => $gadai_all,
+                'lelong' => $akanlelongarray
+            ),200);
+    }
 }
diff --git a/app/Pengesahan.php b/app/Pengesahan.php
index e373016..e66fd9a 100644
--- a/app/Pengesahan.php
+++ b/app/Pengesahan.php
@@ -26,7 +26,7 @@ class Pengesahan extends Model
         'noresit',
         'tarikh_bankin',
         'kodcaw',
-        'mohonid',
+        'nopermohonan',
         'tagoperasi',
         'tagakaun',
         'tagpb',
diff --git a/app/Permohonan.php b/app/Permohonan.php
index 9071841..3503c13 100644
--- a/app/Permohonan.php
+++ b/app/Permohonan.php
@@ -9,7 +9,7 @@ class Permohonan extends Model
     protected $table = 'permohonan';
     public $timestamps = false;
     protected $connection = 'mysql7';
-
+    
     /**
      * The attributes that are mass assignable.
      *
diff --git a/app/Status.php b/app/Status.php
index bb5422b..8dade2e 100644
--- a/app/Status.php
+++ b/app/Status.php
@@ -17,7 +17,7 @@ class Status extends Model
      */
     protected $fillable = [
         'recno',
-        'mohonid',
+        'nopermohonan',
         'statusid',
         'tarikhmasa'
     ];
diff --git a/routes/web.php b/routes/web.php
index 5771b1f..5adea38 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -630,6 +630,7 @@ $router->group(['prefix'=>'portal'], function () use ($router){
     $router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']);
     $router->get('transaksipelanggan/upah',['uses'=>'TransactionController@TransaksiUpah']);
     $router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']);
+    $router->get('customer/info',['uses'=>'TransactionOnlineController@CustomerInfo']);
 });
 
 $router->group(['prefix'=>'admin'], function () use ($router){
@@ -684,7 +685,6 @@ $router->group(['prefix'=>'admin'], function () use ($router){
 
     $router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']);
 
-<<<<<<< Updated upstream
     $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']);
     $router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']);
     $router->get('permohonan/rekod/{kodcaw}',['uses'=>'AdminPageController@GetRekodPermohonanCawangan']);
@@ -701,8 +701,6 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);
 
     
-=======
->>>>>>> Stashed changes
 });
 
 $router->group(['prefix'=>'kelantanpay'], function () use ($router){