diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue index 4306beb4c..5b192f95d 100644 --- a/src/components/common/VnSmsDialog.vue +++ b/src/components/common/VnSmsDialog.vue @@ -199,8 +199,9 @@ es: templates: pendingPayment: 'Su pedido está pendiente de pago. Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.' - minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido - { orderId } con llegada { landing } para recibirlo sin portes adicionales.' + minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€. + Te recomendamos amplíes para no generar costes extra, provocarán un incremento de tu tarifa. + ¡Un saludo!' orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }' en: Inglés es: Español diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue index da8d43c95..344267ef7 100644 --- a/src/components/ui/VnSearchbar.vue +++ b/src/components/ui/VnSearchbar.vue @@ -108,6 +108,7 @@ async function search() { let targetUrl; if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`); + if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`); else if (path.includes(':id')) targetUrl = path.replace(':id', targetId); await router.push({ path: targetUrl }); diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue index 47287c12b..33836550a 100644 --- a/src/components/ui/VnUserLink.vue +++ b/src/components/ui/VnUserLink.vue @@ -1,6 +1,5 @@ diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue index cb0cb333b..e565a791b 100644 --- a/src/pages/ItemType/Card/ItemTypeDescriptor.vue +++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue @@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n'; import CardDescriptor from 'components/ui/CardDescriptor.vue'; import VnLv from 'src/components/ui/VnLv.vue'; +import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import useCardDescription from 'src/composables/useCardDescription'; @@ -65,13 +66,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue index 393675a30..62d1c74ab 100644 --- a/src/pages/ItemType/Card/ItemTypeSummary.vue +++ b/src/pages/ItemType/Card/ItemTypeSummary.vue @@ -2,6 +2,7 @@ import { ref, computed, onUpdated } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; +import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import CardSummary from 'components/ui/CardSummary.vue'; import VnLv from 'src/components/ui/VnLv.vue'; @@ -71,30 +72,29 @@ async function setItemTypeData(data) { {{ t('globals.summary.basicData') }} - - - + + + + + + + - - - - + + diff --git a/src/pages/ItemType/locale/en.yml b/src/pages/ItemType/locale/en.yml new file mode 100644 index 000000000..7889418ea --- /dev/null +++ b/src/pages/ItemType/locale/en.yml @@ -0,0 +1,12 @@ +shared: + code: Code + name: Name + worker: Worker + category: Category + temperature: Temperature +summary: + id: id + life: Life + promo: Promo + itemPackingType: Item packing type + isUnconventionalSize: Is unconventional size diff --git a/src/pages/ItemType/locale/es.yml b/src/pages/ItemType/locale/es.yml new file mode 100644 index 000000000..9a94dceb6 --- /dev/null +++ b/src/pages/ItemType/locale/es.yml @@ -0,0 +1,17 @@ +shared: + code: Código + name: Nombre + worker: Trabajador + category: Reino + temperature: Temperatura +summary: + id: id + code: Código + name: Nombre + worker: Trabajador + category: Reino + temperature: Temperatura + life: Vida + promo: Promoción + itemPackingType: Tipo de embalaje + isUnconventionalSize: Es de tamaño poco convencional diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue index 49470719e..649799b00 100644 --- a/src/pages/Shelving/Card/ShelvingSummary.vue +++ b/src/pages/Shelving/Card/ShelvingSummary.vue @@ -20,14 +20,14 @@ const router = useRouter(); const { t } = useI18n(); const entityId = computed(() => $props.id || route.params.id); -const isDialog = Boolean($props.id); -const hideRightDrawer = () => { - if (!isDialog) { - stateStore.rightDrawer = false; - } -}; -onMounted(hideRightDrawer); -onUnmounted(hideRightDrawer); +const isDialog = false; +// const hideRightDrawer = () => { +// if (!isDialog) { +// stateStore.rightDrawer = false; +// } +// }; +// onMounted(hideRightDrawer); +// onUnmounted(hideRightDrawer); const filter = { include: [ { @@ -46,23 +46,6 @@ const filter = { diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js index 32bd63690..8064c41ff 100644 --- a/src/router/modules/itemType.js +++ b/src/router/modules/itemType.js @@ -1,7 +1,7 @@ import { RouterView } from 'vue-router'; export default { - path: '/item-type', + path: '/item/item-type', name: 'ItemType', meta: { title: 'itemType', @@ -9,7 +9,7 @@ export default { moduleName: 'ItemType', }, component: RouterView, - redirect: { name: 'ItemTypeCard' }, + redirect: { name: 'ItemTypeList' }, menus: { main: [], card: ['ItemTypeBasicData'],