From 588db3fc6015bcb97929b922b62485110ff15dd5 Mon Sep 17 00:00:00 2001 From: afiq Date: Tue, 28 Sep 2021 10:01:30 +0800 Subject: [PATCH 1/2] first --- app/Audit.php | 10 ++++++++++ app/Http/Controllers/GadaianController.php | 8 +++++--- resources/views/customers/info.blade.php | 5 ++++- resources/views/gadaian/index.blade.php | 12 ++++++++---- resources/views/penebusan/index.blade.php | 2 +- 5 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 app/Audit.php diff --git a/app/Audit.php b/app/Audit.php new file mode 100644 index 0000000..26c1d85 --- /dev/null +++ b/app/Audit.php @@ -0,0 +1,10 @@ + $keuntungan6bulan, 'upah12' => $keuntungan12bulan, 'hargajualan' => $hargajualan, - 'kuantiti_marhun' => $request->kuantiti_marhun + 'kuantiti_marhun' => $request->kuantiti_marhun, + 'transaction' => 'Daftar Gadai' ])->json(); $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[ @@ -190,7 +191,7 @@ class GadaianController extends Controller public function editstore(Request $request){ $auth_user = Auth::user(); - + $total_nilai_marhun = $request->total_nilai_marhun; $total_nilai_marhun = str_replace(',','',$total_nilai_marhun); $keuntungan_sebln = $request->keuntungan_sebulan; @@ -214,7 +215,8 @@ class GadaianController extends Controller 'upah6' => $keuntungan6bulan, 'upah12' => $keuntungan12bulan, 'hargajualan' => $hargajualan, - 'kuantiti_marhun' => $request->kuantiti_marhun + 'kuantiti_marhun' => $request->kuantiti_marhun, + 'transaction' => 'Ubah Gadai' ])->json(); $update_komuditi = Http::put(config('api.url').'/api/komuditi/update',[ 'unit_komuditi' => round($request->pinjaman, 2), diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index a4d0f2f..e06e1ff 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -416,6 +416,7 @@ var api_url = ""; var kodcaw = "{{ $cawangan_info['kodcaw'] }}"; $('#daftar_gadai').on('click',function(){ + $("#daftar_gadai").prop('disabled', true); var noic = $('#noic').val(); var iclama = "{{ $customer_info['kplama'] }}"; var icbaru = "{{ $customer_info['kpbaru'] }}"; @@ -431,13 +432,15 @@ title: 'Unit Komoditi Berbaki Minima', text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi' }); + $("#daftar_gadai").prop('disabled', false); event.preventDefault(); return false; }else{ if(Number(data['unit_komuditi']) < 50000){ + $("#daftar_gadai").prop('disabled', false); Swal.fire({ icon: 'error', - title: 'Unit Komoditi Berbaki Minumum', + title: 'Unit Komoditi Berbaki Minima', text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi' }); event.preventDefault(); diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 08eea38..db211cf 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -504,7 +504,8 @@ 'karat' : karat, 'berat_emas' :berat_emas, 'harga' : harga, - 'nilai_marhun' : nilai_marhun + 'nilai_marhun' : nilai_marhun, + 'teller' : "{{ Auth::user()->name }}" }, success:function(data){ $("#tambah_marhun").prop('disabled', false); @@ -615,7 +616,8 @@ 'karat' : karat, 'berat_emas' :berat_emas, 'harga' : harga, - 'nilai_marhun' : nilai_marhun + 'nilai_marhun' : nilai_marhun, + 'teller' : "{{ Auth::user()->name }}" }, success:function(data){ $("#tambah_marhun").prop('disabled', false); @@ -1034,7 +1036,8 @@ data: { "_token": "{{ csrf_token() }}", "norujukan" : norujuk, - "recno" : recnozz[1] + "recno" : recnozz[1], + "teller": "{{ Auth::user()->name }}" }, success:function(data){ location.reload(); @@ -1115,7 +1118,8 @@ 'harga' : harga_edit, 'n_marhun' : nilai_marhun_edit, 'marhun' : marhun_edit, - 'nota' : nota + 'nota' : nota, + "teller": "{{ Auth::user()->name }}" }, success:function(data){ getMarhun(norujukedit); diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 91d1d5f..711fd3e 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1846,7 +1846,7 @@ var marginsemasa = pinjaman_baru/nmsemasa * 100; - $.ajax({ + $.ajax({ method:'get', url: api + '/api/komuditi/check', success:function(komoditi){ From 7a2880f43c1f7d8c818d2128212f1e8910835151 Mon Sep 17 00:00:00 2001 From: afiq Date: Sun, 3 Oct 2021 03:19:11 +0800 Subject: [PATCH 2/2] update --- .../Controllers/AliranTunaiController.php | 2 +- app/Http/Controllers/CustomersController.php | 6 ++- app/Http/Controllers/KhazanahController.php | 3 +- app/Http/Controllers/KomuditiController.php | 15 +++++- app/Komoditi.php | 10 ++++ resources/views/customers/info.blade.php | 6 ++- resources/views/gadaian/edit.blade.php | 12 +++-- .../views/homepage/khazanah/home.blade.php | 2 +- .../views/operasi/komuditi/index.blade.php | 51 ++++++++++++++++-- resources/views/penebusan/index.blade.php | 54 +++++++------------ routes/web.php | 1 + 11 files changed, 113 insertions(+), 49 deletions(-) create mode 100644 app/Komoditi.php diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index de11cc7..c0455bc 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -483,7 +483,7 @@ class AliranTunaiController extends Controller if(strtoupper(Auth::user()->name) === 'LELONG'){ $penebusanbarcodescanned = floatval($lelongan); - $bakisemasa = floatval($lelongan) - floatval($totalserahan); + $bakisemasa = floatval($bakiawal) + floatval($lelongan) - floatval($totalserahan); }else{ $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); } diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index afc3d84..8424db8 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; use Twilio\Rest\Client; +use App\Komoditi; use Carbon\Carbon; @@ -52,12 +53,15 @@ class CustomersController extends Controller // $customer_info = $customers_info; // } + $komoditi = Komoditi::first(); + $min_komoditi = $komoditi['min_komoditi']; + $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('customers.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong')); + return view('customers.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi')); } public function search(Request $request){ diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index ba25597..76693c8 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -953,7 +953,8 @@ class KhazanahController extends Controller ]); $deletepanjar = Http::post(config('api.url') . '/api/DeletePanjar/'. $auth_user['cawangan'],[ - 'recno' => $request->recno + 'recno' => $request->recno, + 'users' => $auth_user['name'] ])->json(); $updateVault = Http::put( config('api.url').'/api/UpdateVault/DeletePanjar/'.$auth_user['cawangan'],[ diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 490f192..8888573 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Http; +use App\Komoditi; use PDF; class KomuditiController extends Controller @@ -18,7 +19,9 @@ class KomuditiController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); $user_name = $auth_user['name']; - return view('operasi.komuditi.index',compact('user_name','api_url')); + $komoditi = Komoditi::first(); + $min_komoditi = $komoditi['min_komoditi']; + return view('operasi.komuditi.index',compact('user_name','api_url','min_komoditi')); } public function cetakRekodKomoditi(){ @@ -42,4 +45,14 @@ class KomuditiController extends Controller return view('print.laporan_transaksi_komoditi',compact('rekod_print','tarikh_rekod')); } + + public function komoditiUpdate(Request $request){ + + $komoditi = Komoditi::first(); + + $komoditi->min_komoditi = $request->komoditi_limit; + $komoditi->save(); + + return redirect()->route('komuditi'); + } } diff --git a/app/Komoditi.php b/app/Komoditi.php new file mode 100644 index 0000000..5ba39b2 --- /dev/null +++ b/app/Komoditi.php @@ -0,0 +1,10 @@ + var api_url = ""; var kodcaw = "{{ $cawangan_info['kodcaw'] }}"; + var min_komoditi = "{{ $min_komoditi }}"; $('#daftar_gadai').on('click',function(){ $("#daftar_gadai").prop('disabled', true); var noic = $('#noic').val(); @@ -437,7 +438,7 @@ event.preventDefault(); return false; }else{ - if(Number(data['unit_komuditi']) < 50000){ + if(Number(data['unit_komuditi']) <= min_komoditi){ $("#daftar_gadai").prop('disabled', false); Swal.fire({ icon: 'error', @@ -1693,6 +1694,9 @@ $.ajax({ method:'post', url: api_url + '/api/removeupahlamatoday/' + kodcaw + '/' + id, + data:{ + "teller" : "{{ Auth::user()->name }}" + }, success:function(data){ if(data == 1) diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php index 52c6f24..184f952 100644 --- a/resources/views/gadaian/edit.blade.php +++ b/resources/views/gadaian/edit.blade.php @@ -450,7 +450,8 @@ data: { "_token": "{{ csrf_token() }}", "norujukan" : norujuk, - "recno" : recnozz[1] + "recno" : recnozz[1], + "teller": "{{ Auth::user()->name }}" }, success:function(data){ location.reload(); @@ -551,7 +552,8 @@ 'harga' : harga_edit, 'n_marhun' : nilai_marhun_edit, 'marhun' : marhun_edit, - 'nota' : nota + 'nota' : nota, + "teller": "{{ Auth::user()->name }}" }, success:function(data){ getMarhun(norujukedit); @@ -640,7 +642,8 @@ 'karat' : karat, 'berat_emas' :berat_emas, 'harga' : harga, - 'nilai_marhun' : nilai_marhun + 'nilai_marhun' : nilai_marhun, + 'teller' : "{{ Auth::user()->name }}" }, success:function(data){ $('#nota').val('').trigger("change"); @@ -736,7 +739,8 @@ 'karat' : karat, 'berat_emas' :berat_emas, 'harga' : harga, - 'nilai_marhun' : nilai_marhun + 'nilai_marhun' : nilai_marhun, + 'teller' : "{{ Auth::user()->name }}" }, success:function(data){ $('#nota').val('').trigger("change"); diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 304efd9..45dd5da 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -159,7 +159,7 @@
- Dashboard + Dashboard
Kakitangan diff --git a/resources/views/operasi/komuditi/index.blade.php b/resources/views/operasi/komuditi/index.blade.php index 66eb33f..5008fd8 100644 --- a/resources/views/operasi/komuditi/index.blade.php +++ b/resources/views/operasi/komuditi/index.blade.php @@ -19,7 +19,7 @@
-
+
No Sijil :
@@ -28,8 +28,12 @@
Harga :
+
+
Limit Komoditi :
+
{{ 'RM ' . number_format($min_komoditi) }}
+
-
+
Kod Produk / Diskripsi :
@@ -48,12 +52,19 @@

Tiada Komoditi

+
+
+
Limit Komoditi :
+
{{ 'RM ' . number_format($min_komoditi) }}
+
+
- Rekod Transaksi Komoditi + Rekod Transaksi Komoditi +
@@ -149,6 +160,36 @@
+