Merge branch 'dev' into 5368-fix-expedition-pallet-label

db/dump/structure.sql

@@ -11183,6 +11183,10 @@ CREATE TABLE `tpvTransaction` (
   `errorCode` char(7) DEFAULT NULL,
   `status` enum('started','ok','ko') NOT NULL DEFAULT 'started',
   `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `merchantParameters` text DEFAULT NULL,
+  `signature` varchar(255) DEFAULT NULL,
+  `signatureVersion` varchar(50) DEFAULT NULL,
+  `responseError` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `merchant_id` (`merchantFk`),
   KEY `receipt_id` (`receiptFk`),
@@ -11192,7 +11196,7 @@ CREATE TABLE `tpvTransaction` (
   CONSTRAINT `receipt_id` FOREIGN KEY (`receiptFk`) REFERENCES `vn`.`receipt` (`Id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `tpvTransaction_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `tpvTransaction_ibfk_2` FOREIGN KEY (`merchantFk`) REFERENCES `tpvMerchant` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Transactions realized through the virtual TPV';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Transactions realized through the virtual TPV';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --

modules/client/back/models/client.json

@@ -154,6 +154,11 @@
 			"model": "Account",
 			"foreignKey": "id"
 		},
+		"user": {
+			"type": "belongsTo",
+			"model": "Account",
+			"foreignKey": "id"
+		},
 		"payMethod": {
 			"type": "belongsTo",
 			"model": "PayMethod",

modules/ticket/front/sale-tracking/style.scss

@@ -6,7 +6,7 @@
     align-items: center;
     border-radius: 50%;
     font-size: .9rem;
-    width: 30px;
+    height: 28px;
-    height: 30px;
+    width: 28px;
     cursor: pointer;
 }