cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-09-01 02:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source
This commit is contained in:
edmondlang
2023-11-09 10:21:22 +08:00
parent 4630133ba1 6fe1ca3e0e
commit 960f0b71a4
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
+10 -1
View File
@@ -10,13 +10,14 @@ use App\Classes\Modules\Transactions\Services\DeletesTransaction;
use App\Classes\Modules\Documents\Services\DeletesDocument;
use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionWithInvoiceNoProcessor;
use Illuminate\Support\Str;
use App\Classes\ValueObjects\Constants\DocumentType;
use App\Http\Resources\BookingResource;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Transaction;
use Illuminate\Support\Carbon;
class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
@@ -121,6 +122,14 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
$currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . (string)(Carbon::now()->timestamp);
$currentInvoice->save();
$transactionWithSameBillNo = Transaction::where('bill_no', $firstBillNo)->withTrashed()->get();
if ($transactionWithSameBillNo) {
foreach ($transactionWithSameBillNo as $transaction) {
$transaction->bill_no = $transaction->bill_no . "-deleted-" . Str::random(10);
$transaction->save();
}
}
$transaction = $booking->transactions()->whereIn('type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->get();
foreach ($transaction as $key => $row) {
$this->deletesTransaction->execute($row);
routes/web.php
+2 -1
View File
@@ -807,6 +807,7 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
Log::channel('regenerateInvoice')->info('Counter ' . $processed_invoice);
dump('Counter ' . $processed_invoice);
dump('Marking ' . $booking->marking);
$processed_invoice += 1;
$booking->status = ApprovalStatus::APPROVED;
@@ -829,7 +830,7 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
$currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . Str::random(10);
$currentInvoice->save();
$transactionWithSameBillNo = Transaction::where('bill_no', $firstBillNo)->get();
$transactionWithSameBillNo = Transaction::where('bill_no', $firstBillNo)->withTrashed()->get();
if ($transactionWithSameBillNo) {
foreach ($transactionWithSameBillNo as $transaction) {
$transaction->bill_no = $transaction->bill_no . "-deleted-" . Str::random(10);