From a72401dbbadff05f5c49b50cf19bef03f6385bd3 Mon Sep 17 00:00:00 2001
From: Jitendra Singh <jitendra@webkul.com>
Date: Wed, 19 Feb 2020 17:09:17 +0530
Subject: [PATCH] Improved attribute package code style

---
 packages/Webkul/Admin/src/Config/acl.php      | 498 +++++++++---------
 packages/Webkul/Admin/src/Config/menu.php     | 280 +++++-----
 packages/Webkul/Admin/src/Config/system.php   | 132 ++---
 .../Seeders/AttributeGroupTableSeeder.php     |  62 +--
 .../Seeders/AttributeOptionTableSeeder.php    |  32 +-
 .../Http/Controllers/AttributeController.php  |  15 +-
 .../AttributeFamilyRepository.php             |  12 +-
 .../AttributeOptionRepository.php             |   3 +-
 .../src/Repositories/AttributeRepository.php  |  31 +-
 9 files changed, 541 insertions(+), 524 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php
index 8b28872db..251550c81 100755
--- a/packages/Webkul/Admin/src/Config/acl.php
+++ b/packages/Webkul/Admin/src/Config/acl.php
@@ -2,420 +2,420 @@
 
 return [
     [
-        'key' => 'dashboard',
-        'name' => 'admin::app.acl.dashboard',
+        'key'   => 'dashboard',
+        'name'  => 'admin::app.acl.dashboard',
         'route' => 'admin.dashboard.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'sales',
-        'name' => 'admin::app.acl.sales',
+        'key'   => 'sales',
+        'name'  => 'admin::app.acl.sales',
         'route' => 'admin.sales.orders.index',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'sales.orders',
-        'name' => 'admin::app.acl.orders',
+        'key'   => 'sales.orders',
+        'name'  => 'admin::app.acl.orders',
         'route' => 'admin.sales.orders.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'sales.invoices',
-        'name' => 'admin::app.acl.invoices',
+        'key'   => 'sales.invoices',
+        'name'  => 'admin::app.acl.invoices',
         'route' => 'admin.sales.invoices.index',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'sales.shipments',
-        'name' => 'admin::app.acl.shipments',
+        'key'   => 'sales.shipments',
+        'name'  => 'admin::app.acl.shipments',
         'route' => 'admin.sales.shipments.index',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'catalog',
-        'name' => 'admin::app.acl.catalog',
+        'key'   => 'catalog',
+        'name'  => 'admin::app.acl.catalog',
         'route' => 'admin.catalog.index',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'catalog.products',
-        'name' => 'admin::app.acl.products',
+        'key'   => 'catalog.products',
+        'name'  => 'admin::app.acl.products',
         'route' => 'admin.catalog.products.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'catalog.products.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'catalog.products.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.catalog.products.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'catalog.products.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'catalog.products.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.catalog.products.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'catalog.products.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'catalog.products.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.catalog.products.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'catalog.categories',
-        'name' => 'admin::app.acl.categories',
+        'key'   => 'catalog.categories',
+        'name'  => 'admin::app.acl.categories',
         'route' => 'admin.catalog.categories.index',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'catalog.categories.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'catalog.categories.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.catalog.categories.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'catalog.categories.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'catalog.categories.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.catalog.categories.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'catalog.categories.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'catalog.categories.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.catalog.categories.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'catalog.attributes',
-        'name' => 'admin::app.acl.attributes',
+        'key'   => 'catalog.attributes',
+        'name'  => 'admin::app.acl.attributes',
         'route' => 'admin.catalog.attributes.index',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'catalog.attributes.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'catalog.attributes.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.catalog.attributes.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'catalog.attributes.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'catalog.attributes.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.catalog.attributes.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'catalog.attributes.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'catalog.attributes.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.catalog.attributes.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'catalog.families',
-        'name' => 'admin::app.acl.attribute-families',
+        'key'   => 'catalog.families',
+        'name'  => 'admin::app.acl.attribute-families',
         'route' => 'admin.catalog.families.index',
-        'sort' => 4
+        'sort'  => 4
     ], [
-        'key' => 'catalog.families.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'catalog.families.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.catalog.families.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'catalog.families.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'catalog.families.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.catalog.families.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'catalog.families.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'catalog.families.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.catalog.families.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'customers',
-        'name' => 'admin::app.acl.customers',
+        'key'   => 'customers',
+        'name'  => 'admin::app.acl.customers',
         'route' => 'admin.customer.index',
-        'sort' => 4
+        'sort'  => 4
     ], [
-        'key' => 'customers.customers',
-        'name' => 'admin::app.acl.customers',
+        'key'   => 'customers.customers',
+        'name'  => 'admin::app.acl.customers',
         'route' => 'admin.customer.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'customers.customers.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'customers.customers.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.customer.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'customers.customers.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'customers.customers.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.customer.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'customers.customers.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'customers.customers.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.customer.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'customers.groups',
-        'name' => 'admin::app.acl.groups',
+        'key'   => 'customers.groups',
+        'name'  => 'admin::app.acl.groups',
         'route' => 'admin.groups.index',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'customers.groups.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'customers.groups.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.groups.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'customers.groups.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'customers.groups.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.groups.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'customers.groups.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'customers.groups.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.groups.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'customers.reviews',
-        'name' => 'admin::app.acl.reviews',
+        'key'   => 'customers.reviews',
+        'name'  => 'admin::app.acl.reviews',
         'route' => 'admin.customer.review.index',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'customers.reviews.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'customers.reviews.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.customer.review.edit',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'customers.reviews.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'customers.reviews.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.customer.review.delete',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'configuration',
-        'name' => 'admin::app.acl.configure',
+        'key'   => 'configuration',
+        'name'  => 'admin::app.acl.configure',
         'route' => 'admin.configuration.index',
-        'sort' => 5
+        'sort'  => 5
     ], [
-        'key' => 'settings',
-        'name' => 'admin::app.acl.settings',
+        'key'   => 'settings',
+        'name'  => 'admin::app.acl.settings',
         'route' => 'admin.users.index',
-        'sort' => 6
+        'sort'  => 6
     ], [
-        'key' => 'settings.locales',
-        'name' => 'admin::app.acl.locales',
+        'key'   => 'settings.locales',
+        'name'  => 'admin::app.acl.locales',
         'route' => 'admin.locales.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.locales.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.locales.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.locales.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.locales.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.locales.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.locales.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.locales.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.locales.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.locales.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.currencies',
-        'name' => 'admin::app.acl.currencies',
+        'key'   => 'settings.currencies',
+        'name'  => 'admin::app.acl.currencies',
         'route' => 'admin.currencies.index',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.currencies.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.currencies.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.currencies.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.currencies.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.currencies.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.currencies.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.currencies.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.currencies.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.currencies.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.exchange_rates',
-        'name' => 'admin::app.acl.exchange-rates',
+        'key'   => 'settings.exchange_rates',
+        'name'  => 'admin::app.acl.exchange-rates',
         'route' => 'admin.exchange_rates.index',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.exchange_rates.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.exchange_rates.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.exchange_rates.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.exchange_rates.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.exchange_rates.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.exchange_rates.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.exchange_rates.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.exchange_rates.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.exchange_rates.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.inventory_sources',
-        'name' => 'admin::app.acl.inventory-sources',
+        'key'   => 'settings.inventory_sources',
+        'name'  => 'admin::app.acl.inventory-sources',
         'route' => 'admin.inventory_sources.index',
-        'sort' => 4
+        'sort'  => 4
     ], [
-        'key' => 'settings.inventory_sources.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.inventory_sources.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.inventory_sources.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.inventory_sources.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.inventory_sources.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.inventory_sources.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.inventory_sources.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.inventory_sources.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.inventory_sources.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.channels',
-        'name' => 'admin::app.acl.channels',
+        'key'   => 'settings.channels',
+        'name'  => 'admin::app.acl.channels',
         'route' => 'admin.channels.index',
-        'sort' => 5
+        'sort'  => 5
     ], [
-        'key' => 'settings.channels.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.channels.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.channels.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.channels.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.channels.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.channels.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.channels.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.channels.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.channels.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.users',
-        'name' => 'admin::app.acl.users',
+        'key'   => 'settings.users',
+        'name'  => 'admin::app.acl.users',
         'route' => 'admin.users.index',
-        'sort' => 6
+        'sort'  => 6
     ], [
-        'key' => 'settings.users.users',
-        'name' => 'admin::app.acl.users',
+        'key'   => 'settings.users.users',
+        'name'  => 'admin::app.acl.users',
         'route' => 'admin.users.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.users.users.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.users.users.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.users.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.users.users.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.users.users.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.users.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.users.users.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.users.users.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.users.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.users.roles',
-        'name' => 'admin::app.acl.roles',
+        'key'   => 'settings.users.roles',
+        'name'  => 'admin::app.acl.roles',
         'route' => 'admin.roles.index',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.users.roles.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.users.roles.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.roles.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.users.roles.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.users.roles.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.roles.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.users.roles.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.users.roles.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.roles.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.sliders',
-        'name' => 'admin::app.acl.sliders',
+        'key'   => 'settings.sliders',
+        'name'  => 'admin::app.acl.sliders',
         'route' => 'admin.sliders.index',
-        'sort' => 7
+        'sort'  => 7
     ], [
-        'key' => 'settings.sliders.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.sliders.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.sliders.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.sliders.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.sliders.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.sliders.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.sliders.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.sliders.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.sliders.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.taxes',
-        'name' => 'admin::app.acl.taxes',
+        'key'   => 'settings.taxes',
+        'name'  => 'admin::app.acl.taxes',
         'route' => 'admin.tax-categories.index',
-        'sort' => 8
+        'sort'  => 8
     ], [
-        'key' => 'settings.taxes.tax-categories',
-        'name' => 'admin::app.acl.tax-categories',
+        'key'   => 'settings.taxes.tax-categories',
+        'name'  => 'admin::app.acl.tax-categories',
         'route' => 'admin.tax-categories.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.taxes.tax-categories.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.taxes.tax-categories.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.tax-categories.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.taxes.tax-categories.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.taxes.tax-categories.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.tax-categories.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.taxes.tax-categories.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.taxes.tax-categories.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.tax-categories.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'settings.taxes.tax-rates',
-        'name' => 'admin::app.acl.tax-rates',
+        'key'   => 'settings.taxes.tax-rates',
+        'name'  => 'admin::app.acl.tax-rates',
         'route' => 'admin.tax-rates.index',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.taxes.tax-rates.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'settings.taxes.tax-rates.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.tax-rates.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'settings.taxes.tax-rates.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'settings.taxes.tax-rates.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.tax-rates.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'settings.taxes.tax-rates.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'settings.taxes.tax-rates.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.tax-rates.delete',
-        'sort' => 3
+        'sort'  => 3
     ], [
-        'key' => 'promotions',
-        'name' => 'admin::app.acl.promotions',
+        'key'   => 'promotions',
+        'name'  => 'admin::app.acl.promotions',
         'route' => 'admin.cart-rules.index',
-        'sort' => 7
+        'sort'  => 7
     ], [
-        'key' => 'promotions.cart-rules',
-        'name' => 'admin::app.acl.cart-rules',
+        'key'   => 'promotions.cart-rules',
+        'name'  => 'admin::app.acl.cart-rules',
         'route' => 'admin.cart-rules.index',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'promotions.cart-rules.create',
-        'name' => 'admin::app.acl.create',
+        'key'   => 'promotions.cart-rules.create',
+        'name'  => 'admin::app.acl.create',
         'route' => 'admin.cart-rules.create',
-        'sort' => 1
+        'sort'  => 1
     ], [
-        'key' => 'promotions.cart-rules.edit',
-        'name' => 'admin::app.acl.edit',
+        'key'   => 'promotions.cart-rules.edit',
+        'name'  => 'admin::app.acl.edit',
         'route' => 'admin.cart-rules.edit',
-        'sort' => 2
+        'sort'  => 2
     ], [
-        'key' => 'promotions.cart-rules.delete',
-        'name' => 'admin::app.acl.delete',
+        'key'   => 'promotions.cart-rules.delete',
+        'name'  => 'admin::app.acl.delete',
         'route' => 'admin.cart-rules.delete',
-        'sort' => 3
+        'sort'  => 3
     ],
 ];
 
diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php
index ce1da1d85..dd5fed828 100755
--- a/packages/Webkul/Admin/src/Config/menu.php
+++ b/packages/Webkul/Admin/src/Config/menu.php
@@ -2,214 +2,214 @@
 
 return [
     [
-        'key' => 'dashboard',
-        'name' => 'admin::app.layouts.dashboard',
-        'route' => 'admin.dashboard.index',
-        'sort' => 1,
+        'key'        => 'dashboard',
+        'name'       => 'admin::app.layouts.dashboard',
+        'route'      => 'admin.dashboard.index',
+        'sort'       => 1,
         'icon-class' => 'dashboard-icon'
     ], [
-        'key' => 'sales',
-        'name' => 'admin::app.layouts.sales',
-        'route' => 'admin.sales.orders.index',
-        'sort' => 2,
+        'key'        => 'sales',
+        'name'       => 'admin::app.layouts.sales',
+        'route'      => 'admin.sales.orders.index',
+        'sort'       => 2,
         'icon-class' => 'sales-icon'
     ], [
-        'key' => 'sales.orders',
-        'name' => 'admin::app.layouts.orders',
-        'route' => 'admin.sales.orders.index',
-        'sort' => 1,
+        'key'        => 'sales.orders',
+        'name'       => 'admin::app.layouts.orders',
+        'route'      => 'admin.sales.orders.index',
+        'sort'       => 1,
         'icon-class' => ''
     ], [
-        'key' => 'sales.shipments',
-        'name' => 'admin::app.layouts.shipments',
-        'route' => 'admin.sales.shipments.index',
-        'sort' => 2,
+        'key'        => 'sales.shipments',
+        'name'       => 'admin::app.layouts.shipments',
+        'route'      => 'admin.sales.shipments.index',
+        'sort'       => 2,
         'icon-class' => ''
     ], [
-        'key' => 'sales.invoices',
-        'name' => 'admin::app.layouts.invoices',
-        'route' => 'admin.sales.invoices.index',
-        'sort' => 3,
+        'key'        => 'sales.invoices',
+        'name'       => 'admin::app.layouts.invoices',
+        'route'      => 'admin.sales.invoices.index',
+        'sort'       => 3,
         'icon-class' => ''
     ], [
-        'key' => 'sales.refunds',
-        'name' => 'admin::app.layouts.refunds',
-        'route' => 'admin.sales.refunds.index',
-        'sort' => 4,
+        'key'        => 'sales.refunds',
+        'name'       => 'admin::app.layouts.refunds',
+        'route'      => 'admin.sales.refunds.index',
+        'sort'       => 4,
         'icon-class' => ''
     ], [
-        'key' => 'catalog',
-        'name' => 'admin::app.layouts.catalog',
-        'route' => 'admin.catalog.products.index',
-        'sort' => 3,
+        'key'        => 'catalog',
+        'name'       => 'admin::app.layouts.catalog',
+        'route'      => 'admin.catalog.products.index',
+        'sort'       => 3,
         'icon-class' => 'catalog-icon'
     ], [
-        'key' => 'catalog.products',
-        'name' => 'admin::app.layouts.products',
-        'route' => 'admin.catalog.products.index',
-        'sort' => 1,
+        'key'        => 'catalog.products',
+        'name'       => 'admin::app.layouts.products',
+        'route'      => 'admin.catalog.products.index',
+        'sort'       => 1,
         'icon-class' => ''
     ], [
-        'key' => 'catalog.categories',
-        'name' => 'admin::app.layouts.categories',
-        'route' => 'admin.catalog.categories.index',
-        'sort' => 3,
+        'key'        => 'catalog.categories',
+        'name'       => 'admin::app.layouts.categories',
+        'route'      => 'admin.catalog.categories.index',
+        'sort'       => 3,
         'icon-class' => ''
     ], [
-        'key' => 'catalog.attributes',
-        'name' => 'admin::app.layouts.attributes',
-        'route' => 'admin.catalog.attributes.index',
-        'sort' => 2,
+        'key'        => 'catalog.attributes',
+        'name'       => 'admin::app.layouts.attributes',
+        'route'      => 'admin.catalog.attributes.index',
+        'sort'       => 2,
         'icon-class' => ''
     ], [
-        'key' => 'catalog.families',
-        'name' => 'admin::app.layouts.attribute-families',
-        'route' => 'admin.catalog.families.index',
-        'sort' => 4,
+        'key'        => 'catalog.families',
+        'name'       => 'admin::app.layouts.attribute-families',
+        'route'      => 'admin.catalog.families.index',
+        'sort'       => 4,
         'icon-class' => ''
     ], [
-        'key' => 'customers',
-        'name' => 'admin::app.layouts.customers',
-        'route' => 'admin.customer.index',
-        'sort' => 4,
+        'key'        => 'customers',
+        'name'       => 'admin::app.layouts.customers',
+        'route'      => 'admin.customer.index',
+        'sort'       => 4,
         'icon-class' => 'customer-icon'
     ], [
-        'key' => 'customers.customers',
-        'name' => 'admin::app.layouts.customers',
-        'route' => 'admin.customer.index',
-        'sort' => 1,
+        'key'        => 'customers.customers',
+        'name'       => 'admin::app.layouts.customers',
+        'route'      => 'admin.customer.index',
+        'sort'       => 1,
         'icon-class' => ''
     ], [
-        'key' => 'customers.groups',
-        'name' => 'admin::app.layouts.groups',
-        'route' => 'admin.groups.index',
-        'sort' => 2,
+        'key'        => 'customers.groups',
+        'name'       => 'admin::app.layouts.groups',
+        'route'      => 'admin.groups.index',
+        'sort'       => 2,
         'icon-class' => ''
     ], [
-        'key' => 'customers.reviews',
-        'name' => 'admin::app.layouts.reviews',
-        'route' => 'admin.customer.review.index',
-        'sort' => 3,
+        'key'        => 'customers.reviews',
+        'name'       => 'admin::app.layouts.reviews',
+        'route'      => 'admin.customer.review.index',
+        'sort'       => 3,
         'icon-class' => ''
     ], [
-        'key' => 'customers.subscribers',
-        'name' => 'admin::app.layouts.newsletter-subscriptions',
-        'route' => 'admin.customers.subscribers.index',
-        'sort' => 4,
+        'key'        => 'customers.subscribers',
+        'name'       => 'admin::app.layouts.newsletter-subscriptions',
+        'route'      => 'admin.customers.subscribers.index',
+        'sort'       => 4,
         'icon-class' => ''
     ], [
-        'key' => 'configuration',
-        'name' => 'admin::app.layouts.configure',
-        'route' => 'admin.configuration.index',
-        'sort' => 7,
+        'key'        => 'configuration',
+        'name'       => 'admin::app.layouts.configure',
+        'route'      => 'admin.configuration.index',
+        'sort'       => 7,
         'icon-class' => 'configuration-icon'
     ], [
-        'key' => 'settings',
-        'name' => 'admin::app.layouts.settings',
-        'route' => 'admin.locales.index',
-        'sort' => 6,
+        'key'        => 'settings',
+        'name'       => 'admin::app.layouts.settings',
+        'route'      => 'admin.locales.index',
+        'sort'       => 6,
         'icon-class' => 'settings-icon'
     ], [
-        'key' => 'settings.locales',
-        'name' => 'admin::app.layouts.locales',
-        'route' => 'admin.locales.index',
-        'sort' => 1,
+        'key'        => 'settings.locales',
+        'name'       => 'admin::app.layouts.locales',
+        'route'      => 'admin.locales.index',
+        'sort'       => 1,
         'icon-class' => ''
     ], [
-        'key' => 'settings.currencies',
-        'name' => 'admin::app.layouts.currencies',
-        'route' => 'admin.currencies.index',
-        'sort' => 2,
+        'key'        => 'settings.currencies',
+        'name'       => 'admin::app.layouts.currencies',
+        'route'      => 'admin.currencies.index',
+        'sort'       => 2,
         'icon-class' => ''
     ], [
-        'key' => 'settings.exchange_rates',
-        'name' => 'admin::app.layouts.exchange-rates',
-        'route' => 'admin.exchange_rates.index',
-        'sort' => 3,
+        'key'        => 'settings.exchange_rates',
+        'name'       => 'admin::app.layouts.exchange-rates',
+        'route'      => 'admin.exchange_rates.index',
+        'sort'       => 3,
         'icon-class' => ''
     ], [
-        'key' => 'settings.inventory_sources',
-        'name' => 'admin::app.layouts.inventory-sources',
-        'route' => 'admin.inventory_sources.index',
-        'sort' => 4,
+        'key'        => 'settings.inventory_sources',
+        'name'       => 'admin::app.layouts.inventory-sources',
+        'route'      => 'admin.inventory_sources.index',
+        'sort'       => 4,
         'icon-class' => ''
     ], [
-        'key' => 'settings.channels',
-        'name' => 'admin::app.layouts.channels',
-        'route' => 'admin.channels.index',
-        'sort' => 5,
+        'key'        => 'settings.channels',
+        'name'       => 'admin::app.layouts.channels',
+        'route'      => 'admin.channels.index',
+        'sort'       => 5,
         'icon-class' => ''
     ], [
-        'key' => 'settings.users',
-        'name' => 'admin::app.layouts.users',
-        'route' => 'admin.users.index',
-        'sort' => 6,
+        'key'        => 'settings.users',
+        'name'       => 'admin::app.layouts.users',
+        'route'      => 'admin.users.index',
+        'sort'       => 6,
         'icon-class' => ''
     ], [
-        'key' => 'settings.users.users',
-        'name' => 'admin::app.layouts.users',
-        'route' => 'admin.users.index',
-        'sort' => 1,
+        'key'        => 'settings.users.users',
+        'name'       => 'admin::app.layouts.users',
+        'route'      => 'admin.users.index',
+        'sort'       => 1,
         'icon-class' => ''
     ], [
-        'key' => 'settings.users.roles',
-        'name' => 'admin::app.layouts.roles',
-        'route' => 'admin.roles.index',
-        'sort' => 2,
+        'key'        => 'settings.users.roles',
+        'name'       => 'admin::app.layouts.roles',
+        'route'      => 'admin.roles.index',
+        'sort'       => 2,
         'icon-class' => ''
     ], [
-        'key' => 'settings.sliders',
-        'name' => 'admin::app.layouts.sliders',
-        'route' => 'admin.sliders.index',
-        'sort' => 7,
+        'key'        => 'settings.sliders',
+        'name'       => 'admin::app.layouts.sliders',
+        'route'      => 'admin.sliders.index',
+        'sort'       => 7,
         'icon-class' => ''
     ], [
-        'key' => 'settings.taxes',
-        'name' => 'admin::app.layouts.taxes',
-        'route' => 'admin.tax-categories.index',
-        'sort' => 8,
+        'key'        => 'settings.taxes',
+        'name'       => 'admin::app.layouts.taxes',
+        'route'      => 'admin.tax-categories.index',
+        'sort'       => 8,
         'icon-class' => ''
     ], [
-        'key' => 'settings.taxes.tax-categories',
-        'name' => 'admin::app.layouts.tax-categories',
-        'route' => 'admin.tax-categories.index',
-        'sort' => 1,
+        'key'        => 'settings.taxes.tax-categories',
+        'name'       => 'admin::app.layouts.tax-categories',
+        'route'      => 'admin.tax-categories.index',
+        'sort'       => 1,
         'icon-class' => ''
     ], [
-        'key' => 'settings.taxes.tax-rates',
-        'name' => 'admin::app.layouts.tax-rates',
-        'route' => 'admin.tax-rates.index',
-        'sort' => 2,
+        'key'        => 'settings.taxes.tax-rates',
+        'name'       => 'admin::app.layouts.tax-rates',
+        'route'      => 'admin.tax-rates.index',
+        'sort'       => 2,
         'icon-class' => ''
     ], [
-        'key' => 'promotions',
-        'name' => 'admin::app.layouts.promotions',
-        'route' => 'admin.catalog-rules.index',
-        'sort' => 5,
+        'key'        => 'promotions',
+        'name'       => 'admin::app.layouts.promotions',
+        'route'      => 'admin.catalog-rules.index',
+        'sort'       => 5,
         'icon-class' => 'promotion-icon'
     ], [
-        'key' => 'promotions.catalog-rules',
-        'name' => 'admin::app.promotions.catalog-rules.title',
-        'route' => 'admin.catalog-rules.index',
-        'sort' => 1,
+        'key'        => 'promotions.catalog-rules',
+        'name'       => 'admin::app.promotions.catalog-rules.title',
+        'route'      => 'admin.catalog-rules.index',
+        'sort'       => 1,
         'icon-class' => ''
     ], [
-        'key' => 'promotions.cart-rules',
-        'name' => 'admin::app.promotions.cart-rules.title',
-        'route' => 'admin.cart-rules.index',
-        'sort' => 2,
+        'key'        => 'promotions.cart-rules',
+        'name'       => 'admin::app.promotions.cart-rules.title',
+        'route'      => 'admin.cart-rules.index',
+        'sort'       => 2,
         'icon-class' => ''
     ], [
-        'key' => 'cms',
-        'name' => 'admin::app.layouts.cms',
-        'route' => 'admin.cms.index',
-        'sort' => 5,
+        'key'        => 'cms',
+        'name'       => 'admin::app.layouts.cms',
+        'route'      => 'admin.cms.index',
+        'sort'       => 5,
         'icon-class' => 'cms-icon'
     ], [
-        'key' => 'cms.pages',
-        'name' => 'admin::app.cms.pages.pages',
-        'route' => 'admin.cms.index',
-        'sort' => 1,
+        'key'        => 'cms.pages',
+        'name'       => 'admin::app.cms.pages.pages',
+        'route'      => 'admin.cms.index',
+        'sort'       => 1,
         'icon-class' => ''
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index 39148ce20..721aac700 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -6,19 +6,19 @@ return [
         'name' => 'admin::app.admin.system.general',
         'sort' => 1,
     ], [
-        'key' => 'general.general',
+        'key'  => 'general.general',
         'name' => 'admin::app.admin.system.general',
         'sort' => 1,
     ], [
-        'key' => 'general.general.locale_options',
-        'name' => 'admin::app.admin.system.locale-options',
-        'sort' => 1,
+        'key'    => 'general.general.locale_options',
+        'name'   => 'admin::app.admin.system.locale-options',
+        'sort'   => 1,
         'fields' => [
             [
-                'name' => 'weight_unit',
-                'title' => 'admin::app.admin.system.weight-unit',
-                'type' => 'select',
-                'options' => [
+                'name'          => 'weight_unit',
+                'title'         => 'admin::app.admin.system.weight-unit',
+                'type'          => 'select',
+                'options'       => [
                     [
                         'title' => 'lbs',
                         'value' => 'lbs'
@@ -31,24 +31,24 @@ return [
             ]
         ]
     ], [
-        'key' => 'general.content',
+        'key'  => 'general.content',
         'name' => 'admin::app.admin.system.content',
         'sort' => 2,
     ], [
-        'key' => 'general.content.footer',
-        'name' => 'admin::app.admin.system.footer',
-        'sort' => 1,
+        'key'    => 'general.content.footer',
+        'name'   => 'admin::app.admin.system.footer',
+        'sort'   => 1,
         'fields' => [
             [
-                'name' => 'footer_content',
-                'title' => 'admin::app.admin.system.footer-content',
-                'type' => 'text',
+                'name'          => 'footer_content',
+                'title'         => 'admin::app.admin.system.footer-content',
+                'type'          => 'text',
                 'channel_based' => true,
-                'locale_based' => true
+                'locale_based'  => true
             ], [
-                'name' => 'footer_toggle',
-                'title' => 'admin::app.admin.system.footer-toggle',
-                'type' => 'select',
+                'name'    => 'footer_toggle',
+                'title'   => 'admin::app.admin.system.footer-toggle',
+                'type'    => 'select',
                 'options' => [
                     [
                         'title' => 'True',
@@ -58,114 +58,114 @@ return [
                         'value' => 0
                     ]
                 ],
-                'locale_based' => true,
+                'locale_based'  => true,
                 'channel_based' => true,
             ]
         ]
     ], [
-        'key' => 'general.design',
+        'key'  => 'general.design',
         'name' => 'admin::app.admin.system.design',
         'sort' => 3,
     ], [
-        'key' => 'general.design.admin_logo',
-        'name' => 'admin::app.admin.system.admin-logo',
-        'sort' => 1,
+        'key'    => 'general.design.admin_logo',
+        'name'   => 'admin::app.admin.system.admin-logo',
+        'sort'   => 1,
         'fields' => [
             [
-                'name' => 'logo_image',
-                'title' => 'admin::app.admin.system.logo-image',
-                'type' => 'image',
+                'name'          => 'logo_image',
+                'title'         => 'admin::app.admin.system.logo-image',
+                'type'          => 'image',
                 'channel_based' => true,
-                'validation' => 'mimes:jpeg,bmp,png,jpg'
+                'validation'    => 'mimes:jpeg,bmp,png,jpg'
             ]
         ]
     ], [
-        'key' => 'catalog',
+        'key'  => 'catalog',
         'name' => 'admin::app.admin.system.catalog',
         'sort' => 2
     ], [
-        'key' => 'catalog.products',
+        'key'  => 'catalog.products',
         'name' => 'admin::app.admin.system.products',
         'sort' => 2
     ], [
-        'key' => 'catalog.products.guest-checkout',
-        'name' => 'admin::app.admin.system.guest-checkout',
-        'sort' => 1,
+        'key'    => 'catalog.products.guest-checkout',
+        'name'   => 'admin::app.admin.system.guest-checkout',
+        'sort'   => 1,
         'fields' => [
             [
-                'name' => 'allow-guest-checkout',
+                'name'  => 'allow-guest-checkout',
                 'title' => 'admin::app.admin.system.allow-guest-checkout',
-                'type' => 'boolean'
+                'type'  => 'boolean'
             ]
         ]
     ], [
-        'key' => 'catalog.products.review',
-        'name' => 'admin::app.admin.system.review',
-        'sort' => 2,
+        'key'    => 'catalog.products.review',
+        'name'   => 'admin::app.admin.system.review',
+        'sort'   => 2,
         'fields' => [
             [
-                'name' => 'guest_review',
+                'name'  => 'guest_review',
                 'title' => 'admin::app.admin.system.allow-guest-review',
-                'type' => 'boolean'
+                'type'  => 'boolean'
             ]
         ]
     ], [
-        'key' => 'catalog.inventory',
+        'key'  => 'catalog.inventory',
         'name' => 'admin::app.admin.system.inventory',
         'sort' => 1,
     ], [
-        'key' => 'catalog.inventory.stock_options',
-        'name' => 'admin::app.admin.system.stock-options',
-        'sort' => 1,
+        'key'    => 'catalog.inventory.stock_options',
+        'name'   => 'admin::app.admin.system.stock-options',
+        'sort'   => 1,
         'fields' => [
             [
-                'name' => 'backorders',
-                'title' => 'admin::app.admin.system.allow-backorders',
-                'type' => 'boolean',
+                'name'          => 'backorders',
+                'title'         => 'admin::app.admin.system.allow-backorders',
+                'type'          => 'boolean',
                 'channel_based' => true
             ]
         ]
     ], [
-        'key' => 'customer',
+        'key'  => 'customer',
         'name' => 'admin::app.admin.system.customer',
         'sort' => 3,
     ], [
-        'key' => 'customer.settings',
+        'key'  => 'customer.settings',
         'name' => 'admin::app.admin.system.settings',
         'sort' => 1,
     ], [
-        'key' => 'customer.settings.address',
-        'name' => 'admin::app.admin.system.address',
-        'sort' => 1,
+        'key'    => 'customer.settings.address',
+        'name'   => 'admin::app.admin.system.address',
+        'sort'   => 1,
         'fields' => [
             [
-                'name' => 'street_lines',
-                'title' => 'admin::app.admin.system.street-lines',
-                'type' => 'text',
-                'validation' => 'between:1,4',
+                'name'          => 'street_lines',
+                'title'         => 'admin::app.admin.system.street-lines',
+                'type'          => 'text',
+                'validation'    => 'between:1,4',
                 'channel_based' => true
             ]
         ]
     ], [
-        'key' => 'customer.settings.newsletter',
-        'name' => 'admin::app.admin.system.newsletter',
-        'sort' => 2,
+        'key'    => 'customer.settings.newsletter',
+        'name'   => 'admin::app.admin.system.newsletter',
+        'sort'   => 2,
         'fields' => [
             [
-                'name' => 'subscription',
+                'name'  => 'subscription',
                 'title' => 'admin::app.admin.system.newsletter-subscription',
-                'type' => 'boolean',
+                'type'  => 'boolean',
             ]
         ],
     ], [
-        'key' => 'customer.settings.email',
-        'name' => 'admin::app.admin.system.email',
-        'sort' => 3,
+        'key'    => 'customer.settings.email',
+        'name'   => 'admin::app.admin.system.email',
+        'sort'   => 3,
         'fields' => [
             [
-                'name' => 'verification',
+                'name'  => 'verification',
                 'title' => 'admin::app.admin.system.email-verification',
-                'type' => 'boolean'
+                'type'  => 'boolean'
             ]
         ],
     ],
diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php
index 394c5ac48..66815b0ab 100755
--- a/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php
+++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php
@@ -17,40 +17,40 @@ class AttributeGroupTableSeeder extends Seeder
         DB::table('attribute_groups')->delete();
 
         DB::table('attribute_groups')->insert([
-            ['id' => '1','name' => 'General','position' => '1','is_user_defined' => '0','attribute_family_id' => '1'],
-            ['id' => '2','name' => 'Description','position' => '2','is_user_defined' => '0','attribute_family_id' => '1'],
-            ['id' => '3','name' => 'Meta Description','position' => '3','is_user_defined' => '0','attribute_family_id' => '1'],
-            ['id' => '4','name' => 'Price','position' => '4','is_user_defined' => '0','attribute_family_id' => '1'],
-            ['id' => '5','name' => 'Shipping','position' => '5','is_user_defined' => '0','attribute_family_id' => '1']
+            ['id' => '1', 'name' => 'General', 'position'          => '1','is_user_defined' => '0','attribute_family_id' => '1'],
+            ['id' => '2', 'name' => 'Description', 'position'      => '2','is_user_defined' => '0','attribute_family_id' => '1'],
+            ['id' => '3', 'name' => 'Meta Description' ,'position' => '3','is_user_defined' => '0','attribute_family_id' => '1'],
+            ['id' => '4', 'name' => 'Price', 'position'            => '4','is_user_defined' => '0','attribute_family_id' => '1'],
+            ['id' => '5', 'name' => 'Shipping', 'position'         => '5','is_user_defined' => '0','attribute_family_id' => '1']
         ]);
 
         DB::table('attribute_group_mappings')->insert([
-            ['attribute_id' => '1','attribute_group_id' => '1','position' => '1'],
-            ['attribute_id' => '2','attribute_group_id' => '1','position' => '2'],
-            ['attribute_id' => '3','attribute_group_id' => '1','position' => '3'],
-            ['attribute_id' => '4','attribute_group_id' => '1','position' => '4'],
-            ['attribute_id' => '5','attribute_group_id' => '1','position' => '5'],
-            ['attribute_id' => '6','attribute_group_id' => '1','position' => '6'],
-            ['attribute_id' => '7','attribute_group_id' => '1','position' => '7'],
-            ['attribute_id' => '8','attribute_group_id' => '1','position' => '8'],
-            ['attribute_id' => '9','attribute_group_id' => '2','position' => '1'],
-            ['attribute_id' => '10','attribute_group_id' => '2','position' => '2'],
-            ['attribute_id' => '11','attribute_group_id' => '4','position' => '1'],
-            ['attribute_id' => '12','attribute_group_id' => '4','position' => '2'],
-            ['attribute_id' => '13','attribute_group_id' => '4','position' => '3'],
-            ['attribute_id' => '14','attribute_group_id' => '4','position' => '4'],
-            ['attribute_id' => '15','attribute_group_id' => '4','position' => '5'],
-            ['attribute_id' => '16','attribute_group_id' => '3','position' => '1'],
-            ['attribute_id' => '17','attribute_group_id' => '3','position' => '2'],
-            ['attribute_id' => '18','attribute_group_id' => '3','position' => '3'],
-            ['attribute_id' => '19','attribute_group_id' => '5','position' => '1'],
-            ['attribute_id' => '20','attribute_group_id' => '5','position' => '2'],
-            ['attribute_id' => '21','attribute_group_id' => '5','position' => '3'],
-            ['attribute_id' => '22','attribute_group_id' => '5','position' => '4'],
-            ['attribute_id' => '23','attribute_group_id' => '1','position' => '10'],
-            ['attribute_id' => '24','attribute_group_id' => '1','position' => '11'],
-            ['attribute_id' => '25','attribute_group_id' => '1','position' => '12'],
-            ['attribute_id' => '26','attribute_group_id' => '1','position' => '9']
+            ['attribute_id' => '1', 'attribute_group_id'  => '1', 'position' => '1'],
+            ['attribute_id' => '2', 'attribute_group_id'  => '1', 'position' => '2'],
+            ['attribute_id' => '3', 'attribute_group_id'  => '1', 'position' => '3'],
+            ['attribute_id' => '4', 'attribute_group_id'  => '1', 'position' => '4'],
+            ['attribute_id' => '5', 'attribute_group_id'  => '1', 'position' => '5'],
+            ['attribute_id' => '6', 'attribute_group_id'  => '1', 'position' => '6'],
+            ['attribute_id' => '7', 'attribute_group_id'  => '1', 'position' => '7'],
+            ['attribute_id' => '8', 'attribute_group_id'  => '1', 'position' => '8'],
+            ['attribute_id' => '9', 'attribute_group_id'  => '2', 'position' => '1'],
+            ['attribute_id' => '10', 'attribute_group_id' => '2', 'position' => '2'],
+            ['attribute_id' => '11', 'attribute_group_id' => '4', 'position' => '1'],
+            ['attribute_id' => '12', 'attribute_group_id' => '4', 'position' => '2'],
+            ['attribute_id' => '13', 'attribute_group_id' => '4', 'position' => '3'],
+            ['attribute_id' => '14', 'attribute_group_id' => '4', 'position' => '4'],
+            ['attribute_id' => '15', 'attribute_group_id' => '4', 'position' => '5'],
+            ['attribute_id' => '16', 'attribute_group_id' => '3', 'position' => '1'],
+            ['attribute_id' => '17', 'attribute_group_id' => '3', 'position' => '2'],
+            ['attribute_id' => '18', 'attribute_group_id' => '3', 'position' => '3'],
+            ['attribute_id' => '19', 'attribute_group_id' => '5', 'position' => '1'],
+            ['attribute_id' => '20', 'attribute_group_id' => '5', 'position' => '2'],
+            ['attribute_id' => '21', 'attribute_group_id' => '5', 'position' => '3'],
+            ['attribute_id' => '22', 'attribute_group_id' => '5', 'position' => '4'],
+            ['attribute_id' => '23', 'attribute_group_id' => '1', 'position' => '10'],
+            ['attribute_id' => '24', 'attribute_group_id' => '1', 'position' => '11'],
+            ['attribute_id' => '25', 'attribute_group_id' => '1', 'position' => '12'],
+            ['attribute_id' => '26', 'attribute_group_id' => '1', 'position' => '9']
         ]);
 
         DB::statement('SET FOREIGN_KEY_CHECKS=0;');
diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php
index 5bdc0ba9e..7f3b1e7ca 100755
--- a/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php
+++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeOptionTableSeeder.php
@@ -14,27 +14,27 @@ class AttributeOptionTableSeeder extends Seeder
         DB::table('attribute_option_translations')->delete();
 
         DB::table('attribute_options')->insert([
-            ['id' => '1', 'admin_name' => 'Red', 'sort_order' => '1', 'attribute_id' => '23'],
-            ['id' => '2', 'admin_name' => 'Green', 'sort_order' => '2', 'attribute_id' => '23'],
+            ['id' => '1', 'admin_name' => 'Red', 'sort_order'    => '1', 'attribute_id' => '23'],
+            ['id' => '2', 'admin_name' => 'Green', 'sort_order'  => '2', 'attribute_id' => '23'],
             ['id' => '3', 'admin_name' => 'Yellow', 'sort_order' => '3', 'attribute_id' => '23'],
-            ['id' => '4', 'admin_name' => 'Black', 'sort_order' => '4', 'attribute_id' => '23'],
-            ['id' => '5', 'admin_name' => 'White', 'sort_order' => '5', 'attribute_id' => '23'],
-            ['id' => '6', 'admin_name' => 'S', 'sort_order' => '1', 'attribute_id' => '24'],
-            ['id' => '7', 'admin_name' => 'M', 'sort_order' => '2', 'attribute_id' => '24'],
-            ['id' => '8', 'admin_name' => 'L', 'sort_order' => '3', 'attribute_id' => '24'],
-            ['id' => '9', 'admin_name' => 'XL', 'sort_order' => '4', 'attribute_id' => '24']
+            ['id' => '4', 'admin_name' => 'Black', 'sort_order'  => '4', 'attribute_id' => '23'],
+            ['id' => '5', 'admin_name' => 'White', 'sort_order'  => '5', 'attribute_id' => '23'],
+            ['id' => '6', 'admin_name' => 'S', 'sort_order'      => '1', 'attribute_id' => '24'],
+            ['id' => '7', 'admin_name' => 'M', 'sort_order'      => '2', 'attribute_id' => '24'],
+            ['id' => '8', 'admin_name' => 'L', 'sort_order'      => '3', 'attribute_id' => '24'],
+            ['id' => '9', 'admin_name' => 'XL', 'sort_order'     => '4', 'attribute_id' => '24']
         ]);
 
         DB::table('attribute_option_translations')->insert([
-            ['id' => '1', 'locale' => 'en', 'label' => 'Red', 'attribute_option_id' => '1'],
-            ['id' => '2', 'locale' => 'en', 'label' => 'Green', 'attribute_option_id' => '2'],
+            ['id' => '1', 'locale' => 'en', 'label' => 'Red', 'attribute_option_id'    => '1'],
+            ['id' => '2', 'locale' => 'en', 'label' => 'Green', 'attribute_option_id'  => '2'],
             ['id' => '3', 'locale' => 'en', 'label' => 'Yellow', 'attribute_option_id' => '3'],
-            ['id' => '4', 'locale' => 'en', 'label' => 'Black', 'attribute_option_id' => '4'],
-            ['id' => '5', 'locale' => 'en', 'label' => 'White', 'attribute_option_id' => '5'],
-            ['id' => '6', 'locale' => 'en', 'label' => 'S', 'attribute_option_id' => '6'],
-            ['id' => '7', 'locale' => 'en', 'label' => 'M', 'attribute_option_id' => '7'],
-            ['id' => '8', 'locale' => 'en', 'label' => 'L', 'attribute_option_id' => '8'],
-            ['id' => '9', 'locale' => 'en', 'label' => 'XL', 'attribute_option_id' => '9']
+            ['id' => '4', 'locale' => 'en', 'label' => 'Black', 'attribute_option_id'  => '4'],
+            ['id' => '5', 'locale' => 'en', 'label' => 'White', 'attribute_option_id'  => '5'],
+            ['id' => '6', 'locale' => 'en', 'label' => 'S', 'attribute_option_id'      => '6'],
+            ['id' => '7', 'locale' => 'en', 'label' => 'M', 'attribute_option_id'      => '7'],
+            ['id' => '8', 'locale' => 'en', 'label' => 'L', 'attribute_option_id'      => '8'],
+            ['id' => '9', 'locale' => 'en', 'label' => 'XL', 'attribute_option_id'     => '9']
         ]);
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
index c80c3f841..82862d16c 100755
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
@@ -68,9 +68,9 @@ class AttributeController extends Controller
     public function store()
     {
         $this->validate(request(), [
-            'code' => ['required', 'unique:attributes,code', new \Webkul\Core\Contracts\Validations\Code],
+            'code'       => ['required', 'unique:attributes,code', new \Webkul\Core\Contracts\Validations\Code],
             'admin_name' => 'required',
-            'type' => 'required'
+            'type'       => 'required'
         ]);
 
         $data = request()->all();
@@ -106,9 +106,9 @@ class AttributeController extends Controller
     public function update($id)
     {
         $this->validate(request(), [
-            'code' => ['required', 'unique:attributes,code,' . $id, new \Webkul\Core\Contracts\Validations\Code],
+            'code'       => ['required', 'unique:attributes,code,' . $id, new \Webkul\Core\Contracts\Validations\Code],
             'admin_name' => 'required',
-            'type' => 'required'
+            'type'       => 'required'
         ]);
 
         $attribute = $this->attributeRepository->update(request()->all(), $id);
@@ -153,6 +153,7 @@ class AttributeController extends Controller
     public function massDestroy()
     {
         $suppressFlash = false;
+
         if (request()->isMethod('post')) {
             $indexes = explode(',', request()->input('indexes'));
 
@@ -169,16 +170,18 @@ class AttributeController extends Controller
                     }
                 } catch (\Exception $e) {
                     report($e);
+
                     $suppressFlash = true;
 
                     continue;
                 }
             }
 
-            if ($suppressFlash)
+            if ($suppressFlash) {
                 session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success', ['resource' => 'attributes']));
-            else
+            } else {
                 session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'attributes']));
+            }
 
             return redirect()->back();
         } else {
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php
index d6a00c84b..e53245904 100755
--- a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php
+++ b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php
@@ -70,12 +70,16 @@ class AttributeFamilyRepository extends Repository
         Event::dispatch('catalog.attribute_family.create.before');
 
         $attributeGroups = isset($data['attribute_groups']) ? $data['attribute_groups'] : [];
+
         unset($data['attribute_groups']);
+
         $family = $this->model->create($data);
 
         foreach ($attributeGroups as $group) {
             $custom_attributes = isset($group['custom_attributes']) ? $group['custom_attributes'] : [];
+
             unset($group['custom_attributes']);
+
             $attributeGroup = $family->attribute_groups()->create($group);
 
             foreach ($custom_attributes as $key => $attribute) {
@@ -118,6 +122,7 @@ class AttributeFamilyRepository extends Repository
                     if (isset($attributeGroupInputs['custom_attributes'])) {
                         foreach ($attributeGroupInputs['custom_attributes'] as $key => $attribute) {
                             $attributeModel = $this->attributeRepository->find($attribute['id']);
+
                             $attributeGroup->custom_attributes()->save($attributeModel, ['position' => $key + 1]);
                         }
                     }
@@ -127,6 +132,7 @@ class AttributeFamilyRepository extends Repository
                     }
 
                     $attributeGroup = $this->attributeGroupRepository->find($attributeGroupId);
+
                     $attributeGroup->update($attributeGroupInputs);
 
                     $attributeIds = $attributeGroup->custom_attributes()->get()->pluck('id');
@@ -137,6 +143,7 @@ class AttributeFamilyRepository extends Repository
                                 $attributeIds->forget($index);
                             } else {
                                 $attributeModel = $this->attributeRepository->find($attribute['id']);
+
                                 $attributeGroup->custom_attributes()->save($attributeModel, ['position' => $key + 1]);
                             }
                         }
@@ -161,12 +168,13 @@ class AttributeFamilyRepository extends Repository
     public function getPartial()
     {
         $attributeFamilies = $this->model->all();
-        $trimmed = array();
+
+        $trimmed = [];
 
         foreach ($attributeFamilies as $key => $attributeFamily) {
             if ($attributeFamily->name != null || $attributeFamily->name != "") {
                 $trimmed[$key] = [
-                    'id' => $attributeFamily->id,
+                    'id'   => $attributeFamily->id,
                     'code' => $attributeFamily->code,
                     'name' => $attributeFamily->name
                 ];
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeOptionRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeOptionRepository.php
index 2e2238b53..d8a6c72fb 100755
--- a/packages/Webkul/Attribute/src/Repositories/AttributeOptionRepository.php
+++ b/packages/Webkul/Attribute/src/Repositories/AttributeOptionRepository.php
@@ -58,8 +58,9 @@ class AttributeOptionRepository extends Repository
      */
     public function uploadSwatchImage($data, $optionId)
     {
-        if (! isset($data['swatch_value']) || ! $data['swatch_value'])
+        if (! isset($data['swatch_value']) || ! $data['swatch_value']) {
             return;
+        }
 
         if ($data['swatch_value'] instanceof \Illuminate\Http\UploadedFile) {
             parent::update([
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
index d5d24ba86..de45cfd38 100755
--- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
+++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
@@ -60,7 +60,9 @@ class AttributeRepository extends Repository
         $data = $this->validateUserInput($data);
 
         $options = isset($data['options']) ? $data['options'] : [];
+
         unset($data['options']);
+
         $attribute = $this->model->create($data);
 
         if (in_array($attribute->type, ['select', 'multiselect', 'checkbox']) && count($options)) {
@@ -183,8 +185,9 @@ class AttributeRepository extends Repository
                 'status'
             ], $attributeColumns);
 
-        if (in_array('*', $codes))
+        if (in_array('*', $codes)) {
             return $this->all($attributeColumns);
+        }
 
         return $this->findWhereIn('code', $codes, $attributeColumns);
     }
@@ -196,8 +199,9 @@ class AttributeRepository extends Repository
     {
         static $attributes = [];
 
-        if (array_key_exists($code, $attributes))
+        if (array_key_exists($code, $attributes)) {
             return $attributes[$code];
+        }
 
         return $attributes[$code] = $this->findOneByField('code', $code);
     }
@@ -209,8 +213,9 @@ class AttributeRepository extends Repository
     {
         static $attributes = [];
 
-        if (array_key_exists($attributeFamily->id, $attributes))
+        if (array_key_exists($attributeFamily->id, $attributes)) {
             return $attributes[$attributeFamily->id];
+        }
 
         return $attributes[$attributeFamily->id] = $attributeFamily->custom_attributes;
     }
@@ -232,21 +237,21 @@ class AttributeRepository extends Repository
                 )) {
                 if ($attribute->options()->exists()) {
                     array_push($trimmed, [
-                        'id' => $attribute->id,
-                        'name' => $attribute->admin_name,
-                        'type' => $attribute->type,
-                        'code' => $attribute->code,
+                        'id'          => $attribute->id,
+                        'name'        => $attribute->admin_name,
+                        'type'        => $attribute->type,
+                        'code'        => $attribute->code,
                         'has_options' => true,
-                        'options' => $attribute->options
+                        'options'     => $attribute->options
                     ]);
                 } else {
                     array_push($trimmed, [
-                        'id' => $attribute->id,
-                        'name' => $attribute->admin_name,
-                        'type' => $attribute->type,
-                        'code' => $attribute->code,
+                        'id'          => $attribute->id,
+                        'name'        => $attribute->admin_name,
+                        'type'        => $attribute->type,
+                        'code'        => $attribute->code,
                         'has_options' => false,
-                        'options' => null
+                        'options'     => null
                     ]);
                 }