Merge pull request #918 from mehmetcoban/master

fixed offline payments edit and delete

modules/OfflinePayments/Http/Controllers/Settings.php

@@ -156,10 +156,13 @@ class Settings extends Controller
 
         $message = trans('messages.success.deleted', ['type' => $remove['name']]);
 
+        flash($message)->success();
+
         return response()->json([
             'errors' => false,
             'success' => true,
-            'message' => $message
+            'message' => $message,
+            'redirect' => route('offline-payments.edit'),
         ]);
     }
 }

modules/OfflinePayments/Resources/assets/js/offline-payments.js

@@ -21,13 +21,22 @@ const app = new Vue({
 
     data() {
         return {
-            form: new Form('offline-payments')
+            form: new Form('offline-payments'),
+            confirm: {
+                code: '',
+                title: '',
+                message: '',
+                button_cancel: '',
+                button_delete: '',
+                show: false
+            },
         }
     },
 
     methods:{
         onEdit(event) {
             var code = event.target.dataset.code;
+
             this.form.loading = true;
 
             axios.post('offline-payments/get', {
@@ -47,6 +56,23 @@ const app = new Vue({
             });
         },
 
+        // Actions > Delete
+        confirmDelete(code, title, message, button_cancel, button_delete) {
+            this.confirm.code = code;
+            this.confirm.title = title;
+            this.confirm.message = message;
+            this.confirm.button_cancel = button_cancel;
+            this.confirm.button_delete = button_delete;
+            this.confirm.show = true;
+        },
+
+        cancelDelete() {
+            this.confirm.code = '';
+            this.confirm.title = '';
+            this.confirm.message = '';
+            this.confirm.show = false;
+        },
+
         onDelete() {
             axios({
                 method: 'DELETE',
@@ -57,14 +83,9 @@ const app = new Vue({
             })
             .then(response => {
                 if (response.data.success) {
-                    var type = (response.data.success) ? 'success' : 'warning';
+                    if (response.data.redirect) {
-
+                        window.location.href = response.data.redirect;
-                    this.$notify({
+                    }
-                        message: response.data.message,
-                        timeout: 5000,
-                        icon: 'fas fa-bell',
-                        type
-                    });
 
                     document.getElementById('method-' + this.confirm.code).remove();
 

modules/OfflinePayments/Resources/views/edit.blade.php

@@ -92,7 +92,7 @@
                                                         'title'   => trans('general.delete'),
                                                         'data-code' => $item->code,
                                                         'id' => 'delete-' . $item->code,
-                                                        '@click'  => 'confirmDelete("' . $item->code . '", "' . trans('general.delete') . ' ' . trans_choice('offline-payments::general.methods', 1) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->name . '</strong>', 'type' => mb_strtolower(trans('offline-payments::general.title'))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
+                                                        '@click'  => 'confirmDelete("' . $item->code . '", "' . trans('general.delete') . ' ' . trans_choice('offline-payments::general.methods', 1) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->name . '</strong>', 'type' => mb_strtolower(trans('offline-payments::general.name'))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
                                                     )) !!}
                                                 </div>
                                             </div>
@@ -120,5 +120,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('modules/OfflinePayments/Resources/js/offline-payments.min.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('modules/OfflinePayments/Resources/assets/js/offline-payments.min.js?v=' . version('short')) }}"></script>
 @endpush

modules/OfflinePayments/mix-manifest.json

@@ -1,4 +1,4 @@
 {
     "/Resources/assets/js/offline-payments.min.js": "/Resources/assets/js/offline-payments.min.js",
-    "/public/css/argon.css": "/public/css/argon.css"
+    "/../../public/css/argon.css": "/../../public/css/argon.css"
 }