diff --git a/db/changes/10410-january/00-smsConfig.sql b/db/changes/10410-january/00-smsConfig.sql deleted file mode 100644 index b3f1610d4..000000000 --- a/db/changes/10410-january/00-smsConfig.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE `vn`.`smsConfig` ADD apiKey varchar(50) NULL; -ALTER TABLE `vn`.`smsConfig` CHANGE `user` user__ varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; -ALTER TABLE `vn`.`smsConfig` CHANGE password password__ varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; -ALTER TABLE `vn`.`sms` MODIFY COLUMN statusCode smallint(9) DEFAULT 0 NULL; -ALTER TABLE `vn`.`sms` MODIFY COLUMN status varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'OK' NULL; diff --git a/db/changes/10410-january/01-smsConfig_update.sql b/db/changes/10410-january/01-smsConfig_update.sql deleted file mode 100644 index c4b4c895e..000000000 --- a/db/changes/10410-january/01-smsConfig_update.sql +++ /dev/null @@ -1,7 +0,0 @@ -UPDATE `vn`.`smsConfig` - SET `uri` = 'https://api.gateway360.com/api/3.0/sms/send' - WHERE `id` = 1; - -UPDATE `vn`.`smsConfig` - SET `apiKey` = '5715476da95b46d686a5a255e6459523' - WHERE `id` = 1; \ No newline at end of file diff --git a/db/changes/10410-january/00-acl.sql b/db/changes/10411-january/00-acl.sql similarity index 100% rename from db/changes/10410-january/00-acl.sql rename to db/changes/10411-january/00-acl.sql diff --git a/db/changes/10410-january/00-booking.sql b/db/changes/10411-january/00-booking.sql similarity index 100% rename from db/changes/10410-january/00-booking.sql rename to db/changes/10411-january/00-booking.sql diff --git a/db/changes/10411-january/00-companyGroup.sql b/db/changes/10411-january/00-companyGroup.sql new file mode 100644 index 000000000..2c5477e63 --- /dev/null +++ b/db/changes/10411-january/00-companyGroup.sql @@ -0,0 +1,12 @@ +UPDATE `vn`.`companyGroup` + SET `code`='verdnatura' + WHERE `id`=1; +UPDATE `vn`.`companyGroup` + SET `code`='ornamental' + WHERE `id`=2; +UPDATE `vn`.`companyGroup` + SET `code`='other' + WHERE `id`=3; +UPDATE `vn`.`companyGroup` + SET `code`='provisional' + WHERE `id`=4; diff --git a/db/changes/10410-january/00-saleVolume.sql b/db/changes/10411-january/00-saleVolume.sql similarity index 100% rename from db/changes/10410-january/00-saleVolume.sql rename to db/changes/10411-january/00-saleVolume.sql diff --git a/db/changes/10410-january/00-ticket_getMovable.sql b/db/changes/10411-january/00-ticket_getMovable.sql similarity index 100% rename from db/changes/10410-january/00-ticket_getMovable.sql rename to db/changes/10411-january/00-ticket_getMovable.sql diff --git a/db/changes/10410-january/00-workerLabour.sql b/db/changes/10411-january/00-workerLabour.sql similarity index 100% rename from db/changes/10410-january/00-workerLabour.sql rename to db/changes/10411-january/00-workerLabour.sql diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index beffbb385..b6629a50f 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -456,7 +456,7 @@ INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassification`, `credit`, `crea INSERT INTO `vn`.`companyGroup`(`id`, `code`) VALUES (1, 'wayneIndustries'), - (2, 'Verdnatura'); + (2, 'verdnatura'); INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`) VALUES diff --git a/modules/item/front/waste/index/style.scss b/modules/item/front/waste/index/style.scss index 09e3a2a4c..faac46139 100644 --- a/modules/item/front/waste/index/style.scss +++ b/modules/item/front/waste/index/style.scss @@ -11,7 +11,7 @@ vn-item-waste-detail { padding-bottom: 7px; padding-bottom: 4px; font-weight: lighter; - background-color: #fde6ca; + background-color: $color-bg; border-bottom: 1px solid #f7931e; white-space: nowrap; overflow: hidden;