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 remote-tracking branch 'origin/last-mile-integration' into last-mile-integration

Browse Source 
# Conflicts:
#	resources/views/pages/delivery/admin.blade.php
This commit is contained in:
omair saleh
2022-04-04 19:41:43 +08:00
parent f96fef94fe ab141ae160
commit aef9b82918
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/pages/delivery/admin.blade.php
+28 -1
View File
@@ -1,8 +1,35 @@
<div class="row d-none" :class="[{'d-flex': $store.getters.getCompanyModuleType === 8}]" v-if="$store.getters.getCompanyModuleType === 8">
<div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
<div class="col">
<div class="row">
<div class="col">
<delivery-orders-table-section-component></delivery-orders-table-section-component>
<div class="col-12">
<div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
<div class="col no-padding">
<h6>Orders List</h6>
</div>
</div>
<div class="row m-l-0 m-r-0">
<div class="col">
<delivery-orders-table-section-component></delivery-orders-table-section-component>
</div>
</div>
</div>
<div class="col-6">
<div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
<div class="col no-padding">
<h6>Customers List</h6>
</div>
</div>
<div class="row m-l-0 m-r-0">
<div class="col">
<list-component key="2" section="customerListSection" :endpoint="route('api.company.list')" :options="{'has_business_module_type': 7}">
<template slot="list" slot-scope="{data}">
<company-component :data="data"></company-component>
</template>
</list-component>
</div>
</div>
</div>
</div>
</div>