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

server

Browse Source
This commit is contained in:
e.arrahn
2021-10-03 15:22:06 +08:00
parent 8b80093bee
commit 1108d190de
3 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+5 -1
View File
@@ -490,7 +490,11 @@ class GadaiController extends Controller
return response()->json($gadai); 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(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
app/Http/Controllers/MarhunController.php
+9 -1
View File
@@ -92,6 +92,10 @@ class MarhunController extends Controller
public function deletemarhun($kodcaw,$norujukan,Request $request) public function deletemarhun($kodcaw,$norujukan,Request $request)
{ {
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->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) public function editmarhun($kodcaw,$norujukan,Request $request)
{ {
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first(); $old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
@@ -176,4 +184,4 @@ class MarhunController extends Controller
return response()->json($marhun); return response()->json($marhun);
} }
} }
app/Http/Controllers/TebusController.php
+37 -8
View File
@@ -563,20 +563,49 @@ class TebusController extends Controller
public function getLaporanTebus($kodcaw,$tarikh){ public function getLaporanTebus($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebus = Tebus::on($cawangan['mysql']) $tebus_data = 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') ->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('gadai as gad','gad.norujukan','=','tebus.norujukan')
->join('online_arrahn.customer as cust', function($join) // ->join('online_arrahn.customer as cust', function($join)
{ // {
$join->on('gad.nokp', '=', 'cust.kpbaru'); // $join->on('gad.nokp', '=', 'cust.kpbaru');
$join->orOn('gad.nokp', '=', 'cust.kplama'); // $join->orOn('gad.nokp', '=', 'cust.kplama');
}) // })
->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') // ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
->where('tebus.t_tebus','=',$tarikh) ->where('tebus.t_tebus','=',$tarikh)
->groupBy('tebus.norujukan') ->groupBy('tebus.norujukan')
->orderBy('tebus.teller') ->orderBy('tebus.teller')
->orderBy('tebus.sirit') ->orderBy('tebus.sirit')
->get(); ->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); return response()->json($tebus);
} }