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

Merge branch 'dev' into 5368-fix-expedition-pallet-label
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2023-03-13 09:19:39 +00:00
parent 0c22c1b0de 9bc86b1617
commit 60c137b280
3 changed files with 5132 additions and 5123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/dump/structure.sql
View File

@ -11183,6 +11183,10 @@ CREATE TABLE `tpvTransaction` (
`errorCode` char(7) DEFAULT NULL, `errorCode` char(7) DEFAULT NULL,
`status` enum('started','ok','ko') NOT NULL DEFAULT 'started', `status` enum('started','ok','ko') NOT NULL DEFAULT 'started',
`created` timestamp NOT NULL DEFAULT current_timestamp(), `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`), PRIMARY KEY (`id`),
KEY `merchant_id` (`merchantFk`), KEY `merchant_id` (`merchantFk`),
KEY `receipt_id` (`receiptFk`), KEY `receipt_id` (`receiptFk`),

5
modules/client/back/models/client.json
View File

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

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

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