fixed issue #750

bagisto · Apr 9, 2019 · 6a4cb01 · 6a4cb01
1 parent d8d645e
commit 6a4cb01
Show file tree

Hide file tree

Showing 48 changed files with 307 additions and 138 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,7 +3,7 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-insert_final_newline = true
+insert_final_newline = false
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true

diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
@@ -128,14 +128,14 @@ public function prepareActions()
     {
         $this->addAction([
             'type' => 'Edit',
-            'method' => 'GET', // use GET request only for redirect purposes
+            'method' => 'GET', //use post only for redirects only
             'route' => 'admin.catalog.attributes.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
-            'method' => 'POST', //upper case string
+            'method' => 'POST', //use post only for requests other than redirects
             'route' => 'admin.catalog.attributes.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php
@@ -57,12 +57,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.catalog.families.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes and POST for rest
             'route' => 'admin.catalog.families.delete',
             // 'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'product']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
@@ -92,12 +92,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.catalog.categories.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.catalog.categories.delete',
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'product']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
@@ -66,12 +66,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.channels.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.channels.delete',
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'product']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php
@@ -57,12 +57,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.currencies.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.currencies.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
@@ -73,12 +73,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.customer.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.customer.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php
@@ -48,12 +48,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.groups.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.groups.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
@@ -91,12 +91,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.customer.review.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.customer.review.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php
@@ -59,12 +59,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.exchange_rates.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.exchange_rates.delete',
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'Exchange Rate']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
@@ -81,12 +81,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.inventory_sources.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.inventory_sources.delete',
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'Exchange Rate']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php
@@ -57,12 +57,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.locales.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.locales.delete',
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'Exchange Rate']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
@@ -63,12 +63,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.customers.subscribers.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.customers.subscribers.delete',
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'Exchange Rate']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
@@ -135,6 +135,7 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'View',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.sales.orders.view',
             'icon' => 'icon eye-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
@@ -66,6 +66,7 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'View',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.sales.invoices.view',
             'icon' => 'icon eye-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
@@ -109,6 +109,7 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'View',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.sales.shipments.view',
             'icon' => 'icon eye-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
@@ -121,12 +121,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.catalog.products.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.catalog.products.delete',
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'product']),
             'icon' => 'icon trash-icon'

diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php
@@ -58,8 +58,16 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.roles.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
+
+        $this->addAction([
+            'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
+            'route' => 'admin.roles.delete',
+            'icon' => 'icon trash-icon'
+        ]);
     }
 }
diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
@@ -61,12 +61,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.sliders.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.sliders.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php
@@ -57,12 +57,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.tax-categories.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.tax-categories.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php
@@ -102,12 +102,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.tax-rates.store',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.tax-rates.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
@@ -86,12 +86,14 @@ public function addColumns()
     public function prepareActions() {
         $this->addAction([
             'type' => 'Edit',
+            'method' => 'GET', // use GET request only for redirect purposes
             'route' => 'admin.users.edit',
             'icon' => 'icon pencil-lg-icon'
         ]);
 
         $this->addAction([
             'type' => 'Delete',
+            'method' => 'POST', // use GET request only for redirect purposes
             'route' => 'admin.users.delete',
             'icon' => 'icon trash-icon'
         ]);

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
@@ -172,10 +172,18 @@ public function update(Request $request, $id)
      */
     public function destroy($id)
     {
-        $this->customer->delete($id);
+        $customer = $this->customer->findorFail($id);
 
-        session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
+        try {
+            $customer->delete();
 
-        return redirect()->back();
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
+
+            return 'true';
+        } catch(\Exception $e) {
+            session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer']));
+        }
+
+        return 'false';
     }
-}
+}
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
@@ -8,7 +8,7 @@
 use Webkul\Customer\Repositories\CustomerGroupRepository as CustomerGroup;
 
 /**
- * CustomerGroup controlller
+ * Customer Group controlller
  *
  * @author    Rahul Shukla <rahulshukla.symfony517@webkul.com>
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
@@ -32,7 +32,7 @@ class CustomerGroupController extends Controller
      /**
      * Create a new controller instance.
      *
-     * @param Webkul\Customer\Repositories\CustomerGroupRepository as customerGroup;
+     * @param \Webkul\Customer\Repositories\CustomerGroupRepository as customerGroup;
      * @return void
      */
     public function __construct(CustomerGroup $customerGroup)
@@ -127,18 +127,24 @@ public function update(Request $request, $id)
      */
     public function destroy($id)
     {
-        $group = $this->customerGroup->findOneByField('id', $id);
+        $customerGroup = $this->customerGroup->findorFail($id);
 
-        if ($group->is_user_defined == 0) {
+        if ($customerGroup->is_user_defined == 0) {
             session()->flash('warning', trans('admin::app.customers.customers.group-default'));
-        } else if (count($group->customer) > 0) {
+        } else if (count($customerGroup->customer) > 0) {
             session()->flash('warning', trans('admin::app.response.customer-associate', ['name' => 'Customer Group']));
         } else {
-            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer Group']));
+            try {
+                $customerGroup->delete($id);
 
-            $this->customerGroup->delete($id);
+                session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer Group']));
+
+                return 'true';
+            } catch(\Exception $e) {
+                session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer Group']));
+            }
         }
 
-        return redirect()->back();
+        return 'false';
     }
 }