Merge branch 'dev' into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
6cc7017475
|
@ -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`),
|
||||
|
|
|
@ -154,6 +154,11 @@
|
|||
"model": "Account",
|
||||
"foreignKey": "id"
|
||||
},
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
"model": "Account",
|
||||
"foreignKey": "id"
|
||||
},
|
||||
"payMethod": {
|
||||
"type": "belongsTo",
|
||||
"model": "PayMethod",
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
align-items: center;
|
||||
border-radius: 50%;
|
||||
font-size: .9rem;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
height: 28px;
|
||||
width: 28px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue