server
This commit is contained in:
@@ -490,7 +490,11 @@ class GadaiController extends Controller
|
||||
return response()->json($gadai);
|
||||
}
|
||||
|
||||
public function batalGadai($kodcaw, $norujukan){
|
||||
public function batalGadai($kodcaw, $norujukan,Request $request){
|
||||
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
$old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
|
||||
|
||||
@@ -92,6 +92,10 @@ class MarhunController extends Controller
|
||||
|
||||
public function deletemarhun($kodcaw,$norujukan,Request $request)
|
||||
{
|
||||
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
|
||||
@@ -113,6 +117,10 @@ class MarhunController extends Controller
|
||||
|
||||
public function editmarhun($kodcaw,$norujukan,Request $request)
|
||||
{
|
||||
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
|
||||
|
||||
@@ -563,21 +563,50 @@ class TebusController extends Controller
|
||||
public function getLaporanTebus($kodcaw,$tarikh){
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
$tebus = Tebus::on($cawangan['mysql'])
|
||||
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
|
||||
$tebus_data = Tebus::on($cawangan['mysql'])
|
||||
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
|
||||
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
|
||||
->join('online_arrahn.customer as cust', function($join)
|
||||
{
|
||||
$join->on('gad.nokp', '=', 'cust.kpbaru');
|
||||
$join->orOn('gad.nokp', '=', 'cust.kplama');
|
||||
})
|
||||
->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
|
||||
// ->join('online_arrahn.customer as cust', function($join)
|
||||
// {
|
||||
// $join->on('gad.nokp', '=', 'cust.kpbaru');
|
||||
// $join->orOn('gad.nokp', '=', 'cust.kplama');
|
||||
// })
|
||||
// ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
|
||||
->where('tebus.t_tebus','=',$tarikh)
|
||||
->groupBy('tebus.norujukan')
|
||||
->orderBy('tebus.teller')
|
||||
->orderBy('tebus.sirit')
|
||||
->get();
|
||||
|
||||
$tebus = [];
|
||||
if($tebus_data){
|
||||
foreach($tebus_data as $index=>$tebusData){
|
||||
$customer_info = Customer::on('mysql7')->where('kplama','=',$tebusData['nokp'])->orWhere('kpbaru','=',$tebusData['nokp'])->first();
|
||||
|
||||
$trans = TransaksiKeuntungan::on('mysql7')->where('norujukan',$tebusData['norujukan'])->orderBy('tarikh_bayaran','desc')->first();
|
||||
|
||||
array_push($tebus,[
|
||||
"t_tebus"=>$tebusData['t_tebus'],
|
||||
"t_gadai"=>$tebusData['t_gadai'],
|
||||
"hargajualan"=>$tebusData['hargajualan'],
|
||||
"bakihargajualan"=>$tebusData['bakihargajualan'],
|
||||
"gadaibakipjm"=>$tebusData['gadaibakipjm'],
|
||||
"tarikh_bayaran"=>$trans['tarikh_bayaran'],
|
||||
"nilaimarhun"=>$tebusData['nilaimarhun'],
|
||||
"tagterima"=>$tebusData['tagterima'],
|
||||
"teller"=>$tebusData['teller'],
|
||||
"jenistebus"=>$tebusData['jenistebus'],
|
||||
"pinjaman"=>$tebusData['pinjaman'],
|
||||
"bakiupah"=>$tebusData['bakiupah'],
|
||||
"bakipjm"=>$tebusData['bakipjm'],
|
||||
"norujukan"=>$tebusData['norujukan'],
|
||||
"nama"=>$customer_info['nama'],
|
||||
"nokp"=>$tebusData['nokp'],
|
||||
"jbg"=>$tebusData['jbg']
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
return response()->json($tebus);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user