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

add commits from server 25/9/2023

Browse Source
This commit is contained in:
root
2023-09-25 22:52:07 +08:00
committed by Afiq Hamzah
parent cc6206bd24
commit 434a2a0057
6 changed files with 102 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+1
View File
@@ -1656,6 +1656,7 @@ class AdminPageController extends Controller
->first();
$blacklist = Blacklist::on('mysql7')->create([
'nosiri' => $customer['nosiri'],
'kodcaw' => $customer['kodcaw'],
'tarikhdaftar' => $customer['tarikhdaftar'],
'kplama' => $customer['kplama'],
app/Http/Controllers/LaporanController.php
+1 -1
View File
@@ -785,7 +785,7 @@ class LaporanController extends Controller
$tebus = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir],['jenistebus','=','T']]);
$ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
$bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where('teller','=','Online')->where('kodcaw',$request->kodcaw);
app/Http/Controllers/PoskodController.php
+2 -2
View File
@@ -56,7 +56,7 @@ class PoskodController extends Controller
return response()->json($e, 403);
}
$created_poskod = Poskod::create([
$created_poskod = Poskod::on('mysql7')->create([
'poskod' => $validated['poskod'],
'koddaerah' => $validated['koddaerah'],
'kodnegeri' => $validated['kodnegeri'],
@@ -67,7 +67,7 @@ class PoskodController extends Controller
public function update(Request $request)
{
$poskod = Poskod::find($request->recno);
$poskod = Poskod::on('mysql7')->find($request->recno);
try {
$validated = $this->validate($request, [
app/Http/Controllers/TransactionOnlineController.php
+14 -2
View File
@@ -246,9 +246,21 @@ class TransactionOnlineController extends Controller
$current = Carbon::now();
$current = new Carbon();
$boolmasa = false;
$transaction_online = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','PAID'],['update_status',0],['tarikh',$current->toDateString()]])->first();
if($transaction_online){
$transaction_masa = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','NOT PAID'],['tarikh',$current->toDateString()]])
->orderBy('masa', 'desc')->first();
if($transaction_masa){
$carbonmasa = new Carbon($transaction_masa['masa']);
$carbonmasaexpired = new Carbon($transaction_masa['masa']);
$carbonmasaexpired->addMinutes(10);
$boolmasa = ($carbonmasaexpired->greaterThanOrEqualTo($current) && $carbonmasa->lessThanOrEqualTo($current)) ? true : false;
}
if($transaction_online || $boolmasa){
return response()->json(true);
}else{
return response()->json(false);