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

Updated: the order label to Order from Shopify order(#1ye5r94) #41

Merged
merged 2 commits into from
Jan 12, 2022
Merged

Updated: the order label to Order from Shopify order(#1ye5r94) #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
149e082
Added: changelog entry file(#1ye5r94)
ymaheshwari1 Jan 12, 2022
90e5c49
Updated: the order label to Order from Shopify order(#1ye5r94)
ymaheshwari1 Jan 12, 2022
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
6 changes: 6 additions & 0 deletions changelogs/unreleased/-1ye5r94.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: 'Added: some minor improvements in the UI'
ticket_id: "#1ye5r94"
merge_request: 40
author: Yash Maheshwari
type: changed
2 changes: 1 addition & 1 deletion src/components/OrderItemCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ion-item lines="none">
<ion-label>
<h1>{{ order.customerName }}</h1>
<p>{{ $t('Shopify order') }}: {{ $filters.getOrderIdentificationId(order.orderIdentifications, orderIdentificationTypeId) }}</p>
<p>{{ $t('Order') }}: {{ $filters.getOrderIdentificationId(order.orderIdentifications, orderIdentificationTypeId) }}</p>
</ion-label>
<ion-badge v-if="order.orderDate" color="dark" slot="end">{{ moment.utc(order.orderDate).fromNow() }}</ion-badge>
<slot name="packedTime">
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"No reason": "No reason",
"Open": "Open",
"OMS": "OMS",
"Order": "Order",
"Order delivered to": "Order delivered to { customerName }",
"Order details": "Order details",
"Order packed and ready for delivery": "Order packed and ready for delivery",
Expand All @@ -42,7 +43,6 @@
"Settings": "Settings",
"Ship": "Ship",
"Shop": "Shop",
"Shopify order": "Shopify order",
"Size": "Size",
"Something went wrong": "Something went wrong",
"Store": "Store",
Expand Down
2 changes: 1 addition & 1 deletion src/views/OrderDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ion-item lines="none">
<ion-label>
<h2>{{ order.customerName }}</h2>
<p>{{ $t('Shopify order') }}: {{ $filters.getOrderIdentificationId(order.orderIdentifications, orderIdentificationTypeId) }}</p>
<p>{{ $t('Order') }}: {{ $filters.getOrderIdentificationId(order.orderIdentifications, orderIdentificationTypeId) }}</p>
</ion-label>
<ion-badge v-if="order.orderDate" color="dark" slot="end">{{ moment.utc(order.orderDate).fromNow() }}</ion-badge>
</ion-item>
Expand Down