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

Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/production

Browse Source
This commit is contained in:
Dillon Ngo
2025-09-02 05:19:39 +08:00
parent 2edd44a218 d5e008d4f3
commit 4db8b24b22
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php
+5 -6
View File
@@ -75,12 +75,11 @@ class ApproveShippingInvoiceTransactionProcessor
$this->createSalesOrderDocProcessor->execute($invoice_transaction);
$this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
//cief todo: 90 - to determine if sending email is necessary
// if(app()->environment(['production'])) {
// $companyModule = $packingList->owner->companyModule;
// $user = $companyModule->employees()->first();
// $user->notify(new InvoiceIssuedEmail($user, $packingList));
// }
if(app()->environment(['production']) && $companyModule->company->e_invoice === 0) { //invoice issued email is only send to customer who has not opted in E-Invoice
$companyModule = $packingList->owner->companyModule;
$user = $companyModule->employees()->first();
$user->notify(new InvoiceIssuedEmail($user, $packingList));
}
$order = $packingList->owner()->first();
if($order instanceof Order){
resources/assets/vue/components/paymentsBilling/elements/SingleAdminPaymentsBillingWithStorageComponent.vue
+3
View File
@@ -75,6 +75,9 @@
</div>
<div class="row">
<div class="col">
<!-- <div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval', 'Pending Payment'].includes(invoice_status)">
<i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
</div> -->
<div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval'].includes(invoice_status)">
<i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
</div>
resources/assets/vue/components/paymentsBilling/elements/SingleAdminPaymentsBillingWithoutStorageComponent.vue
+3
View File
@@ -75,6 +75,9 @@
</div>
<div class="row">
<div class="col">
<!-- <div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval', 'Pending Payment'].includes(invoice_status)">
<i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
</div> -->
<div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval'].includes(invoice_status)">
<i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
</div>