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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-download-user-ACL
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alexandre Riera 2023-03-09 09:47:14 +01:00
parent ce6cb2ec13 24f0ca5168
commit 420e5fe768
2 changed files with 5127 additions and 5123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/dump/structure.sql
View File

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

4
modules/ticket/front/sale-tracking/style.scss
View File

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