From de1ccc7c0b3eb5af08062f7930545232cc852d42 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Fri, 23 Aug 2019 19:04:18 +0530
Subject: [PATCH] Webfont changes

---
 packages/Webkul/Webfont/src/Config/menu.php   |  6 ------
 packages/Webkul/Webfont/src/Http/routes.php   |  2 --
 .../Webkul/Webfont/src/Models/Webfont.php     | 20 ++++++++++++++++++-
 .../src/Providers/WebfontServiceProvider.php  |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/packages/Webkul/Webfont/src/Config/menu.php b/packages/Webkul/Webfont/src/Config/menu.php
index 31f5a5d7c..46d9b717a 100644
--- a/packages/Webkul/Webfont/src/Config/menu.php
+++ b/packages/Webkul/Webfont/src/Config/menu.php
@@ -7,11 +7,5 @@ return [
         'route' => 'admin.cms.webfont',
         'sort' => 2,
         'icon-class' => '',
-    ], [
-        'key' => 'cms.homeseo',
-        'name' => 'webfont::app.homeseo',
-        'route' => 'admin.cms.homeseo',
-        'sort' => 2,
-        'icon-class' => '',
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Webfont/src/Http/routes.php b/packages/Webkul/Webfont/src/Http/routes.php
index 8e93cfe27..4e7f7261d 100644
--- a/packages/Webkul/Webfont/src/Http/routes.php
+++ b/packages/Webkul/Webfont/src/Http/routes.php
@@ -10,6 +10,4 @@ Route::group(['middleware' => ['admin']], function () {
     Route::get('admin/webfont/activate/{id}', 'Webkul\Webfont\Http\Controllers\WebfontController@activate')->name('admin.cms.webfont.activate');
 
     Route::post('admin/webfont/remove/{id}', 'Webkul\Webfont\Http\Controllers\WebfontController@remove')->name('admin.cms.webfont.remove');
-
-    Route::get('admin/home/seo', 'Webkul\Webfont\Http\Controllers\WebfontController@homeSeo')->name('admin.cms.homeseo');
 });
diff --git a/packages/Webkul/Webfont/src/Models/Webfont.php b/packages/Webkul/Webfont/src/Models/Webfont.php
index 728a4d006..9ff8e0281 100644
--- a/packages/Webkul/Webfont/src/Models/Webfont.php
+++ b/packages/Webkul/Webfont/src/Models/Webfont.php
@@ -4,10 +4,28 @@ namespace Webkul\Webfont\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Webkul\Webfont\Contracts\Webfont as WebfontContract;
+use Company;
 
 class Webfont extends Model implements WebfontContract
 {
     protected $table = 'google_web_fonts';
 
-    protected $fillable = ['font', 'activated'];
+    protected $fillable = ['font', 'activated', 'company_id'];
+
+    /**
+     * 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('google_web_fonts' . '.company_id', $company->id));
+        }
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Webfont/src/Providers/WebfontServiceProvider.php b/packages/Webkul/Webfont/src/Providers/WebfontServiceProvider.php
index 964d22c2a..8879f1c2a 100644
--- a/packages/Webkul/Webfont/src/Providers/WebfontServiceProvider.php
+++ b/packages/Webkul/Webfont/src/Providers/WebfontServiceProvider.php
@@ -22,7 +22,7 @@ class WebfontServiceProvider extends ServiceProvider
 
         $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php');
 
-        $this->app->concord->registerModel(\Webkul\Webfont\Contracts\Webfont::class, \Webkul\Webfont\Models\Webfont::class);
+        \Webkul\Webfont\Models\Webfont::observe(\Webkul\Webfont\Observers\WebfontObserver::class);
 
         $this->app->register(EventServiceProvider::class);
     }