diff --git a/Entities/Account.php b/Entities/Account.php index 21e8e49..c778fee 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -95,7 +95,7 @@ class Account extends Model ->where('LIMIT_REF', null) ->where('AC.BATCH_DATE', $startDate) ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount) - ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','101']) + ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','101','600']) // ->groupBy('CUSTOMER_NO', 'ACCOUNT_NUMBER', 'SHORT_TITLE', 'SHORT_NAME', 'COMPANY_NAME', 'CATEGORY', 'LIMIT_REF') ->orderBy('CATEGORY', 'ASC') ->limit(100); diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 2d7bfe0..811239e 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -34,6 +34,7 @@ use Modules\Konfirmasibank\Http\Requests\Fasilitas\StoreFasilitasRequest; use Akaunting\Money\Currency; use Akaunting\Money\Money; use Illuminate\Validation\Rule; +use App\Exports\DataExport; // Sesuaikan dengan class export Anda class KonfirmasiBankController extends Controller { @@ -418,7 +419,6 @@ class KonfirmasiBankController extends Controller } } - // try { foreach ($listAccount as $key1 => $account) { @@ -448,15 +448,8 @@ class KonfirmasiBankController extends Controller $DataDepo = []; try { $Deposito = $Account->getDepo($request['cusNo'], $arrAccount, $dateCoreDepo)->get(); - - } catch (\Illuminate\Database\QueryException $e) { - $errorCode = $e->errorInfo[1]; - if ($errorCode == 1205) { // 1205 adalah kode error untuk Lock wait timeout exceeded; try restarting transaction - // Lakukan sesuatu jika terjadi timeout - return response()->json(['error' => 'Database timeout, please try again later'], 503); - } - // Handle error lainnya - return response()->json(['error' => 'Database error'], 500); + } catch (Exception $e) { + return redirect()->route('konfirmasibank.timeout'); } foreach ($Deposito as $keyDep => $depo) { @@ -478,13 +471,7 @@ class KonfirmasiBankController extends Controller $Arrangement = $Account->getPinjaman($request['cusNo'], $dateCoreAccount)->get(); } catch (\Illuminate\Database\QueryException $e) { - $errorCode = $e->errorInfo[1]; - if ($errorCode == 1205) { // 1205 adalah kode error untuk Lock wait timeout exceeded; try restarting transaction - // Lakukan sesuatu jika terjadi timeout - return response()->json(['error' => 'Database timeout, please try again later'], 503); - } - // Handle error lainnya - return response()->json(['error' => 'Database error'], 500); + return redirect()->route('konfirmasibank.timeout'); } foreach ($Arrangement as $key2 => $pinjaman) { @@ -507,21 +494,13 @@ class KonfirmasiBankController extends Controller $listAccountRK = $Account->getAccountRK($arrAccount, $dateCoreAccount)->get(); } catch (\Illuminate\Database\QueryException $e) { - $errorCode = $e->errorInfo[1]; - if ($errorCode == 1205) { // 1205 adalah kode error untuk Lock wait timeout exceeded; try restarting transaction - // Lakukan sesuatu jika terjadi timeout - return response()->json(['error' => 'Database timeout, please try again later'], 503); - } - // Handle error lainnya - return response()->json(['error' => 'Database error'], 500); + return redirect()->route('konfirmasibank.timeout'); } foreach ($listAccountRK as $rk => $valRk) { $DataRK[$rk]['ACCOUNT_NUMBER'] = $valRk->ACCOUNT_NUMBER; - // $DataRK[$rk]['OPENING_DATE'] = $valRk->OPENING_DATE; $DataRK[$rk]['BATCH_DATE'] = $valRk->BATCH_DATE; - // $DataRK[$rk]['CUSTOMER_NO'] = $valRk->CUSTOMER_NO; $DataRK[$rk]['SHORT_NAME'] = $valRk->PRODUCT_LOAN; $DataRK[$rk]['CURRENCY'] = $valRk->LOAN_CCY; $DataRK[$rk]['PRODUCT'] = $valRk->PRODUCT_LOAN; @@ -534,17 +513,11 @@ class KonfirmasiBankController extends Controller } - try { + try { $fasilitas = Fasilitas::where('nomor_cif', $request['cusNo'])->where('status', 1)->get(); } catch (\Illuminate\Database\QueryException $e) { - $errorCode = $e->errorInfo[1]; - if ($errorCode == 1205) { // 1205 adalah kode error untuk Lock wait timeout exceeded; try restarting transaction - // Lakukan sesuatu jika terjadi timeout - return response()->json(['error' => 'Database timeout, please try again later'], 503); - } - // Handle error lainnya - return response()->json(['error' => 'Database error'], 500); + return redirect()->route('konfirmasibank.timeout'); } foreach ($fasilitas as $key3 => $val3) { @@ -564,13 +537,7 @@ class KonfirmasiBankController extends Controller $ListAnjak = $Account->getAccountAnjak($rekEscrow, $dateCoreAccount)->get(); } catch (\Illuminate\Database\QueryException $e) { - $errorCode = $e->errorInfo[1]; - if ($errorCode == 1205) { // 1205 adalah kode error untuk Lock wait timeout exceeded; try restarting transaction - // Lakukan sesuatu jika terjadi timeout - return response()->json(['error' => 'Database timeout, please try again later'], 503); - } - // Handle error lainnya - return response()->json(['error' => 'Database error'], 500); + return redirect()->route('konfirmasibank.timeout'); } $totalOutstanding = $ListAnjak->sum('OUTSTANDING') != null ? number_format(abs($ListAnjak->sum('OUTSTANDING')), 2, ',', '.') : 'NIHIL'; @@ -883,5 +850,9 @@ class KonfirmasiBankController extends Controller } + public function timeout(){ + return view('konfirmasibank::errors.404'); + } + } diff --git a/Resources/views/errors/404.blade.php b/Resources/views/errors/404.blade.php new file mode 100644 index 0000000..818dbca --- /dev/null +++ b/Resources/views/errors/404.blade.php @@ -0,0 +1,89 @@ + + + + + + Metronic - the world's #1 selling Bootstrap Admin Theme Ecosystem for HTML, Vue, React, Angular & Laravel by Keenthemes + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ +
+ +
+
+ +

System Error

+ + +
Terjadi kesalahan ! Coba beberapa saat lagi.
+ + +
+ + +
+ + +
+ Kembali Ke Halaman Utama +
+ +
+
+ +
+ +
+ +
+ + + + + + + + + + + diff --git a/Routes/web.php b/Routes/web.php index 8ae6f6d..a7dbf98 100644 --- a/Routes/web.php +++ b/Routes/web.php @@ -38,5 +38,7 @@ Route::group(['middleware' => ['auth', 'verified']], function () { Route::post('konfirmasibank/editSigner','KonfirmasiBankController@editSigner')->name('konfirmasibank.editSigner'); Route::post('konfirmasibank/updateSigner','KonfirmasiBankController@updateSigner')->name('konfirmasibank.updateSigner'); Route::post('konfirmasibank/destroySigner','KonfirmasiBankController@destroySigner')->name('konfirmasibank.destroySigner'); + Route::get('konfirmasibank/timeout', 'KonfirmasiBankController@timeout')->name('konfirmasibank.timeout'); + Route::post('konfirmasibank/error','KonfirmasiBankController@error')->name('konfirmasibank.error'); -}); +}); \ No newline at end of file