verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 54 Releases Wiki Activity

7273-driverRouteEmail #3259

Open
sergiodt wants to merge 3 commits from 7273-driverRouteEmail into dev
pull from: 7273-driverRouteEmail
merge into: verdnatura:dev
Conversation 0 Commits 3 Files Changed 9 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a61b5b9fe - Show all commits

2
db/dump/fixtures.before.sql
View File

@ -317,7 +317,7 @@ UPDATE `vn`.`agencyMode` SET `description` = 'Gotham247Expensive' WHERE `id` = 8
UPDATE `vn`.`agencyMode` SET `description` = 'Other agency' WHERE `id` = 10; UPDATE `vn`.`agencyMode` SET `description` = 'Other agency' WHERE `id` = 10;
UPDATE `vn`.`agencyMode` SET `description` = 'Refund' WHERE `id` = 23; UPDATE `vn`.`agencyMode` SET `description` = 'Refund' WHERE `id` = 23;
UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com'; UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail__` = 'no-reply@gothamcity.com';
UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE `id` = 23; UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE `id` = 23;

2
db/routines/vn2008/views/Agencias.sql
View File

@ -10,7 +10,7 @@ AS SELECT `am`.`id` AS `Id_Agencia`,
`am`.`agencyFk` AS `agency_id`, `am`.`agencyFk` AS `agency_id`,
`am`.`inflation` AS `inflacion`, `am`.`inflation` AS `inflacion`,
`am`.`isVolumetric` AS `is_volumetric`, `am`.`isVolumetric` AS `is_volumetric`,
`am`.`reportMail` AS `send_mail`, `am`.`reportMail__` AS `send_mail`,
`am`.`isActive` AS `tpv`, `am`.`isActive` AS `tpv`,
`am`.`code` AS `code`, `am`.`code` AS `code`,
`am`.`isRiskFree` AS `isRiskFree` `am`.`isRiskFree` AS `isRiskFree`

2
modules/zone/back/models/agency-mode.json
View File

@ -29,7 +29,7 @@
"inflation": { "inflation": {
"type": "number" "type": "number"
}, },
"reportMail": { "reportMail__": {
"type": "string" "type": "string"
}, },
"isActive": { "isActive": {