From 22a5f8d495138466c976eae4fa167b550cd9a2ad Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 11 Apr 2018 11:37:39 +0200 Subject: [PATCH 1/4] update export-data.cmd --- services/db/export-data.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/db/export-data.cmd b/services/db/export-data.cmd index 74bb62d78..bffc1eb0b 100755 --- a/services/db/export-data.cmd +++ b/services/db/export-data.cmd @@ -4,7 +4,7 @@ mysqldump --defaults-file=connect.ini --no-create-info account role roleRole rol echo USE `salix`; >> 02-dumpedFixtures.sql mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> 02-dumpedFixtures.sql echo USE `vn`; >> 02-dumpedFixtures.sql -mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner >> 02-dumpedFixtures.sql +mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> 02-dumpedFixtures.sql echo USE `vn2008`; >> 02-dumpedFixtures.sql mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas >> 02-dumpedFixtures.sql From ec90f70c56ad957c80d12d23c6ebc8ef2e8352b0 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 11 Apr 2018 12:56:16 +0200 Subject: [PATCH 2/4] update fixtures for ticketComponents --- services/db/04-fixtures.sql | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index 97b3f1233..924f72500 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -422,7 +422,12 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric VALUES ( 1, 1, 1, 'Gem of Time', 5 , 1.5, 0, 0, 0, CURDATE()), ( 2, 1, 1, 'Gem of Time', 2 , 1.5, 0, 0, 0, CURDATE()), - ( 3, 2, 2, 'Mjolnir' , 10, 4 , 0, 0, 0, CURDATE()); + ( 3, 2, 2, 'Mjolnir' , 10, 4 , 0, 0, 0, CURDATE()), + ( 4, 2, 2, 'Iron Patriot' , 10, 4 , 0, 0, 0, CURDATE()), + ( 5, 2, 2, 'Gem of Mind' , 10, 4 , 0, 0, 0, CURDATE()), + ( 6, 2, 2, 'Gem of Mind' , 10, 4 , 0, 0, 0, CURDATE()), + ( 7, 2, 2, 'Mjolnir' , 10, 4 , 0, 0, 0, CURDATE()), + ( 8, 2, 2, 'Mark I' , 10, 4 , 0, 0, 0, CURDATE()); INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`) VALUES @@ -437,14 +442,25 @@ INSERT INTO `vn`.`componentTypeRate`(`id`, `type`) INSERT INTO `vn`.`componentRate`(`id`, `name`, `componentTypeRate`, `classRate`, `tax`, `isRenewable`) VALUES - ( 1, 'Special price', 1, NULL, NULL, 1), - ( 2, 'Delivery', 2, NULL, NULL, 1), - ( 3, 'Mana', 3, 1, NULL, 0 ); + ( 1, 'Special price', 1, NULL, NULL, 1), + ( 2, 'Delivery 1', 1, NULL, NULL, 1), + ( 3, 'Delivery 2', 1, NULL, NULL, 1), + ( 4, 'Delivery 3', 2, NULL, NULL, 1), + ( 5, 'Delivery 4', 2, NULL, NULL, 0), + ( 6, 'Delivery 5', 2, NULL, NULL, 0), + ( 7, 'Delivery 6', 2, NULL, NULL, 0), + ( 8, 'Mana', 3, 1, NULL, 0 ); INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`) VALUES - ( 1, 1, 0.5), - ( 2, 2, 1.2 ); + ( 1, 1, 1), + ( 2, 2, 2.5), + ( 3, 3, 3), + ( 4, 4, 4.5), + ( 5, 5, 5), + ( 6, 6, 6.5), + ( 7, 7, 7), + ( 8, 2, 1.2 ); INSERT INTO `vn`.`itemBarcode`(`id`, `itemFk`, `code`) From 6cae47c07b1e7674ba63f446355e91605c6c2a6b Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 11 Apr 2018 13:06:44 +0200 Subject: [PATCH 3/4] update fixtures --- services/db/04-fixtures.sql | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index 924f72500..4c38d9595 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -421,13 +421,7 @@ INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`, INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `price`, `discount`, `reserved`, `isPicked`, `created`) VALUES ( 1, 1, 1, 'Gem of Time', 5 , 1.5, 0, 0, 0, CURDATE()), - ( 2, 1, 1, 'Gem of Time', 2 , 1.5, 0, 0, 0, CURDATE()), - ( 3, 2, 2, 'Mjolnir' , 10, 4 , 0, 0, 0, CURDATE()), - ( 4, 2, 2, 'Iron Patriot' , 10, 4 , 0, 0, 0, CURDATE()), - ( 5, 2, 2, 'Gem of Mind' , 10, 4 , 0, 0, 0, CURDATE()), - ( 6, 2, 2, 'Gem of Mind' , 10, 4 , 0, 0, 0, CURDATE()), - ( 7, 2, 2, 'Mjolnir' , 10, 4 , 0, 0, 0, CURDATE()), - ( 8, 2, 2, 'Mark I' , 10, 4 , 0, 0, 0, CURDATE()); + ( 2, 1, 1, 'Gem of Time', 2 , 1.5, 0, 0, 0, CURDATE()); INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`) VALUES @@ -454,13 +448,13 @@ INSERT INTO `vn`.`componentRate`(`id`, `name`, `componentTypeRate`, `classRate`, INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`) VALUES ( 1, 1, 1), - ( 2, 2, 2.5), - ( 3, 3, 3), - ( 4, 4, 4.5), - ( 5, 5, 5), - ( 6, 6, 6.5), - ( 7, 7, 7), - ( 8, 2, 1.2 ); + ( 1, 2, 2.5), + ( 1, 3, 3), + ( 1, 4, 4.5), + ( 1, 5, 5), + ( 1, 6, 6.5), + ( 1, 7, 7), + ( 2, 2, 1.2 ); INSERT INTO `vn`.`itemBarcode`(`id`, `itemFk`, `code`) From c3017185c676104e1e0773e3c4a2783cb2cc3d16 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 11 Apr 2018 14:02:41 +0200 Subject: [PATCH 4/4] update fixtures for clientAdressesEdit redmine 242 --- services/db/04-fixtures.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index 4c38d9595..8203dbe8f 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -81,6 +81,13 @@ UPDATE `vn`.`agencyMode` SET `id` = 4 WHERE `name` = 'Entanglement'; UPDATE `vn`.`agencyMode` SET `id` = 5 WHERE `name` = 'Quantum break device'; UPDATE `vn`.`agencyMode` SET `id` = 6 WHERE `name` = 'Walking'; +UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup'; +UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery'; +UPDATE `vn`.`agencyMode` SET `id` = 3 WHERE `name` = 'Teleportation device'; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 4; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 5; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = -1 WHERE `id` = 6; + INSERT INTO `vn`.`payMethod`(`id`, `name`, `graceDays`, `outstandingDebt`, `ibanRequired`) VALUES (1, 'PayMethod one', 0, 001, 0),