Skip to content

Commit

Permalink
Merge pull request #938 from priyanshee1604/#891
Browse files Browse the repository at this point in the history
Fixed: String for no tracking URL.(#891)
  • Loading branch information
ymaheshwari1 authored Feb 11, 2025
2 parents dee649a + cdb1dab commit dbcc674
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/components/GenerateTrackingCodeModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<ion-input :label="translate('Tracking code')" :placeholder="translate('enter code')" v-model="trackingCode" />
</ion-item>
<ion-item>
<ion-label>{{ translate("Tracking URL:", { trackingUrl: generateTrackingUrl() }) }}</ion-label>
<ion-label>{{ generateTrackingUrl() }}</ion-label>
<ion-button slot="end" fill="clear" size="default" :disabled="!trackingCode.trim() || !getCarrierTrackingUrl()" @click="redirectToTrackingUrl()">
{{ translate("Test") }}
<ion-icon :icon="openOutline" slot="end" />
Expand Down Expand Up @@ -237,7 +237,7 @@ export default defineComponent({
},
generateTrackingUrl() {
if(this.getCarrierTrackingUrl()) {
return this.getCarrierTrackingUrl()?.replace("${trackingNumber}", this.trackingCode)
return translate("Tracking URL:", { trackingUrl: this.getCarrierTrackingUrl()?.replace("${trackingNumber}", this.trackingCode) })
}
return translate("A tracking URL not configured for", { carrierName: this.getCarrierName() })
},
Expand Down

0 comments on commit dbcc674

Please sign in to comment.