upah baru
This commit is contained in:
@@ -255,6 +255,44 @@ class GadaiController extends Controller
|
|||||||
return response()->json($gadai);
|
return response()->json($gadai);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function kiraupahTawarruq($kodcaw,$norujukan){
|
||||||
|
$cawangan = Cawangan::on('mysql7')
|
||||||
|
->where('kodcaw','=',$kodcaw)
|
||||||
|
->first();
|
||||||
|
|
||||||
|
$gadai_data = Gadai::on($cawangan['mysql'])
|
||||||
|
->where('norujukan','=',$norujukan)
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if($gadai_data['tempoh'] > 6){
|
||||||
|
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
|
$upah_semasa_round = round($upahsemasa_raw,2);
|
||||||
|
|
||||||
|
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
|
||||||
|
}else{
|
||||||
|
if($gadai_data['tempoh'] == 6){
|
||||||
|
if($gadai_data['bakiupah'] != 0){
|
||||||
|
$upah_semasa = $gadai_data['bakiupah'];
|
||||||
|
}else{
|
||||||
|
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
|
$upah_semasa_round = round($upahsemasa_raw,2);
|
||||||
|
|
||||||
|
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
|
$upah_semasa_round = round($upahsemasa_raw,2);
|
||||||
|
|
||||||
|
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $upah_semasa;
|
||||||
|
}
|
||||||
|
|
||||||
public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request)
|
public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request)
|
||||||
{
|
{
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
@@ -263,12 +301,14 @@ class GadaiController extends Controller
|
|||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
|
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
|
||||||
|
|
||||||
$upahsemasa = $gadai['jbg'] * (($gadai['kadarupah']/100 )* $gadai['bakipjm']);
|
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
|
||||||
|
|
||||||
if($request->bayaran < $upahsemasa){
|
|
||||||
$upahsemasa = $request->bayaran;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if($gadai['tempoh'] > 6){
|
||||||
|
$baki_bayaran = $request->bayaran - $upahsemasa;
|
||||||
|
$baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
|
||||||
|
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
|
||||||
|
$baki_upah = 0;
|
||||||
|
}else{
|
||||||
$baki_upah = $gadai['bakiupah'] - $request->bayaran;
|
$baki_upah = $gadai['bakiupah'] - $request->bayaran;
|
||||||
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
|
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
|
||||||
if($gadai['bakipjm'] == null){
|
if($gadai['bakipjm'] == null){
|
||||||
@@ -281,13 +321,14 @@ class GadaiController extends Controller
|
|||||||
$baki_pinjaman = $baki_pinjaman + $baki_upah;
|
$baki_pinjaman = $baki_pinjaman + $baki_upah;
|
||||||
$baki_upah = 0;
|
$baki_upah = 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$transaction = Transaction::on('mysql7')->create([
|
$transaction = Transaction::on('mysql7')->create([
|
||||||
'trans_type' => 'A',
|
'trans_type' => 'A',
|
||||||
'norujukan' => $norujukan,
|
'norujukan' => $norujukan,
|
||||||
'nokp' => $gadai['nokp'],
|
'nokp' => $gadai['nokp'],
|
||||||
'teller' => 'online',
|
'teller' => 'online',
|
||||||
'kodcaw' => 'online',
|
'kodcaw' => $kodcaw,
|
||||||
'duit_masuk' => $request->bayaran,
|
'duit_masuk' => $request->bayaran,
|
||||||
'created_at' => $current,
|
'created_at' => $current,
|
||||||
'bakiharga' => $baki_hargajualan,
|
'bakiharga' => $baki_hargajualan,
|
||||||
@@ -297,7 +338,7 @@ class GadaiController extends Controller
|
|||||||
'norujukan' => $norujukan,
|
'norujukan' => $norujukan,
|
||||||
'bayaran_keuntungan' => $upahsemasa,
|
'bayaran_keuntungan' => $upahsemasa,
|
||||||
'tarikh_bayaran'=> $current,
|
'tarikh_bayaran'=> $current,
|
||||||
'kodcaw'=> 'online'
|
'kodcaw'=> $kodcaw
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
|
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
|
||||||
@@ -318,12 +359,14 @@ class GadaiController extends Controller
|
|||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
|
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
|
||||||
|
|
||||||
$upahsemasa = $gadai['jbg'] * (($gadai['kadarupah']/100 )* $gadai['bakipjm']);
|
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
|
||||||
|
|
||||||
if($request->bayaran < $upahsemasa){
|
|
||||||
$upahsemasa = $request->bayaran;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if($gadai['tempoh'] > 6){
|
||||||
|
$baki_bayaran = $request->bayaran - $upahsemasa;
|
||||||
|
$baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
|
||||||
|
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
|
||||||
|
$baki_upah = 0;
|
||||||
|
}else{
|
||||||
$baki_upah = $gadai['bakiupah'] - $request->bayaran;
|
$baki_upah = $gadai['bakiupah'] - $request->bayaran;
|
||||||
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
|
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
|
||||||
if($gadai['bakipjm'] == null){
|
if($gadai['bakipjm'] == null){
|
||||||
@@ -336,6 +379,7 @@ class GadaiController extends Controller
|
|||||||
$baki_pinjaman = $baki_pinjaman + $baki_upah;
|
$baki_pinjaman = $baki_pinjaman + $baki_upah;
|
||||||
$baki_upah = 0;
|
$baki_upah = 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$transaction = Transaction::on('mysql7')->create([
|
$transaction = Transaction::on('mysql7')->create([
|
||||||
'trans_type' => 'A',
|
'trans_type' => 'A',
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ class TebusController extends Controller
|
|||||||
->where('norujukan','=',$norujukan)
|
->where('norujukan','=',$norujukan)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
|
||||||
|
$upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
|
||||||
|
|
||||||
$transaction = Transaction::on('mysql7')
|
$transaction = Transaction::on('mysql7')
|
||||||
->where('norujukan','=',$norujukan)
|
->where('norujukan','=',$norujukan)
|
||||||
@@ -49,14 +50,14 @@ class TebusController extends Controller
|
|||||||
$totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
|
$totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upahsemasa;
|
$rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upah_semasa;
|
||||||
|
|
||||||
$harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
|
$harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
|
||||||
|
|
||||||
return response()->json($harga_tebus);
|
return response()->json($harga_tebus);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function upahTawarruq($kodcaw,$norujukan){
|
public function kiraupahTawarruq($kodcaw,$norujukan){
|
||||||
$cawangan = Cawangan::on('mysql7')
|
$cawangan = Cawangan::on('mysql7')
|
||||||
->where('kodcaw','=',$kodcaw)
|
->where('kodcaw','=',$kodcaw)
|
||||||
->first();
|
->first();
|
||||||
@@ -65,9 +66,39 @@ class TebusController extends Controller
|
|||||||
->where('norujukan','=',$norujukan)
|
->where('norujukan','=',$norujukan)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
if($gadai_data['tempoh'] > 6){
|
||||||
|
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
return response()->json($upahsemasa);
|
$upah_semasa_round = number_format($upahsemasa_raw,2);
|
||||||
|
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
|
||||||
|
}else{
|
||||||
|
if($gadai_data['tempoh'] == 6){
|
||||||
|
if($gadai_data['bakiupah'] != 0){
|
||||||
|
$upah_semasa = $gadai_data['bakiupah'];
|
||||||
|
}else{
|
||||||
|
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
|
$upah_semasa_round = round($upahsemasa_raw,2);
|
||||||
|
|
||||||
|
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
|
$upah_semasa_round = round($upahsemasa_raw,2);
|
||||||
|
|
||||||
|
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $upah_semasa;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function upahTawarruq($kodcaw,$norujukan){
|
||||||
|
|
||||||
|
$upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
|
||||||
|
|
||||||
|
return response()->json(number_format($upah_semasa,2));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tebusSeparuhTawarruq($kodcaw,$norujukan,Request $request){
|
public function tebusSeparuhTawarruq($kodcaw,$norujukan,Request $request){
|
||||||
@@ -82,6 +113,10 @@ class TebusController extends Controller
|
|||||||
|
|
||||||
$upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
$upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
|
$upah_semasa_round = round($upahsemasa,2);
|
||||||
|
|
||||||
|
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
|
||||||
|
|
||||||
$array_recno_marhun = $request->array_recno;
|
$array_recno_marhun = $request->array_recno;
|
||||||
|
|
||||||
$margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
|
$margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
|
||||||
@@ -96,9 +131,13 @@ class TebusController extends Controller
|
|||||||
$total_harga_tebus += $harga_tebus;
|
$total_harga_tebus += $harga_tebus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$total_harga_tebus_round = round($total_harga_tebus,2);
|
||||||
|
|
||||||
|
$totalhargatebus = (float)substr($total_harga_tebus_round, 0, -1);
|
||||||
|
|
||||||
// $total_harga_tebus += $upahsemasa;
|
// $total_harga_tebus += $upahsemasa;
|
||||||
|
|
||||||
return response()->json($total_harga_tebus);
|
return response()->json($totalhargatebus);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tebusNotTawarruq($kodcaw,$norujukan){
|
public function tebusNotTawarruq($kodcaw,$norujukan){
|
||||||
@@ -185,8 +224,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($total_harga_tebus);
|
return response()->json($total_harga_tebus);
|
||||||
}
|
}
|
||||||
|
|
||||||
function rebet($kodcaw,$norujukan)
|
function rebet($kodcaw,$norujukan){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')
|
$cawangan = Cawangan::on('mysql7')
|
||||||
->where('kodcaw','=',$kodcaw)
|
->where('kodcaw','=',$kodcaw)
|
||||||
->first();
|
->first();
|
||||||
@@ -204,8 +242,7 @@ class TebusController extends Controller
|
|||||||
return floatval(number_format($rebet,2));
|
return floatval(number_format($rebet,2));
|
||||||
}
|
}
|
||||||
|
|
||||||
function rebetselepastawarruq($kodcaw,$norujukan)
|
function rebetselepastawarruq($kodcaw,$norujukan){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')
|
$cawangan = Cawangan::on('mysql7')
|
||||||
->where('kodcaw','=',$kodcaw)
|
->where('kodcaw','=',$kodcaw)
|
||||||
->first();
|
->first();
|
||||||
@@ -240,10 +277,7 @@ class TebusController extends Controller
|
|||||||
return floatval(number_format($rebet,2));
|
return floatval(number_format($rebet,2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function tebusUpdate($kodcaw,$norujukan,Request $request){
|
||||||
|
|
||||||
public function tebusUpdate($kodcaw,$norujukan,Request $request)
|
|
||||||
{
|
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
@@ -321,8 +355,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($tebus);
|
return response()->json($tebus);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function listPenebusanBaru($kodcaw)
|
public function listPenebusanBaru($kodcaw){
|
||||||
{
|
|
||||||
|
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
@@ -335,8 +368,7 @@ class TebusController extends Controller
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function listSerahKhazanah($kodcaw)
|
public function listSerahKhazanah($kodcaw){
|
||||||
{
|
|
||||||
|
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
@@ -350,8 +382,7 @@ class TebusController extends Controller
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tagterimaupdate($kodcaw,$norujukan)
|
public function tagterimaupdate($kodcaw,$norujukan){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
|
$update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
|
||||||
@@ -359,8 +390,7 @@ class TebusController extends Controller
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function AllWakil($kodcaw)
|
public function AllWakil($kodcaw){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$wakil = Wakil::on($cawangan['mysql'])
|
$wakil = Wakil::on($cawangan['mysql'])
|
||||||
@@ -370,8 +400,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($wakil,200);
|
return response()->json($wakil,200);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getWakil($kodcaw,$icno)
|
public function getWakil($kodcaw,$icno){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$wakil = Wakil::on($cawangan['mysql'])
|
$wakil = Wakil::on($cawangan['mysql'])
|
||||||
@@ -381,8 +410,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($wakil,200);
|
return response()->json($wakil,200);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getWakilbycode($kodcaw,$nowakil)
|
public function getWakilbycode($kodcaw,$nowakil){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$wakil = Wakil::on($cawangan['mysql'])
|
$wakil = Wakil::on($cawangan['mysql'])
|
||||||
@@ -392,8 +420,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($wakil,200);
|
return response()->json($wakil,200);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function createWakil($kodcaw,$icno,Request $request)
|
public function createWakil($kodcaw,$icno,Request $request){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$wakil_create = Wakil::on($cawangan['mysql'])->create([
|
$wakil_create = Wakil::on($cawangan['mysql'])->create([
|
||||||
@@ -413,8 +440,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($wakil_create ,201);
|
return response()->json($wakil_create ,201);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function listhistorypenebusan($kodcaw,Request $request)
|
public function listhistorypenebusan($kodcaw,Request $request){
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$listtebus = Tebus::on($cawangan['mysql'])
|
$listtebus = Tebus::on($cawangan['mysql'])
|
||||||
@@ -424,9 +450,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($listtebus);
|
return response()->json($listtebus);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getAdvansur($kodcaw,$norujukan){
|
||||||
public function getAdvansur($kodcaw,$norujukan)
|
|
||||||
{
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$listadvansur = Advansur::on($cawangan['mysql'])
|
$listadvansur = Advansur::on($cawangan['mysql'])
|
||||||
@@ -437,8 +461,7 @@ class TebusController extends Controller
|
|||||||
return response()->json($listadvansur,200);
|
return response()->json($listadvansur,200);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function createAdvansur($kodcaw,Request $request)
|
public function createAdvansur($kodcaw,Request $request){
|
||||||
{
|
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user