diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 022a918..a7c818f 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -225,6 +225,17 @@ class GadaianController extends Controller
return redirect()->route('customer_info');
}
+ public function batalmarhun(Request $request){
+ $norujukan = $request->norujukan;
+ $auth_user = Auth::user();
+
+
+ // Http::delete(config('api.url').'/api/gadai/batal/'. $auth_user['cawangan'] .'/' . $norujukan);
+ // $request->session()->forget('page_reload');
+ // $request->session()->forget('norujukan');
+ // return redirect()->route('customer_info');
+ }
+
public function cetakSAG(Request $request){
$auth_user = Auth::user();
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 941db0c..ef4f01a 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -192,8 +192,11 @@ class KhazanahController extends Controller
{
$denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
}
+ else
+ {
+ $denominasi=$denominasi[0];
+ }
- // dd($denominasi);
return view('khazanah.pendahuluanserah',compact('cawangan_info','api_url','listUser','denominasi','array_reqteller'));
}
@@ -521,6 +524,10 @@ class KhazanahController extends Controller
$rekodring20 -= intval($request->ambilanring20);
$rekodring50 -= intval($request->ambilanring50);
$rekodring100 -= intval($request->ambilanring100);
+
+
+ // dd($rekodring1);
+ // dd($rekodb1,$rekodb5,$rekodb10,$rekodb20,$rekodb50,$rekodb100,$rekodsen1,$rekodsen5,$rekodsen10,$rekodsen20,$rekodsen50,$rekodring1,$rekodring5,$rekodring10,$rekodring20,$rekodring50,$rekodring100);
$denominasicreate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
@@ -549,6 +556,7 @@ class KhazanahController extends Controller
]);
+
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
'no'=>$request->no
@@ -662,14 +670,11 @@ class KhazanahController extends Controller
if($amount>$baki_awal)
{
- dd($amount);
//WI ERROR MESSAGE SKIT
}
else
{
-
-
$tarikh=$request->tarikh;
$kodlaluan=$request->teller;
$tambah=$request->amt;
@@ -695,16 +700,13 @@ class KhazanahController extends Controller
{
$bakiawal=0;$masuk=0;$yuran=0;$keluar=0;$baki=0;$tmbh=0;$kurang=0;
- // $daftarTunai=Http::post(config('api.url').'/api/tunai/daftarTunai/'.$auth_user['cawangan'],[
- // 'teller'=>$request->teller
- // ]);
-
$BakiAkhirT=0;$BakiAwalT=0;$tambahT=0;
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$bakiAwal=$getTunai2['bakiawal'];
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
+ $kurangT=$getTunai2['kurang'];
$tam=$getTunai2['tambah'];
if($bakiAwal==0)
@@ -722,8 +724,8 @@ class KhazanahController extends Controller
else
$tambahT=$keluar;
- $kurang=0;
- $BakiAkhirT=$BakiAwalT+$tambahT;
+ $kurang=$kurangT;
+ $BakiAkhirT=$BakiAwalT+$tambahT-$kurang;
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'].'/'.$kodlaluan, [
@@ -740,8 +742,9 @@ class KhazanahController extends Controller
$BakiAwalV=$latestVault[0]['bakiawal'];
// return;
-
- $keluarV=$keluarV+$tambahT;
+ // dd($tambahT);
+ $keluarV=$tambahT;
+
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
$bakiTerkini=$GetLatestBakiTunai;
@@ -784,25 +787,24 @@ class KhazanahController extends Controller
public function KemaskiniSerahan(Request $request)
{
-
-
$auth_user = Auth::user();
$api_url = config('api.url');
+
$peti_besi_terkini=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
- $baki_akhir=$peti_besi_terkini[0]["bakiakhir"];
- $teller=$request->teller;
- $getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'].'/'.$teller)->json();
- $bakiAkhir=$getTunai[0]['baki'];
- $keluarT=$getTunai[0]['keluar'];
- $masukT=$getTunai[0]['masuk'];
- $tambahT=$getTunai[0]['tambah'];
- $kurangT=$getTunai[0]['kurang'];
- $bakiAwalT=$getTunai[0]['bakiawal'];
+ if(sizeof($peti_besi_terkini) == 0)
+ {
+ $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
+ $baki_awal=$peti_besi_terkini["bakiawal"];
+ }
+ else
+ {
+ $baki_awal=$peti_besi_terkini[0]["bakiawal"];
+ }
- $tambah=$request->tambah;
+ $amount = $request->amt;
- if($tambah>$bakiAkhir)
+ if($amount>$baki_awal)
echo "Maaf, Serahan Lebih Besar Dari Baki Akhir Cash Box";
else
@@ -810,96 +812,127 @@ class KhazanahController extends Controller
$tarikh=$request->tarikh;
$kodlaluan=$request->teller;
- $kurang=$request->kurang;
+ $kurang=$request->amt;
$nota=$request->nota;
$kodcaw=$auth_user['cawangan'];
-
-
+ $tambahT = 0;
+
$addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[
- 'kodcaw'=>$kodcaw,
- 'teller'=>$request->teller,
- 'tambah'=>$tambahT,
- 'kurang'=>$kurang,
- 'nota'=>$nota]);
+ 'kodcaw'=>$kodcaw,
+ 'kodlaluan'=>$kodlaluan,
+ 'tambah'=>$tambahT,
+ 'kurang'=>$kurang,
+ 'nota'=>$nota]);
-
-
- $tambah_T=0;$kurang_T=0;$baki_AwalT=0.0;
-
- if($tambahT==0)
- $tambah_T=0;
-
+ $getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
+
+ if(sizeof($getTunai) == 0)
+ {
+ // dd($getTunai);
+ }
else
- $tambah_T=$tambahT+$tambah;
+ {
+ $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
+ $bakiAwalT=$getTunai2['bakiawal'];
+ $keluarT=$getTunai2['keluar'];
+ $baki=$getTunai2['baki'];
+ $tambahT=$getTunai2['tambah'];
+ $kurangT=$getTunai2['kurang'];
+ $masukT=$getTunai2['masuk'];
-
- if($kurangT==0)
- $kurang_T=$kurang;
-
- else {
- $kurang=$kurang+$kurangT;
- $kurang_T=$kurang;
- }
-
- if($bakiAwalT==0)
- $baki_AwalT=0;
-
- else
- $baki_AwalT=$bakiAwalT;
-
-
- $bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T;
-
- //dd($bakiAkhirT, $tambah_T,$masukT,$keluarT,$kurang);
-
-
- $latestVault=Http::get(config('api.url').'/api/currentVault/'.$auth_user['cawangan'])->json();
- $masukV=$latestVault[0]['masuk'];
- $keluarV=$latestVault[0]['keluar'];
- $pendahuluanV=$latestVault[0]['pendahuluan'];
- $serahanV=$latestVault[0]['serahan'];
-
- $masuk_V=0;$pendahuluan_V=0;$keluar_V=0;$serahan_V=0;
-
- if($masukV==0)
- $masuk_V=0;
+ //dd($getTunai2);
- else
- $masuk_V=$masukV;
-
- if($keluarV==0)
- $keluar_V=0;
-
- else
- $keluar_V=$keluarV;
+ $tambah_T=0;$kurang_T=0;$baki_AwalT=0.0;
-
- if($pendahuluanV==0)
- $pendahuluan_V=0;
+ if($tambahT==0)
+ $tambah_T=0;
+
+ else
+ $tambah_T=$tambahT;
+
+
+ if($kurangT==0)
+ $kurang_T=$kurang;
+
+ else
+ {
+ $kurang=$kurang+$kurangT;
+ $kurang_T=$kurang;
+ }
+
+ if($bakiAwalT==0)
+ $baki_AwalT=0;
+
+ else
+ $baki_AwalT=$bakiAwalT;
+
+
+ $bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T;
- else
- $pendahuluan_V=$pendahuluanV;
+ $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'].'/'.$kodlaluan, [
+ 'tambah'=>$tambah_T,
+ 'kurang'=>$kurang_T,
+ 'bakiakhir'=>$bakiAkhirT
+ ]);
+
+ //dd($baki_AwalT,$tambah_T,$masukT,$keluarT,$kurang_T,$bakiAkhirT);
+
+ $latestVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
+ //dd($latestVault);
+ $masukV=$latestVault[0]['masuk'];
+ $keluarV=$latestVault[0]['keluar'];
+ $pendahuluanV=$latestVault[0]['pendahuluan'];
+ $serahanV=$latestVault[0]['serahan'];
+ $bakiAwalV=$latestVault[0]['bakiawal'];
+
+
+ //dd($latestVault);
+
+ $masuk_V=0;$pendahuluan_V=0;$keluar_V=0;$serahan_V=0;
+
+ if($masukV==0)
+ {
+ $masuk_V=0+$kurang_T;
+ }
+ else
+ {
+ $masuk_V=$masukV;
+ }
+
+ if($keluarV==0)
+ $keluar_V=0;
+
+ else
+ $keluar_V=$keluarV;
- if($serahanV==0)
- $serahan_V=0;
+
+ if($pendahuluanV==0)
+ $pendahuluan_V=0;
+
+ else
+ $pendahuluan_V=$pendahuluanV;
+
+
+ if($serahanV==0)
+ $serahan_V=0;
+
+ else
+ $serahan_V=$serahanV;
- else
- $serahan_V=$serahanV;
-
-
+ }
}
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
$sumBaki=$GetLatestBakiTunai;
+
$bakiAkhirV=$bakiAwalV-$keluar_V+$masuk_V+$pendahuluan_V-$serahan_V;
- // dd($bakiAkhirV,$bakiAwalV,$keluar_V,$masuk_V,$pendahuluan_V,$serahan_V);
- $BakiEOD=$bakiAkhirV+$sumBaki;
- // dd($BakiEOD);
-
+ //dd($bakiAkhirV,$bakiAwalV,$keluar_V,$masuk_V,$pendahuluan_V,$serahan_V);
+ $BakiEOD=$bakiAkhirV;
+ // $BakiEOD=$bakiAkhirV+$sumBaki;
$updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[
'masuk'=>$masuk_V,
@@ -907,13 +940,10 @@ class KhazanahController extends Controller
'bakiawal'=>$bakiAwalV,
'bakiakhir'=>$bakiAkhirV,
'bakieod'=>$BakiEOD
-
-
]);
- //--FINAL RESULT...KENA RIDERECT KE PAGE SEBELUMNYA..
+ //--FINAL RESULT...KENA RIDERECT KE PAGE SEBELUMNYA..
- dd($updateVault);
return $this->denominasicalculationserahan($request);
}
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index 96f36e8..eb2d605 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -45,7 +45,7 @@
-
+
@@ -59,6 +59,7 @@
Karat |
Berat |
Nota |
+ Harga |
Action |
@@ -84,13 +85,26 @@
+ @php
+ if($gadaiannorujukan['nilaimarhun'] > 0 && $gadaiannorujukan['nilaimarhun'] < 401){
+ $kadarupah = 1.25/100;
+ }else if($gadaiannorujukan['nilaimarhun'] >= 401 && $gadaiannorujukan['nilaimarhun'] < 2001){
+ $kadarupah = 1.5/100;
+ }else if($gadaiannorujukan['nilaimarhun'] >= 2001 ){
+ $kadarupah = 1.7/100;
+ }
+
+ $keuntungan_sebulan = $gadaiannorujukan['pinjaman'] * $kadarupah;
+ $keuntungan_6bln = $keuntungan_sebulan * 6;
+
+ @endphp
@@ -106,7 +120,8 @@
@@ -117,7 +132,7 @@
Keuntungan 6 Bulan
-
+
@@ -141,7 +156,8 @@
- Batal
+ {{-- Batal --}}
+ Batal
@@ -314,6 +330,11 @@
"targets": [ 1 ],
"visible": false,
"searchable": false
+ },
+ {
+ "targets": [ 7 ],
+ "visible": false,
+ "searchable": false
}
]
});
@@ -350,6 +371,7 @@
marhun_detail['karat'],
formatter.format(marhun_detail['berat']),
marhun_detail['nota'],
+ marhun_detail['harga'],
" "
]).draw();
@@ -420,12 +442,23 @@
function editmarhun(e)
{
let norujuk = $('#norujukan').val();let selectedrow = $(e).closest('tr');let recno = tablemarhun.row(selectedrow).data();
+ let nm = recno[3];let karat = recno[4];let berat = recno[5];
+ let harga = recno[7];
+
+ $('#sltkarat').val(karat);
+ $('#berat').val(berat);
+ $('#nilaimarhun').val(nm);
+ $('#harga').val(harga);
$('#norujukedit').val(norujuk);
$('#recno').val(recno[1]);
$('#editMarhunModal').modal();
}
+ // $( "#daft" ).one( "click", function() {
+ // alert( "This will be displayed only once." );
+ // });
+
$("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga');
diff --git a/resources/views/khazanah/khazanahserahan.blade.php b/resources/views/khazanah/khazanahserahan.blade.php
index b057f46..2bb9514 100644
--- a/resources/views/khazanah/khazanahserahan.blade.php
+++ b/resources/views/khazanah/khazanahserahan.blade.php
@@ -28,7 +28,6 @@
-
diff --git a/resources/views/khazanah/pendahuluanserah.blade.php b/resources/views/khazanah/pendahuluanserah.blade.php
index a501096..b887a6d 100644
--- a/resources/views/khazanah/pendahuluanserah.blade.php
+++ b/resources/views/khazanah/pendahuluanserah.blade.php
@@ -59,6 +59,7 @@
+{{-- {{ dd($denominasi)}} --}}
@@ -76,33 +77,33 @@
| RM1 |
- |
+ |
|
- |
+ |
RM20 |
- |
+ |
|
- |
+ |
| RM5 |
- |
+ |
|
- |
+ |
RM50 |
- |
+ |
|
- |
+ |
| RM10 |
- |
+ |
|
- |
+ |
RM100 |
- |
+
|
- |
+ |
@@ -110,7 +111,7 @@
@@ -200,7 +201,7 @@
| Total Wang Tunai Keping (RM) |
- |
+ |
@@ -213,15 +214,15 @@
diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php
index f9c8c1e..d6e6ad5 100644
--- a/resources/views/modal/editmarhun.blade.php
+++ b/resources/views/modal/editmarhun.blade.php
@@ -48,8 +48,6 @@
-
-
diff --git a/routes/web.php b/routes/web.php
index a176512..f88b09f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -67,7 +67,7 @@ Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersControl
Route::post('/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller');
Route::post('/gadai/store',['as'=>'gadai.store','uses'=>'GadaianController@store'])->middleware('auth','teller');
Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'])->middleware('auth','teller');
-Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'])->middleware('auth','teller');
+Route::get('/gadai/batal/marhun',['as'=>'gadai.batalmarhun','uses'=>'GadaianController@batalmarhun'])->middleware('auth','teller');
Route::get('/customer/otp',['as'=>'customer.otp','uses'=>'CustomersController@getOTP'])->middleware('auth','teller');
Route::get('/getwakil',['as'=>'wakil.search','uses'=>'PenebusanController@getWakil'])->middleware('auth','teller');
Route::get('/cari',['as'=>'wakil.caricustomer','uses'=>'CustomersController@cari'])->middleware('auth','teller');