From 65149d5049055679fb1fa8a877a3cd9103d536b6 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Sat, 31 Aug 2019 22:02:57 +0100
Subject: [PATCH 01/16] Few Terminal based name corrects

---
 src/router/index.js                                       | 2 +-
 .../components/{AccountDetail.vue => TerminalDetail.vue}  | 8 ++++----
 src/views/terminals/create.vue                            | 6 +++---
 src/views/terminals/edit.vue                              | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/views/terminals/components/{AccountDetail.vue => TerminalDetail.vue} (97%)

diff --git a/src/router/index.js b/src/router/index.js
index aaa655d6..7b5cda9d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -244,7 +244,7 @@ export const asyncRoutes = [
         path: 'create',
         component: () => import('@/views/products/create'),
         name: 'CreateProduct',
-        meta: { title: 'Create Products', icon: 'edit' }
+        meta: { title: 'Create Product', icon: 'edit' }
       },
       {
         path: 'edit/:id',
diff --git a/src/views/terminals/components/AccountDetail.vue b/src/views/terminals/components/TerminalDetail.vue
similarity index 97%
rename from src/views/terminals/components/AccountDetail.vue
rename to src/views/terminals/components/TerminalDetail.vue
index 3c6c2554..275bc789 100644
--- a/src/views/terminals/components/AccountDetail.vue
+++ b/src/views/terminals/components/TerminalDetail.vue
@@ -185,12 +185,12 @@ export default {
       })
     },
     setTagsViewTitle() {
-      const title = 'Edit Account'
+      const title = 'Edit Terminal'
       const route = Object.assign({}, this.tempRoute, { title: `${title} - ${this.postForm.name}` })
       this.$store.dispatch('tagsView/updateVisitedView', route)
     },
     setPageTitle() {
-      const title = 'Edit Account'
+      const title = 'Edit Terminal'
       document.title = `${title} - ${this.postForm.id}`
     },
     submitForm() {
@@ -203,13 +203,13 @@ export default {
           methodToCall(this.postForm).then((r) => {
             this.$notify({
               title: 'Success',
-              message: 'Account Saved',
+              message: 'Terminal Saved',
               type: 'success',
               duration: 2000
             })
 
             // Redirect to the edit page when we create a new one
-            if (!this.isEdit) { this.$router.push(`/accounts/edit/${r.data.id}`) }
+            if (!this.isEdit) { this.$router.push(`/terminals/edit/${r.data.id}`) }
 
             this.loading = false
           }).catch((e) => {
diff --git a/src/views/terminals/create.vue b/src/views/terminals/create.vue
index d8a74df5..0e59a71d 100644
--- a/src/views/terminals/create.vue
+++ b/src/views/terminals/create.vue
@@ -1,13 +1,13 @@
 <template>
-  <account-detail :is-edit="false" />
+  <terminal-detail :is-edit="false" />
 </template>
 
 <script>
-import AccountDetail from './components/AccountDetail'
+import TerminalDetail from './components/TerminalDetail'
 
 export default {
   name: 'CreateForm',
-  components: { AccountDetail }
+  components: { TerminalDetail }
 }
 </script>
 
diff --git a/src/views/terminals/edit.vue b/src/views/terminals/edit.vue
index 748ebb82..01f1f7a5 100644
--- a/src/views/terminals/edit.vue
+++ b/src/views/terminals/edit.vue
@@ -1,13 +1,13 @@
 <template>
-  <account-detail :is-edit="true" />
+  <terminal-detail :is-edit="true" />
 </template>
 
 <script>
-import AccountDetail from './components/AccountDetail'
+import TerminalDetail from './components/TerminalDetail'
 
 export default {
   name: 'EditForm',
-  components: { AccountDetail }
+  components: { TerminalDetail }
 }
 </script>
 

From eeeccde926b472462d5bfadb440d8a99ab9e0c46 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Sat, 31 Aug 2019 22:17:13 +0100
Subject: [PATCH 02/16] Terminal management complete

---
 src/api/terminal.js                           |  6 ++-
 .../terminals/components/TerminalDetail.vue   | 38 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/api/terminal.js b/src/api/terminal.js
index a575df8d..5c1721fc 100644
--- a/src/api/terminal.js
+++ b/src/api/terminal.js
@@ -29,6 +29,10 @@ function __dataToDTO(data) {
     'county': data.address.county,
     'country': data.address.country,
     'postCode': data.address.postCode,
-    'identifier': data.identifier
+    'identifier': data.identifier,
+    'contactNumber': data.contactNumber,
+    'fullName': data.fullName,
+    'meta': data.meta,
+    'regionId': data.region_id
   }
 }
diff --git a/src/views/terminals/components/TerminalDetail.vue b/src/views/terminals/components/TerminalDetail.vue
index 275bc789..4591338d 100644
--- a/src/views/terminals/components/TerminalDetail.vue
+++ b/src/views/terminals/components/TerminalDetail.vue
@@ -32,7 +32,21 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label-width="120px" label="Name" class="postInfo-container-item">
-                    <el-input v-model="postForm.name" placeholder="Account Name" />
+                    <el-input v-model="postForm.name" placeholder="Terminal Display Name" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Full Name" class="postInfo-container-item">
+                    <el-input v-model="postForm.fullName" placeholder="Terminal Full Name" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Contact Num" class="postInfo-container-item">
+                    <el-input v-model="postForm.contactNumber" placeholder="Terminal Contact Number" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -71,6 +85,13 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Opening Hours" class="postInfo-container-item">
+                    <el-input v-model="postForm.meta.openingHours" type="textarea" rows="2" placeholder="Terminal Opening Hours" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label-width="120px" label="Status" class="postInfo-container-item">
@@ -99,6 +120,8 @@ const fetchRegionList = require('@/api/region').fetchList
 const defaultForm = {
   id: '',
   name: '',
+  fullName: '',
+  contactNumber: '',
   region_id: '',
   address: {
     line1: '',
@@ -106,6 +129,9 @@ const defaultForm = {
     county: '',
     postCode: '',
     country: ''
+  },
+  meta: {
+    openingHours: ''
   }
 }
 
@@ -173,7 +199,15 @@ export default {
   methods: {
     fetchData(id) {
       fetchTerminal(id).then(response => {
-        this.postForm = response.data
+        const terminal = response.data
+
+        if (!terminal.meta) {
+          terminal.meta = {
+            openingHours: ''
+          }
+        }
+
+        this.postForm = terminal
 
         // // set tagsview title
         this.setTagsViewTitle()

From e6544d6dd81a069f4b716b14cc0c7302106a58bf Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Sun, 1 Sep 2019 16:06:55 +0100
Subject: [PATCH 03/16] Added FAQs to the admin

---
 src/api/faq.js                          |  31 ++++
 src/router/index.js                     |  31 ++++
 src/views/faqs/components/FaqDetail.vue | 230 ++++++++++++++++++++++++
 src/views/faqs/create.vue               |  13 ++
 src/views/faqs/edit.vue                 |  13 ++
 src/views/faqs/list.vue                 |  93 ++++++++++
 6 files changed, 411 insertions(+)
 create mode 100644 src/api/faq.js
 create mode 100644 src/views/faqs/components/FaqDetail.vue
 create mode 100644 src/views/faqs/create.vue
 create mode 100644 src/views/faqs/edit.vue
 create mode 100644 src/views/faqs/list.vue

diff --git a/src/api/faq.js b/src/api/faq.js
new file mode 100644
index 00000000..671b593d
--- /dev/null
+++ b/src/api/faq.js
@@ -0,0 +1,31 @@
+import axios from 'axios'
+
+const FAQEndpointUrl = 'https://metadata.service.development.therig.onlinefuelslabs.io'
+
+export function fetchList(query) {
+  return axios.get(`${FAQEndpointUrl}/faqs`, { params: query })
+}
+
+export function fetchFaq(id) {
+  return axios.get(`${FAQEndpointUrl}/faqs/${id}?platform=OLFDE`)
+}
+
+export function createFaq(data) {
+  const dto = __dataToDTO(data)
+  return axios.post(`${FAQEndpointUrl}/faqs`, dto)
+}
+
+export function updateFaq(data) {
+  const dto = __dataToDTO(data)
+  return axios.put(`${FAQEndpointUrl}/faqs/${data._id}`, dto)
+}
+
+function __dataToDTO(data) {
+  return {
+    'question': data.question,
+    'answer': data.answer,
+    'order': parseInt(data.order),
+    'status': data.status,
+    'platform': 'OLFDE'
+  }
+}
diff --git a/src/router/index.js b/src/router/index.js
index 7b5cda9d..fb160cfb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -261,6 +261,37 @@ export const asyncRoutes = [
       }
     ]
   },
+  {
+    path: '/faqs',
+    component: Layout,
+    redirect: '/faqs/list',
+    name: 'FAQs',
+    meta: {
+      title: 'FAQs',
+      icon: 'example'
+    },
+    children: [
+      {
+        path: 'create',
+        component: () => import('@/views/faqs/create'),
+        name: 'CreateFAQ',
+        meta: { title: 'Create FAQ', icon: 'edit' }
+      },
+      {
+        path: 'edit/:id',
+        component: () => import('@/views/faqs/edit'),
+        name: 'EditFAQs',
+        meta: { title: 'Edit FAQ', noCache: true, activeMenu: '/faqs/list' },
+        hidden: true
+      },
+      {
+        path: 'list',
+        component: () => import('@/views/faqs/list'),
+        name: 'FAQList',
+        meta: { title: 'FAQ List', icon: 'list' }
+      }
+    ]
+  },
   {
     path: '/permission',
     component: Layout,
diff --git a/src/views/faqs/components/FaqDetail.vue b/src/views/faqs/components/FaqDetail.vue
new file mode 100644
index 00000000..2dbf0867
--- /dev/null
+++ b/src/views/faqs/components/FaqDetail.vue
@@ -0,0 +1,230 @@
+<template>
+  <div class="createProduct-container">
+    <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+
+      <sticky :z-index="10" :class-name="'sub-navbar '+postForm.status">
+        <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
+          Save
+        </el-button>
+      </sticky>
+
+      <div class="createPost-main-container">
+
+        <el-row>
+          <el-col :span="20">
+            <div class="postInfo-container">
+              <el-row v-if="isEdit">
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Id" class="postInfo-container-item">
+                    <el-input v-model="postForm._id" placeholder="Id" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Order" class="postInfo-container-item">
+                    <el-input v-model="postForm.order" placeholder="FAQ Order" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Status" class="postInfo-container-item">
+                    <el-radio-group v-model="postForm.status">
+                      <el-radio-button label="ENABLED">Enabled</el-radio-button>
+                      <el-radio-button label="DISABLED">Disabled</el-radio-button>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="16">
+                  <el-form-item label-width="120px" label="Question" class="postInfo-container-item">
+                    <el-input v-model="postForm.question" placeholder="Question" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="16">
+                  <el-form-item label-width="120px" label="Answer" class="postInfo-container-item">
+                    <markdown-editor ref="markdownEditor" v-model="postForm.answer" mode="wysiwyg" :options="{previewStyle:'tab'}" height="200px" width="600px" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Sticky from '@/components/Sticky' // 粘性header组件
+import MarkdownEditor from '@/components/MarkdownEditor'
+import { fetchFaq, updateFaq, createFaq } from '@/api/faq'
+
+const defaultForm = {
+  id: '',
+  question: '',
+  answer: '',
+  status: '',
+  order: 0
+}
+
+export default {
+  name: 'FaqDetail',
+  components: { Sticky, MarkdownEditor },
+  props: {
+    isEdit: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const validateRequire = (rule, value, callback) => {
+      if (value === '') {
+        this.$message({
+          message: rule.field + 'Epic Success brudda',
+          type: 'error'
+        })
+        callback(new Error(rule.field + ' ERRRR'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      postForm: Object.assign({}, defaultForm),
+      loading: false,
+      regionListOptions: [],
+      rules: {
+        // image_uri: [{ validator: validateRequire }],
+        name: [{ validator: validateRequire }]
+        // content: [{ validator: validateRequire }],
+        // source_uri: [{ validator: validateSourceUri, trigger: 'blur' }]
+      },
+      tempRoute: {}
+    }
+  },
+  computed: {
+    displayTime: {
+      // set and get is useful when the data
+      // returned by the back end api is different from the front end
+      // back end return => "2013-06-25 06:59:25"
+      // front end need timestamp => 1372114765000
+      get() {
+        return (+new Date(this.postForm.display_time))
+      },
+      set(val) {
+        this.postForm.display_time = new Date(val)
+      }
+    }
+  },
+  created() {
+    if (this.isEdit) {
+      const id = this.$route.params && this.$route.params.id
+      this.fetchData(id)
+    } else {
+      this.postForm = Object.assign({}, defaultForm)
+    }
+
+    // Why need to make a copy of this.$route here?
+    // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
+    // https://github.com/PanJiaChen/vue-element-admin/issues/1221
+    this.tempRoute = Object.assign({}, this.$route)
+  },
+  methods: {
+    fetchData(id) {
+      fetchFaq(id).then(response => {
+        const faq = response.data
+
+        this.postForm = faq
+
+        // // set tagsview title
+        this.setTagsViewTitle()
+
+        // // set page title
+        this.setPageTitle()
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    setTagsViewTitle() {
+      const title = 'Edit FAQ'
+      const route = Object.assign({}, this.tempRoute, { title: `${title} - ${this.postForm.question}` })
+      this.$store.dispatch('tagsView/updateVisitedView', route)
+    },
+    setPageTitle() {
+      const title = 'Edit FAQ'
+      document.title = `${title} - ${this.postForm.id}`
+    },
+    submitForm() {
+      this.$refs.postForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+
+          // Save the account
+          const methodToCall = this.isEdit ? updateFaq : createFaq
+          methodToCall(this.postForm).then((r) => {
+            this.$notify({
+              title: 'Success',
+              message: 'FAQ Saved',
+              type: 'success',
+              duration: 2000
+            })
+
+            // Redirect to the edit page when we create a new one
+            if (!this.isEdit) { this.$router.push(`/faqs/edit/${r.data.createdFaq._id}`) }
+
+            this.loading = false
+          }).catch((e) => {
+            console.dir(e)
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/mixin.scss";
+
+.createPost-container {
+  position: relative;
+
+  .createPost-main-container {
+    padding: 40px 45px 20px 50px;
+
+    .postInfo-container {
+      position: relative;
+      @include clearfix;
+      margin-bottom: 10px;
+
+      .postInfo-container-item {
+        float: left;
+      }
+    }
+  }
+
+  .word-counter {
+    width: 40px;
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+
+.article-textarea /deep/ {
+  textarea {
+    padding-right: 40px;
+    resize: none;
+    border: none;
+    border-radius: 0px;
+    border-bottom: 1px solid #bfcbd9;
+  }
+}
+</style>
diff --git a/src/views/faqs/create.vue b/src/views/faqs/create.vue
new file mode 100644
index 00000000..54787aea
--- /dev/null
+++ b/src/views/faqs/create.vue
@@ -0,0 +1,13 @@
+<template>
+  <faq-detail :is-edit="false" />
+</template>
+
+<script>
+import FaqDetail from './components/FaqDetail'
+
+export default {
+  name: 'CreateForm',
+  components: { FaqDetail }
+}
+</script>
+
diff --git a/src/views/faqs/edit.vue b/src/views/faqs/edit.vue
new file mode 100644
index 00000000..109cb466
--- /dev/null
+++ b/src/views/faqs/edit.vue
@@ -0,0 +1,13 @@
+<template>
+  <faq-detail :is-edit="true" />
+</template>
+
+<script>
+import FaqDetail from './components/FaqDetail'
+
+export default {
+  name: 'EditForm',
+  components: { FaqDetail }
+}
+</script>
+
diff --git a/src/views/faqs/list.vue b/src/views/faqs/list.vue
new file mode 100644
index 00000000..fe8fad09
--- /dev/null
+++ b/src/views/faqs/list.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="app-container">
+
+    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
+      <el-table-column align="center" label="Question" width="300">
+        <template slot-scope="scope">
+          <span>{{ scope.row.question }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Order" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.order }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Status" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.status }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Actions" width="120">
+        <template slot-scope="scope">
+          <router-link :to="'/faqs/edit/' + scope.row._id">
+            <el-button type="primary" size="small" icon="el-icon-edit">
+              Edit
+            </el-button>
+          </router-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { fetchList } from '@/api/faq'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+
+export default {
+  name: 'FaqList',
+  components: { Pagination },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      list: null,
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  created() {
+    this.listQuery.platform = 'OLFDE'
+
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.faqs
+        this.total = response.data.faqs.length
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

From b6163b1fe1cb8269572f3f021add19fa43991481 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Sun, 1 Sep 2019 23:09:20 +0100
Subject: [PATCH 04/16] Added orders list and filtering, displaying of order
 too

---
 package.json                                |   1 +
 src/api/order.js                            |  13 +
 src/router/index.js                         |  31 ++
 src/views/orders/components/OrderDetail.vue | 334 ++++++++++++++++++++
 src/views/orders/create.vue                 |  13 +
 src/views/orders/edit.vue                   |  13 +
 src/views/orders/list.vue                   | 204 ++++++++++++
 7 files changed, 609 insertions(+)
 create mode 100644 src/api/order.js
 create mode 100644 src/views/orders/components/OrderDetail.vue
 create mode 100644 src/views/orders/create.vue
 create mode 100644 src/views/orders/edit.vue
 create mode 100644 src/views/orders/list.vue

diff --git a/package.json b/package.json
index 351bf5dc..3780f34b 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
     "jszip": "3.2.1",
+    "moment": "^2.24.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
diff --git a/src/api/order.js b/src/api/order.js
new file mode 100644
index 00000000..1585e733
--- /dev/null
+++ b/src/api/order.js
@@ -0,0 +1,13 @@
+import axios from 'axios'
+
+const apiUrl = 'https://orders.service.development.therig.onlinefuelslabs.io'
+
+export function fetchList(query) {
+  query.platform = 'OLFDE'
+  query.accountId = '5caf6ca5bca1f9001212b6ec'
+  return axios.get(`${apiUrl}/orders`, { params: query })
+}
+
+export function fetchOrder(id) {
+  return axios.get(`${apiUrl}/orders/${id}`)
+}
diff --git a/src/router/index.js b/src/router/index.js
index fb160cfb..41a94db8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -292,6 +292,37 @@ export const asyncRoutes = [
       }
     ]
   },
+  {
+    path: '/orders',
+    component: Layout,
+    redirect: '/orders/list',
+    name: 'Orders',
+    meta: {
+      title: 'Orders',
+      icon: 'example'
+    },
+    children: [
+      {
+        path: 'create',
+        component: () => import('@/views/orders/create'),
+        name: 'CreateOrder',
+        meta: { title: 'Create Order', icon: 'edit' }
+      },
+      {
+        path: 'edit/:id',
+        component: () => import('@/views/orders/edit'),
+        name: 'EditOrder',
+        meta: { title: 'Edit Order', noCache: true, activeMenu: '/orders/list' },
+        hidden: true
+      },
+      {
+        path: 'list',
+        component: () => import('@/views/orders/list'),
+        name: 'OrderList',
+        meta: { title: 'Order List', icon: 'list' }
+      }
+    ]
+  },
   {
     path: '/permission',
     component: Layout,
diff --git a/src/views/orders/components/OrderDetail.vue b/src/views/orders/components/OrderDetail.vue
new file mode 100644
index 00000000..c7d242cc
--- /dev/null
+++ b/src/views/orders/components/OrderDetail.vue
@@ -0,0 +1,334 @@
+<template>
+  <div class="createProduct-container">
+    <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+
+      <sticky :z-index="10" :class-name="'sub-navbar '+postForm.status">
+        <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
+          Save
+        </el-button>
+      </sticky>
+
+      <div class="createPost-main-container">
+
+        <el-row>
+          <el-col :span="20">
+            <div class="postInfo-container">
+              <el-row v-if="isEdit">
+                <el-col :span="4">
+                  <el-form-item label-width="120px" label="Id" class="postInfo-container-item">
+                    <el-input v-model="postForm.orderId" placeholder="Id" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="isEdit">
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Seller" class="postInfo-container-item">
+                    <el-input v-model="postForm.offers[0].seller.name" placeholder="Seller" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="isEdit">
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Buyer" class="postInfo-container-item">
+                    <el-input v-model="postForm.buyer.name" placeholder="Buyer" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Status" class="postInfo-container-item">
+                    <el-radio-group v-model="postForm.status">
+                      <el-radio-button label="Complete">Complete</el-radio-button>
+                      <el-radio-button label="Cancelled">Cancelled</el-radio-button>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="isEdit">
+                <el-col :span="18">
+                  <el-form-item label-width="120px" label="Items" class="postInfo-container-item">
+
+                    <el-table :data="postForm.offers" border style="width: 100%">
+                      <el-table-column align="center" label="Id" width="100">
+                        <template slot-scope="scope">
+                          <span>{{ postForm.orderId }}-{{ scope.$index + 1 }}</span>
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column align="center" label="Product" width="170">
+                        <template slot-scope="scope">
+                          <span>{{ scope.row.fuel.name }}</span>
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column align="center" label="Terminal" width="170">
+                        <template slot-scope="scope">
+                          <span>{{ scope.row.terminal.name }}</span>
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column align="center" label="Lifting" width="120">
+                        <template slot-scope="scope">
+                          <span>{{ scope.row | collectionTime }}</span>
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column align="center" label="Credit" width="120">
+                        <template>
+                          <span>Wie Vereinbart</span>
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column align="center" label="Price" width="90">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.price" placeholder="0.00" />
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column align="center" label="Volume" width="80">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.quantityOrdered" placeholder="0" />
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column align="center" label="Line Total">
+                        <template slot-scope="scope">
+                          <span>{{ Number((scope.row.quantityOrdered * scope.row.price) * 10).toFixed(2) }}</span>
+                        </template>
+                      </el-table-column>
+
+                    </el-table>
+
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="isEdit">
+                <el-col :span="4">
+                  <el-form-item label-width="120px" label="Ex. VAT" class="postInfo-container-item">
+                    <el-input v-model="exVatPrice" placeholder="0" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="isEdit">
+                <el-col :span="4">
+                  <el-form-item label-width="120px" label="VAT" class="postInfo-container-item">
+                    <el-input v-model="vatPrice" placeholder="0" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row v-if="isEdit">
+                <el-col :span="4">
+                  <el-form-item label-width="120px" label="Total" class="postInfo-container-item">
+                    <el-input v-model="totalPrice" placeholder="0" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Sticky from '@/components/Sticky' // 粘性header组件
+import { fetchOrder } from '@/api/order'
+
+const defaultForm = {
+  id: '',
+  orderId: ''
+}
+
+export default {
+  name: 'OrderDetail',
+  components: { Sticky },
+  filters: {
+    collectionTime(offer) {
+      if (offer.collectionRange) {
+        return 'Range'
+      } else {
+        return 'Add on days'
+      }
+    },
+    credit(offer) {
+      if (offer.collectionRange) {
+        return 'Range'
+      } else {
+        return 'Add on days'
+      }
+    }
+  },
+  props: {
+    isEdit: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const validateRequire = (rule, value, callback) => {
+      if (value === '') {
+        this.$message({
+          message: rule.field + 'Epic Success brudda',
+          type: 'error'
+        })
+        callback(new Error(rule.field + ' ERRRR'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      postForm: Object.assign({}, defaultForm),
+      loading: false,
+      regionListOptions: [],
+      rules: {
+        // image_uri: [{ validator: validateRequire }],
+        name: [{ validator: validateRequire }]
+        // content: [{ validator: validateRequire }],
+        // source_uri: [{ validator: validateSourceUri, trigger: 'blur' }]
+      },
+      tempRoute: {}
+    }
+  },
+  computed: {
+    displayTime: {
+      // set and get is useful when the data
+      // returned by the back end api is different from the front end
+      // back end return => "2013-06-25 06:59:25"
+      // front end need timestamp => 1372114765000
+      get() {
+        return (+new Date(this.postForm.display_time))
+      },
+      set(val) {
+        this.postForm.display_time = new Date(val)
+      }
+    },
+    exVatPrice: {
+      get() {
+        let price = 0
+        this.postForm.offers.forEach(element => {
+          price += ((element.price * 10) * element.quantityOrdered)
+        })
+        return price.toFixed(2)
+      }
+    },
+    vatPrice: {
+      get() {
+        return (Number(this.exVatPrice) * 0.19).toFixed(2)
+      }
+    },
+    totalPrice: {
+      get() {
+        return (Number(this.exVatPrice) + Number(this.vatPrice)).toFixed(2)
+      }
+    }
+  },
+  created() {
+    if (this.isEdit) {
+      const id = this.$route.params && this.$route.params.id
+      this.fetchData(id)
+    } else {
+      this.postForm = Object.assign({}, defaultForm)
+    }
+
+    // Why need to make a copy of this.$route here?
+    // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
+    // https://github.com/PanJiaChen/vue-element-admin/issues/1221
+    this.tempRoute = Object.assign({}, this.$route)
+  },
+  methods: {
+    fetchData(id) {
+      fetchOrder(id).then(response => {
+        const order = response.data.order
+
+        this.postForm = order
+
+        // // set tagsview title
+        this.setTagsViewTitle()
+
+        // // set page title
+        this.setPageTitle()
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    setTagsViewTitle() {
+      const title = 'Edit Order'
+      const route = Object.assign({}, this.tempRoute, { title: `${title} - ${this.postForm.orderId}` })
+      this.$store.dispatch('tagsView/updateVisitedView', route)
+    },
+    setPageTitle() {
+      const title = 'Edit Order'
+      document.title = `${title} - ${this.postForm.id}`
+    },
+    submitForm() {
+      this.$refs.postForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+
+          // Save the account
+          const methodToCall = this.isEdit ? function() {} : function() {}
+          methodToCall(this.postForm).then((r) => {
+            this.$notify({
+              title: 'Success',
+              message: 'FAQ Saved',
+              type: 'success',
+              duration: 2000
+            })
+
+            // Redirect to the edit page when we create a new one
+            if (!this.isEdit) { this.$router.push(`/faqs/edit/${r.data.createdFaq._id}`) }
+
+            this.loading = false
+          }).catch((e) => {
+            console.dir(e)
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/mixin.scss";
+
+.createPost-container {
+  position: relative;
+
+  .createPost-main-container {
+    padding: 40px 45px 20px 50px;
+
+    .postInfo-container {
+      position: relative;
+      @include clearfix;
+      margin-bottom: 10px;
+
+      .postInfo-container-item {
+        float: left;
+      }
+    }
+  }
+
+  .word-counter {
+    width: 40px;
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+
+.article-textarea /deep/ {
+  textarea {
+    padding-right: 40px;
+    resize: none;
+    border: none;
+    border-radius: 0px;
+    border-bottom: 1px solid #bfcbd9;
+  }
+}
+</style>
diff --git a/src/views/orders/create.vue b/src/views/orders/create.vue
new file mode 100644
index 00000000..78935d4e
--- /dev/null
+++ b/src/views/orders/create.vue
@@ -0,0 +1,13 @@
+<template>
+  <order-detail :is-edit="false" />
+</template>
+
+<script>
+import OrderDetail from './components/OrderDetail'
+
+export default {
+  name: 'CreateForm',
+  components: { OrderDetail }
+}
+</script>
+
diff --git a/src/views/orders/edit.vue b/src/views/orders/edit.vue
new file mode 100644
index 00000000..c16bed3e
--- /dev/null
+++ b/src/views/orders/edit.vue
@@ -0,0 +1,13 @@
+<template>
+  <order-detail :is-edit="true" />
+</template>
+
+<script>
+import OrderDetail from './components/OrderDetail'
+
+export default {
+  name: 'EditForm',
+  components: { OrderDetail }
+}
+</script>
+
diff --git a/src/views/orders/list.vue b/src/views/orders/list.vue
new file mode 100644
index 00000000..c0bb3fcf
--- /dev/null
+++ b/src/views/orders/list.vue
@@ -0,0 +1,204 @@
+<template>
+  <div class="app-container">
+
+    <div class="filter-container">
+      <el-input v-model="listQuery.orderId" placeholder="Order Id" width="10%" />
+      <el-date-picker
+        v-model="listQuery.dateRange"
+        type="daterange"
+        range-separator="To"
+        start-placeholder="Start date"
+        end-placeholder="End date"
+      />
+      <el-select v-model="listQuery.sellerAccountId" :remote-method="getRemoteAccountList" filterable default-first-option remote placeholder="Seller Accounts" loading-text="Loading...">
+        <el-option v-for="(item,index) in sellerAccounts" :key="item+index" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-select v-model="listQuery.buyerAccountId" :remote-method="getRemoteAccountList" filterable default-first-option remote placeholder="Buyer Accounts" loading-text="Loading...">
+        <el-option v-for="(item,index) in buyerAccounts" :key="item+index" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
+        Search
+      </el-button>
+      <el-button class="filter-item" type="danger" icon="el-icon-remove" @click="resetFilter">
+        Reset
+      </el-button>
+    </div>
+
+    <el-table v-loading="listLoading" :data="list" border fit style="width: 100%" :summary-method="getSummary" show-summary>
+      <el-table-column align="center" label="Date" sortable prop="created" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.created }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="orderId" sortable label="Order Id" width="100" />
+
+      <el-table-column align="center" prop="offers[0].seller.name" sortable label="Seller" width="250" />
+
+      <el-table-column align="center" prop="buyer.name" sortable label="Buyer" width="250" />
+
+      <el-table-column align="center" label="Total" width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.offers | totalPrice }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Products" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.offers.length }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column class-name="status-col" label="Status" width="110">
+        <template slot-scope="{row}">
+          <el-tag :type="row.status | statusFilter">
+            {{ row.status }}
+          </el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Actions" width="120">
+        <template slot-scope="scope">
+          <router-link :to="'/orders/edit/' + scope.row._id">
+            <el-button type="primary" size="small" icon="el-icon-edit">
+              Edit
+            </el-button>
+          </router-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+  </div>
+</template>
+
+<script>
+const fetchAccountList = require('@/api/account').fetchList
+import { fetchList } from '@/api/order'
+import moment from 'moment'
+
+export default {
+  name: 'OrderList',
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        Complete: 'success',
+        Cancelled: 'danger'
+      }
+      return statusMap[status]
+    },
+    totalPrice(offers) {
+      let price = 0
+      offers.forEach(element => {
+        price += ((element.price * 10) * element.quantityOrdered)
+      })
+      return `€${(price * 1.19).toFixed(2)}`
+    }
+  },
+  data() {
+    return {
+      sellerAccounts: [],
+      buyerAccounts: [],
+      originalList: null,
+      list: null,
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 20,
+        orderId: '',
+        buyerAccountId: '',
+        sellerAccountId: '',
+        dateRange: [moment().startOf('day').startOf('week').toDate(), moment().toDate()]
+      }
+    }
+  },
+  created() {
+    this.listQuery.platform = 'OLFDE'
+    this.getList()
+  },
+  methods: {
+    getRemoteAccountList(query) {
+      query = {}
+      query.platform = 'OLFDE'
+      query.limit = 100
+      fetchAccountList(query).then(response => {
+        if (!response.data.docs) return
+        this.sellerAccounts = response.data.docs.filter(a => a.type === 'seller').map(v => { return { name: v.name, id: v._id } })
+        this.buyerAccounts = response.data.docs.filter(a => a.type === 'buyer').map(v => { return { name: v.name, id: v._id } })
+      })
+    },
+    getSummary(param) {
+      const { data } = param
+      const sums = []
+
+      let totalPrice = 0
+      data.forEach(order => {
+        order.offers.forEach(element => {
+          totalPrice += ((element.price * 10) * element.quantityOrdered)
+        })
+      })
+
+      // Set the sum on the 4th column, as that's the cost one
+      sums[4] = Number(totalPrice * 1.19).toFixed(2)
+
+      return sums
+    },
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.originalList = response.data.orders
+        this.total = response.data.orders.length
+        this.listLoading = false
+
+        // Handle the filter for the initial load
+        this.handleFilter()
+      })
+    },
+    resetFilter() {
+      this.listQuery.orderId = ''
+      this.listQuery.dateRange = []
+      this.listQuery.sellerAccountId = ''
+      this.listQuery.buyerAccountId = ''
+    },
+    handleFilter() {
+      const allItems = this.originalList
+
+      // If we have an orderId, that trumps all other fields
+      if (this.listQuery.orderId && this.listQuery.orderId.length > 0) {
+        this.list = allItems.filter(o => o.orderId.indexOf(this.listQuery.orderId) > -1)
+      } else {
+        // We don't have an order id, let's check the other fields to use
+        let newResults = allItems
+
+        if (this.listQuery.dateRange.length === 2) {
+          newResults = newResults.filter(o => {
+            const created = new Date(o.created).getTime()
+            return created > this.listQuery.dateRange[0].getTime() && created < this.listQuery.dateRange[1].getTime()
+          })
+        }
+
+        if (this.listQuery.sellerAccountId.length > 0) {
+          newResults = newResults.filter(o => o.offers[0].seller._id === this.listQuery.sellerAccountId)
+        }
+
+        if (this.listQuery.buyerAccountId.length > 0) {
+          newResults = newResults.filter(o => o.buyer._id === this.listQuery.buyerAccountId)
+        }
+
+        this.list = newResults
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

From 3f2a40fbdee6f86703cdce68390f2661f9ee2a39 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Mon, 2 Sep 2019 11:26:00 +0100
Subject: [PATCH 05/16] Added password reset to the user list

---
 src/api/user.js          | 10 ++++++++++
 src/views/users/list.vue | 31 +++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index ce775b56..c35a27e0 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -61,6 +61,16 @@ export function updateUser(data) {
   return axios.put(`${apiUrl}/user/${data.id}`, dto)
 }
 
+export function sendPasswordReset(email, type) {
+  const dto = {
+    email,
+    type,
+    platform: 'OLFDE'
+  }
+
+  return axios.post(`${apiUrl}/user/password/send-reset-link`, dto)
+}
+
 function __dataToDTO(data) {
   return {
     'firstName': data.firstName,
diff --git a/src/views/users/list.vue b/src/views/users/list.vue
index 9fd1dfd2..7e4c6728 100644
--- a/src/views/users/list.vue
+++ b/src/views/users/list.vue
@@ -36,13 +36,16 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="Actions" width="120">
+      <el-table-column align="center" label="Actions" width="250">
         <template slot-scope="scope">
           <router-link :to="'/users/edit/' + scope.row.id">
             <el-button type="primary" size="small" icon="el-icon-edit">
               Edit
             </el-button>
           </router-link>
+          <el-button type="primary" size="small" icon="el-icon-message" @click="sendPasswordResetConfirm(scope.row.email)">
+            Send PW Reset
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -53,7 +56,7 @@
 
 <script>
 const fetchAccountList = require('@/api/account').fetchList
-import { fetchList } from '@/api/user'
+import { fetchList, sendPasswordReset } from '@/api/user'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 
 export default {
@@ -110,6 +113,30 @@ export default {
     handleFilter(query) {
       this.listQuery.page = 1
       this.getList()
+    },
+    sendPasswordResetConfirm(email) {
+      this.$confirm(`This will send an email to <b>${email}</b>, prompting them to reset their password with the provided link. Are you sure you want to do this?`, 'Warning', {
+        confirmButtonText: 'Proceed',
+        cancelButtonText: 'Cancel',
+        dangerouslyUseHTMLString: true,
+        type: 'warning'
+      }).then(() => {
+        sendPasswordReset(email, 'RESET').then(() => {
+          // Send the request
+          this.$message({
+            type: 'success',
+            message: 'Password Reset Sent'
+          })
+        }).catch(() => {
+          // Send the request
+          this.$message({
+            type: 'danger',
+            message: 'Password Reset Failed'
+          })
+        })
+      }).catch(() => {
+        // Do nothing, we don't care that they clicked cancel, but if we don't catch it, we get a console error
+      })
     }
   }
 }

From d9ce37348140cbfa3f955670c42967521ba73a62 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Mon, 2 Sep 2019 12:54:38 +0100
Subject: [PATCH 06/16] Added the full name to the list/edit

---
 src/api/account.js                              |  2 ++
 src/views/accounts/components/AccountDetail.vue | 11 +++++++++--
 src/views/accounts/list.vue                     |  6 ++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/api/account.js b/src/api/account.js
index bad035e4..ebb2b8ae 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -13,6 +13,7 @@ export function fetchAccount(id) {
 export function createAccount(data) {
   const dto = {
     'name': data.name,
+    'fullName': data.fullName || data.name,
     'type': data.type,
     'email': data.email,
     'platform': data.platform || 'OLFDE',
@@ -32,6 +33,7 @@ export function createAccount(data) {
 export function updateAccount(data) {
   const dto = {
     'name': data.name,
+    'fullName': data.fullName || data.name,
     'type': data.type,
     'email': data.email,
     'platform': data.platform,
diff --git a/src/views/accounts/components/AccountDetail.vue b/src/views/accounts/components/AccountDetail.vue
index e3d85cae..e0115b40 100644
--- a/src/views/accounts/components/AccountDetail.vue
+++ b/src/views/accounts/components/AccountDetail.vue
@@ -22,8 +22,15 @@
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label-width="120px" label="Name" class="postInfo-container-item">
-                    <el-input v-model="postForm.name" placeholder="Account Name" />
+                  <el-form-item label-width="120px" label="Display Name" class="postInfo-container-item">
+                    <el-input v-model="postForm.name" placeholder="Display Name" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Full Name" class="postInfo-container-item">
+                    <el-input v-model="postForm.fullName" placeholder="Full Name" />
                   </el-form-item>
                 </el-col>
               </el-row>
diff --git a/src/views/accounts/list.vue b/src/views/accounts/list.vue
index 599afa09..03f7b429 100644
--- a/src/views/accounts/list.vue
+++ b/src/views/accounts/list.vue
@@ -15,6 +15,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" label="Full Name" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.fullName || scope.row.name }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" label="Email" width="250">
         <template slot-scope="scope">
           <span>{{ scope.row.email }}</span>

From cfd42544f96ac9007c4197955858bfe581cf134b Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Mon, 2 Sep 2019 15:21:31 +0100
Subject: [PATCH 07/16] Added fuel and terminal restrictions to the account
 admin

---
 src/api/account.js                            |  8 +-
 .../accounts/components/AccountDetail.vue     | 97 ++++++++++++++++++-
 2 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/src/api/account.js b/src/api/account.js
index ebb2b8ae..7919165f 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -24,7 +24,9 @@ export function createAccount(data) {
     'addressLine2': data.address.addressLine2,
     'county': data.address.county,
     'country': data.address.country,
-    'postCode': data.address.postCode
+    'postCode': data.address.postCode,
+    'fuelRestrictions': data.restrictions.fuels,
+    'terminalRestrictions': data.restrictions.terminals
   }
 
   return axios.post(`${apiUrl}/account/create`, dto)
@@ -44,7 +46,9 @@ export function updateAccount(data) {
     'addressLine2': data.address.addressLine2,
     'county': data.address.county,
     'country': data.address.country,
-    'postCode': data.address.postCode
+    'postCode': data.address.postCode,
+    'fuelRestrictions': data.restrictions.fuels,
+    'terminalRestrictions': data.restrictions.terminals
   }
 
   return axios.put(`${apiUrl}/account/${data.id}`, dto)
diff --git a/src/views/accounts/components/AccountDetail.vue b/src/views/accounts/components/AccountDetail.vue
index e0115b40..4aba4a55 100644
--- a/src/views/accounts/components/AccountDetail.vue
+++ b/src/views/accounts/components/AccountDetail.vue
@@ -93,6 +93,28 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label-width="120px" label="Fuel Restriction" class="postInfo-container-item">
+                    <el-transfer
+                      v-model="postForm.restrictions.fuels"
+                      :titles="['Disabled', 'Enabled']"
+                      :data="fuelsAvailable"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label-width="120px" label="Terminal Restriction" class="postInfo-container-item">
+                    <el-transfer
+                      v-model="postForm.restrictions.terminals"
+                      :titles="['Disabled', 'Enabled']"
+                      :data="terminalsAvailable"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label-width="120px" label="Status" class="postInfo-container-item">
@@ -116,6 +138,8 @@
 <script>
 import Sticky from '@/components/Sticky' // 粘性header组件
 import { fetchAccount, updateAccount, createAccount } from '@/api/account'
+const fetchFuelList = require('@/api/product').fetchList
+const fetchTerminalList = require('@/api/terminal').fetchList
 
 const defaultForm = {
   id: '',
@@ -123,6 +147,10 @@ const defaultForm = {
   phone: '',
   email: '',
   orderConfirmationEmail: '',
+  restrictions: {
+    fuels: [],
+    terminals: []
+  },
   address: {
     addressLine1: '',
     addressLine2: '',
@@ -163,7 +191,10 @@ export default {
         // content: [{ validator: validateRequire }],
         // source_uri: [{ validator: validateSourceUri, trigger: 'blur' }]
       },
-      tempRoute: {}
+      tempRoute: {},
+      terminals: [],
+      fuels: [],
+      fuelRestrictions: []
     }
   },
   computed: {
@@ -178,6 +209,32 @@ export default {
       set(val) {
         this.postForm.display_time = new Date(val)
       }
+    },
+    fuelsAvailable: {
+      get() {
+        return this.fuels.map(f => {
+          return {
+            label: f.name,
+            key: f._id
+          }
+        })
+      },
+      set(value) {
+        this.postForm.restrictions.fuels = value
+      }
+    },
+    terminalsAvailable: {
+      get() {
+        return this.terminals.map(f => {
+          return {
+            label: f.name,
+            key: f._id
+          }
+        })
+      },
+      set(value) {
+        this.postForm.restrictions.terminals = value
+      }
     }
   },
   created() {
@@ -188,6 +245,13 @@ export default {
       this.postForm = Object.assign({}, defaultForm)
     }
 
+    // Fetch the fuels and terminals, to be used as part of the restriction process
+    const requestPromises = [fetchFuelList({ platform: 'OLFDE' }), fetchTerminalList({ platform: 'OLFDE' })]
+    Promise.all(requestPromises).then((responses) => {
+      this.fuels = responses[0].data.fuels
+      this.terminals = responses[1].data.terminals
+    })
+
     // Why need to make a copy of this.$route here?
     // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
     // https://github.com/PanJiaChen/vue-element-admin/issues/1221
@@ -196,7 +260,22 @@ export default {
   methods: {
     fetchData(id) {
       fetchAccount(id).then(response => {
-        this.postForm = response.data
+        const account = response.data
+        if (!account.restrictions) {
+          account.restrictions = {
+            fuels: [],
+            terminals: []
+          }
+        }
+
+        if (account.restrictions.fuels.length === 0) {
+          account.restrictions.fuels = this.fuels.map(f => f._id)
+        }
+        if (account.restrictions.terminals.length === 0) {
+          account.restrictions.terminals = this.terminals.map(f => f._id)
+        }
+
+        this.postForm = account
 
         // // set tagsview title
         this.setTagsViewTitle()
@@ -221,9 +300,21 @@ export default {
         if (valid) {
           this.loading = true
 
+          // Make a clone of the object
+          const accountToSave = Object.assign({}, this.postForm)
+
+          // If we have selected *all* the fuels/terminals available, then send an empty array back. As this means we want *everything*
+          if (accountToSave.restrictions.fuels.length === this.fuels.length) {
+            accountToSave.restrictions.fuels = []
+          }
+
+          if (accountToSave.restrictions.terminals.length === this.terminals.length) {
+            accountToSave.restrictions.terminals = []
+          }
+
           // Save the account
           const methodToCall = this.isEdit ? updateAccount : createAccount
-          methodToCall(this.postForm).then((r) => {
+          methodToCall(accountToSave).then((r) => {
             this.$notify({
               title: 'Success',
               message: 'Account Saved',

From d22924b50761bbce22c972a50bff3122f306accf Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Mon, 2 Sep 2019 16:05:34 +0100
Subject: [PATCH 08/16] Fix the title of the page, showing the name instead of
 the id

---
 src/views/accounts/components/AccountDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/accounts/components/AccountDetail.vue b/src/views/accounts/components/AccountDetail.vue
index 4aba4a55..dfbd0191 100644
--- a/src/views/accounts/components/AccountDetail.vue
+++ b/src/views/accounts/components/AccountDetail.vue
@@ -293,7 +293,7 @@ export default {
     },
     setPageTitle() {
       const title = 'Edit Account'
-      document.title = `${title} - ${this.postForm.id}`
+      document.title = `${title} - ${this.postForm.name}`
     },
     submitForm() {
       this.$refs.postForm.validate(valid => {

From 2a210efea15cc9eb56b3fabafb350d6cde2af6c1 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Thu, 5 Sep 2019 21:12:39 +0100
Subject: [PATCH 09/16] Added crude relationship matrix view

---
 src/api/account.js                   |  4 ++
 src/router/index.js                  |  6 ++
 src/views/accounts/relationships.vue | 97 ++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 src/views/accounts/relationships.vue

diff --git a/src/api/account.js b/src/api/account.js
index 7919165f..c972f62d 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -6,6 +6,10 @@ export function fetchList(query) {
   return axios.get(`${apiUrl}/account/search`, { params: query })
 }
 
+export function fetchRelationships(query) {
+  return axios.get(`${apiUrl}/account/relationship`, { params: query })
+}
+
 export function fetchAccount(id) {
   return axios.get(`${apiUrl}/account/${id}`)
 }
diff --git a/src/router/index.js b/src/router/index.js
index 41a94db8..21231fdf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -134,6 +134,12 @@ export const asyncRoutes = [
         component: () => import('@/views/accounts/list'),
         name: 'SellerAccountList',
         meta: { title: 'Seller Account List', icon: 'list', type: 'seller' }
+      },
+      {
+        path: 'relationship-list',
+        component: () => import('@/views/accounts/relationships'),
+        name: 'RelationshipMatrix',
+        meta: { title: 'Relationships', icon: 'list' }
       }
     ]
   },
diff --git a/src/views/accounts/relationships.vue b/src/views/accounts/relationships.vue
new file mode 100644
index 00000000..9eb95497
--- /dev/null
+++ b/src/views/accounts/relationships.vue
@@ -0,0 +1,97 @@
+
+<template>
+  <div class="app-container">
+
+    <el-table v-loading="listLoading" :data="buyerAccounts" border fit style="width: 100%">
+
+      <el-table-column label="X" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-for="seller in sellerAccounts" :key="seller._id" align="center" :label="seller.name">
+        <template slot-scope="scope">
+          <span v-if="relationshipMatrix[`${buyerAccounts[scope.$index].id}-${seller.id}`]">
+
+            <span style="color: green">B: Enabled<br></span>
+
+            <span v-if="relationshipMatrix[`${buyerAccounts[scope.$index].id}-${seller.id}`].other" style="color: green">S: Enabled<br></span>
+            <span v-else style="color: red">S: Disabled<br></span>
+          </span>
+          <span v-else style="color: red;">
+            No Relationship
+            <br>
+            <br>
+          </span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+  </div>
+</template>
+
+<script>
+import { fetchList, fetchRelationships } from '@/api/account'
+
+export default {
+  name: 'RelationshipList',
+  data() {
+    return {
+      sellerAccounts: [],
+      buyerAccounts: [],
+      relationshipMatrix: [],
+      originalList: null,
+      list: null,
+      total: 0,
+      listLoading: false,
+      listQuery: {
+        page: 1,
+        limit: 20,
+        buyerAccountId: '',
+        sellerAccountId: ''
+      }
+    }
+  },
+  created() {
+    this.listQuery.platform = 'OLFDE'
+    this.getList()
+  },
+  methods: {
+    getRemoteAccountList(query) {
+      query = {}
+      query.platform = 'OLFDE'
+      query.limit = 100
+    },
+    getList() {
+      Promise.all([fetchRelationships({ platform: 'OLFDE' }), fetchList({ platform: 'OLFDE', limit: 100 })]).then((results) => {
+        const allRelationships = results[0].data.relationships
+        this.sellerAccounts = results[1].data.docs.filter(a => a.type === 'seller').map(v => { return { name: v.name, id: v._id } })
+        this.buyerAccounts = results[1].data.docs.filter(a => a.type === 'buyer').map(v => { return { name: v.name, id: v._id } })
+
+        // Map the seller accounts
+        const relationshipData = []
+        allRelationships.forEach((a) => {
+          relationshipData[`${a.buyer.account_id}-${a.other.account_id}`] = a
+        })
+        this.relationshipMatrix = relationshipData
+      })
+    },
+    resetFilter() {
+    },
+    handleFilter() {
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

From 101408b1dabbe5e698e95a13a4e669d00ea6d6e1 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Sun, 8 Sep 2019 21:48:22 +0100
Subject: [PATCH 10/16] Added lifting periods

---
 src/api/liftingPeriod.js                      |  31 +++
 src/router/index.js                           |  31 +++
 .../components/LiftingPeriodDetail.vue        | 210 ++++++++++++++++++
 src/views/liftingperiods/create.vue           |  13 ++
 src/views/liftingperiods/edit.vue             |  13 ++
 src/views/liftingperiods/list.vue             |  78 +++++++
 6 files changed, 376 insertions(+)
 create mode 100644 src/api/liftingPeriod.js
 create mode 100644 src/views/liftingperiods/components/LiftingPeriodDetail.vue
 create mode 100644 src/views/liftingperiods/create.vue
 create mode 100644 src/views/liftingperiods/edit.vue
 create mode 100644 src/views/liftingperiods/list.vue

diff --git a/src/api/liftingPeriod.js b/src/api/liftingPeriod.js
new file mode 100644
index 00000000..fc01ef4a
--- /dev/null
+++ b/src/api/liftingPeriod.js
@@ -0,0 +1,31 @@
+import axios from 'axios'
+
+const LiftingPeriodEndpointUrl = 'https://metadata.service.development.therig.onlinefuelslabs.io'
+
+export function fetchList(query) {
+  return axios.get(`${LiftingPeriodEndpointUrl}/lifting-periods`, { params: query })
+}
+
+export function fetchLiftingPeriod(id) {
+  return axios.get(`${LiftingPeriodEndpointUrl}/lifting-periods/${id}?platform=OLFDE`)
+}
+
+export function createLiftingPeriod(data) {
+  const dto = {
+    'name': data.name,
+    'days': Number(data.days),
+    'platform': data.platform || 'OLFDE'
+  }
+
+  return axios.post(`${LiftingPeriodEndpointUrl}/lifting-periods`, dto)
+}
+
+export function updateLiftingPeriod(data) {
+  const dto = {
+    'name': data.name,
+    'days': Number(data.days),
+    'platform': data.platform || 'OLFDE'
+  }
+
+  return axios.put(`${LiftingPeriodEndpointUrl}/lifting-periods/${data._id}`, dto)
+}
diff --git a/src/router/index.js b/src/router/index.js
index 21231fdf..a0424b5f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -267,6 +267,37 @@ export const asyncRoutes = [
       }
     ]
   },
+  {
+    path: '/lifting-periods',
+    component: Layout,
+    redirect: '/lifting-periods/list',
+    name: 'LiftingPeriods',
+    meta: {
+      title: 'Lifting Periods',
+      icon: 'example'
+    },
+    children: [
+      {
+        path: 'create',
+        component: () => import('@/views/liftingperiods/create'),
+        name: 'CreateLiftingPeriod',
+        meta: { title: 'Create Lifting Period', icon: 'edit' }
+      },
+      {
+        path: 'edit/:id',
+        component: () => import('@/views/liftingperiods/edit'),
+        name: 'EditLiftingPeriod',
+        meta: { title: 'Edit Lifting Period', noCache: true, activeMenu: '/liftingperiods/list' },
+        hidden: true
+      },
+      {
+        path: 'list',
+        component: () => import('@/views/liftingperiods/list'),
+        name: 'LiftingPeriodList',
+        meta: { title: 'Lifting Period List', icon: 'list' }
+      }
+    ]
+  },
   {
     path: '/faqs',
     component: Layout,
diff --git a/src/views/liftingperiods/components/LiftingPeriodDetail.vue b/src/views/liftingperiods/components/LiftingPeriodDetail.vue
new file mode 100644
index 00000000..3de17761
--- /dev/null
+++ b/src/views/liftingperiods/components/LiftingPeriodDetail.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="createAccount-container">
+    <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+
+      <sticky :z-index="10" :class-name="'sub-navbar ' + postForm.status">
+        <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
+          Save
+        </el-button>
+      </sticky>
+
+      <div class="createPost-main-container">
+
+        <el-row>
+          <el-col :span="20">
+            <div class="postInfo-container">
+              <el-row v-if="isEdit">
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Id" class="postInfo-container-item">
+                    <el-input v-model="postForm._id" placeholder="Id" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Name" class="postInfo-container-item">
+                    <el-input v-model="postForm.name" placeholder="Lifting Period Name" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Days" class="postInfo-container-item">
+                    <el-input v-model="postForm.days" placeholder="Lifting Period Days" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Sticky from '@/components/Sticky' // 粘性header组件
+import { fetchLiftingPeriod, updateLiftingPeriod, createLiftingPeriod } from '@/api/liftingPeriod'
+
+const defaultForm = {
+  id: '',
+  name: '',
+  days: 0
+}
+
+export default {
+  name: 'AccountDetail',
+  components: { Sticky },
+  props: {
+    isEdit: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const validateRequire = (rule, value, callback) => {
+      if (value === '') {
+        this.$message({
+          message: rule.field + 'Epic Success brudda',
+          type: 'error'
+        })
+        callback(new Error(rule.field + ' ERRRR'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      postForm: Object.assign({}, defaultForm),
+      loading: false,
+      userListOptions: [],
+      rules: {
+        // image_uri: [{ validator: validateRequire }],
+        name: [{ validator: validateRequire }]
+        // content: [{ validator: validateRequire }],
+        // source_uri: [{ validator: validateSourceUri, trigger: 'blur' }]
+      },
+      tempRoute: {}
+    }
+  },
+  computed: {
+    displayTime: {
+      // set and get is useful when the data
+      // returned by the back end api is different from the front end
+      // back end return => "2013-06-25 06:59:25"
+      // front end need timestamp => 1372114765000
+      get() {
+        return (+new Date(this.postForm.display_time))
+      },
+      set(val) {
+        this.postForm.display_time = new Date(val)
+      }
+    }
+  },
+  created() {
+    if (this.isEdit) {
+      const id = this.$route.params && this.$route.params.id
+      this.fetchData(id)
+    } else {
+      this.postForm = Object.assign({}, defaultForm)
+    }
+
+    // Why need to make a copy of this.$route here?
+    // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
+    // https://github.com/PanJiaChen/vue-element-admin/issues/1221
+    this.tempRoute = Object.assign({}, this.$route)
+  },
+  methods: {
+    fetchData(id) {
+      fetchLiftingPeriod(id).then(response => {
+        this.postForm = response.data.liftingPeriod
+
+        // // set tagsview title
+        this.setTagsViewTitle()
+
+        // // set page title
+        this.setPageTitle()
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    setTagsViewTitle() {
+      const title = 'Edit Lifting Period'
+      const route = Object.assign({}, this.tempRoute, { title: `${title} - ${this.postForm.name}` })
+      this.$store.dispatch('tagsView/updateVisitedView', route)
+    },
+    setPageTitle() {
+      const title = 'Edit Lifting Period'
+      document.title = `${title} - ${this.postForm.name}`
+    },
+    submitForm() {
+      this.$refs.postForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+
+          // Save the account
+          const methodToCall = this.isEdit ? updateLiftingPeriod : createLiftingPeriod
+          methodToCall(this.postForm).then((r) => {
+            this.$notify({
+              title: 'Success',
+              message: 'Lifting Period Saved',
+              type: 'success',
+              duration: 2000
+            })
+
+            // Redirect to the edit page when we create a new one
+            if (!this.isEdit) { this.$router.push(`/lifting-periods/edit/${r.data.createdLiftingPeriod._id}`) }
+
+            this.loading = false
+          }).catch((e) => {
+            console.dir(e)
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/mixin.scss";
+
+.createPost-container {
+  position: relative;
+
+  .createPost-main-container {
+    padding: 40px 45px 20px 50px;
+
+    .postInfo-container {
+      position: relative;
+      @include clearfix;
+      margin-bottom: 10px;
+
+      .postInfo-container-item {
+        float: left;
+      }
+    }
+  }
+
+  .word-counter {
+    width: 40px;
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+
+.article-textarea /deep/ {
+  textarea {
+    padding-right: 40px;
+    resize: none;
+    border: none;
+    border-radius: 0px;
+    border-bottom: 1px solid #bfcbd9;
+  }
+}
+</style>
diff --git a/src/views/liftingperiods/create.vue b/src/views/liftingperiods/create.vue
new file mode 100644
index 00000000..f1992c2e
--- /dev/null
+++ b/src/views/liftingperiods/create.vue
@@ -0,0 +1,13 @@
+<template>
+  <lifting-period-detail :is-edit="false" />
+</template>
+
+<script>
+import LiftingPeriodDetail from './components/LiftingPeriodDetail'
+
+export default {
+  name: 'CreateForm',
+  components: { LiftingPeriodDetail }
+}
+</script>
+
diff --git a/src/views/liftingperiods/edit.vue b/src/views/liftingperiods/edit.vue
new file mode 100644
index 00000000..593fb345
--- /dev/null
+++ b/src/views/liftingperiods/edit.vue
@@ -0,0 +1,13 @@
+<template>
+  <lifting-period-detail :is-edit="true" />
+</template>
+
+<script>
+import LiftingPeriodDetail from './components/LiftingPeriodDetail'
+
+export default {
+  name: 'EditForm',
+  components: { LiftingPeriodDetail }
+}
+</script>
+
diff --git a/src/views/liftingperiods/list.vue b/src/views/liftingperiods/list.vue
new file mode 100644
index 00000000..d2394645
--- /dev/null
+++ b/src/views/liftingperiods/list.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="app-container">
+
+    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
+      <el-table-column align="center" label="Name" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Name" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.days }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Actions" width="120">
+        <template slot-scope="scope">
+          <router-link :to="'/lifting-periods/edit/' + scope.row._id">
+            <el-button type="primary" size="small" icon="el-icon-edit">
+              Edit
+            </el-button>
+          </router-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { fetchList } from '@/api/liftingPeriod'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+
+export default {
+  name: 'LiftingPeriodList',
+  components: { Pagination },
+  data() {
+    return {
+      list: null,
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  created() {
+    // Set the type for the query
+    this.listQuery.platform = 'OLFDE'
+
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.liftingPeriods
+        this.total = response.data.liftingPeriods.length
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

From 1260989d877b85b2ead00ee8c9daecae51b4fd1a Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Sun, 8 Sep 2019 22:00:23 +0100
Subject: [PATCH 11/16] Added payment terms

---
 src/api/paymentTerm.js                        |  31 +++
 src/router/index.js                           |  31 +++
 .../components/PaymentTermsDetails.vue        | 210 ++++++++++++++++++
 src/views/paymentterms/create.vue             |  13 ++
 src/views/paymentterms/edit.vue               |  13 ++
 src/views/paymentterms/list.vue               |  78 +++++++
 6 files changed, 376 insertions(+)
 create mode 100644 src/api/paymentTerm.js
 create mode 100644 src/views/paymentterms/components/PaymentTermsDetails.vue
 create mode 100644 src/views/paymentterms/create.vue
 create mode 100644 src/views/paymentterms/edit.vue
 create mode 100644 src/views/paymentterms/list.vue

diff --git a/src/api/paymentTerm.js b/src/api/paymentTerm.js
new file mode 100644
index 00000000..ac001cb4
--- /dev/null
+++ b/src/api/paymentTerm.js
@@ -0,0 +1,31 @@
+import axios from 'axios'
+
+const PaymentTermsEndpointUrl = 'https://metadata.service.development.therig.onlinefuelslabs.io'
+
+export function fetchList(query) {
+  return axios.get(`${PaymentTermsEndpointUrl}/payment-terms`, { params: query })
+}
+
+export function fetchPaymentTerm(id) {
+  return axios.get(`${PaymentTermsEndpointUrl}/payment-terms/${id}?platform=OLFDE`)
+}
+
+export function createPaymentTerm(data) {
+  const dto = {
+    'name': data.name,
+    'days': Number(data.days),
+    'platform': data.platform || 'OLFDE'
+  }
+
+  return axios.post(`${PaymentTermsEndpointUrl}/payment-terms`, dto)
+}
+
+export function updatePaymentTerm(data) {
+  const dto = {
+    'name': data.name,
+    'days': Number(data.days),
+    'platform': data.platform || 'OLFDE'
+  }
+
+  return axios.put(`${PaymentTermsEndpointUrl}/payment-terms/${data._id}`, dto)
+}
diff --git a/src/router/index.js b/src/router/index.js
index a0424b5f..07a507ab 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -298,6 +298,37 @@ export const asyncRoutes = [
       }
     ]
   },
+  {
+    path: '/payment-terms',
+    component: Layout,
+    redirect: '/payment-terms/list',
+    name: 'PaymentTerms',
+    meta: {
+      title: 'Payment Terms',
+      icon: 'example'
+    },
+    children: [
+      {
+        path: 'create',
+        component: () => import('@/views/paymentterms/create'),
+        name: 'CreatePaymentTerm',
+        meta: { title: 'Create Payment Terms', icon: 'edit' }
+      },
+      {
+        path: 'edit/:id',
+        component: () => import('@/views/paymentterms/edit'),
+        name: 'EditPaymentTerm',
+        meta: { title: 'Edit Payment Terms', noCache: true, activeMenu: '/paymentterms/list' },
+        hidden: true
+      },
+      {
+        path: 'list',
+        component: () => import('@/views/paymentterms/list'),
+        name: 'LiftingPaymentTerm',
+        meta: { title: 'Payment Terms List', icon: 'list' }
+      }
+    ]
+  },
   {
     path: '/faqs',
     component: Layout,
diff --git a/src/views/paymentterms/components/PaymentTermsDetails.vue b/src/views/paymentterms/components/PaymentTermsDetails.vue
new file mode 100644
index 00000000..1fa82b98
--- /dev/null
+++ b/src/views/paymentterms/components/PaymentTermsDetails.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="createAccount-container">
+    <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+
+      <sticky :z-index="10" :class-name="'sub-navbar ' + postForm.status">
+        <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
+          Save
+        </el-button>
+      </sticky>
+
+      <div class="createPost-main-container">
+
+        <el-row>
+          <el-col :span="20">
+            <div class="postInfo-container">
+              <el-row v-if="isEdit">
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Id" class="postInfo-container-item">
+                    <el-input v-model="postForm._id" placeholder="Id" readonly />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Name" class="postInfo-container-item">
+                    <el-input v-model="postForm.name" placeholder="Lifting Period Name" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label-width="120px" label="Days" class="postInfo-container-item">
+                    <el-input v-model="postForm.days" placeholder="Lifting Period Days" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Sticky from '@/components/Sticky' // 粘性header组件
+import { fetchPaymentTerm, updatePaymentTerm, createPaymentTerm } from '@/api/paymentTerm'
+
+const defaultForm = {
+  id: '',
+  name: '',
+  days: 0
+}
+
+export default {
+  name: 'AccountDetail',
+  components: { Sticky },
+  props: {
+    isEdit: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const validateRequire = (rule, value, callback) => {
+      if (value === '') {
+        this.$message({
+          message: rule.field + 'Epic Success brudda',
+          type: 'error'
+        })
+        callback(new Error(rule.field + ' ERRRR'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      postForm: Object.assign({}, defaultForm),
+      loading: false,
+      userListOptions: [],
+      rules: {
+        // image_uri: [{ validator: validateRequire }],
+        name: [{ validator: validateRequire }]
+        // content: [{ validator: validateRequire }],
+        // source_uri: [{ validator: validateSourceUri, trigger: 'blur' }]
+      },
+      tempRoute: {}
+    }
+  },
+  computed: {
+    displayTime: {
+      // set and get is useful when the data
+      // returned by the back end api is different from the front end
+      // back end return => "2013-06-25 06:59:25"
+      // front end need timestamp => 1372114765000
+      get() {
+        return (+new Date(this.postForm.display_time))
+      },
+      set(val) {
+        this.postForm.display_time = new Date(val)
+      }
+    }
+  },
+  created() {
+    if (this.isEdit) {
+      const id = this.$route.params && this.$route.params.id
+      this.fetchData(id)
+    } else {
+      this.postForm = Object.assign({}, defaultForm)
+    }
+
+    // Why need to make a copy of this.$route here?
+    // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
+    // https://github.com/PanJiaChen/vue-element-admin/issues/1221
+    this.tempRoute = Object.assign({}, this.$route)
+  },
+  methods: {
+    fetchData(id) {
+      fetchPaymentTerm(id).then(response => {
+        this.postForm = response.data.paymentTerms
+
+        // // set tagsview title
+        this.setTagsViewTitle()
+
+        // // set page title
+        this.setPageTitle()
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    setTagsViewTitle() {
+      const title = 'Edit Payment Terms'
+      const route = Object.assign({}, this.tempRoute, { title: `${title} - ${this.postForm.name}` })
+      this.$store.dispatch('tagsView/updateVisitedView', route)
+    },
+    setPageTitle() {
+      const title = 'Edit Payment Terms'
+      document.title = `${title} - ${this.postForm.name}`
+    },
+    submitForm() {
+      this.$refs.postForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+
+          // Save the account
+          const methodToCall = this.isEdit ? updatePaymentTerm : createPaymentTerm
+          methodToCall(this.postForm).then((r) => {
+            this.$notify({
+              title: 'Success',
+              message: 'Payment Terms Saved',
+              type: 'success',
+              duration: 2000
+            })
+
+            // Redirect to the edit page when we create a new one
+            if (!this.isEdit) { this.$router.push(`/payment-terms/edit/${r.data.createdPaymentTerms._id}`) }
+
+            this.loading = false
+          }).catch((e) => {
+            console.dir(e)
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/mixin.scss";
+
+.createPost-container {
+  position: relative;
+
+  .createPost-main-container {
+    padding: 40px 45px 20px 50px;
+
+    .postInfo-container {
+      position: relative;
+      @include clearfix;
+      margin-bottom: 10px;
+
+      .postInfo-container-item {
+        float: left;
+      }
+    }
+  }
+
+  .word-counter {
+    width: 40px;
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+
+.article-textarea /deep/ {
+  textarea {
+    padding-right: 40px;
+    resize: none;
+    border: none;
+    border-radius: 0px;
+    border-bottom: 1px solid #bfcbd9;
+  }
+}
+</style>
diff --git a/src/views/paymentterms/create.vue b/src/views/paymentterms/create.vue
new file mode 100644
index 00000000..02c911ef
--- /dev/null
+++ b/src/views/paymentterms/create.vue
@@ -0,0 +1,13 @@
+<template>
+  <payment-terms-details :is-edit="false" />
+</template>
+
+<script>
+import PaymentTermsDetails from './components/PaymentTermsDetails'
+
+export default {
+  name: 'CreateForm',
+  components: { PaymentTermsDetails }
+}
+</script>
+
diff --git a/src/views/paymentterms/edit.vue b/src/views/paymentterms/edit.vue
new file mode 100644
index 00000000..9e962d51
--- /dev/null
+++ b/src/views/paymentterms/edit.vue
@@ -0,0 +1,13 @@
+<template>
+  <payment-terms-details :is-edit="true" />
+</template>
+
+<script>
+import PaymentTermsDetails from './components/PaymentTermsDetails'
+
+export default {
+  name: 'EditForm',
+  components: { PaymentTermsDetails }
+}
+</script>
+
diff --git a/src/views/paymentterms/list.vue b/src/views/paymentterms/list.vue
new file mode 100644
index 00000000..07ffee7f
--- /dev/null
+++ b/src/views/paymentterms/list.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="app-container">
+
+    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
+      <el-table-column align="center" label="Name" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Name" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.days }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="Actions" width="120">
+        <template slot-scope="scope">
+          <router-link :to="'/payment-terms/edit/' + scope.row._id">
+            <el-button type="primary" size="small" icon="el-icon-edit">
+              Edit
+            </el-button>
+          </router-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { fetchList } from '@/api/paymentTerm'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+
+export default {
+  name: 'PaymentTermsList',
+  components: { Pagination },
+  data() {
+    return {
+      list: null,
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  created() {
+    // Set the type for the query
+    this.listQuery.platform = 'OLFDE'
+
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.paymentTerms
+        this.total = response.data.paymentTerms.length
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

From fd265ae8bb6b4a9d04e6ee48c16ab54d33a7f491 Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Tue, 10 Sep 2019 15:31:16 +0100
Subject: [PATCH 12/16] Add ability to manage account lifting periods and
 payment terms in  admin

---
 src/api/account.js                            |  8 +-
 .../accounts/components/AccountDetail.vue     | 88 ++++++++++++++++---
 src/views/accounts/relationships.vue          |  2 +-
 3 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/src/api/account.js b/src/api/account.js
index c972f62d..20bb1426 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -30,7 +30,9 @@ export function createAccount(data) {
     'country': data.address.country,
     'postCode': data.address.postCode,
     'fuelRestrictions': data.restrictions.fuels,
-    'terminalRestrictions': data.restrictions.terminals
+    'terminalRestrictions': data.restrictions.terminals,
+    'paymentTermsRestrictions': data.restrictions.paymentTerms,
+    'liftingPeriodRestrictions': data.restrictions.liftingPeriods
   }
 
   return axios.post(`${apiUrl}/account/create`, dto)
@@ -52,7 +54,9 @@ export function updateAccount(data) {
     'country': data.address.country,
     'postCode': data.address.postCode,
     'fuelRestrictions': data.restrictions.fuels,
-    'terminalRestrictions': data.restrictions.terminals
+    'terminalRestrictions': data.restrictions.terminals,
+    'paymentTermsRestrictions': data.restrictions.paymentTerms,
+    'liftingPeriodRestrictions': data.restrictions.liftingPeriods
   }
 
   return axios.put(`${apiUrl}/account/${data.id}`, dto)
diff --git a/src/views/accounts/components/AccountDetail.vue b/src/views/accounts/components/AccountDetail.vue
index dfbd0191..6e696a55 100644
--- a/src/views/accounts/components/AccountDetail.vue
+++ b/src/views/accounts/components/AccountDetail.vue
@@ -115,6 +115,28 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label-width="120px" label="Lifting Restriction" class="postInfo-container-item">
+                    <el-transfer
+                      v-model="postForm.restrictions.liftingPeriods"
+                      :titles="['Disabled', 'Enabled']"
+                      :data="liftingPeriodsAvailable"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label-width="120px" label="Payment Restriction" class="postInfo-container-item">
+                    <el-transfer
+                      v-model="postForm.restrictions.paymentTerms"
+                      :titles="['Disabled', 'Enabled']"
+                      :data="paymentTermsAvailable"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label-width="120px" label="Status" class="postInfo-container-item">
@@ -140,6 +162,8 @@ import Sticky from '@/components/Sticky' // 粘性header组件
 import { fetchAccount, updateAccount, createAccount } from '@/api/account'
 const fetchFuelList = require('@/api/product').fetchList
 const fetchTerminalList = require('@/api/terminal').fetchList
+const fetchLiftingPeriodsList = require('@/api/liftingPeriod').fetchList
+const fetchPaymentTermsList = require('@/api/paymentTerm').fetchList
 
 const defaultForm = {
   id: '',
@@ -149,7 +173,9 @@ const defaultForm = {
   orderConfirmationEmail: '',
   restrictions: {
     fuels: [],
-    terminals: []
+    terminals: [],
+    liftingPeriods: [],
+    paymentTerms: []
   },
   address: {
     addressLine1: '',
@@ -194,6 +220,8 @@ export default {
       tempRoute: {},
       terminals: [],
       fuels: [],
+      paymentTerms: [],
+      liftingPeriods: [],
       fuelRestrictions: []
     }
   },
@@ -235,6 +263,32 @@ export default {
       set(value) {
         this.postForm.restrictions.terminals = value
       }
+    },
+    liftingPeriodsAvailable: {
+      get() {
+        return this.liftingPeriods.map(f => {
+          return {
+            label: f.name,
+            key: f._id
+          }
+        })
+      },
+      set(value) {
+        this.postForm.restrictions.liftingPeriods = value
+      }
+    },
+    paymentTermsAvailable: {
+      get() {
+        return this.paymentTerms.map(f => {
+          return {
+            label: f.name,
+            key: f._id
+          }
+        })
+      },
+      set(value) {
+        this.postForm.restrictions.paymentTerms = value
+      }
     }
   },
   created() {
@@ -246,10 +300,18 @@ export default {
     }
 
     // Fetch the fuels and terminals, to be used as part of the restriction process
-    const requestPromises = [fetchFuelList({ platform: 'OLFDE' }), fetchTerminalList({ platform: 'OLFDE' })]
+    const requestPromises = [
+      fetchFuelList({ platform: 'OLFDE' }),
+      fetchTerminalList({ platform: 'OLFDE' }),
+      fetchLiftingPeriodsList({ platform: 'OLFDE' }),
+      fetchPaymentTermsList({ platform: 'OLFDE' })
+    ]
+
     Promise.all(requestPromises).then((responses) => {
       this.fuels = responses[0].data.fuels
       this.terminals = responses[1].data.terminals
+      this.liftingPeriods = responses[2].data.liftingPeriods
+      this.paymentTerms = responses[3].data.paymentTerms
     })
 
     // Why need to make a copy of this.$route here?
@@ -264,17 +326,28 @@ export default {
         if (!account.restrictions) {
           account.restrictions = {
             fuels: [],
-            terminals: []
+            terminals: [],
+            paymentTerms: [],
+            liftingPeriods: []
           }
         }
 
         if (account.restrictions.fuels.length === 0) {
           account.restrictions.fuels = this.fuels.map(f => f._id)
         }
+
         if (account.restrictions.terminals.length === 0) {
           account.restrictions.terminals = this.terminals.map(f => f._id)
         }
 
+        if (account.restrictions.paymentTerms != null && account.restrictions.paymentTerms.length === 0) {
+          account.restrictions.paymentTerms = this.paymentTerms.map(f => f._id)
+        }
+
+        if (account.restrictions.liftingPeriods != null && account.restrictions.liftingPeriods.length === 0) {
+          account.restrictions.liftingPeriods = this.liftingPeriods.map(f => f._id)
+        }
+
         this.postForm = account
 
         // // set tagsview title
@@ -303,15 +376,6 @@ export default {
           // Make a clone of the object
           const accountToSave = Object.assign({}, this.postForm)
 
-          // If we have selected *all* the fuels/terminals available, then send an empty array back. As this means we want *everything*
-          if (accountToSave.restrictions.fuels.length === this.fuels.length) {
-            accountToSave.restrictions.fuels = []
-          }
-
-          if (accountToSave.restrictions.terminals.length === this.terminals.length) {
-            accountToSave.restrictions.terminals = []
-          }
-
           // Save the account
           const methodToCall = this.isEdit ? updateAccount : createAccount
           methodToCall(accountToSave).then((r) => {
diff --git a/src/views/accounts/relationships.vue b/src/views/accounts/relationships.vue
index 9eb95497..d7b55ea6 100644
--- a/src/views/accounts/relationships.vue
+++ b/src/views/accounts/relationships.vue
@@ -15,7 +15,7 @@
 
             <span style="color: green">B: Enabled<br></span>
 
-            <span v-if="relationshipMatrix[`${buyerAccounts[scope.$index].id}-${seller.id}`].other" style="color: green">S: Enabled<br></span>
+            <span v-if="relationshipMatrix[`${buyerAccounts[scope.$index].id}-${seller.id}`].other.enabled_spot" style="color: green">S: Enabled<br></span>
             <span v-else style="color: red">S: Disabled<br></span>
           </span>
           <span v-else style="color: red;">

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

From 2f4f82ee1199e1128840ac72f2cf8a36ff11625a Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Tue, 10 Sep 2019 22:00:16 +0100
Subject: [PATCH 14/16] remove the order conf field

---
 src/views/accounts/list.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/accounts/list.vue b/src/views/accounts/list.vue
index 03f7b429..2d906492 100644
--- a/src/views/accounts/list.vue
+++ b/src/views/accounts/list.vue
@@ -27,12 +27,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="Order Confirmation Email" width="200">
-        <template slot-scope="scope">
-          <span>{{ scope.row.orderConfirmationEmail }}</span>
-        </template>
-      </el-table-column>
-
       <el-table-column align="center" label="Phone" width="200">
         <template slot-scope="scope">
           <span>{{ scope.row.phone }}</span>

From a242a18e528132ba614f2afb7c17ee6d17be21ca Mon Sep 17 00:00:00 2001
From: Dean Bartok-Thomas <dean@spikedsoftware.com>
Date: Wed, 11 Sep 2019 08:46:24 +0100
Subject: [PATCH 15/16]  Fix foraccounts not defaulting the conf email

---
 src/api/account.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/api/account.js b/src/api/account.js
index 7c2a2c1f..8bd528d6 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -23,7 +23,6 @@ export function createAccount(data) {
     'platform': data.platform || 'OLFDE',
     'phone': data.phone,
     'status': parseInt(data.status),
-    'orderConfirmationEmail': data.orderConfirmationEmail,
     'addressLine1': data.address.addressLine1,
     'addressLine2': data.address.addressLine2,
     'county': data.address.county,
@@ -49,7 +48,6 @@ export function updateAccount(data) {
     'platform': data.platform,
     'phone': data.phone,
     'status': parseInt(data.status),
-    'orderConfirmationEmail': data.orderConfirmationEmail,
     'addressLine1': data.address.addressLine1,
     'addressLine2': data.address.addressLine2,
     'county': data.address.county,