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

Merge branch 'dillon/34.8a-enhancement' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-11-16 09:17:32 +08:00
parent cd4b12a88c 922718f7c2
commit 8e0e9e1c77
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/PackingListLimitOneByTypeOrderedByInvoiceDate.php
+1
View File
@@ -23,6 +23,7 @@ class PackingListLimitOneByTypeOrderedByInvoiceDate implements Filter
$join->on('transactions.owner_id', '=', 'packing_lists.id');
$join->where('transactions.owner_type', '=', PackingList::class);
$join->where('transactions.status', '=', ApprovalStatus::APPROVED);
$join->whereNull('transactions.deleted_at');
$join->whereRaw('(transactions.type <> 16 OR transactions.id = (
SELECT id FROM transactions WHERE owner_id = packing_lists.id AND type = 16 LIMIT 1
))');
resources/assets/vue/components/companies/elements/CustomerPaymentBillingInnerComponent.vue
+2 -2
View File
@@ -73,8 +73,8 @@
</div>
<group-payment-form-component :section="section" :company_module_id="company_module_id" :selectedIds="selectedIds" :selectedShippingInvoicesOnlyIds="selectedShippingInvoicesOnlyIds" :sumAmount="parseFloat(sumAmount)" v-on:isPaymentOutdated="paymentOutdated($event)" v-if="showPaymentProceedModal"></group-payment-form-component>
<reload-confirmation-form-component
contentText="Some information has been updated, click 'Yes' to reload page"
buttonText="Yes"
contentText="Some information has been updated, please reload page to continue"
buttonText="Reload Page"
class="text-center"
:section="section"
v-if="showPaymentOutdatedModal"
resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
+2 -2
View File
@@ -198,8 +198,8 @@
</div>
<payment-form-component :data="item" :section="section" v-on:isPaymentOutdated="paymentOutdated($event)" v-if="showPaymentProceedModal"></payment-form-component>
<reload-confirmation-form-component
contentText="Some information has been updated, click 'Yes' to reload page"
buttonText="Yes"
contentText="Some information has been updated, please reload page to continue"
buttonText="Reload Page"
class="text-center"
:section="section"
v-if="showPaymentOutdatedModal"
resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingWithStorageComponent.vue
+2 -2
View File
@@ -286,8 +286,8 @@
</div>
<group-payment-form-component :section="section" :selectedIds="selectedIds" :sumAmount="parseFloat(totalOutstanding.toFixed(2))" :selectedShippingInvoicesOnlyIds="selectedShippingInvoicesOnlyIds" :showManualPayment="true" v-on:isPaymentOutdated="paymentOutdated($event)" v-if="showPaymentProceedModal"></group-payment-form-component>
<reload-confirmation-form-component
contentText="Some information has been updated, click 'Yes' to reload page"
buttonText="Yes"
contentText="Some information has been updated, please reload page to continue"
buttonText="Reload Page"
class="text-center"
:section="section"
v-if="showPaymentOutdatedModal"
resources/assets/vue/components/paymentsBilling/elements/SingleAdminPaymentsBillingWithStorageComponent.vue
+2 -2
View File
@@ -222,8 +222,8 @@
</div>
<group-payment-form-component :section="section" :selectedIds="selectedIds" :sumAmount="parseFloat(totalOutstanding.toFixed(2))" :selectedShippingInvoicesOnlyIds="selectedShippingInvoicesOnlyIds" :showManualPayment="true" v-on:isPaymentOutdated="paymentOutdated($event)" v-if="showPaymentProceedModal"></group-payment-form-component>
<reload-confirmation-form-component
contentText="Some information has been updated, click 'Yes' to reload page"
buttonText="Yes"
contentText="Some information has been updated, please reload page to continue"
buttonText="Reload Page"
class="text-center"
:section="section"
v-if="showPaymentOutdatedModal"
resources/assets/vue/components/paymentsBilling/elements/SingleAdminPaymentsBillingWithoutStorageComponent.vue
+2 -2
View File
@@ -274,8 +274,8 @@
</div>
<payment-form-component :data="item.shipping_transaction" :section="section" v-on:isPaymentOutdated="paymentOutdated($event)" v-if="showPaymentProceedModal"></payment-form-component>
<reload-confirmation-form-component
contentText="Some information has been updated, click 'Yes' to reload page"
buttonText="Yes"
contentText="Some information has been updated, please reload page to continue"
buttonText="Reload Page"
class="text-center"
:section="section"
v-if="showPaymentOutdatedModal"