Merge branch 'hotfix/tunai-add-timestamp' of bitbucket.org:arrahn-pkb/kaunter into hotfix/tunai-add-timestamp

app/Http/Controllers/PenebusanController.php

@@ -278,6 +278,167 @@ class PenebusanController extends Controller
         $auth_user = Auth::user();
 
 
+        ////////////////////////
+       /// UPDATE TEBUS API////
+       ///////////////////////
+        $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
+            'nopelanggan' => $request->nopelanggan,
+            'jenistebus' => $request->jenistebus,
+            'jbg' => $request->jbg,
+            'kadarupah' => $request->kadarupah,
+            'nilai_marhun' => $request->nilai_marhun,
+            'pinjaman' => $request->pinjaman_lama,
+            'ansuran' => $request->ansuran,
+            'nowakil' => $request->nowakil,
+            'addpinjaman'=> $request->addpinjaman,
+            'bakipinjaman' => $request->bakipinjaman,
+            'bakiupah' => $request->bakiupah,
+            'historygadaian' => $request->historygadaian,
+            'marhun' => $request->marhun,
+            'jenisbayarantebus' => $request->jenisbayarantebus,
+            'jeniskeuntungan' => $request->jeniskeuntungan,
+            'teller' => $request->teller,
+            "duitpelanggan" => $request->bayaran,
+            "bakipelanggan" => $request->bakipelanggan,
+        ])->json();
+
+        if($updatetebus == 'duplicate'){
+            return response()->json('duplicate');
+        }
+
+        //////////////////////
+        /// 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 tambahpinjaman_latest(Request $request)
+    {
+        $api_url = config('api.url');
+        $current = Carbon::now();
+        $current = new Carbon();
+        $curent_year = substr($current->year,2,2);
+        $curent_month = sprintf("%02d", $current->month);
+        $current_day = sprintf("%02d", $current->day);
+
+        $auth_user = Auth::user();
+
+
         ////////////////////////
        /// UPDATE TEBUS API////
        ///////////////////////

config/redeemoption.php

@@ -1,7 +1,9 @@
 <?php
 return [
     'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',1),
-    'enable_separuh' => env('ENABLE_SEPARUH',0),
+    'enable_separuh' => env('ENABLE_SEPARUH',1),
-    'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',0)
+    'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1),
+    // 'enable_specific_block' => env('ENABLE_BLOCK',0),
+    'cawangan_block' => explode(',', env('CAWANGAN_BLOCK', '1STOP,010915,010219,011013,011412,010621,010620,010617,010618')),
   ];
 ?>

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

@@ -157,7 +157,9 @@
                     <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>
+                                @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
+                                    <a class="btn btn-primary button-spacing" id="daftar_gadai">Daftar Pembiayaan</a>
+                                @endif
                                 </div>
                         <div class="nav nav-tabs" id="nav-tab" role="tablist">
                             @php
@@ -598,6 +600,13 @@
         var pinjaman = $(data).data("pinjaman");
         var hargajualan = $(data).data("hargajualan");
 
+        let array_tempblock = ['011237240808-0003','011237240719-0015','011237240806-0011','011237240828-0001',
+            '011237240904-0007','011237240904-0008','011237240904-0009','011237240719-0023','011237240719-0024',
+            '011237240719-0025','011237240618-0026','011237240719-0027','011237240719-0028','011237240618-0020',
+            '011237240719-0030','011237240618-0029','011237240731-0026','011237240715-0027','011237240912-0009',
+        ];
+
+
         Swal.fire({
             title: 'Memuatkan...',
             allowEscapeKey : false,
@@ -607,6 +616,16 @@
             }
             });
 
+        if (array_tempblock.includes(norujukan)) {
+            Swal.close();
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Surat Pembiayaan Mengalami Masalah Sila Hubungi IT'
+            });
+            return false;
+        }
+
         if(hargajualan == pinjaman){
             Swal.fire({
                 icon: 'error',

resources/views/khazanah/index.blade.php

@@ -812,20 +812,39 @@
         var nokp = $('#noic').val();
         if(id_type=='nokp'){
             if($.isNumeric(nokp) == false){
-                Swal.fire({
+                // Swal.fire({
-                    icon: 'error',
+                //     icon: 'error',
-                    title: 'Amaran!',
+                //     title: 'Amaran!',
-                    text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
+                //     text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
-                });
+                // });
-                event.preventDefault();
+                // event.preventDefault();
-                return false;
+                // return false;
+                if(nokp.substr(-1) != '*'){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
             }
             if(nokp.length != 12){
-                Swal.fire({
+                // Swal.fire({
-                    icon: 'error',
+                //     icon: 'error',
-                    title: 'Amaran!',
+                //     title: 'Amaran!',
-                    text: 'Sila Periksa No KP Pelanggan'
+                //     text: 'Sila Periksa No KP Pelanggan'
-                });
+                // });
+                if(nokp.substr(-1) != '*')
+                {
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Periksa No KP Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
                 event.preventDefault();
                 return false;
             }

resources/views/penebusan/v2/index.blade.php

@@ -91,16 +91,24 @@
                             <select class="form-control" id="sltjenistebus">
                                 <option value="T">T = Penyelesaian Pembiayaan</option>
                                     @if($gadai['tagbaru'] == 1)
-                                        <option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran Pembiayaan</option>
+                                        @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
+                                            <option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran Pembiayaan</option>
+                                        @endif
                                         @if(config('redeemoption.enable_separuh') == 1)
+                                            @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
                                             <option value="S">S = Sebahagian</option>
+                                            @endif
                                         @endif
                                         @if(config('redeemoption.enable_tambahpinjam') == 1)
+                                            @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
                                             <option value="P">P = Tambah Pembiayaan</option>
+                                            @endif
                                         @endif
                                     @endif
                                     @if(config('redeemoption.enable_pembiayaansemula') == 1)
+                                        @if(!in_array(Auth::user()->cawangan, config('redeemoption.cawangan_block', [])))
                                         <option value="AT">PS = Pembiayaan Semula</option>
+                                        @endif
                                     @endif
                                     <option value="" disabled hidden>Pilih Jenis Penyelesaian Pembiayaan</option>
                               </select>

resources/views/print/resittebusautotawarruq.blade.php

@@ -452,24 +452,22 @@ hr.new5 {
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Pembiayaan</td>
+    <td style="width:10px">B. Pembiayaan + Keuntungan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
+    @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
+    <td style="width:10px">: RM {{ number_format($temp_loan,2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">(-) Bayaran Pembiayaan</td>
+    <td style="width:10px">(-) Bayaran Pelanggan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
+    @php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
+    <td style="width:10px">: RM {{ number_format($temp_totalpay,2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">Keuntungan</td>
+    <td style="width:10px;">Jumlah Bayaran</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
+    @php $total = $temp_loan - $temp_totalpay; @endphp
-  </tr>
+    <td style="width:10px;">: RM {{ number_format($total,2) }}</td>
-  <tr>
-    <td style="width:10px">Pembiayaan Baru</td>
-    <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
   </tr>
   <tr>
       <td></td>
@@ -481,9 +479,9 @@ hr.new5 {
       <td></td>
   </tr>
   <tr>
-    <td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
+    <td style="width:10px; font-size:17px"><b>Pembiayaan Baru</b></td>
     <td style="width:5px"> </td>
-    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}</b></td>
   </tr>
 </table>
 <table id="payment" style="border: none; margin-top:20px; width:55%">
@@ -599,24 +597,22 @@ hr.new5 {
 
 <table id="payment">
   <tr>
-    <td style="width:10px">Pembiayaan</td>
+    <td style="width:10px">B. Pembiayaan + Keuntungan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
+    @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
+    <td style="width:10px">: RM {{ number_format($temp_loan,2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">(-) Bayaran Pembiayaan</td>
+    <td style="width:10px">(-) Bayaran Pelanggan</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
+    @php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp
+    <td style="width:10px">: RM {{ number_format($temp_totalpay,2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">Keuntungan</td>
+    <td style="width:10px;">Jumlah Bayaran</td>
     <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
+    @php $total = $temp_loan - $temp_totalpay; @endphp
-  </tr>
+    <td style="width:10px;">: RM {{ number_format($total,2) }}</td>
-  <tr>
-    <td style="width:10px">Pembiayaan Baru</td>
-    <td style="width:5px"> </td>
-    <td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
   </tr>
   <tr>
       <td></td>
@@ -628,9 +624,9 @@ hr.new5 {
       <td></td>
   </tr>
   <tr>
-    <td style="width:10px; font-size:17px"><b>Jumlah Bayaran</b></td>
+    <td style="width:10px; font-size:17px"><b>Pembiayaan Baru</b></td>
     <td style="width:5px"> </td>
-    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</b></td>
+    <td style="width:10px; font-size: 17px">: <b>RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}</b></td>
   </tr>
 </table>
 <table id="payment" style="border: none; margin-top:20px; width:55%">