cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 05:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/90-e-invoice-e-2' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-09-13 13:40:45 +08:00
parent 191b7bc8d3 981ebfb4a3
commit d878a9d026
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
+1 -1
View File
@@ -100,7 +100,7 @@ class CreateInvoiceTransactionV2Processor
$bookingOriginalStatus = $options['bookingOriginalStatus'] ?? ApprovalStatus::COMPLETED;
if($generateEInvoiceRefund){
$generateEInvoice = true; //cief todo: 90 - cannot have 2 flags doing the same thing
$generateEInvoice = true; //With or without refund, these 2 flags are meant to Generate E-Invoice, so cannot have opposite indicator
}
if ($booking->status === ApprovalStatus::COMPLETED && !$generateEInvoiceRefund) {
app/Http/Kernel.php
+1 -1
View File
@@ -80,6 +80,6 @@ class Kernel extends HttpKernel
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'valid.token' => ValidateToken::class,
'token.check' => \App\Http\Middleware\TokenCheckerMiddleware::class,
'admin' => \App\Http\Middleware\EnsureUserIsAdmin::class, //cief todo: 90 - maintenance
'admin' => \App\Http\Middleware\EnsureUserIsAdmin::class, //cief maintenance
];
}
resources/assets/vue/general/mixins/request.js
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ export default {
let statusCode = response.status,
success = response.ok;
// console.log('statusCode: ' + statusCode); //cief todo: 90 - maintenance
// console.log('statusCode: ' + statusCode); //cief maintenance
if(statusCode == 503){
window.location.href = '/maintenance';
}
routes/api.php
+1 -1
View File
@@ -26,7 +26,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
Route::post('online_payment/callback', 'Billplz\CallbackBillplzController@callback')->name('online_payment.callback');
Route::group(['middleware' => 'valid.token'], function () {
Route::group(['middleware' => 'admin'], function () { //cief todo: 90 - maintenance
Route::group(['middleware' => 'admin'], function () { //cief maintenance
Route::get('/storage/{fileName}/fetch', 'Documents\RenderDocumentController@fileStorageServe')->where(['fileName' => '.*'])->name('storage.document.file');
Route::post('/import/update-debtor/f614e339d7058904a831aad742e24d55', 'Imports\ImportUpdateDebtorController@import')->name('debtor.import');