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

6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
Conversation 0 Commits 191 Files Changed 177 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c61105e356 - Show all commits

2
db/changes/240402/00-saleComponent.sql → db/changes/240403/00-saleComponent.sql
View File

@ -585,5 +585,5 @@ END$$
DELIMITER ; DELIMITER ;
TRUNCATE TABLE `vn`.`ticketUpdateAction`; TRUNCATE TABLE `vn`.`ticketUpdateAction`;
INSERT INTO `vn`.`ticketUpdateAction` (id, description, code) VALUES(1, 'Cambiar los precios en el ticket', 'renewPrice'); INSERT INTO `vn`.`ticketUpdateAction` (id, description, code) VALUES(1, 'Cambiar los precios en el ticket', 'renewPrices');
INSERT INTO `vn`.`ticketUpdateAction` (id, description, code) VALUES(2, 'Convertir en maná', 'mana'); INSERT INTO `vn`.`ticketUpdateAction` (id, description, code) VALUES(2, 'Convertir en maná', 'mana');

2
modules/ticket/front/basic-data/step-two/index.js
View File

@ -25,7 +25,7 @@ class Controller extends Component {
loadDefaultTicketAction() { loadDefaultTicketAction() {
const isSalesAssistant = this.aclService.hasAny(['salesAssistant']); const isSalesAssistant = this.aclService.hasAny(['salesAssistant']);
this.ticket.option = isSalesAssistant ? 'mana' : 'buyerDiscount'; this.ticket.option = isSalesAssistant ? 'mana' : 'renewPrices';
} }
onStepChange() { onStepChange() {