verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

#7864 - 7864_testToMaster_2434 #2867

Merged
jsegarra merged 139 commits from 7864_testToMaster_2434 into master 2024-08-20 06:33:22 +00:00
Conversation 0 Commits 139 Files Changed 192 +10 -29
4 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a9ab84356 - Show all commits

7
db/versions/11165-grayAralia/00-firstScript.sql Normal file
View File

@ -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;

6
print/templates/reports/collection-label/collection-label.html
View File

@ -10,14 +10,10 @@
</td> </td>
<td colspan="2" id="shipped">{{dashIfEmpty(labelData.shipped)}}</td> <td colspan="2" id="shipped">{{dashIfEmpty(labelData.shipped)}}</td>
</tr> </tr>
<tr v-if="labelData?.qrData"> <tr>
<td rowspan="3"><img :src="labelData.qrData" class="qr"/></td> <td rowspan="3"><img :src="labelData.qrData" class="qr"/></td>
<td id="outline" class="ellipsize">{{dashIfEmpty(labelData.workerCode)}}</td> <td id="outline" class="ellipsize">{{dashIfEmpty(labelData.workerCode)}}</td>
</tr> </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> <tr>
<td id="outline" class="ellipsize">{{labelCount || labelData.labelCount || 0}}</td> <td id="outline" class="ellipsize">{{labelCount || labelData.labelCount || 0}}</td>
</tr> </tr>

19
print/templates/reports/collection-label/collection-label.js
View File

@ -1,7 +1,5 @@
const {DOMImplementation, XMLSerializer} = require('xmldom');
const vnReport = require('../../../core/mixins/vn-report.js'); const vnReport = require('../../../core/mixins/vn-report.js');
const {toDataURL} = require('qrcode'); const {toDataURL} = require('qrcode');
const jsBarcode = require('jsbarcode');
module.exports = { module.exports = {
name: 'collection-label', name: 'collection-label',
@ -30,11 +28,8 @@ module.exports = {
const labels = await this.rawSqlFromDef('labelsData', [ticketIds]); const labels = await this.rawSqlFromDef('labelsData', [ticketIds]);
const [{scannableCodeType}] = await this.rawSqlFromDef('barcodeType');
if (scannableCodeType === 'qr') {
for (const labelData of labels) for (const labelData of labels)
labelData.qrData = await this.getQr(labelData?.ticketFk, labelData?.workerFk); labelData.qrData = await this.getQr(labelData?.ticketFk, labelData?.workerFk);
}
this.labelsData = labels; this.labelsData = labels;
this.checkMainEntity(this.labelsData); this.checkMainEntity(this.labelsData);
@ -50,20 +45,6 @@ module.exports = {
}); });
return toDataURL(QRdata, {margin: 0}); 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) { getVertical(labelData) {
let value; let value;
if (labelData.collectionFk) { if (labelData.collectionFk) {

3
print/templates/reports/collection-label/sql/barcodeType.sql
View File

@ -1,3 +0,0 @@
SELECT scannableCodeType
FROM productionConfig
LIMIT 1