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

Merge branch 'pipi' into 'master'

Browse Source 
penebusan real

See merge request online-sistem1/kaunter!27
This commit is contained in:
hafifie rahman
2020-12-15 00:37:33 +00:00
parent 0b9e2d09ba 7b17a55bf2
commit 04e4f868de
2 changed files with 100 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PenebusanController.php
+69 -43
View File
@@ -48,20 +48,20 @@ class PenebusanController extends Controller
////////////////////////
/// UPDATE TEBUS API////
///////////////////////
// $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
// 'nopelanggan' => $request->nopelanggan,
// 'jenistebus' => $request->jenistebus,
// 'jbg' => $request->jbg,
// 'kadarupah' => $request->kadarupah,
// 'nilai_marhun' => $request->nilai_marhun,
// 'pinjaman' => $request->pinjaman_lama,
// 'ansuran' => $request->ansuran,
// 'addpinjaman'=> $request->addpinjaman,
// 'bakipinjaman' => $request->bakipinjaman,
// 'bakiupah' => $request->bakiupah,
// 'historygadaian' => $request->historygadaian,
// 'marhun' => $request->marhun
// ])->json();
$updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
'nopelanggan' => $request->nopelanggan,
'jenistebus' => $request->jenistebus,
'jbg' => $request->jbg,
'kadarupah' => $request->kadarupah,
'nilai_marhun' => $request->nilai_marhun,
'pinjaman' => $request->pinjaman,
'ansuran' => $request->ansuran,
'addpinjaman'=> $request->addpinjaman,
'bakipinjaman' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
])->json();
//////////////////////
/// MAKING NEW SAG////
@@ -85,6 +85,33 @@ class PenebusanController extends Controller
'sirig' => $new_sirig
]);
//////////////////////
////Update SAG BARU///
/////////////////////
$total_nilai_marhun = $request->nilai_marhun;
$margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
$kadarupah = $request->kadarkeuntungan * 100;
$keuntungan6bulan = $request->keuntungan_6bln;
$keuntungan12bulan = $request->keuntungan_sebulan*12;
$hargajualan = $request->pinjaman + $keuntungan12bulan;
$gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
'kodcaw' => $auth_user['cawangan'],
'nilaimarhun' => round($total_nilai_marhun, 2),
'berat' => round($request->total_berat, 2),
'pinjaman' => round($request->pinjaman, 2),
'kadarupah' => round($kadarupah, 2),
'marhun' => $request->marhun,
'percentpinj' => $margin_pinjaman,
'teller'=> $auth_user['name'],
'upah6' => $keuntungan6bulan,
'upah12' => $keuntungan12bulan,
'hargajualan' => $hargajualan,
'kuantiti_marhun' => $request->kuantiti_marhun
])->json();
///////////////////////////
/// MARHUN UPDATE TABLE////
//////////////////////////
@@ -130,20 +157,20 @@ class PenebusanController extends Controller
////////////////////////
/// UPDATE TEBUS API////
///////////////////////
// $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
// 'nopelanggan' => $request->nopelanggan,
// 'jenistebus' => $request->jenistebus,
// 'jbg' => $request->jbg,
// 'kadarupah' => $request->kadarupah,
// 'nilai_marhun' => $request->nilai_marhun,
// 'pinjaman' => $request->pinjaman_lama,
// 'ansuran' => $request->ansuran,
// 'addpinjaman'=> $request->addpinjaman,
// 'bakipinjaman' => $request->bakipinjaman,
// 'bakiupah' => $request->bakiupah,
// 'historygadaian' => $request->historygadaian,
// 'marhun' => $request->marhun
// ])->json();
$updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
'nopelanggan' => $request->nopelanggan,
'jenistebus' => $request->jenistebus,
'jbg' => $request->jbg,
'kadarupah' => $request->kadarupah,
'nilai_marhun' => $request->nilai_marhun,
'pinjaman' => $request->pinjaman_lama,
'ansuran' => $request->ansuran,
'addpinjaman'=> $request->addpinjaman,
'bakipinjaman' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
])->json();
//////////////////////
/// MAKING NEW SAG////
@@ -159,7 +186,6 @@ class PenebusanController extends Controller
$new_transaction = sprintf("%04d",$new_sirig);
$norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
// dd($norujukan);
$gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
'norujukan' => $norujukanbaru,
'nopelanggan' => $request->nopelanggan,
@@ -242,20 +268,20 @@ class PenebusanController extends Controller
////////////////////////
/// UPDATE TEBUS API////
///////////////////////
// $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
// 'nopelanggan' => $request->nopelanggan,
// 'jenistebus' => $request->jenistebus,
// 'jbg' => $request->jbg,
// 'kadarupah' => $request->kadarupah,
// 'nilai_marhun' => $request->nilai_marhun,
// 'pinjaman' => $request->pinjaman_lama,
// 'ansuran' => $request->ansuran,
// 'addpinjaman'=> $request->addpinjaman,
// 'bakipinjaman' => $request->bakipinjaman,
// 'bakiupah' => $request->bakiupah,
// 'historygadaian' => $request->historygadaian,
// 'marhun' => $request->marhun
// ])->json();
$updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
'nopelanggan' => $request->nopelanggan,
'jenistebus' => $request->jenistebus,
'jbg' => $request->jbg,
'kadarupah' => $request->kadarupah,
'nilai_marhun' => $request->nilai_marhun,
'pinjaman' => $request->pinjaman_lama,
'ansuran' => $request->ansuran,
'addpinjaman'=> $request->addpinjaman,
'bakipinjaman' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'historygadaian' => $request->historygadaian,
'marhun' => $request->marhun
])->json();
//////////////////////
resources/views/penebusan/index.blade.php
+31 -7
View File
@@ -666,16 +666,31 @@ function bayaransemua()
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jenistebus = $('#sltjenistebus').find(":selected").val();
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }} ";
var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
// var pinjaman = "{{ $gadai['pinjaman']}}";
var pinjaman = (parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#perludibayar').val())) - lebihan;
var pinjaman = parseFloat("{{ $gadai['pinjaman']}}") - lebihan;
var ansuran = $('#bayaran').val();
var addpinjaman = $('#bayaran').val();
var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
var bakiupah = 0;
var historygadaian = norujukan;
var marhun = "{{ $gadai['marhun'] }}";
var noic = "{{ $gadai['nokp'] }}";
var total_berat = parseFloat("{{ $gadai['berat'] }}");
var kuantiti_marhun = Number("{{sizeof($marhun)}}");
var kadarupahbaru = 0;
if(nilai_marhun > 0 && nilai_marhun < 401.99){
kadarupahbaru = 1.2/100;
}else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
kadarupahbaru = 1.50/100;
}else if(nilai_marhun >= 2002 ){
kadarupahbaru = 1.70/100;
}
var keuntungan_sebulan = pinjaman * kadarupahbaru;
var keuntungan_6bln = keuntungan_sebulan * 6;
$.ajax({
method:'get',
@@ -692,7 +707,14 @@ function bayaransemua()
"bakipinjaman" : bakipinjaman,
"bakiupah" : bakiupah,
"historygadaian" : historygadaian,
"marhun" : marhun
"marhun" : marhun,
"norujukan" : norujukan,
"noic" : noic,
"kadarkeuntungan" : kadarupahbaru,
"keuntungan_6bln" : keuntungan_6bln,
"keuntungan_sebulan" : keuntungan_sebulan,
"kuantiti_marhun" : kuantiti_marhun
},
success:function(success_data){
Swal.fire(
@@ -702,13 +724,15 @@ function bayaransemua()
).then(function() {
window.location.replace("{{ url()->previous() }}");
})
}
},error: function (request, status, error) {
console.log(request.responseText);
}
});
}
/////////////
//End File//
///////////
////////////
}
else if($('#sltjenistebus').find(":selected").val() == 'S')
@@ -770,7 +794,7 @@ function bayaransemua()
var kadarupah = "{{ $gadai['kadarupah'] }}";
var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun;
var pinjamanbaru = (parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#perludibayar').val())) - lebihan;
var pinjamanbaru = (parseFloat("{{ $gadai['pinjaman'] }}")) - lebihan;
var ansuran = 0;
var addpinjaman = 0;
var bakipinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#perludibayar').val());