From ffd918af204992c3f15b852e70e7109ea33db601 Mon Sep 17 00:00:00 2001
From: Vivek Sharma <viveksh047@webkul.com>
Date: Sat, 7 Mar 2020 11:43:22 +0530
Subject: [PATCH 1/5] [Updated: Changed Velocity's models related code.]

---
 config/concord.php                                     |  3 ++-
 .../src/Contracts/VelocityCustomerCompareProduct.php   |  7 +++++++
 .../src/Models/{OrderBrands.php => OrderBrand.php}     |  2 +-
 .../src/Models/VelocityCustomerCompareProduct.php      |  3 ++-
 .../src/Models/VelocityCustomerCompareProductProxy.php | 10 ++++++++++
 .../Velocity/src/Providers/ModuleServiceProvider.php   |  6 +++++-
 .../Velocity/src/Providers/VelocityServiceProvider.php |  8 --------
 .../Velocity/src/Repositories/CategoryRepository.php   |  2 +-
 .../Velocity/src/Repositories/ContentRepository.php    |  2 +-
 .../src/Repositories/ContentTranslationRepository.php  |  2 +-
 .../src/Repositories/OrderBrandsRepository.php         |  2 +-
 .../VelocityCustomerCompareProductRepository.php       |  2 +-
 .../src/Repositories/VelocityMetadataRepository.php    |  2 +-
 13 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 packages/Webkul/Velocity/src/Contracts/VelocityCustomerCompareProduct.php
 rename packages/Webkul/Velocity/src/Models/{OrderBrands.php => OrderBrand.php} (92%)
 create mode 100644 packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProductProxy.php

diff --git a/config/concord.php b/config/concord.php
index e7ec5845e..753ad1b54 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -22,6 +22,7 @@ return [
         \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
         \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class,
-        \Webkul\BookingProduct\Providers\ModuleServiceProvider::class
+        \Webkul\BookingProduct\Providers\ModuleServiceProvider::class,
+        \Webkul\Velocity\Providers\ModuleServiceProvider::class
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Contracts/VelocityCustomerCompareProduct.php b/packages/Webkul/Velocity/src/Contracts/VelocityCustomerCompareProduct.php
new file mode 100644
index 000000000..3e0f05fc9
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Contracts/VelocityCustomerCompareProduct.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\Velocity\Contracts;
+
+interface VelocityCustomerCompareProduct
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Models/OrderBrands.php b/packages/Webkul/Velocity/src/Models/OrderBrand.php
similarity index 92%
rename from packages/Webkul/Velocity/src/Models/OrderBrands.php
rename to packages/Webkul/Velocity/src/Models/OrderBrand.php
index da145f466..8cf33108d 100644
--- a/packages/Webkul/Velocity/src/Models/OrderBrands.php
+++ b/packages/Webkul/Velocity/src/Models/OrderBrand.php
@@ -7,7 +7,7 @@ use Webkul\Velocity\Contracts\OrderBrand as OrderBrandContract;
 use Webkul\Attribute\Models\AttributeOptionProxy;
 use Webkul\Category\Models\CategoryProxy;
 
-class OrderBrands extends Model implements OrderBrandContract
+class OrderBrand extends Model implements OrderBrandContract
 {
     
     protected $table = 'order_brands';
diff --git a/packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProduct.php b/packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProduct.php
index 5abf45d58..1f934467f 100644
--- a/packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProduct.php
+++ b/packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProduct.php
@@ -3,8 +3,9 @@
 namespace Webkul\Velocity\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Webkul\Velocity\Contracts\VelocityCustomerCompareProduct as VelocityCustomerCompareProductContract;
 
-class VelocityCustomerCompareProduct extends Model
+class VelocityCustomerCompareProduct extends Model implements VelocityCustomerCompareProductContract
 {
     protected $guarded = [];
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProductProxy.php b/packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProductProxy.php
new file mode 100644
index 000000000..5a6677584
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Models/VelocityCustomerCompareProductProxy.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\Velocity\Models;
+
+use Konekt\Concord\Proxies\ModelProxy;
+
+class VelocityCustomerCompareProductProxy extends ModelProxy
+{
+
+}
\ 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 943105d3c..9bd278f4c 100644
--- a/packages/Webkul/Velocity/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/Velocity/src/Providers/ModuleServiceProvider.php
@@ -7,7 +7,11 @@ use Konekt\Concord\BaseModuleServiceProvider;
 class ModuleServiceProvider extends BaseModuleServiceProvider
 {
     protected $models = [
-        \Webkul\Velocity\Models\Content::class,
         \Webkul\Velocity\Models\Category::class,
+        \Webkul\Velocity\Models\Content::class,
+        \Webkul\Velocity\Models\ContentTranslation::class,
+        \Webkul\Velocity\Models\OrderBrand::class,
+        \Webkul\Velocity\Models\VelocityCustomerCompareProduct::class,
+        \Webkul\Velocity\Models\VelocityMetadata::class,
     ];
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
index b9aa7b1a0..74a40ccd5 100644
--- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
+++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
@@ -3,10 +3,6 @@
 namespace Webkul\Velocity\Providers;
 
 use Illuminate\Routing\Router;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
 use Webkul\Velocity\Facades\Velocity as VelocityFacade;
@@ -58,10 +54,6 @@ class VelocityServiceProvider extends ServiceProvider
      */
     protected function registerConfig()
     {
-        // $this->mergeConfigFrom(
-        //     dirname(__DIR__) . '/Config/system.php', 'core'
-        // );
-
         $this->mergeConfigFrom(
             dirname(__DIR__) . '/Config/admin-menu.php', 'menu.admin'
         );
diff --git a/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php b/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php
index 0030d6d2b..43805603d 100644
--- a/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/CategoryRepository.php
@@ -39,7 +39,7 @@ class CategoryRepository extends Repository
      */
     function model()
     {
-        return 'Webkul\Velocity\Models\Category';
+        return 'Webkul\Velocity\Contracts\Category';
     }
 
     /**
diff --git a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
index ac983d164..32bfbd0bf 100644
--- a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
@@ -40,7 +40,7 @@ class ContentRepository extends Repository
      */
     function model()
     {
-        return 'Webkul\Velocity\Models\Content';
+        return 'Webkul\Velocity\Contracts\Content';
     }
 
     /**
diff --git a/packages/Webkul/Velocity/src/Repositories/ContentTranslationRepository.php b/packages/Webkul/Velocity/src/Repositories/ContentTranslationRepository.php
index 91c9851af..f69a6d9af 100644
--- a/packages/Webkul/Velocity/src/Repositories/ContentTranslationRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/ContentTranslationRepository.php
@@ -13,6 +13,6 @@ class ContentTranslationRepository extends Repository
      */
     function model()
     {
-        return 'Webkul\Velocity\Models\ContentTranslation';
+        return 'Webkul\Velocity\Contracts\ContentTranslation';
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Repositories/OrderBrandsRepository.php b/packages/Webkul/Velocity/src/Repositories/OrderBrandsRepository.php
index bb9b5c76e..6d39eb23a 100644
--- a/packages/Webkul/Velocity/src/Repositories/OrderBrandsRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/OrderBrandsRepository.php
@@ -18,7 +18,7 @@ class OrderBrandsRepository extends Repository
      */
     function model()
     {
-        return 'Webkul\Velocity\Models\OrderBrands';
+        return 'Webkul\Velocity\Contracts\OrderBrand';
     }
     
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Repositories/VelocityCustomerCompareProductRepository.php b/packages/Webkul/Velocity/src/Repositories/VelocityCustomerCompareProductRepository.php
index 4b357c7e3..c7b3143ed 100644
--- a/packages/Webkul/Velocity/src/Repositories/VelocityCustomerCompareProductRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/VelocityCustomerCompareProductRepository.php
@@ -13,6 +13,6 @@ class VelocityCustomerCompareProductRepository extends Repository
      */
     function model()
     {
-        return 'Webkul\Velocity\Models\VelocityCustomerCompareProduct';
+        return 'Webkul\Velocity\Contracts\VelocityCustomerCompareProduct';
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Repositories/VelocityMetadataRepository.php b/packages/Webkul/Velocity/src/Repositories/VelocityMetadataRepository.php
index a6612e6a5..b4031b985 100644
--- a/packages/Webkul/Velocity/src/Repositories/VelocityMetadataRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/VelocityMetadataRepository.php
@@ -13,6 +13,6 @@ class VelocityMetadataRepository extends Repository
      */
     function model()
     {
-        return 'Webkul\Velocity\Models\VelocityMetadata';
+        return 'Webkul\Velocity\Contracts\VelocityMetadata';
     }
 }
\ No newline at end of file

From aea33cfc68a89ea093718dfd97b821373a58ee47 Mon Sep 17 00:00:00 2001
From: Vivek <viveksh047@webkul.com>
Date: Mon, 16 Mar 2020 10:48:01 +0530
Subject: [PATCH 2/5] [Updated: resolved config/concord.php conflict.]

---
 config/concord.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/concord.php b/config/concord.php
index 753ad1b54..461d383c5 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -10,6 +10,7 @@ return [
          */
 
         \Webkul\Attribute\Providers\ModuleServiceProvider::class,
+        \Webkul\BookingProduct\Providers\ModuleServiceProvider::class,
         \Webkul\Category\Providers\ModuleServiceProvider::class,
         \Webkul\Checkout\Providers\ModuleServiceProvider::class,
         \Webkul\Core\Providers\ModuleServiceProvider::class,
@@ -22,7 +23,6 @@ return [
         \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
         \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class,
-        \Webkul\BookingProduct\Providers\ModuleServiceProvider::class,
         \Webkul\Velocity\Providers\ModuleServiceProvider::class
     ]
 ];
\ No newline at end of file

From 5c11e05893c9e92a095b1161ee7f2dba659b31a0 Mon Sep 17 00:00:00 2001
From: Vivek <viveksh047@webkul.com>
Date: Mon, 16 Mar 2020 10:57:20 +0530
Subject: [PATCH 3/5] [Updated: resolved config/concord.php conflict.]

---
 config/concord.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/concord.php b/config/concord.php
index 461d383c5..e942abaa9 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -23,6 +23,6 @@ return [
         \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
         \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class,
-        \Webkul\Velocity\Providers\ModuleServiceProvider::class
+        \Webkul\Velocity\Providers\ModuleServiceProvider::class,
     ]
 ];
\ No newline at end of file

From fcbaec66764eb680e7a2812ba550553d6d1eef5b Mon Sep 17 00:00:00 2001
From: Vivek <viveksh047@webkul.com>
Date: Mon, 16 Mar 2020 10:58:27 +0530
Subject: [PATCH 4/5] [Updated: resolved config/concord.php conflict.]

---
 config/concord.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/concord.php b/config/concord.php
index e942abaa9..17d6cbc12 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -23,6 +23,5 @@ return [
         \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
         \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class,
-        \Webkul\Velocity\Providers\ModuleServiceProvider::class,
     ]
 ];
\ No newline at end of file

From c9062abd1f3f8c43c5140e8f4d9fc11fb8d1e70a Mon Sep 17 00:00:00 2001
From: Vivek <viveksh047@webkul.com>
Date: Mon, 16 Mar 2020 11:02:51 +0530
Subject: [PATCH 5/5] [Updated: resolved config/concord.php conflict.]

---
 config/concord.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/concord.php b/config/concord.php
index 17d6cbc12..e942abaa9 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -23,5 +23,6 @@ return [
         \Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
         \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class,
+        \Webkul\Velocity\Providers\ModuleServiceProvider::class,
     ]
 ];
\ No newline at end of file