diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js index 85e98bc83..41529428c 100644 --- a/modules/order/back/methods/order/catalogFilter.js +++ b/modules/order/back/methods/order/catalogFilter.js @@ -109,11 +109,11 @@ module.exports = Self => { w.lastName AS lastName, w.firstName, tci.priceKg, - vn.ink.name AS inkName + ink.hex FROM tmp.ticketCalculateItem tci JOIN vn.item i ON i.id = tci.itemFk JOIN vn.itemType it ON it.id = i.typeFk - LEFT JOIN vn.ink ON ink.id = i.inkFk + JOIN vn.ink ON ink.id = i.inkFk JOIN vn.worker w on w.id = it.workerFk`); // Apply order by tag diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html index cdc56f04b..2d7492d87 100644 --- a/modules/order/front/catalog-view/index.html +++ b/modules/order/front/catalog-view/index.html @@ -4,8 +4,8 @@
-
-
+
+