From 58331043e924ebf1c8a4024ca988d7b0eb41b72d Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 20 Sep 2019 14:49:53 +0530
Subject: [PATCH] translatable package update

---
 composer.json                                 | 48 +++++++++----------
 config/app.php                                |  2 +-
 .../Controllers/Shop/WishlistController.php   |  2 +-
 .../Core/src/Eloquent/TranslatableModel.php   |  2 +-
 .../Repositories/ProductFlatRepository.php    |  4 +-
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/composer.json b/composer.json
index 6b3e2d635..9a2f62ce5 100755
--- a/composer.json
+++ b/composer.json
@@ -8,30 +8,30 @@
     "license": "MIT",
     "type": "project",
     "require": {
-      "php": "^7.1.3",
-      "ext-curl": "*",
-      "ext-intl": "*",
-      "ext-mbstring": "*",
-      "ext-openssl": "*",
-      "ext-pdo": "*",
-      "ext-pdo_mysql": "*",
-      "ext-tokenizer": "*",
-      "barryvdh/laravel-dompdf": "0.8.3",
-      "dimsav/laravel-translatable": "^9.0",
-      "doctrine/dbal": "2.9.2",
-      "fideloper/proxy": "^4.0",
-      "flynsarmy/db-blade-compiler": "*",
-      "guzzlehttp/guzzle": "~6.0",
-      "intervention/image": "^2.4",
-      "intervention/imagecache": "^2.3",
-      "kalnoy/nestedset": "^4.3",
-      "konekt/concord": "^1.2",
-      "laravel/framework": "5.6.*",
-      "laravel/tinker": "^1.0",
-      "maatwebsite/excel": "3.1.11",
-      "nwidart/laravel-modules": "^3.2",
-      "prettus/l5-repository": "2.6.32",
-      "tymon/jwt-auth": "1.0.0-rc.4"
+        "php": "^7.1.3",
+        "ext-curl": "*",
+        "ext-intl": "*",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "ext-pdo": "*",
+        "ext-pdo_mysql": "*",
+        "ext-tokenizer": "*",
+        "astrotomic/laravel-translatable": "^11.0.0",
+        "barryvdh/laravel-dompdf": "0.8.3",
+        "doctrine/dbal": "2.9.2",
+        "fideloper/proxy": "^4.0",
+        "flynsarmy/db-blade-compiler": "*",
+        "guzzlehttp/guzzle": "~6.0",
+        "intervention/image": "^2.4",
+        "intervention/imagecache": "^2.3",
+        "kalnoy/nestedset": "^4.3",
+        "konekt/concord": "^1.2",
+        "laravel/framework": "5.6.*",
+        "laravel/tinker": "^1.0",
+        "maatwebsite/excel": "3.1.11",
+        "nwidart/laravel-modules": "^3.2",
+        "prettus/l5-repository": "2.6.32",
+        "tymon/jwt-auth": "1.0.0-rc.4"
     },
     "require-dev": {
       "barryvdh/laravel-debugbar": "^3.1",
diff --git a/config/app.php b/config/app.php
index 3bb520a73..292f592b4 100755
--- a/config/app.php
+++ b/config/app.php
@@ -202,7 +202,7 @@ return [
          * Package Service Providers...
          */
 
-        Dimsav\Translatable\TranslatableServiceProvider::class,
+        Astrotomic\Translatable\TranslatableServiceProvider::class,
 
         /*
          * Application Service Providers...
diff --git a/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php b/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php
index 9086e3f6a..39f83f6e0 100644
--- a/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php
+++ b/packages/Webkul/API/Http/Controllers/Shop/WishlistController.php
@@ -44,7 +44,7 @@ class WishlistController extends Controller
         auth()->setDefaultDriver($this->guard);
 
         $this->middleware('auth:' . $this->guard);
-        
+
         $this->wishlistRepository = $wishlistRepository;
 
         $this->productRepository = $productRepository;
diff --git a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php
index e54a03009..f14045a60 100755
--- a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php
+++ b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php
@@ -3,7 +3,7 @@
 namespace Webkul\Core\Eloquent;
 
 use Illuminate\Database\Eloquent\Model;
-use Dimsav\Translatable\Translatable;
+use Astrotomic\Translatable\Translatable;
 use Webkul\Core\Models\Locale;
 
 class TranslatableModel extends Model
diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
index d29abd4ed..66e3c20cf 100644
--- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
@@ -49,7 +49,7 @@ class ProductFlatRepository extends Repository
         //     ->where('product_categories.category_id', $categoryId)
         //     ->max('price');
 
-        return $this->model->max('price');
+        return $this->model->max('product_flat.price');
     }
 
      /**
@@ -59,7 +59,7 @@ class ProductFlatRepository extends Repository
      */
     public function getProductMaximumPrice()
     {
-        return $this->model->max('price');
+        return $this->model->max('product_flat.price');
     }
 
     /**