Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn into adminapi
This commit is contained in:
@@ -20,6 +20,7 @@ use App\Tunai;
|
|||||||
use App\Komuditi;
|
use App\Komuditi;
|
||||||
use App\KawalanStokLama;
|
use App\KawalanStokLama;
|
||||||
use App\KawalanStok;
|
use App\KawalanStok;
|
||||||
|
use App\KadarUpah;
|
||||||
use App\Moratorium;
|
use App\Moratorium;
|
||||||
use App\Audit;
|
use App\Audit;
|
||||||
use App\Customer;
|
use App\Customer;
|
||||||
@@ -207,6 +208,7 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
|
|
||||||
public function daftarGadaiMarhun($norujukan,Request $request){
|
public function daftarGadaiMarhun($norujukan,Request $request){
|
||||||
|
// dd("ggwp");
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
@@ -228,24 +230,34 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
$bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->count();
|
$bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->count();
|
||||||
|
|
||||||
|
$total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun');
|
||||||
|
$total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
|
||||||
|
|
||||||
|
$kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
|
||||||
|
$upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
|
||||||
|
$upah6 = $upah1 * 6;
|
||||||
|
$upah12 = $upah1 * 12;
|
||||||
|
|
||||||
|
$hargajualan = $request->pinjaman + $upah12;
|
||||||
|
|
||||||
$gadai = Gadai::on($cawangan['mysql'])
|
$gadai = Gadai::on($cawangan['mysql'])
|
||||||
->where('norujukan','=',$norujukan)
|
->where('norujukan','=',$norujukan)
|
||||||
->update(array(
|
->update(array(
|
||||||
'nilaimarhun' => $request->nilaimarhun,
|
'nilaimarhun' => $total_nilai_marhun,
|
||||||
'berat'=> $request->berat,
|
'berat'=> $total_berat,
|
||||||
'pinjaman' => $request->pinjaman,
|
'pinjaman' => $request->pinjaman,
|
||||||
'kadarupah' => $request->kadarupah,
|
'kadarupah' => $kadar_raw['kadarupdah'],
|
||||||
'marhun' => $request->marhun,
|
'marhun' => $request->marhun,
|
||||||
'percentpinj' => $margin_pinjam,
|
'percentpinj' => $margin_pinjam,
|
||||||
'teller' => $request->teller,
|
'teller' => $request->teller,
|
||||||
'bakipjm' => $request->pinjaman,
|
'bakipjm' => $request->pinjaman,
|
||||||
'bakiupah' => $request->upah6,
|
'bakiupah' => $upah6,
|
||||||
'jbg' => 0.5,
|
'jbg' => 0.5,
|
||||||
't_update' => $current->toDateString(),
|
't_update' => $current->toDateString(),
|
||||||
'cetak' => 0,
|
'cetak' => 0,
|
||||||
'upah12' => $request->upah12,
|
'upah12' => $upah12,
|
||||||
'hargajualan' => $request->hargajualan,
|
'hargajualan' => $hargajualan,
|
||||||
'bakihargajualan' => $request->hargajualan,
|
'bakihargajualan' => $hargajualan,
|
||||||
'tagserah' => 0,
|
'tagserah' => 0,
|
||||||
't_matang' => $t_matang,
|
't_matang' => $t_matang,
|
||||||
't_matang1' => $t_kontrak,
|
't_matang1' => $t_kontrak,
|
||||||
@@ -3403,29 +3415,33 @@ class GadaiController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function updateLelongTawarruq(Request $request){
|
public function updateLelongTawarruq(Request $request){
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
|
$cawangan_all = Cawangan::on('mysql7')->get();
|
||||||
|
|
||||||
// foreach($cawangan_all as $index=>$cawangan){
|
foreach($cawangan_all as $index=>$cawangan){
|
||||||
$gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','!=','bakihargajualan'],['hargajualan','!=',null]])->get();
|
$gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get();
|
||||||
foreach($gadai_all as $index=>$gadai){
|
foreach($gadai_all as $index=>$gadai){
|
||||||
$totalbayaran = $gadai['hargajualan'] - $gadai['bakihargajualan'];
|
$totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1);
|
||||||
$upah6bln_raw = $gadai['bakiupah'];
|
$upah6bln_raw = $gadai['bakiupah'];
|
||||||
|
|
||||||
$upah6bln_round = number_format($upah6bln_raw,2);
|
$upah6bln_round = number_format($upah6bln_raw,2);
|
||||||
$upah6bln = substr($upah6bln_round, 0, -1);
|
$upah6bln = substr($upah6bln_round, 0, -1);
|
||||||
$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
|
//$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
|
||||||
|
if(strpos($upah6bln,',')){
|
||||||
|
$upah6bln = str_replace(',','',$upah6bln);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if($totalbayaran >= $upah6bln){
|
if($totalbayaran >= $upah6bln){
|
||||||
Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
|
$update_gadai= Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
|
||||||
'lelong_tawarruq'=>0
|
'lelong_tawarruq'=>'0'
|
||||||
]);
|
]);
|
||||||
}else{
|
}else{
|
||||||
Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
|
$update_gadai=Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
|
||||||
'lelong_tawarruq'=>1
|
'lelong_tawarruq'=>'1'
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// }
|
}
|
||||||
return response()->json('successful');
|
return response()->json('successful');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ use App\Tebus;
|
|||||||
use App\Advansur;
|
use App\Advansur;
|
||||||
use App\LelTebus;
|
use App\LelTebus;
|
||||||
use App\LelMarhun;
|
use App\LelMarhun;
|
||||||
|
use App\Audit;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
use DB;
|
use DB;
|
||||||
@@ -669,7 +670,7 @@ class LelongController extends Controller
|
|||||||
|
|
||||||
$lelong = Lelong::on($cawangan['mysql'])
|
$lelong = Lelong::on($cawangan['mysql'])
|
||||||
->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah')
|
->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah')
|
||||||
->leftJoin('gadai', 'gadai.norujukan', '=', 'Lelong.norujukan')
|
->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
|
||||||
// ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
|
// ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
|
||||||
->where('batchno','=',$request->batchno)
|
->where('batchno','=',$request->batchno)
|
||||||
->orderBy('gadai.t_gadai','asc')
|
->orderBy('gadai.t_gadai','asc')
|
||||||
@@ -677,7 +678,7 @@ class LelongController extends Controller
|
|||||||
|
|
||||||
$batchlel = BatchLel::on($cawangan['mysql'])
|
$batchlel = BatchLel::on($cawangan['mysql'])
|
||||||
->where('batchno','=',$request->batchno)
|
->where('batchno','=',$request->batchno)
|
||||||
->get()->toArray();
|
->first();
|
||||||
|
|
||||||
$lelonglist = $lelong->get();
|
$lelonglist = $lelong->get();
|
||||||
|
|
||||||
@@ -692,10 +693,10 @@ class LelongController extends Controller
|
|||||||
->select('nama','telefon','telefon2','alamat1','alamat2','poskod','koddaerah')
|
->select('nama','telefon','telefon2','alamat1','alamat2','poskod','koddaerah')
|
||||||
->where('kpbaru','=',$lel['nokp'])
|
->where('kpbaru','=',$lel['nokp'])
|
||||||
->orWhere('kplama','=',$lel['nokp'])
|
->orWhere('kplama','=',$lel['nokp'])
|
||||||
->get()->toArray();
|
->first();
|
||||||
|
|
||||||
$poskod = Poskod::on('mysql7')
|
$poskod = Poskod::on('mysql7')
|
||||||
->where('poskod','=',$customer[0]['poskod'])
|
->where('poskod','=',$customer['poskod'])
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$daerah = Daerah::on('mysql7')
|
$daerah = Daerah::on('mysql7')
|
||||||
@@ -706,7 +707,7 @@ class LelongController extends Controller
|
|||||||
->where('kodnegeri','=',$poskod['kodnegeri'])
|
->where('kodnegeri','=',$poskod['kodnegeri'])
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
array_push($arraylelong,['poskod'=>$customer[0]['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer[0]['alamat1'],'alamat2' => $customer[0]['alamat2'],'masa' => $batchlel[0]['masadari'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer[0]['nama'], 'telefon1' => $customer[0]['telefon'], 'telefon2' => $customer[0]['telefon2'], 'norujukan' => $lel['norujukan'], 'JBG' => $lel['jbg'], 'IC' => $lel['nokp'], 'Pembiayaan' => $lel['pinjaman'], 'upah6' => $lel['bakiupah'], 'bayaran' => $ansuran]);
|
array_push($arraylelong,['poskod'=>$customer['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer['alamat1'],'alamat2' => $customer['alamat2'],'masa' => $batchlel['masadari'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer['nama'], 'telefon1' => $customer['telefon'], 'telefon2' => $customer['telefon2'], 'norujukan' => $lel['norujukan'], 'JBG' => $lel['jbg'], 'IC' => $lel['nokp'], 'Pembiayaan' => $lel['pinjaman'], 'upah6' => $lel['bakiupah'], 'bayaran' => $ansuran]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return response()->json($arraylelong);
|
return response()->json($arraylelong);
|
||||||
@@ -721,4 +722,18 @@ class LelongController extends Controller
|
|||||||
return response()->json($detailslelong);
|
return response()->json($detailslelong);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function keluarLelongTawarruq(){
|
||||||
|
$cawangan_all = Cawangan::on('mysql7')->get();
|
||||||
|
|
||||||
|
foreach($cawangan_all as $index=>$cawangan){
|
||||||
|
$list_lelong = Lelong::on($cawangan['mysql'])->where('t_jual',null)->pluck('norujukan')->toArray();
|
||||||
|
|
||||||
|
$gadai_lelong = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_lelong)->where('lelong_tawarruq',0)->pluck('norujukan')->toArray();
|
||||||
|
|
||||||
|
$delete_lelong = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$gadai_lelong)->delete();
|
||||||
|
|
||||||
|
$update_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadai_lelong)->update(['taglel'=>0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -392,8 +392,10 @@ class TebusController extends Controller
|
|||||||
'sttebus' => "T",
|
'sttebus' => "T",
|
||||||
't_update' => $current->toDateString(),
|
't_update' => $current->toDateString(),
|
||||||
));
|
));
|
||||||
|
$harga_tebus = $this->tebusTawarruq($kodcaw,$norujukan);
|
||||||
$upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
|
$upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
|
||||||
|
$upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
|
||||||
|
$upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
|
||||||
|
|
||||||
$create_tebus = Tebus::on($cawangan['mysql'])->create([
|
$create_tebus = Tebus::on($cawangan['mysql'])->create([
|
||||||
'kodcaw'=> $kodcaw,
|
'kodcaw'=> $kodcaw,
|
||||||
@@ -403,20 +405,20 @@ class TebusController extends Controller
|
|||||||
'jenistebus' => $request->jenistebus,
|
'jenistebus' => $request->jenistebus,
|
||||||
'glcode' => "0",
|
'glcode' => "0",
|
||||||
't_tebus' => $current->toDateString(),
|
't_tebus' => $current->toDateString(),
|
||||||
'jbg' => $request->jbg,
|
'jbg' => $gadai['tempoh'],
|
||||||
'kadarupah' => $request->kadarupah,
|
'kadarupah' => $gadai['kadarupah'],
|
||||||
'nilaimarhun' => $request->nilai_marhun,
|
'nilaimarhun' => $gadai['nilaimarhun'],
|
||||||
'pinjaman' => $request->pinjaman,
|
'pinjaman' => $gadai['pinjaman'],
|
||||||
'ansuran' => $request->ansuran,
|
'ansuran' => 0.00,
|
||||||
'addpinjaman' => $request->addpinjaman,
|
'addpinjaman' => $request->addpinjaman,
|
||||||
'bakipjm' => $request->bakipinjaman,
|
'bakipjm' => $harga_tebus,
|
||||||
'bakiupah' => $request->bakiupah,
|
'bakiupah' => $upah_tebus,
|
||||||
'terima' => "*",
|
'terima' => "*",
|
||||||
'kodgl' => "0",
|
'kodgl' => "0",
|
||||||
'nowakil' => $request->nowakil,
|
'nowakil' => $request->nowakil,
|
||||||
'rebate' => $rebet,
|
'rebate' => $rebet,
|
||||||
'marhuntebus' => $request->marhun,
|
'marhuntebus' => $request->marhun,
|
||||||
'historygadaian' => $request->historygadaian,
|
'historygadaian' => $norujukan,
|
||||||
'tarikhbyrn' => $current->toDateString(),
|
'tarikhbyrn' => $current->toDateString(),
|
||||||
'teller' => $request->teller
|
'teller' => $request->teller
|
||||||
]);
|
]);
|
||||||
@@ -437,9 +439,9 @@ class TebusController extends Controller
|
|||||||
|
|
||||||
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
|
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
|
||||||
'norujukan' => $norujukan,
|
'norujukan' => $norujukan,
|
||||||
'bayaran_keuntungan' => $request->bakiupah,
|
'bayaran_keuntungan' => $upah_tebus,
|
||||||
'bayaran_pembiayaan' => $gadai['bakipjm'],
|
'bayaran_pembiayaan' => $gadai['bakipjm'],
|
||||||
'keuntungan_rebet' => $upah_rebet,
|
'keuntungan_rebet' => $upah_rebet_sebenar,
|
||||||
'tarikh_bayaran'=> $current,
|
'tarikh_bayaran'=> $current,
|
||||||
'kodcaw'=> $kodcaw
|
'kodcaw'=> $kodcaw
|
||||||
]);
|
]);
|
||||||
@@ -464,7 +466,7 @@ class TebusController extends Controller
|
|||||||
'nokp' => $gadai['nokp'],
|
'nokp' => $gadai['nokp'],
|
||||||
'teller' => $request->teller,
|
'teller' => $request->teller,
|
||||||
'kodcaw' => $kodcaw,
|
'kodcaw' => $kodcaw,
|
||||||
'duit_masuk' => $request->bakipinjaman,
|
'duit_masuk' => $harga_tebus,
|
||||||
'created_at' => $current,
|
'created_at' => $current,
|
||||||
'bakiharga' => $baki_hargajualan,
|
'bakiharga' => $baki_hargajualan,
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ class TransactionOnlineController extends Controller
|
|||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
|
||||||
|
|
||||||
|
$sag = Gadai::on($cawangan['mysql'])->where('norujukan',$request->norujukan)->first();
|
||||||
|
|
||||||
$transaction = TransactionOnline::on('mysql7')->create([
|
$transaction = TransactionOnline::on('mysql7')->create([
|
||||||
'nokp' => $request->nokp,
|
'nokp' => $request->nokp,
|
||||||
'reference_no' => $request->reference_no,
|
'reference_no' => $request->reference_no,
|
||||||
@@ -42,7 +46,8 @@ class TransactionOnlineController extends Controller
|
|||||||
'total_payment' => $request->total_payment,
|
'total_payment' => $request->total_payment,
|
||||||
'tarikh' => $current->toDateString(),
|
'tarikh' => $current->toDateString(),
|
||||||
'masa' => $current->toTimeString(),
|
'masa' => $current->toTimeString(),
|
||||||
'customer_name' => $request->customer_name
|
'customer_name' => $request->customer_name,
|
||||||
|
'tempohbayar'=>$sag['tempoh']
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return response()->json($transaction,201);
|
return response()->json($transaction,201);
|
||||||
@@ -68,7 +73,7 @@ class TransactionOnlineController extends Controller
|
|||||||
$gadai_data = Gadai::on($cawangan['mysql'])->where([['norujukan',$transaction['norujukan']],['nokp',$transaction['nokp']]])->first();
|
$gadai_data = Gadai::on($cawangan['mysql'])->where([['norujukan',$transaction['norujukan']],['nokp',$transaction['nokp']]])->first();
|
||||||
|
|
||||||
if($gadai_data['hargajualan'] > 0){
|
if($gadai_data['hargajualan'] > 0){
|
||||||
$this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
|
$this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at'],$transaction['tempohbayar']);
|
||||||
}else{
|
}else{
|
||||||
$this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
|
$this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
|
||||||
}
|
}
|
||||||
@@ -83,7 +88,7 @@ class TransactionOnlineController extends Controller
|
|||||||
'teller' => 'ONLINE'
|
'teller' => 'ONLINE'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan'],['billplz_id',$transaction['billplz_id']]]])->update([
|
TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan']],['billplz_id',$transaction['billplz_id']]])->update([
|
||||||
'update_status' => 1,
|
'update_status' => 1,
|
||||||
'update_serahan' => 1
|
'update_serahan' => 1
|
||||||
]);
|
]);
|
||||||
@@ -92,7 +97,7 @@ class TransactionOnlineController extends Controller
|
|||||||
return response()->json('success');
|
return response()->json('success');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function kiraupahTawarruq($kodcaw,$norujukan){
|
public function kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar){
|
||||||
$cawangan = Cawangan::on('mysql7')
|
$cawangan = Cawangan::on('mysql7')
|
||||||
->where('kodcaw','=',$kodcaw)
|
->where('kodcaw','=',$kodcaw)
|
||||||
->first();
|
->first();
|
||||||
@@ -101,7 +106,7 @@ class TransactionOnlineController extends Controller
|
|||||||
->where('norujukan','=',$norujukan)
|
->where('norujukan','=',$norujukan)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
|
$bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
|
||||||
|
|
||||||
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
|
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
|
||||||
|
|
||||||
@@ -114,7 +119,7 @@ class TransactionOnlineController extends Controller
|
|||||||
return $upah_semasa;
|
return $upah_semasa;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function kiraUpahRebet($kodcaw,$norujukan){
|
public function kiraUpahRebet($kodcaw,$norujukan,$tempohbayar){
|
||||||
$cawangan = Cawangan::on('mysql7')
|
$cawangan = Cawangan::on('mysql7')
|
||||||
->where('kodcaw','=',$kodcaw)
|
->where('kodcaw','=',$kodcaw)
|
||||||
->first();
|
->first();
|
||||||
@@ -123,7 +128,7 @@ class TransactionOnlineController extends Controller
|
|||||||
->where('norujukan','=',$norujukan)
|
->where('norujukan','=',$norujukan)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
|
$bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
|
||||||
|
|
||||||
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||||
|
|
||||||
@@ -137,15 +142,19 @@ class TransactionOnlineController extends Controller
|
|||||||
return $upah_rebet;
|
return $upah_rebet;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at){
|
public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at,$tempohbayar){
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
$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 = $this->kiraupahTawarruq($kodcaw,$norujukan);
|
if($tempohbayar == 0.0){
|
||||||
$upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
|
$tempohbayar = $gadai['tempoh'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar);
|
||||||
|
$upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan,$tempohbayar);
|
||||||
|
|
||||||
$total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
|
$total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
|
||||||
|
|
||||||
@@ -188,7 +197,7 @@ class TransactionOnlineController extends Controller
|
|||||||
'jbg' => 0,
|
'jbg' => 0,
|
||||||
't_update' => Carbon::parse($paid_at)->toDateString(),
|
't_update' => Carbon::parse($paid_at)->toDateString(),
|
||||||
'bakihargajualan' => $baki_hargajualan,
|
'bakihargajualan' => $baki_hargajualan,
|
||||||
'tempohbayar' => $gadai['tempoh'],
|
'tempohbayar' => $tempohbayar,
|
||||||
'lelong_tawarruq' => $lelong_tawarruq
|
'lelong_tawarruq' => $lelong_tawarruq
|
||||||
));
|
));
|
||||||
return response()->json($update_gadai, 200);
|
return response()->json($update_gadai, 200);
|
||||||
@@ -243,4 +252,19 @@ class TransactionOnlineController extends Controller
|
|||||||
return response()->json(false);
|
return response()->json(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getListUnsuccessful(){
|
||||||
|
$list = TransactionOnline::on('mysql7')->whereIn('status',['NOT PAID','UNSUCCESSFUL'])->get();
|
||||||
|
|
||||||
|
return response()->json($list);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateUnsuccessfulTransaction(Request $request){
|
||||||
|
$transaction = TransactionOnline::on('mysql7')->where('billplz_id','=',$request->billplz_id)->update(array(
|
||||||
|
'status' => $request->status,
|
||||||
|
'paid_at' => $request->paid_at
|
||||||
|
));
|
||||||
|
|
||||||
|
return response()->json($transaction,200);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class KadarUpah extends Model
|
||||||
|
{
|
||||||
|
protected $table = 'kadarupah';
|
||||||
|
protected $connection = 'mysql7';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes that are mass assignable.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
// protected $fillable = [
|
||||||
|
|
||||||
|
// ];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes excluded from the model's JSON form.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
// protected $hidden = [];
|
||||||
|
}
|
||||||
@@ -5,6 +5,18 @@ return [
|
|||||||
'default' => 'accounts',
|
'default' => 'accounts',
|
||||||
|
|
||||||
'connections' => [
|
'connections' => [
|
||||||
|
'lelong' => [
|
||||||
|
'driver' => 'mysql',
|
||||||
|
'host' => env('DB_HOST_LELONG'),
|
||||||
|
'port' => env('DB_PORT_LELONG'),
|
||||||
|
'database' => env('DB_DATABASE_LELONG'),
|
||||||
|
'username' => env('DB_USERNAME_LELONG'),
|
||||||
|
'password' => env('DB_PASSWORD_LELONG'),
|
||||||
|
'charset' => 'utf8',
|
||||||
|
'collation' => 'utf8_unicode_ci',
|
||||||
|
'prefix' => '',
|
||||||
|
'strict' => false,
|
||||||
|
],
|
||||||
'mysql' => [
|
'mysql' => [
|
||||||
'driver' => 'mysql',
|
'driver' => 'mysql',
|
||||||
'host' => env('DB_HOST'),
|
'host' => env('DB_HOST'),
|
||||||
|
|||||||
@@ -224,6 +224,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
$router->get('transaction/online/express',['uses'=>'TransactionOnlineController@getTransactionOnline']);
|
$router->get('transaction/online/express',['uses'=>'TransactionOnlineController@getTransactionOnline']);
|
||||||
$router->get('transaction/online/update',['uses'=>'TransactionOnlineController@updateTransactionOnline']);
|
$router->get('transaction/online/update',['uses'=>'TransactionOnlineController@updateTransactionOnline']);
|
||||||
$router->get('transaction/online/login',['uses'=>'TransactionOnlineController@getTransactionOnlineLogin']);
|
$router->get('transaction/online/login',['uses'=>'TransactionOnlineController@getTransactionOnlineLogin']);
|
||||||
|
$router->get('transaction/online/unsuccessful',['uses'=>'TransactionOnlineController@getListUnsuccessful']);
|
||||||
|
$router->put('transaction/online/unsuccesfull/update',['uses'=>'TransactionOnlineController@updateUnsuccessfulTransaction']);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -547,6 +550,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
$router->get('check/upah12/kosong',['uses'=>'GadaiController@upah12kosong']);
|
$router->get('check/upah12/kosong',['uses'=>'GadaiController@upah12kosong']);
|
||||||
|
|
||||||
$router->get('calculate/akru/bycawangan',['uses'=>'GadaiController@calculateAkru']);
|
$router->get('calculate/akru/bycawangan',['uses'=>'GadaiController@calculateAkru']);
|
||||||
|
|
||||||
|
$router->get('keluar/lelong/tawarruq',['uses'=>'LelongController@keluarLelongTawarruq']);
|
||||||
});
|
});
|
||||||
|
|
||||||
$router->group(['prefix'=>'e-arrahn'], function () use ($router){
|
$router->group(['prefix'=>'e-arrahn'], function () use ($router){
|
||||||
|
|||||||
Reference in New Issue
Block a user