From 646e6c7b463708433aa9352ddefa5079f2823971 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 20 Feb 2019 13:26:31 +0100 Subject: [PATCH 1/4] Disabled delivery-note preview --- modules/ticket/front/descriptor/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js index a236b0d5a..d18063ef7 100644 --- a/modules/ticket/front/descriptor/index.js +++ b/modules/ticket/front/descriptor/index.js @@ -11,7 +11,7 @@ class Controller { {callback: this.showAddTurnDialog, name: 'Add turn', show: true}, {callback: this.showAddStowaway, name: 'Add stowaway', show: () => this.isTicketModule()}, {callback: this.showRemoveStowaway, name: 'Remove stowaway', show: () => this.shouldShowRemoveStowaway()}, - {callback: this.showDeliveryNote, name: 'Show Delivery Note', show: true}, + /* {callback: this.showDeliveryNote, name: 'Show Delivery Note', show: true}, */ {callback: this.showDeleteTicketDialog, name: 'Delete ticket', show: true}, /* callback: this.showChangeShipped, name: 'Change shipped hour', show: true} */ ]; From 888db7d8a669aedfe166a6516fb111fe44d0b8fa Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 20 Feb 2019 13:49:25 +0100 Subject: [PATCH 2/4] button styles fixed --- front/core/components/button/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss index 47df4f7ef..8a5d7bb59 100644 --- a/front/core/components/button/style.scss +++ b/front/core/components/button/style.scss @@ -1,5 +1,5 @@ vn-button { - & i[class="material-icons"] { + i.material-icons { margin-top: 6px; } } \ No newline at end of file From e5b95460f651ac4619e1a430bb5a84846aeb8a30 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 20 Feb 2019 13:51:41 +0100 Subject: [PATCH 3/4] update fixtures cau 9908 --- services/db/install/dump/fixtures.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index ac299d46e..6de6c866a 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -1030,7 +1030,9 @@ INSERT INTO `hedera`.`tpvTransaction`(`id`,`merchantFk`, `clientFk`,`receiptFk`, (1, 1, 101, NULL, 2000, NULL, 'SIS0042', 'ok', CURDATE()), (2, 1, 101, NULL, 1000, NULL, 'SIS0051', 'started', CURDATE()), (3, 2, 101, NULL, 7268, 0, NULL, 'ok', CURDATE()), - (4, 2, 101, NULL, 4698, 100, NULL, 'started', CURDATE()); + (4, 2, 101, NULL, 4698, 100, NULL, 'started', CURDATE()), + (5, 1, 104, NULL, 2000, 100, NULL, 'ok', CURDATE()), + (6, 2, 104, NULL, 4000, 100, NULL, 'started', CURDATE()); INSERT INTO `vn`.`orderTicket`(`orderFk`, `ticketFk`) VALUES From 258e60b9fbfbae7842f09cbd58f18944d0e13b15 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 20 Feb 2019 14:01:05 +0100 Subject: [PATCH 4/4] update fixtures cau 9908 --- services/db/install/dump/fixtures.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index 6de6c866a..b97fb8511 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -1029,10 +1029,10 @@ INSERT INTO `hedera`.`tpvTransaction`(`id`,`merchantFk`, `clientFk`,`receiptFk`, VALUES (1, 1, 101, NULL, 2000, NULL, 'SIS0042', 'ok', CURDATE()), (2, 1, 101, NULL, 1000, NULL, 'SIS0051', 'started', CURDATE()), - (3, 2, 101, NULL, 7268, 0, NULL, 'ok', CURDATE()), - (4, 2, 101, NULL, 4698, 100, NULL, 'started', CURDATE()), - (5, 1, 104, NULL, 2000, 100, NULL, 'ok', CURDATE()), - (6, 2, 104, NULL, 4000, 100, NULL, 'started', CURDATE()); + (3, 2, 101, NULL, 7268, NULL, NULL, 'ok', CURDATE()), + (4, 2, 101, NULL, 4698, NULL, NULL, 'started', CURDATE()), + (5, 1, 104, NULL, 2000, NULL, 'SIS0043', 'ok', CURDATE()), + (6, 2, 104, NULL, 4000, NULL, 'SIS0044', 'started', CURDATE()); INSERT INTO `vn`.`orderTicket`(`orderFk`, `ticketFk`) VALUES