From 82ce0a423473c4e27492a17a7c4a8163911aafdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sun, 9 Feb 2020 13:10:26 +0300
Subject: [PATCH] Delete modal background style..

---
 resources/assets/js/mixins/global.js          | 85 ++++++++++---------
 .../partials/form/delete_button.blade.php     | 14 ---
 .../views/partials/form/delete_link.blade.php | 13 ---
 3 files changed, 45 insertions(+), 67 deletions(-)

diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js
index 3cae77f2d..a9a36d4a8 100644
--- a/resources/assets/js/mixins/global.js
+++ b/resources/assets/js/mixins/global.js
@@ -37,14 +37,6 @@ export default {
 
     data: function () {
         return {
-            confirm: {
-                url: '',
-                title: '',
-                message: '',
-                button_cancel: '',
-                button_delete: '',
-                show: false
-            },
             money: {
                 decimal: '.',
                 thousands: ',',
@@ -141,43 +133,56 @@ export default {
 
         // Actions > Delete
         confirmDelete(url, title, message, button_cancel, button_delete) {
-            this.confirm.url = url;
-            this.confirm.title = title;
-            this.confirm.message = message;
-            this.confirm.button_cancel = button_cancel;
-            this.confirm.button_delete = button_delete;
-            this.confirm.show = true;
-        },
+            let confirm = {
+                url: url,
+                title: title,
+                message: message,
+                button_cancel: button_cancel,
+                button_delete: button_delete,
+                show: true
+            };
 
-        // Delete action post
-        onDelete() {
-            axios({
-                method: 'DELETE',
-                url: this.confirm.url,
-            })
-            .then(response => {
-                if (response.data.redirect) {
-                    this.confirm.url = '';
-                    this.confirm.title = '';
-                    this.confirm.message = '';
-                    this.confirm.show = false;
+            this.component = Vue.component('add-new-component', (resolve, reject) => {
+                resolve({
+                    template : '<div id="dynamic-component"><akaunting-modal v-if="confirm.show" :show="confirm.show" :title="confirm.title" :message="confirm.message" :button_cancel="confirm.button_cancel" :button_delete="confirm.button_delete" @confirm="onDelete" @cancel="cancelDelete"></akaunting-modal></div>',
 
-                    window.location.href = response.data.redirect;
-                }
-            })
-            .catch(error => {
-                this.success = false;
+                    components: {
+                        AkauntingModal,
+                    },
+
+                    data: function () {
+                        return {
+                            confirm: confirm,
+                        }
+                    },
+
+                    methods: {
+                        // Delete action post
+                       async onDelete() {
+                            let promise = Promise.resolve(axios({
+                                method: 'DELETE',
+                                url: this.confirm.url,
+                            }));
+
+                            promise.then(response => {
+                                if (response.data.redirect) {
+                                    window.location.href = response.data.redirect;
+                                }
+                            })
+                            .catch(error => {
+                                this.success = false;
+                            });
+                        },
+
+                        // Close modal empty default value
+                        cancelDelete() {
+                            this.confirm.show = false;
+                        },
+                    }
+                })
             });
         },
 
-        // Close modal empty default value
-        cancelDelete() {
-            this.confirm.url = '';
-            this.confirm.title = '';
-            this.confirm.message = '';
-            this.confirm.show = false;
-        },
-
         // Change bank account get money and currency rate
         onChangeAccount(account_id) {
             axios.get(url + '/banking/accounts/currency', {
diff --git a/resources/views/partials/form/delete_button.blade.php b/resources/views/partials/form/delete_button.blade.php
index 63ad7ff49..d2bf894ff 100644
--- a/resources/views/partials/form/delete_button.blade.php
+++ b/resources/views/partials/form/delete_button.blade.php
@@ -18,17 +18,3 @@
     'title'   => trans('general.delete'),
     '@click'  => 'confirmDelete("' . $url . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->$value . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
 )) !!}
-
-@push('content_content_end')
-    <akaunting-modal
-        :show="confirm.show"
-        :title="confirm.title"
-        :message="confirm.message"
-        :button_cancel="confirm.button_cancel"
-        :button_delete="confirm.button_delete"
-        v-if='confirm.show'
-        @confirm='onDelete'
-        @cancel="cancelDelete">
-    </akaunting-modal>
-@endpush
-
diff --git a/resources/views/partials/form/delete_link.blade.php b/resources/views/partials/form/delete_link.blade.php
index 4ead1ebf7..d10ca086e 100644
--- a/resources/views/partials/form/delete_link.blade.php
+++ b/resources/views/partials/form/delete_link.blade.php
@@ -20,16 +20,3 @@
     'title'   => trans('general.delete'),
     '@click'  => 'confirmDelete("' . $url . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
 )) !!}
-
-@push('content_content_end')
-    <akaunting-modal
-        :show="confirm.show"
-        :title="confirm.title"
-        :message="confirm.message"
-        :button_cancel="confirm.button_cancel"
-        :button_delete="confirm.button_delete"
-        v-if='confirm.show'
-        @confirm='onDelete'
-        @cancel="cancelDelete">
-    </akaunting-modal>
-@endpush