From 313c9b78ff72f043067767ff19d26dcac90bcdf3 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Mon, 19 Aug 2019 17:34:29 +0530
Subject: [PATCH] Updated module to latest of the Bagisto

---
 .../SAASCustomizer/src/Models/CMS/CMS.php     | 27 +++++++++++++++++++
 .../src/Models/Discount/CatalogRule.php       | 27 +++++++++++++++++++
 .../Models/Discount/CatalogRuleProducts.php   | 27 +++++++++++++++++++
 .../Discount/CatalogRuleProductsPrice.php     | 27 +++++++++++++++++++
 .../src/Observers/CMS/CMSObserver.php         | 17 ++++++++++++
 .../Discount/CatalogRuleObserver.php          | 17 ++++++++++++
 .../Discount/CatalogRuleProductsObserver.php  | 17 ++++++++++++
 .../CatalogRuleProductsPriceObserver.php      | 17 ++++++++++++
 .../SAASCustomizerServiceProvider.php         | 11 ++++++++
 9 files changed, 187 insertions(+)
 create mode 100644 packages/Webkul/SAASCustomizer/src/Models/CMS/CMS.php
 create mode 100644 packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRule.php
 create mode 100644 packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProducts.php
 create mode 100644 packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProductsPrice.php
 create mode 100644 packages/Webkul/SAASCustomizer/src/Observers/CMS/CMSObserver.php
 create mode 100644 packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleObserver.php
 create mode 100644 packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsObserver.php
 create mode 100644 packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsPriceObserver.php

diff --git a/packages/Webkul/SAASCustomizer/src/Models/CMS/CMS.php b/packages/Webkul/SAASCustomizer/src/Models/CMS/CMS.php
new file mode 100644
index 000000000..56f2a10e9
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Models/CMS/CMS.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Models\CMS;
+
+use Webkul\CMS\Models\CMS as BaseModel;
+
+use Company;
+
+class CMS extends BaseModel
+{
+    /**
+     * Create a new Eloquent query builder for the model.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @return \Illuminate\Database\Eloquent\Builder|static
+     */
+    public function newEloquentBuilder($query)
+    {
+        $company = Company::getCurrent();
+
+        if (auth()->guard('super-admin')->check() || ! isset($company->id)) {
+            return new \Illuminate\Database\Eloquent\Builder($query);
+        } else {
+            return new \Illuminate\Database\Eloquent\Builder($query->where('cart_rules' . '.company_id', $company->id));
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRule.php b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRule.php
new file mode 100644
index 000000000..a2f49d784
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRule.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Models\Discount;
+
+use Webkul\Discount\Models\CatalogRule as BaseModel;
+
+use Company;
+
+class CatalogRule extends BaseModel
+{
+    /**
+     * Create a new Eloquent query builder for the model.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @return \Illuminate\Database\Eloquent\Builder|static
+     */
+    public function newEloquentBuilder($query)
+    {
+        $company = Company::getCurrent();
+
+        if (auth()->guard('super-admin')->check() || ! isset($company->id)) {
+            return new \Illuminate\Database\Eloquent\Builder($query);
+        } else {
+            return new \Illuminate\Database\Eloquent\Builder($query->where('cart_rules' . '.company_id', $company->id));
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProducts.php b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProducts.php
new file mode 100644
index 000000000..ba7a31c71
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProducts.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Models\Discount;
+
+use Webkul\Discount\Models\CatalogRuleProducts as BaseModel;
+
+use Company;
+
+class CatalogRuleProducts extends BaseModel
+{
+    /**
+     * Create a new Eloquent query builder for the model.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @return \Illuminate\Database\Eloquent\Builder|static
+     */
+    public function newEloquentBuilder($query)
+    {
+        $company = Company::getCurrent();
+
+        if (auth()->guard('super-admin')->check() || ! isset($company->id)) {
+            return new \Illuminate\Database\Eloquent\Builder($query);
+        } else {
+            return new \Illuminate\Database\Eloquent\Builder($query->where('cart_rules' . '.company_id', $company->id));
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProductsPrice.php b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProductsPrice.php
new file mode 100644
index 000000000..69b4fde2f
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProductsPrice.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Models\Discount;
+
+use Webkul\Discount\Models\CatalogRuleProductsPrice as BaseModel;
+
+use Company;
+
+class CatalogRuleProductsPrice extends BaseModel
+{
+    /**
+     * Create a new Eloquent query builder for the model.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @return \Illuminate\Database\Eloquent\Builder|static
+     */
+    public function newEloquentBuilder($query)
+    {
+        $company = Company::getCurrent();
+
+        if (auth()->guard('super-admin')->check() || ! isset($company->id)) {
+            return new \Illuminate\Database\Eloquent\Builder($query);
+        } else {
+            return new \Illuminate\Database\Eloquent\Builder($query->where('cart_rules' . '.company_id', $company->id));
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Observers/CMS/CMSObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/CMS/CMSObserver.php
new file mode 100644
index 000000000..26d0227f7
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Observers/CMS/CMSObserver.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Observers\CMS;
+
+use Webkul\SAASCustomizer\Models\CMS\CMS;
+
+use Company;
+
+class CMSObserver
+{
+    public function creating(CMS $model)
+    {
+        if (! auth()->guard('super-admin')->check()) {
+            $model->company_id = Company::getCurrent()->id;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleObserver.php
new file mode 100644
index 000000000..78aee2b74
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleObserver.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Observers\Discount;
+
+use Webkul\SAASCustomizer\Models\Discount\CatalogRule;
+
+use Company;
+
+class CatalogRuleObserver
+{
+    public function creating(CatalogRule $model)
+    {
+        if (! auth()->guard('super-admin')->check()) {
+            $model->company_id = Company::getCurrent()->id;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsObserver.php
new file mode 100644
index 000000000..31a42daa3
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsObserver.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Observers\Discount;
+
+use Webkul\SAASCustomizer\Models\Discount\CatalogRuleProducts;
+
+use Company;
+
+class CatalogRuleProductsObserver
+{
+    public function creating(CatalogRuleProducts $model)
+    {
+        if (! auth()->guard('super-admin')->check()) {
+            $model->company_id = Company::getCurrent()->id;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsPriceObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsPriceObserver.php
new file mode 100644
index 000000000..5698a68b4
--- /dev/null
+++ b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsPriceObserver.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Webkul\SAASCustomizer\Observers\Discount;
+
+use Webkul\SAASCustomizer\Models\Discount\CatalogRuleProductsPrice;
+
+use Company;
+
+class CatalogRuleProductsPriceObserver
+{
+    public function creating(CatalogRuleProductsPrice $model)
+    {
+        if (! auth()->guard('super-admin')->check()) {
+            $model->company_id = Company::getCurrent()->id;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php b/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php
index 09063008a..7e49e85a7 100644
--- a/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php
+++ b/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php
@@ -234,6 +234,9 @@ class SAASCustomizerServiceProvider extends ServiceProvider
 
         //Discount Model
         $this->app->concord->registerModel(\Webkul\Discount\Contracts\CartRule::class, \Webkul\SAASCustomizer\Models\Discount\CartRule::class);
+        $this->app->concord->registerModel(\Webkul\Discount\Contracts\CatalogRule::class, \Webkul\SAASCustomizer\Models\Discount\CatalogRule::class);
+        $this->app->concord->registerModel(\Webkul\Discount\Contracts\CatalogRuleProducts::class, \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProducts::class);
+        $this->app->concord->registerModel(\Webkul\Discount\Contracts\CatalogRuleProductsPrice::class, \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProductsPrice::class);
     }
 
     /**
@@ -330,5 +333,13 @@ class SAASCustomizerServiceProvider extends ServiceProvider
         \Webkul\SAASCustomizer\Models\User\Role::observe(\Webkul\SAASCustomizer\Observers\User\RoleObserver::class);
 
         \Webkul\SAASCustomizer\Models\Discount\CartRule::observe(\Webkul\SAASCustomizer\Observers\Discount\CartRuleObserver::class);
+
+        \Webkul\SAASCustomizer\Models\CMS\CMS::observe(\Webkul\SAASCustomizer\Observers\CMS\CMSObserver::class);
+
+        \Webkul\SAASCustomizer\Models\Discount\CatalogRule::observe(\Webkul\SAASCustomizer\Observers\Discount\CatalogRuleObserver::class);
+
+        \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProducts::observe(\Webkul\SAASCustomizer\Observers\Discount\CatalogRuleProductsObserver::class);
+
+        \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProductsPrice::observe(\Webkul\SAASCustomizer\Observers\Discount\CatalogRuleProductsPriceObserver::class);
     }
 }
\ No newline at end of file