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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Omair Saleh
2023-01-24 04:18:20 +08:00
parent 17b76dc8e3 ed937b15ff
commit bbc3d51b6c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+4 -1
View File
@@ -270,7 +270,7 @@
</div>
</div>
</div>
<purchase-order-form-component v-if="booking.service.id !== 4 || $store.getters.isAdmin || [199, 510].includes($store.getters.getCompanyId)" :data="booking" :section="section"></purchase-order-form-component>
<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>
</div>
</div>
<div class="row m-t-15" v-if="booking.status === 3 && $store.getters.isSuperAdmin">
@@ -467,6 +467,9 @@
});
return complete;
},
companySegmentIds() {
return this.booking.company.segments.map(obj => parseInt(obj.id));
}
},
watch: {
resources/views/pages/settings.blade.php
+2 -2
View File
@@ -31,7 +31,7 @@
</div>
</div>
</div>
<div class="row m-b-5">
<div class="row m-b-5" v-if="$store.getters.isAdmin">
<div class="col">
<div class="row">
<div class="col">
@@ -245,7 +245,7 @@
</div>
</div>
</div>
<div class="row tabsContainer hide tabContent" tab-name="labelSegment">
<div class="row tabsContainer hide tabContent" tab-name="labelSegment" v-if="$store.getters.isAdmin">
<div class="col">
<loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('labelSection')"></loading-component>
<div class="row" v-show="!$store.getters.isLoading('labelSection')">