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

#8002 adjust to Lilium #3199

Open
jorgep wants to merge 8 commits from 8002-refactorToLilium into dev
pull from: 8002-refactorToLilium
merge into: verdnatura:dev
Conversation 0 Commits 8 Files Changed 3 +7 -16
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1c49c073ee - Show all commits

11
front/core/components/snackbar/snackbar.js
View File

@ -27,17 +27,8 @@ export default class Controller extends Component {
setTimeout(() => element.classList.add('shown'), 30); setTimeout(() => element.classList.add('shown'), 30);
shape.element = element; shape.element = element;
if (data.additionalData && this.vnToken.token) { if (data.additionalData && this.vnToken.token)
this.additionalData = data.additionalData; this.additionalData = data.additionalData;
let supportButton = document.createElement('i');
supportButton.setAttribute('class', 'material-icons clickable');
supportButton.addEventListener('click', () => this.$.supportDialog.show());
element.appendChild(supportButton);
let buttonIcon = 'support_agent';
buttonIcon = document.createTextNode(buttonIcon);
supportButton.appendChild(buttonIcon);
}
if (shape.type) if (shape.type)
element.classList.add(shape.type); element.classList.add(shape.type);

12
front/core/components/support-dialog/index.js
View File

@ -10,12 +10,12 @@ export default class Controller extends Dialog {
if (response !== 'accept') if (response !== 'accept')
return super.responseHandler(response); return super.responseHandler(response);
this.$http.post('Ostickets/send-to-support', { // this.$http.post('Ostickets/send-to-support', {
reason: this.reason, // reason: this.reason,
additionalData: this.additionalData // additionalData: this.additionalData
}) // })
.then(() => super.responseHandler(response)) // .then(() => super.responseHandler(response))
.then(() => this.vnApp.showSuccess(this.$t('Email sended!'))); // .then(() => this.vnApp.showSuccess(this.$t('Email sended!')));
} }
} }