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-11-07 11:11:02 +08:00
parent 9e47233444 b9f38fd009
commit 030b527818
10 changed files with 440 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+195 -42
View File
@@ -9,82 +9,235 @@ LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
DB_CONNECTION=mysql
DB_HOST=localhost
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=arrahn
DB_USERNAME=root
DB_PASSWORD=root
DB_DATABASE=arrahn_1stop
DB_USERNAME=spider
DB_PASSWORD=G0dz!ll42020
DB_CONNECTION_2=mysql
DB_HOST_2=localhost
DB_HOST_2=127.0.0.1
DB_PORT_2=3306
DB_DATABASE_2=arrahn_kangar
DB_USERNAME_2=root
DB_PASSWORD_2=root
DB_DATABASE_2=arrahn_gmusang
DB_USERNAME_2=spider
DB_PASSWORD_2=G0dz!ll42020
DB_CONNECTION_3=mysql
DB_HOST_3=localhost
DB_HOST_3=127.0.0.1
DB_PORT_3=3306
DB_DATABASE_3=arrahn_kuantan
DB_USERNAME_3=root
DB_PASSWORD_3=root
DB_DATABASE_3=arrahn_guchil
DB_USERNAME_3=spider
DB_PASSWORD_3=G0dz!ll42020
DB_CONNECTION_4=mysql
DB_HOST_4=localhost
DB_HOST_4=127.0.0.1
DB_PORT_4=3306
DB_DATABASE_4=arrahn_pmas
DB_USERNAME_4=root
DB_PASSWORD_4=root
DB_DATABASE_4=arrahn_jelawat
DB_USERNAME_4=spider
DB_PASSWORD_4=G0dz!ll42020
DB_CONNECTION_5=mysql
DB_HOST_5=localhost
DB_HOST_5=127.0.0.1
DB_PORT_5=3306
DB_DATABASE_5=arrahn_putatan
DB_USERNAME_5=root
DB_PASSWORD_5=root
DB_DATABASE_5=arrahn_jeli
DB_USERNAME_5=spider
DB_PASSWORD_5=G0dz!ll42020
DB_CONNECTION_6=mysql
DB_HOST_6=localhost
DB_HOST_6=127.0.0.1
DB_PORT_6=3306
DB_DATABASE_6=arrahn_koklanas
DB_USERNAME_6=root
DB_PASSWORD_6=root
DB_DATABASE_6=arrahn_kb2
DB_USERNAME_6=spider
DB_PASSWORD_6=G0dz!ll42020
DB_CONNECTION_7=mysql
DB_HOST_7=localhost
DB_HOST_7=127.0.0.1
DB_PORT_7=3306
DB_DATABASE_7=online_arrahn
DB_USERNAME_7=root
DB_PASSWORD_7=root
DB_USERNAME_7=spider
DB_PASSWORD_7=G0dz!ll42020
DB_CONNECTION_8=mysql
DB_HOST_8=localhost
DB_HOST_8=127.0.0.1
DB_PORT_8=3306
DB_DATABASE_8=arrahn_kb1
DB_USERNAME_8=root
DB_PASSWORD_8=root
DB_DATABASE_8=arrahn_klanas
DB_USERNAME_8=spider
DB_PASSWORD_8=G0dz!ll42020
DB_CONNECTION_9=mysql
DB_HOST_9=localhost
DB_HOST_9=127.0.0.1
DB_PORT_9=3306
DB_DATABASE_9=arrahn_kb2
DB_USERNAME_9=root
DB_PASSWORD_9=root
DB_DATABASE_9=arrahn_machang
DB_USERNAME_9=spider
DB_PASSWORD_9=G0dz!ll42020
DB_CONNECTION_10=mysql
DB_HOST_10=localhost
DB_HOST_10=127.0.0.1
DB_PORT_10=3306
DB_DATABASE_10=arrahn_sandakan
DB_USERNAME_10=root
DB_PASSWORD_10=root
DB_DATABASE_10=arrahn_pmas
DB_USERNAME_10=spider
DB_PASSWORD_10=G0dz!ll42020
DB_CONNECTION_11=mysql
DB_HOST_11=localhost
DB_HOST_11=127.0.0.1
DB_PORT_11=3306
DB_DATABASE_11=arrahn_pputeh
DB_USERNAME_11=root
DB_PASSWORD_11=root
DB_USERNAME_11=spider
DB_PASSWORD_11=G0dz!ll42020
DB_CONNECTION_12=mysql
DB_HOST_12=127.0.0.1
DB_PORT_12=3306
DB_DATABASE_12=arrahn_rpanjang
DB_USERNAME_12=spider
DB_PASSWORD_12=G0dz!ll42020
DB_CONNECTION_13=mysql
DB_HOST_13=127.0.0.1
DB_PORT_13=3306
DB_DATABASE_13=arrahn_tmerah
DB_USERNAME_13=spider
DB_PASSWORD_13=G0dz!ll42020
DB_CONNECTION_14=mysql
DB_HOST_14=127.0.0.1
DB_PORT_14=3306
DB_DATABASE_14=arrahn_wb
DB_USERNAME_14=spider
DB_PASSWORD_14=G0dz!ll42020
DB_CONNECTION_15=mysql
DB_HOST_15=127.0.0.1
DB_PORT_15=3306
DB_DATABASE_15=arrahn_wcy
DB_USERNAME_15=spider
DB_PASSWORD_15=G0dz!ll42020
DB_CONNECTION_16=mysql
DB_HOST_16=127.0.0.1
DB_PORT_16=3306
DB_DATABASE_16=arrahn_bentong
DB_USERNAME_16=spider
DB_PASSWORD_16=G0dz!ll42020
DB_CONNECTION_17=mysql
DB_HOST_17=192.168.0.102
DB_PORT_17=3306
DB_DATABASE_17=arrahn_kajang
DB_USERNAME_17=spider
DB_PASSWORD_17=G0dz!ll42020
DB_CONNECTION_18=mysql
DB_HOST_18=192.168.0.102
DB_PORT_18=3306
DB_DATABASE_18=arrahn_kangar
DB_USERNAME_18=spider
DB_PASSWORD_18=G0dz!ll42020
DB_CONNECTION_19=mysql
DB_HOST_19=192.168.0.102
DB_PORT_19=3306
DB_DATABASE_19=arrahn_kuantan
DB_USERNAME_19=spider
DB_PASSWORD_19=G0dz!ll42020
DB_CONNECTION_20=mysql
DB_HOST_20=192.168.0.102
DB_PORT_20=3306
DB_DATABASE_20=arrahn_pgudang
DB_USERNAME_20=spider
DB_PASSWORD_20=G0dz!ll42020
DB_CONNECTION_21=mysql
DB_HOST_21=192.168.0.102
DB_PORT_21=3306
DB_DATABASE_21=arrahn_raub
DB_USERNAME_21=spider
DB_PASSWORD_21=G0dz!ll42020
DB_CONNECTION_22=mysql
DB_HOST_22=192.168.0.102
DB_PORT_22=3306
DB_DATABASE_22=arrahn_rlaut
DB_USERNAME_22=spider
DB_PASSWORD_22=G0dz!ll42020
DB_CONNECTION_23=mysql
DB_HOST_23=192.168.0.102
DB_PORT_23=3306
DB_DATABASE_23=arrahn_skudai
DB_USERNAME_23=spider
DB_PASSWORD_23=G0dz!ll42020
DB_CONNECTION_24=mysql
DB_HOST_24=192.168.0.102
DB_PORT_24=3306
DB_DATABASE_24=arrahn_spetani
DB_USERNAME_24=spider
DB_PASSWORD_24=G0dz!ll42020
DB_CONNECTION_25=mysql
DB_HOST_25=192.168.0.102
DB_PORT_25=3306
DB_DATABASE_25=arrahn_temerloh
DB_USERNAME_25=spider
DB_PASSWORD_25=G0dz!ll42020
DB_CONNECTION_26=mysql
DB_HOST_26=192.168.0.103
DB_PORT_26=3306
DB_DATABASE_26=arrahn_api2
DB_USERNAME_26=spider
DB_PASSWORD_26=G0dz!ll42020
DB_CONNECTION_27=mysql
DB_HOST_27=192.168.0.103
DB_PORT_27=3306
DB_DATABASE_27=arrahn_beaufort
DB_USERNAME_27=spider
DB_PASSWORD_27=G0dz!ll42020
DB_CONNECTION_28=mysql
DB_HOST_28=192.168.0.103
DB_PORT_28=3306
DB_DATABASE_28=arrahn_kbelud
DB_USERNAME_28=spider
DB_PASSWORD_28=G0dz!ll42020
DB_CONNECTION_29=mysql
DB_HOST_29=192.168.0.103
DB_PORT_29=3306
DB_DATABASE_29=arrahn_keningau
DB_USERNAME_29=spider
DB_PASSWORD_29=G0dz!ll42020
DB_CONNECTION_30=mysql
DB_HOST_30=192.168.0.103
DB_PORT_30=3306
DB_DATABASE_30=arrahn_putatan
DB_USERNAME_30=spider
DB_PASSWORD_30=G0dz!ll42020
DB_CONNECTION_31=mysql
DB_HOST_31=192.168.0.103
DB_PORT_31=3306
DB_DATABASE_31=arrahn_sandakan
DB_USERNAME_31=spider
DB_PASSWORD_31=G0dz!ll42020
DB_CONNECTION_32=mysql
DB_HOST_32=192.168.0.103
DB_PORT_32=3306
DB_DATABASE_32=arrahn_tawau
DB_USERNAME_32=spider
DB_PASSWORD_32=G0dz!ll42020
DB_CONNECTION_33=mysql
DB_HOST_33=192.168.0.103
DB_PORT_33=3306
DB_DATABASE_33=arrahn_tuaran
DB_USERNAME_33=spider
DB_PASSWORD_33=G0dz!ll42020
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
app/Http/Controllers/GadaiController.php
+86 -38
View File
@@ -1813,12 +1813,15 @@ class GadaiController extends Controller
public function petiBesiSemasa(){
$cawangan_all = Cawangan::on('mysql7')->get();
$jumlahPetibesi = 0;
$peti_besi = [];
foreach($cawangan_all as $index=>$cawangan){
$petibesi = Vault::on('mysql6')->orderBy('Tarikh','desc')->first();
$petibesi = Vault::on($cawangan['mysql'])->orderBy('tarikh','desc')->first();
array_push($peti_besi,['cawangan'=>$cawangan['details_caw'],'bakipeti'=>$petibesi['bakieod']]);
$jumlahPetibesi += $petibesi['bakieod'];
}
return response()->json(number_format($jumlahPetibesi,2));
$data = ['totalvault'=>$jumlahPetibesi,'petibesicawangan'=>$peti_besi];
return response()->json($data);
}
public function prestasiCawangan(Request $request){
@@ -2071,7 +2074,7 @@ class GadaiController extends Controller
$audit = new Audit();
$audit->users = $request->kodlaluan;
$audit->actions = 'Hapus Gadai';
$audit->actions = 'Hapus Tebus';
$audit->norujukan = $norujukan;
$audit->old_data = $gadai;
$audit->kodcaw = $kodcaw;
@@ -2885,42 +2888,83 @@ class GadaiController extends Controller
$current = Carbon::now();
$current = new Carbon();
$transaksi_data = TransaksiKeuntungan::on('mysql7')
->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
->where([['sttebus',''],['hargajualan','<>','null']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']])
->pluck('norujukan');
$transaksi = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->sum('bayaran_pembiayaan');
// $arraylejer = array();
// $transaksi_data = TransaksiKeuntungan::on('mysql7')
// // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
// ->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');
// // ->get();
// ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
// ->where('kodcaw',$kodcaw)
// ->pluck('norujukan');
// dd($transaksi_data);
// $transaksi = 0;
// if($transaksi_data){
// foreach($transaksi_data as $index=>$transaksiData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first();
// if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->mula && $gadaiData['hargajualan'] != null))){
// $transaksi += $transaksiData['bayaran_pembiayaan'];
// }
// }
// }
// $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
// ->where([['sttebus',''],['hargajualan','<>','null']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']])
// ->pluck('norujukan');
return response($transaksi);
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->whereIn('norujukan',$gadaiData)
// ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
// ->sum('bayaran_pembiayaan');
$from = date($request->mula);
$to = date($request->hingga);
$transaksi_data = TransaksiKeuntungan::on('mysql7')
// ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->whereDate('tarikh_bayaran','<=', $request->hingga)
->whereDate('tarikh_bayaran','>=', $request->mula)
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
->where([['sttebus',''],['hargajualan','<>','null']])
->pluck('norujukan');
$transaksi_kredit = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$transaksi_kredit_gadai)
->whereDate('tarikh_bayaran','<=', $request->hingga)
->whereDate('tarikh_bayaran','>=', $request->mula)
// ->whereBetween('tarikh_bayaran',[$from,$to])
->sum('bayaran_pembiayaan');
// $transaksi_kredit = 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]])
// ->sum('bayaran_pembiayaan');
$tebus = Gadai::on($cawangan['mysql'])
->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan')
->join('tebus as t','gadai.norujukan','=','t.norujukan')
->where('gadai.sttebus','T')
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]])
->groupBy('gadai.norujukan')
->get();
$arraytebus = array();
foreach($tebus as $index => $t)
{
if($t['hargajualan'] != $t['bakihargajualan'])
{
array_push($arraytebus,$t['norujukan']);
}
}
// dd($arraytebus);
$transaksi_debit = 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');
})
->where('trans.trans_type','=','A')
->where('trans.norujukan',$arraytebus)
->sum('bayaran_pembiayaan');
$arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit];
return response($arraylejer);
}
public function LaporanAuditAktif($kodcaw,Request $request)
@@ -2929,7 +2973,9 @@ class GadaiController extends Controller
$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]]);
->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->orderBy('t_gadai', 'ASC')
->orderBy('sirig', 'ASC');
$rekodaudit = $audit->get();
$totalrekod = $audit->sum('pinjaman');
@@ -2947,7 +2993,9 @@ class GadaiController extends Controller
$audit = Gadai::on($cawangan['mysql'])
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->orderBy('t_gadai', 'ASC')
->orderBy('sirig', 'ASC');
$rekodaudit = $audit->get();
$totalrekod = $audit->sum('pinjaman');
app/Http/Controllers/HargaEmasController.php
+13
View File
@@ -106,4 +106,17 @@ class HargaEmasController extends Controller
}
return response()->json($hargaemas);
}
public function laporanhargaemas(Request $request)
{
$rekod = HistoryEmasSandaran::on('mysql7')
->where('t_efektif','>=',$request->mula)
->where('t_efektif','<=',$request->hingga)
->orderBy('t_efektif','desc')
->orderBy('m_efektif','desc')
->get();
return response()->json($rekod);
}
}
app/Http/Controllers/LaporanController.php
+54 -1
View File
@@ -19,8 +19,11 @@ use App\Denominasi;
use App\HapusKira;
use App\GlCode;
use App\GlDetail;
use App\Audit;
use Carbon\Carbon;
use DateTime;
class LaporanController extends Controller
{
public function laporanHarian(Request $request){
@@ -244,7 +247,7 @@ class LaporanController extends Controller
$upahsimpankaunter = $keuntungan_kaunter + $upahtebus + $upahlelong + $upahansurKaunter + $total_keuntunganbukanansuran_kaunter;
$keuntungansebenarkaunter = $total_keuntunganansuran_kaunter;
$upahsimpanonline = $upahtebus + $upahlelong + $upahansurOnline;
$upahsimpanonline = $upahansurOnline;
$keuntungansebenaronline = $total_keuntunganansuran_online + $total_keuntunganbukanansuran_online;
$total_keuntungan_kaunter = floatval($upahsimpankaunter) + floatval($keuntungansebenarkaunter);
@@ -259,6 +262,10 @@ class LaporanController extends Controller
->where('tebus.t_tebus','=',$request->tarikh)
->get();
$pembiayaanlelong = Lelong::on($cawangan['mysql'])
->where('t_jual','=',$request->tarikh)
->sum('pinjaman');
$totalpenebusan = 0;
foreach($tebus as $index1=>$teb)
@@ -271,6 +278,8 @@ class LaporanController extends Controller
}
}
//Lelongan Pembiayaan
$totalpenebusan += $pembiayaanlelong;
//b
$bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->where('pinjaman','>',0)->count();
@@ -910,4 +919,48 @@ class LaporanController extends Controller
return response()->json($arrayxtra);
}
public function LaporanAuditTrail(Request $request)
{
$atarray = array();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$audittrail = Audit::on('mysql7')
->where('kodcaw','=',$request->kodcaw)
->whereDate('created_at','=',$request->tarikh)
->get();
foreach($audittrail as $index=>$at)
{
$datetime = new DateTime($at['created_at']);
$tarikh = $datetime->format('n/j/Y');
$masa = $datetime->format('H:i');
$atnewdata = json_decode($at['new_data'],true);
$atolddata = json_decode($at['old_data'],true);
$nokp = Gadai::on($cawangan['mysql'])->where('norujukan',$at['norujukan'])->pluck('nokp');
array_push($atarray,[
'tarikh' => $tarikh,
'masa' => $masa,
'users' => $at['users'],
'pelulus' => isset($atnewdata['namapelulus']) ? $atnewdata['namapelulus'] : '-',
'actions' => $at['actions'],
'norujukan' => $at['norujukan'],
'kodcaw' => $at['kodcaw'],
'oldpinjaman' => isset($atolddata['pinjaman']) ? $atolddata['pinjaman'] : 0,
'oldupah' => isset($atolddata['bakiupah']) ? $atolddata['bakiupah'] : 0,
'newpinjaman' => isset($atnewdata['pinjaman']) ? $atnewdata['pinjaman'] : 0,
'newupah' => isset($atnewdata['bakiupah']) ? $atnewdata['bakiupah'] : 0,
'nota' => isset($atnewdata['nota']) ? $atnewdata['nota'] : '-',
'nokp' => isset($nokp[0]) ? $nokp[0] : '-',
'norujukanasal' => isset($atnewdata['norujukan']) ? $atnewdata['norujukan'] : '-'
]);
}
return response()->json($atarray);
}
}
app/Http/Controllers/LelongController.php
+35 -6
View File
@@ -234,26 +234,42 @@ class LelongController extends Controller
public function BakiLelongCalculationLejer($kodcaw,Request $request)
{
$cas_lelong = 0;
$jumlah_lelong = 0;
$baki_lelong = 0;
$rugi_lelong = 0;
$tarikhbaru = $request->mula;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$bakilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
->where('baki','>=',0)
->sum('baki');
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
->where('baki','>=',0)
->sum('baki');
$rugilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
->where('baki','<',0)
->sum('baki');
$data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])->get();
$rugitotal = $rugilelong;
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']);
}
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong, 'baki' => $baki_lelong, 'rugi' => $rugi_lelong, 'jumlahlelong' => $jumlah_lelong, 'caslelong' => $cas_lelong];
return response()->json($arraylelong,200);
}
@@ -479,6 +495,19 @@ class LelongController extends Controller
return response()->json($cajlelong,200);
}
public function cajlelongcalculationLejer($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$cajlelong = Lelong::on($cawangan['mysql'])
->whereNotNull('t_jual')
->where([['t_jual','<=', $request->mula],['t_jual','>=',$request->hingga]])
->sum('cajlelong');
return response()->json($cajlelong,200);
}
public function cajperkhidmatancalculation($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
app/Http/Controllers/PendahuluanSerahanController.php
+9 -1
View File
@@ -94,7 +94,7 @@ class PendahuluanSerahanController extends Controller
->where('pendahuluan','>',0)
->orderby('tarikh','desc')
->get();
}else{
}else if($request->jenis == 'serahan'){
$gldetail=GlDetail::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
@@ -103,6 +103,14 @@ class PendahuluanSerahanController extends Controller
->where('serahan','>',0)
->orderby('tarikh','desc')
->get();
}else{
$gldetail=GlDetail::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
->where('descpt','LIKE','SERAHAN BAYAR ONLINE%')
->where('serahan','>',0)
->orderby('tarikh','desc')
->get();
}
app/Http/Controllers/TransactionController.php
+12
View File
@@ -6,6 +6,7 @@ use App\Transaction;
use App\TransaksiKeuntungan;
use App\Pengguna;
use App\Cawangan;
use App\Advansur;
use Illuminate\Http\Request;
@@ -118,4 +119,15 @@ class TransactionController extends Controller
return response()->json($transaction);
}
public function TransaksiUpah(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('norujukan','=',$request->norujukan)
->orderBy('tarikh','desc')
->get();
return response()->json($listadvansur,200);
}
}
app/Http/Controllers/TransactionOnlineController.php
+13
View File
@@ -223,4 +223,17 @@ class TransactionOnlineController extends Controller
return response()->json($transactionOnline);
}
public function searchSAGOnline(Request $request){
$current = Carbon::now();
$current = new Carbon();
$transaction_online = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','PAID'],['update_status',0],['tarikh',$current->toDateString()]])->first();
if($transaction_online){
return response()->json(true);
}else{
return response()->json(false);
}
}
}
app/Http/Controllers/VaultController.php
+15
View File
@@ -667,6 +667,21 @@ class VaultController extends Controller
return response()->json($arraypend);
}
public function laporanPetiBesiRange($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','>=', $request->mula)
->where('tarikh','<=', $request->hingga)
->orderby('tarikh','desc')->get();
return response()->json($vault);
}
}
routes/web.php
+8
View File
@@ -164,6 +164,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('harga_emas/create',['uses'=>'HargaEmasController@createhargaemas']);
$router->put('harga_emas/delete/{id}', ['uses' => 'HargaEmasController@deletehargaemas']);
$router->get('harga_emas/rekod/sandaran',['uses'=>'HargaEmasController@rekodEmasSandaran']);
$router->get('harga_emas/laporan/sandaran',['uses'=>'HargaEmasController@laporanhargaemas']);
//Cawangan API
@@ -289,6 +291,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']);
$router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']);
$router->get('GetTunaiSemalam/{kodcaw}',['uses' =>'TunaiController@getTunaiSemalam']);
$router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']);
$router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']);
//API PANJAR KHAZANAH
$router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
@@ -457,6 +462,7 @@ $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBa
$router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']);
$router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']);
$router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']);
$router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculationLejer']);
// //-- Harta Semasa --//
$router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']);
@@ -584,6 +590,8 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
$router->group(['prefix'=>'portal'], function () use ($router){
$router->get('financeMonth',['uses'=>'GadaiController@PembiayaanBulanan']);
$router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']);
$router->get('transaksipelanggan/upah',['uses'=>'TransactionController@TransaksiUpah']);
$router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']);
});