This commit is contained in:
e.arrahn
2021-07-08 12:22:25 +08:00
parent 8395fa0c77
commit efcff2e4a1
10 changed files with 113 additions and 20 deletions
+56 -6
View File
@@ -554,14 +554,15 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->select('Gadai.t_gadai','Gadai.norujukan','cust.nama','Gadai.nokp','Gadai.semakbarcode','Gadai.masa','Gadai.berat','Gadai.nilaimarhun','Gadai.pinjaman','Gadai.upah12','Gadai.percentpinj','cust.alamat1','Gadai.teller')
->join('Customer as cust', function($join)
->select('gadai.t_gadai','gadai.norujukan','cust.nama','gadai.nokp','gadai.semakbarcode','gadai.masa','gadai.berat','gadai.nilaimarhun','gadai.pinjaman','gadai.upah12','gadai.percentpinj','cust.alamat1','gadai.teller')
->join('online_arrahn.customer as cust', function($join)
{
$join->on('Gadai.nokp', '=', 'cust.kpbaru');
$join->orOn('Gadai.nokp', '=', 'cust.kplama');
$join->on('gadai.nokp', '=', 'cust.kpbaru');
$join->orOn('gadai.nokp', '=', 'cust.kplama');
})
->where('Gadai.t_gadai','=',$tarikh)
->orderBy('Gadai.teller')
->where('gadai.t_gadai','=',$tarikh)
->orderBy('gadai.teller')
->orderBy('gadai.sirig')
->get();
return response()->json($gadai);
@@ -2298,6 +2299,55 @@ class GadaiController extends Controller
case 'ARP':
$tarikhtawarruq = '2021-06-15';
break;
case '010621':
$tarikhtawarruq = '2021-06-21';
break;
case '010136':
$tarikhtawarruq = '2021-06-20';
break;
case '011235':
$tarikhtawarruq = '2021-06-21';
break;
case '011227':
$tarikhtawarruq = '2021-06-21';
break;
case '010620':
$tarikhtawarruq = '2021-06-21';
break;
case '010617':
$tarikhtawarruq = '2021-06-21';
break;
case '010915':
$tarikhtawarruq = '2021-06-22';
break;
case '011228':
$tarikhtawarruq = '2021-06-22';
break;
case '010219':
$tarikhtawarruq = '2021-06-22';
break;
case '011229':
$tarikhtawarruq = '2021-06-22';
break;
break;
case '011230':
$tarikhtawarruq = '2021-06-23';
break;
case '011013':
$tarikhtawarruq = '2021-06-23';
break;
case '011412':
$tarikhtawarruq = '2021-06-23';
break;
case '011234':
$tarikhtawarruq = '2021-06-22';
break;
case '020303':
$tarikhtawarruq = '2021-06-23';
break;
case '010618':
$tarikhtawarruq = '2021-06-23';
break;
}
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])