From 42abeecedee76f3306c14505f78c6c92e8ef0fc6 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Thu, 10 Sep 2020 16:35:32 +0200
Subject: [PATCH] hex color now displayed on catalog

---
 modules/order/back/methods/order/catalogFilter.js | 4 ++--
 modules/order/front/catalog-view/index.html       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js
index 85e98bc838..41529428c6 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 cdc56f04bf..2d7492d87d 100644
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@@ -4,8 +4,8 @@
     <section ng-repeat="item in $ctrl.model.data" class="product">
         <vn-card>
             <div class="image">
-                <div ng-if="::item.inkName != null" class="item-color-background">
-                    <div class="item-color" style="background-color: {{::item.inkName}}"></div>
+                <div ng-if="::item.hex != null" class="item-color-background">
+                    <div class="item-color" style="background-color: #{{::item.hex}}"></div>
                 </div>
                 <img
                     ng-src="{{::$root.imagePath}}/catalog/200x200/{{::item.image}}"