resolve conflict

app/Console/Commands/ResetRoleAsal.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\User;
+use Illuminate\Console\Command;
+
+class ResetRoleAsal extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:roleasal';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Reset Role';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $all_user = User::all();
+        foreach($all_user as $index=>$user_kaunter){
+            $user = User::find($user_kaunter->id);
+            if($user->cawangan != 'operasi'){
+                $user->roles = $user->role_asal;
+                $user->save();
+            }
+        }
+    }
+}

app/Console/Kernel.php

@@ -16,6 +16,7 @@ class Kernel extends ConsoleKernel
         Commands\resetRoleDaily::class,
         Commands\updateJbg::class,
         Commands\updateOnline::class,
+        Commands\ResetRoleAsal::class,
     ];
 
     /**
@@ -28,6 +29,7 @@ class Kernel extends ConsoleKernel
     {
         $schedule->command('reset:dailyrole')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
         $schedule->command('update:jbg')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
+        $schedule->command('reset:roleasal')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
         $schedule->command('update:online')->daily()->timezone('Asia/Kuala_Lumpur')->everyFifteenMinutes();
     }
 

app/Events/NotifikasiKelulusan.php

@@ -11,14 +11,15 @@ class NotifikasiKelulusan implements ShouldBroadcast
 {
   use Dispatchable, InteractsWithSockets, SerializesModels;
 
-  public $norujukan,$kelulusan,$siri,$komen;
+  public $norujukan,$kelulusan,$siri,$komen,$teller;
 
-  public function __construct($norujukan,$kelulusan,$siri,$komen)
+  public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
   {
       $this->norujukan = $norujukan;
       $this->kelulusan = $kelulusan;
       $this->siri = $siri;
       $this->komen = $komen;
+      $this->teller = $teller;
   }
 
   public function broadcastOn()

app/Events/NotifikasiUbahHapus.php

@@ -11,13 +11,14 @@ class NotifikasiUbahHapus implements ShouldBroadcast
 {
   use Dispatchable, InteractsWithSockets, SerializesModels;
 
-  public $norujukan,$kelulusan,$komen;
+  public $norujukan,$kelulusan,$komen,$teller;
 
-  public function __construct($norujukan,$kelulusan,$komen)
+  public function __construct($norujukan,$kelulusan,$komen,$teller)
   {
       $this->norujukan = $norujukan;
       $this->kelulusan = $kelulusan;
       $this->komen = $komen;
+      $this->teller = $teller;
   }
 
   public function broadcastOn()

app/Events/OperasiNotice.php

@@ -11,7 +11,7 @@ class OperasiNotice implements ShouldBroadcast
 {
   use Dispatchable, InteractsWithSockets, SerializesModels;
 
-  public $cawangan,$namateller;
+  public $cawangan,$namakhazanah;
 
   public function __construct($cawangan,$namakhazanah)
   {

app/Http/Controllers/Auth/LoginController.php

@@ -65,21 +65,27 @@ class LoginController extends Controller
             if($auth_user['roles'] == 'teller'){
                 if($auth_user['role_harian'] == 'teller'){
                     $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                    return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url'));
+                    // return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url'));
+                    return redirect()->route('home');
                 }elseif($auth_user['role_harian'] == 'penilai'){
                     $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
                     $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json();
                     $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
-                    return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
+                    // return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
+                    return redirect()->route('home');
+                }else{
+                    return view('not_assign');
                 }
             }
             elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
+                // return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
+                return redirect()->route('home');
             }
-            elseif($auth_user['roles'] == 'operasi'){
+            else{
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
+                // return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
+                return redirect()->route('home');
             }
         }
 

app/Http/Controllers/HomeController.php

@@ -39,12 +39,15 @@ class HomeController extends Controller
                 $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
                 return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
             }
+            else{
+                return view('not_assign');
+            }
         }
         elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
             return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
         }
-        elseif($auth_user['roles'] == 'operasi'){
+        else{
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
             return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
         }

app/Http/Controllers/KakitanganController.php

@@ -22,7 +22,8 @@ class KakitanganController extends Controller
         $auth_user = Auth::user();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $role = Role::get();
-        return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role'));
+        $kakitangan = User::all();
+        return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan'));
     }
 
     public function registerStaff(Request $request){
@@ -89,6 +90,79 @@ class KakitanganController extends Controller
             ));
         }
 
+        // Check teller tak serah baki tunai untuk generate balik
+        
+        $tunaisemalam = Http::get(config('api.url') . '/api/GetTunaiSemalam/'. $auth_user['cawangan'])->json();
+
+        if (sizeof($tunaisemalam) > 0)
+        {
+            foreach($tunaisemalam as $index=>$tunsem){
+
+                $latesttunai = Http::get(config('api.url') . '/api/GetCurrentTunai/'. $auth_user['cawangan'], ['kodlaluan' => $tunsem['kodlaluan']])->json();
+
+                if(sizeof($latesttunai) == 0)
+                {
+                    $alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
+                        'kodcaw' => $tunsem['kodcaw'],
+                        'teller' => $tunsem['kodlaluan'],
+                        'bakiawal' => $tunsem['baki'],
+                        'masuk' => 0.00,
+                        'yuran' => 0.00,
+                        'keluar' => 0.00,
+                        'baki' => $tunsem['baki'],
+                        'tambah' => 0.00,
+                        'kurang' => 0.00
+                    ])->json(); 
+                }
+            }
+        }
+
         return redirect()->route('home');
     }
+
+    public function tukartaraf(Request $request){
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $user = User::find($request->id);
+        $role = Role::get();
+        return view('operasi.tukar_taraf',compact('cawangan_info','api_url','role','user'));
+    }
+
+    public function tukartarafUpdate(Request $request){
+        $user = User::find($request->user_id);
+        if($user->role_harian == null){
+            if($user->role_asal == 'pc'){
+                $user->roles = $request->role;
+                $user->save();
+            }
+        }else{
+            if($user->role_asal == 'pc'){
+                $user->roles = $request->role;
+                $user->role_harian = $request->role;
+                $user->save();
+            }
+        }
+
+        return redirect()->route('daftar.kakitangan');
+    }
+
+    public function tukarcawangan(Request $request){
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $user = User::find($request->id);
+        $role = Role::get();
+        return view('operasi.tukar_cawangan',compact('cawangan_info','api_url','role','user'));
+    }
+
+    public function tukarcawanganUpdate(Request $request){
+        $user = User::find($request->user_id);
+        $user->cawangan = $request->cawangan;
+        $user->roles = $request->role;
+        $user->role_harian = $request->role;
+        $user->save();
+
+        return redirect()->route('daftar.kakitangan');
+    }
 }

app/Http/Controllers/OperasiController.php

@@ -88,24 +88,26 @@ class OperasiController extends Controller
         {
             $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
                 'sahkan' => 1,
+                'namaoperasi' => $request->namaoperasi,
                 'siri' => $request->siri
             ])->json();
 
             if($updatelulus)
             {
-                event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
+                event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$request->teller));
             }
         }
         else 
         {
             $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
                 'sahkan' => 2,
+                'namaoperasi' => $request->namaoperasi,
                 'siri' => $request->siri
             ])->json();
 
             if($updatelulus)
             {
-                event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
+                event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
             }
         }
      
@@ -185,4 +187,12 @@ class OperasiController extends Controller
         
         return view('operasi.hargaemas',compact('cawangan_info','api_url','harga_emas'));
     }
+
+    public function margin(){
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $margin_pembiayaan = Http::get(config('api.url') . '/api/maxpinjaman')->json();
+        return view('operasi.margin_pembiayaan',compact('cawangan_info','api_url','margin_pembiayaan'));
+    }
 }

app/Http/Controllers/PenebusanController.php

@@ -93,15 +93,15 @@ class PenebusanController extends Controller
         // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
         $bakiakhir = $baki + $request->bayaran;
         
-        // Add on 20210411
+        // // Add on 20210411
-        $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $request->kodcaw.'/'.$request->norujukan)->json();
+        // $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $request->kodcaw.'/'.$request->norujukan)->json();
-        $tempohGadai=$gadaidetail[0]['tempoh'];
+        // $tempohGadai=$gadaidetail[0]['tempoh'];
-        $upah12bulan=$gadaidetail[0]['upah12'];
+        // $upah12bulan=$gadaidetail[0]['upah12'];
-        $bakiPinjaman=$gadaidetail[0]['bakipjm'];
+        // $bakiPinjaman=$gadaidetail[0]['bakipjm'];
-        $teller=$gadaidetail[0]['teller'];
+        // $teller=$gadaidetail[0]['teller'];
-        $upah6bulan= $upah12bulan/2;                   //add on 202104011
+        // $upah6bulan= $upah12bulan/2;                   //add on 202104011
-        $tempoh_bayar=$gadaidetail[0]['tempohbayar']; //add on 202104011
+        // $tempoh_bayar=$gadaidetail[0]['tempohbayar']; //add on 202104011
-        $tarikhgadai=$gadaidetail[0]['t_gadai'];//Add on 20210411
+        // $tarikhgadai=$gadaidetail[0]['t_gadai'];//Add on 20210411
 
         //masuk dalam tunai aliran
         $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$request->kodcaw, [
@@ -111,210 +111,6 @@ class PenebusanController extends Controller
             'bakiakhir' => $bakiakhir
         ]);
 
-        //************** KIRAAN LEJER AM BERMULA ****************
-
-
-        $Bayaran_Pendahuluan='1000/019';
-        $GL_CODE='1000/010';
-        $KOD_PINJAMAN='1000/017';
-        $KOD_UT='1000/211';
-        $KOD_US='2000/007';
-        $Untung_Semasa='5000/017';
-        $KOD_ANS='5000/511';
-
-        
-
-        $jumlahBayaran_ansuran=Http::get(config('api.url').'/api/ansuranByrKaunter/'.$request->kodcaw.'/'.$request->norujukan)->json();
-        $jumlah_telah_bayaransuran=$jumlahBayaran_ansuran[0]['cash_in'];
-        $jumbayaran=$request->bayaran;
-
-        $Transaksi_keuntungan=Http::get(config('api.url').'/api/transaksi_keuntungan/'.$request->norujukan)->json();
-        $bayaran_keuntungan=$Transaksi_keuntungan[0]['bayaran_keuntungan'];
-        $bayaran_pembiayaan=$Transaksi_keuntungan[0]['bayaran_pembiayaan'];
-        $tarikh_bayaran=$Transaksi_keuntungan[0]['tarikh_bayaran'];
-
-            //tahun gadaian
-        $tahun_gadai=substr($tarikhgadai,0,4);
-        $month_gadai=substr($tarikhgadai, 5,2);
-        // bulan gadaian
-        $year_bayar=substr($tarikh_bayaran, 0, 4);
-        $month_bayar=substr($tarikh_bayaran, 5,2);
-
-
-        $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan)->json();
-        $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
-        $bayaran_latest_pendahuluan=$get_latest_bayarUntung[0]['bayaran_pembiayaan'];
-        
-           $hargajualan=$gadaidetail[0]['hargajualan'];
-
-  
-        
-              //ansuran tawaruq
-         //check sama ada jumlah bayaran melebihi keuntungan semasa..kalau lebih dia akan masuk dalam bayaran pendahuluan...
-         if($jumbayaran<$bayaran_keuntungan)
-          {
-
-            $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $GL_CODE])->json();   
-            
-            $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
-            $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
-            $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
-            $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
-            $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
-            $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-
-            
-            $debit_Tunai=$debit_Tunai+$jumbayaran;
-
-            $hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
-            $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
-        
-            $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
-                'recno'=>$recno_Tunai,
-                'debit'=>$debit_Tunai,
-                'kredit'=>$kredit_Tunai,
-                'hariini'=>$hariIni_Tunai,
-               'kelmarin'=>$kelmarin_Tunai,
-            
-            ]);    
-        
-
-
-            $get_lejerBP=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $Bayaran_Pendahuluan])->json();
-
-            $hariini_BP=$get_lejerBP[0]['hariini'];
-            $kelmarin_BP=$get_lejerBP[0]['kelmarin'];
-            $jumlah_BP=$get_lejerBP[0]['jumlah'];
-            $debit_BP= $get_lejerBP[0]['debit'];
-            $recno_BP= $get_lejerBP[0]['recno'];
-
-            $kredit_BP= $get_lejerBP[0]['kredit'];
-
-            $kredit_BP=$kredit_BP+$bayaran_latest_pendahuluan;
-
-            $hariini_BP=$debit_BP-$kredit_BP;
-            $kelmarin_BP=$jumlah_BP-$hariini_BP;
-
-            $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
-            'recno'=>$recno_BP,
-            'debit'=>$debit_BP,
-            'kredit'=>$kredit_BP,
-            'hariini'=>$hariini_BP,
-            'kelmarin' =>$kelmarin_BP,     
-
-        ]);
-
-
-            $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan)->json();
-            $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
-
-            $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
-
-            $hariini_untung=$get_lejer_Untung[0]['hariini'];
-            $kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
-            $jumlah_untung=$get_lejer_Untung[0]['jumlah'];
-            $debit_untung=$get_lejer_Untung [0]['debit'];
-            $recno_untung=$get_lejer_Untung [0]['recno'];
-            $kredit_untung=$get_lejer_Untung [0]['kredit'];
-
-
-            $kredit_untung=$kredit_untung+$bayaran_latest_untung;
-            
-            $hariini_untung=$debit_untung-$kredit_untung;
-            $kelmarin_untung=$jumlah_untung-$hariini_untung;
-
-            $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
-                'recno'=>$recno_untung,
-                'debit'=>$debit_untung,
-                'kredit'=>$kredit_untung,
-                'hariini'=>$hariini_untung,
-                'kelmarin' =>$kelmarin_untung,     
-
-        ]);
-
-        }
-            
-        else
-        {
-            $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $GL_CODE])->json();   
-
-            $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
-            $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
-            $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
-            $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
-            $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
-            $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-
-            $debit_Tunai=$debit_Tunai+$jumbayaran;
- 
-
-            $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
-            $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
-
-            $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
-            'recno'=>$recno_Tunai,
-            'debit'=>$debit_Tunai,
-            'kredit'=>$kredit_Tunai,
-            'hariini'=>$hariini_Tunai,
-            'kelmarin'=>$kelmarin_Tunai,
-
-            ]);
-
-  
-            $get_lejerBP=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=> $Bayaran_Pendahuluan])->json();
-
-            $hariini_BP=$get_lejerBP[0]['hariini'];
-            $kelmarin_BP=$get_lejerBP[0]['kelmarin'];
-            $jumlah_BP=$get_lejerBP[0]['jumlah'];
-            $debit_BP= $get_lejerBP[0]['debit'];
-            $recno_BP= $get_lejerBP[0]['recno'];
-            $kredit_BP= $get_lejerBP[0]['kredit'];
-
-
-            $kredit_BP=$kredit_BP+$bayaran_latest_pendahuluan;
-            $hariini_BP=$debit_BP-$kredit_BP;
-            $kelmarin_BP=$jumlah_BP-$hariini_BP;
-
-            $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
-            'recno'=>$recno_BP,
-            'debit'=>$debit_BP,
-            'kredit'=>$kredit_BP,
-            'hariini'=>$hariini_BP,
-            'kelmarin' =>$kelmarin_BP,     
-
-        ]);
-
-            $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan)->json();
-            $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
-            $get_lejer_Untung=Http::get(config('api.url').'/api/getGlejer/'.$request->kodcaw,['glcode'=>$Untung_Semasa])->json();
-
-            $hariini_untung=$get_lejer_Untung[0]['hariini'];
-            $kelmarin_untung=$get_lejer_Untung[0]['kelmarin'];
-            $jumlah_untung=$get_lejer_Untung[0]['jumlah'];
-            $debit_untung=$get_lejer_Untung [0]['debit'];
-            $recno_untung=$get_lejer_Untung [0]['recno'];
-            $kredit_untung=$get_lejer_Untung [0]['kredit']; 
-
-            $kredit_untung=$kredit_untung+$bayaran_latest_untung;
-            $hariini_untung=$debit_untung-$kredit_untung;
-            $kelmarin_untung=$jumlah_untung-$hariini_untung;
-
-            $updateGlejer_Untung=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$request->kodcaw,[
-            'recno'=>$recno_untung,
-            'debit'=>$debit_untung,
-            'kredit'=>$kredit_untung,
-            'hariini'=>$hariini_untung,
-            'kelmarin' =>$kelmarin_untung,     
-
-            ]);
-
-            }
-
-        // end kiraan lejer am untuk tawaruq
-
-
-        //***************KIRAAN LEJER AM TAMAT*******************************
-
         return response()->json($updateTunai,200);
     }
 

app/Http/Controllers/UserController.php

@@ -18,6 +18,10 @@ class UserController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('user.index',compact('cawangan_info','api_url'));
+        if($auth_user->roles == 'teller' || $auth_user->roles == 'ppc' || $auth_user->roles == 'pc'){
+            return view('user.index',compact('cawangan_info','api_url','auth_user'));
+        }else{
+            return view('user.index_operasi',compact('cawangan_info','api_url','auth_user'));
+        }
     }
 }

composer.json

@@ -27,6 +27,7 @@
         "yajra/laravel-datatables-oracle": "^9.11"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.6",
         "facade/ignition": "^2.0",
         "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",

resources/views/customers/index.blade.php

@@ -175,7 +175,7 @@
                         <div class="modal-footer">
                             <input type="text" hidden name="idtype"  value="nokp">
                             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-                            <input type="submit" name="submit" class="btn btn-primary" value="Terima">
+                            <input type="submit" name="submit" class="btn btn-primary" id="terima_ic" value="Terima">
                         </div>
                         </form>
                     </div>
@@ -296,7 +296,7 @@
                         <div class="modal-footer">
                             <input type="text" hidden name="idtype" value="passport">
                             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-                            <input type="submit" name="submit" class="btn btn-primary" value="Terima">
+                            <input type="submit" name="submit" class="btn btn-primary" id="terima_passport" value="Terima">
                         </div>
                         </form>
                     </div>
@@ -436,6 +436,7 @@
     });
 
     function verifycustomer(){
+        $("#terima_ic").prop('disabled', true);
         var customername = $('#name').val();
         var customeralamat = $('#alamat').val();
         var customerposkod = $('#poskod').val();
@@ -443,6 +444,7 @@
         var customerphone_alternate = $('#alternate_phone').val();
         var age = $('#age').val();
         if(age < 18){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -452,6 +454,7 @@
             return false;
         }
         if(customername == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -461,6 +464,7 @@
             return false;
         }
         if(customeralamat == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -470,6 +474,7 @@
             return false;
         }
         if(customerposkod == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -479,6 +484,7 @@
             return false;
         }else{
             if(customerposkod.length != 5){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -488,6 +494,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerposkod) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -499,6 +506,7 @@
             }
         }
         if(customerphone == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -508,6 +516,7 @@
             return false;
         }else{
             if((customerphone.length < 9 || customerphone.length >= 12)){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -517,6 +526,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -529,6 +539,7 @@
         }
         if(customerphone_alternate != ''){
             if(customerphone_alternate.length < 8 && customerphone_alternate.length > 12){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -538,6 +549,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone_alternate) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -552,6 +564,7 @@
     }
 
     function verifycustomerpassport(){
+        $("#terima_passport").prop('disabled', true);
         var customername = $('#passport_name').val();
         var customeralamat = $('#passport_alamat').val();
         var customerposkod = $('#passport_poskod').val();
@@ -561,6 +574,7 @@
         var age = $('#passport_age').val();
 
         if(age < 18){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -570,6 +584,7 @@
             return false;
         }
         if(customername == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -579,6 +594,7 @@
             return false;
         }
         if(tarikh_lahir == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -588,6 +604,7 @@
             return false;
         }
         if(customeralamat == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -597,6 +614,7 @@
             return false;
         }
         if(customerposkod == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -606,6 +624,7 @@
             return false;
         }else{
             if(customerposkod.length != 5){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -615,6 +634,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerposkod) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -626,6 +646,7 @@
             }
         }
         if(customerphone == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -635,6 +656,7 @@
             return false;
         }else{
             if(customerphone.length <= 9 || customerphone.length >= 12){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -644,6 +666,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -656,6 +679,7 @@
         }
         if(customerphone_alternate != ''){
             if(customerphone_alternate.length <= 8 && customerphone_alternate.length >= 12){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -665,6 +689,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone_alternate) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',

resources/views/customers/info.blade.php

@@ -92,7 +92,7 @@
                             <b>No Telefon</b>
                         </div>
                         <div class="col-md-8">
-                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] }}">
+                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : 'NIL' }}">
                         </div>
                     </div>
 
@@ -248,7 +248,7 @@
                                     No KP
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] }}" class='form-control'>
+                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -264,7 +264,7 @@
                                     No Telefon 1
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] }}" class='form-control'>
+                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : 'NIL' }}" class='form-control'>
                                     <span id="errortelefon" style="color:red;"></span>
                                 </div>
                             </div>
@@ -273,7 +273,7 @@
                                     No Telefon 2
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] }}" class='form-control'>
+                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : 'NIL' }}" class='form-control'>
                                     <span id="errortelefon2" style="color:red;"></span>
                                 </div>
                             </div>
@@ -310,7 +310,7 @@
                                     Alamat
                                 </div>
                                 <div class='col-md-8'>
-                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] }}</textarea>
+                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] ? $customer_info['alamat1'] : 'NIL' }}</textarea>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -318,7 +318,7 @@
                                     Poskod
                                 </div>
                                 <div class='col-md-8'>
-                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] }}" class='form-control'>
+                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] ? $customer_info['poskod'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -328,9 +328,12 @@
                                 <div class='col-md-8'>
                                     @php
                                         $poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
+                                        if(empty($poskod)){
+                                            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+                                        }
                                         $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
                                     @endphp
-                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah['namadaerah'] }}" class='form-control'>
+                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah ? $daerah['namadaerah'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -341,7 +344,7 @@
                                     @php
                                         $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
                                     @endphp
-                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri['negeri'] }}" class='form-control'>
+                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri ? $negeri['negeri'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -430,7 +433,7 @@
                     event.preventDefault();
                     return false;
                 }else{
-                    if(Number(data['unit_komuditi']) < 10000){
+                    if(Number(data['unit_komuditi']) < 50000){
                         Swal.fire({
                             icon: 'error',
                             title: 'Unit Komoditi Berbaki Minumum',
@@ -561,7 +564,7 @@
                                 channel.bind('my-kelulusan', function(data) {
                                 
 
-                                    if(data.norujukan == norujukan && data.siri == siricreated)
+                                    if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                     {
                                         if(data.kelulusan == 'lulus')
                                         {
@@ -699,7 +702,7 @@
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                 gadai_detail['t_gadai'],
-                                gadai_detail['t_matang1'],
+                                gadai_detail['t_matang'],
                                 'RM '+ formatter.format(gadai_detail['bakihargajualan']),
                                 'RM '+formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
@@ -1203,10 +1206,12 @@
                                         encrypted: true
                                         });
 
+                        let teller = "{{ Auth::user()->name }}";
+
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {
 
-                            if(data.norujukan == norujukan)
+                            if(data.norujukan == norujukan && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1416,10 +1421,12 @@
                                         encrypted: true
                                         });
 
+                    let teller = "{{ Auth::user()->name }}";
+
                     var channel = pusher.subscribe('notice-ubahhapus');
                     channel.bind('my-ubahhapus', function(data) {
 
-                        if(data.norujukan == ubahid)
+                        if(data.norujukan == ubahid && data.teller == teller)
                         {
                             if(data.kelulusan == 'lulus')
                             {
@@ -1565,6 +1572,8 @@
                     }
                 }); 
 
+                let teller = "{{ Auth::user()->name }}";
+
                 var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
                                         cluster: 'ap1',
                                         encrypted: true
@@ -1573,7 +1582,7 @@
                 var channel = pusher.subscribe('notice-ubahhapus');
                 channel.bind('my-ubahhapus', function(data) {
 
-                    if(data.norujukan == id)
+                    if(data.norujukan == id && data.teller == teller)
                     {
                         if(data.kelulusan == 'lulus')
                         {
@@ -1583,7 +1592,6 @@
                                     title: 'Telah Disahkan'
                             }).then(function(){
 
-                                let teller = "{{ Auth::user()->name }}";
 
                                 if($("input[name='options']:checked").val() == 'belum_tebus'){
                                     $.ajax({

resources/views/gadaian/edit.blade.php

@@ -553,11 +553,6 @@
                     'nota' : nota
                 },
                 success:function(data){
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Berjaya!',
-                        text: 'Ubah Marhun Berjaya'
-                    });
                     getMarhun(norujukedit);
                     $('#editMarhunModal').modal('hide');
                 }
@@ -647,11 +642,6 @@
                                     'nilai_marhun' : nilai_marhun
                                 },
                                 success:function(data){
-                                    Swal.fire({
-                                        icon: 'success',
-                                        title: 'Berjaya!',
-                                        text: 'Tambah Marhun Berjaya'
-                                    });
                                     $('#nota').val('').trigger("change");
                                     $('#marhun').val(0);
                                     $('#karat').val(0);
@@ -748,11 +738,6 @@
                                 'nilai_marhun' : nilai_marhun
                             },
                             success:function(data){
-                                Swal.fire({
-                                    icon: 'success',
-                                    title: 'Berjaya!',
-                                    text: 'Tambah Marhun Berjaya'
-                                });
                                 $('#nota').val('').trigger("change");
                                 $('#marhun').val(0);
                                 $('#karat').val(0);
@@ -939,7 +924,7 @@
                             channel.bind('my-kelulusan', function(data) {
                             
 
-                                if(data.norujukan == norujukan && data.siri == siricreated)
+                                if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                 {
                                     if(data.kelulusan == 'lulus')
                                     {
@@ -1046,7 +1031,7 @@
 
                                 // console.log(message);
 
-                                if(data.norujukan == norujukan && data.siri == siricreated)
+                                if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                 {
                                     if(data.kelulusan == 'lulus')
                                     {

resources/views/gadaian/index.blade.php

@@ -509,11 +509,6 @@
                                 success:function(data){
                                     $("#tambah_marhun").prop('disabled', false);
                                     $("#terima_marhun").prop('disabled', false);
-                                    Swal.fire({
-                                        icon: 'success',
-                                        title: 'Berjaya!',
-                                        text: 'Tambah Marhun Berjaya'
-                                    });
                                     $('#nota').val('').trigger("change");
                                     $('#marhun').val(0);
                                     $('#karat').val(0);
@@ -625,11 +620,6 @@
                             success:function(data){
                                 $("#tambah_marhun").prop('disabled', false);
                                 $("#terima_marhun").prop('disabled', false);
-                                Swal.fire({
-                                    icon: 'success',
-                                    title: 'Berjaya!',
-                                    text: 'Tambah Marhun Berjaya'
-                                });
                                 $('#nota').val('').trigger("change");
                                 $('#marhun').val(0);
                                 $('#karat').val(0);
@@ -851,9 +841,8 @@
 
                                         var channel = pusher.subscribe('notice-kelulusan');
                                         channel.bind('my-kelulusan', function(data) {
-                                        
 
-                                            if(data.norujukan == norujukan && data.siri == siricreated)
+                                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                             {
                                                 if(data.kelulusan == 'lulus')
                                                 {
@@ -969,9 +958,7 @@
                                         channel.bind('my-kelulusan', function(data) {
                                         // let message = JSON.stringify(data);
 
-                                            // console.log(message);
+                                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
-
-                                            if(data.norujukan == norujukan && data.siri == siricreated)
                                             {
                                                 if(data.kelulusan == 'lulus')
                                                 {
@@ -1131,11 +1118,6 @@
                     'nota' : nota
                 },
                 success:function(data){
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Berjaya!',
-                        text: 'Ubah Marhun Berjaya'
-                    });
                     getMarhun(norujukedit);
                     $('#editMarhunModal').modal('hide');
                 }

resources/views/homepage/admin/home.blade.php

@@ -0,0 +1,23 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center  mt-5">
+        <div class="col-md-8">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="#">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Admin</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Kakitangan</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/homepage/akaun/home.blade.php

@@ -0,0 +1,23 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center  mt-5">
+        <div class="col-md-8">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="#">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Akaun</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <h1>AKAUN</h1>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/homepage/audit/home.blade.php

@@ -0,0 +1,23 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center  mt-5">
+        <div class="col-md-8">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="#">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Audit</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <h1>AUDIT</h1>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/homepage/operasi/home.blade.php

@@ -15,7 +15,7 @@
 
                 <div class="card-body text-center">
                     <a href="{{ route('operasi.kelulusan') }}" class="btn btn-info btn-lg">Kelulusan</a>
-                    <a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Daftar Kakitangan</a>
+                    <a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Kakitangan</a>
                     <a href="{{ route('parameter') }}" class="btn btn-info btn-lg">Parameter</a>
                     <a href="{{ route('komuditi') }}" class="btn btn-info btn-lg">Komoditi</a>
                 </div>

resources/views/khazanah/alirantunai.blade.php

@@ -20,14 +20,14 @@
           <thead class="thead-dark">
               <tr>
                   <th>Bil</th>
-                  <th>Tarikh</th>
+                  <th width="60%">Tarikh</th>
-                  <th>Baki Awal Tunai</th>
+                  <th>C/F</th>
                   <th>Keluar</th>
                   <th>Masuk</th>
-                  <th>Baki EOD</th>
-                  <th>Baki Akhir Tunai</th>
                   <th>Pendahuluan</th>
                   <th>Serahan</th>
+                  <th>Panjar</th>
+                  <th>B/F</th>
               </tr>
           </thead>
           <tbody>
@@ -35,14 +35,14 @@
               @foreach ($petibesi as $tunai)
                 <tr>
                 <td>{{ $loop->iteration }}</td>
-                <td>{{ $tunai['tarikh'] }}</td>
+                <td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh']))  }}</td>
-                <td>{{ $tunai['bakiawal'] }}</td>
+                <td>{{ number_format($tunai['bakiawal'],2) }}</td>
-                <td>{{ $tunai['keluar'] }}</td>
+                <td>{{ number_format($tunai['keluar'],2) }}</td>
-                <td>{{ $tunai['masuk'] }}</td>
+                <td>{{ number_format($tunai['masuk'],2) }}</td>
-                <td>{{ $tunai['bakieod'] }}</td>
+                <td>{{ number_format($tunai['pendahuluan'],2) }}</td>
-                <td>{{ $tunai['bakiakhir'] }}</td>
+                <td>{{ number_format($tunai['serahan'],2) }}</td>
-                <td>{{ $tunai['pendahuluan'] }}</td>
+                <td>{{ number_format($tunai['totpanjar'],2) }}</td>
-                <td>{{ $tunai['serahan'] }}</td>
+                <td>{{ number_format($tunai['bakiakhir'],2) }}</td>
                 </tr>
               @endforeach
           </tbody>
@@ -206,7 +206,7 @@
                                           <div class="inner">
                                             <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
                       
-                                            <p>Tebusan</p>
+                                            <p>Penebusan</p>
                                           </div>
                                           <div class="icon">
                                           </div>
@@ -244,19 +244,19 @@
                                               <tr>
                                                   <th>Bil</th>
                                                   <th>Tarikh</th>
-                                                  <th>Baki Awal Tunai</th>
+                                                  <th>C/F</th>
-                                                  <th>Tunai Diterima</th>
+                                                  <th>Pendahuluan</th>
-                                                  <th>Tunai Dikeluar</th>
+                                                  <th>Serahan</th>
                                                   <th>Gadaian</th>
-                                                  <th>Tebusan</th>
+                                                  <th>Penebusan</th>
-                                                  <th>Baki Akhir Tunai</th>
+                                                  <th>B/F</th>
                                               </tr>
                                           </thead>
                                           <tbody>
                                               @foreach ($arraytunai[$index1] as $tunai)
                                                 <tr>
                                                 <td>{{ $loop->iteration }}</td>
-                                                <td>{{ $tunai['tarikh'] }}</td>
+                                                <td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh']))  }}</td>
                                                 <td>{{ number_format($tunai['bakiawal'],2) }}</td>
                                                 <td>{{ number_format($tunai['tambah'],2) }}</td>
                                                 <td>{{ number_format($tunai['kurang'],2) }}</td>
@@ -287,7 +287,7 @@
                                             @foreach($arrayaddtunai[$index1] as $at)
                                             <tr>
                                               <td> {{ $loop->iteration }} </td>
-                                              <td> {{ $at['tarikh'] }} </td>
+                                              <td> {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} </td>
                                               <td> {{ number_format($at['tambah'],2) }} </td>
                                               <td> {{ number_format($at['kurang'],2) }} </td>
                                               <td> {{ $at['nota'] }} </td>
@@ -348,7 +348,7 @@
                                             @foreach($arraytuntutbaki[$index1] as $tb)
                                             <tr>
                                             <td> {{ $loop->iteration }} </td>
-                                            <td> {{ $tb['tarikh'] }} </td>
+                                            <td> {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} </td>
                                             <td> {{ number_format($tb['cajlelong'],2) }} </td>
                                             <td> {{ number_format($tb['jumlah'],2) }} </td>
                                             <td> @php if($tb['jenis'] == 'T'){
@@ -396,7 +396,7 @@
                                         <div class="inner">
                                           <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
                     
-                                          <p>Tunai Diterima</p>
+                                          <p>Pendahuluan</p>
                                         </div>
                                         <div class="icon">
                                         </div>
@@ -409,7 +409,7 @@
                                           <div class="inner">
                                             <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
                       
-                                            <p>Tunai Dikeluar</p>
+                                            <p>Serahan</p>
                                           </div>
                                           <div class="icon">
                                           </div>
@@ -450,7 +450,7 @@
                                           <div class="inner">
                                             <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
                       
-                                            <p>Tebusan</p>
+                                            <p>Penebusan</p>
                                           </div>
                                           <div class="icon">
                                           </div>
@@ -489,19 +489,19 @@
                                               <tr>
                                                   <th>Bil</th>
                                                   <th>Tarikh</th>
-                                                  <th>Baki Awal Tunai</th>
+                                                  <th>C/F</th>
-                                                  <th>Tunai Diterima</th>
+                                                  <th>Pendahuluan</th>
-                                                  <th>Tunai Dikeluar</th>
+                                                  <th>Serahan</th>
                                                   <th>Gadaian</th>
-                                                  <th>Tebusan</th>
+                                                  <th>Penebusan</th>
-                                                  <th>Baki Akhir Tunai</th>
+                                                  <th>B/F</th>
                                               </tr>
                                           </thead>
                                           <tbody>
                                               @foreach ($arraytunai[$index1] as $tunai)
                                                 <tr>
                                                 <td>{{ $loop->iteration }}</td>
-                                                <td>{{ $tunai['tarikh'] }}</td>
+                                                <td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }}</td>
                                                 <td>{{ number_format($tunai['bakiawal'],2) }}</td>
                                                 <td>{{ number_format($tunai['tambah'],2) }}</td>
                                                 <td>{{ number_format($tunai['kurang'],2) }}</td>
@@ -532,7 +532,7 @@
                                             @foreach($arrayaddtunai[$index1] as $at)
                                             <tr>
                                               <td> {{ $loop->iteration }} </td>
-                                              <td> {{ $at['tarikh'] }} </td>
+                                              <td> {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} </td>
                                               <td> {{ number_format($at['tambah'],2) }} </td>
                                               <td> {{ number_format($at['kurang'],2) }} </td>
                                               <td> {{ $at['nota'] }} </td>
@@ -594,7 +594,7 @@
                                             @foreach($arraytuntutbaki[$index1] as $tb)
                                             <tr>
                                             <td> {{ $loop->iteration }} </td>
-                                            <td> {{ $tb['tarikh'] }} </td>
+                                            <td> {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} </td>
                                             <td> {{ number_format($tb['cajlelong'],2) }} </td>
                                             <td> {{ number_format($tb['jumlah'],2) }} </td>
                                             <td> @php if($tb['jenis'] == 'T'){

resources/views/khazanah/info.blade.php

@@ -324,9 +324,12 @@
                                 <div class='col-md-8'>
                                     @php
                                         $poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
+                                        if(empty($poskod)){
+                                            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+                                        }
                                         $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
                                     @endphp
-                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah['namadaerah'] }}" class='form-control'>
+                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah ? $daerah['namadaerah'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -337,7 +340,7 @@
                                     @php
                                         $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
                                     @endphp
-                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri['negeri'] }}" class='form-control'>
+                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri ? $negeri['negeri'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -556,7 +559,7 @@
 
     function checkAGH()
     {
-
+        $('AGHModalEdit').hide();
     }
 
     function checktuntutbaki(e)
@@ -688,23 +691,35 @@
         }
     }
 
-    function ulangcetakagh()
+    function ulangcetakagh(e)
     {
-        if($("input[name='options']:checked").val() == 'belum_tebus'){
+        var komen2 = $(e).data('komen2');
+        var noruj = $(e).data('histid');
+
+        if(komen2 !== null)
+        {
+            if($("input[name='options']:checked").val() == 'belum_tebus'){
             let histid = $('input[name="belum"]:checked').val();
-            if(histid == null){
+                if(histid == null){
-                Swal.fire({
+                    Swal.fire({
-                    icon: 'error',
+                        icon: 'error',
-                    title: 'Amaran',
+                        title: 'Amaran',
-                    text: 'Sila pilih salah satu SAG'
+                        text: 'Sila pilih salah satu SAG'
-                });
+                    });
-            }else{
+                }else{
-                let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
+                    let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
-                urlroute = urlroute.replace(':id', histid);
+                    urlroute = urlroute.replace(':id', histid);
-                window.open(urlroute, '_blank');
+                    window.open(urlroute, '_blank');
-                swal.close();
+                    swal.close();
+                }
             }
+        }else{
+            $('#AGHModalEdit').modal('show');
+            $('#norujukanhiddenedit').val(noruj);
+            swal.close(); 
         }
+
+        return;
     }
 
     function saghilangfunc()
@@ -724,6 +739,7 @@
                     data:{ "norujukan" : histid,"kodcaw" : kodcaw},
                     success:function(data)
                     {
+
                         var count = Object.keys(data).length;
 
                         if(count > 0)
@@ -735,7 +751,7 @@
                                 showConfirmButton: false,
                                 html:   "<br>" +
                                         '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh()">' + 'Ulang Cetak' + '</button>',
+                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
                                 icon: 'error',
                                 title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
                             });
@@ -791,6 +807,24 @@
         
     });
 
+    $('#negeriaghedit').change(function(){
+
+        var daerahselect = document.getElementById("daerahaghedit");
+
+        $('#daerahaghedit').attr('disabled', false);
+        $(daerahagh).empty();
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/daerahkodnegeri/' + this.value,
+            success:function(data){
+                $.each(data, function( index, daerah ){
+                    addOptionEdit(daerah.koddaerah,daerah.namadaerah);
+                });
+            }
+        });
+
+    });
+
     function addOption(textopt,valueopt) {
 
         optionText = textopt;
@@ -799,6 +833,14 @@
         $('#daerahagh').append(`<option value='${optionText}'>${optionValue}</option>`);
     }
 
+    function addOptionEdit(textopt,valueopt) {
+
+        optionText = textopt;
+        optionValue = valueopt;
+
+        $('#daerahaghedit').append(`<option value='${optionText}'>${optionValue}</option>`);
+    }
+
     
 
     function rekodasal(gadaian){

resources/views/khazanah/kelulusan.blade.php

@@ -264,7 +264,7 @@
     async function updatelulus(e)
     {
         let api = "{{ config('api.url') }}";
-        let kodcaw = " {{ Auth::user()->cawangan }}";
+        let kodcaw = "{{ Auth::user()->cawangan }}";
 
         const { value: katalaluan } = await Swal.fire({
             title: 'Masukkan Katalaluan Semula',
@@ -311,6 +311,7 @@
             allowOutsideClick: false
         })
 
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
         let nm = $(e).closest('tr').children('td:eq(4)').text();
         let ber = $(e).closest('tr').children('td:eq(5)').text();
         let marg = $(e).closest('tr').children('td:eq(6)').text();
@@ -320,6 +321,9 @@
         let norujukan = $(e).data('norujukan');
         let pelulus = $(e).data('pelulus');
         let siri = $(e).data('siri');
+        let namakhazanah = "{{ Auth::user()->name }}";
+
+        teller = String(teller);
 
         $.ajax({
             method:'put',
@@ -329,7 +333,9 @@
                 "norujukan" : norujukan,
                 "pelulus" : pelulus,
                 "siri" : siri,
-                'komen' : komen
+                'komen' : komen,
+                'namakhazanah' : namakhazanah,
+                'teller' : teller
             },
             success:function(data){
                 Swal.fire({
@@ -394,9 +400,13 @@
             allowOutsideClick: false
         })
 
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
         let norujukan = $(e).data('norujukan');
         let pelulus = $(e).data('pelulus');
         let siri = $(e).data('siri');
+        let namakhazanah = "{{ Auth::user()->name }}";
+
+        teller = String(teller);
 
         $.ajax({
             method:'put',
@@ -407,7 +417,10 @@
                 "pelulus" : pelulus,
                 "siri" : siri,
                 "komenkelulusan" : komenkelulusan,
-                "pembatalan" : "batal"
+                "pembatalan" : "batal",
+                'namakhazanah' : namakhazanah,
+                'teller' : teller
+
             },
             success:function(data){
                 Swal.fire({
@@ -467,15 +480,19 @@
 
 
         let norujukan = $(e).data('norujukan');
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
         let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
 
+        teller = String(teller);
+
         $.ajax({
             method:'put',
             url: "{{ route('khazanah.updatekelulusan') }}",
             data: {
                 "_token": "{{ csrf_token() }}",
                 "norujukan" : norujukan,
-                "khazanah" : namakhazanah
+                "khazanah" : namakhazanah,
+                'teller' : teller
             },
             success:function(data){
                 
@@ -543,6 +560,9 @@
 
         let norujukan = $(e).data('norujukan');
         let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
+
+        teller = String(teller);
 
         $.ajax({
             method:'put',
@@ -552,7 +572,9 @@
                 "norujukan" : norujukan,
                 "khazanah" : namakhazanah,
                 "komenubahhapus" : komenkelulusan,
-                "batal" : 'batal'
+                "batal" : 'batal',
+                'teller' : teller
+
             },
             success:function(data){
                 

resources/views/khazanah/khazanahserahan.blade.php

@@ -36,7 +36,7 @@
   <div class="col-2"> </div>
   <div class="col-6">
     <button type="button"  data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button>
-    <input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
+    <input type="button" id="terima_transaksi" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
     <a onclick="triggerbatal();" class="btn btn-danger">Batal</a>
   </div>
 </div>
@@ -338,6 +338,8 @@
 
   function triggersubmit()
   {
+    $("#terima_transaksi").prop('disabled', true);
+    
     $('#form-pendahuluan').trigger('submit');
   }
 

resources/views/khazanah/laporan/datalejer_am.blade.php

@@ -6,7 +6,13 @@
     <div class="row">
         <div class="col-md-12">
             <div class="card">
-                <div class="card-header">{{ __('Data Lejer AM') }}</div>
+              <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                  <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                  <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Lejer Am</li>
+                </ol>
+              </nav>
 
                 <div class="card-body text-center">
                     <div class="row form-group">
@@ -20,8 +26,6 @@
                       @csrf
                     <div class="row">
                       
-
-
                     <div class="col-sm-2">Mula</div>
                      <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1"    autocomplete="off"  aria-describedby="basic-addon1"></div>
                       </div>
@@ -33,7 +37,7 @@
                     <div class="row">
                     <div class="col-sm-1"> </div>   <div class="col-sm-6"></div>
                     <div class="col-sm-3"></div>
-                    <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM"   formaction="{{route('cetak.lejer_am')}}">  
+                    <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formtarget="_blank"  formaction="{{route('cetak.lejer_am')}}">  
                       </div>
                     </div>
 
@@ -51,34 +55,6 @@
 
                       </form>
                     </div><!--end section form-->
-
-
-
-
-                    <br>
-                    <br>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <table class="" id="myTable">
-                                <thead>
-                                    <tr>
-                                        <th>Bil</th>
-                                        <th>Bil Gadaian</th>
-                                        <th>Jumlah Pinjaman (RM)</th>
-                                        <th>Peratusan %</th>
-                                    
-                             
-                                    </tr>
-                                </thead>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-12 text-right">
-                            Bilangan Surat : <span id="bilangan_surat">3</span>
-                            Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>

resources/views/khazanah/laporan/index.blade.php

@@ -35,10 +35,12 @@
                                 <a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pemodal</a>
                             </div>
                              <div class="row">
-                                <a href="{{route('laporan.stokauditbersih')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Bersih </a>
+                                {{-- <a href="{{route('laporan.stokauditbersih')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a> --}}
+                                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a>
                             </div> 
                              <div class="row">
-                                <a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Details</a>
+                                {{-- <a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a> --}}
+                                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a>
                             </div> 
                         </div>
                         <div class="col-3 mx-1">
@@ -61,7 +63,7 @@
                                 <a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pelanggan</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.datalejer_am')}}" class="btn btn-danger btn-lg btn-block mb-3">Lejer Am</a>
+                                <a href="{{ route('laporan.datalejer_am') }}" class="btn btn-dark btn-lg btn-block mb-3">Lejer Am</a>
                             </div>
                             <div class="row">
                                 <a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3">Tuntut Baki</a>

resources/views/khazanah/laporan/petibesi.blade.php

@@ -44,6 +44,12 @@
     var api_url = "<?php echo $api_url ?>";
     var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
 
+    $(document).ready( function () {
+        $('#datetimepicker1').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
+
     var tablecustomers = $('#myTable').DataTable({
         "ordering": false
     });

resources/views/khazanah/panjar.blade.php

@@ -71,6 +71,7 @@
                                             <th>deskripsi</th>
                                             <th>kategori</th>
                                             <th>bayaran</th>
+                                            <th>tindakan</th>
                                         </tr>
                                     </thead>
                                 </table>
@@ -154,21 +155,92 @@
         var counter = 1;
         tablepanjar.clear().draw();
 
+        var today = new Date();
+        var dd = String(today.getDate()).padStart(2, '0');
+        var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
+        var yyyy = today.getFullYear();
+
+        today = yyyy + '-' + mm + '-' + dd;
+
         $.each(data,function(index,panjar){
           
-                    tablepanjar.row.add([
+            if(today === panjar['tarikh'])
+            {
+                tablepanjar.row.add([
                         counter,
                         panjar['tarikh'],
                         panjar['deskripsi'],
                         panjar['kategori'],
-                        panjar['bayaran']
+                        panjar['bayaran'],
+                        '<button onclick="deletepanjar(this);" data-recno="' + panjar['recno'] + '" class="btn btn-danger fas fa-trash-alt"></button>'
                     ]).draw();
-                    counter = counter + 1;
+            }else{
+                tablepanjar.row.add([
+                        counter,
+                        panjar['tarikh'],
+                        panjar['deskripsi'],
+                        panjar['kategori'],
+                        panjar['bayaran'],
+                        '<button data-recno="' + panjar['recno'] + '" class="btn btn-secondary fas fa-trash-alt"></button>'
+                    ]).draw();
+            }
+
+            counter = counter + 1;
+
+                  
            
         });
         
     }
 
+    function deletepanjar(e)
+    {
+        let rec_no = $(e).data('recno');
+
+        Swal.fire({
+            title: 'Adakah anda pasti?',
+            text: "Anda tidak dapat untuk mengembalinya kembali!",
+            icon: 'warning',
+            showCancelButton: true,
+            cancelButtonText: "Batal",   
+            confirmButtonColor: '#3085d6',
+            cancelButtonColor: '#d33',
+            confirmButtonText: 'Teruskan!'
+            }).then((result) => {
+            if (result.isConfirmed) {
+               
+                $.ajax({
+                method: 'post',
+                url: '{{ route("khazanah.deletepanjar") }}',
+                data: {
+                    "_token": "{{ csrf_token() }}",
+                    'recno' : rec_no
+                },
+                success:function(data){
+
+                    if(data === 'berjaya')
+                    {
+                        location.reload();
+
+                    }else{
+                        Swal.fire(
+                            'Tidak Berjaya!',
+                            'Data tidak berjaya dihapuskan.',
+                            'error'
+                        )
+                    }
+
+                }
+                });
+
+
+
+
+               
+            }
+        });
+    }
+
     function caritarikh()
     {
         let mula = $('#mula').val();
@@ -322,7 +394,14 @@ function kiraanpanjar(datakeyin)
 
     function checkformpanjar(formdata)
     {
-       
+        $("#terima_transaksi_keraian").prop('disabled', true);
+        $("#terima_transaksi_selenggara").prop('disabled', true);
+        $("#terima_transaksi_belanjaam").prop('disabled', true);
+        $("#terima_transaksi_perubatan").prop('disabled', true);
+        $("#terima_transaksi_dapur").prop('disabled', true);
+        $("#terima_transaksi_pos").prop('disabled', true);
+        
+
         // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan;
 
         let baucer = $(formdata).find("[name='baucer']").val();
@@ -409,9 +488,18 @@ function kiraanpanjar(datakeyin)
        
         if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true)
         {
+           
+
             return true;
         }else{
             
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
             event.preventDefault();
             return;
         }
@@ -500,6 +588,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
         
     });
 
@@ -531,6 +626,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
     $('#BelanjaamModal').on('hidden.bs.modal', function (e) {
@@ -561,6 +663,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
     $('#PerubatanModal').on('hidden.bs.modal', function (e) {
@@ -591,6 +700,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
 
@@ -622,6 +738,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
     // $('#denominasipanjar').on('hidden.bs.modal', function (e) {

resources/views/khazanah/pendahuluanserahanmain.blade.php

@@ -21,7 +21,7 @@
                 <div class="card-body">
 
                     <div class="mt-3 mx-auto">
-                               
+                     {{-- @php $date = date('yy-m-d'); @endphp --}}
                         <table class='table table-hover table-striped table-bordered' id='table-pendahuluanserahan' style="width: 100%;">
                             <thead class="thead-dark">
                                 <tr>
@@ -29,16 +29,18 @@
                                     <th>Description</th>
                                     <th>Pendahuluan (RM)</th>
                                     <th>Serahan (RM)</th>
+                                    {{-- <th>Tindakan</th> --}}
                                 </tr>
                             </thead>
                             <tbody>
                                 @foreach ($listgldetail as $gldetail)
-                                  <tr>
+                                    <tr>
-                                  <td>{{ $gldetail['tarikh'] }}</td>
+                                        <td>{{ $gldetail['tarikh'] }}</td>
-                                  <td>{{ $gldetail['descpt'] }}</td>
+                                        <td>{{ $gldetail['descpt'] }}</td>
-                                  <td>{{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }}</td>
+                                        <td>{{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }}</td>
-                                  <td>{{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}</td>
+                                        <td>{{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}</td>
-                                  </tr>
+                                       {{-- @if($date === $gldetail['tarikh']) <td class="text-center"><button onclick="deletependser();" class="btn btn-danger fas fa-trash-alt"></button></td>@else<td></td> @endif --}}
+                                    </tr>
                                 @endforeach
                             </tbody>
                         </table>
@@ -110,6 +112,28 @@
 
         });
 
+        function deletependser()
+        {
+            Swal.fire({
+            title: 'Adakah anda pasti?',
+            text: "Anda tidak dapat untuk mengembalinya kembali!",
+            icon: 'warning',
+            showCancelButton: true,
+            cancelButtonText: "Batal",   
+            confirmButtonColor: '#3085d6',
+            cancelButtonColor: '#d33',
+            confirmButtonText: 'Teruskan!'
+            }).then((result) => {
+            if (result.isConfirmed) {
+                Swal.fire(
+                'Deleted!',
+                'Your file has been deleted.',
+                'success'
+                )
+            }
+        });
+        }
+
         function validateformat(evt)
         {
             var charCode = (evt.which) ? evt.which : event.keyCode
@@ -144,6 +168,7 @@
 
         function functerima()
         {
+
             let amaun = $('#amaun').val();
             let keterangan = $('#keterangan').val();
             let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -198,6 +223,9 @@
                 $('#pendahuluanserahanModal').modal('hide');
                 return true;
             }else{
+
+                $("#terima_transaksi").prop('disabled', false);
+
                 event.preventDefault();
                 return false;
             }
@@ -226,6 +254,8 @@
             $('#denominasiHQModal').modal('hide');
             $('#pendahuluanserahanModal').modal('show');
 
+            $("#terima_transaksi").prop('disabled', false);
+
             $('#bundle1').val('');
             $('#totalb1').val(0.00);
             $('#bundle5').val('');
@@ -243,6 +273,8 @@
 
         function terimapost()
         {
+            $("#terima_transaksi").prop('disabled', true);
+
             let amaun = $('#amaundiminta').val();
             let keterangan = $('#keterangan').val();
             let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -298,7 +330,7 @@
 
                             $('#denominasiHQModal').modal('hide');
                             $('#pendahuluanserahanModal').modal('hide');
-
+                            location.reload();
                         });
 
                     }else if(data == 'GAGAL'){
@@ -309,6 +341,7 @@
 
                             $('#denominasiHQModal').modal('hide');
                             $('#pendahuluanserahanModal').modal('hide');
+                            $("#terima_transaksi").prop('disabled', false);
                            
                         });
                     }

resources/views/layouts/app.blade.php

@@ -28,7 +28,7 @@
     <link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
     <link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" />
     <link rel="stylesheet" href="{{ asset('vendor/datepicker/css/bootstrap-datepicker.min.css') }}"/>
-    
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <script src="{{ asset('js/jquery.min.js') }}"></script>
     <script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
     <script src="{{ asset('js/select2.min.js') }}"></script>
@@ -172,7 +172,7 @@
                                 });
                             
                             </script>
-                        @elseif($auth_user['roles'] == 'teller') 
+                        @elseif($auth_user['role_harian'] == 'teller') 
                             <li class="nav-item dropdown" style="margin-right:10px;">
                                 <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                                     <i id="bell" class="fa fa-bell"></i>
@@ -187,7 +187,7 @@
                                 </div>
                             </li>
 
-                            <script>
+                            {{-- <script>
 
                                 // Enable pusher logging - don't include this in production
                                 // Pusher.logToConsole = true;
@@ -228,7 +228,7 @@
                                     $('#bell').css("color", "grey");
                                 });
                             
-                            </script>
+                            </script> --}}
                             
                         @endif
 

resources/views/layouts/app_operasi.blade.php

@@ -28,7 +28,7 @@
     <link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
     <link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" />
     <link rel="stylesheet" href="{{ asset('vendor/datepicker/css/bootstrap-datepicker.min.css') }}"/>
-    
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <script src="{{ asset('js/jquery.min.js') }}"></script>
     <script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
     <script src="{{ asset('js/select2.min.js') }}"></script>

resources/views/lelongan/index.blade.php

@@ -199,6 +199,59 @@
 
     function bayarantuntubaki()
     {
+
+        let norujukan = $('#norujukan').val();
+                    let api = "{{ config('api.url') }}";
+                    let nowakil = 0;
+                    let jenis = '';
+
+                    if($("input[name='radlelong']:checked").val() == 'baki')
+                    {
+                        jenis = 'T';
+                        let mohon = "Tuntut Baki Lelongan";
+                    }else{
+                        jenis = 'B';
+                        let mohon = "Bayar Baki Lelongan";
+                    }
+
+                    
+        let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
+        let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
+        let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
+
+	$.ajax({
+            method: 'put',
+            url: "{{ route('lelong.tuntutbaki') }}",
+            data: { 
+            "_token": "{{ csrf_token() }}",
+            'batchno' : batchno,
+            'jenis' : jenis,
+            'norujukan' : norujukan,
+            'teller' : teller,
+            'bakipjm' : bakipjm,
+            'bakiupah' : bakiupah,
+            'cajlain' : cajlain,
+            'cajlelong' : cajlelong,
+            'jumlah' : jumlah,
+            'nowakil' : nowakil,
+            'hargajual' : hargajual
+            },
+            success:function(data){
+                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+                Swal.fire(
+                        'Berjaya!',
+                        'Tuntut Baki Berjaya',
+                        'success'
+                    ) .then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{  route('customer_info') }}");
+                    })
+            },error: function(xhr, status, error) {
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
+            }
+        });
         const swalWithBootstrapButtons = Swal.mixin({
             customClass: {
                 confirmButton: 'btn btn-success',
@@ -276,11 +329,13 @@
                                             encrypted: true
                                             });
 
+                        let teller = "{{ Auth::user()->name }}";
+                        
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {
 
 
-                            if(data.norujukan == norujukan)
+                            if(data.norujukan == norujukan && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -350,4 +405,4 @@
     }
 
 </script>
-@endsection
+@endsection

resources/views/modal/agh.blade.php

@@ -63,4 +63,69 @@
   </div>
 
 
+    <!-- Modal HistoryBayaran -->
+    <div class="modal fade" id="AGHModalEdit" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title text-center" id="ModalTitle">Surat Akuan Gadaian Hilang</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">  
+            
+            <div class="container">
+              <form name="frmagh" target="_blank" action="{{ route('agh.update') }}" onsubmit="return checkAGH();" method="POST">
+                @csrf
+                <input type="hidden" name="norujukanhidden" id="norujukanhiddenedit"/>
+              <div class="col-12 row">
+                <div class="col-5"><label class="mt-1">Jenis Alasan :</label></div>
+                <div class="col-7">
+                  <select name="alasan" id="alasanedit" class="form-control">
+                    <option value="Simpanan">Simpanan</option>
+                    <option value="Bencana alam">Bencana alam</option>
+                    <option value="Kecurian">Kecurian</option>
+                    <option value="Di Ragut">Di Ragut</option>
+                    <option value="Kes Polis">Kes Polis</option>
+                    <option value="Hilang">Hilang</option>
+                  </select>
+                </div>
+              </div>
+  
+              <div class="col-12 row mt-2">
+                <div class="col-5"><label class="mt-1">Negeri :</label></div>
+                <div class="col-7">
+                  <select name="negeriagh" id="negeriaghedit" class="form-control">
+                    @foreach($negeri as $neg)
+                    <option value="{{ $neg['kodnegeri'] }}">{{ $neg['negeri'] }}</option>
+                    @endforeach
+                  </select>
+                </div>
+              </div>
+  
+  
+              <div class="col-12 row mt-2">
+                <div class="col-5"><label class="mt-1">Daerah :</label></div>
+                <div class="col-7">
+                  <select name="daerahagh" id="daerahaghedit" class="form-control" disabled>
+                    <option value="No Data">Sila Pilih Negeri *</option>
+                  </select>
+                </div>
+              </div>
+            </div>
+  
+            
+          </div>
+  
+          <div class="modal-footer">
+              <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
+              <button type="submit" class="btn btn-success">Hantar</button>
+          </div>
+        </form>
+        </div>
+      </div>
+    </div>
+
+
 

resources/views/modal/panjar.blade.php

@@ -81,7 +81,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success">Terima</button>
+            <button type="submit" id="terima_transaksi_keraian" class="btn btn-success">Terima</button>
         </div>
       </form>
       </div>
@@ -171,7 +171,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success">Terima</button>
+            <button type="submit" id="terima_transaksi_selenggara" class="btn btn-success">Terima</button>
         </div>
       </form>
       </div>
@@ -262,7 +262,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-              <button type="submit" class="btn btn-success">Terima</button>
+              <button type="submit" id="terima_transaksi_belanjaam" class="btn btn-success">Terima</button>
             </div>
           </form>
           </div>
@@ -354,7 +354,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success">Terima</button>
+            <button type="submit" id="terima_transaksi_perubatan" class="btn btn-success">Terima</button>
           </div>
         </form>
         </div>
@@ -444,7 +444,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-              <button type="submit" class="btn btn-success">Terima</button>
+              <button type="submit" id="terima_transaksi_dapur" class="btn btn-success">Terima</button>
             </div>
           </form>
           </div>
@@ -523,7 +523,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-              <button type="submit" class="btn btn-success">Terima</button>
+              <button type="submit" id="terima_transaksi_pos" class="btn btn-success">Terima</button>
             </div>
           </form>
           </div>

resources/views/modal/pendahuluanserahan.blade.php

@@ -45,7 +45,7 @@
 
         <div class="modal-footer">
             <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
-            <button type="button" class="btn btn-success btn-lg" onclick="functerima()">Terima</button>
+            <button type="button" id="terima_transaksi" class="btn btn-success btn-lg" onclick="functerima()">Terima</button>
         </div>
       </div>
     </div>

resources/views/not_assign.blade.php

@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>Laravel</title>
+
+        <!-- Fonts -->
+        <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;600&display=swap" rel="stylesheet">
+
+        <!-- Styles -->
+        <style>
+            html, body {
+                background-color: #fff;
+                color: #636b6f;
+                font-family: 'Nunito', sans-serif;
+                font-weight: 200;
+                height: 100vh;
+                margin: 0;
+            }
+
+            .full-height {
+                height: 100vh;
+            }
+
+            .flex-center {
+                align-items: center;
+                display: flex;
+                justify-content: center;
+            }
+
+            .position-ref {
+                position: relative;
+            }
+
+            .top-right {
+                position: absolute;
+                right: 10px;
+                top: 18px;
+            }
+
+            .content {
+                text-align: center;
+            }
+
+            .title {
+                font-size: 84px;
+            }
+
+            .links > a {
+                color: #636b6f;
+                padding: 0 25px;
+                font-size: 13px;
+                font-weight: 600;
+                letter-spacing: .1rem;
+                text-decoration: none;
+                text-transform: uppercase;
+            }
+
+            .m-b-md {
+                margin-bottom: 30px;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="flex-center position-ref full-height">
+        
+            @if (Route::has('login'))
+                <div class="top-right links">
+                    @auth
+                        <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">Logout</a>
+                    @else
+                        <a href="{{ route('login') }}">Login</a>
+
+                        @if (Route::has('register'))
+                            <a href="{{ route('register') }}">Register</a>
+                        @endif
+                    @endauth
+                </div>
+            @endif
+            <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
+                @csrf
+            </form>
+            <div class="content">
+                <div class="title m-b-md">
+                    Kakitangan Belum Disahkan Lagi
+                </div>
+            </div>
+        </div>
+    </body>
+</html>

resources/views/operasi/daftar_kakitangan.blade.php

@@ -94,8 +94,58 @@
             </div>
         </div>
     </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header">{{ __('Senarai Kakitangan') }}</div>
+                <div class="card-body text-center">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <table id="rekod_kakitangan" class="table table-striped table-hover">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>Nama Staff</th>
+                                        <th>Jawatan</th>
+                                        <th>Cawangan</th>
+                                        <th>Action</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($kakitangan as $index=>$staff)
+                                        <tr>
+                                            <td>{{ $loop->iteration }}</td>
+                                            <td>{{ $staff->name }}</td>
+                                            <td>{{ strtoupper($staff->roles) }}</td>
+                                            <td>
+                                                @if($staff->cawangan == 'operasi')
+                                                    {{ ucwords($staff->cawangan) }}
+                                                @else
+                                                    @php 
+                                                    $cawangan_staff = Http::get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json();
+                                                    echo  ucwords($cawangan_staff['details_caw']);
+                                                    @endphp
+                                                @endif
+                                            </td>
+                                            <td>
+                                                <a href="{{ route('kakitangan.tukartaraf',['id'=>$staff->id]) }}" class="btn btn-warning" title="Tukar Taraf"><i class="material-icons">edit</i></a>
+                                                <a href="{{ route('kakitangan.tukarcawangan',['id'=>$staff->id]) }}" class="btn btn-info" title="Tukar Cawangan"><i class="material-icons">work</i></a>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 <script>
+
+    var tablerekod = $('#rekod_kakitangan').DataTable();
+
     function verifyregister(){
         var cawangan = $('#cawangan').val();
         var role = $('#role').val();

resources/views/operasi/kelulusan.blade.php

@@ -313,6 +313,10 @@
         let norujukan = $(e).data('norujukan');
         let cawangankod = $(e).data('kodcaw');
         let siri = $(e).data('siri');
+        let namaoperasi = "{{ Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(2)').text();
+
+        teller = String(teller);
 
         $.ajax({
             method:'put',
@@ -322,7 +326,9 @@
                 "norujukan" : norujukan,
                 "kodcaw" : cawangankod,
                 "komenkelulusan" : komenkelulusan,
-                "siri" : siri
+                "siri" : siri,
+                'namaoperasi' : namaoperasi,
+                'teller' : teller
             },
             success:function(data){
                 console.log(data);
@@ -391,6 +397,10 @@
         let norujukan = $(e).data('norujukan');
         let siri = $(e).data('siri');
         let cawangankod = $(e).data('kodcaw');
+        let namaoperasi = "{{ Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(2)').text();
+
+        teller = String(teller);
 
         $.ajax({
             method:'put',
@@ -401,7 +411,9 @@
                 "siri" : siri,
                 "kodcaw" : cawangankod,
                 "komenkelulusan" : komenkelulusan,
-                "pembatalan" : "batal"
+                "pembatalan" : "batal",
+                'namaoperasi' : namaoperasi,
+                'teller' : teller
             },
             success:function(data){
                 Swal.fire({

resources/views/operasi/margin_pembiayaan.blade.php

@@ -0,0 +1,61 @@
+@extends('layouts.app_operasi')
+@section('content')
+@include('modal.hargaemas')
+
+
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ url('operasi/parameter') }}">Parameter</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Margin Pembiayaan</li>
+                    </ol>
+                </nav>
+                <div class="card-body text-center">
+                    
+                    <div class="mt-3">
+                        
+                        <table class='table table-striped table-hover' id='table-margin' style="width:100%;">
+                            <thead class="thead-dark">
+                                <tr>
+                                    <th>Bil</th>
+                                    <th>Taraf</th>
+                                    <th>Margin</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach($margin_pembiayaan as $index=>$mp)
+                                    <tr>
+                                        <td>{{ $loop->iteration }}</td>
+                                        <td>{{ strtoupper($mp['user_type']) }}</td>
+                                        <td>{{ $mp['max'] . '%' }}</td>
+                                        <td></td>
+                                    </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    var table_margin = $('#table-margin').DataTable();
+
+    $.ajax({
+        method:'GET',
+        url: api_url + '/api/maxpinjaman',
+        success:function(data){
+            
+        }
+    });
+</script>
+
+@endsection

resources/views/operasi/parameter.blade.php

@@ -15,7 +15,7 @@
 
                 <div class="card-body text-center">
                     <a href="{{ route('operasi.hargaemas') }}" class="btn btn-info btn-lg">Harga Emas</a>
-                    <a href="#" class="btn btn-info btn-lg">Contoh 1</a>
+                    <a href="{{ route('operasi.margin') }}" class="btn btn-info btn-lg">Margin Pembiayaan</a>
                     <a href="#" class="btn btn-info btn-lg">Contoh 2</a>
                 </div>
             </div>

resources/views/operasi/tukar_cawangan.blade.php

@@ -0,0 +1,101 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+                
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+                      <li class="breadcrumb-item" aria-current="page"><a href="{{ route('daftar.kakitangan') }}">Kakitangan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Tukar Taraf</li>
+                    </ol>
+                </nav>
+
+                <div class="card-body text-center">
+                    <form action="{{ route('kakitangan.tukarcawangan.update') }}" method="post">
+                        @csrf
+                        <input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
+                        <div class='row form-group'>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Nama</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nama' id='nama' readonly value="{{ $user->name }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Email</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='email' id='email' readonly value="{{ $user->email }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Cawangan</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        @php
+                                            $cawangan_all = Http::get($api_url . '/api/cawangan')->json();
+                                        @endphp
+                                        <select class="form-control" name="cawangan" data-placeholder="Pilih Cawangan" id="cawangan">
+                                            <option disabled selected value> -- Pilih Cawangan -- </option>
+                                            <option value="operasi" {{ $user->roles == 'operasi' ? 'selected' : '' }}>Operasi</option>
+                                            @foreach($cawangan_all as $cawangan)    
+                                                <option value="{{ $cawangan['kodcaw'] }}" {{ $user->cawangan == $cawangan['kodcaw'] ? 'selected' : '' }}>{{ $cawangan['details_caw'] }}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No KP</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nokp' id='nokp' readonly value="{{ $user->no_kp }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No Telefon</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='telefon' id='telefon' readonly value="{{ $user->no_telefon }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Jawatan</b>
+                                    </div>
+
+                                    <div class='col-md-7'>
+                                        <select class="form-control" name="role" data-placeholder="Pilih Jawatan" id="role">
+                                            <option disabled selected> -- Pilih Jawatan -- </option>
+                                            @foreach($role as $roles)    
+                                                <option value="{{ $roles['role_code'] }}" {{ $user->roles == $roles['role_code'] ? 'selected' : '' }}>{{ $roles['keterangan'] }}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class='row justify-content-end'>
+                            <div class='col-md-12'>
+                                <input type="submit" class='btn btn-info float-right mr-5' value='Tukar Cawangan'>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/operasi/tukar_taraf.blade.php

@@ -0,0 +1,84 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+                
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+                      <li class="breadcrumb-item" aria-current="page"><a href="{{ route('daftar.kakitangan') }}">Kakitangan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Tukar Taraf</li>
+                    </ol>
+                </nav>
+
+                <div class="card-body text-center">
+                    <form action="{{ route('kakitangan.tukartaraf.update') }}" method="post">
+                        @csrf
+                        <input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
+                        <div class='row form-group'>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Nama</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nama' id='nama' readonly value="{{ $user->name }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Email</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='email' id='email' readonly value="{{ $user->email }}" class='form-control'>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No KP</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nokp' id='nokp' readonly value="{{ $user->no_kp }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No Telefon</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='telefon' id='telefon' readonly value="{{ $user->no_telefon }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Jawatan</b>
+                                    </div>
+
+                                    <div class='col-md-7'>
+                                        <select class="form-control" name="role" data-placeholder="Pilih Jawatan" id="role">
+                                            <option disabled selected> -- Pilih Jawatan -- </option>
+                                            @foreach($role as $roles)    
+                                                <option value="{{ $roles['role_code'] }}" {{ $user->roles == $roles['role_code'] ? 'selected' : '' }}>{{ $roles['keterangan'] }}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class='row justify-content-end'>
+                            <div class='col-md-12'>
+                                <input type="submit" class='btn btn-info float-right mr-5' value='Tukar Taraf'>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/penebusan/index.blade.php

@@ -246,7 +246,7 @@
                             <div class="col-6">
                                 <div class="form-group row" id="divbayaran">
                                     <div class="col-4">
-                                       BAYARAN PEMBIAYAAN(RM)
+                                       BAYARAN PELANGGAN(RM)
                                     </div>
                                     <div class="col-8">
                                         <input type="text" id="bayaran" onkeyup="bayartambahan(this)" placeholder="0.00" class="form-control" disabled/>
@@ -373,6 +373,7 @@
     $('#divhargaemassemasa').hide();
     $('#divperludibayartawarruq').hide();
     $('#divbayarantawarruq').hide();
+    $('#divbayaran').hide();
 
 
     var array_recno = [];
@@ -442,7 +443,7 @@
                 url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
                 success:function(data){
-                    $('#jumlahupah').val(formatter.format(data));
+                    $('#jumlahupah').val(data);
                 }
             });
 
@@ -700,8 +701,8 @@
 
     $("#sltjenistebus").change(function(){
     
-        var jumupah = parseFloat($('#jumlahupah').val());
+        var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
-        var jumupahrebet = parseFloat($('#bayaranditerima').val());
+        var jumupahrebet = parseFloat($('#bayaranditerima').val().replace(/[^0-9.-]+/g,""));
 
         switch($(this).val()) {
             case "T":
@@ -721,9 +722,9 @@
                 $('#divhargaemassemasa').hide();
                 $('#divperludibayartawarruq').hide();
                 $('#divbayarantawarruq').hide();
+                $('#divbayaran').hide();
 
                 $('#divtelahdibayar').show();
-                $('#divbayaran').show();
                 $('#divperludibayar').show();
 
                 tebusan();
@@ -748,9 +749,9 @@
                 $('#divbayarantawarruq').hide();
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
-                $('#divperludibayar').show();
+                $('#divperludibayar').hide();
 
-                $('#perludibayar').val(formatter.format(jumupah));
+                $('#bayaran').val(formatter.format(jumupah));
 
                 break;
 
@@ -992,6 +993,7 @@
     function bayaransemua()
     {
         $("#terima_transaksi").prop('disabled', true);
+        var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
         if($('#sltjenistebus').find(":selected").val() == 'T'){
         
             var adadah = false;
@@ -1128,7 +1130,17 @@
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
             var bayar = $('#bayaran').val();
-            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
+            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
+
+            if(bayar < jumupah){
+                $("#terima_transaksi").prop('disabled', false);
+                Swal.fire(
+                    'Amaran!',
+                    'Bayaran tidak boleh kurang dari kos keuntungan semasa',
+                    'error'
+                )
+                return false;
+            }
 
             if(bayar >  bakipinjam){   
                 $("#terima_transaksi").prop('disabled', false);
@@ -1282,9 +1294,9 @@
 
                         var channel = pusher.subscribe('notice-kelulusan');
                         channel.bind('my-kelulusan', function(data) {
-                        
+                            console.log(data);
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1412,7 +1424,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1558,7 +1570,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1686,7 +1698,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1902,7 +1914,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -2030,7 +2042,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -2417,7 +2429,11 @@
     {
         let wakil = $('#wakiltxt').val();
 
-        if(wakil.length == 12)
+        var patternregex = /\s+|[-,\/]/g;
+
+        wakil = wakil.replace(patternregex,"").toUpperCase();
+
+        if(wakil.length <= 12)
         {
             $.ajax({
                 method:'GET',
@@ -2465,7 +2481,7 @@
         {
             Swal.fire({
                 icon: 'error',
-                titleText: 'Kad Pengenalan',
+                titleText: 'Kad Pengenalan dan Passport',
                 text: 'mestilah tidak melebihi dan kurang daripada 12 patah perkataan'
             });
         }

resources/views/print/laporan_ansuran.blade.php

@@ -205,52 +205,78 @@
     <th>No K/P</th>
     <th>Tempoh</th>
     <th>Baki Pembiayaan (RM)</th>
+    <th>Bayaran Pemb. (RM)</th>
     <th>Bayaran (RM)</th>
     <th>Keuntungan (RM)</th>
   </tr>
-  @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; @endphp
+  @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; $totalpendahuluan = 0;@endphp
   @foreach($tebus as $index=>$item)
-  @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan']; @endphp
+  @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan'];$totalpendahuluan += $item['bayaran_pembiayaan']; @endphp
+  @if($index > 0)
+    @if($item['teller'] != $tebus[$index - 1]['teller'])
+        <tr>
+            <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+        </tr>
+        @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp
+    @endif
+  @else
+    <tr>
+        <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+    </tr>
+    @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp
+  @endif
     <tr>
       <td>{{ $counter }}</td>
       <td>{{$item['norujukan']}}</td>
-      <td>
+      <td>{{ $item['nama'] }}</td>
-        @php
+      <td>{{ $item['nokp'] }}</td>
-            $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
+      <td>{{ $item['tempoh'] }}</td>
-            $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json();
+      <td>{{ number_format($item['bakipjm'],2) }}</td>
-            
+      <td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>
-            echo $customer_detail['nama'];
-        @endphp
-      </td>
-      <td>{{ $gadai_detail[0][0]['nokp'] }}</td>
-        <td>{{ $gadai_detail[0][0]['tempoh'] }}</td>
-      <td>{{ number_format($gadai_detail[0][0]['bakipjm'],2) }}</td>
       <td>{{ number_format($item['duit_masuk'],2) }}</td>
       <td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
-
     </tr>
     @php $counter++; @endphp
+    @php $totaldmteller += $item['duit_masuk'];$totalupahteller += $item['bayaran_keuntungan'];$totalpendhteller += $item['bayaran_pembiayaan']; @endphp
     @if($index+1 < sizeof($tebus))
         @if($item['teller'] != $tebus[$index + 1]['teller'])
             <tr>
                 <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
-                <td><b>{{ number_format($totalduitmasuk,2) }} </b></td>
+                <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
-                <td><b>{{ number_format($totalkeuntungan,2) }} </b></td>
+                <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+                <td><b>{{ number_format($totalupahteller,2) }} </b></td>
             </tr>
-            @php $counter = 0; @endphp
+            @php $counter = 1;$totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0;@endphp
         @endif
     @else
         <tr>
             <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
-            <td><b>{{ number_format($totalduitmasuk,2) }} </b></td>
+            <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
-            <td><b>{{ number_format($totalkeuntungan,2) }} </b></td>
+            <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+            <td><b>{{ number_format($totalupahteller,2) }} </b></td>
         </tr>
     @endif
   @endforeach
 </table>
 
-<br>
+<br><br>
-<br>
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <th colspan="9"></th>
+    <th style="text-align:center;">Bayaran Pemb. (RM)</th>
+    <th style="text-align:center;">Bayaran (RM)</th>
+    <th style="text-align:center;">Keuntungan (RM)</th>
+  </tr>
+  <tr>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalpendahuluan,2) }}</td>
+    <td>{{ number_format($totalduitmasuk,2) }}</td>
+    <td>{{ number_format($totalkeuntungan,2) }}</td>
+  </tr>
+</table>
+
+<br><br>
+<br><br>
 <table id="sign">
   <tr>
     <td></td>

resources/views/print/laporan_lejer_am.blade.php

@@ -438,17 +438,124 @@
   <td> </td> 
   
   </tr>
-  
+</table>
-  
+<br>
-  
+<br>
-  
+
-  
+<table id="title">
-  
+<td> <b><u>LEJER AM</u></b></td>
-   <tr>
+</table>
-   <td></td>
+<br>
-   <td>........................................................</td><td></td>
+
-   <td>......................................................... </td>
+
-   <td> </td>
+<table id="tarikh_cetak">
-   </tr>
+
-  
+<tr>
-  </table>
+<td style="width:5px" ><b>TARIKH DARI</b></td ><td style="width:1px"> {{$tarikh_mula}}  </td>
+<td style="width:5px" ><b>HINGGA</b></td><td style="width:1px"> {{$tarikh_akhir}} </td> 
+</tr>
+
+</table>
+
+<br>
+
+<table id="glejer">
+  <tr>
+    <th style="width:10px">KOD GL</th>
+    <th colspan="2" style="width:50px">KETERANGAN</th>
+    <th style="width:5px">DEBIT</th>
+    <th style="width:5px" >KREDIT</th>
+    <th style="width:10px">JUMLAH</th>
+  </tr>
+
+ @foreach($Kredit as $index=>$kred)
+    @foreach($Debit as $index=>$deb)
+      @if($kred['glcode'] === $deb['glcode'])
+      <tr>
+        <td style="width:10px">{{ $kred['glcode'] }}</td>
+        <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
+        <td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
+        <td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
+        <td style="width:10px">@php $Totalsama = $deb['amaun'] - $kred['amaun']; echo number_format($Totalsama,2); @endphp</td>
+      </tr>
+      @endif
+    @endforeach
+  @endforeach
+
+@foreach($Debit as $index=>$deb)
+  @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019')
+    <tr>
+      <td style="width:10px">{{ $deb['glcode'] }}</td>
+      <td colspan="2" style="width:50px">{{ $deb['descpt'] }}</td>
+      <td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
+      <td style="width:5px" >{{ number_format(0,2) }}</td>
+      <td style="width:10px">{{ number_format($deb['amaun'],2) }}</td>
+    </tr>
+  @endif
+@endforeach
+
+@foreach($Kredit as $index=>$kred)
+  @if($kred['glcode'] == '5000/241'  || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102')
+    <tr>
+      <td style="width:10px">{{ $kred['glcode'] }}</td>
+      <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
+      <td style="width:5px">{{ number_format(0,2) }}</td>
+      <td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
+      <td style="width:10px">{{ number_format(($kred['amaun']*-1),2) }}</td>
+    </tr>
+  @endif
+@endforeach
+
+  <tr>
+    <th style="width:10px" colspan="3">JUMLAH: </th>
+    <th style="width:5px">{{ number_format($TotalDebit,2) }}</th>
+    <th style="width:5px" >{{ number_format($TotalKredit,2) }}</th>
+    <th style="width:10px">@php $Total = $TotalDebit - $TotalKredit; echo number_format($Total,2); @endphp</th>
+  </tr>
+</table>
+
+
+
+<br>
+<br>
+
+
+<table id="details">
+<tr>
+<th> </th><th> DISEMAK  </th><th></th> <th> DISAHKAN </th><th></th>
+</tr>
+<tr>
+
+<td> </td> 
+<td> </td> 
+
+<td> </td> 
+
+<td> </td> 
+
+</tr>
+
+<tr>
+
+<td> </td> 
+<td> </td> 
+
+<td> </td> 
+
+<td> </td> 
+
+</tr>
+
+
+
+
+
+
+ <tr>
+ <td></td>
+ <td>........................................................</td><td></td>
+ <td>......................................................... </td>
+ <td> </td>
+ </tr>
+
+</table>

resources/views/print/laporan_penebusan.blade.php

@@ -198,30 +198,30 @@
     <th>Norujukan</th>
     <th>Nama</th>
     <th>No KP</th>
-    <th>T Gadai</th>
+    <th>Masa</th>
-    <th>T Tebus</th>
     <th>JBG</th>
     <th>J Tebus</th>
+    <th width="6%;">Nilai Marhun(RM)</th>
     <th width="6%;">Pembiayaan(RM)</th>
     <th width="6%;">Upah/Keuntungan(RM)</th>
     <th width="6%;">Bayaran(RM)</th>
     <th width="6%;">Jumlah(RM)</th>
   </tr>
-  @php $counter = 1; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
+  @php $counter = 1;$totalnm = 0; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
   @foreach($tebus as $index=>$item)
-  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah'];@endphp
+  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah']; $totalnm += $item['nilaimarhun'];@endphp
     @if($index > 0)
         @if($item['teller'] != $tebus[$index - 1]['teller'])
             <tr>
                 <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
             </tr>
-            @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
+            @php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
         @endif
     @else
         <tr>
             <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
-        @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
+        @php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
     @endif
     <tr>
       <td>{{ $counter }}</td>
@@ -229,34 +229,30 @@
       <td>{{ $item['nama'] }}</td>
       <td>{{ $item['nokp'] }}</td>
       <td>
-        @php 
+        @php
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_gadai']);
+            $dt = new DateTime($item['tarikh_bayaran']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
+            $time = $dt->format('h:i:s');
-          echo($formattedweddingdate);
+            echo date($time);
-        @endphp
-      </td>
-      <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate);
         @endphp
       </td>
       <td>{{ $item['jbg'] }}</td>
       <td>{{$item['jenistebus']}}</td>
+      <td>
+        {{ number_format($item['nilaimarhun'],2) }}
+      </td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
       <td>{{ number_format($item['bakiupah'],2) }}</td>
       <td>{{ number_format($item['bakipjm'],2) }}</td>
       <td>@php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
     </tr>
     @php $counter++; @endphp
-    @php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
+    @php $totalnmteller += $item['nilaimarhun']; $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
     @php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
     @if($index+1 < sizeof($tebus))
         @if($item['teller'] != $tebus[$index + 1]['teller'])
             <tr class="new-page">
                 <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
-                <td></td>
+                <td><b>{{ number_format($totalnmteller,2) }} </b></td>
                 <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
                 <td><b>{{ number_format($totalupahteller,2) }} </b></td>
                 <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -267,7 +263,7 @@
     @else
         <tr class="new-page">
             <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
-            <td></td>
+            <td><b>{{ number_format($totalnmteller,2) }}</b></td>
             <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
             <td><b>{{ number_format($totalupahteller,2) }} </b></td>
             <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -281,12 +277,14 @@
 <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
   <tr>
     <th colspan="9"></th>
+    <th style="text-align:center;">Nilai Marhun (RM)</th>
     <th style="text-align:center;">Pembiayaan (RM)</th>
     <th style="text-align:center;">Upah/Keuntungan (RM)</th>
     <th style="text-align:center;">Jumlah (RM)</th>
   </tr>
   <tr>
     <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalnm,2) }}</td>
     <td>{{ number_format($totalpinjaman,2) }}</td>
     <td>{{ number_format($totalupah,2) }}</td>
     <td>{{ number_format($totalbayaran,2) }}</td>
@@ -329,6 +327,18 @@
 
 {{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
 
+<br>
+<br>
+<table id="sign">
+  <tr>
+    <td>{{ $ansuran['bilangan'] }}</td>
+    <td>Ansuran Pembiayaan</td>
+    <td>{{ number_format($ansuran['totalpendahuluan'],2) }}</td>
+    <td>{{ number_format($ansuran['totalkeuntungan'],2) }}</td>
+    <td> Not Applicable </td>
+  </tr>
+</table>
+
 <br>
 <br>
 <table id="sign">
@@ -355,3 +365,5 @@
 
 
 
+
+

resources/views/print/laporan_petibesi.blade.php

@@ -211,7 +211,7 @@
     <th>TOLAK</th>
   </tr>
   <tr>
-    <td>Serahan Kepada Teller</td>
+    <td>Pendahuluan Kepada Teller</td>
     <td>:</td>
     <td>RM {{ number_format($petibesi['keluar'],2) }}</td>
   </tr>
@@ -226,7 +226,7 @@
     <th>TAMBAH</th>
   </tr>
   <tr>
-    <td>Pendahuluan Daripada Teller</td>
+    <td>Serahan Daripada Teller</td>
     <td>:</td>
     <td>RM {{ number_format($petibesi['masuk'],2) }}</td>
   </tr>

resources/views/print/laporan_ringkasanharian.blade.php

@@ -191,8 +191,10 @@
       <div class="col-12">
         <p><b>G) BAYAR BAKI LELONG</b></p>
       </div>
-      <div class="col-6">RM</div>
+      <div class="col-6">1. BAKI LELONG</div>
       <div class="col-6">{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}</div>
+      <div class="col-6">2. RUGI LELONG</div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}</div>
     </div>
   </div>
 </div>
@@ -214,6 +216,7 @@
               <th>70%</th>
               <th>75%</th>
               <th>80%</th>
+              <th>JUMLAH</th>
             </tr>
           </thead>
           <tbody>
@@ -223,6 +226,7 @@
               <td>{{ 'RM '. number_format($laporan['gadai_70'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['gadai_75'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['gadai_80'],2) }}</td>
+              <td>{{ 'RM '. number_format($laporan['total_gadaian'],2) }}</td>
             </tr>
             <tr>
               <td>2</td>
@@ -230,6 +234,7 @@
               <td>{{ 'RM '. number_format($laporan['nilaimarhun_70'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['nilaimarhun_75'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['nilaimarhun_80'],2) }}</td>
+              <td>{{ 'RM '. number_format($laporan['total_nm'],2) }}</td>
             </tr>
             <tr>
               <td>3</td>
@@ -237,6 +242,7 @@
               <td>{{ $laporan['bilangan_70'] }}</td>
               <td>{{ $laporan['bilangan_75'] }}</td>
               <td>{{ $laporan['bilangan_80'] }}</td>
+              <td>{{ number_format($laporan['total_bilangan']) }}</td>
             </tr>
           </tbody>
         </table>

resources/views/print/laporan_ringkasanterkumpulv2.blade.php

@@ -114,8 +114,10 @@
       <div class="col-12">
         <p><b>G) BAYAR BAKI LELONG</b></p>
       </div>
-      <div class="col-6">RM</div>
+      <div class="col-6">1. BAKI LELONG</div>
-      <div class="col-6"></div>
+      <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['bayar_baki_lelong'],2) }}</div>
+      <div class="col-6">2. RUGI LELONG</div>
+      <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}</div>
     </div>
   </div>
 </div>
@@ -137,6 +139,7 @@
               <th>70%</th>
               <th>75%</th>
               <th>80%</th>
+              <th>JUMLAH</th>
             </tr>
           </thead>
           <tbody>
@@ -146,6 +149,7 @@
               <td>RM {{ number_format($laporan_ringkasan['gadai_70'],2) }}</td>
               <td>RM {{ number_format($laporan_ringkasan['gadai_75'],2) }}</td>
               <td>RM {{ number_format($laporan_ringkasan['gadai_80'],2) }}</td>
+              <td>RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }}</td>
             </tr>
             <tr>
               <td>2</td>
@@ -153,6 +157,7 @@
               <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }}</td>
               <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }}</td>
               <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }}</td>
+              <td>RM {{ number_format($laporan_ringkasan['total_nm'],2) }}</td>
             </tr>
             <tr>
               <td>3</td>
@@ -160,6 +165,7 @@
               <td>{{ $laporan_ringkasan['bilangan_70'] }}</td>
               <td>{{ $laporan_ringkasan['bilangan_75'] }}</td>
               <td>{{ $laporan_ringkasan['bilangan_80'] }}</td>
+              <td>{{ number_format($laporan_ringkasan['total_bilangan']) }}</td>
             </tr>
           </tbody>
         </table>

resources/views/print/laporan_upah.blade.php

@@ -221,13 +221,13 @@
     <th>Tarikh</th>
     <th>No Rujukan</th>
     <th>Teller</th>
-    <th>Pinjaman</th>
+    <th>Tempoh</th>
-    <th>JBG</th>
+    <th>Pembiayaan (RM)</th>
-    <th>Upah Dibayar</th>
+    <th>Upah Dibayar (RM)</th>
   </tr>
   @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
   @foreach($advansur as $index=>$item)
-  @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman'];$totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
+  @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; @endphp
     @if($index > 0)
       @if($item['teller'] != $advansur[$index - 1]['teller'])
             <tr>
@@ -242,32 +242,30 @@
         @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
 
     @endif
-  
     <tr>
       <td>{{ $counter }}</td>
       <td>{{ $item['tarikh'] }}</td>
       <td><b>{{ $item['norujukan'] }}</b></td>
       <td>{{ $item['teller'] }}</td>
-      <td>{{ number_format($item['pinjaman'],2) }}</td>
       <td>{{ $item['jbg'] }}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
       <td>{{ number_format($item['upahDibayar'],2) }}</td>
     </tr>
     @php $counter++; @endphp
+    @php $totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
     @if($index+1 < sizeof($advansur))
     @if($item['teller'] != $advansur[$index + 1]['teller'])
         <tr>
-            <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+            <td colspan="5">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
             <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
-            <td></td>
             <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
         </tr>
         @php  @endphp
     @endif
 @else
     <tr>
-        <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+        <td colspan="5">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
         <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
-        <td></td>
         <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
     </tr>
 @endif

resources/views/print/resit_tuntutbaki.blade.php

@@ -1,3 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script>
+    $(document).ready(function () {
+      window.print();
+      window.onfocus=function(){ window.close();}
+    });
+</script>
 <style>
 #header {
   font-family: Arial, Helvetica, sans-serif;

resources/views/print/resitadvansur.blade.php

@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:10px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:15px;
     text-align: left;
 
   }

resources/views/print/resitansuran.blade.php

@@ -77,22 +77,6 @@ hr.new5 {
   margin-right: 0;
 }
 
-
-
-
-</style>
-
-
-
-
-
-
-
-
-
-
-
-<style>
   hr.new1 {
     border-top: 1px dotted black;
   }
@@ -247,7 +231,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +240,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
@@ -399,7 +383,7 @@ hr.new5 {
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
  </tr>
  <tr>
 <td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
@@ -493,7 +477,7 @@ hr.new5 {
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
 </tr>
 <tr>
 <td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
@@ -563,4 +547,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
+<br>

resources/views/print/resittambahpinjam.blade.php

@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }

resources/views/print/resittebus.blade.php

@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:12px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:13px;
+    font-size:15px;
     text-align: left;
 
   }

resources/views/print/resittebusautotawarruq.blade.php

@@ -8,8 +8,8 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 <script>
     $(document).ready(function () {
-      // window.print();
+      window.print();
-      // window.onfocus=function(){ window.close();}
+      window.onfocus=function(){ window.close();}
     });
 </script>
 <style>

resources/views/print/resittebussebelum.blade.php

@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:12px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:13px;
+    font-size:15px;
     text-align: left;
 
   }

resources/views/print/resittebusseparuh.blade.php

@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }

resources/views/print/sag.blade.php

@@ -8,7 +8,7 @@
 <script>
     $(document).ready(function () {
       window.print();
-      // window.onfocus=function(){ window.close();}
+      window.onfocus=function(){ window.close();}
     });
 </script>
 
@@ -26,6 +26,14 @@
     margin-top: -70px;
   }
 
+  .khazanah-copy{
+    border:1px solid black;
+    padding:10px;
+    width : 250px;
+    font-size:11px;
+    margin-left: 200px;
+  }
+
   #customers {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
@@ -68,7 +76,7 @@
   .grid-container {
     display: grid;
     grid: 80px / 33% 33% 33%;
-    padding: 10px;
+    padding: 10px 10px 0px 10px;
   }
 
   #customers td, #customers th {
@@ -392,6 +400,16 @@
     border-top: 1px dashed black;
   }
 
+  #detail-kaki{
+    width: 100%;
+   border-collapse: collapse !important;
+  }
+
+  .cell-breakWord {
+    word-wrap: break-word;
+    max-width: 1px;
+  }
+
 </style>
 </head>
 
@@ -414,7 +432,6 @@
       {!! QrCode::size(60)->generate($pembayaran_segera); !!}
       <p class="bottomright"><b>SALINAN PELANGGAN</b></p>
     </div>
-
   </div>
   
   <table style="margin-bottom:10px;" id="perjanjian">
@@ -424,8 +441,8 @@
     <tr>
       <td> NAMA</td>
       <td> {{$customer_detail['nama']}}</td>
-      <td>NO SAG </td>
+      <td><b>NO SAG</b> </td>
-      <td>{{$gadai_detail['norujukan']}}</td>
+      <td style="font-size:12px"><b>{{$gadai_detail['norujukan']}}</b></td>
     </tr>
     <tr>
       <td> NO MYKAD</td>
@@ -450,14 +467,26 @@
       <td>
         @php
           $poskod = Http::get($api_url . '/api/poskod/'.$customer_detail['poskod'])->json();
+          if(empty($poskod)){
+            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+          }
           $daerah = Http::get($api_url . '/api/daerah/'.$poskod['koddaerah'])->json();
+          if($daerah){
+            $namadaerah = $daerah['namadaerah'];
+          }else{
+            $namadaerah = 'NIL';
+          }
           $negeri = Http::get($api_url . '/api/negeri/'.$poskod['kodnegeri'])->json();
-
+          if($negeri){
-          echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
+            $negeri = $negeri['negeri'];
+          }else{
+            $negeri = 'NIL';
+          }
+          echo ($customer_detail['poskod']. ', ' .$namadaerah.', '.$negeri);
         @endphp
       </td>
-      <td>NILAI PEMBIAYAAN</td>
+      <td><b>NILAI PEMBIAYAAN</b></td>
-      <td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
+      <td><b>RM {{ number_format($gadai_detail['pinjaman'],2) }}</b> </td>
     </tr>
     <tr>
       <td>NO TELEFON</td>
@@ -465,11 +494,23 @@
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td><b>KOS KEUNTUNGAN SEBULAN</b></td>
+      <td><b>
+          @php
+            $upah_sbln = ($gadai_detail['kadarupah']/100) * $gadai_detail['pinjaman'];
+            echo 'RM ' . number_format($upah_sbln,2);
+          @endphp
+      </b></td>
+    </tr>
   </table>
 
   <table style="margin-bottom:10px;" id="transaksi_twq">
     <tr>
-      <th  colspan="4"> TRANSAKSI TAWARRUQ</th>
+      <th  colspan="3"> TRANSAKSI TAWARRUQ</th>
+      <th>Setuju</th>
     </tr>
     <tr>
       <td rowspan="2"> 1</td>
@@ -477,7 +518,7 @@
       <td rowspan="2">
         Saya bersetuju dan dengan ini membeli komoditi daripada PKB pada Harga Jualan dengan bayaran tangguh. Komoditi adalah sebagaimana yang dinyatakan di dalam sijil pembekal komoditi mengikut kadar jumlah pembiayaan yang diberikan kepada saya.
       </td>
-      <td rowspan="2"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
+      <td rowspan="2"><table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
     <tr></tr>
     <tr>
@@ -486,7 +527,7 @@
       <td rowspan="1">
         Saya bersetuju untuk menggadaikan Marhun sebagai cagaran kepada harga komoditi.
       </td>
-      <td rowspan="1"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
+      <td rowspan="1"><table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
   </table>
 
@@ -498,33 +539,29 @@
 
   <table style="margin-bottom:10px;" id="keuntungan">
     <tr>
-      <th colspan="3">MAKLUMAT SIJIL KOMODITI </th>
+      <th colspan="6">MAKLUMAT SIJIL KOMODITI </th>
     </tr>
     <tr>
       <td>1</td>
       <td>Nombor Sijil</td>
       <td>{{ $komuditi['no_sijil'] }}</td>
-    </tr>
-    <tr>
-      <td>2</td>
-      <td>Kod Produk / Diskripsi</td>
-      <td>{{ $product['kodproduk'] . ' / ' . $product['description'] }}</td>
-    </tr>
-    <tr>
-      <td>3</td>
-      <td>Unit</td>
-      <td>{{ $product['unit'] }}</td>
-    </tr>
-    <tr>
       <td>4</td>
       <td>Kuantiti</td>
       <td>{{ $kuantiti }}</td>
     </tr>
     <tr>
+      <td>2</td>
+      <td>Kod Produk / Diskripsi</td>
+      <td>{{ $product['kodproduk'] . ' / ' . $product['description'] }}</td>
       <td>5</td>
       <td>Nilai</td>
       <td>{{ 'RM ' . number_format($gadai_detail['pinjaman'],2) }}</td>
     </tr>
+    <tr>
+      <td>3</td>
+      <td>Unit</td>
+      <td colspan ="4">{{ $product['unit'] }}</td>
+    </tr>
   </table>
 
   <table style="margin-bottom:10px;" id="keuntungan">
@@ -538,7 +575,7 @@
     </tr>
     <tr>
       <td>TARIKH AKHIR BAYARAN</td>
-      <td style="text-align: center;"> 
+      <td style="text-align: center; font-weight: bold;"> 
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
@@ -555,7 +592,7 @@
     </tr>
     <tr>
       <td>JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR</td>
-      <td style="text-align: center;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
+      <td style="text-align: center; font-weight: bold;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
       <td style="text-align: center;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
     </tr>
     <tr>
@@ -651,9 +688,9 @@
       <th colspan="2">TANDATANGAN SAKSI</th>
     </tr>
     <tr>
-      <td rowspan="3" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
+      <td rowspan="2" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
     </tr>
     <tr></tr>
     <tr></tr>
@@ -709,7 +746,7 @@
     </tr>
     <tr>
       <td> 1.</td>
-      <td colspan="6"> Sesrorang Pelanggan hendaklah mendapat satu salinan Surat Akuan Gadai (SAG).Sekiranya SAG hilang, Pelanggan hendaklah memberitahu Permodalan Kelantan Berhad (PKB) dengan serta-merta dan mendapatkan pengesahan Surat Akuan Sumpah sebelum diberikan salinan SAG baru.</td>
+      <td colspan="6"> Seorang Pelanggan hendaklah mendapat satu salinan Surat Akuan Gadai (SAG).Sekiranya SAG hilang, Pelanggan hendaklah memberitahu Permodalan Kelantan Berhad (PKB) dengan serta-merta dan mendapatkan pengesahan Surat Akuan Sumpah sebelum diberikan salinan SAG baru.</td>
     </tr>
     <tr>
       <td> 2.</td>
@@ -848,7 +885,7 @@
       <td> NAMA</td>
       <td> {{$customer_detail['nama']}}</td>
       <td>NO SAG </td>
-      <td>{{$gadai_detail['norujukan']}}</td>
+      <td style="font-size:12px">{{$gadai_detail['norujukan']}}</td>
     </tr>
     <tr>
       <td> NO MYKAD</td>
@@ -873,10 +910,22 @@
       <td>
         @php
           $poskod = Http::get($api_url . '/api/poskod/'.$customer_detail['poskod'])->json();
+          if(empty($poskod)){
+            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+          }
           $daerah = Http::get($api_url . '/api/daerah/'.$poskod['koddaerah'])->json();
+          if($daerah){
+            $namadaerah = $daerah['namadaerah'];
+          }else{
+            $namadaerah = 'NIL';
+          }
           $negeri = Http::get($api_url . '/api/negeri/'.$poskod['kodnegeri'])->json();
-
+          if($negeri){
-          echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
+            $negeri = $negeri['negeri'];
+          }else{
+            $negeri = 'NIL';
+          }
+          echo ($customer_detail['poskod']. ', ' .$namadaerah.', '.$negeri);
         @endphp
       </td>
       <td>NILAI PEMBIAYAAN</td>
@@ -888,6 +937,17 @@
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td>KOS KEUNTUNGAN SEBULAN</td>
+      <td>
+          @php
+            $upah_sbln = ($gadai_detail['kadarupah']/100) * $gadai_detail['pinjaman'];
+            echo 'RM ' . number_format($upah_sbln,2);
+          @endphp
+      </td>
+    </tr>
   </table>
   <br>
 
@@ -994,9 +1054,9 @@
       <th colspan="2">TANDATANGAN SAKSI </th>
     </tr>
     <tr>
-      <td rowspan="3" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
+      <td rowspan="2" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
     </tr>
     <tr></tr>
     <tr></tr>
@@ -1050,10 +1110,10 @@
       @endphp
     </div>
     <br>
-    <table>
+    <table id="detail-kaki">
       <tr>
         <td>No SAG</td>
-        <td>{{ $gadai_detail['norujukan'] }}</td>
+        <td style="font-size:16px">{{ $gadai_detail['norujukan'] }}</td>
       </tr>
       <tr>
         <td>Nama</td>
@@ -1077,7 +1137,13 @@
       </tr>
       <tr>
         <td>Marhun</td>
-        <td>{{ $gadai_detail['marhun'] }}</td>
+        <td class="cell-breakWord">
+        @php
+          foreach($marhun_detail as $index=>$marhun_customer){
+            echo '1'.$marhun_customer['marhun']. '(' .$marhun_customer['karat'].'),';
+          }
+        @endphp
+        </td>
       </tr>
     </table>
     <br>
@@ -1149,7 +1215,105 @@
       </table>
     </div>
   </div>
-  <div class='page-break'>  </div>
+  <div class="khazanah-copy">
+    <div style="text-align:center;">
+      @php
+        echo '<img src="data:image/png;base64,' . DNS1D::getBarcodePNG($gadai_detail['norujukan'], 'C128',1,40) . '" alt="barcode"   />';
+      @endphp
+    </div>
+    <br>
+    <table id="detail-kaki">
+      <tr>
+        <td>No SAG</td>
+        <td style="font-size:16px">{{ $gadai_detail['norujukan'] }}</td>
+      </tr>
+      <tr>
+        <td>Nama</td>
+        <td>{{ $customer_detail['nama'] }}</td>
+      </tr>
+      <tr>
+        <td>No K/P</td>
+        <td>{{ $gadai_detail['nokp'] }}</td>
+      </tr>
+      <tr>
+        <td>Nilai Marhun</td>
+        <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }}</td>
+      </tr>
+      <tr>
+        <td>Nilai Pembiayaan</td>
+        <td>RM {{ number_format($gadai_detail['pinjaman'],2) }}</td>
+      </tr>
+      <tr>
+        <td>Berat (g)</td>
+        <td>{{ $gadai_detail['berat'] }}</td>
+      </tr>
+      <tr>
+        <td>Marhun</td>
+        <td class="cell-breakWord">
+        @php
+          foreach($marhun_detail as $index=>$marhun_customer){
+            echo '1'.$marhun_customer['marhun']. '(' .$marhun_customer['karat'].'),';
+          }
+        @endphp
+        </td>
+      </tr>
+    </table>
+    <br>
+    <div id="khazanahtable">
+      <table class="table_table" style="border: 1px solid black;">
+        <thead>
+          <tr>
+            <th class="table_th" colspan="3">Ujian</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td class="table_td" colspan="2">Mutu</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Ketumpatan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Peratus (%)</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Kunci/Emas</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Batu Hitam/Asid</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Digital Caliper</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Precious Metel Verifier</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Magnet</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Saya sahkan telah menyemak fizikal saiz, berat dengan teliti mengikut SOP penilai</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td">
+                {{ $gadai_detail['teller'] }}
+            </td>
+            <td class="table_td">Tandatangan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
   <div class='page-break'>  </div>
   <div class="grid-container">
     <div id="header_surat1">
@@ -1224,4 +1388,4 @@
     <p><b>(Tandatangan pelanggan)</b></p>
   </div>
 </body>
-</html>
+</html>

resources/views/user/index.blade.php

@@ -4,25 +4,30 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12">
-            <h3 class="text-center text-uppercase">maklumat pengguna</h3>
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Maklumat Pengguna</li>
+                </ol>
+            </nav>
             <div class="card">
                 <div class="card-body text-center">
                     <div class="col-md-12" style="margin-right:auto;margin-left:auto">
                         <div class="row form-group">
-                            <div class="col-md-6">
+                            <div class="col-md-12">
                                 <div class="row form-group">
                                     <div class="col-md-6">NAMA</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->name }}"></div>
                                     <div class="col-md-6">NO TELEFON</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_telefon }}"></div>
                                 </div>
                             </div>
-                            <div class="col-md-6">
+                            <div class="col-md-12">
                                 <div class="row form-group">
                                     <div class="col-md-6">NO KP</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
                                     <div class="col-md-6">JAWATAN</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->role_harian }}"></div>
                                 </div>
                             </div>
                         </div>

resources/views/user/index_operasi.blade.php

@@ -0,0 +1,40 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Maklumat Pengguna</li>
+                </ol>
+            </nav>
+            <div class="card">
+                <div class="card-body text-center">
+                    <div class="col-md-12" style="margin-right:auto;margin-left:auto">
+                        <div class="row form-group">
+                            <div class="col-md-12">
+                                <div class="row form-group">
+                                    <div class="col-md-6">NAMA</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->name }}"></div>
+                                    <div class="col-md-6">NO TELEFON</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_telefon }}"></div>
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="row form-group">
+                                    <div class="col-md-6">NO KP</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
+                                    <div class="col-md-6">JAWATAN</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->roles }}"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

routes/web.php

@@ -34,13 +34,6 @@ Route::get('test', function () {
     return "event test je";
 });
 
-// Route::get('resitbiasa', function () {
-    
-
-
-    
-// });
-
 Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index');
 
 Route::get('/welcome',function(){
@@ -162,6 +155,7 @@ Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'Khazana
 Route::get('/mintasemulakelulusan',['as'=>'khazanah.getmintasemulakelulusan','uses'=>'KhazanahController@mintakatalaluansemula'])->middleware('auth','khazanah');
 Route::get('/mintasemulakelulusan/operasi',['as'=>'operasi.getmintasemulakelulusan','uses'=>'OperasiController@mintakatalaluansemula'])->middleware('auth','operasi');
 Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createpanjar'])->middleware('auth','khazanah');
+Route::post('/deletepanjar',['as'=>'khazanah.deletepanjar','uses'=>'KhazanahController@deletepanjar'])->middleware('auth','khazanah');
 Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianController@edit'])->middleware('auth','teller');
 Route::post('/gadai/edit/store',['as'=>'gadai.editstore','uses'=>'GadaianController@editstore'])->middleware('auth','teller');
 Route::put('/gadai/edit/deletemarhun',['as'=>'gadai.editmarhun','uses'=>'GadaianController@editmarhun'])->middleware('auth','teller');
@@ -244,29 +238,27 @@ Route::get('/operasi/parameter','OperasiController@parameter')->name('parameter'
 Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiController@hargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');
+Route::get('kakitangan/tukar_taraf',['as'=>'kakitangan.tukartaraf','uses'=>'KakitanganController@tukartaraf'])->middleware('auth','operasi');
+Route::post('kakitangan/tukar_taraf/update',['as'=>'kakitangan.tukartaraf.update','uses'=>'KakitanganController@tukartarafUpdate'])->middleware('auth','operasi');
+Route::get('kakitangan/tukar_cawangan',['as'=>'kakitangan.tukarcawangan','uses'=>'KakitanganController@tukarcawangan'])->middleware('auth','operasi');
+Route::post('kakitangan/tukar_cawangan/update',['as'=>'kakitangan.tukarcawangan.update','uses'=>'KakitanganController@tukarcawanganUpdate'])->middleware('auth','operasi');
+
+Route::get('/operasi/margin',['as'=>'operasi.margin','uses'=>'OperasiController@margin'])->middleware('auth','operasi');
 
 Route::get('/komoditi',['as'=>'komuditi','uses'=>'KomuditiController@index']);
 Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController@rekodKomoditi']);
 Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
 
 Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahController@SuratAkuanGadaian'])->middleware('auth','khazanah');
+Route::post('/khazanah/suratakuangadaianedit',['as'=>'agh.update','uses'=>'KhazanahController@SuratAkuanGadaianUpdate'])->middleware('auth','khazanah');
 Route::get('/khazanah/ulangcetakagh/{norujukan}',['as'=>'agh.ulangcetak','uses'=>'KhazanahController@ulangcetakSuratAkuanGadaianHilang'])->middleware('auth','khazanah');
 
-
 Route::get('/laporan/stokauditbersih', ['as'=>'laporan.stokauditbersih', 'uses'=>'KhazanahController@stokAuditBersih'])->middleware('auth','khazanah');
 Route::post('/laporan/stokauditbersih_cetak',['as' =>'stokauditbersih.cetakstokauditbersih', 'uses'=>'KhazanahController@cetakStok_AuditBersih'])->middleware('auth','khazanah');
 
-
 Route::get('/laporan/stokauditdetails', ['as'=>'laporan.stokauditdetails','uses'=>'KhazanahController@stokAuditDetails'])->middleware('auth','khazanah');
 Route::post('laporan/stokauditdetails_cetak',['as'=>'stokauditdetails.stokauditdetails_cetak', 'uses'=>'KhazanahController@cetak_stokAuditDetails'])->middleware('auth', 'khazanah');
 
-
-
-
-
-
-
-
 Route::get('/laporan/datalejeram',['as' =>'laporan.datalejer_am', 'uses'=>'KhazanahController@data_lejer_am'])->middleware('auth', 'khazanah');
 route::post('/cetaklejer_am',['as'=>'cetak.lejer_am', 'uses'=>'KhazanahController@cetak_lejer_am'])->middleware('auth', 'khazanah');
 

storage/debugbar/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore