From 013b12988f69118a957209b22fc89ecb7632d595 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Tue, 10 Sep 2019 21:50:54 +0100
Subject: [PATCH] Added new orderCompleteEmail alert fields

---
 src/api/account.js                            |  8 +++--
 src/components/Tinymce/index.vue              |  2 +-
 src/components/Tinymce/plugins.js             |  3 +-
 .../accounts/components/AccountDetail.vue     | 30 +++++++++++++++----
 4 files changed, 34 insertions(+), 9 deletions(-)

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 @@
                   </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: [],