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

Fixed: AM/PM showing twice in the date issue (#897) #907

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Fixed: AM/PM showing twice in the date issue (#897) #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/components/GiftCardActivationModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default defineComponent({
}
},
getCreatedDateTime() {
return DateTime.fromMillis(this.item.gcInfo.fulfillmentDate).toFormat("dd MMMM yyyy t a ZZZZ");
return DateTime.fromMillis(this.item.gcInfo.fulfillmentDate).toFormat("dd MMMM yyyy hh:mm a ZZZZ");
}
},
setup() {
Expand Down
4 changes: 2 additions & 2 deletions src/views/Completed.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<div class="order-primary-info">
<ion-label>
<strong>{{ order.customerName }}</strong>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>

Expand All @@ -64,7 +64,7 @@
<div class="order-metadata">
<ion-label>
{{ order.shipmentMethodTypeDesc }}
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
<p v-if="order.trackingCode">{{ translate("Tracking Code") }} {{ order.trackingCode }}</p>
</ion-label>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/views/InProgress.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<div class="order-primary-info">
<ion-label>
<strong>{{ order.customerName }}</strong>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>

Expand All @@ -67,7 +67,7 @@
<div class="order-metadata">
<ion-label>
{{ order.shipmentMethodTypeDesc }}
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/views/OpenOrders.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<div class="order-primary-info">
<ion-label>
<strong>{{ order.customerName }}</strong>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>

Expand All @@ -59,7 +59,7 @@
<div class="order-metadata">
<ion-label>
{{ order.shipmentMethodTypeDesc }}
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/views/OrderDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div class="order-primary-info">
<ion-label>
<strong>{{ order.customerName }}</strong>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>
<div class="order-tags">
Expand All @@ -49,7 +49,7 @@
<div class="order-metadata">
<ion-label>
{{ order.shipmentMethodTypeDesc }}
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>
</div>
Expand Down Expand Up @@ -1613,7 +1613,7 @@ export default defineComponent({
return isMessageRequired ? translate(message, { message: this.orderInvoicingInfo.response.Message }) : translate(message);
},
getInvoicingConfirmationDate(date: any) {
return DateTime.fromMillis(date).setZone(this.userProfile.userTimeZone).toFormat('dd MMMM yyyy t a ZZZZ')
return DateTime.fromMillis(date).setZone(this.userProfile.userTimeZone).toFormat('dd MMMM yyyy hh:mm a ZZZZ')
},
async printPackingSlip(order: any) {
// if the request to print packing slip is not yet completed, then clicking multiple times on the button
Expand Down
6 changes: 3 additions & 3 deletions src/views/Rejections.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<div class="order-primary-info">
<ion-label>
<strong>{{ order.customerName }}</strong>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>

Expand All @@ -106,7 +106,7 @@
<div class="order-metadata">
<ion-label>
{{ order.shipmentMethod }}
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}</p>
<p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy hh:mm a ZZZZ') }}</p>
</ion-label>
</div>
</div>
Expand All @@ -123,7 +123,7 @@
</ion-item>
</div>
<ion-label>
{{ formatUtcDate(item.rejectedAt, 'dd MMMM yyyy t a ZZZZ')}}
{{ formatUtcDate(item.rejectedAt, 'dd MMMM yyyy hh:mm a ZZZZ')}}
<p>{{ translate('rejected time') }}</p>
</ion-label>
<ion-label lines="none">
Expand Down
Loading