From c3c7ef901a4663d6480634d96e7df0d2e5803ed6 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Fri, 4 Sep 2020 12:40:23 +0200
Subject: [PATCH] version pre-hex in vn.ink table

---
 db/dump/fixtures.sql                          | 28 +++++++++----------
 .../order/back/methods/order/catalogFilter.js |  3 +-
 modules/order/front/catalog-view/index.html   |  3 ++
 modules/order/front/catalog-view/style.scss   | 20 +++++++++++--
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 22fa2076a..5837f447d 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -735,20 +735,20 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`)
 
 INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`, `minPrice`)
     VALUES
-        (1,  2, 70,   'AMA', 1,    1, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 67,     1, NULL, 0),
-        (2,  2, 70,   'AZL', 1,    2, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 66,     1, NULL, 0),
-        (3,  1, 60,   'AMR', 1,    3, NULL,              1,    05080000, 0, 4751000000, 0, NULL, 0, 65,     1, NULL, 0),
-        (4,  1, 60,   'AMR', 1,    1, 'Increases block', 1,    05080000, 1, 4751000000, 0, NULL, 0, 69,     2, NULL, 0),
-        (5,  3, 30,   'GRE', 1,    2, NULL,              2,    06021010, 1, 4751000000, 0, NULL, 0, 74,     2, NULL, 0),
-        (6,  5, 30,   'GRE', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 62,     2, NULL, 0),
-        (7,  5, 90,   'AZL', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 64,     2, NULL, 0),
-        (8,  2, 70,   'AMA', 1,    1, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 75,     1, NULL, 0),
-        (9,  2, 70,   'AZL', 1,    2, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 76,     1, NULL, 0),
-        (10, 1, 60,   'AMR', 1,    3, NULL,              1,    05080000, 0, 4751000000, 0, NULL, 0, 77,     1, NULL, 0),
-        (11, 1, 60,   'AMR', 1,    1, NULL,              1,    05080000, 1, 4751000000, 0, NULL, 0, 78,     2, NULL, 0),
-        (12, 3, 30,   'GRE', 1,    2, NULL,              2,    06021010, 1, 4751000000, 0, NULL, 0, 82,     2, NULL, 0),
-        (13, 5, 30,   'GRE', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 83,     2, NULL, 0),
-        (14, 5, 90,   'AZL', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 84,     2, NULL, 0),
+        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 67,     1, NULL, 0),
+        (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 66,     1, NULL, 0),
+        (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 0, 4751000000, 0, NULL, 0, 65,     1, NULL, 0),
+        (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 1, 4751000000, 0, NULL, 0, 69,     2, NULL, 0),
+        (5,  3, 30,   'RED', 1,    2, NULL,              2,    06021010, 1, 4751000000, 0, NULL, 0, 74,     2, NULL, 0),
+        (6,  5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 62,     2, NULL, 0),
+        (7,  5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 64,     2, NULL, 0),
+        (8,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 75,     1, NULL, 0),
+        (9,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, 76,     1, NULL, 0),
+        (10, 1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 0, 4751000000, 0, NULL, 0, 77,     1, NULL, 0),
+        (11, 1, 60,   'YEL', 1,    1, NULL,              1,    05080000, 1, 4751000000, 0, NULL, 0, 78,     2, NULL, 0),
+        (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 1, 4751000000, 0, NULL, 0, 82,     2, NULL, 0),
+        (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 83,     2, NULL, 0),
+        (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 84,     2, NULL, 0),
         (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350,  2, NULL, 0),
         (16, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350,  2, NULL, 0),
         (71, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 1, 4751000000, 0, NULL, 0, 88,     2, NULL, 0);
diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js
index 114cd2786..85e98bc83 100644
--- a/modules/order/back/methods/order/catalogFilter.js
+++ b/modules/order/back/methods/order/catalogFilter.js
@@ -108,7 +108,8 @@ module.exports = Self => {
                     tci.available,
                     w.lastName AS lastName, 
                     w.firstName,
-                    tci.priceKg
+                    tci.priceKg,
+                    vn.ink.name AS inkName
                 FROM tmp.ticketCalculateItem tci
                     JOIN vn.item i ON i.id = tci.itemFk
                     JOIN vn.itemType it ON it.id = i.typeFk
diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html
index 459a61f59..cdc56f04b 100644
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@@ -4,6 +4,9 @@
     <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>
                 <img
                     ng-src="{{::$root.imagePath}}/catalog/200x200/{{::item.image}}" 
                     zoom-image="{{::$root.imagePath}}/catalog/1600x900/{{::item.image}}"
diff --git a/modules/order/front/catalog-view/style.scss b/modules/order/front/catalog-view/style.scss
index aa4e301a9..66cd0c388 100644
--- a/modules/order/front/catalog-view/style.scss
+++ b/modules/order/front/catalog-view/style.scss
@@ -27,5 +27,21 @@ vn-order-catalog {
     .catalog-list {
         padding-top: $spacing-sm;
     }
-}
-
+    .item-color-background {
+        background: linear-gradient(white, $color-main);
+        border-radius: 50%;
+        margin-left: 140px;
+        margin-top: 140px;
+        width: 40px;
+        height: 40px;
+        position: absolute;
+    }
+    .item-color {
+        margin: auto;
+        margin-top: 5px;
+        border-radius: 50%;
+        width: 30px;
+        height: 30px;
+        position: relative;
+    }
+}
\ No newline at end of file