merged production

app/Console/Commands/DailyImbangDuga.php

@@ -54,7 +54,7 @@ class DailyImbangDuga extends Command
         
         foreach($array_cawangan as $caw)
         {
-            if($caw['zone'] == $zone)
+            if($caw['version'] == 'v2')
             {
                 $response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']);
             }

app/Console/Commands/generateAkruProblem.php

@@ -63,7 +63,7 @@ class generateAkruProblem extends Command
 
         $updateIG = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/updateImbangDuga',[
             'zone' => $zone,
-            'tarikh' => $previousmonth,
+            'tarikh' => $previousmonth->toDateString(),
         ])->json();
 
         $this->info('sucess');

app/Http/Controllers/PenebusanController.php

@@ -257,7 +257,8 @@ class PenebusanController extends Controller
             'karat' => $array1['karat'],
             'berat_emas' => $array1['berat'],
             'harga' => $array1['harga'],
-            'nilai_marhun' => $array1['n_marhun']
+            'nilai_marhun' => $array1['n_marhun'],
+	    'kuantiti' => $array1['bil']
         ])->json();
 
         }
@@ -308,12 +309,129 @@ class PenebusanController extends Controller
             "nowakil" => isset($request->nowakil) ? $request->nowakil : 0
         ])->json();
 
-        if($updatetebus['result'] == 'success'){
+        if($updatetebus == 'duplicate'){
-            event(new TebusNotify('lulus',Auth::user()->cawangan));
+            return response()->json('duplicate');
-            event(new GadaiNotify('lulus',Auth::user()->cawangan));
-            $this->AliranTunaiController->alirantunaiTebus($request);
         }
-        return response()->json($updatetebus['result'],200);
+
+        //////////////////////
+        /// MAKING NEW SAG////
+        /////////////////////
+
+        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+        ///////////////////////////
+        /// MARHUN UPDATE TABLE////
+        //////////////////////////
+
+
+        $arraymarhunbaru = [];
+
+        $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+        $marhunyangdiambil = $marhunsediada[0];
+        foreach($marhunyangdiambil as $index=>$marhunloop)
+        {
+            $karatbaru = str_replace('.','-',$marhunloop['karat']);
+            $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+            $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
+
+            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
+        }
+
+        foreach($arraymarhunbaru as $array1){
+            $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+                'norujukan' => $norujukanbaru,
+                'marhun' => $array1['marhun'],
+                'nota' => $array1['nota'],
+                'karat' => $array1['karat'],
+                'berat_emas' => $array1['berat'],
+                'harga' => $array1['harga'],
+                'tag_permata' => $array1['tag_permata'],
+                'berat_batu_permata' => $array1['berat_batu_permata'],
+		'kuantiti' => $array1['bil']
+            ])->json();
+        }
+
+
+
+       //////////////////////
+      ////Update SAG BARU///
+      /////////////////////
+
+        $total_nilai_marhun = $request->nilai_marhun;
+        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
+        $kadarupah = $request->kadarkeuntungan * 100;
+
+        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
+            'pembiayaan' => $request->pinjaman,
+            'nilaimarhun' => $total_nilai_marhun,
+            'kadarujrah' => $request->kadarkeuntungan,
+            'margin' => ($margin_pinjaman*100),
+            'kodcaw' => Auth::user()->cawangan
+        ])->json();
+
+        $keuntungan_sebln = $onepercent['keuntungan'];
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun
+        ])->json();
+
+        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
+        ////////////////////////////
+        ////Update History Gadaian///
+        ////////////////////////////
+
+        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan,
+            'jenistebus' => $request->jenistebus,
+        ])->json();
+
+
+        event(new TebusNotify('lulus',Auth::user()->cawangan));
+        event(new GadaiNotify('lulus',Auth::user()->cawangan));
+        $this->AliranTunaiController->alirantunaiTebus($request);
+
     }
 
     public function tebusautotawarruq(Request $request)
@@ -348,14 +466,130 @@ class PenebusanController extends Controller
             "jenisAT" => $request->jenisAT,
         ])->json();
 
-
+        if($updatetebus == 'duplicate'){
-        if($updatetebus['result'] == 'success'){
+            return response()->json('duplicate');
-            $alirantunai = new AliranTunaiController();
-            event(new TebusNotify('lulus',Auth::user()->cawangan));
-            event(new GadaiNotify('lulus',Auth::user()->cawangan));
-            $alirantunai->alirantunaiTebusAutoTawarruq($request);
         }
 
+        //////////////////////
+       /// MAKING NEW SAG////
+       /////////////////////
+        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+       $arraymarhunbaru = [];
+
+       $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+       $marhunyangdiambil = $marhunsediada[0];
+       foreach($marhunyangdiambil as $index=>$marhunloop)
+       {
+           $karatbaru = str_replace('.','-',$marhunloop['karat']);
+           $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+           $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
+           $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
+
+           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
+       }
+
+       foreach($arraymarhunbaru as $array1){
+           $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+               'norujukan' => $norujukanbaru,
+               'marhun' => $array1['marhun'],
+               'nota' => $array1['nota'],
+               'karat' => $array1['karat'],
+               'berat_emas' => $array1['berat'],
+               'harga' => $array1['harga'],
+               'nilai_marhun' => $array1['n_marhun'],
+               'tag_permata' => $array1['tag_permata'],
+               'berat_batu_permata' => $array1['berat_batu_permata'],
+               'jenisAT' => $request->jenisAT
+	       'kuantiti' => $array1['bil']
+           ])->json();
+       }
+
+        //////////////////////
+       ////Update SAG BARU///
+       /////////////////////
+
+
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun);
+
+        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
+            'pembiayaan' => $request->pinjaman,
+            'nilaimarhun' => $total_nilai_marhun,
+            'kadarujrah' => $request->kadarkeuntungan,
+            'margin' => ($margin_pinjaman*100),
+            'kodcaw' => Auth::user()->cawangan
+        ])->json();
+
+        $keuntungan_sebln = $onepercent['keuntungan'];
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+        ]);
+
+
+        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
+        ////////////////////////////
+       ////Update History Gadaian///
+       ////////////////////////////
+
+        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan,
+            'jenistebus' => $request->jenistebus,
+        ])->json();
+
+
+        $alirantunai = new AliranTunaiController();
+        event(new TebusNotify('lulus',Auth::user()->cawangan));
+        event(new GadaiNotify('lulus',Auth::user()->cawangan));
+        $alirantunai->alirantunaiTebusAutoTawarruq($request);
+
         return response()->json($updatetebus['result'],200);
     }
 
@@ -394,6 +628,9 @@ class PenebusanController extends Controller
             "bakipelanggan" => $request->bakipelanggan,
         ])->json();
 
+        if($updatetebus == 'duplicate'){
+            return response()->json('duplicate');
+        }
 
         //////////////////////
        /// MAKING NEW SAG////
@@ -453,6 +690,7 @@ class PenebusanController extends Controller
                 'tag_permata' => $array1['tag_permata'],
                 'berat_batu_permata' => $array1['berat_batu_permata'],
                 'nilai_marhun' => $array1['n_marhun']
+		'kuantiti' => $array1['bil']
             ])->json();
 
         }

app/Services/ImbangdugaServices.php

@@ -56,7 +56,7 @@ class ImbangdugaServices
                 
                 if($kodcaw == '010219')
                     if($tarikh >= '2022-11-24')
-                        $data = $value - 78379.9;
+                        $data = $value;
                     else $data = $value;
                 else $data = $value;
             break;
@@ -64,7 +64,12 @@ class ImbangdugaServices
                 if($kodcaw == '010219')
                     if($tarikh < '2022-11-24')
                         $data = $value - 78379.9;
-                    else $data = $value;
+                    else if($tarikh >= '2023-02-16'){
+                            $hutang = Http::get(config('api.url').'/admin/ig/penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json();
+                            $bayaran_hutang = Http::get(config('api.url').'/admin/ig/bayaran_penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json();
+                            $data = $hutang['bakihutang'] - $bayaran_hutang;
+                    }else $data = $value;
+                    //else $data = $value;
                 else $data = $value;
             break;
             case 'jualan1stop':

config/redeemoption.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',1),
-    'enable_separuh' => env('ENABLE_SEPARUH',1),
+    'enable_separuh' => env('ENABLE_SEPARUH',0),
-    'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1)
+    'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',0)
   ];
 ?>

resources/views/callcenter/v2/info.blade.php

@@ -118,26 +118,25 @@
                             <input type="text" class="form-control" name="rugilelong" id="rugilelong" readonly value="{{ number_format($rugilelong,2) }}">
                         </div>
                     </div>
+
+                    <div class="col-md-12 d-flex justify-content-end mt-3">
+                <button class="btn btn-primary" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
+            </div>
                 </div>
                 
+
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">
                     <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai.
+                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
                         </label>
-                        <label class="btn btn-primary">
+                        <label class="btn btn-secondary">
                             <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
                         </label>
-                        <label class="btn btn-primary">
+                        <label class="btn btn-secondary">
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
                         </label>
                     </div>
-                    <div class='col-md-3'>
-                        {{-- <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> --}}
-                    </div>
-                    <div class="col-md-3 text-right">
-                        <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
-                    </div>
                 </div>
             </div>
             <div class="card">

resources/views/customers/v2/info.blade.php

@@ -12,7 +12,7 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
-
+        <div class="card">
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb pb-3">
                   <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -89,10 +89,8 @@
                     </div>
 
                 </div>
-
                 <div class="col-md-6">
-
+                <div class="form-group row">
-                    <div class="form-group row">
                         <div class="col-md-4">
                             <b>No Telefon</b>
                         </div>
@@ -119,30 +117,48 @@
                         </div>
                     </div>
                 </div>
-
-                <div class="col-md-12 mt-md-3 justify-content-between form-group row">
-                    <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
-                        </label>
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
-                        </label>
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
-                        </label>
-                    </div>
-                    <div class='col-md-3'>
-                        <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
-                    </div>
-                    <div class="col-md-3 text-right">
-                        <a class="btn btn-primary" style="margin-right:-50px" id="daftar_gadai">Daftar Pembiayaan</a>
-                    </div>
-                </div>
             </div>
-            <div class="card">
+
+            <!-- footer card -->
+<div class="mr-4 form-group d-flex justify-content-end">
+    <button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> 
+</div>
+
+</div>
+
+</div>       
+        
+    <!-- button -->
+
+  <div class="col-md-10 mt-md-2 justify-content-between form-group row">
+  <div class="btn-group btn-group-toggle d-flex flex-fill" data-toggle="buttons">
+    <label class="btn btn-secondary flex-fill">
+        <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>
+        Pembiayaan Belum Selesai
+    </label>
+    <label class="btn btn-secondary flex-fill">
+        <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">
+        Pembiayaan Sudah Selesai
+    </label>
+    <label class="btn btn-secondary flex-fill">
+        <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">
+        Lelong
+    </label>  
+  </div>
+
+</div>
+
+      
+<!-- card -->
+ 
+    <div class="col-md-12 col-lg-12">
+         <div class="card">
                 <div class="card-body">
                     <nav class="mb-3">
+                        <!-- button -->
+                            <div class="mr-2 form-group d-flex justify-content-end">
+                        <a class="btn btn-primary button-spacing" id="daftar_gadai">Daftar Pembiayaan</a>
+                                </div>
                         <div class="nav nav-tabs" id="nav-tab" role="tablist">
                             @php
                                 $activate_tab = request()->session()->pull('activate_tab', 'SAG_lama');
@@ -254,6 +270,7 @@
         </div>
     </div>
 </div>
+</div>
 
 <!-- Modal -->
 <div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
@@ -1617,7 +1634,7 @@
         });
     }
 
-    function ubahPembiayaanSemulaErrorHandling()
+    async function ubahPembiayaanSemulaErrorHandling()
     {
         let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked')
 
@@ -1638,7 +1655,7 @@
             return true;
         }
 
-        let isPS = checkPS(selected.value)
+        let isPS = await checkPS(selected.value)
 
         if(isPS === true){
             Swal.fire({
@@ -1653,9 +1670,9 @@
         return false;
     }
 
-    function ubahfunc(e){
+    async function ubahfunc(e){
 
-        let isError = ubahPembiayaanSemulaErrorHandling()
+        let isError = await ubahPembiayaanSemulaErrorHandling()
         if(isError){
             return;
         }

resources/views/khazanah/v2/info.blade.php

@@ -1,5 +1,11 @@
 @extends('layouts.app')
 
+<style>
+    #daftar_gadai{
+        color:#fff !important;
+    }
+</style>
+
 
 @section('content')
 @include('modal.historytebus')
@@ -10,7 +16,7 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
-
+        <div class="card">
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb pb-3">
                   <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -85,7 +91,7 @@
 
                 <div class="col-md-6">
 
-                    <div class="form-group row">
+                <div class="form-group row">
                         <div class="col-md-4">
                             <b>No Telefon</b>
                         </div>
@@ -112,27 +118,37 @@
                         </div>
                     </div>
                 </div>
-
-                <div class="col-md-12 mt-md-3 justify-content-between form-group row">
-                    <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
-                        </label>
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
-                        </label>
-                        <label class="btn btn-primary">
-                            <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
-                        </label>
-                    </div>
-                    <div class='col-md-3 text-right'>
-                    </div>
-                    <div class="col-md-3 text-right">
-                        <button class='btn btn-primary' data-toggle="modal" style="margin-right:-50px" data-target="#customer_detail">Maklumat Pelanggan</button>
-
-                    </div>
-                </div>
             </div>
+
+            <!-- footer card -->
+            <div class="mr-4 form-group d-flex justify-content-end">
+    <button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> 
+</div>
+
+</div>
+
+</div>       
+        
+    <!-- button -->
+
+    <div class="col-md-10 mt-md-2 justify-content-between form-group row">
+
+      <div class="btn-group btn-group-toggle d-flex flex-fill" data-toggle="buttons">
+        <label class="btn btn-secondary flex-fill">
+            <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
+        </label>
+        <label class="btn btn-secondary flex-fill">
+            <input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
+        </label>
+        <label class="btn btn-secondary flex-fill">
+            <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
+        </label>  
+      </div>
+    </div>
+            </div>
+
+
+
             <div class="card">
                 <div class="card-body">
                     <nav class="mb-3">

resources/views/operasi/daftar_kakitangan.blade.php

@@ -124,12 +124,12 @@
                                             <td>{{ $staff->name }}</td>
                                             <td>{{ strtoupper($staff->roles) }}</td>
                                             <td>
-                                                @if($staff->cawangan == 'operasi')
+                                                @if($staff->cawangan == 'operasi' || $staff->cawangan == 'callcenter' || $staff->cawangan == 'admin')
                                                     {{ ucwords($staff->cawangan) }}
                                                 @else
                                                     @php
                                                     $cawangan_staff = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json();
-                                                    echo  ($cawangan_staff) ? ucwords($cawangan_staff['details_caw']) : 'test';
+                                                    echo  (isset($cawangan_staff['details_caw'])) ? ucwords($cawangan_staff['details_caw']) : 'test';
                                                     @endphp
                                                 @endif
                                             </td>

resources/views/print/sag_ujrah_3.blade.php

@@ -231,13 +231,13 @@
             display: flex;
             justify-content: center;
             align-items: center;
-            margin-top: -140px;
+            margin-top: -135px;
         }
 
         .main-kaki-sag {
             border: 1px solid black;
             padding: 10px;
-            width: 200px;
+            width: 245px;
             transform: rotate(-90deg);
             font-size: 9px;
         }
@@ -1644,7 +1644,7 @@
                                     '" alt="barcode" />';
                             @endphp
                         </div>
-                        <div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div>
+                       {{-- <div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div> --}}
                     </div>
                     <div class="detail-kaki-sag">
                         <div class="ps-positioning {{ $is_pembiayaan_semula == false ? 'hidden' : '' }}">

resources/views/print/surat_wakil.blade.php

@@ -152,21 +152,18 @@
 
   <table id="details" style="margin-top:20px;">
     <tr>
-      <td colspan="2">Saya seperti nama di atas, ingin memaklumkan kepada Ar-Rahn Koperasi Permodalan Kelantan Berhad
+        <td colspan="2">
-        bagi Cawangan {{ $cawangan_detail['namacaw'] }}, bahawa saya tidak dapat hadir untuk melakukan transaksi:
+            Saya seperti nama di atas, ingin memaklumkan kepada Ar-Rahn Koperasi Permodalan Kelantan Berhad
-      </td>
+            bagi Cawangan {{ $cawangan_detail['namacaw'] }}, bahawa saya tidak dapat hadir untuk melakukan transaksi:
+        </td>
     </tr>
     <tr>
-      <td>
+        <td>
-        Penyelesaian Penuh
+            <input type="checkbox"><strong>Penyelesaian Penuh</strong>
-      </td>
+        </td>
     </tr>
-    <tr>
+</table>
-      <td>
+
-        Penyelesaian Penuh dan Permohonan Pembiayaan Baru
-      </td>
-    </tr>
-  </table>
 
   <table id="details" style="margin-top:20px;">
     <tr>
@@ -200,11 +197,8 @@
     </tr>
   </table>
 
-  <table id="details" style="margin-top:20px;">
+  <br>
-    <tr>
+  <br>
-      <td colspan="2">2. Saya mengaku tidak akan membuat apa-apa <b>TUNTUTAN @ GANTI RUGI</b> atas kebarangkalian @
-        kerugian yang berlaku disebabkan perlantikan wakil bagi menyelesaikan pembiayaan saya.</td>
-    </tr>
 
   </table>