cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'dillon/58-shipping-portal-sst' into 'master'"

Browse Source 
This reverts commit 7cd376a9b5, reversing
changes made to 6176135f85.
This commit is contained in:
Omair Saleh
2024-04-16 13:21:07 +08:00
parent d129f8f6bd
commit a49920973e
30 changed files with 402 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/web.php
+3 -18
View File
@@ -802,14 +802,7 @@ Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
$invoice->documents()->delete();
$view = 'pages.pdfs.shipping_invoice';
$dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
$shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
$view = 'pages.pdfs.shipping_invoice_sst';
}
$transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice]);
$transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
$document_object = new DocumentObject(
DocumentType::SHIPPING_INVOICE,
@@ -835,16 +828,8 @@ Route::get('/invoices/combine/{ids}', function($ids){
$ids = json_decode($ids);
$transactions = Transaction::whereIn('id', $ids)->get();
$invoice = $transactions[0]; //NOTE: invoices that need to be combined need to be seperated before and after SST implementation
$view = 'pages.pdfs.shipping_invoices_combined';
$dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
$shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
$view = 'pages.pdfs.shipping_invoices_sst_combined';
}
$pdf = LaravelMpdf::loadView($view, ['invoice_transactions' => $transactions]);
$pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoices_combined', ['invoice_transactions' => $transactions]);
return $pdf->download('combined_invoice_.pdf');
})->name('invoice.combined_summary');
@@ -1270,7 +1255,7 @@ Route::get('/payment-and-billing-2', function () {
})->name('admin.payment-and-billing-2');
Route::get('/show-all-extra-payments', function () {
ini_set('memory_limit', '-1');
ini_set('memory_limit', '-1');
$invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)
->where('status', ApprovalStatus::COMPLETED)