TPS/elektronika_bagisto
TPS
/
elektronika_bagisto
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

translatable package update

This commit is contained in:
rahul shukla 2019-09-20 14:49:53 +05:30
parent cee52398a1
commit 58331043e9
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
composer.json
View File

@ -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",

2
config/app.php
View File

@ -202,7 +202,7 @@ return [
* Package Service Providers...
*/
Dimsav\Translatable\TranslatableServiceProvider::class,
Astrotomic\Translatable\TranslatableServiceProvider::class,
/*
* Application Service Providers...

2
packages/Webkul/API/Http/Controllers/Shop/WishlistController.php
View File

@ -44,7 +44,7 @@ class WishlistController extends Controller
auth()->setDefaultDriver($this->guard);
$this->middleware('auth:' . $this->guard);
$this->wishlistRepository = $wishlistRepository;
$this->productRepository = $productRepository;

2
packages/Webkul/Core/src/Eloquent/TranslatableModel.php
View File

@ -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

4
packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
View File

@ -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');
}
/**