diff --git a/src/api/account.js b/src/api/account.js index 20bb1426..7c2a2c1f 100644 --- a/src/api/account.js +++ b/src/api/account.js @@ -32,7 +32,9 @@ export function createAccount(data) { 'fuelRestrictions': data.restrictions.fuels, 'terminalRestrictions': data.restrictions.terminals, 'paymentTermsRestrictions': data.restrictions.paymentTerms, - 'liftingPeriodRestrictions': data.restrictions.liftingPeriods + 'liftingPeriodRestrictions': data.restrictions.liftingPeriods, + 'sendOrderCompleteAlert': data.sendOrderCompleteAlert, + 'orderCompleteAlertText': data.orderCompleteAlertText } return axios.post(`${apiUrl}/account/create`, dto) @@ -56,7 +58,9 @@ export function updateAccount(data) { 'fuelRestrictions': data.restrictions.fuels, 'terminalRestrictions': data.restrictions.terminals, 'paymentTermsRestrictions': data.restrictions.paymentTerms, - 'liftingPeriodRestrictions': data.restrictions.liftingPeriods + 'liftingPeriodRestrictions': data.restrictions.liftingPeriods, + 'sendOrderCompleteAlert': data.sendOrderCompleteAlert, + 'orderCompleteAlertText': data.orderCompleteAlertText } return axios.put(`${apiUrl}/account/${data.id}`, dto) diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index 0c6174c4..737e2acc 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -43,7 +43,7 @@ export default { }, menubar: { type: String, - default: 'file edit insert view format table' + default: '' }, height: { type: [Number, String], diff --git a/src/components/Tinymce/plugins.js b/src/components/Tinymce/plugins.js index 058d2aef..91e6849f 100644 --- a/src/components/Tinymce/plugins.js +++ b/src/components/Tinymce/plugins.js @@ -2,6 +2,7 @@ // Detail plugins list see https://www.tinymce.com/docs/plugins/ // Custom builds see https://www.tinymce.com/download/custom-builds/ -const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount'] +// const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount'] +const plugins = [] export default plugins diff --git a/src/views/accounts/components/AccountDetail.vue b/src/views/accounts/components/AccountDetail.vue index 6e696a55..bafd0f20 100644 --- a/src/views/accounts/components/AccountDetail.vue +++ b/src/views/accounts/components/AccountDetail.vue @@ -93,7 +93,22 @@ - + + + + + + + + + + + + - + - + - +