From 718c610609de295828d1266886889b586e562873 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 11 May 2021 13:00:46 +0800 Subject: [PATCH 01/13] fixing imbangan duga dan sedikit di server --- .../Controllers/AliranTunaiController.php | 8 +++---- app/Http/Controllers/KhazanahController.php | 24 ++++++++++++++++++- resources/views/aliran_tunai/index.blade.php | 2 -- .../views/modal/pendahuluanserahan.blade.php | 2 +- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index a6d67b7..b355410 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1455,7 +1455,7 @@ class AliranTunaiController extends Controller { if($gad['teller'] === Auth::user()->name) { - if($gad['semakbarcode'] === 'LULUS') + if($gad['semakbarcode'] == 'Lulus') $totalgadaibarcodescanned += $gad['pinjaman']; $totalgadai += $gad['pinjaman']; @@ -1528,7 +1528,7 @@ class AliranTunaiController extends Controller { return response('sama'); }else{ - $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($totaltebusbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)]; + $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)]; return response()->json($arraykemaskini); } } @@ -1549,8 +1549,8 @@ class AliranTunaiController extends Controller $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ 'kodlaluan' => $auth_user['name'], - 'keluar'=> $keluar, - 'masuk'=> $masuk, + 'keluar'=> $request->gadaian, + 'masuk'=> $request->penebusan, 'bakiakhir'=> $request->bakiakhir ]); diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index f3828ee..9586863 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3371,6 +3371,20 @@ class KhazanahController extends Controller $totaltunaiditangan = $tunaiditangan; } + $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; + //1Stop Special Case + if($auth_user['cawangan'] === '1STOP') + { + $jualan1stop = floatval(129857.00); + $belian1stop = floatval(122446.50); + $utgterkumpulxtra = floatval(6727.10); + $rugilelongxtra = floatval(10079.30); + $bakilelongxtra = floatval(123.20); + $cajlelongxtra = floatval(25.50); + $upahsimpanxtra = floatval(4894.40); + + } + //Terkumpul $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); @@ -3388,7 +3402,9 @@ class KhazanahController extends Controller if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); + if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]); + $totalhartasemasa = 0; foreach($hartasemasa as $index => $hs) { @@ -3411,7 +3427,13 @@ class KhazanahController extends Controller if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); - if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); + if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); + if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); + if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); + if($rugilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); + if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]); + if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); + $totaltanggungansemasa = 0; foreach($tanggungansemasa as $index => $ts) diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index e8fbca1..7a4deb2 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -336,9 +336,7 @@ }); } } - } }); - } let pusherenv = "{{ env('PUSHER_APP_KEY') }}"; diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php index 3b46d1c..a3c84af 100644 --- a/resources/views/modal/pendahuluanserahan.blade.php +++ b/resources/views/modal/pendahuluanserahan.blade.php @@ -12,7 +12,7 @@
- +
From e9c9aa78424d675e3542d92b21f570f304a4cbbc Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Tue, 11 May 2021 16:36:06 +0800 Subject: [PATCH 02/13] log viewer --- composer.json | 1 + composer.lock | 65 +++- config/logviewer.php | 15 + .../vendor/laravel-log-viewer/log.blade.php | 339 ++++++++++++++++++ routes/web.php | 2 +- 5 files changed, 420 insertions(+), 2 deletions(-) create mode 100644 config/logviewer.php create mode 100644 resources/views/vendor/laravel-log-viewer/log.blade.php diff --git a/composer.json b/composer.json index b88c633..fbedd0b 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "milon/barcode": "^7.0", "predis/predis": "^1.1", "pusher/pusher-php-server": "~4.0", + "rap2hpoutre/laravel-log-viewer": "^1.7", "simplesoftwareio/simple-qrcode": "^4.1", "spatie/laravel-medialibrary": "^7.19", "twilio/sdk": "^6.16", diff --git a/composer.lock b/composer.lock index df97578..020bb29 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "79aad5a75460ed20426a86ab992dab8e", + "content-hash": "4f26944f77caea167bb120f5fe970820", "packages": [ { "name": "almasaeed2010/adminlte", @@ -3337,6 +3337,69 @@ ], "time": "2020-08-18T17:17:46+00:00" }, + { + "name": "rap2hpoutre/laravel-log-viewer", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/rap2hpoutre/laravel-log-viewer.git", + "reference": "27392d29234b6ff38a456454558f4bcc40cc837a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rap2hpoutre/laravel-log-viewer/zipball/27392d29234b6ff38a456454558f4bcc40cc837a", + "reference": "27392d29234b6ff38a456454558f4bcc40cc837a", + "shasum": "" + }, + "require": { + "illuminate/support": "4.2.*|5.*|^6.0|^7.0|^8.0", + "php": ">=5.4.0" + }, + "require-dev": { + "orchestra/testbench": "3.7.*", + "phpunit/phpunit": "^7" + }, + "type": "laravel-package", + "extra": { + "laravel": { + "providers": [ + "Rap2hpoutre\\LaravelLogViewer\\LaravelLogViewerServiceProvider" + ] + } + }, + "autoload": { + "classmap": [ + "src/controllers" + ], + "psr-0": { + "Rap2hpoutre\\LaravelLogViewer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "rap2hpoutre", + "email": "raphaelht@gmail.com" + } + ], + "description": "A Laravel log reader", + "keywords": [ + "laravel", + "log", + "log-reader", + "log-viewer", + "logging", + "lumen" + ], + "support": { + "issues": "https://github.com/rap2hpoutre/laravel-log-viewer/issues", + "source": "https://github.com/rap2hpoutre/laravel-log-viewer/tree/master" + }, + "time": "2020-09-08T12:21:27+00:00" + }, { "name": "sabberworm/php-css-parser", "version": "8.3.1", diff --git a/config/logviewer.php b/config/logviewer.php new file mode 100644 index 0000000..90c2a6f --- /dev/null +++ b/config/logviewer.php @@ -0,0 +1,15 @@ + 52428800, // size in Byte + 'pattern' => env('LOGVIEWER_PATTERN', '*.log'), + 'storage_path' => env('LOGVIEWER_STORAGE_PATH', storage_path('logs')), +]; diff --git a/resources/views/vendor/laravel-log-viewer/log.blade.php b/resources/views/vendor/laravel-log-viewer/log.blade.php new file mode 100644 index 0000000..aad56db --- /dev/null +++ b/resources/views/vendor/laravel-log-viewer/log.blade.php @@ -0,0 +1,339 @@ + + + + + + + Laravel log viewer + + + + + + + +
+
+
+

Laravel Log Viewer

+

by Rap2h

+ +
+ + +
+ +
+ @foreach($folders as $folder) +
+ + {{$folder}} + + @if ($current_folder == $folder) +
+ @foreach($folder_files as $file) + + {{$file}} + + @endforeach +
+ @endif +
+ @endforeach + @foreach($files as $file) + + {{$file}} + + @endforeach +
+
+
+ @if ($logs === null) +
+ Log file >50M, please download it. +
+ @else + + + + @if ($standardFormat) + + + + @else + + @endif + + + + + + @foreach($logs as $key => $log) + + @if ($standardFormat) + + + @endif + + + + @endforeach + + +
LevelContextDateLine numberContent
+   {{$log['level']}} + {{$log['context']}}{{{$log['date']}}} + @if ($log['stack']) + + @endif + {{{$log['text']}}} + @if (isset($log['in_file'])) +
{{{$log['in_file']}}} + @endif + @if ($log['stack']) + + @endif +
+ @endif +
+ @if($current_file) + + Download file + + - + + Clean file + + - + + Delete file + + @if(count($files) > 1) + - + + Delete all files + + @endif + @endif +
+
+
+
+ + + + + + + + + + + + diff --git a/routes/web.php b/routes/web.php index ff90705..7dec167 100644 --- a/routes/web.php +++ b/routes/web.php @@ -41,7 +41,7 @@ Route::get('test', function () { // }); - +Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index'); Route::get('/welcome',function(){ From b9c89b1d6acee765abf1c6edd61382b20ef4b2e5 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 11 May 2021 16:36:47 +0800 Subject: [PATCH 03/13] fix tuntutbaki --- app/Http/Controllers/AliranTunaiController.php | 10 ++++++++-- app/Http/Controllers/LelongController.php | 6 ++++-- resources/views/lelongan/index.blade.php | 8 ++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index b355410..65c86a1 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1431,7 +1431,7 @@ class AliranTunaiController extends Controller $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json(); $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json(); $ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json(); - + $tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json(); $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json(); $totalserahan = 0; @@ -1501,11 +1501,17 @@ class AliranTunaiController extends Controller $totalupahlama += $upahlama['upahDibayar']; } + $totaltuntutbaki = 0; + foreach($tuntutbaki as $index1=>$tb) + { + $totaltuntutbaki += $tb['jumlah']; + } + $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama); $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama); $gadaian = floatval($totalgadai); - $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)); + $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false; diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5f07630..9f64533 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -91,8 +91,10 @@ class LelongController extends Controller $bakiakhir = $baki; - $bakiakhir -= $request->jumlah; - + if($request->jenis == 'T') + $bakiakhir -= $request->jumlah; + else + $bakiakhir += -($request->jumlah); //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index e275dfb..b1bd3fb 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -207,6 +207,8 @@ buttonsStyling: false }); + let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val(); + swalWithBootstrapButtons.fire({ title: 'Dapatkan Pengesahan Khazanah', text: "Tuntutan Baki Pelanggan!", @@ -246,9 +248,9 @@ } - let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val();let bakiupah = $('#keuntungan').val(); + 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();let hargajual = $('#hargajual').val(); + let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,""); $.ajax({ method:'post', @@ -273,8 +275,6 @@ var channel = pusher.subscribe('notice-ubahhapus'); channel.bind('my-ubahhapus', function(data) { - console.log(data); - if(data.norujukan == norujukan) { From 42b6079331a713df1c97841c79546ed3186d8b59 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 11 May 2021 17:17:12 +0800 Subject: [PATCH 04/13] caj perkhidmatan terkumpul tertinggal --- app/Http/Controllers/KhazanahController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 9586863..87b9f32 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3427,6 +3427,7 @@ class KhazanahController extends Controller if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); From eeb8e32743d7a06fea7662344ff073f2a41f9b28 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 12 May 2021 09:05:56 +0800 Subject: [PATCH 05/13] fix penebusan --- app/Http/Controllers/PenebusanController.php | 30 +++++ public/js/main.js | 109 ++++++++++++++++++- resources/views/khazanah/panjar.blade.php | 4 +- resources/views/modal/denopanjar.blade.php | 22 ++-- resources/views/penebusan/index.blade.php | 10 +- routes/web.php | 1 + 6 files changed, 158 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index da38505..e61b57d 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -38,6 +38,36 @@ class PenebusanController extends Controller return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa')); } + public function tebuspenuh(Request $request) + { + $api_url = config('api.url'); + + $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $request->kodcaw .'/' . $request->norujukan,[ + "nopelanggan" => $request->nopelanggan, + "jenistebus" => $request->jenistebus, + "jbg" => $request->jbg, + "kadarupah" => $request->kadarupah, + "nilai_marhun" => $request->nilai_marhun, + "pinjaman" => $request->pinjaman, + "ansuran" => $request->ansuran, + "addpinjaman" => $request->addpinjaman, + "bakipinjaman" => $request->bakipinjaman, + "bakiupah" => $request->bakiupah, + "historygadaian" => $request->historygadaian, + "marhun" => $request->marhun, + "nowakil" => $request->nowakil, + "jenisbayarantebus" => $request->jenisbayarantebus, + "teller" => $request->teller + ])->json(); + + if($updatetebus) + { + return response('success'); + }else{ + return response('fail'); + } + } + public function bayaransuransTawarruq(Request $request) { $api_url = config('api.url'); diff --git a/public/js/main.js b/public/js/main.js index 9d027d9..7403408 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -135,7 +135,6 @@ function totalkeyserahan(datakeyin) $.each(arrayambilan, function( index, arr ){ if(arr[0] == idkey) { - arrayambilan[index][1] = totalamount(idkey,valkey); } @@ -267,6 +266,114 @@ function kiraan(datakeyin) } +function kiraanpanjar(datakeyin) +{ + var idkey = $(datakeyin).attr('id'); + var valkey = $(datakeyin).val(); + var amount = 0; + let amountkiraan = 0; + + var validate = parseFloat($('#amaundiminta').val()); + + console.log(validate); + $.each(arrayambilan, function( index, arr ){ + if(arr[0] == idkey) + { + + arrayambilan[index][1] = totalamount(idkey,valkey); + } + + amount += arr[1]; + }); + + if(amount > validate) + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Jumlah denominasi melebihi kadar' + }); + } + else + { + + $('#amaunkiraan').val(amount); + + } + + switch(idkey) { + case 'bundle1': + amountkiraan += (valkey * 100); + $('#totalb1').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle20': + amountkiraan += (valkey * 1000); + $('#totalb20').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle5': + amountkiraan += (valkey * 500); + $('#totalb5').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle50': + amountkiraan += (valkey * 5000); + $('#totalb50').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle10': + amountkiraan += (valkey * 1000); + $('#totalb10').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle100': + amountkiraan += (valkey * 5000); + $('#totalb100').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen1': + amountkiraan += (valkey * 0.01); + $('#totalsen1').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen5': + amountkiraan += (valkey * 0.05); + $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen10': + amountkiraan += (valkey * 0.05); + $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen20': + amountkiraan += (valkey * 0.20); + $('#totalsen20').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen50': + amountkiraan += (valkey * 0.50); + $('#totalsen50').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit1': + amountkiraan += (valkey * 1); + $('#totalring1').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit5': + amountkiraan += (valkey * 5); + $('#totalring5').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit10': + amountkiraan += (valkey * 10); + $('#totalring10').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit20': + amountkiraan += (valkey * 20); + $('#totalring20').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit50': + amountkiraan += (valkey * 50); + $('#totalring50').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit100': + amountkiraan += (valkey * 100); + $('#totalring100').val(formatter.format(amountkiraan.toFixed(2))); + break; + } + +} + async function openuptambahdanserah(e) { var id = $(e).attr('id'); diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 2a5f9e7..190d327 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -134,7 +134,7 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'Tambah Marhun Tidak Berjaya' + text: 'Panjar Tak Berjaya' }); console.log(xhRequest); } @@ -196,7 +196,7 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'Tambah Marhun Tidak Berjaya' + text: 'Panjar Tidak Berjaya' }); console.log(xhRequest); } diff --git a/resources/views/modal/denopanjar.blade.php b/resources/views/modal/denopanjar.blade.php index 8f7fc73..76119ce 100644 --- a/resources/views/modal/denopanjar.blade.php +++ b/resources/views/modal/denopanjar.blade.php @@ -35,51 +35,51 @@ RM0.01 - + RM1 - + RM0.05 - + RM5 - + RM0.10 - + RM10 - + RM0.20 - + RM20 - + RM0.50 - + RM50 - + @@ -89,7 +89,7 @@ RM100 - + diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index cdc7a04..55aa5ad 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -926,10 +926,12 @@ var nowakil = nw; $.ajax({ - method:'put', + method:'get', datatype: 'json', - url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan, + url: "{{ route('tebus.penuh') }}", data:{ + "kodcaw" : kodcaw, + "norujukan" : norujukan, "nopelanggan" : nopelanggan, "jenistebus" : jenistebus, "jbg" : jbg, @@ -949,7 +951,7 @@ success:function(success_data){ - if(success_data == 1) + if(success_data == 'success') { $.ajax({ method: 'put', @@ -980,7 +982,7 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!', + text: 'norujukan Sudah ditebus di dalam table gadai!', }); } } diff --git a/routes/web.php b/routes/web.php index 7dec167..bf260ff 100644 --- a/routes/web.php +++ b/routes/web.php @@ -96,6 +96,7 @@ Route::get('/kemaskinialirantunai',['as'=>'kemaskini.alirantunai','uses'=>'Alira //MAINTENANCE +Route::get('/tebuspenuh',['as'=>'tebus.penuh','uses'=>'PenebusanController@tebuspenuh'])->middleware('auth','teller'); Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller'); Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller'); From e7a9a92699fda0dbd165d2f29b1c8b41003c817c Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 12 May 2021 17:44:53 +0800 Subject: [PATCH 06/13] fix plenaggan --- app/Http/Controllers/KhazanahController.php | 44 +- .../views/homepage/khazanah/home.blade.php | 2 +- resources/views/khazanah/index.blade.php | 653 ++++++++++- resources/views/khazanah/info.blade.php | 1034 +++++++++++++---- routes/web.php | 3 +- 5 files changed, 1423 insertions(+), 313 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 87b9f32..f88e879 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -36,25 +36,57 @@ class KhazanahController extends Controller $api_url = config('api.url'); $auth_user = Auth::user(); + $idtype = 'nokp'; $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bank = Http::get(config('api.url') . '/api/bank')->json(); - return view('khazanah.index',compact('search','cawangan_info','bank','api_url')); + return view('khazanah.index',compact('search','cawangan_info','bank','api_url','idtype')); + } + + public function search(Request $request){ + $noic = $request->noic; + $idtype = $request->customerIDType; + Session::put('noic', $noic); + $api_url = config('api.url'); + $auth_user = Auth::user(); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $bank = Http::get(config('api.url') . '/api/bank')->json(); + $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + + if($customers_info){ + $customer_info = $customers_info[0]; + }else{ + $customer_info = $customers_info; + } + $request->session()->forget('page_reload'); + $request->session()->forget('norujukan'); + + $search = true; + + if($customer_info){ + Session::put('customer_info_khazanah',$customer_info); + return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); + }else{ + return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype')); + } } public function info(Request $request){ $auth_user = Auth::user(); $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $customers_info = Http::get(config('api.url') . '/api/customers/'. $request->noic)->json(); + $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); if($customers_info){ $customer_info = $customers_info[0]; }else{ $customer_info = $customers_info; } + $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json(); + $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json(); + $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); - return view('khazanah.info',compact('cawangan_info','api_url','customer_info')); + return view('khazanah.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong')); } public function menu() @@ -2838,7 +2870,7 @@ class KhazanahController extends Controller } public function cetakLaporanRingkasanHarian(Request $request){ - // dd($request); + $api_url = config('api.url'); $auth_user = Auth::user(); $current = Carbon::now(); @@ -2904,11 +2936,11 @@ class KhazanahController extends Controller $totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil']; $totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil']; - $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; echo number_format($totalbilhapuskira); + $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; $totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj']; $totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj']; - $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; echo number_format($totalpinjhapuskira,2); + $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; $totalbilkawalanstok = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira; $totalpinjkawalanstok = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira; diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 9769bbe..c70cbe4 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -174,7 +174,7 @@
- Pelanggan + Pelanggan
Laporan diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php index 78fc091..4195a35 100644 --- a/resources/views/khazanah/index.blade.php +++ b/resources/views/khazanah/index.blade.php @@ -10,17 +10,31 @@
+ + +
masukkan nombor kad pengenalan
-
+
-
+
- +
- + +
+
+
@@ -29,14 +43,14 @@
@if($search == true )
-
@endif
- +
+
@@ -151,271 +400,529 @@
- - -
-
-
- -

maklumat pelanggan

- -
-
-
-
- Nama -
-
- -
-
-
-
-
-
- No Kad Pengenalan -
-
- -
-
-
- -
-
- - - -
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - - -
BilNo RujukanTarikh GadaiPembiayaanNilai MarhunTempohKeuntunganTarikh MatangMarginKos KeuntunganHapus Gadai
- - {{-- Sudah Tebus --}} - - - - - - - - - - - - - - - - - - -
BilNo RujukanTarikh GadaiPembiayaanNilai MarhunTempohKeuntunganTarikh MatangMarginKos KeuntunganHapus Gadai
- - - - - - - - - - - - - - - - - - -
BilNo RujukanTarikh GadaiPembiayaanNilai MarhunTempohKeuntunganTarikh MatangMarginKos KeuntunganHapus Gadai
- -
-
-
-
-
@endsection diff --git a/routes/web.php b/routes/web.php index bf260ff..eefb395 100644 --- a/routes/web.php +++ b/routes/web.php @@ -125,6 +125,7 @@ Route::get('/laporan/tebus',['as'=>'laporan.tebus','uses'=>'KhazanahController@l Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahController@cetakLaporanPenebusan'])->middleware('auth','khazanah'); Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah'); Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); +Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah'); Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); @@ -143,7 +144,7 @@ Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahControlle Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah'); Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah'); Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah'); -Route::get('/pelangganan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah'); +Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah'); Route::get('/unjuran',['as'=>'khazanah.unjuran','uses'=>'KhazanahController@unjuran'])->middleware('auth','khazanah'); Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar'])->middleware('auth','khazanah'); Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller'); From b35de0f1795aaefa5dc2cac2bc95ca782cc5f176 Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Fri, 14 May 2021 20:08:23 +0800 Subject: [PATCH 07/13] auto tawarruq --- config/app.php | 1 + resources/views/penebusan/index.blade.php | 606 +++++++++++++----- .../vendor/laravel-log-viewer/log.blade.php | 5 +- 3 files changed, 441 insertions(+), 171 deletions(-) diff --git a/config/app.php b/config/app.php index 7d36cfc..1b9b59d 100644 --- a/config/app.php +++ b/config/app.php @@ -177,6 +177,7 @@ return [ Yajra\DataTables\DataTablesServiceProvider::class, Barryvdh\DomPDF\ServiceProvider::class, Milon\Barcode\BarcodeServiceProvider::class, + Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class, ], diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index cdc7a04..04cbecc 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -73,6 +73,7 @@ @endif @if($gadai['hargajualan'] == null) + @endif @@ -165,9 +166,7 @@
- {{--
--}}
-
BAKI HARGA JUALAN(RM) @@ -176,7 +175,6 @@
-
BAKI PEMBIAYAAN(RM) @@ -188,7 +186,6 @@
-
PEMBIAYAAN ASAL(RM) @@ -196,7 +193,15 @@
-
+
+
+
+ BAYARAN PEMBIAYAAN(RM) +
+
+ +
+
@@ -214,10 +219,15 @@ PEMBIAYAAN H. ASAL (RM)
@php - $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100; + if($gadai['bakipjm'] != 0){ + $bakipjm = $gadai['bakipjm']; + }else{ + $bakipjm = $gadai['pinjaman']; + } + $percent_asal = ($bakipjm / $gadai['nilaimarhun']) * 100; @endphp
- +
{{ number_format($percent_asal,2) }}
@@ -253,7 +263,14 @@
- +
+
+ PERLU DIBAYAR(RM) +
+
+ +
+
@@ -289,10 +306,15 @@ PEMBIAYAAN BARU(RM)
@php - $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100; + if($gadai['bakipjm'] != 0){ + $bakipjm = $gadai['bakipjm']; + }else{ + $bakipjm = $gadai['pinjaman']; + } + $percent_hargaemassemasa = ($bakipjm / $nilaihargasemasa) * 100; @endphp
- +
{{ number_format($percent_hargaemassemasa,2) }}
@@ -349,6 +371,8 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); + $('#divperludibayartawarruq').hide(); + $('#divbayarantawarruq').hide(); var array_recno = []; @@ -568,8 +592,6 @@ success:function(success){ let bayarz = $('#bayaran').val(formatter.format(success)); - - bayaranseparuhasal = Number(success); let bakihargajual = $('#bakihargajualan').val().replace(/[^0-9.-]+/g,""); @@ -686,8 +708,8 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - - + $('#divperludibayartawarruq').hide(); + $('#divbayarantawarruq').hide(); $('#divtelahdibayar').show(); $('#divbayaran').show(); @@ -709,8 +731,8 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - - + $('#divperludibayartawarruq').hide(); + $('#divbayarantawarruq').hide(); $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').show(); @@ -731,15 +753,13 @@ $('#divpinjamanbaru').hide(); $('#divbayaranditerima').hide(); $('#divhargaemassemasa').hide(); - - + $('#divperludibayartawarruq').hide(); + $('#divbayarantawarruq').hide(); $('#divbakipinjaman').show(); $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').show(); - - $('#perludibayar').val(formatter.format(jumupah)); break; @@ -751,12 +771,12 @@ $('#divpinjamanbaru').show(); $('#divbayaranditerima').show(); $('#divhargaemassemasa').show(); - + $('#divperludibayartawarruq').hide(); $('#divtelahdibayar').hide(); $('#divbakipinjaman').hide(); $('#divbayaran').hide(); $('#divperludibayar').hide(); - + $('#divbayarantawarruq').hide(); $("#bayaran").prop("disabled", false); $("#bayaran").val(0); @@ -774,14 +794,38 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - - + $('#divperludibayartawarruq').hide(); + $('#divbayarantawarruq').hide(); $('#divtelahdibayar').hide(); $('#divbayaran').hide(); $('#divperludibayar').show(); $('#perludibayar').val(formatter.format(jumupah)); break; + case "AT": + $('input[type="checkbox"]').hide(); + $('span.spannar').show(); + $('#divpinjaman').show(); + $('#divtambahpinjaman').hide(); + $('#divpinjamanbaru').show(); + $('#divbayaranditerima').hide(); + $('#divhargaemassemasa').show(); + $('#divbayarantawarruq').show(); + $("#bayaran").prop("disabled", true); + $("#perludibayartawarruq").prop("readonly", true); + $("#bayarantawarruq").prop("readonly", false); + $("#bayaran").val(0); + $('#divperludibayartawarruq').show(); + + $('#divbakipinjaman').hide(); + $('#divtelahdibayar').hide(); + $('#divbayaran').hide(); + $('#divperludibayar').hide(); + + $('#perludibayartawarruq').val(formatter.format(jumupah)); + + break; + } }); @@ -830,6 +874,40 @@ } } + function bayartawarruq(e){ + var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,"")); + var bayaran = parseFloat(e.value); + var pinjamasal = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,"")); + + + var nm = parseFloat("{{ $gadai['nilaimarhun'] }}"); + var nmsemasa = parseFloat("{{ $nilaihargasemasa }}"); + + // console.log(nm+' '+nmsemasa); + + const percentpinj = parseFloat("{{ $percent_asal }}"); + const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru + + if(e.value != ''){ + var bayaran = parseFloat(e.value); + }else{ + var bayaran = 0; + } + + var totalbayaran = keuntungan + bayaran; + + var pinjaman_baru = pinjamasal - bayaran; + + var totalsemasa = pinjaman_baru/nmsemasa * 100; + var total= pinjaman_baru/nm * 100; + + $('#perludibayartawarruq').val(totalbayaran.toFixed(2)); + $('#hargapembiayaansemasa').val(pinjaman_baru.toFixed(2)); + $('#pinjamanbaru').val(pinjaman_baru.toFixed(2)); + $('#basic-addon2').text(totalsemasa.toFixed(2)); + $('#basic-hargaemas').text(total.toFixed(2)); + } + function bayartambahan(e){ if($('#sltjenistebus').find(":selected").val() == 'A'){ if(hargajualan == ''){ @@ -869,8 +947,6 @@ totalpinjbaru = pinjam + parseFloat(e.value); - console.log(totalpinjbaru); - var maxpinjaman = nmsemasa * 0.7; var bakimaxpinjaman = maxpinjaman - totalpinjbaru; @@ -995,152 +1071,43 @@ let jenisbayarantebus = ''; let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1); - if(hargajualan == ''){ - jenisbayarantebus = "nottawarruq"; - }else if (hargajualan != ''){ - jenisbayarantebus = "tawarruq"; + var bayar = $('#bayaran').val(); + var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran; + + if(bayar > bakipinjam){ + $("#terima_transaksi").prop('disabled', false); + Swal.fire( + 'Amaran!', + 'Bayaran tidak boleh melebihi 10% nilai marhun!', + 'error' + ) + return false; } - if(hargajualan != ''){ - var bayar = $('#bayaran').val(); - var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran; + $.ajax({ + method:'get', + url: "{{ route('bayaran.ansuranstawarruq') }}", + data:{ + "bayaran" : bayar, + "kodcaw" : kodcaw, + "norujukan" : norujukan, + "teller" : teller + }, + success:function(success_data){ + + var urlroute = '{{ route("resit.ansurans", ":id") }}'; + urlroute = urlroute.replace(':id', norujukan); - if(bayar > bakipinjam){ - $("#terima_transaksi").prop('disabled', false); Swal.fire( - 'Amaran!', - 'Bayaran tidak boleh melebihi 10% nilai marhun!', - 'error' - ) - return false; + 'Berjaya!', + 'Bayaran Ansuran Berjaya', + 'success' + ).then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) } - - $.ajax({ - method:'get', - url: "{{ route('bayaran.ansuranstawarruq') }}", - data:{ - "bayaran" : bayar, - "kodcaw" : kodcaw, - "norujukan" : norujukan, - "teller" : teller - }, - success:function(success_data){ - - var urlroute = '{{ route("resit.ansurans", ":id") }}'; - urlroute = urlroute.replace(':id', norujukan); - - Swal.fire( - 'Berjaya!', - 'Bayaran Ansuran Berjaya', - 'success' - ).then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); - }) - } - }); - - } - else if(hargajualan == ''){ - // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val())){ - // Swal.fire( - // 'Amaran!', - // 'Masukkan jumlah melebihi jumlah upah!', - // 'error' - // ) - // return false; - // } - - var bakpin = parseFloat("{{ $gadai['pinjaman'] }}") - hadbayaransuran; - - var bayar = $('#bayaran').val(); - - if(bayar > bakpin){ - $("#terima_transaksi").prop('disabled', false); - Swal.fire( - 'Amaran!', - 'Bayaran tidak boleh melebihi 10% nilai marhun!', - 'error' - ) - return false; - } - - var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val()); - - var nopelanggan = "{{ $gadai['nopelanggan'] }}"; - var jenistebus = $('#sltjenistebus').find(":selected").val(); - var jbg = "{{ $gadai['tempoh'] }}"; - var kadarupah = "{{ $gadai['kadarupah'] }} "; - var nilai_marhun = "{{ $gadai['nilaimarhun']}}"; - var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val()); - var ansuran = $('#bayaran').val(); - var addpinjaman = $('#bayaran').val(); - var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val()); - var bakiupah = 0; - var historygadaian = norujukan; - var marhun = "{{ $gadai['marhun'] }}"; - var noic = "{{ $gadai['nokp'] }}"; - var total_berat = parseFloat("{{ $gadai['berat'] }}"); - var kuantiti_marhun = Number("{{ sizeof($marhun) }}"); - - var kadarupahbaru = 0; - - if(nilai_marhun > 0 && nilai_marhun < 401.99){ - kadarupahbaru = 1.2/100; - }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){ - kadarupahbaru = 1.50/100; - }else if(nilai_marhun >= 2002 ){ - kadarupahbaru = 1.70/100; - } - - var keuntungan_sebulan = pinjaman * kadarupahbaru; - var keuntungan_6bln = keuntungan_sebulan * 6; - - - $.ajax({ - method:'get', - url: "{{ route('bayaran.ansurans') }}", - data:{ - "nopelanggan" : nopelanggan, - "jenistebus" : jenistebus, - "jbg" : jbg, - "kadarupah" : kadarupah, - "nilai_marhun" : nilai_marhun, - "pinjaman" : pinjaman, - "ansuran" : ansuran, - "addpinjaman" : addpinjaman, - "bakipinjaman" : bakipinjaman, - "bakiupah" : bakiupah, - "historygadaian" : historygadaian, - "marhun" : marhun, - "norujukan" : norujukan, - "noic" : noic, - "kadarkeuntungan" : kadarupahbaru, - "keuntungan_6bln" : keuntungan_6bln, - "keuntungan_sebulan" : keuntungan_sebulan, - "kuantiti_marhun" : kuantiti_marhun, - "lebihan" : lebihan, - "jenisbayarantebus" : jenisbayarantebus, - "teller" : teller - - }, - success:function(success_data){ - Swal.fire( - 'Berjaya!', - 'Bayaran Ansuran Berjaya', - 'success' - ).then(function() { - window.location.replace("{{ url('customer_info') }}"); - }) - },error: function (request, status, error) { - console.log(request.responseText); - } - }); - - } - ///////////// - //End File// - //////////// + }); }else if($('#sltjenistebus').find(":selected").val() == 'S'){ @@ -1787,6 +1754,311 @@ } }) + }else if($('#sltjenistebus').find(":selected").val() == 'AT'){ + + + // if(separuhla <= 10) + // { + // $("#terima_transaksi").prop('disabled', false); + // Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error'); + // return false; + // } + + // if(separuhla >= 80) + // { + // $("#terima_transaksi").prop('disabled', false); + // Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error'); + // return false; + // } + + // if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val()))) + // { + // $("#terima_transaksi").prop('disabled', false); + // Swal.fire('Amaran!','Jumlah bayaran kurang daripada jumlah yang perlu dibayar!','error'); + // return false; + // } + + + // let maxbayaran = totalmarhun * 0.1; + + // if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50){ + // $("#terima_transaksi").prop('disabled', false); + // Swal.fire( + // 'Amaran!', + // `Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`, + // 'error' + // ) + // return false; + // } + + // //checked box + // var checkboxes = document.querySelectorAll('input[type="checkbox"]'); + // var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked); + // if (checkedOne == false) { + // $("#terima_transaksi").prop('disabled', false); + // Swal.fire( + // 'Amaran!', + // 'Sila tick salah satu marhun!', + // 'error' + // ) + // return false; + // } + + // if(separuhla > 70 && separuhla <= 75){ + + // const swalWithBootstrapButtons = Swal.mixin({ + // customClass: { + // confirmButton: 'btn btn-success', + // cancelButton: 'btn btn-danger' + // }, + // buttonsStyling: false + // }); + + // swalWithBootstrapButtons.fire({ + // title: 'Dapatkan Pengesahan Khazanah', + // text: "Tetapan margin melebihi 70% untuk Khazanah!", + // icon: 'info', + // showCancelButton: true, + // confirmButtonText: 'Hantar', + // cancelButtonText: 'Batal', + // reverseButtons: true + // }).then((result) => { + // if (result.isConfirmed) { + + // let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla; + // let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh"; + // let jumpinjam = $('#bakipinjaman').val(); + // let teller = "{{ Auth::user()->name }}"; + + // Swal.fire({ + // title: 'Tunggu Pengesahan Daripada Khazanah.', + // icon: 'info', + // width: 600, + // padding: '3em', + // background: '#fffff', + // showCancelButton: false, + // showConfirmButton: false, + // allowOutsideClick: false, + // allowEscapeKey: false, + // allowEnterKey: false + // }) + // let siricreated = 0; + // $.ajax({ + // method:'post', + // url: "{{ route('khazanah.createkelulusan') }}", + // data: { + // "_token": "{{ csrf_token() }}", + // "norujukan" : norujukan, + // "komen" : komen, + // "jumpinjam" : jumpinjam, + // "teller" : teller + // }, + // success:function(data){ + // siricreated = data; + // }, + // error: function(xhr, status, error) { + // var err = eval("(" + xhr.responseText + ")"); + // alert(xhr.responseText); + // } + // }); + + // var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { + // cluster: 'ap1', + // encrypted: true + // }); + + // var channel = pusher.subscribe('notice-kelulusan'); + // channel.bind('my-kelulusan', function(data) { + + + // if(data.norujukan == norujukan && data.siri == siricreated) + // { + // if(data.kelulusan == 'lulus') + // { + // Swal.fire({ + // icon: 'success', + // title: 'Telah Disahkan', + // text: `Komen : ${data.komen}` + // }).then(function(){ + // gadaiseparuhfunc(); + // }); + + // } + // else if(data.kelulusan == 'batal') + // { + // Swal.fire({ + // icon: 'warning', + // title: 'Telah Dibatalkan', + // text: `Komen : ${data.komen}` + // }).then(function(){ + // return false; + // }); + // } + // } + + + + // }); + + + // } else if (result.dismiss === Swal.DismissReason.cancel) { + // $("#terima_transaksi").prop('disabled', false); + // swalWithBootstrapButtons.fire( + // 'Gagal', + // 'Gagal mendapatkan kelulusan khazanah', + // 'error' + // ) + // } + // }); + // event.preventDefault(); + // return false; + + // }else if((separuhla > 75 && separuhla <= 80) || pinjamanbaru >= 10000){ + + // const swalWithBootstrapButtons = Swal.mixin({ + // customClass: { + // confirmButton: 'btn btn-success', + // cancelButton: 'btn btn-danger' + // }, + // buttonsStyling: false + // }); + + // let text = ''; + // if(separuhla > 75 && separuhla <= 80) + // { + // text = 'Tetapan margin melebihi 75% untuk Operasi!'; + // }else if(pinjamanbaru >= 10000) + // { + // text = 'Pembiayaan melebihi RM 10,000!'; + // } + + + // swalWithBootstrapButtons.fire({ + // title: 'Dapatkan Pengesahan Operasi', + // text: text, + // icon: 'info', + // showCancelButton: true, + // confirmButtonText: 'Hantar', + // cancelButtonText: 'Batal', + // reverseButtons: true + // }).then((result) => { + // if (result.isConfirmed) { + + // let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla; + // let komen = ''; + // if(separuhla > 75 && separuhla <= 80) + // { + // komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh"; + // }else if(pinjamanbaru >= 10000) + // { + // komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh"; + // } + + // let jumpinjam = $('#bakipinjaman').val(); + // let teller = "{{ Auth::user()->name }}"; + + // Swal.fire({ + // title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.', + // icon: 'info', + // width: 600, + // padding: '3em', + // background: '#fffff', + // showCancelButton: false, + // showConfirmButton: false, + // allowOutsideClick: false, + // allowEscapeKey: false, + // allowEnterKey: false + // }) + // let siricreated = 0; + // $.ajax({ + // method:'post', + // url: "{{ route('operasi.createkelulusan') }}", + // data: { + // "_token": "{{ csrf_token() }}", + // "norujukan" : norujukan, + // "komen" : komen, + // "jumpinjam" : jumpinjam, + // "teller" : teller + // }, + // success:function(data){ + // siricreated = data; + // }, + // error: function(xhr, status, error) { + // var err = eval("(" + xhr.responseText + ")"); + // alert(xhr.responseText); + // } + // }); + + + // var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { + // cluster: 'ap1', + // encrypted: true + // }); + + // var channel = pusher.subscribe('notice-kelulusan'); + // channel.bind('my-kelulusan', function(data) { + + + // if(data.norujukan == norujukan && data.siri == siricreated) + // { + // if(data.kelulusan == 'lulus') + // { + // Swal.fire({ + // icon: 'success', + // title: 'Telah Disahkan', + // text: `Komen : ${data.komen}` + // }).then(function(){ + // gadaiseparuhfunc(); + // return true; + // }); + + // } + // else if(data.kelulusan == 'batal') + // { + // Swal.fire({ + // icon: 'warning', + // title: 'Telah Dibatalkan', + // text: `Komen : ${data.komen}` + // }).then(function(){ + // $("#terima_gadai").prop('disabled', false); + // return false; + // }); + // } + // } + + + + // }); + + + // }else if (result.dismiss === Swal.DismissReason.cancel){ + // $("#terima_transaksi").prop('disabled', false); + // swalWithBootstrapButtons.fire( + // 'Gagal', + // 'Gagal mendapatkan kelulusan operasi', + // 'error' + // ) + // } + // }); + // event.preventDefault(); + // return false; + + // }else if(separuhla > 80){ + // $("#terima_transaksi").prop('disabled', false); + // Swal.fire( + // 'Amaran!', + // 'Pinjaman Haruslah Dalam Lingkungan 80%!', + // 'error' + // ) + // return false; + // } + + + // gadaiseparuhfunc(); + + ///////////// + //End File// + /////////// } //Bayaran Semua function end file diff --git a/resources/views/vendor/laravel-log-viewer/log.blade.php b/resources/views/vendor/laravel-log-viewer/log.blade.php index aad56db..90a3650 100644 --- a/resources/views/vendor/laravel-log-viewer/log.blade.php +++ b/resources/views/vendor/laravel-log-viewer/log.blade.php @@ -5,10 +5,7 @@ Laravel log viewer - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
Laporan Stok Audit Tarikh Cetak: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp +
TARIKH@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp +
+ +
+ + + + + + + + + + + + @php $counter = 1;$totalpinjaman = 0; @endphp + @foreach($stokaudit['rekod'] as $index=>$item) + @php if($item['hargajualan'] == null) $totalpinjaman += $item['pinjaman']; else $totalpinjaman += $item['bakipjm']; @endphp + + + + + + + + + + + @php $counter++; @endphp + @endforeach + + + + + + + +
BilNorujukanJBGNo. KPBeratNilai Marhun (RM)PembiayaanLanjutan
{{ $counter }}{{$item['norujukan']}}{{ $item['jbg'] }}{{$item['nokp']}}{{ number_format($item['berat'],2) }}{{ number_format($item['nilaimarhun'],2) }}@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp{{$item['lelong_tawarruq']}}
Jumlah{{ number_format($stokaudit['totalberat'],2) }}{{ number_format($stokaudit['totalnilaimarhun'],2) }}{{ number_format($stokaudit['total'],2) }}
+ +
+
+ + + + + + + + + + + + + + + +
.................................................................. ..................................................................
DI SEMAK DI SAHKAN
+ + + + + + diff --git a/resources/views/print/laporan_stokaudit.blade.php b/resources/views/print/laporan_stokaudit.blade.php index de071c4..8a1e1ef 100644 --- a/resources/views/print/laporan_stokaudit.blade.php +++ b/resources/views/print/laporan_stokaudit.blade.php @@ -219,6 +219,7 @@ {{ number_format($item['berat'],2) }} {{ number_format($item['nilaimarhun'],2) }} @php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp + {{-- {{ number_format($item['pinjaman'],2) }} --}} {{$item['lelong_tawarruq']}} @php $counter++; @endphp @@ -227,6 +228,7 @@ Jumlah {{ number_format($stokaudit['totalberat'],2) }} {{ number_format($stokaudit['totalnilaimarhun'],2) }} + {{-- {{ number_format($stokaudit['total'],2) }} --}} {{ number_format($totalpinjaman,2) }} diff --git a/resources/views/print/laporan_tuntutbaki.blade.php b/resources/views/print/laporan_tuntutbaki.blade.php new file mode 100644 index 0000000..d034fc5 --- /dev/null +++ b/resources/views/print/laporan_tuntutbaki.blade.php @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{-- --}} + {{-- --}} + + + + + + {{-- + + + + + + + --}} + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
LAPORAN TUNTUT BAKI +
Tarikh: @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp
Tarikh Cetak@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp +
+ +
+ + + + + + + + + + @php $counter = 1; $totaljumlah = 0; @endphp + @foreach($tuntutbaki as $index=>$item) + @php $totaljumlah += $item['jumlah'] @endphp + @if($index > 0) + @if($item['teller'] != $tuntutbaki[$index - 1]['teller']) + + + + @php $totalpinjamanteller = 0;$totalcajlelong = 0; @endphp + @endif + @else + + + + @php $totalpinjamanteller = 0;$totalcajlelong = 0; @endphp + + @endif + + + + + + + + + @php $counter++; @endphp + @php $totalpinjamanteller += $item['jumlah'];$totalcajlelong += $item['cajlelong']; @endphp + @if($index+1 < sizeof($tuntutbaki)) + @if($item['teller'] != $tuntutbaki[$index + 1]['teller']) + + + + + + + @php $counter = 1;$totalpinjamanteller = 0;$totalcajlelong = 0; @endphp + @endif + @else + + + + + + + @endif + @endforeach +
BilNamaNo K/PNo RujukanCaj Lelong (RM)Jumlah Baki (RM)
Teller : {{ $item['teller'] }}
Teller : {{ $item['teller'] }}
{{ $counter }} + @php + + $gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json(); + $customer_detail = Http::get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json(); + echo $customer_detail[0]['nama']; + @endphp + {{$gadaidetail[0][0]['nokp']}}{{$item['norujukan']}}{{ $item['cajlelong'] }}{{ $item['jumlah'] }}
{{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }}{{ number_format($totalcajlelong,2) }} {{ number_format($totalpinjamanteller,2) }}
{{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }}{{ number_format($totalcajlelong,2) }} {{ number_format($totalpinjamanteller,2) }}
+ +
JUMLAH KESELURUHAN : RM {{ number_format($totaljumlah,2) }}
+ +
+
+ + + + + + + + + + + + + + + +
.................................................................. ..................................................................
DI SEMAK DI SAHKAN
+ + + + + + diff --git a/resources/views/print/suratgadaianhilang.blade.php b/resources/views/print/suratgadaianhilang.blade.php new file mode 100644 index 0000000..9bc7b67 --- /dev/null +++ b/resources/views/print/suratgadaianhilang.blade.php @@ -0,0 +1,99 @@ + + + Surat Akuan Gadaian + + + +
+

SURAT AKUAN BERKANUN

+

+ + @php + $poskod = Http::get($api_url . '/api/poskod/' . $customers[0]['poskod'])->json(); + $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json(); + $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json(); + + @endphp +

Saya {{ $customers[0]['nama'] }}, No. K/P : {{ $gadai[0][0]['nokp'] }} yang beralamat di {{ $customers[0]['alamat1'] . ', ' . $customers[0]['poskod'] . ', ' . $daerah['namadaerah'] . ', ' . $negeri['negeri'] }} dengan sesungguhnya dan sebenarnya mengaku bahawa: -

+ +
    +
  1. Surat Gadaian {{$cawangan_detail['namacaw']}} kepunyaan saya telah hilang dalam simpanan kerana {{ $polis[0]['komen1'] }}. Saya telah sedaya upaya berusaha mencari surat tersebut tetapi gagal menemuinya. Saya juga mengaku bahawa tidak pernah menjual atau menggadai surat tersebut kepada mana-mana institusi kewangan.
    2. +
+
    +
  1. Butir-butir mengenai kehilangan tersebut adalah seperti berikut: -
    2. +
+

 

+ + + + + + + + + + + +
Tarikh AduanTarikh SAGNo.Rujukan
{{ $polis[0]['tarikh'] }}{{$gadai[0][0]['t_gadai']}}{{ $polis[0]['norujukan'] }}
+

 

+

 

+

Dan saya membuat akuan ini dengan kepercayaan bahwa akuan ini adalah benar, serta menurut peruntukan Akta Akuan Berkanun 1960.

+

 

+ + + + + + + + + + + + + + + + + @php + list($negeriagh, $daerahagh) = explode('|', $polis[0]['komen2']); + $negeri = Http::get($api_url . '/api/negeri/' . $negeriagh)->json(); + $daerah = Http::get($api_url . '/api/daerah/' . $daerahagh)->json(); + + @endphp + + + + + + + + + + + + + + + +
Diperbuat dan dengan sesungguhnya diakui)
Oleh yang tersebut namanya di atas iaitu-)
{{ $customers[0]['nama'] }})........................................................
DI {{ $daerah['namadaerah'] }}- )
Negeri {{ $negeri['negeri'] }})
Pada........................................................)
+



+

Di Hadapan Saya,

+



+

..................................................................................

+

( Tandatangan Hakim Mahkamah Seksyen,

+

Majistret atau Pesuruhjaya Sumpah )

+ + \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 840d5cc..94dac2e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -45,7 +45,12 @@ Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index'); Route::get('/welcome',function(){ - return view('print.resittebus'); + $auth_user = Auth::user(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + return view('print.suratgadaihilang', compact('cawangan_detail')); + }); @@ -198,6 +203,8 @@ Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'us Route::get('/laporan/perbelanjaan', [ 'as'=>'laporan.perbelanjaan', 'uses'=>'KhazanahController@laporan_Perbelanjaan'])->middleware('auth','khazanah'); Route::post('/laporan/perbelanjaan/cetak', ['as'=>'perbelanjaan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan'])->middleware('auth','khazanah'); Route::get('/laporan/perbelanjaan/cetak/{baucer}', ['as'=>'perbelanjaan.cetaklaporanbaucer', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan_Baucer'])->middleware('auth','khazanah'); +Route::get('/laporan/tuntutbaki', [ 'as'=>'laporan.tuntutbaki', 'uses'=>'KhazanahController@laporan_tuntutbaki'])->middleware('auth','khazanah'); +Route::post('/laporan/tuntutbaki/cetak', ['as'=>'tuntutbaki.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_tuntutbaki'])->middleware('auth','khazanah'); // Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah'); // Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah'); @@ -234,9 +241,7 @@ 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::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'); From 460ac3d6e3a300de1869e0d04afa6fd446bf4e96 Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Sun, 23 May 2021 09:59:13 +0800 Subject: [PATCH 11/13] auto tawarruq --- .../Controllers/AliranTunaiController.php | 32 + app/Http/Controllers/GadaianController.php | 40 ++ app/Http/Controllers/PenebusanController.php | 139 ++++ resources/views/penebusan/index.blade.php | 593 ++++++++++-------- .../print/resittebusautotawarruq.blade.php | 565 +++++++++++++++++ routes/web.php | 2 + 6 files changed, 1107 insertions(+), 264 deletions(-) create mode 100644 resources/views/print/resittebusautotawarruq.blade.php diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 12a57bb..d9f125f 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1276,6 +1276,38 @@ class AliranTunaiController extends Controller } + public function alirantunaiTebusAutoTawarruq(Request $request){ + + $auth_user = Auth::user(); + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json(); + $gadai_detail = $gadai[0]; + + $tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan])->json(); + $tebus_detail = $tebus[0]; + + $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json(); + + $keluar=$getTunai2['keluar']; + $baki=$getTunai2['baki']; + $masuk=$getTunai2['masuk']; + $bakiawal=$getTunai2['bakiawal']; + $pendahuluan=$getTunai2['tambah']; + $serahan=$getTunai2['kurang']; + $totalmasuk = 0; + $bakiakhir = $baki; + $totalkeluar = 0; + + $bakiakhir = $bakiakhir + $request->totalbayaran; + + $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ + 'kodlaluan' => $tebus_detail['teller'], + 'keluar'=>$keluar, + 'masuk'=>$masuk, + 'bakiakhir'=>$bakiakhir + ]); + } + public function alirantunaiUpahBknTawarruq(Request $request){ $auth_user = Auth::user(); diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 7d9bf97..4de9172 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -425,6 +425,46 @@ class GadaianController extends Controller return view('print.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction')); } + public function resitautotawarruq($id) + { + + $auth_user = Auth::user(); + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); + + $totaltransaction = 0; + + $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json(); + + foreach($transaction as $trans) + { + $totaltransaction += $trans['duit_masuk']; + } + + if(sizeof($gadai) != 0) + $gadai = $gadai[0][0]; + + $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); + + $transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json(); + if(sizeof($customers_info) != 0) + $customers_info = $customers_info[0]; + + + $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json(); + + if(sizeof($penebusan) != 0) + $penebusan = $penebusan[0]; + + $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json(); + + // dd($wakil); + if(sizeof($wakil) != 0) + $wakil = $wakil[0]; + + return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan')); + } + public function resittebus($id) { diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index fac24d0..26f637b 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -697,6 +697,145 @@ class PenebusanController extends Controller } + public function tebusautotawarruq(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//// + /////////////////////// + $updatetebus = Http::put(config('api.url').'/api/updateautotawarruq/'. $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, + 'addpinjaman'=> $request->addpinjaman, + 'bakipinjaman' => $request->bakipinjaman, + 'bakiupah' => $request->bakiupah, + 'nowakil' => $request->nowakil, + 'historygadaian' => $request->historygadaian, + 'marhun' => $request->marhun, + 'jenisbayarantebus' => $request->jenisbayarantebus, + 'teller' => $request->teller, + + 'totalbayaran' => $request->totalbayaran, + ])->json(); + + + ////////////////////// + /// MAKING NEW SAG//// + ///////////////////// + $gadai_transaction = Http::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::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[ + 'norujukan' => $norujukanbaru, + 'nopelanggan' => $request->nopelanggan, + 'nokp' => $request->noic, + 'sirig' => $new_sirig + ]); + + + ////////////////////// + ////Update SAG BARU/// + ///////////////////// + $keuntungan_sebln = $request->keuntungan_sebulan; + $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); + + $total_nilai_marhun = $request->total_nilai_marhun; + $margin_pinjaman = $request->pinjaman / $total_nilai_marhun; + $kadarupah = $request->kadarkeuntungan * 100; + $keuntungan6bulan = $keuntungan_sebln * 6; + $keuntungan12bulan = $keuntungan_sebln * 12; + $hargajualan = $request->pinjaman + $keuntungan12bulan; + + + $gadai = Http::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 + ])->json(); + + $komuditi = Http::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::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ + 'historygadaian' => $request->norujukan + ])->json(); + + /////////////////////////// + /// MARHUN UPDATE TABLE//// + ////////////////////////// + + + $arraymarhunbaru = []; + + $marhunsediada = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); + + $marhunyangdiambil = $marhunsediada[0]; + foreach($marhunyangdiambil as $index=>$marhunloop) + { + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); + + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); + } + + foreach($arraymarhunbaru as $array1){ + $updatemarhun = Http::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'] + ])->json(); + } + + $this->AliranTunaiController->alirantunaiTebusAutoTawarruq($request); + + + return response()->json($updatemarhun,200); + + } public function tebusseparuh(Request $request) { diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 28fb008..b71dd27 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1758,305 +1758,280 @@ }else if($('#sltjenistebus').find(":selected").val() == 'AT'){ + var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,"")); + var pinjamasal = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,"")); - // if(separuhla <= 10) - // { - // $("#terima_transaksi").prop('disabled', false); - // Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error'); - // return false; - // } + var nm = parseFloat("{{ $gadai['nilaimarhun'] }}"); + var nmsemasa = parseFloat("{{ $nilaihargasemasa }}"); - // if(separuhla >= 80) - // { - // $("#terima_transaksi").prop('disabled', false); - // Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error'); - // return false; - // } + var pinjaman_baru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"")); - // if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val()))) - // { - // $("#terima_transaksi").prop('disabled', false); - // Swal.fire('Amaran!','Jumlah bayaran kurang daripada jumlah yang perlu dibayar!','error'); - // return false; - // } + var marginsemasa = pinjaman_baru/nmsemasa * 100; + if(marginsemasa < 10) + { + $("#terima_transaksi").prop('disabled', false); + Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error'); + return false; + } - // let maxbayaran = totalmarhun * 0.1; + if(marginsemasa > 80) + { + $("#terima_transaksi").prop('disabled', false); + Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error'); + return false; + } - // if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50){ - // $("#terima_transaksi").prop('disabled', false); - // Swal.fire( - // 'Amaran!', - // `Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`, - // 'error' - // ) - // return false; - // } + if(marginsemasa > 70 && marginsemasa <= 75){ - // //checked box - // var checkboxes = document.querySelectorAll('input[type="checkbox"]'); - // var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked); - // if (checkedOne == false) { - // $("#terima_transaksi").prop('disabled', false); - // Swal.fire( - // 'Amaran!', - // 'Sila tick salah satu marhun!', - // 'error' - // ) - // return false; - // } + const swalWithBootstrapButtons = Swal.mixin({ + customClass: { + confirmButton: 'btn btn-success', + cancelButton: 'btn btn-danger' + }, + buttonsStyling: false + }); - // if(separuhla > 70 && separuhla <= 75){ - - // const swalWithBootstrapButtons = Swal.mixin({ - // customClass: { - // confirmButton: 'btn btn-success', - // cancelButton: 'btn btn-danger' - // }, - // buttonsStyling: false - // }); - - // swalWithBootstrapButtons.fire({ - // title: 'Dapatkan Pengesahan Khazanah', - // text: "Tetapan margin melebihi 70% untuk Khazanah!", - // icon: 'info', - // showCancelButton: true, - // confirmButtonText: 'Hantar', - // cancelButtonText: 'Batal', - // reverseButtons: true - // }).then((result) => { - // if (result.isConfirmed) { + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Khazanah', + text: "Tetapan margin melebihi 70% untuk Khazanah!", + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Hantar', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if (result.isConfirmed) { - // let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla; - // let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh"; - // let jumpinjam = $('#bakipinjaman').val(); - // let teller = "{{ Auth::user()->name }}"; + let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa; + let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq"; + let teller = "{{ Auth::user()->name }}"; - // Swal.fire({ - // title: 'Tunggu Pengesahan Daripada Khazanah.', - // icon: 'info', - // width: 600, - // padding: '3em', - // background: '#fffff', - // showCancelButton: false, - // showConfirmButton: false, - // allowOutsideClick: false, - // allowEscapeKey: false, - // allowEnterKey: false - // }) - // let siricreated = 0; - // $.ajax({ - // method:'post', - // url: "{{ route('khazanah.createkelulusan') }}", - // data: { - // "_token": "{{ csrf_token() }}", - // "norujukan" : norujukan, - // "komen" : komen, - // "jumpinjam" : jumpinjam, - // "teller" : teller - // }, - // success:function(data){ - // siricreated = data; - // }, - // error: function(xhr, status, error) { - // var err = eval("(" + xhr.responseText + ")"); - // alert(xhr.responseText); - // } - // }); + Swal.fire({ + title: 'Tunggu Pengesahan Daripada Khazanah.', + icon: 'info', + width: 600, + padding: '3em', + background: '#fffff', + showCancelButton: false, + showConfirmButton: false, + allowOutsideClick: false, + allowEscapeKey: false, + allowEnterKey: false + }) + let siricreated = 0; + $.ajax({ + method:'post', + url: "{{ route('khazanah.createkelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan, + "komen" : komen, + "jumpinjam" : pinjaman_baru, + "teller" : teller + }, + success:function(data){ + siricreated = data; + }, + error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); - // var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { - // cluster: 'ap1', - // encrypted: true - // }); + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { + cluster: 'ap1', + encrypted: true + }); - // var channel = pusher.subscribe('notice-kelulusan'); - // channel.bind('my-kelulusan', function(data) { + var channel = pusher.subscribe('notice-kelulusan'); + channel.bind('my-kelulusan', function(data) { - // if(data.norujukan == norujukan && data.siri == siricreated) - // { - // if(data.kelulusan == 'lulus') - // { - // Swal.fire({ - // icon: 'success', - // title: 'Telah Disahkan', - // text: `Komen : ${data.komen}` - // }).then(function(){ - // gadaiseparuhfunc(); - // }); + if(data.norujukan == norujukan && data.siri == siricreated) + { + if(data.kelulusan == 'lulus') + { + Swal.fire({ + icon: 'success', + title: 'Telah Disahkan', + text: `Komen : ${data.komen}` + }).then(function(){ + gadaiautotawarruq(); + }); - // } - // else if(data.kelulusan == 'batal') - // { - // Swal.fire({ - // icon: 'warning', - // title: 'Telah Dibatalkan', - // text: `Komen : ${data.komen}` - // }).then(function(){ - // return false; - // }); - // } - // } + } + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan', + text: `Komen : ${data.komen}` + }).then(function(){ + return false; + }); + } + } - // }); + }); - // } else if (result.dismiss === Swal.DismissReason.cancel) { - // $("#terima_transaksi").prop('disabled', false); - // swalWithBootstrapButtons.fire( - // 'Gagal', - // 'Gagal mendapatkan kelulusan khazanah', - // 'error' - // ) - // } - // }); - // event.preventDefault(); - // return false; + } else if (result.dismiss === Swal.DismissReason.cancel) { + $("#terima_transaksi").prop('disabled', false); + swalWithBootstrapButtons.fire( + 'Gagal', + 'Gagal mendapatkan kelulusan khazanah', + 'error' + ) + } + }); + event.preventDefault(); + return false; - // }else if((separuhla > 75 && separuhla <= 80) || pinjamanbaru >= 10000){ + }else if((marginsemasa > 75 && marginsemasa <= 80) || pinjaman_baru >= 10000){ - // const swalWithBootstrapButtons = Swal.mixin({ - // customClass: { - // confirmButton: 'btn btn-success', - // cancelButton: 'btn btn-danger' - // }, - // buttonsStyling: false - // }); + const swalWithBootstrapButtons = Swal.mixin({ + customClass: { + confirmButton: 'btn btn-success', + cancelButton: 'btn btn-danger' + }, + buttonsStyling: false + }); - // let text = ''; - // if(separuhla > 75 && separuhla <= 80) - // { - // text = 'Tetapan margin melebihi 75% untuk Operasi!'; - // }else if(pinjamanbaru >= 10000) - // { - // text = 'Pembiayaan melebihi RM 10,000!'; - // } + let text = ''; + if(marginsemasa > 75 && marginsemasa <= 80) + { + text = 'Tetapan margin melebihi 75% untuk Operasi!'; + }else if(pinjaman_baru >= 10000) + { + text = 'Pembiayaan melebihi RM 10,000!'; + } - // swalWithBootstrapButtons.fire({ - // title: 'Dapatkan Pengesahan Operasi', - // text: text, - // icon: 'info', - // showCancelButton: true, - // confirmButtonText: 'Hantar', - // cancelButtonText: 'Batal', - // reverseButtons: true - // }).then((result) => { - // if (result.isConfirmed) { + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Operasi', + text: text, + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Hantar', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if (result.isConfirmed) { - // let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla; - // let komen = ''; - // if(separuhla > 75 && separuhla <= 80) - // { - // komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh"; - // }else if(pinjamanbaru >= 10000) - // { - // komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh"; - // } + let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa; + let komen = ''; + if(marginsemasa > 75 && marginsemasa <= 80) + { + komen = "Pembiayaan Melebihi Margin 75%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq"; + }else if(pinjamanbaru >= 10000) + { + komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq"; + } - // let jumpinjam = $('#bakipinjaman').val(); - // let teller = "{{ Auth::user()->name }}"; + let jumpinjam = $('#bakipinjaman').val(); + let teller = "{{ Auth::user()->name }}"; - // Swal.fire({ - // title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.', - // icon: 'info', - // width: 600, - // padding: '3em', - // background: '#fffff', - // showCancelButton: false, - // showConfirmButton: false, - // allowOutsideClick: false, - // allowEscapeKey: false, - // allowEnterKey: false - // }) - // let siricreated = 0; - // $.ajax({ - // method:'post', - // url: "{{ route('operasi.createkelulusan') }}", - // data: { - // "_token": "{{ csrf_token() }}", - // "norujukan" : norujukan, - // "komen" : komen, - // "jumpinjam" : jumpinjam, - // "teller" : teller - // }, - // success:function(data){ - // siricreated = data; - // }, - // error: function(xhr, status, error) { - // var err = eval("(" + xhr.responseText + ")"); - // alert(xhr.responseText); - // } - // }); + Swal.fire({ + title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.', + icon: 'info', + width: 600, + padding: '3em', + background: '#fffff', + showCancelButton: false, + showConfirmButton: false, + allowOutsideClick: false, + allowEscapeKey: false, + allowEnterKey: false + }) + let siricreated = 0; + $.ajax({ + method:'post', + url: "{{ route('operasi.createkelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan, + "komen" : komen, + "jumpinjam" : pinjaman_baru, + "teller" : teller + }, + success:function(data){ + siricreated = data; + }, + error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); - // var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { - // cluster: 'ap1', - // encrypted: true - // }); + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { + cluster: 'ap1', + encrypted: true + }); - // var channel = pusher.subscribe('notice-kelulusan'); - // channel.bind('my-kelulusan', function(data) { + var channel = pusher.subscribe('notice-kelulusan'); + channel.bind('my-kelulusan', function(data) { - // if(data.norujukan == norujukan && data.siri == siricreated) - // { - // if(data.kelulusan == 'lulus') - // { - // Swal.fire({ - // icon: 'success', - // title: 'Telah Disahkan', - // text: `Komen : ${data.komen}` - // }).then(function(){ - // gadaiseparuhfunc(); - // return true; - // }); + if(data.norujukan == norujukan && data.siri == siricreated) + { + if(data.kelulusan == 'lulus') + { + Swal.fire({ + icon: 'success', + title: 'Telah Disahkan', + text: `Komen : ${data.komen}` + }).then(function(){ + gadaiautotawarruq(); + return true; + }); - // } - // else if(data.kelulusan == 'batal') - // { - // Swal.fire({ - // icon: 'warning', - // title: 'Telah Dibatalkan', - // text: `Komen : ${data.komen}` - // }).then(function(){ - // $("#terima_gadai").prop('disabled', false); - // return false; - // }); - // } - // } + } + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan', + text: `Komen : ${data.komen}` + }).then(function(){ + $("#terima_gadai").prop('disabled', false); + return false; + }); + } + } - // }); + }); - // }else if (result.dismiss === Swal.DismissReason.cancel){ - // $("#terima_transaksi").prop('disabled', false); - // swalWithBootstrapButtons.fire( - // 'Gagal', - // 'Gagal mendapatkan kelulusan operasi', - // 'error' - // ) - // } - // }); - // event.preventDefault(); - // return false; + }else if (result.dismiss === Swal.DismissReason.cancel){ + $("#terima_transaksi").prop('disabled', false); + swalWithBootstrapButtons.fire( + 'Gagal', + 'Gagal mendapatkan kelulusan operasi', + 'error' + ) + } + }); + event.preventDefault(); + return false; - // }else if(separuhla > 80){ - // $("#terima_transaksi").prop('disabled', false); - // Swal.fire( - // 'Amaran!', - // 'Pinjaman Haruslah Dalam Lingkungan 80%!', - // 'error' - // ) - // return false; - // } + }else if(marginsemasa > 80){ + $("#terima_transaksi").prop('disabled', false); + Swal.fire( + 'Amaran!', + 'Pinjaman Haruslah Dalam Lingkungan 80%!', + 'error' + ) + return false; + } - // gadaiseparuhfunc(); + gadaiautotawarruq(); ///////////// //End File// @@ -2066,6 +2041,97 @@ //Bayaran Semua function end file } + function gadaiautotawarruq() + { + + var nopelanggan = "{{ $gadai['nopelanggan'] }}"; + var jenistebus = 'T'; + var jbg = "{{ $gadai['tempoh'] }}"; + var kadarupah = "{{ $gadai['kadarupah'] }}"; + var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}"); + var nilai_marhun = parseFloat("{{ $nilaihargasemasa }}"); + var pinjamanbaru = $('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""); + var ansuran = 0; + var addpinjaman = 0; + var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,""); + var bakipinjaman = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,"")) - bakiupah; + + var historygadaian = "{{ $gadai['norujukan'] }}"; + var marhun = "{{ $gadai['marhun'] }}"; + var noic = "{{ $gadai['nokp'] }}"; + var total_berat = parseFloat("{{ $gadai['berat'] }}"); + var pinjaman = parseFloat("{{ $gadai['pinjaman']}}"); + var kuantiti_marhun = Number("{{sizeof($marhun)}}"); + var nowakil = nw; + var perludibayar = parseFloat($('#perludibayartawarruq').val().replace(/[^0-9.-]+/g,"")); + + var kadarupahbaru = 0; + if(nilai_marhun > 0 && nilai_marhun < 400.99){ + kadarupahbaru = 1.20/100; + }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){ + kadarupahbaru = 1.50/100; + }else if(nilai_marhun >= 2001 ){ + kadarupahbaru = 1.70/100; + } + + var keuntungan_sebulan = pinjamanbaru * kadarupahbaru; + var keuntungan_6bln = keuntungan_sebulan * 6; + + $.ajax({ + method:"GET", + url: "{{ route('tebus.autotawarruq') }}", + data:{ + //yang lama + "norujukan" : norujukan, + "nopelanggan" : nopelanggan, + "jenistebus" : jenistebus, + "jbg" : jbg, + "kadarupah" : kadarupah, + "nilai_marhun" : nilai_marhun_lama, + "pinjaman_lama" : pinjaman, + "ansuran" : ansuran, + "addpinjaman" : addpinjaman, + "bakipinjaman" : bakipinjaman, + "bakiupah" : bakiupah, + "historygadaian" : historygadaian, + "marhun" : marhun, + "nowakil" : nowakil, + "jenisbayarantebus" : "nottawarruq", + "teller" : teller, + + + //yang baru + "noic" : noic, + "total_nilai_marhun" : nilai_marhun, + "pinjaman" : pinjamanbaru, + "kadarkeuntungan" : kadarupahbaru, + "keuntungan_6bln" : keuntungan_6bln, + "keuntungan_sebulan" : keuntungan_sebulan, + "total_berat" : total_berat, + "marhun_detail" : marhun, + "kuantiti_marhun" : kuantiti_marhun, + + "totalbayaran" : perludibayar, + + }, + success:function(success_data){ + + var urlroute = '{{ route("resit.autotawarruq", ":id") }}'; + urlroute = urlroute.replace(':id', norujukan); + Swal.fire( + 'Berjaya!', + 'Tebus Auto Tawarruq Berjaya', + 'success' + ) .then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + },error: function (request, status, error) { + console.log(request.responseText); + } + }); + } + function gadaiseparuhfunc() { @@ -2115,7 +2181,6 @@ }); var nopelanggan = "{{ $gadai['nopelanggan'] }}"; - var jenistebus = $('#sltjenistebus').find(":selected").val(); var jbg = "{{ $gadai['tempoh'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }}"; var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}"); @@ -2136,11 +2201,11 @@ var kadarupahbaru = 0; - if(nilai_marhun > 0 && nilai_marhun < 401.99){ + if(nilai_marhun > 0 && nilai_marhun < 400.99){ kadarupahbaru = 1.2/100; - }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){ + }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){ kadarupahbaru = 1.50/100; - }else if(nilai_marhun >= 2002 ){ + }else if(nilai_marhun >= 2001 ){ kadarupahbaru = 1.70/100; } @@ -2231,11 +2296,11 @@ var kadarupahbaru = 0; - if(nilai_marhun > 0 && nilai_marhun < 401.99){ + if(nilai_marhun > 0 && nilai_marhun < 400.99){ kadarupahbaru = 1.20/100; - }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){ + }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){ kadarupahbaru = 1.50/100; - }else if(nilai_marhun >= 2002 ){ + }else if(nilai_marhun >= 2001 ){ kadarupahbaru = 1.70/100; } diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php new file mode 100644 index 0000000..24930d5 --- /dev/null +++ b/resources/views/print/resittebusautotawarruq.blade.php @@ -0,0 +1,565 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
User Image User Image
+ + + + + + + + + + +
Salinan Pelanggan
RESIT BAYARAN
+ +
+ + + + + + + + + + + + + + + + + + + + + +
Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
+
+ +

AT

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Pinjaman : RM {{ number_format($gadai['pinjaman'],2) }}
(-) Bayaran Pinjaman : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}
Bayaran Upah : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }}
Pembiyaan Baru : RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }}
Jumlah Bayaran : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
{{ Auth::user()->name }}
+
+
+
+ +
+
+ + + + + + + + + + + + + +
Salinan Pejabat
RESIT BAYARAN
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp
No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
+
+ +

AT

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Pinjaman : RM {{ number_format($gadai['pinjaman'],2) }}
(-) Bayaran Pinjaman : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}
Bayaran Upah : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }}
Pembiyaan Baru : RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }}
Jumlah Bayaran : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
.................................................... .................................................... .................................................... ....................................................
DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
{{ Auth::user()->name }}
+
\ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 840d5cc..ea7cdef 100644 --- a/routes/web.php +++ b/routes/web.php @@ -97,6 +97,7 @@ Route::get('/kemaskinialirantunai',['as'=>'kemaskini.alirantunai','uses'=>'Alira //MAINTENANCE Route::get('/tebuspenuh',['as'=>'tebus.penuh','uses'=>'PenebusanController@tebuspenuh'])->middleware('auth','teller'); +Route::get('/tebusautotawarruq',['as'=>'tebus.autotawarruq','uses'=>'PenebusanController@tebusautotawarruq'])->middleware('auth','teller'); Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller'); Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller'); @@ -214,6 +215,7 @@ Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'Gadai Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'GadaianController@resitbelumtebus'])->middleware('auth','teller'); Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'GadaianController@resittambahpinjam'])->middleware('auth','teller'); Route::get('/resit/tuntutbaki/{id}',['as'=>'resit.tuntutbaki','uses'=>'LelongController@resittuntutbaki'])->middleware('auth','teller'); +Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'GadaianController@resitautotawarruq'])->middleware('auth','teller'); Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahController@barcodescanned'])->middleware('auth','khazanah'); From 0e977ecb6292c955b298ca9c0bc0b3be915391dd Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 24 May 2021 16:59:58 +0800 Subject: [PATCH 12/13] fix skit2 --- app/Events/NotifikasiAGH.php | 33 ++++++++ app/Http/Controllers/GadaianController.php | 6 +- app/Http/Controllers/KhazanahController.php | 75 ++++++++++++++----- resources/views/khazanah/info.blade.php | 52 ++++++++----- resources/views/khazanah/panjar.blade.php | 47 +++++++++--- resources/views/modal/agh.blade.php | 23 +++--- resources/views/modal/panjar.blade.php | 41 ++++++++++ resources/views/penebusan/index.blade.php | 28 +++++++ resources/views/print/resitadvansur.blade.php | 4 +- resources/views/print/resitansuran.blade.php | 13 ++-- .../views/print/resitansuransebelum.blade.php | 4 +- .../views/print/resittambahpinjam.blade.php | 4 +- resources/views/print/resittebus.blade.php | 5 +- .../print/resittebusseparuhbelum.blade.php | 4 +- .../views/print/suratgadaianhilang.blade.php | 68 ++++++++++------- 15 files changed, 306 insertions(+), 101 deletions(-) create mode 100644 app/Events/NotifikasiAGH.php diff --git a/app/Events/NotifikasiAGH.php b/app/Events/NotifikasiAGH.php new file mode 100644 index 0000000..3e89d31 --- /dev/null +++ b/app/Events/NotifikasiAGH.php @@ -0,0 +1,33 @@ +kodcaw = $kodcaw; + $this->message = $message; + $this->typeerror = $typeerror; + $this->pc = $pc; + } + + public function broadcastOn() + { + return ['notice-agh']; + } + + public function broadcastAs() + { + return 'my-agh'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 7d9bf97..ccdbf22 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -430,6 +430,10 @@ class GadaianController extends Controller $auth_user = Auth::user(); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + dd($cawangan_info); + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); $totaltransaction = 0; @@ -462,7 +466,7 @@ class GadaianController extends Controller if(sizeof($wakil) != 0) $wakil = $wakil[0]; - return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction')); + return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction')); } public function resitbelumtebus($id) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 8949897..f45e8a9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -9,6 +9,7 @@ use App\Events\OperasiNotice; use App\Events\PendahuluanSerahan; use App\Events\NotifikasiKelulusan; use App\Events\NotifikasiUbahHapus; +use App\Events\NotifikasiAGH; use App\User; use App\Cawangan; @@ -1712,10 +1713,10 @@ class KhazanahController extends Controller $debit_panjar= $get_Panjar_AM[0]['debit']; $recno_panjar= $get_Panjar_AM[0]['recno']; $kredit_panjar= $get_Panjar_AM[0]['kredit']; - $debit_panjar=$debit_panjar+$request->bayaran; - $harini_panjar=$debit_panjar-$kredit_panjar; - $kelmarin_panjar=$jumlah_panjar-$harini_panjar; - $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + $debit_panjar=$debit_panjar+$request->bayaran; + $harini_panjar=$debit_panjar-$kredit_panjar; + $kelmarin_panjar=$jumlah_panjar-$harini_panjar; + $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ 'recno'=>$recno_panjar, 'debit'=>$debit_panjar, 'kredit'=>$kredit_panjar, @@ -1762,6 +1763,19 @@ class KhazanahController extends Controller if($upVault == 200 && empty($panjar) == false && $upDeno == 200) { + if($request->jenismodal === 'perubatan') + { + $listUser=User::where('name','=',$request->tuntutan)->get(); + + $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran); + + $overrideuser = User::where('cawangan','=',$auth_user['cawangan']) + ->where('name','=',$request->tuntutan) + ->update(array( + 'perubatan' => $totalsebenar + )); + } + return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.'); }else{ return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.'); @@ -2963,7 +2977,7 @@ class KhazanahController extends Controller $split_date = explode('-',$request->datetimepicker1); $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json(); + $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); $marhun = $marhun[0]; $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan']; @@ -3811,33 +3825,58 @@ class KhazanahController extends Controller $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh; - $daftarpolis = Http::post(config('api.url').'/api/polis/create/',[ + $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json(); - 'kodcaw' =>$auth_user['cawangan'], - 'norujukan' => $request->norujukanhidden, - 'komen1' => $request->alasan, - 'komen2' => $kodnegeridandaerah, - 'tebus' => 0, - 'teller' => $auth_user['name'], - 'caj' => 0.00 + $daftar = 0; + if(sizeof($polis) > 0) + { + event(new NotifikasiAGH($auth_user['cawangan'],'Tak boleh generate dah kerana sudah digenerate dah.','error',$auth_user['name'])); + $daftar = 400; + }else{ + $daftarpolis = Http::post(config('api.url').'/api/polis/create/',[ - ]); - - - $daftar = $daftarpolis->getStatusCode(); + 'kodcaw' =>$auth_user['cawangan'], + 'norujukan' => $request->norujukanhidden, + 'komen1' => $request->alasan, + 'komen2' => $kodnegeridandaerah, + 'tebus' => 0, + 'teller' => $auth_user['name'], + 'caj' => 0.00 + + ]); + $daftar = $daftarpolis->getStatusCode(); + } + if($daftar == 200) { $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json(); + event(new NotifikasiAGH($auth_user['cawangan'],'Surat Akuan Gadaian Hilang berjaya dijana.','success',$auth_user['name'])); // return redirect()->route('khazanah.customer_info')->with('aghinformation','Surat Akuan Gadaian Hilang berjaya dijana.|success'); return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url')); }else{ - return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami Masalah dalam menjana.|error'); + + event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name'])); + // return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error'); } return response($daftarpolis); } + public function cetakSuratAkuanGadaianHilang(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + + + + return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url')); + } + } diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index 2b88266..319c9e3 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -7,24 +7,6 @@ @include('modal.agh') -@if(Session::has('aghinformation')) -@php list($message, $type) = explode('|', Session::get('aghinformation')); @endphp - -@endif -
@@ -425,6 +407,35 @@ +