Skip to content

Commit

Permalink
Improved: picker check for packed orders (#284)
Browse files Browse the repository at this point in the history
  • Loading branch information
amansinghbais committed Nov 1, 2023
1 parent 376e047 commit 83a91ad
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/views/OrderDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ion-button v-if="orderType === 'open'" class="ion-hide-md-up" :disabled="!hasPermission(Actions.APP_ORDER_UPDATE) || order.readyToHandover || order.rejected" @click="rejectOrder()">
<ion-icon slot="icon-only" color="danger" :icon="bagRemoveOutline" />
</ion-button>
<ion-button v-if="orderType === 'packed' && showPackingSlip" :class="order.part.shipmentMethodEnum.shipmentMethodEnumId !== 'STOREPICKUP' ? 'ion-hide-md-up' : ''" :disabled="!hasPermission(Actions.APP_ORDER_UPDATE) || order.handovered || order.shipped" @click="order.part.shipmentMethodEnum.shipmentMethodEnumId === 'STOREPICKUP' ? printPackingSlip(order) : printShippingLabelAndPackingSlip(order)">
<ion-button v-else-if="orderType === 'packed' && showPackingSlip" :class="order.part.shipmentMethodEnum.shipmentMethodEnumId !== 'STOREPICKUP' ? 'ion-hide-md-up' : ''" :disabled="!hasPermission(Actions.APP_ORDER_UPDATE) || order.handovered || order.shipped" @click="order.part.shipmentMethodEnum.shipmentMethodEnumId === 'STOREPICKUP' ? printPackingSlip(order) : printShippingLabelAndPackingSlip(order)">
<ion-icon slot="icon-only" :icon="printOutline" />
</ion-button>
</ion-buttons>
Expand Down Expand Up @@ -66,7 +66,7 @@
<p>{{ order.shippingInstructions }}</p>
</ion-label>
</ion-item>
<ion-item v-if="orderType === 'packed'" lines="none">
<ion-item v-if="orderType === 'packed' && order.pickers" lines="none">
<ion-label class="ion-text-wrap">
{{ translate("Picked by", { pickers: order.pickers }) }}
</ion-label>
Expand Down

0 comments on commit 83a91ad

Please sign in to comment.