cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

1688 changes

Browse Source
This commit is contained in:
edmondlang
2024-07-08 19:07:06 +08:00
parent 28ef7fe7de
commit 726d06871b
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+2 -2
View File
@@ -320,7 +320,7 @@
account_no: '',
step:1,
promoCode:"",
oneSixEightEightIds: [4, 10],
oneSixEightEightServiceIds: [4, 10],
}
},
computed: {
@@ -328,7 +328,7 @@
return !!Object.keys(this.parameters.bankAccount).length;
},
isOneSizEightEightOrder() {
return this.oneSixEightEightIds.includes(this.data.serviceType.id);
return this.oneSixEightEightServiceIds.includes(this.data.serviceType.id);
}
},
created(){
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+6 -5
View File
@@ -219,7 +219,7 @@
</div>
<div class="row no-margin">
<div class="col bg-white padding-25">
<div class="row align-items-center m-b-10" v-if='booking.service.id === 4'>
<div class="row align-items-center m-b-10" v-if='oneSixEightEightServiceIds.includes(booking.service.id)'>
<div class="col">
<div class="row">
<div class="col-auto p-r-0">
@@ -261,7 +261,7 @@
</a>
</div>
</div>
<div class="row m-t-15" v-if="$store.getters.isAdmin && booking.service.id === 4 && booking.documents.ecommerce_purchase_order">
<div class="row m-t-15" v-if="$store.getters.isAdmin && oneSixEightEightServiceIds.includes(booking.service.id) && booking.documents.ecommerce_purchase_order">
<div class="col-sm col-md-auto">
<div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal" data-type="deletePo">Delete PO</div>
</div>
@@ -269,7 +269,7 @@
<delete-po-form-component :data="booking" :section="section" class="text-center"></delete-po-form-component>
</modal-component>
</div>
<div class="row m-b-25" v-if="$store.getters.isAdmin && booking.service.id === 4 && booking.status !== 3">
<div class="row m-b-25" v-if="$store.getters.isAdmin && oneSixEightEightServiceIds.includes(booking.service.id) && booking.status !== 3">
<div class="col">
<div class="row" v-if="!booking.documents.ecommerce_purchase_order">
<div class="col">
@@ -278,7 +278,7 @@
</div>
</div>
</div>
<purchase-order-form-component v-if="booking.service.id !== 4 || $store.getters.isAdmin || [199, 510].includes($store.getters.getCompanyId) || companySegmentIds.includes(24)" :data="booking" :section="section"></purchase-order-form-component>
<purchase-order-form-component v-if="oneSixEightEightServiceIds.includes(booking.service.id) || $store.getters.isAdmin || [199, 510].includes($store.getters.getCompanyId) || companySegmentIds.includes(24)" :data="booking" :section="section"></purchase-order-form-component>
</div>
</div>
<div class="row m-t-15" v-if="booking.status === 3 && $store.getters.isSuperAdmin || ($store.getters.isCustomer && $store.getters.getCompanyId === 199)">
@@ -492,7 +492,8 @@
isLoading: true,
booking: null,
attention: false,
bearShowing: false
bearShowing: false,
oneSixEightEightServiceIds: [4, 10],
}
},
computed: {