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.

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: locale file to include payment status entry(#410) #414

Merged
merged 2 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"Address 2": "Address 2",
"Apply": "Apply",
"Authenticating": "Authenticating",
"Authorized": "Authorized",
"Are you sure you want to change the time zone to?": "Are you sure you want to change the time zone to?",
"Are you sure you want to delete this CSV mapping? This action cannot be undone.": "Are you sure you want to delete this CSV mapping? This action cannot be undone.",
"Are you sure you want to update this CSV mapping? This action cannot be undone.": "Are you sure you want to update this CSV mapping? This action cannot be undone.",
Expand All @@ -31,12 +32,16 @@
"Box added successfully": "Box added successfully",
"Boxes": "Boxes",
"Cancel": "Cancel",
"Cancelled": "Cancelled",
"Cash": "Cash",
"Cash On Delivery": "Cash On Delivery",
"Click the backdrop to dismiss.": "Click the backdrop to dismiss.",
"Change": "Change",
"Changes to the CSV mapping has been saved.": "Changes to the CSV mapping has been saved.",
"Check stock": "Check stock",
"Choose language": "Choose language",
"City": "City",
"Credit Card": "Credit Card",
"COD Fee": "COD Fee",
"COD Fee Tax": "COD Fee Tax",
"Completed": "Completed",
Expand All @@ -55,6 +60,8 @@
"Customer letter": "Customer letter",
"Customer Name": "Customer Name",
"Damaged": "Damaged",
"Debit Card": "Debit Card",
"Declined": "Declined",
"Define custom label for": "Define custom label for {field}",
"Dismiss": "Dismiss",
"Delete": "Delete",
Expand All @@ -80,6 +87,7 @@
"Export Orders": "Export Orders",
"Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.",
"Export packed orders": "Export packed orders",
"Ext Other Gateways": "Ext Other Gateways",
"Facility": "Facility",
"Facility Address 1": "Facility Address 1",
"Facility Address 2": "Facility Address 2",
Expand Down Expand Up @@ -162,6 +170,8 @@
"No results found for . Try searching In Progress or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "No results found for { searchedQuery }. Try searching In Progress or Completed tab instead.{ lineBreak } If you still can't find what you're looking for, try switching stores.",
"No time zone found": "No time zone found",
"Not in Stock": "Not in Stock",
"Not-Authorized": "Not-Authorized",
"Not-Received": "Not-Received",
"No Capacity": "No Capacity",
"No packed shipments to ship for these orders": "No packed shipments to ship for these orders",
"order": "order",
Expand Down Expand Up @@ -225,6 +235,8 @@
"Quantity": "Quantity",
"Reason:": "Reason:",
"Ready to pack": "Ready to pack",
"Received": "Received",
"Refunded": "Refunded",
"Reject": "Reject",
"Reject all": "Reject all",
"Reject all in progress orders": "Reject all in progress orders",
Expand Down Expand Up @@ -265,6 +277,7 @@
"Selected Fields: ": "Selected Fields: ",
"Sell inventory online": "Sell inventory online",
"Sell online": "Sell online",
"Settled": "Settled",
"Setting fulfillment capacity to 0 disables new order from being allocated to this facility. Leave this empty if this facility's fulfillment capacity is unrestricted.": "Setting fulfillment capacity to 0 disables new order from being allocated to this facility. Leave this empty if this facility's fulfillment capacity is unrestricted.",
"Settings": "Settings",
"Set Limit": "Set Limit",
Expand Down
13 changes: 13 additions & 0 deletions src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"Address 2": "Dirección 2",
"Apply": "Aplicar",
"Authenticating": "Autenticando",
"Authorized": "Authorized",
"Are you sure you want to change the time zone to?": "¿Estás seguro/a de que quieres cambiar la zona horaria a?",
"Are you sure you want to delete this CSV mapping? This action cannot be undone.": "¿Estás seguro/a de que quieres eliminar este mapeo CSV? Esta acción no se puede deshacer.",
"Are you sure you want to update this CSV mapping? This action cannot be undone.": "¿Estás seguro/a de que quieres actualizar este mapeo CSV? Esta acción no se puede deshacer.",
Expand All @@ -31,12 +32,16 @@
"Box added successfully": "Caja agregada exitosamente",
"Boxes": "Cajas",
"Cancel": "Cancelar",
"Cancelled": "Cancelled",
"Cash": "Cash",
"Cash On Delivery": "Cash On Delivery",
"Click the backdrop to dismiss.": "Haz clic en el fondo para cerrar.",
"Change": "Cambiar",
"Changes to the CSV mapping has been saved.": "Los cambios en el mapeo CSV se han guardado.",
"Check stock": "Revisar inventario",
"Choose language": "Elegir idioma",
"City": "Ciudad",
"Credit Card": "Credit Card",
"COD Fee": "Tarifa COD",
"COD Fee Tax": "Impuesto de Tarifa COD",
"Completed": "Completado",
Expand All @@ -55,6 +60,8 @@
"Customer letter": "Carta al Cliente",
"Customer Name": "Nombre del cliente",
"Damaged": "Dañado",
"Debit Card": "Debit Card",
"Declined": "Declined",
"Define custom label for": "Definir etiqueta personalizada para {field}",
"Dismiss": "Descartar",
"Delete": "Borrar",
Expand All @@ -80,6 +87,7 @@
"Export Orders": "Exportar Ordenes",
"Export orders that are packed and haven't been shipped yet. Use the exported file to send the packed order details to a carrier where shipping labels and tracking codes will be generated.": "Exporta pedidos que están empacados y aún no se han enviado. Utiliza el archivo exportado para enviar los detalles de los pedidos empacados a una empresa de transporte donde se generarán etiquetas de envío y códigos de seguimiento.",
"Export packed orders": "Exportar pedidos empacados",
"Ext Other Gateways": "Ext Other Gateways",
"Facility": "Tiendas",
"Facility Address 1": "Direccion de tiendas 1",
"Facility Address 2": "Direccion de tiendas 2",
Expand Down Expand Up @@ -162,6 +170,8 @@
"No time zone found": "No se encontró zona horaria",
"No fulfillment capacity": "Sin capacidad de cumplimiento",
"Not in Stock": "No en Stock",
"Not-Authorized": "Not-Authorized",
"Not-Received": "Not-Received",
"No packed shipments to ship for these orders": "No hay envíos empacados para estos pedidos",
"order": "pedido",
"orders allocated today": "pedidos asignados hoy {orderCount}",
Expand Down Expand Up @@ -225,6 +235,8 @@
"Reason:": "Razón:",
"Ready to pack": "Listo para empacar",
"Reject": "Rechazar",
"Received": "Received",
"Refunded": "Refunded",
"Reject all": "Rechazar todo",
"Reject all in progress orders": "Rechazar todos los pedidos en curso",
"Reject all open orders": "Rechazar todos los pedidos abiertos",
Expand Down Expand Up @@ -263,6 +275,7 @@
"Selected Fields: ": "Filas seleccionadas: ",
"Sell inventory online": "Vender inventario en línea",
"Sell online": "Vender en línea",
"Settled": "Settled",
"Setting fulfillment capacity to 0 disables new order from being allocated to this facility. Leave this empty if this facility's fulfillment capacity is unrestricted.": "Establecer la capacidad de cumplimiento en 0 inhabilita la asignación de nuevos pedidos a esta instalación. Déjelo vacío si la capacidad de cumplimiento de esta instalación no tiene restricciones.",
"Settings": "Configuraciones",
"Set Limit": "Establecer Límite",
Expand Down
2 changes: 1 addition & 1 deletion src/views/OrderDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ion-chip>
<ion-chip outline v-if="order?.orderPaymentPreferences?.length > 0" :color="statusColor[order?.orderPaymentPreferences[0]?.statusId]">
<ion-icon :icon="cashOutline" />
<ion-label>{{ getPaymentMethodDesc(order?.orderPaymentPreferences[0]?.paymentMethodTypeId)}} : {{ getStatusDesc(order?.orderPaymentPreferences[0]?.statusId) }}</ion-label>
<ion-label>{{ translate(getPaymentMethodDesc(order?.orderPaymentPreferences[0]?.paymentMethodTypeId)) }} : {{ translate(getStatusDesc(order?.orderPaymentPreferences[0]?.statusId)) }}</ion-label>
</ion-chip>
</div>
<div class="order-metadata">
Expand Down Expand Up @@ -312,7 +312,7 @@
trashBinOutline,
ribbonOutline
} from 'ionicons/icons';
import { getProductIdentificationValue, translate, ShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';

Check warning on line 315 in src/views/OrderDetail.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (18.x)

'ShopifyImg' is defined but never used

Check warning on line 315 in src/views/OrderDetail.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (20.x)

'ShopifyImg' is defined but never used
import { copyToClipboard, formatUtcDate, getFeature, showToast } from '@/utils'
import { Actions, hasPermission } from '@/authorization'
import OrderActionsPopover from '@/components/OrderActionsPopover.vue'
Expand Down Expand Up @@ -428,7 +428,7 @@
this.confirmUpdateBox(item, order, result.data, kitProducts, orderItemSeqId)
}
},
async confirmUpdateBox(item: any, order: any, selectedBox: string, kitProducts?: any, orderItemSeqId?: number) {

Check warning on line 431 in src/views/OrderDetail.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (18.x)

'orderItemSeqId' is defined but never used

Check warning on line 431 in src/views/OrderDetail.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (20.x)

'orderItemSeqId' is defined but never used
const alert = await alertController.create({
message: translate("Are you sure you want to update box selection?"),
header: translate("Update box selection?"),
Expand Down
Loading