-
+
@@ -93,6 +97,10 @@
// required: true
default: 0
},
+ name:{
+ type: String,
+ default: ""
+ },
},
data(){
return {
@@ -102,6 +110,7 @@
quantity: 0,
price: 0,
amount: 0,
+ reference: 'CUSTOM_CHARGES',
},
products: []
}
@@ -113,6 +122,12 @@
price: { required },
}
},
+ mounted() {
+ if(this.name){
+ this.product.name = this.name;
+ this.product.reference = 'PAY_ON_BEHALF';
+ }
+ },
created() {
if (this.data) {
this.product = this.data;
@@ -136,7 +151,7 @@
this.$emit('add', {
name: this.product.name,
quantity: this.product.quantity,
- reference: 'CUSTOM_CHARGES',
+ reference: this.product.reference,
price: parseFloat((this.product.price).toString().replace(',', '')),
amount: this.productTotal
});
diff --git a/resources/assets/vue/components/paymentsBilling/forms/InvoiceItemsFormComponent.vue b/resources/assets/vue/components/paymentsBilling/forms/InvoiceItemsFormComponent.vue
index 5153c14a..a0806e4d 100644
--- a/resources/assets/vue/components/paymentsBilling/forms/InvoiceItemsFormComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/forms/InvoiceItemsFormComponent.vue
@@ -15,13 +15,14 @@
@@ -44,6 +45,7 @@
parameters: {
transaction_details: []
},
+ addChargesName: ''
}
},
methods: {
diff --git a/resources/views/pages/pdfs/shipping_invoice_sst.blade.php b/resources/views/pages/pdfs/shipping_invoice_sst.blade.php
new file mode 100644
index 00000000..5e08aea2
--- /dev/null
+++ b/resources/views/pages/pdfs/shipping_invoice_sst.blade.php
@@ -0,0 +1,21 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+
+
+
+
+ @include('pages.pdfs.shipping_invoice_sst_inner', ['invoice_transaction' => $invoice_transaction])
+
+
+
+
+
+@endsection
diff --git a/resources/views/pages/pdfs/shipping_invoice_sst_inner.blade.php b/resources/views/pages/pdfs/shipping_invoice_sst_inner.blade.php
new file mode 100644
index 00000000..eadd5f87
--- /dev/null
+++ b/resources/views/pages/pdfs/shipping_invoice_sst_inner.blade.php
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/pages/pdfs/shipping_invoices_sst_combined.blade.php b/resources/views/pages/pdfs/shipping_invoices_sst_combined.blade.php
new file mode 100644
index 00000000..f7cff168
--- /dev/null
+++ b/resources/views/pages/pdfs/shipping_invoices_sst_combined.blade.php
@@ -0,0 +1,163 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+ @php
+ $grandTotal = 0;
+ $grandTotalTax = 0;
+ $grandSubTotal = 0;
+ @endphp
+
+
+
+
+
+
+
+
+
+
+ @foreach ($invoice_transactions as $transaction)
+
+
+
+
+@endsection
diff --git a/routes/web.php b/routes/web.php
index da9575b8..c95a958d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -802,7 +802,14 @@ Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
$invoice->documents()->delete();
- $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+ $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]);
$document_object = new DocumentObject(
DocumentType::SHIPPING_INVOICE,
@@ -828,8 +835,16 @@ 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
- $pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoices_combined', ['invoice_transactions' => $transactions]);
+ $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]);
return $pdf->download('combined_invoice_.pdf');
})->name('invoice.combined_summary');
@@ -1255,7 +1270,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)
+
+ Name
+{{product.name}}
+
-
-
{{ addCharges? 'Cancel' : 'Add Charges' }}
+ {{ addCharges? 'Cancel' : 'Add \'Pay On Behalf \' Charges' }}
+ {{ addCharges? 'Cancel' : 'Add Charges' }}
Save Change
+
+
{{ $invoice_transaction->bill_no }}
+ | SST This is generated by computer. No signature required. | +Page {PAGENO} of {nbpg} | +
+  }})
+ |
+
+
+
+ CIEF WORLDWIDE SDN BHD
+
+
+ (1134596-M) + No. 72-3, Jalan Jalil 1, + The Earth Bukit Jalil, + 57000 Kuala Lumpur + Tel: 03-8082 1252 + SST No: W10-2403-32000643 + |
+
+
+
+ Invoice
+
+
+
+ Invoice No: {{ $invoice_transaction->bill_no }}
+
+ @php
+ $companyModule = $invoice_transaction->owner->owner->companyModule;
+ @endphp
+
+ Date: {{ $invoice_transaction->created_at }}
+ Order No: {{ $invoice_transaction->owner->owner->reference }}
+ Container Ref: {{ $invoice_transaction->owner->containers()->first()->reference }}
+ {{--{{ $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference }} --}}
+ |
+
| + + Bill To + + | +||
|
+
+ {{ $companyModule->name }}
+
+
+ @php
+ $addresses = $companyModule->addresses()->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
+ @endphp
+ @if($addresses)
+ {{ $addresses->street_one }}
+ {{ $addresses->street_two }} ,
+ {{ $addresses->district()->first()->name }},
+ {{ $addresses->postcode }}
+ {{ $addresses->state()->first()->name }},
+ {{ $addresses->country()->first()->name }}
+ @endif
+
+
+ @php
+ $contact = $companyModule->contacts()->first();
+ @endphp
+ Phone: {{ $contact ? $contact->phone : '' }}
+
+ |
+ ||
+
+
| No | +Description | +Qty | +Unit Price (RM) |
+ Tax (%) | +Tax Amount (RM) |
+ Sub Total (RM) |
+
|---|---|---|---|---|---|---|
| {{ $key + 1 }} | +{!! $transaction_detail->name !!} | +{{ round($transaction_detail->quantity, 3) }} | ++ {{ round($transaction_detail->price, 2) }} + | ++ {{ round($transaction_detail->tax_percentage, 2) }} + | ++ {{ number_format(round($transaction_detail->tax_amount, 2), 2) }} + | ++ {{ number_format(round($transaction_detail->amount, 2), 2) }} + | +
| + | Subtotal | ++ {{ number_format(round($invoice_transaction->amount - $invoice_transaction->tax, 2), 2) }} + | +||||
| + | Service Charges | ++ {{ number_format(round($invoice_transaction->service_charge, 2), 2) }} + | +||||
| + | Total SST (6%) RM | +{{ number_format($invoice_transaction->tax, 2) }} | +||||
| + | Total Amount RM | ++ {{ number_format(round($invoice_transaction->amount, 2), 2) }} + | +||||
|
+
+ |
+
+
+
+ CIEF WORLDWIDE SDN BHD
+
+
+ (1134596-M) + No. 72-3, Jalan Jalil 1, + The Earth Bukit Jalil, + 57000 Kuala Lumpur + Tel: 03-8082 1252 + SST No: W10-2403-32000643 + |
+
+
+
+ Summary
+
+
+
+ @php
+ $companyModule = $invoice_transactions[0]->owner->owner->companyModule;
+ @endphp
+
+ {{-- Date: {{ $invoice_transactions[0]->created_at }} --}}
+ Date: {{ \Carbon\Carbon::now() }}
+ |
+
| + + Bill To + + | +||
|
+
+ {{ $companyModule->name }}
+
+
+ @php
+ $addresses = $companyModule->addresses()->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
+ @endphp
+ {{ $addresses->street_one }}
+ {{ $addresses->street_two }} ,
+ {{ $addresses->district()->first()->name }},
+ {{ $addresses->postcode }}
+ {{ $addresses->state()->first()->name }},
+ {{ $addresses->country()->first()->name }}
+
+
+ @php
+ $contact = $companyModule->contacts()->first();
+ @endphp
+ Phone: {{ $contact ? $contact->phone : '' }}
+
+ |
+ ||
+
+
| No | +Invoice No | +Description | +Qty | +Unit Price (RM) |
+ Tax (%) | +Tax Amount (RM) |
+ Sub Total (RM) |
+
|---|---|---|---|---|---|---|---|
| {{ $key + 1 }} | +{{ $invoice_transaction->bill_no }} | +{!! $transaction_detail->name !!} | +{{ round($transaction_detail->quantity, 3) }} | ++ {{ round($transaction_detail->price, 2) }} + | ++ {{ round($transaction_detail->tax_percentage, 2) }} + | ++ {{ number_format(round($transaction_detail->tax_amount, 2), 2) }} + | ++ {{ round($transaction_detail->amount, 2) }} + | +
| + | Total Taxable Amount | ++ {{ round($grandSubTotal, 2) }} + | +|||||
| + | Total SST (6%) RM | ++ {{ round($grandTotalTax, 2) }} + | +|||||
| + | Total Amount RM | ++ {{ round($grandTotal, 2) }} + + | +|||||
| This is generated by computer. No signature required. | +Page {PAGENO} of {nbpg} | +