Merge branch 'dev' into hotfix_arcRfid

db/changes/231205/00-rollbackDelivery.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`printQueueArgs` MODIFY COLUMN value varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;

modules/ticket/back/methods/ticket/expeditionPalletLabel.js

@@ -11,8 +11,7 @@ module.exports = Self => {
                 http: {source: 'path'}
             }, {
                 arg: 'userFk',
-                type: 'number',
-                required: true,
+                type: 'any',
                 description: 'The user id'
             }
         ],

print/templates/reports/expedition-pallet-label/expedition-pallet-label.html

@@ -30,7 +30,7 @@
                         <img :src="QR" id="QR"/>
                         <div id="right">
                             <div id="additionalInfo" class="ellipsize"><b>Pallet: </b>{{id}}</div>
-                            <div id="additionalInfo" class="ellipsize"><b>User: </b> {{username.name || '---'}}</div>
+                            <div id="additionalInfo" class="ellipsize"><b>User: </b> {{username?.name || '---'}}</div>
                             <div id="additionalInfo" class="ellipsize"><b>Day: </b>{{labelData.dayName.toUpperCase() || '---'}}</div>
                         </div>
                     </td>
@@ -38,4 +38,4 @@
             </tbody>
         </table>
     </body>
-</html>
+</html>

print/templates/reports/expedition-pallet-label/expedition-pallet-label.js

@@ -14,13 +14,12 @@ module.exports = {
         },
         userFk: {
             type: Number,
-            required: true,
             description: 'The user id'
         }
     },
     async serverPrefetch() {
         this.labelsData = await this.rawSqlFromDef('labelData', this.id);
-        this.username = await this.findOneFromDef('username', this.userFk);
+        if (this.userFk) this.username = await this.findOneFromDef('username', this.userFk);
         this.labelData = this.labelsData[0];
         this.checkMainEntity(this.labelData);