From 776efdd2ad5cd09cb23a86acaab701d904507eb9 Mon Sep 17 00:00:00 2001
From: Chad Derya <scd@onlinefuels.com>
Date: Tue, 10 Sep 2019 13:45:55 +0100
Subject: [PATCH] deleting individual  fuels and terminals work

---
 src/api/product.js                     |  5 +---
 src/api/terminal.js                    |  6 +---
 src/components/PopUps/Delete/index.vue | 38 +++++++++++++++-----------
 src/views/products/list.vue            |  2 ++
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/api/product.js b/src/api/product.js
index a9ebba80..7acb55b6 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -23,10 +23,7 @@ export function updateProduct(data) {
 
 export function deleteProduct(data) {
   if (data !== '') {
-    console.log(data)
-    const chad = `${ProductEndpointUrl}/fuels/${data}?secret=MySecretForFuels&platform=${store.state.platform}`
-    // return axios.delete(${ProductEndpointUrl}/fuels/${data}?secret=MySecretForFuels&platform=${store.state.platform})
-    return chad
+    return axios.delete(`${ProductEndpointUrl}/fuels/${data}?secret=MySecretForFuels&platform=${store.state.platform}`)
   }
   return 'error'
 }
diff --git a/src/api/terminal.js b/src/api/terminal.js
index e84d61dc..8f1272f3 100644
--- a/src/api/terminal.js
+++ b/src/api/terminal.js
@@ -23,12 +23,8 @@ export function updateTerminal(data) {
 }
 
 export function deleteTerminal(data) {
-  // put this logic in the .vue file
   if (data !== '') {
-    console.log(data)
-    const chad = `${TerminalEndpointUrl}/terminal/${data}?secret=MySecretForTerminal&platform=${store.state.platform}`
-    // return axios.delete(${ProductEndpointUrl}/fuels/${data}?secret=MySecretForTermina&platform=${store.state.platform})
-    return chad
+    return axios.delete(`${TerminalEndpointUrl}/terminal/${data}?secret=MySecretForTerminals&platform=${store.state.platform}`)
   }
   return 'error'
 }
diff --git a/src/components/PopUps/Delete/index.vue b/src/components/PopUps/Delete/index.vue
index 5b301428..cd7257a5 100644
--- a/src/components/PopUps/Delete/index.vue
+++ b/src/components/PopUps/Delete/index.vue
@@ -98,30 +98,36 @@ export default {
       return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess)
     },
     handleSubmit() {
-      console.log(this.item._id)
       if (this.type === 'terminal') {
-        console.log(deleteTerminal(this.item._id))
-      } else {
-        console.log(deleteProduct(this.item._id))
+        deleteTerminal(this.item._id).then((response) => {
+          this.confirmationPage(response)
+        })
+      } else if (this.type === 'product') {
+        deleteProduct(this.item._id).then((response) => {
+          this.confirmationPage(response)
+        })
       }
       // delete${this.type}(this.item._id))
       // .then((r) => {
       // console.log(r)
+      // confirmationPage (response)
       // })
+    },
+    confirmationPage(response) {
       this.viewState = 'confirmation'
-      // if (response && response.success){
-      this.confirmation = {
-        text: `Succesfully deleted ${this.item.name} form ${this.type}s list`,
-        icon: 'el-icon-circle-check',
-        iconStyle: 'font-size: 75px; color: green;'
+      if (response && response.data.message === 'Completed') {
+        this.confirmation = {
+          text: `Succesfully deleted ${this.item.name} form ${this.type}s list`,
+          icon: 'el-icon-circle-check',
+          iconStyle: 'font-size: 75px; color: green;'
+        }
+      } else if (!response || response === 'error') {
+        this.confirmation = {
+          text: `Error deleting ${this.item.name} form ${this.type}s list. Please refresh your page and try again. If the Error persists, please contact dev team`,
+          icon: 'el-icon-circle-close',
+          iconStyle: 'font-size: 75px; color: red;'
+        }
       }
-    // }else if (!response || !response.success){
-      // this.confirmation = {
-      //   text: `Error deleting ${this.item.name} form ${this.type}s list. /n Please refresh your page and try again. If the Error persists, please contact Chadmin`,
-      //   icon: 'el-icon-circle-close',
-      //   iconStyle: 'font-size: 75px; color: red;'
-      // }
-    // }
     }
   }
 }
diff --git a/src/views/products/list.vue b/src/views/products/list.vue
index 6afbd9be..0e9c3b1b 100644
--- a/src/views/products/list.vue
+++ b/src/views/products/list.vue
@@ -44,6 +44,8 @@
             :item="scope.row"
             :type="'product'"
           />
+          <!-- NEED TO SEND BACK SUCCESSFULLY DELETED  from above SO IT REFETCHES THE PRODUCT LIST -->
+
         </template>
       </el-table-column>
     </el-table>