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

Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

Browse Source
This commit is contained in:
e.arrahn
2021-07-15 18:04:00 +08:00
parent a51f381ec7 7c6ac00916
commit e961e0b31d
15 changed files with 1541 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/DenoPanjar.php
+28
View File
@@ -0,0 +1,28 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class DenoPanjar extends Model
{
protected $table = 'denopanjar';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','jenis','recno','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50'];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
public $timestamps = false;
}
app/Http/Controllers/CustomerController.php
+1 -1
View File
@@ -300,7 +300,7 @@ class CustomerController extends Controller
// $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Customer::on('mysql7')
->where('tarikhdaftar','=',$tarikh)
->where([['tarikhdaftar','=',$tarikh],['kodcaw',$kodcaw]])
->orderBy('tarikhdaftar', 'desc')
->get();
app/Http/Controllers/GadaiController.php
+414 -54
View File
@@ -18,6 +18,7 @@ use App\Vault;
use App\Tunai;
use App\Komuditi;
use App\KawalanStokLama;
use App\KawalanStok;
use Illuminate\Http\Request;
@@ -73,8 +74,11 @@ class GadaiController extends Controller
}
public function showOneGadaiByNorujukan($norujukan){
$cawangan_all = Cawangan::on('mysql7')->get();
$gadai_all = [];
foreach($cawangan_all as $index=>$cawangan){
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
if(sizeof($gadai) != 0){
@@ -82,6 +86,7 @@ class GadaiController extends Controller
}
}
return response()->json($gadai_all);
}
@@ -553,8 +558,30 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->where('t_gadai','=',$tarikh)
->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');
})
->where('gadai.t_gadai','=',$tarikh)
->orderBy('gadai.teller')
->orderBy('gadai.sirig')
->get();
return response()->json($gadai);
}
public function getLaporanGadaiRange($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->where('t_gadai','>=',$request->mula)
->where('t_gadai','<=',$request->akhir)
->orderBy('teller')
->orderBy('t_gadai','asc')
->orderBy('sirig','asc')
->get();
return response()->json($gadai);
@@ -893,7 +920,34 @@ class GadaiController extends Controller
$dateans = new Carbon($request->tarikh);
$gadai = Transaction::on('mysql7')
$ansuran = Transaction::on('mysql7')
->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller')
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->leftJoin('customer as cust', function($join)
{
$join->on('transaction.nokp', '=', 'cust.kpbaru');
$join->orOn('transaction.nokp', '=', 'cust.kplama');
})
->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan')
->where('transaction.kodcaw','=',$kodcaw)
->where('transaction.trans_type','=','A')
->whereDate('transaction.created_at','=',$dateans)
->orderBy('transaction.teller')
->get();
return response()->json($ansuran);
}
public function getAnsuranSummary($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$dateans = new Carbon($request->tarikh);
$ansurans = Transaction::on('mysql7')
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -901,10 +955,15 @@ class GadaiController extends Controller
})
->where('transaction.kodcaw','=',$kodcaw)
->where('transaction.trans_type','=','A')
->whereDate('transaction.created_at','=',$dateans)
->get();
->whereDate('transaction.created_at','=',$dateans);
$keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
$pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
$bilangan = $ansurans->count();
$arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan, 'bilangan' => $bilangan];
return response()->json($gadai);
return response()->json($arrayansuran,200);
}
public function updateHistoryGadai($kodcaw,$norujukan,Request $request){
@@ -1133,6 +1192,62 @@ class GadaiController extends Controller
$lelong3[0]['pinj'] = $lelpinj3;
}
}else{
$kawalanstok = KawalanStok::on($cawangan['mysql'])
->get();
foreach($kawalanstok as $indexgad => $gadaikawalanstok)
{
//Gadai
$gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilgadc1']);
$gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilgadc2']);
$gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilgadc3']);
$gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc1']);
$gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc2']);
$gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc3']);
$gadai1[0]['bil'] = $gad1;
$gadai1[0]['pinj'] = $gadpinj1;
$gadai2[0]['bil'] = $gad2;
$gadai2[0]['pinj'] = $gadpinj2;
$gadai3[0]['bil'] = $gad3;
$gadai3[0]['pinj'] = $gadpinj3;
//Tebus
$teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['biltebc1']);
$teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['biltebc2']);
$teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['biltebc3']);
$tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc1']);
$tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc2']);
$tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc3']);
$tebus1[0]['bil'] = $teb1;
$tebus1[0]['pinj'] = $tebpinj1;
$tebus2[0]['bil'] = $teb2;
$tebus2[0]['pinj'] = $tebpinj2;
$tebus3[0]['bil'] = $teb3;
$tebus3[0]['pinj'] = $tebpinj3;
//Lelong
$lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['billelc1']);
$lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['billelc2']);
$lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['billelc3']);
$lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc1']);
$lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc2']);
$lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc3']);
$lelong1[0]['bil'] = $lel1;
$lelong1[0]['pinj'] = $lelpinj1;
$lelong2[0]['bil'] = $lel2;
$lelong2[0]['pinj'] = $lelpinj2;
$lelong3[0]['bil'] = $lel3;
$lelong3[0]['pinj'] = $lelpinj3;
}
}
//////////////////
@@ -2196,7 +2311,88 @@ class GadaiController extends Controller
case 'WB':
$tarikhtawarruq = '2021-05-24';
break;
}
case 'APM':
$tarikhtawarruq = '2021-06-08';
break;
case 'ARM':
$tarikhtawarruq = '2021-06-08';
break;
case '020306':
$tarikhtawarruq = '2021-06-08';
break;
case '010311':
$tarikhtawarruq = '2021-06-13';
break;
case 'GC':
$tarikhtawarruq = '2021-06-13';
break;
case 'JLI':
$tarikhtawarruq = '2021-06-13';
break;
case '010621':
$tarikhtawarruq = '2021-06-15';
break;
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;
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-28';
break;
case '020303':
$tarikhtawarruq = '2021-06-29';
break;
case '010618':
$tarikhtawarruq = '2021-06-29';
break;
case '011231':
$tarikhtawarruq = '2021-06-24';
break;
case '011232':
$tarikhtawarruq = '2021-06-28';
break;
case '011233':
$tarikhtawarruq = '2021-06-28';
break;
}
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
@@ -2222,21 +2418,162 @@ class GadaiController extends Controller
return response()->json($array_rekodemas);
}
public function CalculationPinjamanDiberiLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$tarikhtawarruq = '';
switch ($kodcaw) {
case 'KB2':
$tarikhtawarruq = '2021-04-13';
break;
case 'WCY':
$tarikhtawarruq = '2021-05-04';
break;
case '1STOP':
$tarikhtawarruq = '2021-05-09';
break;
case '020301':
$tarikhtawarruq = '2021-05-18';
break;
case 'ALS':
$tarikhtawarruq = '2021-05-24';
break;
case 'WB':
$tarikhtawarruq = '2021-05-24';
break;
case 'APM':
$tarikhtawarruq = '2021-06-08';
break;
case 'ARM':
$tarikhtawarruq = '2021-06-08';
break;
case '020306':
$tarikhtawarruq = '2021-06-08';
break;
case '010311':
$tarikhtawarruq = '2021-06-13';
break;
case 'GC':
$tarikhtawarruq = '2021-06-13';
break;
case 'JLI':
$tarikhtawarruq = '2021-06-13';
break;
case '010621':
$tarikhtawarruq = '2021-06-15';
break;
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;
case '011013':
$tarikhtawarruq = '2021-06-23';
break;
case '011412':
$tarikhtawarruq = '2021-06-23';
break;
case '011234':
$tarikhtawarruq = '2021-06-28';
break;
case '020303':
$tarikhtawarruq = '2021-06-29';
break;
case '010618':
$tarikhtawarruq = '2021-06-29';
break;
case '011231':
$tarikhtawarruq = '2021-06-24';
break;
case '011232':
$tarikhtawarruq = '2021-06-28';
break;
case '011233':
$tarikhtawarruq = '2021-06-28';
break;
}
$gadai = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$tarikhtawarruq]])
->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]])
->sum('pinjaman');
$tebus = Gadai::on($cawangan['mysql'])
->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
->where('gadai.tagpalsu','=',0)
->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']])
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
->sum('teb.pinjaman');
$array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus];
return response()->json($array_rekodemas);
}
public function CalculationPembiayaanTawarruq($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
// if($request->tarikh > '2021-04-13'){
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
// ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
->where([['t_gadai','<=',$request->tarikh],['sttebus','=',''],['hargajualan','<>','NULL']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
// ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']])
->sum('pinjaman');
// }
return response()->json($rekod_pinjamandiberi);
}
public function CalculationPembiayaanTawarruqLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
// $Gadai = Gadai::on($cawangan['mysql'])
// ->where('tagpalsu','=',0)
// ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
// ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
// ->sum('pinjaman');
$Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
$Tebus = Gadai::on($cawangan['mysql'])
->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
->where('gadai.tagpalsu','=',0)
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gadai.sttebus','=','T'],['gadai.hargajualan','<>','NULL']])
->sum('teb.pinjaman');
$rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
return response()->json($rekod_pinjamandiberi);
}
@@ -2279,6 +2616,36 @@ class GadaiController extends Controller
return response()->json($totalkeuntungan,200);
}
public function CalculationKeuntunganLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$current = Carbon::now();
$current = new Carbon();
$keuntungan = Gadai::on($cawangan['mysql'])
->where('t_gadai','>=',$request->mula)
->where('t_gadai','<=',$request->hingga)
->where('hargajualan','<>','null')
->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['t_gadai','>=','2021-04-14']])
->whereNotNull('upah12')
->sum('upah12');
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
// ->whereYear('tarikh_bayaran','=',$current->year)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// $totalkeuntungan = $keuntungan - $transaksi;
$totalkeuntungan = $keuntungan;
return response()->json($totalkeuntungan,200);
}
public function CalculationBayaranPendahuluan($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
@@ -2299,33 +2666,41 @@ class GadaiController extends Controller
return response($transaksi);
}
public function CalculationBayaranPendahuluanLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$datetawarruq = new Carbon('2021-04-14');
$datemula = new Carbon($request->mula);
$datemula->addDays(1);
$datehingga = new Carbon($request->hingga);
$datehingga->addDays(1);
$current = Carbon::now();
$current = new Carbon();
$transaksi = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->sum('bayaran_pembiayaan');
return response($transaksi);
}
public function LaporanAuditAktif($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rekodaudit = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->get();
$audit = Gadai::on($cawangan['mysql'])
->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
$totalrekod = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
$totalberat = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('berat');
$totalnilaimarhun = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('nilaimarhun');
$rekodaudit = $audit->get();
$totalrekod = $audit->sum('pinjaman');
$totalberat = $audit->sum('berat');
$totalnilaimarhun = $audit->sum('nilaimarhun');
$arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun];
@@ -2336,29 +2711,14 @@ class GadaiController extends Controller
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rekodaudit = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
$audit = Gadai::on($cawangan['mysql'])
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->get();
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
$totalrekod = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
$totalberat = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('berat');
$totalnilaimarhun = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('nilaimarhun');
$rekodaudit = $audit->get();
$totalrekod = $audit->sum('pinjaman');
$totalberat = $audit->sum('berat');
$totalnilaimarhun = $audit->sum('nilaimarhun');
$arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun];
app/Http/Controllers/GlejerController.php
+6 -9
View File
@@ -37,15 +37,12 @@ class GlejerController extends Controller
public function Getglejer_Data($tarikh1,$tarikh2,$kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$glejer=Glejer::on($cawangan['mysql'])->whereBetween('tarikh',[$tarikh1,$tarikh2])->orderBy('glcode','ASC')->get();
return response()->json($glejer);
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$db=$cawangan['mysql'];
$glejer=DB::connection($db)->select( "SELECT glcode, descpt , SUM(debit)AS total_debit, SUM(kredit) AS total_kredit, SUM(hariini) AS totalharini FROM glejer where tarikh BETWEEN '".$tarikh1."' and '".$tarikh2."' GROUP BY glcode,descpt ORDER BY glcode asc" );
return response()->json($glejer);
}
app/Http/Controllers/KelulusanController.php
+11 -4
View File
@@ -99,7 +99,8 @@ class KelulusanController extends Controller
->where('siri','=',$request->siri)
->update(array(
'masalulus' => $harini->toTimeString(),
'pelulus' => 'khazanah'
'pelulus' => 'khazanah',
'khazanah' => $request->namakhazanah
));
}else{
@@ -110,7 +111,8 @@ class KelulusanController extends Controller
->where('siri','=',$request->siri)
->update(array(
'masalulus'=> 'batal',
'pelulus'=> 'khazanah'
'pelulus'=> 'khazanah',
'khazanah' => $request->namakhazanah
));
}
@@ -125,7 +127,9 @@ class KelulusanController extends Controller
->where('norujukan','=',$norujukan)
->where('siri','=',$request->siri)
->update(array(
'pelulus' => 'operasi'
'pelulus' => 'operasi',
'khazanah' => $request->namakhazanah
));
}
@@ -137,7 +141,8 @@ class KelulusanController extends Controller
->where('siri','=',$request->siri)
->update(array(
'pelulus' => 'operasi',
'masalulus' => 'batal'
'masalulus' => 'batal',
'khazanah' => $request->namakhazanah
));
}
}
@@ -150,6 +155,7 @@ class KelulusanController extends Controller
->where('siri','=',$request->siri)
->update(array(
'pelulus' => 'dahlulus',
'operasi' => $request->namaoperasi,
'masalulus'=> $harini->toTimeString()
));
}else if($request->sahkan === 2){
@@ -159,6 +165,7 @@ class KelulusanController extends Controller
->where('siri','=',$request->siri)
->update(array(
'pelulus' => 'dahlulus',
'operasi' => $request->namaoperasi,
'masalulus'=> 'batal'
));
}
app/Http/Controllers/KomuditiController.php
+8
View File
@@ -22,6 +22,14 @@ class KomuditiController extends Controller
return response()->json($komuditi);
}
public function checkKomuditiDateChoose(Request $request){
$current = Carbon::now();
$current = new Carbon();
$komuditi = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$request->tarikh)->orderBy('created_at','desc')->first();
return response()->json($komuditi);
}
public function checkKomuditiDashboard(){
$current = Carbon::now();
$current = new Carbon();
app/Http/Controllers/LaporanController.php
+159 -8
View File
@@ -47,12 +47,13 @@ class LaporanController extends Controller
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw)
->where('trans.trans_type','=','A')
->groupBy('trans.id')
->sum('keuntungan_rebet');
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
@@ -60,7 +61,7 @@ class LaporanController extends Controller
$bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count();
$bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count();
$bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count();
$bilangan_customer_baru = Customer::on('mysql7')->where('tarikhdaftar','=',$request->tarikh)->count();
$bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$request->tarikh],['kodcaw',$request->kodcaw]])->count();
//c
/* Sistem */
@@ -182,21 +183,30 @@ class LaporanController extends Controller
}
//g
$bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah');
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
$gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman');
$gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman');
$total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80);
$nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('nilaimarhun');
$nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun');
$nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun');
$total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80);
$bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->count();
$bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->count();
$bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->count();
$total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80);
array_push($laporan_harian,[
'total_gadai'=>$total_gadai,
'total_tebus'=>$total_tebus,
@@ -206,15 +216,19 @@ class LaporanController extends Controller
'bilangan_ansuran'=>$bilangan_ansuran,
'bilangan_customer_baru'=>$bilangan_customer_baru,
'bayar_baki_lelong'=>$bayar_baki_lelong,
'bayar_rugi_lelong'=>$bayar_rugi_lelong,
'gadai_70'=>$gadai_70,
'gadai_75'=>$gadai_75,
'gadai_80'=>$gadai_80,
'total_gadaian'=>$total_gadaian,
'nilaimarhun_70'=>$nilaimarhun_70,
'nilaimarhun_75'=>$nilaimarhun_75,
'nilaimarhun_80'=>$nilaimarhun_80,
'total_nm'=>$total_nm,
'bilangan_70'=>$bilangan_70,
'bilangan_75'=>$bilangan_75,
'bilangan_80'=>$bilangan_80,
'total_bilangan'=>$total_bilangan,
'panjar_harian'=>$panjar_harian,
'panjar_bulanan'=>$panjar_bulanan,
'panjar_tahunan'=>$panjar_tahunan,
@@ -237,6 +251,129 @@ class LaporanController extends Controller
return response()->json($laporan_harian);
}
public function laporanTerkumpul(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$laporan_terkumpul = [];
$gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir]]);
$tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
$ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
//a
$total_gadai = $gadai->sum('pinjaman');
$total_tebus = $tebus->sum('pinjaman');
$total_ansuran = $ansuran->sum('duit_masuk');
// $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
$total_upah = Advansur::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->sum('upahdibayar');
$total_keuntungantebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]])->sum('bakiupah');
$total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','>=',$request->mula)
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.trans_type','=','A')
->where('trans.kodcaw','=',$request->kodcaw)
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
//b
$bilangan_gadai = $gadai->count();
$bilangan_tebus = $tebus->count();
$bilangan_ansuran = $ansuran->count();
$bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count();
//f
$data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->get();
$bilangan_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->count();
$cas_lelong = 0;
$jumlah_lelong = 0;
$baki_lelong = 0;
$rugi_lelong = 0;
foreach($data_lelong as $index=>$lelong){
if($lelong['baki'] >= 0){
$cas_lelong += $lelong['cajlelong'];
$jumlah_lelong += $lelong['hargajual'];
$baki_lelong += $lelong['baki'];
}elseif($lelong['baki'] < 0){
$cas_lelong += $lelong['cajlelong'];
$jumlah_lelong += $lelong['hargajual'];
$rugi_lelong += abs($lelong['baki']);
}
}
//g
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
$gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman');
$gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman');
$total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80);
$nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('nilaimarhun');
$nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun');
$nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun');
$total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80);
$bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->count();
$bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->count();
$bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->count();
$total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80);
array_push($laporan_terkumpul,[
'total_gadai'=>$total_gadai,
'total_tebus'=>$total_tebus,
'total_ansuran'=>$total_ansuran,
'bilangan_gadai'=>$bilangan_gadai,
'bilangan_tebus'=>$bilangan_tebus,
'bilangan_ansuran'=>$bilangan_ansuran,
'bilangan_customer_baru'=>$bilangan_customer_baru,
'bayar_baki_lelong'=>$bayar_baki_lelong,
'bayar_rugi_lelong'=>$bayar_rugi_lelong,
'gadai_70'=>$gadai_70,
'gadai_75'=>$gadai_75,
'gadai_80'=>$gadai_80,
'total_gadaian'=>$total_gadaian,
'nilaimarhun_70'=>$nilaimarhun_70,
'nilaimarhun_75'=>$nilaimarhun_75,
'nilaimarhun_80'=>$nilaimarhun_80,
'total_nm'=>$total_nm,
'bilangan_70'=>$bilangan_70,
'bilangan_75'=>$bilangan_75,
'bilangan_80'=>$bilangan_80,
'total_bilangan'=>$total_bilangan,
'bilangan_lelong'=>$bilangan_lelong,
'cas_lelong'=>$cas_lelong,
'jumlah_lelong'=>$jumlah_lelong,
'baki_lelong'=>$baki_lelong,
'rugi_lelong'=>$rugi_lelong,
'total_keuntungan'=>floatval($total_keuntungan)
]);
return response()->json($laporan_terkumpul);
}
public function CalcHapusKira($kodcaw,Request $request)
{
@@ -252,8 +389,9 @@ class LaporanController extends Controller
public function CalcXtra($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$upahsimpan = GlCode::on($cawangan['mysql'])
->where('glcode','=','5000/413')
->sum('amaun');
@@ -261,12 +399,25 @@ class LaporanController extends Controller
$bakilelongxtra = GlCode::on($cawangan['mysql'])
->where('glcode','=','7000/190')
->sum('amaun');
$untungrugiterkumpul = GlCode::on($cawangan['mysql'])
->where('glcode','=','7000/201')
->sum('amaun');
$arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul)];
$kerugianlelongxtra = GlCode::on($cawangan['mysql'])
->where('glcode','=','3000/120')
->sum('amaun');
if($kodcaw == '011229')
{
$peruntukanhapuskira = GlCode::on($cawangan['mysql'])
->where('glcode','=','1000/015')
->sum('amaun');
}else{
$peruntukanhapuskira = 0;
}
$arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)];
return response()->json($arrayxtra);
}
app/Http/Controllers/LelongController.php
+95 -7
View File
@@ -182,11 +182,6 @@ class LelongController extends Controller
->where('baki','>=',0)
->sum('baki');
}
// dd($bakilelong->toSql());
$ansrugi = AnsRugi::on($cawangan['mysql'])
->sum('bayaran');
@@ -201,8 +196,86 @@ class LelongController extends Controller
->where('baki','<',0)
->sum('baki');
$rugitotal=$rugilelong + $ansrugi;
$rugitotal=$rugilelong + $ansrugi;
if($kodcaw == 'APM')
$bakilelong += 4498.1;
if($kodcaw == '010617')
$rugitotal -= 6.1;
if($kodcaw == '011229'){
$rugitotal -= 919.7;
$bakilelong -= 144;
}
if($kodcaw == '011412')
$rugitotal -= 7248.4;
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
return response()->json($arraylelong,200);
}
public function BakiLelongCalculationLejer($kodcaw,Request $request)
{
$tarikhbaru = $request->mula;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
if($kodcaw == 'KB2')
{
if($request->tarikh <= '2021-02-25')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
})
->where('baki','>=',0)
->sum('baki');
}
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}
$ansrugi = AnsRugi::on($cawangan['mysql'])
->sum('bayaran');
$rugilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru)
{
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','<',0)
->sum('baki');
// $rugitotal = $rugilelong + $ansrugi;
$rugitotal = $rugilelong;
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
return response()->json($arraylelong,200);
@@ -423,4 +496,19 @@ class LelongController extends Controller
return response()->json($cajperkhidmatan,200);
}
}
public function LelonganHarini($kodcaw)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$lelong = Lelong::on($cawangan['mysql'])
->whereNotNull('t_jual')
->where('t_jual','=', $current->toDateString())
->sum('hargajual');
return response()->json($lelong,200);
}
}
app/Http/Controllers/PanjarController.php
+134
View File
@@ -3,6 +3,8 @@
namespace App\Http\Controllers;
use App\Panjar;
use App\Cawangan;
use App\DenoPanjar;
use Carbon\Carbon;
@@ -111,6 +113,15 @@ class PanjarController extends Controller
return response()->json($panjar);
}
public function delete(REQUEST $request,$kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete();
return response('Batal Berjaya', 200);
}
public function calculationpanjar(Request $request,$kodcaw)
{
@@ -140,11 +151,134 @@ class PanjarController extends Controller
->whereYear('tarikh','=',$current->year)
->sum('bayaran');
if($kodcaw == 'APM')
{
$perubatan = $perubatan - 10;
$baikidanselenggara = $baikidanselenggara - 10;
}
$arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
return response()->json($arraycalculation);
}
public function calculationpanjarLejer(Request $request,$kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$current = Carbon::now();
$current = new Carbon($request->tarikh);
$baikidanselenggara = Panjar::on($cawangan['mysql'])
// ->where('tarikh','>=', $request->mula)
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->hingga)
->where('tag', '=', 2)
->sum('bayaran');
$perubatan = Panjar::on($cawangan['mysql'])
// ->where('tarikh','>=', $request->mula)
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->hingga)
->where('tag', '=', 1)
->sum('bayaran');
$keraian = Panjar::on($cawangan['mysql'])
// ->where('tarikh','>=', $request->mula)
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->hingga)
->where('tag', '=', 3)
->sum('bayaran');
if($kodcaw == 'APM')
{
$perubatan = $perubatan - 10;
$baikidanselenggara = $baikidanselenggara - 10;
}
$arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
return response()->json($arraycalculation);
}
public function createDenoPanjar($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopanjar=DenoPanjar::on('mysql7')->create([
'tarikh' => $current->toDateString(),
'masa' => $current->toTimeString(),
'kodcaw' => $kodcaw,
'kodlaluan' => $request->kodlaluan,
'serahan' => $request->serahan,
'bd1' => $request->bd1,
'bd5' => $request->bd5,
'bd10' => $request->bd10,
'bd20' => $request->bd20,
'bd50' => $request->bd50,
'bd100' => $request->bd100,
'txtring1' => $request->txtring1,
'txtring5' => $request->txtring5,
'txtring10' => $request->txtring10,
'txtring20' => $request->txtring20,
'txtring50' => $request->txtring50,
'txtring100' => $request->txtring100,
'txtring1000' => $request->txtring1000,
'txtsen1' => $request->txtsen1,
'txtsen5' => $request->txtsen5,
'txtsen10' => $request->txtsen10,
'txtsen20' => $request->txtsen20,
'txtsen50' => $request->txtsen50,
'jenis' =>$request->jenis,
'recno' =>$request->recno,
'update' => '0'
]);
return response()->json($denopanjar,200);
}
public function getDenoPanjar($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopanjar = DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get();
return response()->json($denopanjar,200);
}
public function updateDenoPanjar($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopanjar=DenoPanjar::on('mysql7')
->where('recno','=', $request->recno)
->update(array(
'pelulus' => $request->pelulus,
'masalulus'=> $harini->toTimeString()
));
return response()->json($denopanjar,200);
}
}
app/Http/Controllers/PolisController.php
+19
View File
@@ -54,4 +54,23 @@ class PolisController extends Controller
return response()->json($polis);
}
public function editPolis(Request $request)
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$polis = Polis::on($cawangan['mysql'])
->where('norujukan','=',$request->norujukan)
->update([
'komen1' => $request->komen1,
'komen2' => $request->komen2,
'teller' => $request->teller
]);
return response()->json($polis);
}
}
app/Http/Controllers/TebusController.php
+235 -11
View File
@@ -61,7 +61,13 @@ class TebusController extends Controller
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
$upah_semasa_round = number_format($upahsemasa_raw,2);
if(strpos($upah_semasa_round,',')){
$upah_semasa_round = str_replace(',','',$upah_semasa_round);
}
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
}
return $upah_semasa;
}
@@ -80,7 +86,13 @@ class TebusController extends Controller
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_rebet_round = number_format($upahrebet_raw,2);
if(strpos($upah_rebet_round,',')){
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = (float)substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
return $upah_rebet;
}
@@ -494,8 +506,18 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebus = Tebus::on($cawangan['mysql'])
->where('t_tebus','=',$tarikh)
->orderBy('teller')
->select('tebus.t_tebus', 'gad.t_gadai','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')
->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')
->where('tebus.t_tebus','=',$tarikh)
->groupBy('tebus.norujukan')
->orderBy('tebus.teller')
->orderBy('tebus.sirit')
->get();
return response()->json($tebus);
@@ -687,6 +709,23 @@ class TebusController extends Controller
return response()->json($listadvansur,200);
}
public function SenaraiAdvansurRangeDate($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('tarikh','>=',$request->mula)
->where('tarikh','<=',$request->akhir)
->orderBy('teller')
->orderBy('tarikh','asc')
->get();
return response()->json($listadvansur,200);
}
public function advansurharini($kodcaw,Request $request){
$current = Carbon::now();
@@ -720,6 +759,24 @@ class TebusController extends Controller
return response()->json($arrayadvansur,200);
}
public function advansurdetailsRange($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('tarikh','>=',$request->mula)->where('tarikh','<=',$request->akhir);
$countadvansur = $listadvansur->count();
$totaladvansur = $listadvansur->sum('upahdibayar');
$arrayadvansur = ['bil' => $countadvansur, 'total' => $totaladvansur];
return response()->json($arrayadvansur,200);
}
public function getAdvansurByKodlaluan($kodcaw,Request $request)
{
$current = Carbon::now();
@@ -826,6 +883,56 @@ class TebusController extends Controller
return response()->json($total,200);
}
public function calculationKeuntunganSebenarLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$current = new Carbon($request->tarikh);
$total = 0;
$keuntunganselepastawarruq = 0;
$keuntungansebelumtawarruq = 0;
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
//Keuntungan Selepas Tawarruq
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']])
->whereYear('t_tebus','=',$current->year)
->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']])
->whereYear('t_jual','=',$current->year)
->sum('bakiupah');
$upahansur = Advansur::on($cawangan['mysql'])
->where('tarikh','>=',$request->mula)
->where('tarikh','<=',$request->hingga)
->whereYear('tarikh','=',$current->year)
->sum('upahdibayar');
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
// $keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
// $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq + $keuntungan;
return response()->json($total,200);
}
public function calculationUntungRugiTerkumpul($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -912,6 +1019,9 @@ class TebusController extends Controller
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter;
if($kodcaw == '011229')
$total -= 45390.37;
return response()->json($total,200);
@@ -936,31 +1046,130 @@ class TebusController extends Controller
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$dateSM = new Carbon('2021-04-24');
$dateSM->addDays(1);
$dateSM = '2021-04-24';
$current = Carbon::now();
$current = new Carbon();
if($request->tarikh < '2021-06-09')
{
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
$total = ($keuntungan + $keuntunganreducing);
}else{
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
$total = $keuntungan + $keuntunganreducing;
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
}
return response($total);
}
public function untungrugicalculationLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
// $datetawarruq = new Carbon('2021-04-14');
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$dateSM = '2021-04-24';
$current = Carbon::now();
$current = new Carbon();
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$total = ($ansuran + $bukanansuran);
return response($total);
}
@@ -980,4 +1189,19 @@ class TebusController extends Controller
return response($rebet);
}
public function RebetCalculationLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rebet = Tebus::on($cawangan['mysql'])
->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
->where('tebus.t_tebus','>=',$request->mula)
->where('tebus.t_tebus','<=',$request->hingga)
->where('db2.hargajualan','>','0')
->whereNotNull('db2.hargajualan')
->sum('rebate');
return response($rebet);
}
}
app/Http/Controllers/VaultController.php
+211 -1
View File
@@ -88,6 +88,36 @@ class VaultController extends Controller
return response()->json($updateVault, 200);
}
public function updateVaultDeletePanjar($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first();
$bakiawal = $vault['bakiawal'];
$keluar = $vault['keluar'];
$masuk = $vault['masuk'];
$bakiakhir = $vault['bakiakhir'];
$bakieod = $vault['bakieod'];
$pendahuluan = $vault['pendahuluan'];
$serahan = $vault['serahan'];
$totpanjaran = $vault['totpanjar'];
$totalpanjar = $totpanjaran - $request->totpanjar;
$bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar;
$updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
'totpanjar' => $totalpanjar,
'bakiakhir'=>$bakiakhir,
'bakieod'=>$bakiakhir
));
return response()->json($updateVault, 200);
}
public function updateVaultPendahuluanSerahan($kodcaw, Request $request)
{
$current = Carbon::now();
@@ -276,6 +306,50 @@ class VaultController extends Controller
return response()->json($totalbakiakhirtunai);
}
public function TunaiDiTanganLejer($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$totalbakiakhirtunai = 0;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->hingga)
->orderby('tarikh','desc')->first();
$tunai = Tunai::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->hingga)
->get();
$total = 0;
foreach($tunai as $index=>$money)
{
$total+=$money['baki'];
}
if($total != 0)
{
$totalmasuk = $vault['masuk'] + $vault['pendahuluan'] + $total;
}else
{
$totalmasuk = $vault['masuk'];
}
$totalkeluar = $vault['keluar'] + $vault['serahan'] + $vault['totpanjar'];
$arraytunaiditangan = ['totalmasuk' => $totalmasuk, 'totalkeluar' => $totalkeluar];
return response()->json($arraytunaiditangan,200);
}
public function laporanPetiBesi($kodcaw,$tarikh)
{
@@ -321,7 +395,7 @@ class VaultController extends Controller
//Sebelum Tawarruq
if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP')
if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915')
{
$serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb)
@@ -398,6 +472,142 @@ class VaultController extends Controller
->where('glcode','=',$serahankoperasi)
->sum('amaun');
if($kodcaw == '011229')
$totalserahan -= 0.10;
if($kodcaw == '011013')
$totalserahan += 641000;
$arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
return response()->json($arraypend);
}
public function CalculationPendahuluanSerahanLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$serahanpkb = '1000/020';
$serahanjmc = '1000/026';
$pendahuluanpkb = '7000/102';
$pendahuluanjmc = '7000/106';
$serahankoperasi = '1000/090';
$mula = $request->mula;
$hingga = $request->hingga;
//Selepas Tawarruq
$serahanpkbTawarruq = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$serahanpkb)
->where('tarikh','>=', $mula)
->where('tarikh','<=', $hingga)
->where('tarikh','>','2021-03-24')
->sum('serahan');
//Sebelum Tawarruq
if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915')
{
$serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb)
->where('tarikh','>=', $mula)
->where('tarikh','<=', $hingga)
->where('tarikh','>','2013-12-31')
->sum('amaun');
$serahanJMC = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanjmc)
->where('tarikh','>=', $mula)
->where('tarikh','<=', $hingga)
->where('tarikh','>','2013-12-31')
->sum('amaun');
if($mula <= '2013-12-31')
{
$serahanpkblama = imbangdugalama::on($cawangan['mysql'])
->sum('serahan_pkb');
$serahanjmclama = imbangdugalama::on($cawangan['mysql'])
->sum('serahan_jmc');
$totaljmc = $serahanJMC + $serahanjmclama;
$totalpkb = $serahanpkb + $serahanpkblama;
$totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
}else{
$totaljmc = $serahanJMC;
$totalpkb = $serahanpkb;
$totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
}
}else{
if($kodcaw == '020301')
$serahanbaru = '1000/030';
else
$serahanbaru = '1000/026';
$serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb)
->where('tarikh','>=', $mula)
->where('tarikh','<=', $hingga)
->sum('amaun');
$serahanJMC = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanbaru)
->where('tarikh','>=', $mula)
->where('tarikh','<=', $hingga)
->sum('amaun');
$totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC;
}
//Selepas Tawarruq
$pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$pendahuluanpkb)
->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2021-03-24']])
->sum('pendahuluan');
//Sebelum Tawarruq
$pendahuluanPKB = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$pendahuluanpkb)
->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']])
->sum('amaun');
$pendahuluanJMC = GlDetail::on($cawangan['mysql'])
->where('ktacct','=','7000/106')
->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']])
->sum('amaun');
if($mula <= '2013-12-31')
{
$pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
->sum('pendahuluan_pkb');
$pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
->sum('pendahuluan_jmc');
$total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;
$pindahkekpkb = GlCode::on($cawangan['mysql'])
->where('glcode','=',$serahankoperasi)
->sum('amaun');
}else{
$total = $pendahuluanPKBtawarruq + $pendahuluanPKB + $pendahuluanJMC;
$pindahkekpkb = 0;
}
$arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
return response()->json($arraypend);
app/KawalanStok.php
+132
View File
@@ -0,0 +1,132 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class KawalanStok extends Model
{
protected $table = 'kawalanstok';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'bilgadcf1',
'bilgadc1',
'bilgad1',
'bilgadcf2',
'bilgadc2',
'bilgad2',
'bilgadcf3',
'bilgadc3',
'bilgad3',
'pinjgadcf1',
'pinjgadc1',
'pinjgad1',
'pinjgadcf2',
'pinjgadc2',
'pinjgad2',
'pinjgadcf3',
'pinjgadc3',
'pinjgad3',
'biltebcf1',
'biltebc1',
'bilteb1',
'biltebcf2',
'biltebc2',
'bilteb2',
'biltebcf3',
'biltebc3',
'bilteb3',
'pinjtebcf1',
'pinjtebc1',
'pinjteb1',
'pinjtebcf2',
'pinjtebc2',
'pinjteb2',
'pinjtebcf3',
'pinjtebc3',
'pinjteb3',
'billelcf1',
'billelc1',
'billel1',
'billelcf2',
'billelc2',
'billel2',
'billelcf3',
'billelc3',
'billel3',
'pinjlelcf1',
'pinjlelc1',
'pinjlel1',
'pinjlelcf2',
'pinjlelc2',
'pinjlel2',
'pinjlelcf3',
'pinjlelc3',
'pinjlel3',
'bilhapcf1',
'bilhapc1',
'bilhap1',
'bilhapcf2',
'bilhapc2',
'bilhap2',
'bilhapcf3',
'bilhapc3',
'bilhap3',
'pinjhapcf1',
'pinjhapc1',
'pinjhap1',
'pinjhapcf2',
'pinjhapc2',
'pinjhap2',
'pinjhapcf3',
'pinjhapc3',
'pinjhap3',
'jumbil1',
'jumbil2',
'jumbil3',
'jumbilall',
'jumpinj1',
'jumpinj2',
'jumpinj3',
'jumpinjall',
'per1',
'per2',
'per3',
'jumgad',
'jumpinjgad',
'jumpinjgadall',
'jumteb',
'jumpinjteb',
'jumpinjteball',
'jumlel',
'jumpinjlel',
'jumpinjlelall',
'jumhap',
'jumpinjhap',
'jumpinjhapall',
'jumpinjgadcf',
'jumpinjtebcf',
'jumpinjlelcf',
'jumpinjhapcf',
'jumgadcf',
'jumgadall',
'jumtebcf',
'jumteball',
'jumlelcf',
'jumlelall',
'jumhapcf',
'jumhapall'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
config/database.php
+33
View File
@@ -16,6 +16,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql2' => [
'driver' => 'mysql',
@@ -28,6 +29,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql3' => [
'driver' => 'mysql',
@@ -40,6 +42,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql4' => [
'driver' => 'mysql',
@@ -52,6 +55,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql5' => [
'driver' => 'mysql',
@@ -64,6 +68,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
@@ -78,6 +83,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
@@ -92,6 +98,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql8' => [
'driver' => 'mysql',
@@ -104,6 +111,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql9' => [
@@ -117,6 +125,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql10' => [
'driver' => 'mysql',
@@ -129,6 +138,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql11' => [
'driver' => 'mysql',
@@ -141,6 +151,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql12' => [
@@ -154,6 +165,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql13' => [
'driver' => 'mysql',
@@ -166,6 +178,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql14' => [
'driver' => 'mysql',
@@ -178,6 +191,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql15' => [
@@ -191,6 +205,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql16' => [
'driver' => 'mysql',
@@ -203,6 +218,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql17' => [
@@ -216,6 +232,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql18' => [
'driver' => 'mysql',
@@ -228,6 +245,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql19' => [
'driver' => 'mysql',
@@ -240,6 +258,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql20' => [
'driver' => 'mysql',
@@ -252,6 +271,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql21' => [
'driver' => 'mysql',
@@ -264,6 +284,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql22' => [
@@ -277,6 +298,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql23' => [
'driver' => 'mysql',
@@ -289,6 +311,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql24' => [
@@ -302,6 +325,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql25' => [
@@ -315,6 +339,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql26' => [
'driver' => 'mysql',
@@ -327,6 +352,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql27' => [
'driver' => 'mysql',
@@ -339,6 +365,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql28' => [
@@ -352,6 +379,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql29' => [
'driver' => 'mysql',
@@ -364,6 +392,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql30' => [
'driver' => 'mysql',
@@ -376,6 +405,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql31' => [
'driver' => 'mysql',
@@ -388,6 +418,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql32' => [
'driver' => 'mysql',
@@ -400,6 +431,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql33' => [
'driver' => 'mysql',
@@ -412,6 +444,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
],
];
routes/web.php
+55 -6
View File
@@ -81,6 +81,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('gadaiansemasa/{kodcaw}',['uses'=>'GadaiController@getGadaianSemasa']);
$router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']);
$router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);
$router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); //Range Date
$router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']);
$router->put('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']);
@@ -101,6 +103,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('upahbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahNotTawarruq']);
$router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']);
$router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']);
//Maintenance API TEBUS
// $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
$router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);
@@ -121,7 +124,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']);
$router->get('bakilelong/cawangan/{kodcaw}/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelongEachCawangan']);
$router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']);
$router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanLelong']); //laporan lelong
$router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); //laporan lelong
$router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); //laporan lelong
//Marhun API
@@ -203,12 +208,15 @@ $router->group(['prefix'=>'api'], function () use ($router){
//ANSURAN UPAH API
$router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
$router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']);
$router->get('ansuransummary/{kodcaw}',['uses'=>'GadaiController@getAnsuranSummary']);
$router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
$router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
$router->get('AnsuranByRangeTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansurRangeDate']);
$router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
$router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']);
$router->get('advansurdetails/{kodcaw}',['uses'=>'TebusController@advansurdetails']);
$router->get('advansurdetailsrange/{kodcaw}',['uses'=>'TebusController@advansurdetailsRange']);
$router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
$router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);
@@ -216,6 +224,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('polis/get/',['uses'=>'PolisController@getPolis']);
$router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']);
$router->post('polis/create/',['uses'=>'PolisController@createPolis']);
$router->put('polis/edit/',['uses'=>'PolisController@editPolis']);
//LAPORAN API
@@ -235,6 +244,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']);
$router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']);
$router->put('UpdateVault/Panjar/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']);
$router->put('UpdateVault/DeletePanjar/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePanjar']);
$router->put('UpdateVaultPendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPendahuluanSerahan']);
$router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
$router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
@@ -266,6 +276,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']);
// $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']);
$router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']);
$router->post('DeletePanjar/{kodcaw}',['uses'=>'PanjarController@delete']);
//API KELULUSAN
$router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']);
@@ -290,6 +302,14 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
$router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);
//API DENO PANJAR & DENO PEND-SERAHAN
$router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']);
$router->get('getdenopanjar/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']);
$router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']);
$router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']);
//API WAKIL
$router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
$router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
@@ -390,13 +410,40 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira
//-- Untung Rugi --//
$router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
//LEJER AM//
//Dua-Dua Table
$router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan
$router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
$router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
// //-- Harta Semasa --//
$router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); //pinjaman diberi
$router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); //pembiayaan tawarruq
$router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); //pembiayaan tawarruq
$router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); //Tunai di tangan
// $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
// //-- Tanggungan Semasa --//
$router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); //panjar
$router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); //baki lelong & Rugi lelong
// $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
// $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut
// $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
$router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); //Keuntungan Sebenar
// $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
// $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
// $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
// $router->get('XtraLejer/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Xtra
// //-- Untung Rugi --//
$router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']);
$router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculationLejer']);
//END IMBANG DUGA//
//END IMBANG DUGA & LEJER AM//
//ADDED LEJER AM
@@ -409,6 +456,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//Komuditi Pukal
$router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']);
$router->get('komuditi/checkdate',['uses'=>'KomuditiController@checkKomuditiDateChoose']);
$router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']);
$router->post('komuditi/jual',['uses'=>'KomuditiController@jualKomuditi']);
$router->put('komuditi/update',['uses'=>'KomuditiController@updateKomuditi']);
@@ -423,6 +471,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('komoditi/rekod/transaksi',['uses'=>'KomuditiController@rekodTransaksiKomoditi']);
$router->get('laporan/harian',['uses'=>'LaporanController@laporanHarian']);
$router->get('laporan/terkumpul',['uses'=>'LaporanController@laporanTerkumpul']);
//Collection ID Billplz
$router->get('billplz/collectionid',['uses'=>'PortalBillplzController@getCollectionIDCawangan']);