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

Merge branch 'server'

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-05-19 16:52:21 +08:00
parent c19d58862a 5b97af3887
commit 00c2060a10
23 changed files with 2354 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.DS_Store
Vendored
BIN
View File
Binary file not shown.
app/Advansur.php
+1 -1
View File
@@ -23,7 +23,7 @@ class Advansur extends Model
'kadarupah',
'glcode',
'upahsebenar',
'upahdibayar',
'upahDibayar',
'teller',
'prkod',
'jbg',
app/Gadai.php
+1
View File
@@ -72,6 +72,7 @@ class Gadai extends Model
'upah12',
'tagkomuditi',
'tempohbayar',
'lelong_tawarruq'
];
/**
app/Http/Controllers/CustomerController.php
+31
View File
@@ -397,6 +397,37 @@ class CustomerController extends Controller
return response()->json($customer_update, 200);
}
public function customerUpdateKhazanah($nokp,Request $request){
$cawangan_all = Cawangan::on('mysql7')->get();
foreach($cawangan_all as $index=>$cawangan){
$customer = Customer::on($cawangan['mysql'])
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->first();
if($customer != null){
$poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
$customer_update = Customer::on($cawangan['mysql'])
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->update(array(
'telefon' => $request->telefon1,
'telefon2' => $request->telefon2,
'kodbank' => $request->kodbank,
'noakaun' => $request->noakaun,
'nota' => $request->nota,
'nama' => $request->nama,
'alamat1' => $request->alamat,
'poskod' => $request->poskod,
'koddaerah' => $poskod['koddaerah'],
'kodnegeri' => $poskod['kodnegeri']
));
}
}
return response()->json($customer_update, 200);
}
public function listNorujukanMobile($nokp){
$cawangan_all = Cawangan::on('mysql7')->get();
$array_norujukan = [];
app/Http/Controllers/DaerahController.php
+9
View File
@@ -14,4 +14,13 @@ class DaerahController extends Controller
->first();
return response()->json($daerah);
}
public function showOneNegeri($kodnegeri)
{
$daerah = Daerah::on('mysql7')
->where('kodnegeri','=',$kodnegeri)
->get();
return response()->json($daerah);
}
}
app/Http/Controllers/GadaiController.php
+617 -215
View File
File diff suppressed because it is too large Load Diff
app/Http/Controllers/LaporanController.php
+135 -2
View File
@@ -12,6 +12,11 @@ use App\Customer;
use App\TuntutBaki;
use App\Panjar;
use App\Lelong;
use App\Advansur;
use App\Vault;
use App\Tunai;
use App\Denominasi;
use App\Hapuskira;
use Carbon\Carbon;
@@ -31,7 +36,25 @@ class LaporanController extends Controller
$total_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->sum('pinjaman');
$total_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('pinjaman');
$total_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->sum('duit_masuk');
$total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereRaw('DATE(tarikh_bayaran) = ?',[$request->tarikh])->sum('keuntungan_sebenar');
// $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
$total_upah = Advansur::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('upahdibayar');
$total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->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->tarikh)
->where('trans.trans_type','=','A')
->groupBy('trans.id')
->sum('keuntungan_rebet');
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
//b
$bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count();
@@ -40,6 +63,40 @@ class LaporanController extends Controller
$bilangan_customer_baru = Customer::on($cawangan['mysql'])->where('tarikhdaftar','=',$request->tarikh)->count();
//c
/* Sistem */
$petibesi_sistem = Vault::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('bakiakhir');
/* Imbang Duga */
$totalbakiakhirtunai = 0;
$vault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$request->kodcaw)
->where('tarikh','<=', $request->tarikh)
->orderby('tarikh','desc')->first();
$tunai = Tunai::on($cawangan['mysql'])
->where('kodcaw','=',$request->kodcaw)
->where('tarikh','=', $request->tarikh)
->get();
$total = 0;
foreach($tunai as $index=>$money)
{
$total+=$money['baki'];
}
if($total != 0)
{
$totalbakiakhirtunai = $vault['bakiakhir'] + $total;
}else
{
$totalbakiakhirtunai = $vault['bakiakhir'];
}
/* Denominasi */
$petibesi_deno = Denominasi::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('txtjumlah');
//d
$panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran');
@@ -47,6 +104,61 @@ class LaporanController extends Controller
$panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
//e
/* Imbang Duga */
$rekodkoop = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
->sum('pinjaman');
if($request->tarikh > '2021-04-13'){
$rekodtawarruq = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
->sum('pinjaman');
}
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('db2.sttebus','=','')
->where('db2.hargajualan','<>','null')
->where('tarikh_bayaran' ,'<=', $daterequest)
->sum('bayaran_pembiayaan');
$outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan);
/* Stok Audit */
$stokaudit = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
$stokauditget = $stokaudit->get();
$stokauditnilaimarhun = $stokaudit->sum('nilaimarhun');
$stokauditcount = $stokaudit->count();
$totalstokaudit = 0;
foreach($stokauditget as $index1=>$stokA)
{
if($stokA['hargajualan'] == null)
$totalstokaudit += $stokA['pinjaman'];
else
$totalstokaudit += $stokA['bakipjm'];
}
/* Kawalan Stok */
//f
$data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get();
@@ -111,9 +223,30 @@ class LaporanController extends Controller
'jumlah_lelong'=>$jumlah_lelong,
'baki_lelong'=>$baki_lelong,
'rugi_lelong'=>$rugi_lelong,
'total_keuntungan'=>$total_keuntungan
'total_keuntungan'=>floatval($total_keuntungan),
'petibesi_sistem'=>$petibesi_sistem,
'petibesi_deno'=>$petibesi_deno,
'stokauditpembiayaan'=>$totalstokaudit,
'stokauditnilaimarhun'=>$stokauditnilaimarhun,
'stokauditcount'=>$stokauditcount,
'petibesiimbangduga'=>$totalbakiakhirtunai,
'outstandingimbangduga'=>$outstandingimbangduga
]);
return response()->json($laporan_harian);
}
public function CalcHapusKira($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$hapuskira = HapusKira::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','<',$request->tarikh)
->sum('amaun');
return response()->json($hapuskira);
}
}
app/Http/Controllers/LelongController.php
+27 -15
View File
@@ -142,33 +142,45 @@ class LelongController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$bakilelonglama = imbangdugalama::on($cawangan['mysql'])
->sum('baki_lelong');
// $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
// ->sum('baki_lelong');
$rugilelonglama = imbangdugalama::on($cawangan['mysql'])
->sum('rugi_lelong');
// $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
// ->sum('rugi_lelong');
if($request->tarikh <= '2021-02-25')
if($kodcaw == 'KB2')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
if($request->tarikh <= '2021-02-25')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh)
->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->tarikh)
->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->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}
}
app/Http/Controllers/NegeriController.php
+10
View File
@@ -14,4 +14,14 @@ class NegeriController extends Controller
->first();
return response()->json($negeri);
}
public function NegeriListAll()
{
$negeri = Negeri::on('mysql7')
->where('kodnegeri','<>','17')
->where('kodnegeri','<>','00')
->get();
return response()->json($negeri);
}
}
app/Http/Controllers/PanjarController.php
+14 -1
View File
@@ -38,6 +38,20 @@ class PanjarController extends Controller
return response()->json($panjar);
}
public function listeachpanjar(Request $request,$kodcaw)
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$panjar=Panjar::on($cawangan['mysql'])
->where('nobaucer','=',$request->nobaucer)
->first();
return response()->json($panjar);
}
public function listmulaakhir($kodcaw,$mula,$akhir)
{
@@ -82,7 +96,6 @@ class PanjarController extends Controller
$panjar=Panjar::on($cawangan['mysql'])
->create([
'tarikh'=> $harini->toDateString(),
'deskripsi'=> $request->deskripsi,
'bayaran' => $request->bayaran,
app/Http/Controllers/PolisController.php
+57
View File
@@ -0,0 +1,57 @@
<?php
namespace App\Http\Controllers;
use App\Polis;
use App\Cawangan;
use Illuminate\Http\Request;
use Carbon\Carbon;
class PolisController extends Controller
{
public function getPolis(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$polis = Polis::on($cawangan['mysql'])
->where('norujukan','=',$request->norujukan)
->get();
return response()->json($polis);
}
public function PolischangeTebus(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$polis = Polis::on($cawangan['mysql'])
->where('norujukan','=',$request->norujukan)
->update(['tebus' => $request->tebus]);
return response()->json($polis);
}
public function createPolis(Request $request)
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$polis = Polis::on($cawangan['mysql'])
->create([
'tarikh' => $harini->toDateString(),
'kodcaw' => $request->kodcaw,
'norujukan' => $request->norujukan,
'komen1' => $request->komen1,
'komen2' => $request->komen2,
'tebus' => 0,
'teller' => $request->teller,
'caj' => 0.00
]);
return response()->json($polis);
}
}
app/Http/Controllers/TebusController.php
+282 -99
View File
@@ -17,6 +17,7 @@ use App\Lelong;
use App\HapusKira;
use App\Parameter;
use App\Panjar;
use App\HargaEmas;
use Illuminate\Http\Request;
@@ -33,30 +34,7 @@ class TebusController extends Controller
->where('norujukan','=',$norujukan)
->first();
$upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
$transaction = Transaction::on('mysql7')
->where([['norujukan','=',$norujukan],['trans_type','=','A']])
->get();
$transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
->where('norujukan','=',$norujukan)
->get();
$totalBayaranKeuntungan = 0;
$totalBayaran = 0;
foreach($transaction as $index=>$trans){
$totalBayaran += $trans['duit_masuk'];
}
foreach($transaction_keuntungan as $index=>$untung){
$totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
}
$rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upah_semasa;
$rebet = $this->rebetselepastawarruq($kodcaw,$norujukan);
$harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
@@ -72,29 +50,35 @@ class TebusController extends Controller
->where('norujukan','=',$norujukan)
->first();
if($gadai_data['tempoh'] > 6){
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
}else{
if($gadai_data['tempoh'] == 6){
if($gadai_data['bakiupah'] != 0){
$upah_semasa = $gadai_data['bakiupah'];
}else{
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
}
}else{
$upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
}
}
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
$upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
return $upah_semasa;
}
public function kiraUpahRebet($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$kodcaw)
->first();
$gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_rebet_round = number_format($upahrebet_raw,2);
$upah_rebet = (float)substr($upah_rebet_round, 0, -1);
return $upah_rebet;
}
public function upahTawarruq($kodcaw,$norujukan){
$upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
@@ -112,15 +96,12 @@ class TebusController extends Controller
->where('norujukan','=',$norujukan)
->first();
$upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = round($upahsemasa,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
$array_recno_marhun = $request->array_recno;
$margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
// $margin_pembiayaan = round(($gadai_data['bakipjm']/$request->hargasemasa)*100,2);
$nilai_marhun = $gadai_data['nilaimarhun'];
$total_harga_tebus = 0;
@@ -136,8 +117,6 @@ class TebusController extends Controller
$totalhargatebus = (float)substr($total_harga_tebus_round, 0, -1);
// $total_harga_tebus += $upahsemasa;
return response()->json($totalhargatebus);
}
@@ -149,20 +128,42 @@ class TebusController extends Controller
$gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
// dd($gadai_data);
$upah_semasa = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
$harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
return response()->json($harga_tebus);
}
public function kiraUpahNotTawarruq($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$kodcaw)
->first();
$gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
$upahtelahbayar = Advansur::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->sum('upahdibayar');
$upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
$margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
$margin_kadarupah = 80;
$rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
$upah_sebenar = $upah_asal - $rebet;
$upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
$upah_semasa = bcdiv(round($upahsemasa,2),1,1);
$upah_semasa = number_format($upah_semasa,2);
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
}
$upah_semasa = (float)$upah_semasa - $upahtelahbayar;
$upah_semasa = bcdiv(round($upah_sebenar * $gadai_data['jbg'],2),1,1);
$upah_semasa = (float)number_format($upah_semasa,2);
$harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
return response()->json($harga_tebus);
return $upah_semasa;
}
public function upahNotTawarruq($kodcaw,$norujukan){
@@ -173,16 +174,24 @@ class TebusController extends Controller
$gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
// dd($gadai_data);
$upahtelahbayar = Advansur::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->sum('upahdibayar');
$upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
$margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
$margin_kadarupah = 80;
$rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
$upah_sebenar = $upah_asal - $rebet;
$upah_semasa = bcdiv(round($upah_sebenar * $gadai_data['jbg'],2),1,1);
$upah_semasa = (float)number_format($upah_semasa,2);
$upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
$upah_semasa = bcdiv(round($upahsemasa,2),1,1);
$upah_semasa = number_format($upah_semasa,2);
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
}
$upah_semasa = (float)$upah_semasa - $upahtelahbayar;
return response()->json($upah_semasa);
}
@@ -195,7 +204,7 @@ class TebusController extends Controller
$gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
// dd($gadai_data);
$upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
$margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
$margin_kadarupah = 80;
@@ -251,30 +260,22 @@ class TebusController extends Controller
$gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
$transaction = Transaction::on('mysql7')
->where([['norujukan','=',$norujukan],['trans_type','=','A']])
->get();
$transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
->where('norujukan','=',$norujukan)
->get();
->where('norujukan','=',$norujukan)
->sum('keuntungan_rebet');
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
$totalBayaranKeuntungan = 0;
$totalBayaran = 0;
$rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
foreach($transaction as $index=>$trans){
$totalBayaran += $trans['duit_masuk'];
$rebet_round = number_format($rebet_raw,2);
if(strpos($rebet_round,',')){
$rebet_round = str_replace(',','',$rebet_round);
}
foreach($transaction_keuntungan as $index=>$untung){
$totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
}
$rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upahsemasa;
$rebet = (float)substr($rebet_round, 0, -1);
return $rebet;
}
@@ -303,6 +304,8 @@ class TebusController extends Controller
't_update' => $current->toDateString(),
));
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
$create_tebus = Tebus::on($cawangan['mysql'])->create([
'kodcaw'=> $kodcaw,
'norujukan'=> $norujukan,
@@ -346,12 +349,12 @@ class TebusController extends Controller
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $norujukan,
'bayaran_keuntungan' => $request->bakiupah,
'bayaran_pembiayaan' => $gadai['bakipjm'],
'keuntungan_rebet' => $upah_rebet,
'tarikh_bayaran'=> $current,
'kodcaw'=> $kodcaw,
'keuntungan_sebenar'=>$request->bakiupah
'kodcaw'=> $kodcaw
]);
if($request->jenistebus == 'P'){
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bakiupah;
$transaction = Transaction::on('mysql7')->create([
@@ -392,6 +395,34 @@ class TebusController extends Controller
return response()->json($tebus);
}
public function getLaporanTebusPengasingan($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebusarrahn = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('t_tebus','=',$request->tarikh)
->whereNull('hargajualan');
$totalpenebusanarrahn = $tebusarrahn->sum('tebus.pinjaman');
$bilpenebusanarrahn = $tebusarrahn->count();
$totalkeuntunganarrahn = $tebusarrahn->sum('tebus.bakiupah');
$tebustawarruq = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('t_tebus','=',$request->tarikh)
->whereNotNull('hargajualan');
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
$bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
$array_penebusan = ['bilarrahn' => $bilpenebusanarrahn, 'totalarrahn' => $totalpenebusanarrahn, 'keuntunganarrahn' => $totalkeuntunganarrahn, 'biltawarruq' => $bilpenebusantawarruq, 'totaltawarruq' => $totalpenebusantawarruq,'totalrebate' => $totalrebatetawarruq,'keuntungantawarruq' => $totalkeuntungantawarruq];
return response()->json($array_penebusan);
}
public function listPenebusanBaru($kodcaw){
$current = Carbon::now();
@@ -489,6 +520,19 @@ class TebusController extends Controller
return response()->json($wakil_create ,201);
}
public function UbahWakil($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$wakil = $request->nowakil;
$update_wakil = Tebus::on($cawangan['mysql'])->where('norujukan','=',$request->norujukan)->update(array(
"nowakil" => $wakil
));
return response()->json($update_wakil ,201);
}
public function listhistorypenebusan($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -510,6 +554,81 @@ class TebusController extends Controller
return response()->json($listadvansur,200);
}
public function getAdvansurUpah($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->orderBy('tarikh','desc')
->first();
return response()->json($listadvansur,200);
}
public function SenaraiAdvansur($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('teller','=',$request->kodlaluan)
->where('tarikh','=',$current->toDateString())
->orderBy('tarikh','desc')
->get();
return response()->json($listadvansur,200);
}
public function advansurharini($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->tarikh)
->sum('upahdibayar');
return response()->json($listadvansur,200);
}
public function advansurdetails($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->tarikh);
$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();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('teller','=',$request->kodlaluan)
->where('tarikh','=',$current->toDateString())
->sum('upahdibayar');
return response()->json($listadvansur,200);
}
public function createAdvansur($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
@@ -526,7 +645,7 @@ class TebusController extends Controller
'kadarupah' => $request->kadarupah,
'glcode' => $request->glcode,
'upahsebenar' => $request->upahsebenar,
'upahdibayar' => $request->upahdibayar,
'upahDibayar' => $request->upahdibayar,
'teller' => $request->teller,
'prkod' => $request->prkod,
'jbg' => $request->jbg,
@@ -549,20 +668,30 @@ class TebusController extends Controller
$keuntunganselepastawarruq = 0;
$keuntungansebelumtawarruq = 0;
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>=','2021-03-14')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('rebate')
->sum('rebate');
//Keuntungan Selepas Tawarruq
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>=','2021-03-14')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('bakiupah')
->sum('bakiupah');
// $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
// ->where('t_tebus','>=','2021-03-14')
// ->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('rebate')
// ->sum('rebate');
// $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
// ->where('t_tebus','>','2021-04-13')
// ->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('bakiupah')
// ->sum('bakiupah');
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
@@ -582,9 +711,11 @@ class TebusController extends Controller
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
$keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah;
// $keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
// $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq + $keuntungan;
return response()->json($total,200);
}
@@ -691,4 +822,56 @@ class TebusController extends Controller
return response()->json($penghutangkaki,200);
}
public function untungrugicalculation($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 = new Carbon('2021-04-24');
$dateSM->addDays(1);
$current = Carbon::now();
$current = new Carbon();
$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)
->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)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
$total = $keuntungan + $keuntunganreducing;
return response($total);
}
public function RebetCalculation($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','>','2021-04-13')
->where('tebus.t_tebus','<=',$request->tarikh)
->where('db2.hargajualan','>','0') // tambahan 2021-05-07
->whereNotNull('db2.hargajualan')
->sum('rebate');
return response($rebet);
}
}
app/Http/Controllers/TransactionController.php
+28
View File
@@ -3,9 +3,13 @@
namespace App\Http\Controllers;
use App\Transaction;
use App\Pengguna;
use App\Cawangan;
use Illuminate\Http\Request;
use Carbon\Carbon;
use DB;
class TransactionController extends Controller
{
@@ -68,4 +72,28 @@ class TransactionController extends Controller
return response()->json($transaction);
}
public function GetPengguna($kodcaw,Request $request)
{
$namateller = $request->namateller;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$pengguna=Pengguna::on($cawangan['mysql'])
->where('nama','=',$namateller)->limit(1)->get();
return response()->json($pengguna);
}
public function getSumBayaran_Ansuran($kodcaw,$norujukan)
{
$current = Carbon::now();
$current = new Carbon();
$tarikh = $current->toDateString();
$transaction=DB::connection('mysql7')->select("SELECT SUM(duit_masuk) AS cash_in FROM transaction WHERE DATE(created_at)='".$tarikh."' AND kodcaw='".$kodcaw."' AND norujukan ='".$norujukan."'" );
return response()->json($transaction);
}
}
app/Http/Controllers/TransaksiKeuntunganController.php
+20 -1
View File
@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
use App\TransaksiKeuntungan;
use Illuminate\Http\Request;
use Carbon\Carbon;
use DB;
class TransaksiKeuntunganController extends Controller
{
@@ -13,10 +15,27 @@ class TransaksiKeuntunganController extends Controller
return response()->json($transaksi);
}
public function getLatestTransaksi_Untung($norujukan) //added byy fariz 20210413
{
$transaksi = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id','desc')->limit(1)->get();
return response()->json($transaksi);
}
public function GetjumlahBayaranPendahuluan($norujukan)
{
$current = Carbon::now();
$current = new Carbon();
$tarikh = $current->toDateString();
$transaction=DB::connection('mysql7')->select( "SELECT SUM(bayaran_pembiayaan) AS total_byr_pendahuluan FROM transaksi_keuntungan WHERE norujukan='".$norujukan."' AND DATE( tarikh_bayaran) = '".$tarikh."'" );
return response()->json($transaction);
}
public function createTransaksiKeuntungan(Request $request){
$transaksi = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $request->norujukan,
'bayaran_keuntungan' => $request->bayaran_keuntungan,
'bayaran_keuntungan' =>$request->bayaran_keuntungan,
'tarikh_bayaran'=> $request->tarikh_bayaran,
'tempoh'=> $request->tempoh,
'kodcaw'=> $request->kodcaw
app/Http/Controllers/TunaiController.php
+12 -1
View File
@@ -85,7 +85,7 @@ class TunaiController extends Controller
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
$updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
'keluar'=>$request->keluar,
'masuk'=>$request->masuk,
@@ -261,6 +261,17 @@ class TunaiController extends Controller
return response()->json($requestteller);
}
public function getRequestTellerLaporanSerahan($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',1],['serahan','>',0],['kodlaluan','=',$request->teller],['tarikh','=',$current->toDateString()]])->get();
return response()->json($requestteller);
}
public function getRequestTellerByDate($kodcaw,Request $request)
{
app/Http/Controllers/VaultController.php
+65 -21
View File
@@ -243,15 +243,37 @@ class VaultController extends Controller
public function TunaiDiTangan($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$current = new Carbon();
$totalbakiakhirtunai = 0;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','=', $request->tarikh)
->where('tarikh','<=', $request->tarikh)
->orderby('tarikh','desc')->first();
return response()->json($vault);
$tunai = Tunai::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','=', $request->tarikh)
->get();
$total = 0;
foreach($tunai as $index=>$money)
{
$total+=$money['baki'];
}
if($total != 0)
{
$totalbakiakhirtunai = $vault['bakiakhir'] + $total;
}else
{
$totalbakiakhirtunai = $vault['bakiakhir'];
}
return response()->json($totalbakiakhirtunai);
}
@@ -299,29 +321,50 @@ class VaultController extends Controller
//Sebelum Tawarruq
if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP')
{
$serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb)
->where('tarikh','<=', $request->tarikh)
->where('tarikh','>','2013-12-31')
->sum('amaun');
$serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb)
->where('tarikh','<=', $request->tarikh)
->where('tarikh','>','2013-12-31')
->sum('amaun');
$serahanJMC = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanjmc)
->where('tarikh','<=', $request->tarikh)
->where('tarikh','>','2013-12-31')
->sum('amaun');
$serahanJMC = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanjmc)
->where('tarikh','<=', $request->tarikh)
->where('tarikh','>','2013-12-31')
->sum('amaun');
$serahanpkblama = imbangdugalama::on($cawangan['mysql'])
->sum('serahan_pkb');
$serahanpkblama = imbangdugalama::on($cawangan['mysql'])
->sum('serahan_pkb');
$serahanjmclama = imbangdugalama::on($cawangan['mysql'])
->sum('serahan_jmc');
$serahanjmclama = imbangdugalama::on($cawangan['mysql'])
->sum('serahan_jmc');
$totaljmc = $serahanJMC + $serahanjmclama;
$totalpkb = $serahanpkb + $serahanpkblama;
$totaljmc = $serahanJMC + $serahanjmclama;
$totalpkb = $serahanpkb + $serahanpkblama;
$totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
}else{
$totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
if($kodcaw == '020301')
$serahanbaru = '1000/030';
else
$serahanbaru = '1000/026';
$serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb)
->where('tarikh','<=', $request->tarikh)
->sum('amaun');
$serahanJMC = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanbaru)
->where('tarikh','<=', $request->tarikh)
->sum('amaun');
$totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC;
}
//Selepas Tawarruq
@@ -353,6 +396,7 @@ class VaultController extends Controller
$pindahkekpkb = GlCode::on($cawangan['mysql'])
->where('glcode','=',$serahankoperasi)
->orWhere('glcode','=',)
->sum('amaun');
$arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
app/KawalanStokLama.php
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class KawalanStokLama extends Model
{
protected $table = 'kawalanstok_lama';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'bilGad1','bilGad2','bilGad3','bilTeb1','bilTeb2','bilTeb3','bilLel1','bilLel2','bilLel3','pinjGad1','pinjGad2','pinjGad3','pinjTeb1','pinjTeb2','pinjTeb3','pinjLel1','pinjLel2','pinjLel3'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
app/Pengguna.php
+54
View File
@@ -0,0 +1,54 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Pengguna extends Model
{
protected $table = 'pengguna';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'kodcaw',
'kodlaluan',
'katalaluan',
'taraf',
'nama',
'kplama',
'kpbaru',
'pinjmax',
'limittunait',
'limittunaip',
'status',
't_luput',
'flag',
'created_by',
'last_modified_by',
't_daftar',
'date_created',
'pinjmaxxtra',
'pengganti',
'khazanahtemp',
'ppo',
'settingtetap',
'autoberat',
'perubatan',
'tagperubatan',
'pptetap',
'kktetap',
'mmtetap',
'tellertetap'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
app/Polis.php
+37
View File
@@ -0,0 +1,37 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Polis extends Model
{
protected $table = 'polis';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'tarikh',
'kodcaw',
'norujukan',
'komen1',
'komen2',
'tebus',
'recno',
'teller',
'caj'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
app/TransaksiKeuntungan.php
+1 -1
View File
@@ -14,7 +14,7 @@ class TransaksiKeuntungan extends Model
* @var array
*/
protected $fillable = [
'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','keuntungan_sebenar'
'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan','keuntungan_rebet'
];
/**
composer.lock
Generated
+589 -729
View File
File diff suppressed because it is too large Load Diff
config/database.php
+286 -15
View File
@@ -17,11 +17,10 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql2' => [
'driver' => 'mysql',
'host' => env('DB_HOST_2'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_2'),
'database' => env('DB_DATABASE_2'),
'username' => env('DB_USERNAME_2'),
'password' => env('DB_PASSWORD_2'),
@@ -30,11 +29,10 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql3' => [
'driver' => 'mysql',
'host' => env('DB_HOST_3'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_3'),
'database' => env('DB_DATABASE_3'),
'username' => env('DB_USERNAME_3'),
'password' => env('DB_PASSWORD_3'),
@@ -43,11 +41,10 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql4' => [
'driver' => 'mysql',
'host' => env('DB_HOST_4'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_4'),
'database' => env('DB_DATABASE_4'),
'username' => env('DB_USERNAME_4'),
'password' => env('DB_PASSWORD_4'),
@@ -56,11 +53,10 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql5' => [
'driver' => 'mysql',
'host' => env('DB_HOST_5'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_5'),
'database' => env('DB_DATABASE_5'),
'username' => env('DB_USERNAME_5'),
'password' => env('DB_PASSWORD_5'),
@@ -68,12 +64,13 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql6' => [
'driver' => 'mysql',
'host' => env('DB_HOST_6'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_6'),
'database' => env('DB_DATABASE_6'),
'username' => env('DB_USERNAME_6'),
'password' => env('DB_PASSWORD_6'),
@@ -81,12 +78,13 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql7' => [
'driver' => 'mysql',
'host' => env('DB_HOST_7'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_7'),
'database' => env('DB_DATABASE_7'),
'username' => env('DB_USERNAME_7'),
'password' => env('DB_PASSWORD_7'),
@@ -98,7 +96,7 @@ return [
'mysql8' => [
'driver' => 'mysql',
'host' => env('DB_HOST_8'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_8'),
'database' => env('DB_DATABASE_8'),
'username' => env('DB_USERNAME_8'),
'password' => env('DB_PASSWORD_8'),
@@ -106,11 +104,12 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql9' => [
'driver' => 'mysql',
'host' => env('DB_HOST_9'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_9'),
'database' => env('DB_DATABASE_9'),
'username' => env('DB_USERNAME_9'),
'password' => env('DB_PASSWORD_9'),
@@ -122,7 +121,7 @@ return [
'mysql10' => [
'driver' => 'mysql',
'host' => env('DB_HOST_10'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_10'),
'database' => env('DB_DATABASE_10'),
'username' => env('DB_USERNAME_10'),
'password' => env('DB_PASSWORD_10'),
@@ -134,7 +133,7 @@ return [
'mysql11' => [
'driver' => 'mysql',
'host' => env('DB_HOST_11'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_11'),
'database' => env('DB_DATABASE_11'),
'username' => env('DB_USERNAME_11'),
'password' => env('DB_PASSWORD_11'),
@@ -142,6 +141,278 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql12' => [
'driver' => 'mysql',
'host' => env('DB_HOST_12'),
'port' => env('DB_PORT_12'),
'database' => env('DB_DATABASE_12'),
'username' => env('DB_USERNAME_12'),
'password' => env('DB_PASSWORD_12'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql13' => [
'driver' => 'mysql',
'host' => env('DB_HOST_13'),
'port' => env('DB_PORT_13'),
'database' => env('DB_DATABASE_13'),
'username' => env('DB_USERNAME_13'),
'password' => env('DB_PASSWORD_13'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql14' => [
'driver' => 'mysql',
'host' => env('DB_HOST_14'),
'port' => env('DB_PORT_14'),
'database' => env('DB_DATABASE_14'),
'username' => env('DB_USERNAME_14'),
'password' => env('DB_PASSWORD_14'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql15' => [
'driver' => 'mysql',
'host' => env('DB_HOST_15'),
'port' => env('DB_PORT_15'),
'database' => env('DB_DATABASE_15'),
'username' => env('DB_USERNAME_15'),
'password' => env('DB_PASSWORD_15'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql16' => [
'driver' => 'mysql',
'host' => env('DB_HOST_16'),
'port' => env('DB_PORT_16'),
'database' => env('DB_DATABASE_16'),
'username' => env('DB_USERNAME_16'),
'password' => env('DB_PASSWORD_16'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql17' => [
'driver' => 'mysql',
'host' => env('DB_HOST_17'),
'port' => env('DB_PORT_17'),
'database' => env('DB_DATABASE_17'),
'username' => env('DB_USERNAME_17'),
'password' => env('DB_PASSWORD_17'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql18' => [
'driver' => 'mysql',
'host' => env('DB_HOST_18'),
'port' => env('DB_PORT_18'),
'database' => env('DB_DATABASE_18'),
'username' => env('DB_USERNAME_18'),
'password' => env('DB_PASSWORD_18'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql19' => [
'driver' => 'mysql',
'host' => env('DB_HOST_19'),
'port' => env('DB_PORT_19'),
'database' => env('DB_DATABASE_19'),
'username' => env('DB_USERNAME_19'),
'password' => env('DB_PASSWORD_19'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql20' => [
'driver' => 'mysql',
'host' => env('DB_HOST_20'),
'port' => env('DB_PORT_20'),
'database' => env('DB_DATABASE_20'),
'username' => env('DB_USERNAME_20'),
'password' => env('DB_PASSWORD_20'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql21' => [
'driver' => 'mysql',
'host' => env('DB_HOST_21'),
'port' => env('DB_PORT_21'),
'database' => env('DB_DATABASE_21'),
'username' => env('DB_USERNAME_21'),
'password' => env('DB_PASSWORD_21'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql22' => [
'driver' => 'mysql',
'host' => env('DB_HOST_22'),
'port' => env('DB_PORT_22'),
'database' => env('DB_DATABASE_22'),
'username' => env('DB_USERNAME_22'),
'password' => env('DB_PASSWORD_22'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql23' => [
'driver' => 'mysql',
'host' => env('DB_HOST_23'),
'port' => env('DB_PORT_23'),
'database' => env('DB_DATABASE_23'),
'username' => env('DB_USERNAME_23'),
'password' => env('DB_PASSWORD_23'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql24' => [
'driver' => 'mysql',
'host' => env('DB_HOST_24'),
'port' => env('DB_PORT_24'),
'database' => env('DB_DATABASE_24'),
'username' => env('DB_USERNAME_24'),
'password' => env('DB_PASSWORD_24'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql25' => [
'driver' => 'mysql',
'host' => env('DB_HOST_25'),
'port' => env('DB_PORT_25'),
'database' => env('DB_DATABASE_25'),
'username' => env('DB_USERNAME_25'),
'password' => env('DB_PASSWORD_25'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql26' => [
'driver' => 'mysql',
'host' => env('DB_HOST_26'),
'port' => env('DB_PORT_26'),
'database' => env('DB_DATABASE_26'),
'username' => env('DB_USERNAME_26'),
'password' => env('DB_PASSWORD_26'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql27' => [
'driver' => 'mysql',
'host' => env('DB_HOST_27'),
'port' => env('DB_PORT_27'),
'database' => env('DB_DATABASE_27'),
'username' => env('DB_USERNAME_27'),
'password' => env('DB_PASSWORD_27'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql28' => [
'driver' => 'mysql',
'host' => env('DB_HOST_28'),
'port' => env('DB_PORT_28'),
'database' => env('DB_DATABASE_28'),
'username' => env('DB_USERNAME_28'),
'password' => env('DB_PASSWORD_28'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql29' => [
'driver' => 'mysql',
'host' => env('DB_HOST_29'),
'port' => env('DB_PORT_29'),
'database' => env('DB_DATABASE_29'),
'username' => env('DB_USERNAME_29'),
'password' => env('DB_PASSWORD_29'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql30' => [
'driver' => 'mysql',
'host' => env('DB_HOST_30'),
'port' => env('DB_PORT_30'),
'database' => env('DB_DATABASE_30'),
'username' => env('DB_USERNAME_30'),
'password' => env('DB_PASSWORD_30'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql31' => [
'driver' => 'mysql',
'host' => env('DB_HOST_31'),
'port' => env('DB_PORT_31'),
'database' => env('DB_DATABASE_31'),
'username' => env('DB_USERNAME_31'),
'password' => env('DB_PASSWORD_31'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql32' => [
'driver' => 'mysql',
'host' => env('DB_HOST_32'),
'port' => env('DB_PORT_32'),
'database' => env('DB_DATABASE_32'),
'username' => env('DB_USERNAME_32'),
'password' => env('DB_PASSWORD_32'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql33' => [
'driver' => 'mysql',
'host' => env('DB_HOST_33'),
'port' => env('DB_PORT_33'),
'database' => env('DB_DATABASE_33'),
'username' => env('DB_USERNAME_33'),
'password' => env('DB_PASSWORD_33'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
],
];
];
routes/web.php
+52 -5
View File
@@ -29,6 +29,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->delete('customers/{kodcaw}/{nokp}', ['uses' => 'CustomerController@delete']);
$router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
$router->put('customers/update/kaunter/{nokp}', ['uses' => 'CustomerController@customerUpdateKaunter']);
$router->put('customers/update/khazanah/{nokp}', ['uses' => 'CustomerController@customerUpdateKhazanah']);
$router->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']);
$router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']);
@@ -76,6 +77,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('check/sag',['uses'=>'GadaiController@checkNorujukan']);
$router->get('updatejbgsemasa',['uses'=>'GadaiController@updateJBGsemasa']);
//Tebus API
$router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);
@@ -85,12 +87,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('tebusbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusNotTawarruq']);
$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']);
$router->get('listpenebusanhistory/{kodcaw}',['uses'=>'TebusController@listhistorypenebusan']);
//API FARIS
$router->put('tebus/serah_marhun_teller/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodescanTebus']);
// $router->get('tebus_serahan/{kodcaw}',['uses'=>'TebusController@SerahMarhunTeller']);
@@ -143,9 +145,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
//Negeri API
$router->get('negeri/{kodnegeri}',['uses'=>'NegeriController@showOneNegeri']);
$router->get('negeri/',['uses'=>'NegeriController@NegeriListAll']);
//Daerah API
$router->get('daerah/{koddaerah}',['uses'=>'DaerahController@showOneDaerah']);
$router->get('daerahkodnegeri/{kodnegeri}',['uses'=>'DaerahController@showOneNegeri']);
//Bank API
$router->get('bank',['uses'=>'BankController@showAllBank']);
@@ -164,6 +168,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']);
$router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413
$router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); // new added 20210413
//OTP API
$router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
@@ -177,13 +185,26 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']);
//ANSURAN API
$router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
$router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
//ANSURAN UPAH API
$router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
$router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
$router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
$router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
$router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']);
$router->get('advansurdetails/{kodcaw}',['uses'=>'TebusController@advansurdetails']);
$router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
$router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);
//POLIS API
$router->get('polis/get/',['uses'=>'PolisController@getPolis']);
$router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']);
$router->post('polis/create/',['uses'=>'PolisController@createPolis']);
//LAPORAN API
$router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
$router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif
$router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan takaktif
$router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
$router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']);
$router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);
@@ -224,6 +245,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//API PANJAR KHAZANAH
$router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
$router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']);
$router->get('SenaraiPanjar/listeach/{kodcaw}',['uses'=>'PanjarController@listeachpanjar']);
$router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']);
// $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']);
$router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']);
@@ -246,6 +268,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//API REQUEST TELLER
$router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']);
$router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
$router->get('requestTeller/getlaporan/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahan']);
$router->get('requestTeller/get/{kodcaw}/date',['uses' => 'TunaiController@getRequestTellerByDate']);
$router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
$router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);
@@ -254,7 +277,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
$router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
$router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']);
$router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);
$router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']);
//update tagterima Tebus
@@ -319,14 +342,21 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']); //transaction kira sum all bayaran online cawangan
//NAMA PENGGUNA TAMBAH KODLALUAN
$router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']);
//IMBANG DUGA//
//Dua-Dua Table
$router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //pendahuluan dan serahan
$router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); //Penghutang Ar-Rahn dan Keuntungan Terakru
$router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); //Penghutang Ar-Rahn dan Keuntungan Terakru
//-- Harta Semasa --//
$router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
$router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
$router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq
$router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
$router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
@@ -338,9 +368,26 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
$router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
$router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
$router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
//-- Untung Rugi --//
$router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
//END IMBANG DUGA//
//ADDED LEJER AM
$router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413
$router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); // new added 20210413
//-- Ansuran GLEJER --//
$router->get('ansuranByrKaunter/{kodcaw}/{norujukan}',['uses'=>'TransactionController@getSumBayaran_Ansuran']);
//Komuditi Pukal
$router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']);
$router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']);