Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two

db/changes/10410-january/00-smsConfig.sql

@@ -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;

db/changes/10410-january/01-smsConfig_update.sql

@@ -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;

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;

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

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;