From fee22e8491398212dc8678affe0402014a166609 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 13 Nov 2020 14:55:03 +0530 Subject: [PATCH] Refactoring Done --- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../Providers/CoreModuleServiceProvider.php | 29 +++++++++++++++++++ .../src/Providers/ModuleServiceProvider.php | 25 +--------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- .../src/Providers/ModuleServiceProvider.php | 25 ++-------------- 17 files changed, 60 insertions(+), 369 deletions(-) create mode 100644 packages/Webkul/Core/src/Providers/CoreModuleServiceProvider.php diff --git a/packages/Webkul/Attribute/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Attribute/src/Providers/ModuleServiceProvider.php index 4d873abbf..3bc14f1f8 100644 --- a/packages/Webkul/Attribute/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Attribute/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Attribute\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Attribute\Models\Attribute::class, @@ -14,25 +14,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\Attribute\Models\AttributeOptionTranslation::class, \Webkul\Attribute\Models\AttributeTranslation::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Providers/ModuleServiceProvider.php b/packages/Webkul/BookingProduct/src/Providers/ModuleServiceProvider.php index 28c5e18d9..2ccc2a6d3 100644 --- a/packages/Webkul/BookingProduct/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/BookingProduct/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\BookingProduct\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\BookingProduct\Models\BookingProduct::class, @@ -16,25 +16,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\BookingProduct\Models\BookingProductTableSlot::class, \Webkul\BookingProduct\Models\Booking::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php b/packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php index 53562ab78..87be0d02d 100644 --- a/packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php @@ -2,33 +2,12 @@ namespace Webkul\CMS\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\CMS\Models\CmsPage::class, \Webkul\CMS\Models\CmsPageTranslation::class ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php b/packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php index 777242610..7cb871a76 100644 --- a/packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\CartRule\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\CartRule\Models\CartRule::class, @@ -13,25 +13,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\CartRule\Models\CartRuleCoupon::class, \Webkul\CartRule\Models\CartRuleCouponUsage::class ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php b/packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php index 898a9a065..243938526 100644 --- a/packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php @@ -2,34 +2,13 @@ namespace Webkul\CatalogRule\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\CatalogRule\Models\CatalogRule::class, \Webkul\CatalogRule\Models\CatalogRuleProduct::class, \Webkul\CatalogRule\Models\CatalogRuleProductPrice::class ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Category/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Category/src/Providers/ModuleServiceProvider.php index d0456d390..b7e47339f 100644 --- a/packages/Webkul/Category/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Category/src/Providers/ModuleServiceProvider.php @@ -2,33 +2,12 @@ namespace Webkul\Category\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Category\Models\Category::class, \Webkul\Category\Models\CategoryTranslation::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Checkout/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Checkout/src/Providers/ModuleServiceProvider.php index 359c43207..7cc9e469e 100644 --- a/packages/Webkul/Checkout/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Checkout/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Checkout\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Checkout\Models\Cart::class, @@ -13,25 +13,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\Checkout\Models\CartPayment::class, \Webkul\Checkout\Models\CartShippingRate::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Providers/CoreModuleServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreModuleServiceProvider.php new file mode 100644 index 000000000..fa30ba040 --- /dev/null +++ b/packages/Webkul/Core/src/Providers/CoreModuleServiceProvider.php @@ -0,0 +1,29 @@ +areMigrationsEnabled()) { + $this->registerMigrations(); + } + + if ($this->areModelsEnabled()) { + $this->registerModels(); + $this->registerEnums(); + $this->registerRequestTypes(); + } + + if ($this->areViewsEnabled()) { + $this->registerViews(); + } + + if ($routes = $this->config('routes', true)) { + $this->registerRoutes($routes); + } + } +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Core/src/Providers/ModuleServiceProvider.php index 56d748ec9..636a566eb 100644 --- a/packages/Webkul/Core/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Core/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,7 @@ namespace Webkul\Core\Providers; -use Konekt\Concord\BaseModuleServiceProvider; - -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Core\Models\Channel::class, @@ -19,25 +17,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\Core\Models\Slider::class, \Webkul\Core\Models\SubscribersList::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Customer/src/Providers/ModuleServiceProvider.php index fe6f41a57..27f0bf691 100644 --- a/packages/Webkul/Customer/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Customer/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Customer\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Customer\Models\Customer::class, @@ -12,25 +12,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\Customer\Models\CustomerGroup::class, \Webkul\Customer\Models\Wishlist::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Inventory/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Inventory/src/Providers/ModuleServiceProvider.php index 9ecd0c1e5..30b1c875f 100644 --- a/packages/Webkul/Inventory/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Inventory/src/Providers/ModuleServiceProvider.php @@ -2,32 +2,11 @@ namespace Webkul\Inventory\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Inventory\Models\InventorySource::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Product/src/Providers/ModuleServiceProvider.php index c3b65a328..a518ded6b 100644 --- a/packages/Webkul/Product/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Product/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Product\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Product\Models\Product::class, @@ -23,25 +23,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\Product\Models\ProductBundleOptionProduct::class, \Webkul\Product\Models\ProductCustomerGroupPrice::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Sales/src/Providers/ModuleServiceProvider.php index 2f22f3f4a..082524829 100755 --- a/packages/Webkul/Sales/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Sales/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Sales\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Sales\Models\Order::class, @@ -20,25 +20,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\Sales\Models\Refund::class, \Webkul\Sales\Models\RefundItem::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/SocialLogin/src/Providers/ModuleServiceProvider.php b/packages/Webkul/SocialLogin/src/Providers/ModuleServiceProvider.php index cb7163529..1f012741c 100644 --- a/packages/Webkul/SocialLogin/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/SocialLogin/src/Providers/ModuleServiceProvider.php @@ -2,32 +2,11 @@ namespace Webkul\SocialLogin\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\SocialLogin\Models\CustomerSocialAccount::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Tax/src/Providers/ModuleServiceProvider.php index 3a695fa1f..e2757155c 100644 --- a/packages/Webkul/Tax/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Tax/src/Providers/ModuleServiceProvider.php @@ -2,34 +2,13 @@ namespace Webkul\Tax\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Tax\Models\TaxCategory::class, \Webkul\Tax\Models\TaxMap::class, \Webkul\Tax\Models\TaxRate::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/User/src/Providers/ModuleServiceProvider.php b/packages/Webkul/User/src/Providers/ModuleServiceProvider.php index f37e6b93f..49ae6d4d9 100644 --- a/packages/Webkul/User/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/User/src/Providers/ModuleServiceProvider.php @@ -2,33 +2,12 @@ namespace Webkul\User\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\User\Models\Admin::class, \Webkul\User\Models\Role::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Velocity/src/Providers/ModuleServiceProvider.php index f9577954b..02c7afc41 100644 --- a/packages/Webkul/Velocity/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Velocity\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ \Webkul\Velocity\Models\Category::class, @@ -14,25 +14,4 @@ class ModuleServiceProvider extends BaseModuleServiceProvider \Webkul\Velocity\Models\VelocityCustomerCompareProduct::class, \Webkul\Velocity\Models\VelocityMetadata::class, ]; - - public function boot() - { - if ($this->areMigrationsEnabled()) { - $this->registerMigrations(); - } - - if ($this->areModelsEnabled()) { - $this->registerModels(); - $this->registerEnums(); - $this->registerRequestTypes(); - } - - if ($this->areViewsEnabled()) { - $this->registerViews(); - } - - if ($routes = $this->config('routes', true)) { - $this->registerRoutes($routes); - } - } } \ No newline at end of file