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 into apiaku

Browse Source
This commit is contained in:
hafifierahman
2021-01-12 11:40:27 +08:00
parent ac2ad33a12 d7384fdcf3
commit 80274522b3
22 changed files with 334 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+50 -36
View File
@@ -9,67 +9,81 @@ LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
DB_CONNECTION=mysql
DB_HOST=192.168.0.100
DB_PORT=3306
DB_HOST=192.168.0.102
DB_PORT=3307
DB_DATABASE=arrahn
DB_USERNAME=godzilla
DB_PASSWORD=godzilla
DB_USERNAME=root
DB_PASSWORD=G0dz!ll42020
DB_CONNECTION_2=mysql
DB_HOST_2=192.168.0.100
DB_PORT_2=3306
DB_HOST_2=192.168.0.102
DB_PORT_2=3307
DB_DATABASE_2=arrahn_kangar
DB_USERNAME_2=godzilla
DB_PASSWORD_2=godzilla
DB_USERNAME_2=root
DB_PASSWORD_2=G0dz!ll42020
DB_CONNECTION_3=mysql
DB_HOST_3=192.168.0.100
DB_PORT_3=3306
DB_HOST_3=192.168.0.102
DB_PORT_3=3307
DB_DATABASE_3=arrahn_kuantan
DB_USERNAME_3=godzilla
DB_PASSWORD_3=godzilla
DB_USERNAME_3=root
DB_PASSWORD_3=G0dz!ll42020
DB_CONNECTION_4=mysql
DB_HOST_4=192.168.0.100
DB_PORT_4=3306
DB_HOST_4=192.168.0.102
DB_PORT_4=3307
DB_DATABASE_4=arrahn_pmas
DB_USERNAME_4=godzilla
DB_PASSWORD_4=godzilla
DB_USERNAME_4=root
DB_PASSWORD_4=G0dz!ll42020
DB_CONNECTION_5=mysql
DB_HOST_5=192.168.0.100
DB_PORT_5=3306
DB_HOST_5=192.168.0.102
DB_PORT_5=3307
DB_DATABASE_5=arrahn_putatan
DB_USERNAME_5=godzilla
DB_PASSWORD_5=godzilla
DB_USERNAME_5=root
DB_PASSWORD_5=G0dz!ll42020
DB_CONNECTION_6=mysql
DB_HOST_6=192.168.0.100
DB_PORT_6=3306
DB_HOST_6=192.168.0.102
DB_PORT_6=3307
DB_DATABASE_6=arrahn_koklanas
DB_USERNAME_6=godzilla
DB_PASSWORD_6=godzilla
DB_USERNAME_6=root
DB_PASSWORD_6=G0dz!ll42020
DB_CONNECTION_7=mysql
DB_HOST_7=192.168.0.100
DB_PORT_7=3306
DB_HOST_7=192.168.0.102
DB_PORT_7=3307
DB_DATABASE_7=online_arrahn
DB_USERNAME_7=godzilla
DB_PASSWORD_7=godzilla
DB_USERNAME_7=root
DB_PASSWORD_7=G0dz!ll42020
DB_CONNECTION_8=mysql
DB_HOST_8=192.168.0.100
DB_PORT_8=3306
DB_HOST_8=192.168.0.102
DB_PORT_8=3307
DB_DATABASE_8=arrahn_kb1
DB_USERNAME_8=godzilla
DB_PASSWORD_8=godzilla
DB_USERNAME_8=root
DB_PASSWORD_8=G0dz!ll42020
DB_CONNECTION_9=mysql
DB_HOST_9=192.168.0.100
DB_PORT_9=3306
DB_HOST_9=192.168.0.102
DB_PORT_9=3307
DB_DATABASE_9=arrahn_kb2
DB_USERNAME_9=godzilla
DB_PASSWORD_9=godzilla
DB_USERNAME_9=root
DB_PASSWORD_9=G0dz!ll42020
DB_CONNECTION_9=mysql
DB_HOST_9=192.168.0.102
DB_PORT_9=3307
DB_DATABASE_9=arrahn_kb2
DB_USERNAME_9=root
DB_PASSWORD_9=G0dz!ll42020
DB_CONNECTION_10=mysql
DB_HOST_10=192.168.0.102
DB_PORT_10=3307
DB_DATABASE_10=arrahn_sandakan
DB_USERNAME_10=root
DB_PASSWORD_10=G0dz!ll42020
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
app/BatalGadai.php
+1 -1
View File
@@ -15,7 +15,7 @@ class BatalGadai extends Model
* @var array
*/
protected $fillable = [
'recNo','noRujukan','tellerId','namaTeller', 'tarikh', 'masa'
'recno','norujukan','tellerid','namateller', 'tarikh', 'masa'
];
/**
app/Console/Commands/DailyGadai.php
+1 -1
View File
@@ -44,7 +44,7 @@ class DailyGadai extends Command
$cawangan = Cawangan::on('mysql7')->get();
$current = Carbon::now();
foreach($cawangan as $cawangan_mysql){
$all_gadai = Gadai::on($cawangan_mysql['mysql'])->where('sttebus','!=','L')->orWhere('sttebus','!=','T')->get();
$all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get();
foreach($all_gadai as $gadai){
if($gadai['t_update'] == null){
$tarikh_update = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
app/Denominasi.php
+13 -13
View File
@@ -30,32 +30,32 @@ class Denominasi extends Model
'b50',
'bd100',
'b100',
'txtRing1',
'txtring1',
'k1',
'txtRing5',
'txtring5',
'k5',
'txtSen1',
'txtsen1',
'k01',
'txtSen5',
'txtsen5',
'k05',
'txtSen10',
'txtsen10',
'k010',
'txtSen20',
'txtsen20',
'k020',
'txtSen50',
'txtsen50',
'k050',
'txtRing10',
'txtring10',
'k10',
'txtRing20',
'txtring20',
'k20',
'txtRing50',
'txtring50',
'k50',
'txtRing100',
'txtring100',
'k100',
'txtRing1000',
'txtring1000',
'k1000',
'jumlahbundle',
'txtJumlah',
'txtjumlah',
'nota',
'jumlahkeping'
app/Gadai.php
+6 -6
View File
@@ -27,18 +27,18 @@ class Gadai extends Model
'pinjaman',
'telahbayar',
'upahtelahbyr',
'CajTelahByr',
'cajtelahbyr',
'ansuran',
'ansupah',
'kadarupah',
'tempoh',
't_Lelong',
't_Hapus',
't_lelong',
't_hapus',
'sttebus',
'terima',
'cetak',
'tnCek',
'noCek',
'tncek',
'nocek',
'bkcode',
'teller',
'pelulus',
@@ -47,7 +47,7 @@ class Gadai extends Model
'f_lulus',
'tag',
'jbg',
'bakiPJM',
'bakipjm',
'bakiupah',
'marhun' ,
'taglel' ,
app/HapusKira.php
+17 -17
View File
@@ -15,23 +15,23 @@ class HapusKira extends Model
* @var array
*/
protected $fillable = [
'RECNO',
'KODCAW',
'BATCHNO',
'NORUJUKAN',
'TARIKH',
'KADARUPAH',
'AMAUN',
'N_MARHUN',
'SEMUA',
'NOTA' ,
'PRKOD',
'TELLER',
'PELULUS',
'TERIMA',
'BAKIPJM',
'BAKIUPAH',
'KODGL'
'recno',
'kodcaw',
'batchno',
'norujukan',
'tarikh',
'kadarupah',
'amaun',
'n_marhun',
'semua',
'nota' ,
'prkod',
'teller',
'pelulus',
'terima',
'bakipjm',
'bakiupah',
'kodgl'
];
/**
app/Http/Controllers/CustomerController.php
+28 -1
View File
@@ -210,7 +210,6 @@ class CustomerController extends Controller
}
public function createCustomer($kodcaw,Request $request){
// dd($request);
$current = Carbon::now();
$current = new Carbon();
@@ -239,6 +238,9 @@ class CustomerController extends Controller
'aktif' => 'A',
'telefon2' => $request->telefon2,
'nosiri'=>$request->nosiri,
'nota'=>$request->nota,
'kodkerja'=>$request->kodkerja,
'tujuangadai'=>$request->tujuangadai
]);
return response()->json($customer, 201);
@@ -271,6 +273,31 @@ class CustomerController extends Controller
return response()->json($customer_update, 200);
}
public function customerUpdateKaunter($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
));
}
}
return response()->json($customer_update, 200);
}
public function listNorujukanMobile($nokp){
$cawangan_all = Cawangan::on('mysql7')->get();
$array_norujukan = [];
app/Http/Controllers/DenominasiController.php
+13 -13
View File
@@ -71,32 +71,32 @@ class DenominasiController extends Controller
'b50'=> $bd50,
'bd100'=> $request->bd100,
'b100'=> $bd100,
'txtRing1'=> $request->txtRing1,
'txtring1'=> $request->txtRing1,
'k1'=> $k1,
'txtRing5'=> $request->txtRing5,
'txtring5'=> $request->txtRing5,
'k5'=> $k5,
'txtSen1'=> $request->txtSen1,
'txtsen1'=> $request->txtSen1,
'k01'=> $k01,
'txtSen5'=> $request->txtSen5,
'txtsen5'=> $request->txtSen5,
'k05'=> $k05,
'txtSen10'=> $request->txtSen10,
'txtsen10'=> $request->txtSen10,
'k010'=> $k010,
'txtSen20'=> $request->txtSen20,
'txtsen20'=> $request->txtSen20,
'k020'=> $k020,
'txtSen50'=> $request->txtSen50,
'txtsen50'=> $request->txtSen50,
'k050'=> $k050,
'txtRing10'=> $request->txtRing10,
'txtring10'=> $request->txtRing10,
'k10'=> $k10,
'txtRing20'=> $request->txtRing20,
'txtring20'=> $request->txtRing20,
'k20'=> $k20,
'txtRing50'=> $request->txtRing50,
'txtring50'=> $request->txtRing50,
'k50'=> $k50,
'txtRing100'=> $request->txtRing100,
'txtring100'=> $request->txtRing100,
'k100'=> $k100,
'txtRing1000'=> $request->txtRing1000,
'txtring1000'=> $request->txtRing1000,
'k1000'=> $request->k1000,
'jumlahbundle'=> $totalbundle,
'txtJumlah'=> $totaljumlah,
'txtjumlah'=> $totaljumlah,
'jumlahkeping' => $totalkeping
) );
app/Http/Controllers/GadaiController.php
+79 -39
View File
@@ -97,6 +97,7 @@ class GadaiController extends Controller
'nokp' => $request->nokp,
'sirig' => $request->sirig,
't_gadai' => $current->toDateString(),
'sttebus' => '',
'masa' =>$current->toTimeString()
]);
return response()->json($gadai, 201);
@@ -155,6 +156,13 @@ class GadaiController extends Controller
return response()->json($gadai);
}
public function checkNorujukan(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])->where([['norujukan','=',$request->norujukan],['nokp','=',$request->nokp]])->first();
return response()->json($gadai);
}
public function updateOneGadaiByNorujukan($norujukan,$kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
@@ -429,8 +437,8 @@ class GadaiController extends Controller
->sum('bayaran');
$bayarlebihanlelong = TuntutBaki::on($cawangan['mysql'])
->where('TARIKH','<=',$tarikh)
->sum('JUMLAH');
->where('tarikh','<=',$tarikh)
->sum('jumlah');
$hapuskira = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(gadai.pinjaman) as jumlahpinjaman')
@@ -505,8 +513,8 @@ class GadaiController extends Controller
->sum('bayaran');
$bayarlebihanlelong = TuntutBaki::on($cawangan['mysql'])
->where('TARIKH','=',$tarikh)
->sum('JUMLAH');
->where('tarikh','=',$tarikh)
->sum('jumlah');
$wtd = WTD::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(wtd.pinjaman) as jumlahpinjaman')
@@ -753,51 +761,51 @@ class GadaiController extends Controller
// ->get();
$hapuskira1 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
->where('TARIKH','<',$tarikh)
->where('N_MARHUN','>=',1)
->where('N_MARHUN','<=',400.99)
->orderBy('TARIKH')
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','<',$tarikh)
->where('n_marhun','>=',1)
->where('n_marhun','<=',400.99)
->orderBy('tarikh')
->get();
$hapuskira2 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
->where('TARIKH','<',$tarikh)
->where('N_MARHUN','>=',401)
->where('N_MARHUN','<=',2000.99)
->orderBy('TARIKH')
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','<',$tarikh)
->where('n_marhun','>=',401)
->where('n_marhun','<=',2000.99)
->orderBy('tarikh')
->get();
$hapuskira3 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
->where('TARIKH','<',$tarikh)
->where('N_MARHUN','>=',2001)
->where('N_MARHUN','<=',1000000)
->orderBy('TARIKH')
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','<',$tarikh)
->where('n_marhun','>=',2001)
->where('n_marhun','<=',1000000)
->orderBy('tarikh')
->get();
$hapuskiraini1 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
->where('TARIKH','=',$tarikh)
->where('N_MARHUN','>=',1)
->where('N_MARHUN','<=',400.99)
->orderBy('TARIKH')
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','=',$tarikh)
->where('n_marhun','>=',1)
->where('n_marhun','<=',400.99)
->orderBy('tarikh')
->get();
$hapuskiraini2 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
->where('TARIKH','=',$tarikh)
->where('N_MARHUN','>=',401)
->where('N_MARHUN','<=',2000.99)
->orderBy('TARIKH')
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','=',$tarikh)
->where('n_marhun','>=',401)
->where('n_marhun','<=',2000.99)
->orderBy('tarikh')
->get();
$hapuskiraini3 = HapusKira::on($cawangan['mysql'])
->selectRaw('COUNT(NORUJUKAN) AS bil, SUM(bakipjm) AS pinj')
->where('TARIKH','=',$tarikh)
->where('N_MARHUN','>=',2001)
->where('N_MARHUN','<=',1000000)
->orderBy('TARIKH')
->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
->where('tarikh','=',$tarikh)
->where('n_marhun','>=',2001)
->where('n_marhun','<=',1000000)
->orderBy('tarikh')
->get();
@@ -989,7 +997,7 @@ class GadaiController extends Controller
foreach($cawangan_all as $index=>$cawangan){
$petibesi = Vault::on('mysql6')->orderBy('Tarikh','desc')->first();
$jumlahPetibesi += $petibesi['BakiEod'];
$jumlahPetibesi += $petibesi['bakieod'];
}
return response()->json(number_format($jumlahPetibesi,2));
}
@@ -1069,7 +1077,7 @@ class GadaiController extends Controller
$nilaiMarhun = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$tarikh],['sttebus','=','']])->sum('nilaimarhun');
$upah = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$tarikh)->sum('bakiupah');
array_push($prestasi_cawangan,['cawangan'=>$cawangan['details_caw'],'nilai_marhun'=>$nilaiMarhun,'outstanding'=>$outstanding,'gadai'=>$gadai,'tebus'=>$tebus,'upah'=>$upah,'tarikh'=>$tarikh]);
array_push($prestasi_cawangan,['cawangan'=>$cawangan['details_caw'],'nilai_marhun'=>(float)$nilaiMarhun,'outstanding'=>(float)$outstanding,'gadai'=>(float)$gadai,'tebus'=>(float)$tebus,'upah'=>(float)$upah,'tarikh'=>$tarikh]);
}
return response()->json($prestasi_cawangan);
@@ -1088,9 +1096,13 @@ class GadaiController extends Controller
$cawangan_all = Cawangan::on('mysql7')->get();
$petibesi_cawangan = [];
foreach($cawangan_all as $index=>$cawangan){
$petibesi = Vault::on('mysql6')->where('Tarikh','=',$tarikh)->first();
array_push($petibesi_cawangan,['cawangan'=>$cawangan['details_caw'],'petibesi'=>$petibesi['BakiEod'],'tarikh'=>$tarikh]);
$petibesi = Vault::on($cawangan['mysql'])->where('Tarikh','=',$tarikh)->first();
if(is_array($petibesi) || is_object($petibesi)){
array_push($petibesi_cawangan,['cawangan'=>$cawangan['details_caw'],'petibesi'=>$petibesi['bakieod'],'tarikh'=>$tarikh]);
}else{
array_push($petibesi_cawangan,['cawangan'=>$cawangan['details_caw'],'petibesi'=>0,'tarikh'=>$tarikh]);
}
}
return response()->json($petibesi_cawangan);
@@ -1140,4 +1152,32 @@ class GadaiController extends Controller
return response('Bukan-Tebus');
}
public function senaraiLelong($kodcaw,Request $request){
if($request->tarikh == null){
$current = Carbon::now();
$current = new Carbon();
$tarikh_lelong = $current;
}else{
$tarikh_lelong = Carbon::parse($request->tarikh.' 00:00:00' );
}
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai_aktif = Gadai::on($cawangan['mysql'])->whereNotIn('sttebus',['L','T'])->get();
$senarai_lelong =[];
foreach($gadai_aktif as $index=>$gadai){
$jbg_lelong = $gadai['jbg'];
$baki_upah = $gadai['bakiupah'];
if($jbg_lelong >= 9 || $baki_upah != 0){
array_push($senarai_lelong,$senarai_lelong);
}
}
return response()->json($senarai_lelong);
}
}
app/Http/Controllers/KelulusanController.php
+20 -20
View File
@@ -18,7 +18,7 @@ class KelulusanController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$kelulusan=Mohon::on($cawangan['mysql'])
->where('TARIKH','=',$harini->toDateString())
->where('tarikh','=',$harini->toDateString())
->where('masalulus','=','')
->get();
@@ -33,8 +33,8 @@ class KelulusanController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$kelulusan=Mohon::on($cawangan['mysql'])
->where('TARIKH','=',$harini->toDateString())
->where('NORUJUKAN','=',$norujukan)
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->where('masalulus','<>','')
->get();
@@ -50,7 +50,7 @@ class KelulusanController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$kelulusan=Mohon::on($cawangan['mysql'])
->where('TARIKH','<',$harini->toDateString())
->where('tarikh','<',$harini->toDateString())
->get();
return response()->json($kelulusan);
@@ -66,8 +66,8 @@ class KelulusanController extends Controller
$kelulusan=Mohon::on($cawangan['mysql'])
->where('TARIKH','=',$harini->toDateString())
->where('NORUJUKAN','=',$norujukan)
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'masalulus'=> $harini->toTimeString()
@@ -88,14 +88,14 @@ class KelulusanController extends Controller
$kelulusan=Mohon::on($cawangan['mysql'])
->create([
'TARIKH'=> $harini->toDateString(),
'NORUJUKAN'=> $norujukan,
'SIRI' => "try",
'KOMEN' => $request->komen,
'tarikh'=> $harini->toDateString(),
'norujukan'=> $norujukan,
'siri' => "try",
'komen' => $request->komen,
'lastdategadai' => $request->dategadai,
'bilGad' => $request->bilgadai,
'jumPinj' => $request->jumpinjam,
'jenisTebus' => $request->jenistebus,
'bilgad' => $request->bilgadai,
'jumpinj' => $request->jumpinjam,
'jenistebus' => $request->jenistebus,
'teller' => $request->teller,
'pelulus' => $request->pelulus
@@ -106,14 +106,14 @@ class KelulusanController extends Controller
$kelulusan=Mohon::on($cawangan['mysql'])
->create([
'TARIKH'=> $harini->toDateString(),
'NORUJUKAN'=> $norujukan,
'SIRI' => "try",
'KOMEN' => $request->komen,
'tarikh'=> $harini->toDateString(),
'norujukan'=> $norujukan,
'siri' => "try",
'komen' => $request->komen,
'lastdategadai' => $request->dategadai,
'bilGad' => $request->bilgadai,
'jumPinj' => $request->jumpinjam,
'jenisTebus' => $request->jenistebus,
'bilgad' => $request->bilgadai,
'jumpinj' => $request->jumpinjam,
'jenistebus' => $request->jenistebus,
'teller' => $request->teller,
'peloperasi' => $request->peloperasi
app/Http/Controllers/PanjarController.php
+2 -2
View File
@@ -48,8 +48,8 @@ class PanjarController extends Controller
$kelulusan=Panjar::on($cawangan['mysql'])
->where('TARIKH','=',$harini->toDateString())
->where('NORUJUKAN','=',$norujukan)
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'pelulus' => $request->pelulus,
'masalulus'=> $harini->toTimeString()
app/Http/Controllers/TebusController.php
+23 -23
View File
@@ -222,7 +222,7 @@ class TebusController extends Controller
'kodcaw'=> $kodcaw,
'norujukan'=> $norujukan,
'nopelanggan' => $request->nopelanggan,
'JenisByr' => "TN",
'jenisbyr' => "TN",
'jenistebus' => $request->jenistebus,
'glcode' => "0",
't_tebus' => $current->toDateString(),
@@ -232,7 +232,7 @@ class TebusController extends Controller
'pinjaman' => $request->pinjaman,
'ansuran' => $request->ansuran,
'addpinjaman' => $request->addpinjaman,
'BakiPjm' => $request->bakipinjaman,
'bakipjm' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'terima' => "*",
'kodgl' => "0",
@@ -244,17 +244,17 @@ class TebusController extends Controller
]);
$create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
'TARIKH' => $current->toDateString(),
'MASA' => $current->toTimeString(),
'NORUJUKAN' => $norujukan,
'NM' => $request->nilai_marhun,
'KPD' => "kosong",
'DRP' => "kosong",
'BLN' => $current->month,
'THN' => $current->year,
'TAG' => 0,
'jenisTebus' => $request->jenistebus,
'namaTeller' => "nama teller"
'tarikh' => $current->toDateString(),
'masa' => $current->toTimeString(),
'norujukan' => $norujukan,
'nm' => $request->nilai_marhun,
'pkd' => "kosong",
'drp' => "kosong",
'bln' => $current->month,
'thn' => $current->year,
'tag' => 0,
'jenistebus' => $request->jenistebus,
'namateller' => "nama teller"
]);
return response()->json($update_gadai, 201);
@@ -314,7 +314,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$wakil = Wakil::on($cawangan['mysql'])
->orderBy('NOWAKIL','desc')
->orderBy('nowakil','desc')
->get();
return response()->json($wakil,200);
@@ -325,7 +325,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$wakil = Wakil::on($cawangan['mysql'])
->where('NOKP','=',$icno)
->where('nokp','=',$icno)
->get();
return response()->json($wakil,200);
@@ -349,14 +349,14 @@ class TebusController extends Controller
$wakil_create = Wakil::on($cawangan['mysql'])->create([
'kodcaw' => $kodcaw,
'NOPELANGGAN' => $request->nopelanggan,
'NOWAKIL' => $request->nowakil,
'NAMA' => $request->nama,
'NOKP' => $icno,
'HUBUNGAN' => $request->hubungan,
'ALAMAT1' => $request->alamat,
'TELEFON' => $request->telefon,
'NOTA' => $request->nota
'nopelanggan' => $request->nopelanggan,
'nowakil' => $request->nowakil,
'nama' => $request->nama,
'nokp' => $icno,
'hubungan' => $request->hubungan,
'alamat1' => $request->alamat,
'telefon' => $request->telefon,
'nota' => $request->nota
]);
app/Http/Controllers/TunaiController.php
+3 -3
View File
@@ -150,13 +150,13 @@ class TunaiController extends Controller
$current = Carbon::now();
$current = new Carbon();
$requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['KodLaluan','=',$kodlaluan],['update','=',0]])->get();
$requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['kodlaluan','=',$kodlaluan],['update','=',0]])->get();
return response()->json($requestteller);
}
public function updateRequestTeller($kodcaw,$kodlaluan,Request $request)
{
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['KodLaluan','=',$kodlaluan],['update','=',0]])->update(array(
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$kodlaluan],['update','=',0]])->update(array(
'update' => 1
@@ -173,7 +173,7 @@ class TunaiController extends Controller
'tarikh' => $current->toDateString(),
'kodcaw' => $kodcaw,
'KodLaluan'=> $kodlaluan,
'kodlaluan'=> $kodlaluan,
'modal'=>$request->modal,
'serahan'=>$request->serahan,
'update' => '0'
app/Http/Controllers/VaultController.php
+5 -5
View File
@@ -32,11 +32,11 @@ class VaultController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
'Masuk'=>$request->masuk,
'Keluar'=>$request->keluar,
'BakiAwal'=>$request->bakiawal,
'BakiAkhir'=>$request->bakiakhir,
'BakiEod'=>$request->bakieod
'masuk'=>$request->masuk,
'keluar'=>$request->keluar,
'bakiawal'=>$request->bakiawal,
'bakiakhir'=>$request->bakiakhir,
'bakieod'=>$request->bakieod
) );
app/InOutMar.php
+11 -11
View File
@@ -14,17 +14,17 @@ class InOutMar extends Model
* @var array
*/
protected $fillable = [
'TARIKH',
'MASA',
'NORUJUKAN',
'NM',
'KPD',
'DRP',
'BLN',
'THN',
'TAG',
'jenisTebus',
'namaTeller'
'tarikh',
'masa',
'norujukan',
'nm',
'kpd',
'drp',
'bln',
'thn',
'tag',
'jenistebus',
'namateller'
];
/**
app/Mohon.php
+7 -7
View File
@@ -15,14 +15,14 @@ class Mohon extends Model
* @var array
*/
protected $fillable = [
'TARIKH',
'NORUJUKAN',
'SIRI',
'KOMEN',
'tarikh',
'norujukan',
'siri',
'komen',
'lastdategadai',
'bilGad',
'jumPinj',
'jenisTebus',
'bildad',
'jumpinj',
'jenistebus',
'teller',
'pelulus',
'peloperasi',
app/Tebus.php
+7 -16
View File
@@ -19,9 +19,9 @@ class Tebus extends Model
'kodcaw',
'norujukan',
'nopelanggan',
'JenisByr',
'jenisbyr',
'jenistebus',
'CajCek',
'cajcek',
'glcode',
't_tebus',
'jbg',
@@ -30,35 +30,26 @@ class Tebus extends Model
'nilaimarhun',
'addpinjaman',
'pinjaman',
'BakiPjm',
'bakipjm',
'bakiupah',
'terima',
'cetak',
'teller',
'pelulus',
'pelulust',
'F_Lulus',
'f_lulus',
'nowakil',
'prkod',
'cancelID',
'CancelTime',
'cancelid',
'canceltime',
'kodgl',
'UpahAsal',
'upahasal',
'rebate',
'marhuntebus',
// 'Tiada',
// 'GantiRugi',
// 'TrkhUpah',
// 'tagterima',
'hubungan',
// 'upahpercuma',
'upahdibayar' ,
// 'bayaranpampasan',
'historygadaian',
'pinjamanterkini',
// 'byrnonline',
// 'byrnlebih',
// 'byrnkurang',
'tarikhbyrn',
];
app/TuntutBaki.php
+20 -20
View File
@@ -15,26 +15,26 @@ class TuntutBaki extends Model
* @var array
*/
protected $fillable = [
'RECNO',
'BATCHNO',
'JENIS',
'KODCAW',
'NORUJUKAN',
'TARIKH',
'PRKOD',
'TELLER',
'PELULUS',
'BAKIPJM',
'BAKIUPAH',
'CAJLAIN',
'CAJLELONG',
'KODGL',
'GLCODE',
'TERIMA',
'F_LULUS',
'JUMLAH',
'NOWAKIL',
'HARGAJUAL',
'recno',
'batchno',
'jenis',
'kodcaw',
'norujukan',
'tarikh',
'prkod',
'teller',
'pelulus',
'bakipjm',
'bakiupah',
'cajlain',
'cajlelong',
'kodgl',
'glcode',
'terima',
'f_lulus',
'jumlah',
'nowakil',
'hargajual',
'gst_cl',
'gst_hj'
];
app/Vault.php
+1 -1
View File
@@ -35,7 +35,7 @@ class Vault extends Model
'rm50',
'rm100',
'rm1000',
'totPanjar'
'totpanjar'
];
public $timestamps = false;
app/Wakil.php
+10 -10
View File
@@ -15,16 +15,16 @@ class Wakil extends Model
* @var array
*/
protected $fillable = [
'NOPELANGGAN',
'NOWAKIL',
'NAMA',
'NOKP',
'HUBUNGAN',
'ALAMAT1',
'ALAMAT2',
'ALAMAT3',
'TELEFON',
'NOTA'
'nopelanggan',
'nowakil',
'nama',
'nokp',
'hubungan',
'alamat1',
'alamat2',
'alamt3',
'telefon',
'nota'
];
/**
config/database.php
+12
View File
@@ -119,5 +119,17 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql10' => [
'driver' => 'mysql',
'host' => env('DB_HOST_10'),
'port' => env('DB_PORT'),
'database' => env('DB_DATABASE_10'),
'username' => env('DB_USERNAME_10'),
'password' => env('DB_PASSWORD_10'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
],
];
routes/web.php
+5 -4
View File
@@ -23,16 +23,13 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('customers',['uses'=>'CustomerController@showAllCustomers']);
$router->get('customers/cawangan/{kodcaw}',['uses'=>'CustomerController@showAllCustomersByCawangan']);
$router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByIC']);
$router->get('customers/{ic}/gadai/{status}',['uses'=>'CustomerController@showOneCustomerGadai']);
$router->get('customers/{ic}/gadai/{status}/{kodcaw}',['uses'=>'CustomerController@showOneCustomerGadaiByCawangan']);
$router->post('customers/create/{kodcaw}',['uses'=>'CustomerController@createCustomer']);
$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->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']);
$router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']);
//Gadai API
@@ -67,6 +64,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('gadai/customers/{ic}/outstandingsemasa',['uses'=>'GadaiController@outstandingSemasaCustomer']);
$router->put('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']);
$router->get('senarai/lelong/{kodcaw}',['uses'=>'GadaiController@senaraiLelong']);
$router->get('check/sag',['uses'=>'GadaiController@checkNorujukan']);
//Tebus API
$router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);