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

Merge branch 'last-mile-integration' into 'development'

Browse Source 
update final touch up for last delivery integration

See merge request CIEFWorldwideSdnBhd/shipping-portal!127
This commit is contained in:
omair saleh
2022-04-07 13:28:33 +00:00
parent 908c547ddc 4a1905abde
commit f5a0e9cd07
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Orders/Services/ChecksIfOrderNumberExists.php
+1 -1
View File
@@ -21,7 +21,7 @@ class ChecksIfOrderNumberExists
$this->repository = $repository;
}
public function execute(int $orderNumber): bool {
public function execute(string $orderNumber): bool {
return $this->repository->where('reference', $orderNumber)->exists();
}
resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue
+2 -2
View File
@@ -30,6 +30,7 @@
<th class="col-auto pointer align-items-center" @click="chooseAllOrder()" v-if="$store.getters.isAdmin || $store.getters.getCompanyModuleType === 8">
<i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selectAllOrder, 'fa-check-square': selectAllOrder}" ></i>
</th>
<th scope="col">Created Date</th>
<th scope="col">Order Number</th>
<th scope="col">Marking</th>
<th scope="col">Service Type</th>
@@ -43,7 +44,6 @@
<th scope="col">Receiver Name</th>
<th scope="col">Receiver Address</th>
<th scope="col">Receiver Phone</th>
<th scope="col">Created Date</th>
</tr>
</thead>
<tbody>
@@ -51,6 +51,7 @@
<td class="col-auto pointer align-items-center" @click="selectOrder(data.id)" v-if="$store.getters.isAdmin || $store.getters.getCompanyModuleType === 8">
<i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selectedOrderId.includes(data.id), 'fa-check-square': selectedOrderId.includes(data.id), 'text-complete': selectedOrderId.includes(data.id)}" ></i>
</td>
<td>{{data.created_at}}</td>
<td class="parentContainer">
{{data.reference}}
<a :href="'https://www.tracking.my/lineclear/'+data.reference" target="_blank"><div class="btn btn-xs btn-success m-l-10">Track <i class="fa fa-angle-right m-l-5"></i></div></a>
@@ -71,7 +72,6 @@
<td>{{data.delivery_address.contact.reference}}</td>
<td>{{data.delivery_address.street_one+' '+(data.delivery_address.street_two ? data.delivery_address.street_two : '')+', '+ data.delivery_address.district.name+', '+data.delivery_address.post_code+' '+data.delivery_address.state.name+', '+data.delivery_address.country.name}}</td>
<td>{{data.delivery_address.contact.phone}}</td>
<td>{{data.created_at}}</td>
</tr>
<tr v-if="$store.getters.getListData(section).length === 0">
<td colspan="100%" class="text-center">No data available in table</td>