Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved: removed the generate label button from the shipment card for in-progress orders (#751) #755

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Improved: removed the generate label button from the shipment card for in-progress orders (#751) #755

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a907d15
Improved: removed the generate label button from the shipment card fo…
amansinghbais Sep 12, 2024
352208f
Reverted: showing error message in shipping label generation in inpro…
amansinghbais Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/views/OrderDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,15 @@
</template>
</ion-item>
<template v-if="order.missingLabelImage">
<ion-button :disabled="!shipmentMethodTypeId" fill="outline" expand="block" class="ion-margin" @click.stop="regenerateShippingLabel(order)">
{{ shipmentLabelErrorMessages ? translate("Retry Label") : translate("Generate Label") }}
<ion-spinner color="primary" slot="end" data-spinner-size="medium" v-if="order.isGeneratingShippingLabel" name="crescent" />
</ion-button>
<ion-button :disabled="!shipmentMethodTypeId || !carrierPartyId" fill="clear" expand="block" color="medium" @click="openTrackingCodeModal()">
{{ translate("Add tracking code manually") }}
</ion-button>
<template v-if="category === 'completed'">
<ion-button :disabled="!shipmentMethodTypeId" fill="outline" expand="block" class="ion-margin" @click.stop="regenerateShippingLabel(order)">
{{ shipmentLabelErrorMessages ? translate("Retry Label") : translate("Generate Label") }}
<ion-spinner color="primary" slot="end" data-spinner-size="medium" v-if="order.isGeneratingShippingLabel" name="crescent" />
</ion-button>
<ion-button :disabled="!shipmentMethodTypeId || !carrierPartyId" fill="clear" expand="block" color="medium" @click="openTrackingCodeModal()">
{{ translate("Add tracking code manually") }}
</ion-button>
</template>
<ion-item lines="none" v-if="shipmentLabelErrorMessages">
<ion-label class="ion-text-wrap">
{{ shipmentLabelErrorMessages }}
Expand Down
Loading