Merge branch 'pipi' into 'master'

tebus dan hargaemas

See merge request online-sistem1/kaunter!36
This commit is contained in:
hafifie rahman
2021-01-12 03:44:50 +00:00
20 changed files with 1025 additions and 318 deletions
+32 -5
View File
@@ -106,7 +106,7 @@ class GadaianController extends Controller
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('gadaian.edit',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan','api_url'));
return view('gadaian.edit',compact('customer_info','gadaiannorujukan','limit_pinjaman_semasa','cawangan_info','norujukan','api_url'));
}
public function editmarhun(Request $request){
@@ -122,7 +122,25 @@ class GadaianController extends Controller
return $gadaiannorujukan;
}
public function ubahmarhun(Request $request){
$api_url = config('api.url');
$auth_user = Auth::user();
dd(request()->all());
$gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/ubah/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukan,[
'marhun' => $request->valmarhun,
'karat' => $request->karat,
'berat' => $request->berat,
'harga' => $request->harga,
'n_marhun' => $request->n_marhun
])->json();
return $gadaiannorujukan;
}
public function store(Request $request){
$auth_user = Auth::user();
@@ -252,6 +270,8 @@ class GadaianController extends Controller
public function resit($id)
{
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/id/'. $id)->json();
if(sizeof($transaction) != 0)
@@ -275,7 +295,15 @@ class GadaianController extends Controller
$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];
@@ -291,14 +319,13 @@ class GadaianController extends Controller
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/ALS/code/' . $penebusan['nowakil'])->json();
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil'));
return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
}
public function history(Request $request)
+61 -9
View File
@@ -313,6 +313,67 @@ class KhazanahController extends Controller
///END KELULUSAN///
public function createpanjar(Request $request)
{
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
switch ($request->jenismodal) {
case "selenggara":
$kategori = "Baiki dan Selenggara";
$tag = 2;
break;
case "keraian":
$kategori = "Keraian & Promosi";
$tag = 3;
break;
case "belanjaam":
$kategori = "Belanja AM";
$tag = 1;
break;
case "perubatan":
$kategori = "Belanja AM - Perubatan";
$tag = 1;
break;
case "dapur":
$kategori = "Belanja AM - Barangan Dapur";
$tag = 1;
break;
case "pos":
$kategori = "Belanja AM -Postage";
$tag = 1;
break;
}
$panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[
'deskripsi' => $request->deskripsi,
'bayaran' => $request->bayaran,
'tag' => $tag,
'kategori' => $kategori,
'id' => $auth_user['name'],
'bakiperubatan' => "0",
'nobaucer' => $request->baucer,
'nobil' => "3213231",
'tuntutoleh' => $request->tuntutan
])->json();
$updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[
'masuk'=>$masukV,
'keluar'=>$keluarV,
'bakiawal'=>$bakiAwalV,
'bakiakhir'=>$bakiAkhirV,
'bakieod'=>$bakiEOD
]);
return response($panjar);
}
public function pendahuluan()
{
$auth_user = Auth::user();
@@ -1172,15 +1233,6 @@ class KhazanahController extends Controller
return view('khazanah.capaian',compact('cawangan_info','api_url'));
}
public function hargaemas()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json();
return view('khazanah.hargaemas',compact('cawangan_info','api_url','harga_emas'));
}
public function pelanggan()
{
@@ -95,4 +95,55 @@ class OperasiController extends Controller
return response()->json($createlulus,201);
}
public function parameter()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('operasi.parameter',compact('cawangan_info','api_url'));
}
public function hargaemas()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json();
return view('operasi.hargaemas',compact('cawangan_info','api_url','harga_emas'));
}
public function createhargaemas(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json();
$kemaskini = Http::post(config('api.url') . '/api/harga_emas/create/',[
'karat' => $request->karat,
'keterangan'=> $request->keterangan,
'harga' => $request->harga,
'harga2' => $request->harga
])->json();
return redirect('/operasi/hargaemas');
}
public function updatehargaemas(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json();
$kemaskini = Http::put(config('api.url') . '/api/harga_emas/update/',[
"recno" => $request->recno,
"harga" => $request->harga
])->json();
return redirect('/operasi/hargaemas');
}
}
+6 -3
View File
@@ -61,7 +61,8 @@ class PenebusanController extends Controller
'bakiupah' => $request->bakiupah,
'nowakil' => $request->nowakil,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus
])->json();
//////////////////////
@@ -181,7 +182,8 @@ class PenebusanController extends Controller
'bakipinjaman' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus
])->json();
//////////////////////
@@ -302,7 +304,8 @@ class PenebusanController extends Controller
'bakiupah' => $request->bakiupah,
'nowakil' => $request->nowakil,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
'marhun' => $request->marhun,
'jenisbayarantebus' => $request->jenisbayarantebus
])->json();
+160 -113
View File
@@ -219,15 +219,21 @@
</div>
<div class="col-md-4">
<div class="form-group row">
<div class="col-md-4">
Jumlah Pembiayaan Semasa
<div class="col-md-6">
Jumlah Pembiayaan Semasa / Limit Pembiayaan Semasa
</div>
<div class="col-md-8">
<div class="col-md-3">
@php
$outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa')->json();
@endphp
<input type="text" class="form-control" name="outstanding_semasa" id="outstanding_semasa" readonly value="{{ number_format($outstanding_semasa,2) }}">
</div>
<div class="col-md-3">
@php
$limit_pinjaman_semasa = 0;
@endphp
<input type="text" class="form-control" name="outstanding_semasa" id="outstanding_semasa" readonly value="{{ number_format($limit_pinjaman_semasa,2) }}">
</div>
</div>
</div>
<div class="col-md-4">
@@ -281,12 +287,12 @@
<th>Bil</th>
<th>No Rujukan</th>
<th>Tarikh Gadai</th>
<th>Pembiayaan</th>
<th>Tarikh Matang</th>
<th>Nilai Marhun</th>
<th>Pembiayaan</th>
<th>Margin</th>
<th>Tempoh</th>
<th>Keuntungan</th>
<th>Tarikh Matang</th>
<th>Margin</th>
<th>Kos Keuntungan</th>
</tr>
</thead>
@@ -379,12 +385,12 @@
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
'<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'],
'RM '+formatter.format(gadai_detail['pinjaman']),
gadai_detail['t_matang'],
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'],
'RM '+ formatter.format(keuntungan_semasa),
gadai_detail['t_matang'],
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),
''
]).draw();
@@ -396,12 +402,12 @@
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
gadai_detail['norujukan'],
gadai_detail['t_gadai'],
'RM '+formatter.format(gadai_detail['pinjaman']),
gadai_detail['t_matang'],
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'],
'RM '+ formatter.format(keuntungan_semasa),
gadai_detail['t_matang'],
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),
''
]).draw();
@@ -413,12 +419,12 @@
counter,
gadai_detail['norujukan'],
gadai_detail['t_gadai'],
'RM '+formatter.format(gadai_detail['pinjaman']),
gadai_detail['t_matang'],
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'],
'RM '+ formatter.format(keuntungan_semasa),
gadai_detail['t_matang'],
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),
''
]).draw();
@@ -477,9 +483,8 @@
{
Swal.fire({
icon: 'error',
title: 'Oops...',
text: 'Something went wrong!',
footer: '<a href>Why do I have this issue?</a>'
title: 'Amaran',
text: 'Sila pilih salah satu SAG'
});
}
else
@@ -502,7 +507,30 @@
else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let histid = $('input[name="sudahtebus"]:checked').val();
alert(histid);
if(histid == null)
{
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG'
});
}
else
{
$.ajax({
method:'get',
url:'{{ route("gadai.history") }}',
data:{ "norujukan" : histid},
success:function(data)
{
$('#historytebusModal').modal();
historytebustable(data);
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
}
}
}
@@ -525,8 +553,7 @@
tebusaz['norujukan'],
tebusaz['jenistebus'],
tebusaz['jbg'],
tebusaz['t_tebus'],
"<a href='#' class='btn btn-info'>Cetak</a>"
tebusaz['t_tebus']
]).draw();
counter = counter + 1;
@@ -536,64 +563,116 @@
function ubahfunc(e)
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
let ubahid = $('input[name="belum"]:checked').val();
if(ubahid == null)
{
Swal.fire({
icon: 'error',
title: 'Oops...',
text: 'Something went wrong!',
footer: '<a href>Why do I have this issue?</a>'
});
}
else
{
var urlroute = '{{ route("gadaian.edit", ":id") }}';
urlroute = urlroute.replace(':id', ubahid);
let ubahid = $('input[name="belum"]:checked').val();
window.location.replace(urlroute);
}
if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus')
{
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG!'
});
return false;
}
else if($("input[name='options']:checked").val() == 'sudah_tebus'){
Swal.fire({
if($("input[name='options']:checked").val() == 'sudah_tebus')
{
Swal.fire({
icon: 'error',
title: 'Oops...',
text: 'Ubah hanya untuk belum tebus sahaja!',
footer: '<a href>Why do I have this issue?</a>'
});
title: 'Amaran',
text: 'Ubah hanya untuk belum tebus sahaja!'
});
return false;
}
}
function hapusfunc()
{
let kodcaw = "{{ $cawangan_info['kodcaw'] }}";
if($("input[name='options']:checked").val() == 'belum_tebus'){
let hapusid = $('input[name="belum"]:checked').val();
const swalWithBootstrapButtons = Swal.mixin({
const swalWithBootstrapButtons = Swal.mixin
({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
})
})
swalWithBootstrapButtons.fire({
title: 'Are you sure?',
text: "You won't be able to revert this!",
icon: 'warning',
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Khazanah?',
text: "Ubah Rekod Pelanggan!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Yes, delete it!',
cancelButtonText: 'No, cancel!',
confirmButtonText: 'Setuju!',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
var urlroute = '{{ route("gadaian.edit", ":id") }}';
urlroute = urlroute.replace(':id', ubahid);
window.location.replace(urlroute);
}else if (result.dismiss === Swal.DismissReason.cancel) {
swalWithBootstrapButtons.fire(
'Cancelled',
'Your imaginary file is safe :)',
'error'
)
}
});
}
function hapusfunc()
{
let kodcaw = "{{ $cawangan_info['kodcaw'] }}";
let hapusid = $('input[name="belum"]:checked').val();
let hapusidsudah = $('input[name="sudahtebus"]:checked').val();
if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus')
{
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG!'
});
return false;
}else if(hapusidsudah == null && $("input[name='options']:checked").val() == 'sudah_tebus')
{
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG!'
});
return false;
}
const swalWithBootstrapButtons = Swal.mixin
({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
})
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Khazanah?',
text: "Hapus Rekod!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
if($("input[name='options']:checked").val() == 'belum_tebus')
{
$.ajax({
method:'put',
url:api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid,
@@ -601,53 +680,24 @@
{
console.log(data);
swalWithBootstrapButtons.fire(
'Deleted!',
'Your file has been deleted.',
'Hapus!',
'Data pelanggan telah dihapuskan.',
'success'
).then(function () {
location.reload();
});
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
} else if (
/* Read more about handling dismissals below */
result.dismiss === Swal.DismissReason.cancel
) {
swalWithBootstrapButtons.fire(
'Cancelled',
'Your imaginary file is safe :)',
'error'
)
}
});
else if($("input[name='options']:checked").val() == 'sudah_tebus')
{
}
else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let hapusid = $('input[name="sudahtebus"]:checked').val();
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
})
swalWithBootstrapButtons.fire({
title: 'Are you sure?',
text: "You won't be able to revert this!",
icon: 'warning',
showCancelButton: true,
confirmButtonText: 'Yes, delete it!',
cancelButtonText: 'No, cancel!',
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
method:'put',
url:api_url+'/api/tebus/hapus/' + kodcaw + '/' + hapusid,
@@ -656,8 +706,8 @@
if(data != "Bukan-Tebus")
{
swalWithBootstrapButtons.fire(
'Deleted!',
'Your file has been deleted.',
'Hapus!',
'Data pelanggan telah dihapuskan.',
'success'
).then(function () {
location.reload();
@@ -671,25 +721,22 @@
'error'
)
}
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
} else if (
/* Read more about handling dismissals below */
result.dismiss === Swal.DismissReason.cancel
) {
swalWithBootstrapButtons.fire(
'Cancelled',
'Your imaginary file is safe :)',
'error'
)
}
});
}
}else if (result.dismiss === Swal.DismissReason.cancel) {
swalWithBootstrapButtons.fire(
'Cancelled',
'Your imaginary file is safe :)',
'error'
)
}
});
}
function gadaiOptionButton(noic){
+38 -2
View File
@@ -1,5 +1,7 @@
@extends('layouts.app')
@include('modal.editmarhun')
@section('content')
<div class="container">
<div class="row justify-content-center">
@@ -138,7 +140,7 @@
<input type="text" name="kadarkeuntungan" id="kadarkeuntungan" 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>
<a href="{{ route('gadai.batal',['norujukan'=>$norujukan]) }}" 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>
<input type="submit" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima">
</div>
</div>
@@ -228,6 +230,8 @@
<script>
var api_url = "<?php echo $api_url ?>";
$('#pinjaman').val(parseFloat("{{ $gadaiannorujukan['pinjaman'] }}"));
function disableF5(e) { if ((e.which || e.keyCode) == 116) e.preventDefault(); };
$(document).ready( function () {
$(document).on("keydown", disableF5);
@@ -334,13 +338,15 @@
marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +",";
tablemarhun.row.add([
counter,
marhun_detail['recno'],
marhun_detail['marhun'],
'RM ' + formatter.format(marhun_detail['n_marhun']),
marhun_detail['karat'],
formatter.format(marhun_detail['berat']),
marhun_detail['nota'],
"<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();
counter = counter + 1;
});
});
@@ -405,6 +411,36 @@
});
}
function editmarhun(e)
{
let marhun = $(e).closest('tr').children('td:eq(1)').text();
let norujuk = $('#norujukan').val();
$('#norujukedit').val(norujuk);
$('#valmarhun').val(marhun);
$('#editMarhunModal').modal();
}
$("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga');
$('#berat').attr('readonly', false);
$('#harga').val(hargaref);
});
function calculationharga(e)
{
let berat = $(e).val();
let total = 0;
let harga = $('#harga').val();
total = berat * harga;
$('#nilaimarhun').val(total.toFixed(2));
}
$('#pinjaman').on('input',function(){
var pinjaman = Number(this.value);
var nilaimarhun = Number($('#jumlah_nilai_marhun').val());
+17 -35
View File
@@ -13,42 +13,24 @@
<div class="form-group row col-12">
<input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
<input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
<div class="col-md-4">
<div class="form-group row">
<div class="col-md-4">
No Rujukan
</div>
<div class="col-md-8">
<input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $gadai_session['norujukan'] }}">
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group row">
<div class="col-md-4">
Jumlah Pembiayaan Semasa
</div>
<div class="col-md-8">
@php
$outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa')->json();
@endphp
<input type="text" class="form-control" name="pinjaman_semasa" id="pinjaman_semasa" readonly value="{{ number_format($outstanding_semasa,2) }}">
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group row">
<div class="col-md-4">
Limit Pembiayaan Semasa
</div>
<div class="col-md-8">
<input type="text" class="form-control" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ $limit_pinjaman_semasa }}">
</div>
</div>
</div>
</div>
<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>
<div class="col-12 mb-2">
<div class="form-group row">
<div class="col-6 text-left">
<div class="form-group row">
<div class="col-md-4">
No Rujukan
</div>
<div class="col-md-8">
<input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}">
</div>
</div>
</div>
<div class="col-6 text-right">
<button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
</div>
</div>
</div>
<div class="card">
<div class="card-body">
@@ -10,6 +10,7 @@
<div class="card-body text-center">
<a href="{{ route('operasi.kelulusan') }}" class="btn btn-info btn-lg">Kelulusan</a>
<a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Daftar Kakitangan</a>
<a href="{{ route('parameter') }}" class="btn btn-info btn-lg">Parameter</a>
</div>
</div>
</div>
@@ -1,61 +0,0 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
<div class="card-body text-center">
<h2>Harga Emas Sandaran</h2>
<div class="mt-5">
<table class='table mt-4' id='table-emas' style="width:100%;">
<thead>
<tr>
<th>Bil</th>
<th>Mutu Emas</th>
<th>Karat</th>
<th>Harga/Gram</th>
<th>Tarikh Ubah</th>
</tr>
</thead>
<tbody>
@foreach ($harga_emas as $index=>$he)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $he['keterangan'] }}</td>
<td>{{ $he['karat'] }}</td>
<td>{{ $he['harga'] }}</td>
<td>{{ $he['tarikhupdate'] }}</td>
</tr>
@endforeach
</tbody>
</table>
<div class="row mt-5 col-12 d-flex justify-content-end">
<a href="#" class="btn btn-info btn-lg col-3 btn-block">Kemaskini Harga Baru</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
var tableemas = $('#table-emas').DataTable({
"scrollX": true
});
</script>
@endsection
+36 -12
View File
@@ -39,12 +39,12 @@
<div class="mt-3 col-12">
<div class="row">
<div class="col-3">
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#keraianModal" data-backdrop="static" data-keyboard="false">Keraian</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#SelenggaraModal" data-backdrop="static" data-keyboard="false">Selenggara</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#BelanjaamModal" data-backdrop="static" data-keyboard="false">Belanja Am</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#PerubatanModal" data-backdrop="static" data-keyboard="false">Perubatan</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#DapurModal" data-backdrop="static" data-keyboard="false">Dapur</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#PosModal" data-backdrop="static" data-keyboard="false">Pos</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#keraianModal" data-backdrop="static" data-keyboard="false">Keraian</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#SelenggaraModal" data-backdrop="static" data-keyboard="false">Selenggara</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#BelanjaamModal" data-backdrop="static" data-keyboard="false">Belanja Am</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#PerubatanModal" data-backdrop="static" data-keyboard="false">Perubatan</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#DapurModal" data-backdrop="static" data-keyboard="false">Dapur</button>
<button class="btn btn-info btn-lg btn-block" data-toggle="modal" data-target="#PosModal" data-backdrop="static" data-keyboard="false">Pos</button>
</div>
<div class="col-9">
<table class='table mt-4' id='table-panjar' style="width:100%;">
@@ -61,12 +61,6 @@
</div>
</div>
</div>
{{-- <div class="row mt-4 col-12 d-flex justify-content-end">
<a href="#" class="btn btn-info btn-lg btn-block ml-1 col-2">Sahkan</a>
</div> --}}
</div>
</div>
@@ -75,9 +69,39 @@
</div>
<script>
var api_url = "<?php echo $api_url ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
$(".modal.fade").on("show.bs.modal", function(e) {
$.ajax({
method: 'get',
url: api_url + '/api/SenaraiPanjar/list/' + kodcaw,
success:function(data)
{
let today = new Date();
let dd = String(today.getDate()).padStart(2, '0');
let mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
let yyyy = String(today.getFullYear());
let yy = yyyy.substring(2, 4);
let baucerno = 'B' + yy + mm + dd + '-' + String(data.recno).padStart(4, '0');
$('#' + e.currentTarget.id + ' .baucer').val(baucerno);
}
});
});
var tablepanjar = $('#table-panjar').DataTable({
"scrollX": true
});
@@ -0,0 +1,66 @@
<!-- Modal HistoryBayaran -->
@php
$hargaemas = Http::get(config('api.url') . '/api/harga_emas/')->json();
@endphp
<div class="modal fade" id="editMarhunModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="ModalTitle">Ubah Marhun</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form name="ubahmarhunform" method="put" action='{{ route('gadai.ubahmarhun') }}'>
@csrf
<input type="text" name="norujukedit" id="norujukedit"/>
<input type="text" name="valmarhun" id="valmarhun"/>
<div class="form-group row">
<div class="col-6 form-group row">
<label class="col-4">Karat</label>
<select name="sltkarat" id="sltkarat" class="col-8 form-control">
@foreach ($hargaemas as $index=>$he)
<option value="{{ $he['karat'] }}" data-harga="{{ $he['harga'] }}">{{ $he['karat'] }}</option>
@endforeach
</select>
</div>
<div class="col-6 form-group row">
<label class="col-4 ">Berat</label>
<input type="text" name="berat" id="berat" onkeyup="calculationharga(this)" class="form-control col-8" readonly/>
</div>
</div>
<div class="form-group row">
<div class="col-6 form-group row">
<label class="col-4">Harga</label>
<input type="text" name="harga" id="harga" class="form-control col-8" readonly/>
</div>
<div class="col-6 form-group row">
<label class="col-6">Nilai Marhun</label>
<input type="text" name="nilaimarhun" id="nilaimarhun" class="form-control col-6" readonly/>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
+68
View File
@@ -0,0 +1,68 @@
<!-- Modal kemaskiniHargaModal -->
<div class="modal fade" id="kemaskiniHargaModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="ModalTitle">Kemaskini Harga Emas</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form id="kemaskinihargala" method="post" action="{{ route('hargaemas.update') }}">
@csrf
<div class="modal-body">
<input type="hidden" name="recno" id="recno"/>
<label>Karat</label>
<input name="karat" class="form-control" id="karat" readonly/>
<label>Keterangan</label>
<input name="keterangan" class="form-control" id="keterangan" readonly/>
<label>Harga</label>
<input name="harga" id="harga" class="form-control"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
<!-- Modal CreateHargaModal -->
<div class="modal fade" id="createHargaModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="ModalTitle">Tambah Harga Emas</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form method="post" action="{{ route('hargaemas.create') }}">
@csrf
<label>Karat</label>
<input name="karat" class="form-control"/>
<label>Keterangan</label>
<input name="keterangan" class="form-control"/>
<label>Harga</label>
<input name="harga" class="form-control"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
@@ -17,7 +17,6 @@
<th>Jenis Tebus</th>
<th>JBG</th>
<th>Tarikh Tebus</th>
<th>Cetak</th>
</tr>
</thead>
<tbody>
+165 -28
View File
@@ -9,26 +9,30 @@
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="modaltype" value="keraian"/>
<label>Baucer No:
<input type="text" class="form-control mb-4" name="baucer"/>
<input type="hidden" name="jenismodal" value="keraian"/>
<label>Baucer No: </label>
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<label>Tarikh:
<label>Tarikh: </label>
<input type="date" class="form-control mb-4" name="tarikh"/>
<label>Tuntutan Oleh:
<input type="text" class="form-control mb-4" name="tuntutoleh"/>
<label>Tuntutan Oleh: </label>
<input type="text" class="form-control mb-4" name="tuntutan"/>
<label>Tarikh Bil:
<label>Tarikh Bil: </label>
<input type="date" class="form-control mb-4" name="tarikhbil"/>
<label>Bayaran RM:
<label>Deskripsi:</label>
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<label>Bayaran RM: </label>
<input type="text" class="form-control mb-4" name="bayaran"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="button" class="btn btn-success btn-lg">Terima</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
@@ -46,26 +50,30 @@
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="modaltype" value="selenggara"/>
<input type="hidden" name="jenismodal" value="selenggara"/>
<label>Baucer No:
<input type="text" class="form-control mb-4"/>
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<label>Tarikh:
<input type="date" class="form-control mb-4"/>
<input type="date" name="tarikh" class="form-control mb-4"/>
<label>Tuntutan Oleh:
<input type="text" class="form-control mb-4"/>
<input type="text" name="tuntutan" class="form-control mb-4"/>
<label>Tarikh Bil:
<input type="date" class="form-control mb-4"/>
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<label>Deskripsi:</label>
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<label>Bayaran RM:
<input type="text" class="form-control mb-4"/>
<input type="text" name="bayaran" class="form-control mb-4"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="button" class="btn btn-success btn-lg">Terima</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
@@ -83,31 +91,160 @@
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="modaltype" value="belanjaam"/>
<label>Baucer No:
<input type="text" class="form-control mb-4"/>
<input type="hidden" name="jenismodal" value="belanjaam"/>
<label>Baucer No:</label>
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<label>Tarikh:
<input type="date" class="form-control mb-4"/>
<label>Tarikh:</label>
<input type="date" name="tarikh" class="form-control mb-4"/>
<label>Tuntutan Oleh:
<input type="text" class="form-control mb-4"/>
<label>Tuntutan Oleh:</label>
<input type="text" name="tuntutan" class="form-control mb-4"/>
<label>Tarikh Bil:
<input type="date" class="form-control mb-4"/>
<label>Tarikh Bil:</label>
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<label>Bayaran RM:
<input type="text" class="form-control mb-4"/>
<label>Deskripsi Postage:</label>
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<label>Bayaran RM:</label>
<input type="text" name="bayaran" class="form-control mb-4"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="button" class="btn btn-success btn-lg">Terima</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
<!-- Modal PerubatanModal -->
<div class="modal fade" id="PerubatanModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">Perubatan</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="perubatan"/>
<label>Baucer No:</label>
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<label>Tarikh:</label>
<input type="date" name="tarikh" class="form-control mb-4"/>
<label>Tuntutan Oleh:</label>
<input type="text" name="tuntutan" class="form-control mb-4"/>
<label>Tarikh Bil:</label>
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<label>Deskripsi:</label>
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<label>Bayaran RM:</label>
<input type="text" name="bayaran" class="form-control mb-4"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
<!-- Modal DapurModal -->
<div class="modal fade" id="DapurModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">Dapur</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="dapur"/>
<label>Baucer No:</label>
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<label>Tarikh:</label>
<input type="date" name="tarikh" class="form-control mb-4"/>
<label>Tuntutan Oleh:</label>
<input type="text" name="tuntutan" class="form-control mb-4"/>
<label>Tarikh Bil:</label>
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<label>Deskripsi:</label>
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<label>Bayaran RM:</label>
<input type="text" name="bayaran" class="form-control mb-4"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
<!-- Modal PosModal -->
<div class="modal fade" id="PosModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">Pos</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="pos"/>
<label>Tarikh:</label>
<input type="date" name="tarikh" class="form-control mb-4"/>
<label>Baucer No:</label>
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<label>Tarikh Bil:</label>
<input type="date" name="tarikhbil" class="form-control mb-4"/>
<label>Deskripsi Perubatan:</label>
<input type="text" name="deskripsi" class="form-control mb-4"/>
<label>Bayaran RM:</label>
<input type="text" name="bayaran" class="form-control mb-4"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
+124
View File
@@ -0,0 +1,124 @@
@extends('layouts.app')
@include('modal.hargaemas')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
<div class="card-body text-center">
<h2>Harga Emas Sandaran</h2>
<div class="mt-5">
<table class='table mt-4' id='table-emas' style="width:100%;">
<thead>
<tr>
<th>Bil</th>
<th>Mutu Emas</th>
<th>Karat</th>
<th>Harga/Gram</th>
<th>Tarikh Ubah</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@foreach ($harga_emas as $index=>$he)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $he['keterangan'] }}</td>
<td>{{ $he['karat'] }}</td>
<td>{{ $he['harga'] }}</td>
<td>{{ $he['tarikhupdate'] }}</td>
<td class="text-center">
<a href="#" onclick="editharga(this)" data-recno="{{ $he['recno'] }}" class="btn btn-primary"><i class="fas fa-edit"></i></a>
<a href="#" onclick="hapusharga(this)" data-recno="{{ $he['recno'] }}" class="btn btn-danger"><i class="fas fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="row mt-5 col-12 d-flex justify-content-end">
<a href="#" data-toggle="modal" data-target="#createHargaModal" data-backdrop="static" data-keyboard="false" class="btn btn-info col-3 mr-2">Tambah Harga Emas</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
let api_url = "{{ $api_url }}";
var tableemas = $('#table-emas').DataTable({
"scrollX": true
});
function editharga(e)
{
let rec_no = $(e).data('recno');
let keterangan = $(e).closest('tr').find('td:eq(1)').text();
let karat = $(e).closest('tr').find('td:eq(2)').text();
let harga = $(e).closest('tr').find('td:eq(3)').text();
$('#recno').val(rec_no);
$('#keterangan').val(keterangan);
$('#karat').val(karat);
$('#harga').val(harga);
$('#kemaskiniHargaModal').modal();
}
function hapusharga(e)
{
let rec_no = $(e).data('recno');
Swal.fire({
title: 'Are you sure?',
text: "You won't be able to revert this!",
icon: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Yes, delete it!'
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
method: 'put',
url: api_url + '/api/harga_emas/delete/' + rec_no,
success:function(data)
{
console.log(data);
}
});
Swal.fire(
'Deleted!',
'Your file has been deleted.',
'success'
).then(function(){
location.reload();
});
}
});
}
</script>
@endsection
@@ -0,0 +1,19 @@
@extends('layouts.app_operasi')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
<div class="card-body text-center">
<a href="{{ route('operasi.hargaemas') }}" class="btn btn-info btn-lg">Harga Emas</a>
<a href="#" class="btn btn-info btn-lg">Contoh 1</a>
<a href="#" class="btn btn-info btn-lg">Contoh 2</a>
</div>
</div>
</div>
</div>
</div>
@endsection
+157 -29
View File
@@ -10,7 +10,6 @@
<h3 class="text-center text-uppercase mb-5">PENEBUSAN</h3>
<div class="form-group row col-12">
{{-- {{ dd($gadai) }} --}}
<div class="col-6">
<div class="form-group row">
<div class="col-4">
@@ -153,9 +152,21 @@
<div class="col-8">
<input type="text" id="pinjaman" value="{{ $gadai['bakipjm'] }}" class="form-control" readonly/>
</div>
</div>
</div>
</div>
<div class="col-6" id="divpembiayaanasal">
<div class="form-group row">
<div class="col-4">
PEMBIAYAAN ASAL(RM)
</div>
<div class="col-8">
<input type="text" id="pinjamanasal" value="{{ $gadai['pinjaman'] }}" class="form-control" readonly/>
</div>
</div>
</div>
<div class="col-6">
<div class="form-group row">
<div class="col-4">
@@ -181,7 +192,7 @@
BAYARAN PEMBIAYAAN(RM)
</div>
<div class="col-8">
<input type="text" id="bayaran" placeholder="0.00" class="form-control" disabled/>
<input type="text" id="bayaran" onkeyup="bayartambahan(this)" placeholder="0.00" class="form-control" disabled/>
</div>
</div>
<div class="form-group row" id="divtambahpinjaman">
@@ -192,11 +203,8 @@
<input type="text" id="tambahpinjam" onkeyup="bayarpinjam(this)" placeholder="0.00" class="form-control"/>
</div>
<div class="col-4">
@php
$maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'];
@endphp
<input type="text" id="tambahpinjamsebenar" placeholder="0.00" value="{{ $maxgadai }}" class="form-control" disabled/>
<input type="text" id="tambahpinjamsebenar" placeholder="0.00" class="form-control" disabled/>
</div>
</diV>
@@ -311,7 +319,15 @@ function tebusan()
{
if(tarikhgadai >= tarikhtawarruq)
{
{
let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
$('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));
$('#divpembiayaanasal').hide();
$('#divbakihargajualan').show();
$('#divtelahdibayar').show();
//Upah Tawarruq
$.ajax({
@@ -339,6 +355,13 @@ function tebusan()
}
else if(tarikhgadai < tarikhtawarruq)
{
let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['pinjaman'] }}";
$('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));
$('#divpembiayaanasal').show();
$('#divbakihargajualan').hide();
$('#divtelahdibayar').hide();
//Upah Bukan Tawarruq
$.ajax({
@@ -435,7 +458,6 @@ if(tarikhgadai >= tarikhtawarruq)
"array_recno" : array_recno
},
success:function(success){
alert(success);
let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
let bakihargajual = $('#bakihargajualan').val();
@@ -462,7 +484,6 @@ if(tarikhgadai >= tarikhtawarruq)
}
else if(tarikhgadai < tarikhtawarruq){
alert('separuh belum tawarruq');
//Separuh Bayar Bukan Tawarruq
$(document).on('click', '#checkmarhun', function(e) {
@@ -521,7 +542,7 @@ if(tarikhgadai >= tarikhtawarruq)
$('#bayaran').val(jumlahminima);
$('#bakipinjaman').val($('#pinjaman').val() - jumlahminima);
$('#bakipinjaman').val($('#pinjamanasal').val() - jumlahminima);
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
jumlahperlu = Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val());
@@ -626,6 +647,7 @@ $("#sltjenistebus").change(function(){
function bayarkey(e)
{
if($('#sltjenistebus').find(":selected").val() == 'S')
{
let byr = $(e).val();
@@ -640,6 +662,32 @@ function bayarkey(e)
}
}
function bayartambahan(e)
{
if($('#sltjenistebus').find(":selected").val() == 'A')
{
if(tarikhgadai < tarikhtawarruq)
{
let byr = $(e).val();
let total = 0;
let pdbyr = 0;
if(byr == '')
{
$('#perludibayar').val($('#jumlahupah').val());
}
else
{
pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
$('#perludibayar').val(pdbyr);
// $('#perludibayar').val(total);
}
}
}
}
function bayarpinjam(e)
@@ -673,6 +721,15 @@ function bayaransemua()
if($('#sltjenistebus').find(":selected").val() == 'T')
{
let jenisbayarantebus = '';
if(tarikhgadai < tarikhtawarruq)
{
jenisbayarantebus = "nottawarruq";
}
else if (tarikhgadai >= tarikhtawarruq){
jenisbayarantebus = "tawarruq";
}
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jenistebus = $('#sltjenistebus').find(":selected").val();
var jbg = "{{ $gadai['tempoh'] }}";
@@ -706,7 +763,8 @@ function bayaransemua()
"bakiupah" : bakiupah,
"historygadaian" : historygadaian,
"marhun" : marhun,
"nowakil" : nowakil
"nowakil" : nowakil,
"jenisbayarantebus" : jenisbayarantebus
},
success:function(success_data){
Swal.fire({
@@ -729,6 +787,15 @@ function bayaransemua()
}
else if($('#sltjenistebus').find(":selected").val() == 'A')
{
let jenisbayarantebus = '';
if(tarikhgadai < tarikhtawarruq)
{
jenisbayarantebus = "nottawarruq";
}
else if (tarikhgadai >= tarikhtawarruq){
jenisbayarantebus = "tawarruq";
}
if(tarikhgadai >= tarikhtawarruq)
{
var bayar = $('#bayaran').val();
@@ -753,25 +820,25 @@ function bayaransemua()
}
else if(tarikhgadai < tarikhtawarruq)
{
// if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val()))
// {
// Swal.fire(
// 'Amaran!',
// 'Masukkan jumlah melebihi jumlah upah!',
// 'error'
// )
// return false;
// }
if($('#bayaran').val() < $('#perludibayar').val())
{
Swal.fire(
'Amaran!',
'Masukkan jumlah melebihi jumlah perlu dibayar!',
'error'
)
return false;
}
var lebihan = parseFloat($('#bayaran').val()) - parseFloat($('#perludibayar').val());
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']}}") - lebihan;
var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
var ansuran = $('#bayaran').val();
var addpinjaman = $('#bayaran').val();
var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
@@ -816,7 +883,9 @@ function bayaransemua()
"kadarkeuntungan" : kadarupahbaru,
"keuntungan_6bln" : keuntungan_6bln,
"keuntungan_sebulan" : keuntungan_sebulan,
"kuantiti_marhun" : kuantiti_marhun
"kuantiti_marhun" : kuantiti_marhun,
"lebihan" : lebihan,
"jenisbayarantebus" : jenisbayarantebus
},
success:function(success_data){
@@ -825,7 +894,7 @@ function bayaransemua()
'You clicked the button!',
'success'
).then(function() {
window.location.replace("{{ url()->previous() }}");
window.location.replace("{{ url('customer_info') }}");
})
},error: function (request, status, error) {
console.log(request.responseText);
@@ -840,6 +909,15 @@ function bayaransemua()
}
else if($('#sltjenistebus').find(":selected").val() == 'S')
{
let jenisbayarantebus = '';
if(tarikhgadai < tarikhtawarruq)
{
jenisbayarantebus = "nottawarruq";
}
else if (tarikhgadai >= tarikhtawarruq){
jenisbayarantebus = "tawarruq";
}
if($('#perludibayar').val() < $('#bayaran').val())
{
Swal.fire(
@@ -850,11 +928,27 @@ function bayaransemua()
return false;
}
//checked box
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
console.log(checkboxes.length);
if (checkedOne == false) {
Swal.fire(
'Amaran!',
'Sila tick salah satu marhun!',
'error'
)
return false;
}
var sumnilaimarhun = 0;
var sumberat = 0;
var marhun = "{{ $gadai['marhun'] }}";
var test = marhun.split(",");
// var marhunlama = marhun.split(",");
$.each( array_nm, function( index, value ) {
sumnilaimarhun += parseFloat(value);
@@ -877,13 +971,25 @@ function bayaransemua()
return false;
}
// else
// {
// console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
// marhunlama.splice(index,1);
// }
}
});
var marhun_baru = test.join(", ");
// var marhun_lama = marhunlama.join(", ");
// console.table(marhun_baru);
// console.table(marhun_lama);
// return;
$.each( array_berat, function( index, value ) {
sumberat += parseFloat(value);
});
@@ -910,6 +1016,7 @@ function bayaransemua()
var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length;
var nowakil = nw;
console.log("Pinjaman Baru Sekali Lagi: " + pinjamanbaru);
// console.log('lebihan : ' + lebihan + ' ');
console.log("No Pelanggan:" + nopelanggan + " " + "jenistebus:" + jenistebus + " " + "jbg:" + jbg + " " + "kadarupah:" + kadarupah + " ");
@@ -951,6 +1058,7 @@ function bayaransemua()
"marhun" : marhun,
"nowakil" : nowakil,
"arrayrecno" : array_recno,
"jenisbayarantebus" : jenisbayarantebus,
//yang baru
@@ -993,6 +1101,25 @@ function bayaransemua()
}
else if($('#sltjenistebus').find(":selected").val() == 'P')
{
let jenisbayarantebus = '';
if(tarikhgadai < tarikhtawarruq)
{
jenisbayarantebus = "nottawarruq";
}
else if (tarikhgadai >= tarikhtawarruq){
jenisbayarantebus = "tawarruq";
}
if(parseFloat($('#basic-addon2').text()) > 70)
{
Swal.fire(
'Amaran!',
'Pinjaman Haruslah Dalam Lingkungan 70%!',
'error'
)
return false;
}
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
@@ -1064,7 +1191,8 @@ function bayaransemua()
"keuntungan_6bln" : keuntungan_6bln,
"keuntungan_sebulan" : keuntungan_sebulan,
"noic" : noic,
"norujukan" : norujukan
"norujukan" : norujukan,
"jenisbayarantebus" : jenisbayarantebus
},
success:function(success_data){
+10 -10
View File
@@ -396,25 +396,25 @@ hr.new5 {
<table id="inside">
<tr>
<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> No SAG</td><td> {{ $transaction['norujukan'] }} </td>
<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> No SAG</td><td> {{ $transaction['norujukan'] }} </td>
</tr>
<tr>
<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
<tr>
<td colspan="3">No K/P Wakil </td> <td>: </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">No K/P Wakil </td> <td>: </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
</table>
<br>
@@ -492,25 +492,25 @@ hr.new5 {
<table id="inside">
<tr>
<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> No SAG</td><td> {{ $transaction['norujukan'] }} </td>
<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> No SAG</td><td> {{ $transaction['norujukan'] }} </td>
</tr>
<tr>
<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tarikh Bayar</td><td> @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tarikh Bayar</td><td> @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp </td>
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
<tr>
<td colspan="3">No K/P Wakil </td> <td>: </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">No K/P Wakil </td> <td>: </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
</table>
<br>
+7 -7
View File
@@ -397,22 +397,22 @@ hr.new5 {
<table id="inside">
<tr>
<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> No SAG</td><td> {{ $gadai['norujukan'] }} </td>
</tr>
<tr>
<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tarikh Bayar</td><td>@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp</td>
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
<tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
</table>
<br>
@@ -427,7 +427,7 @@ hr.new5 {
<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['hargajualan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['BakiPjm'],2) }} </td>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($totaltransaction,2) }}</td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['bakihargajualan'],2) }} </td>
@@ -529,7 +529,7 @@ hr.new5 {
<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format(($gadai['hargajualan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($penebusan['BakiPjm'],2) }} </td>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($totaltransaction,2) }} </td>
</tr>
<tr>
<td style="width:10px">Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">RM {{ number_format($gadai['bakihargajualan'],2) }}</td>
+7 -3
View File
@@ -79,7 +79,7 @@ Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'
//MAINTENANCE
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@tambahpinjaman'])->middleware('auth','teller');
Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller');
//Penilai
Route::get('/gadaiansemasa',['as'=>'gadaian.semasa','uses'=>'GadaianController@gadaiansemasa'])->middleware('auth','penilai');
@@ -115,7 +115,6 @@ Route::post('/kemaskiniserahan',['as'=>'khazanah.KemaskiniSerahan','uses'=>'Khaz
Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahController@kakitangan'])->middleware('auth','khazanah');
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('/hargaemas',['as'=>'khazanah.hargaemas','uses'=>'KhazanahController@hargaemas'])->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('/unjuran',['as'=>'khazanah.unjuran','uses'=>'KhazanahController@unjuran'])->middleware('auth','khazanah');
@@ -123,10 +122,11 @@ Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar
Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller');
Route::post('/createkelulusan',['as'=>'khazanah.createkelulusan','uses'=>'KhazanahController@createkelulusan'])->middleware('auth','teller');
Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'KhazanahController@updatekelulusan'])->middleware('auth','khazanah');
Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createkelulusan'])->middleware('auth','teller');
Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createpanjar'])->middleware('auth','khazanah');
Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianController@edit'])->middleware('auth','teller');
Route::post('/gadai/edit/store',['as'=>'gadai.editstore','uses'=>'GadaianController@editstore'])->middleware('auth','teller');
Route::put('/gadai/edit/deletemarhun',['as'=>'gadai.editmarhun','uses'=>'GadaianController@editmarhun'])->middleware('auth','teller');
Route::put('/gadai/edit/editmarhun',['as'=>'gadai.ubahmarhun','uses'=>'GadaianController@ubahmarhun'])->middleware('auth','teller');
//Laporan Baru
Route::get('/laporan/lelongan',['as'=>'laporan.lelongan','uses'=>'KhazanahController@laporanLelongan'])->middleware('auth','khazanah');
@@ -162,3 +162,7 @@ Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'Operas
Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi');
Route::get('/daftar/kakitangan',['as'=>'daftar.kakitangan','uses'=>'KakitanganController@daftarKakitangan'])->middleware('auth','operasi');
Route::post('/daftar/kakitangan/baru',['as'=>'kakitangan.baru','uses'=>'KakitanganController@registerStaff'])->middleware('auth','operasi');
Route::get('/operasi/parameter','OperasiController@parameter')->name('parameter')->middleware('auth','operasi');
Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiController@hargaemas'])->middleware('auth','operasi');
Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi');
Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');