From 5a9ab843568e2fdcda02df303d55cf363c75a86c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 24 Jul 2024 09:14:28 +0200
Subject: [PATCH 1/2] feat: refs #7646  delete scannableCodeType

---
 .../11165-grayAralia/00-firstScript.sql       |  7 ++++++
 .../collection-label/collection-label.html    |  6 +----
 .../collection-label/collection-label.js      | 23 ++-----------------
 .../collection-label/sql/barcodeType.sql      |  3 ---
 4 files changed, 10 insertions(+), 29 deletions(-)
 create mode 100644 db/versions/11165-grayAralia/00-firstScript.sql
 delete mode 100644 print/templates/reports/collection-label/sql/barcodeType.sql

diff --git a/db/versions/11165-grayAralia/00-firstScript.sql b/db/versions/11165-grayAralia/00-firstScript.sql
new file mode 100644
index 000000000..2e0e2a329
--- /dev/null
+++ b/db/versions/11165-grayAralia/00-firstScript.sql
@@ -0,0 +1,7 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS  vn.productionConfig 
+CHANGE COLUMN IF EXISTS  scannableCodeType scannableCodeType__ enum('qr','barcode')
+  CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'barcode' NOT NULL,
+CHANGE COLUMN IF EXISTS scannablePreviusCodeType scannablePreviusCodeType__ enum('qr','barcode') 
+  CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'barcode' NOT NULL;
+
diff --git a/print/templates/reports/collection-label/collection-label.html b/print/templates/reports/collection-label/collection-label.html
index 65709ead0..1f57fc3d9 100644
--- a/print/templates/reports/collection-label/collection-label.html
+++ b/print/templates/reports/collection-label/collection-label.html
@@ -10,14 +10,10 @@
                     </td>
                     <td colspan="2" id="shipped">{{dashIfEmpty(labelData.shipped)}}</td>
                 </tr>
-                <tr v-if="labelData?.qrData">
+                <tr>
                     <td rowspan="3"><img :src="labelData.qrData" class="qr"/></td>
                     <td id="outline" class="ellipsize">{{dashIfEmpty(labelData.workerCode)}}</td>
                 </tr>
-                <tr v-else>
-                    <td rowspan="3"><div v-html="getBarcode(labelData.ticketFk)" class="basrcode"></div></td>
-                    <td id="outline" class="ellipsize">{{dashIfEmpty(labelData.workerCode)}}</td>
-                </tr>
                 <tr>
                     <td id="outline" class="ellipsize">{{labelCount || labelData.labelCount || 0}}</td>
                 </tr>
diff --git a/print/templates/reports/collection-label/collection-label.js b/print/templates/reports/collection-label/collection-label.js
index f2f697ae6..4aeaca854 100644
--- a/print/templates/reports/collection-label/collection-label.js
+++ b/print/templates/reports/collection-label/collection-label.js
@@ -1,7 +1,5 @@
-const {DOMImplementation, XMLSerializer} = require('xmldom');
 const vnReport = require('../../../core/mixins/vn-report.js');
 const {toDataURL} = require('qrcode');
-const jsBarcode = require('jsbarcode');
 
 module.exports = {
     name: 'collection-label',
@@ -30,11 +28,8 @@ module.exports = {
 
         const labels = await this.rawSqlFromDef('labelsData', [ticketIds]);
 
-        const [{scannableCodeType}] = await this.rawSqlFromDef('barcodeType');
-        if (scannableCodeType === 'qr') {
-            for (const labelData of labels)
-                labelData.qrData = await this.getQr(labelData?.ticketFk, labelData?.workerFk);
-        }
+        for (const labelData of labels)
+            labelData.qrData = await this.getQr(labelData?.ticketFk, labelData?.workerFk);
 
         this.labelsData = labels;
         this.checkMainEntity(this.labelsData);
@@ -50,20 +45,6 @@ module.exports = {
             });
             return toDataURL(QRdata, {margin: 0});
         },
-        getBarcode(id) {
-            const xmlSerializer = new XMLSerializer();
-            const document = new DOMImplementation().createDocument('http://www.w3.org/1999/xhtml', 'html', null);
-            const svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
-
-            jsBarcode(svgNode, id, {
-                xmlDocument: document,
-                format: 'code128',
-                displayValue: false,
-                width: 3.8,
-                height: 115,
-            });
-            return xmlSerializer.serializeToString(svgNode);
-        },
         getVertical(labelData) {
             let value;
             if (labelData.collectionFk) {
diff --git a/print/templates/reports/collection-label/sql/barcodeType.sql b/print/templates/reports/collection-label/sql/barcodeType.sql
deleted file mode 100644
index 0700c95a2..000000000
--- a/print/templates/reports/collection-label/sql/barcodeType.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT scannableCodeType
-    FROM productionConfig
-    LIMIT 1
\ No newline at end of file

From 00845c0534afc25f1a4a3fa1032b76ff6c591b7d Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 12 Aug 2024 08:03:49 +0200
Subject: [PATCH 2/2] refactor: refs #7646 #7646 Deleted scannable* variables
 productionConfig

---
 db/versions/11165-grayAralia/00-firstScript.sql | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/db/versions/11165-grayAralia/00-firstScript.sql b/db/versions/11165-grayAralia/00-firstScript.sql
index 2e0e2a329..652b2343a 100644
--- a/db/versions/11165-grayAralia/00-firstScript.sql
+++ b/db/versions/11165-grayAralia/00-firstScript.sql
@@ -1,7 +1,3 @@
--- Place your SQL code here
-ALTER TABLE IF EXISTS  vn.productionConfig 
-CHANGE COLUMN IF EXISTS  scannableCodeType scannableCodeType__ enum('qr','barcode')
-  CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'barcode' NOT NULL,
-CHANGE COLUMN IF EXISTS scannablePreviusCodeType scannablePreviusCodeType__ enum('qr','barcode') 
-  CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'barcode' NOT NULL;
-
+ALTER TABLE vn.productionConfig
+  DROP COLUMN scannableCodeType,
+  DROP COLUMN scannablePreviusCodeType;