zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added new orderCompleteEmail alert fields

This commit is contained in:
Dean Bartok-Thomas 2019-09-10 21:50:54 +01:00
parent fd265ae8bb
commit 013b12988f
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/account.js
View File

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

2
src/components/Tinymce/index.vue
View File

@ -43,7 +43,7 @@ export default {
},
menubar: {
type: String,
default: 'file edit insert view format table'
default: ''
},
height: {
type: [Number, String],

3
src/components/Tinymce/plugins.js
View File

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

30
src/views/accounts/components/AccountDetail.vue
View File

@ -93,7 +93,22 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="postForm.type === 'seller'">
<el-col :span="8">
<el-form-item label-width="120px" label="Send Order Complete Alert" class="postInfo-container-item">
<el-switch v-model="postForm.sendOrderCompleteAlert" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="postForm.type === 'seller' && postForm.sendOrderCompleteAlert">
<el-col :span="20">
<el-form-item label-width="120px" label="Order Complete Email Text" class="postInfo-container-item">
<tinymce v-model="postForm.orderCompleteAlertText" :height="150" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="postForm.type === 'seller'">
<el-col :span="12">
<el-form-item label-width="120px" label="Fuel Restriction" class="postInfo-container-item">
<el-transfer
@ -104,7 +119,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="postForm.type === 'seller'">
<el-col :span="12">
<el-form-item label-width="120px" label="Terminal Restriction" class="postInfo-container-item">
<el-transfer
@ -115,7 +130,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="postForm.type === 'seller'">
<el-col :span="12">
<el-form-item label-width="120px" label="Lifting Restriction" class="postInfo-container-item">
<el-transfer
@ -126,7 +141,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="postForm.type === 'seller'">
<el-col :span="12">
<el-form-item label-width="120px" label="Payment Restriction" class="postInfo-container-item">
<el-transfer
@ -160,6 +175,7 @@
<script>
import Sticky from '@/components/Sticky' // 粘性header组件
import { fetchAccount, updateAccount, createAccount } from '@/api/account'
import Tinymce from '@/components/Tinymce'
const fetchFuelList = require('@/api/product').fetchList
const fetchTerminalList = require('@/api/terminal').fetchList
const fetchLiftingPeriodsList = require('@/api/liftingPeriod').fetchList
@ -171,6 +187,8 @@ const defaultForm = {
phone: '',
email: '',
orderConfirmationEmail: '',
sendOrderCompleteAlert: false,
orderCompleteAlertText: '',
restrictions: {
fuels: [],
terminals: [],
@ -188,7 +206,7 @@ const defaultForm = {
export default {
name: 'AccountDetail',
components: { Sticky },
components: { Sticky, Tinymce },
props: {
isEdit: {
type: Boolean,
@ -323,6 +341,8 @@ export default {
fetchData(id) {
fetchAccount(id).then(response => {
const account = response.data
console.dir(account)
if (!account.restrictions) {
account.restrictions = {
fuels: [],