KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'pipi' into 'master'

Browse Source 
aliran tunai dan fix beberapa

See merge request online-sistem1/kaunter!42
This commit is contained in:
hafifie rahman
2021-01-25 22:42:32 +00:00
parent cc12f0aeb6 1d71a49eaf
commit 2f5e6fbbf6
7 changed files with 220 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+11
View File
@@ -225,6 +225,17 @@ class GadaianController extends Controller
return redirect()->route('customer_info'); 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){ public function cetakSAG(Request $request){
$auth_user = Auth::user(); $auth_user = Auth::user();
app/Http/Controllers/KhazanahController.php
+129 -99
View File
@@ -192,8 +192,11 @@ class KhazanahController extends Controller
{ {
$denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json(); $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')); 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); $rekodring20 -= intval($request->ambilanring20);
$rekodring50 -= intval($request->ambilanring50); $rekodring50 -= intval($request->ambilanring50);
$rekodring100 -= intval($request->ambilanring100); $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'],[ $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,[ $updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
'no'=>$request->no 'no'=>$request->no
@@ -662,14 +670,11 @@ class KhazanahController extends Controller
if($amount>$baki_awal) if($amount>$baki_awal)
{ {
dd($amount);
//WI ERROR MESSAGE SKIT //WI ERROR MESSAGE SKIT
} }
else else
{ {
$tarikh=$request->tarikh; $tarikh=$request->tarikh;
$kodlaluan=$request->teller; $kodlaluan=$request->teller;
$tambah=$request->amt; $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; $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; $BakiAkhirT=0;$BakiAwalT=0;$tambahT=0;
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json(); $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$bakiAwal=$getTunai2['bakiawal']; $bakiAwal=$getTunai2['bakiawal'];
$keluar=$getTunai2['keluar']; $keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki']; $baki=$getTunai2['baki'];
$kurangT=$getTunai2['kurang'];
$tam=$getTunai2['tambah']; $tam=$getTunai2['tambah'];
if($bakiAwal==0) if($bakiAwal==0)
@@ -722,8 +724,8 @@ class KhazanahController extends Controller
else else
$tambahT=$keluar; $tambahT=$keluar;
$kurang=0; $kurang=$kurangT;
$BakiAkhirT=$BakiAwalT+$tambahT; $BakiAkhirT=$BakiAwalT+$tambahT-$kurang;
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'].'/'.$kodlaluan, [ $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'].'/'.$kodlaluan, [
@@ -740,8 +742,9 @@ class KhazanahController extends Controller
$BakiAwalV=$latestVault[0]['bakiawal']; $BakiAwalV=$latestVault[0]['bakiawal'];
// return; // return;
// dd($tambahT);
$keluarV=$keluarV+$tambahT; $keluarV=$tambahT;
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
$bakiTerkini=$GetLatestBakiTunai; $bakiTerkini=$GetLatestBakiTunai;
@@ -784,25 +787,24 @@ class KhazanahController extends Controller
public function KemaskiniSerahan(Request $request) public function KemaskiniSerahan(Request $request)
{ {
$auth_user = Auth::user(); $auth_user = Auth::user();
$api_url = config('api.url'); $api_url = config('api.url');
$peti_besi_terkini=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); $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(); if(sizeof($peti_besi_terkini) == 0)
$bakiAkhir=$getTunai[0]['baki']; {
$keluarT=$getTunai[0]['keluar']; $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
$masukT=$getTunai[0]['masuk']; $baki_awal=$peti_besi_terkini["bakiawal"];
$tambahT=$getTunai[0]['tambah']; }
$kurangT=$getTunai[0]['kurang']; else
$bakiAwalT=$getTunai[0]['bakiawal']; {
$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"; echo "Maaf, Serahan Lebih Besar Dari Baki Akhir Cash Box";
else else
@@ -810,96 +812,127 @@ class KhazanahController extends Controller
$tarikh=$request->tarikh; $tarikh=$request->tarikh;
$kodlaluan=$request->teller; $kodlaluan=$request->teller;
$kurang=$request->kurang; $kurang=$request->amt;
$nota=$request->nota; $nota=$request->nota;
$kodcaw=$auth_user['cawangan']; $kodcaw=$auth_user['cawangan'];
$tambahT = 0;
$addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[ $addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[
'kodcaw'=>$kodcaw, 'kodcaw'=>$kodcaw,
'teller'=>$request->teller, 'kodlaluan'=>$kodlaluan,
'tambah'=>$tambahT, 'tambah'=>$tambahT,
'kurang'=>$kurang, 'kurang'=>$kurang,
'nota'=>$nota]); 'nota'=>$nota]);
$getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$tambah_T=0;$kurang_T=0;$baki_AwalT=0.0; if(sizeof($getTunai) == 0)
{
if($tambahT==0) // dd($getTunai);
$tambah_T=0; }
else 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'];
//dd($getTunai2);
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;
else $tambah_T=0;$kurang_T=0;$baki_AwalT=0.0;
$masuk_V=$masukV;
if($keluarV==0)
$keluar_V=0;
else
$keluar_V=$keluarV;
if($tambahT==0)
if($pendahuluanV==0) $tambah_T=0;
$pendahuluan_V=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 $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'].'/'.$kodlaluan, [
$pendahuluan_V=$pendahuluanV; '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(); $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
$sumBaki=$GetLatestBakiTunai; $sumBaki=$GetLatestBakiTunai;
$bakiAkhirV=$bakiAwalV-$keluar_V+$masuk_V+$pendahuluan_V-$serahan_V; $bakiAkhirV=$bakiAwalV-$keluar_V+$masuk_V+$pendahuluan_V-$serahan_V;
// dd($bakiAkhirV,$bakiAwalV,$keluar_V,$masuk_V,$pendahuluan_V,$serahan_V); //dd($bakiAkhirV,$bakiAwalV,$keluar_V,$masuk_V,$pendahuluan_V,$serahan_V);
$BakiEOD=$bakiAkhirV+$sumBaki; $BakiEOD=$bakiAkhirV;
// dd($BakiEOD); // $BakiEOD=$bakiAkhirV+$sumBaki;
$updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[ $updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[
'masuk'=>$masuk_V, 'masuk'=>$masuk_V,
@@ -907,13 +940,10 @@ class KhazanahController extends Controller
'bakiawal'=>$bakiAwalV, 'bakiawal'=>$bakiAwalV,
'bakiakhir'=>$bakiAkhirV, 'bakiakhir'=>$bakiAkhirV,
'bakieod'=>$BakiEOD 'bakieod'=>$BakiEOD
]); ]);
//--FINAL RESULT...KENA RIDERECT KE PAGE SEBELUMNYA.. //--FINAL RESULT...KENA RIDERECT KE PAGE SEBELUMNYA..
dd($updateVault);
return $this->denominasicalculationserahan($request); return $this->denominasicalculationserahan($request);
} }
resources/views/gadaian/edit.blade.php
+38 -5
View File
@@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<div class="col-12 text-right mb-2"> <div class="col-12 text-right mb-2">
<button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button> <button type="button" style="margin:auto" id="daft" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
</div> </div>
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@@ -59,6 +59,7 @@
<th>Karat</th> <th>Karat</th>
<th>Berat</th> <th>Berat</th>
<th>Nota</th> <th>Nota</th>
<th>Harga</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
@@ -84,13 +85,26 @@
</div> </div>
</diV> </diV>
</div> </div>
@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
<div class="col-3"> <div class="col-3">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-6"> <div class="col-md-6">
Keuntungan Sebulan Keuntungan Sebulan
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<input type="text" class="form-control" readonly name="keuntungan_sebulan" id="keuntungan_sebulan"> <input type="text" class="form-control" readonly name="keuntungan_sebulan" id="keuntungan_sebulan" value="{{ number_format((float)$keuntungan_sebulan,2) }}">
</div> </div>
</diV> </diV>
</div> </div>
@@ -106,7 +120,8 @@
<div class="col-7 input-group"> <div class="col-7 input-group">
<input type="text" class="form-control" name="pinjaman" value="{{ $gadaiannorujukan['pinjaman'] }}" id="pinjaman"> <input type="text" class="form-control" name="pinjaman" value="{{ $gadaiannorujukan['pinjaman'] }}" id="pinjaman">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text span-pinjaman">0 %</span> @php $percentpinjam = ($gadaiannorujukan['pinjaman']/$gadaiannorujukan['nilaimarhun'])*100; @endphp
<span class="input-group-text span-pinjaman">{{ number_format((float)$percentpinjam,2) }}%</span>
</div> </div>
</div> </div>
</diV> </diV>
@@ -117,7 +132,7 @@
Keuntungan 6 Bulan Keuntungan 6 Bulan
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<input type="text" class="form-control" readonly name="keuntungan_6bln" id="keuntungan_6bln"> <input type="text" class="form-control" readonly name="keuntungan_6bln" id="keuntungan_6bln" value="{{ number_format((float)$keuntungan_6bln,2) }}">
</div> </div>
</diV> </diV>
</div> </div>
@@ -141,7 +156,8 @@
<input type="text" name="kadarkeuntungan" id="kadarkeuntungan" value="" hidden> <input type="text" name="kadarkeuntungan" id="kadarkeuntungan" value="" hidden>
<input type="text" name="kuantiti_marhun" id="kuantiti_marhun" value="" hidden> <input type="text" name="kuantiti_marhun" id="kuantiti_marhun" value="" hidden>
<input type="text" name="total_nilai_marhun" id="total_nilai_marhun" value="" hidden> <input type="text" name="total_nilai_marhun" id="total_nilai_marhun" value="" hidden>
<a href="{{ route('customer_info') }}" class="float-right btn btn-danger mr-2">Batal</a> {{-- <a href="{{ route('customer_info') }}" class="float-right btn btn-danger mr-2">Batal</a> --}}
<a href="{{ route('gadai.batalmarhun',['norujukan'=>$norujukan]) }}" class="float-right btn btn-danger mr-2">Batal</a>
<input type="submit" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima"> <input type="submit" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima">
</div> </div>
</div> </div>
@@ -314,6 +330,11 @@
"targets": [ 1 ], "targets": [ 1 ],
"visible": false, "visible": false,
"searchable": false "searchable": false
},
{
"targets": [ 7 ],
"visible": false,
"searchable": false
} }
] ]
}); });
@@ -350,6 +371,7 @@
marhun_detail['karat'], marhun_detail['karat'],
formatter.format(marhun_detail['berat']), formatter.format(marhun_detail['berat']),
marhun_detail['nota'], marhun_detail['nota'],
marhun_detail['harga'],
"<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button>" "<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button>"
]).draw(); ]).draw();
@@ -420,12 +442,23 @@
function editmarhun(e) function editmarhun(e)
{ {
let norujuk = $('#norujukan').val();let selectedrow = $(e).closest('tr');let recno = tablemarhun.row(selectedrow).data(); 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); $('#norujukedit').val(norujuk);
$('#recno').val(recno[1]); $('#recno').val(recno[1]);
$('#editMarhunModal').modal(); $('#editMarhunModal').modal();
} }
// $( "#daft" ).one( "click", function() {
// alert( "This will be displayed only once." );
// });
$("#sltkarat").change(function(e){ $("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga'); let hargaref = $(this).find(':selected').data('harga');
resources/views/khazanah/khazanahserahan.blade.php
+1 -2
View File
@@ -28,7 +28,6 @@
</div> </div>
<br> <br>
<input type="hidden" name="no" value="{{ $array_reqteller['no'] }}"/> <input type="hidden" name="no" value="{{ $array_reqteller['no'] }}"/>
<div class="row"> <div class="row">
@@ -45,7 +44,7 @@
<div class="col-6"> <div class="col-6">
<button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-primary">Panduan Format Bundle</button> <button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-primary">Panduan Format Bundle</button>
<input type="button" onclick="triggersubmit();" class="btn btn-primary" value="Terima"/> <input type="button" onclick="triggersubmit();" class="btn btn-primary" value="Terima"/>
<a href="{{ url('/pendahuluan') }}" class="btn btn-primary">Batal</a> <a href="{{ url('/serahan') }}" class="btn btn-primary">Batal</a>
</div> </div>
</div> </div>
<br> <br>
resources/views/khazanah/pendahuluanserah.blade.php
+40 -39
View File
@@ -59,6 +59,7 @@
</li> </li>
</ul> </ul>
{{-- {{ dd($denominasi)}} --}}
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab"> <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
@@ -76,33 +77,33 @@
</tr> </tr>
<tr> <tr>
<td>RM1</td> <td>RM1</td>
<td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['0']['bd1'] }}" readonly/></td> <td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['bd1'] }}" readonly/></td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['0']['b1'] }}" readonly/> </td> <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['b1'] }}" readonly/> </td>
<td> RM20</td> <td> RM20</td>
<td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['0']['bd20'] }}" readonly/> </td> <td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['bd20'] }}" readonly/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['0']['b20'] }}" readonly/> </td> <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['b20'] }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM5</td> <td>RM5</td>
<td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['0']['bd5'] }}" readonly/> </td> <td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['bd5'] }}" readonly/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['0']['b5'] }}" readonly/> </td> <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['b5'] }}" readonly/> </td>
<td>RM50</td> <td>RM50</td>
<td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['0']['bd50'] }}" readonly/> </td> <td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['bd50'] }}" readonly/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['0']['b50'] }} " readonly/> </td> <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['b50'] }} " readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM10</td> <td>RM10</td>
<td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['0']['bd10'] }}" readonly/> </td> <td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['bd10'] }}" readonly/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['0']['b10'] }}" readonly/> </td> <td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['b10'] }}" readonly/> </td>
<td>RM100 </td> <td> <td>RM100 </td> <td>
<input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['0']['bd100'] }}" readonly/> </td> <input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['bd100'] }}" readonly/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['0']['b100'] }}" readonly/> </td> <td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['b100'] }}" readonly/> </td>
</tr> </tr>
</table> </table>
<br> <br>
@@ -110,7 +111,7 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th colspan="6"> Total Wang Tunai Bundle (RM) </th> <th colspan="6"> Total Wang Tunai Bundle (RM) </th>
<th> <input type="text" class="form-control" name="totalbundle" id="totalbundle" value="{{ $denominasi['0']['jumlahbundle'] }}" readonly/> </th> <th> <input type="text" class="form-control" name="totalbundle" id="totalbundle" value="{{ $denominasi['jumlahbundle'] }}" readonly/> </th>
</tr> </tr>
@@ -136,53 +137,53 @@
<tr> <tr>
<td>RM0.01</td> <td>RM0.01</td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td> <td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['0']['k01'] }}" readonly/> </td> <td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['k01'] }}" readonly/> </td>
<td>RM1</td> <td>RM1</td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td> <td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['0']['k1'] }}" readonly/> </td> <td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['k1'] }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.05</td> <td>RM0.05</td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td> <td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['0']['k05'] }}" readonly/> </td> <td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['k05'] }}" readonly/> </td>
<td>RM5</td> <td>RM5</td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td> <td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['txtring5'] }}" readonly/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['0']['k5'] }}" readonly/> </td> <td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['k5'] }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.10</td> <td>RM0.10</td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td> <td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['0']['k010'] }}" readonly/> </td> <td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['k010'] }}" readonly/> </td>
<td>RM10</td> <td>RM10</td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td> <td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['txtring10'] }}" readonly/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['0']['k10'] }}" readonly/> </td> <td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['k10'] }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.20</td> <td>RM0.20</td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td> <td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['0']['k020'] }}" readonly/> </td> <td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['k020'] }}" readonly/> </td>
<td> RM20</td> <td> RM20</td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td> <td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['txtring20'] }}" readonly/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['0']['k20'] }}" readonly/> </td> <td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['k20'] }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.50</td> <td>RM0.50</td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td> <td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['0']['k050'] }}" readonly/> </td> <td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['k050'] }}" readonly/> </td>
<td>RM50</td> <td>RM50</td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td> <td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['txtring50'] }}" readonly/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['0']['k50'] }}" readonly/> </td> <td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['k50'] }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
@@ -190,9 +191,9 @@
<td></td> <td></td>
<td></td> <td></td>
<td>RM100 </td> <td>RM100 </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td> <td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['txtring100'] }}" readonly/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['0']['k100'] }}" readonly/> </td> <td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['k100'] }}" readonly/> </td>
</tr> </tr>
</table> </table>
<br> <br>
@@ -200,7 +201,7 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th colspan="6"> Total Wang Tunai Keping (RM) </th> <th colspan="6"> Total Wang Tunai Keping (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['jumlahkeping'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ $denominasi['jumlahkeping'] }}" readonly/> </th>
</tr> </tr>
@@ -213,15 +214,15 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th> Total Keseluruhan (RM) </th> <th> Total Keseluruhan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['txtjumlah'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ $denominasi['txtjumlah'] }}" readonly/> </th>
</tr> </tr>
<tr> <tr>
<th> Baki Akhir Sistem (RM) </th> <th> Baki Akhir Sistem (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['txtjumlah'] - $denominasi['0']['lebihan'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ $denominasi['txtjumlah'] - $denominasi['lebihan'] }}" readonly/> </th>
</tr> </tr>
<tr> <tr>
<th> Lebihan/Kekurangan (RM) </th> <th> Lebihan/Kekurangan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['lebihan'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ $denominasi['lebihan'] }}" readonly/> </th>
</tr> </tr>
</table> </table>
resources/views/modal/editmarhun.blade.php
-2
View File
@@ -48,8 +48,6 @@
<input type="text" name="nilaimarhun" id="nilaimarhun" class="form-control col-6" readonly/> <input type="text" name="nilaimarhun" id="nilaimarhun" class="form-control col-6" readonly/>
</div> </div>
</div> </div>
</div> </div>
routes/web.php
+1 -1
View File
@@ -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('/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::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',['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('/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('/getwakil',['as'=>'wakil.search','uses'=>'PenebusanController@getWakil'])->middleware('auth','teller');
Route::get('/cari',['as'=>'wakil.caricustomer','uses'=>'CustomersController@cari'])->middleware('auth','teller'); Route::get('/cari',['as'=>'wakil.caricustomer','uses'=>'CustomersController@cari'])->middleware('auth','teller');