merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #3050

This commit is contained in:
rahulshukla-home 2020-05-13 22:27:42 +05:30
parent 457d491ebd
commit 426ea4d802
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/CMS/src/Repositories/CmsRepository.php
View File

@ -5,7 +5,7 @@ namespace Webkul\CMS\Repositories;
use Illuminate\Support\Facades\Event;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Webkul\Core\Eloquent\Repository;
use Webkul\CMS\Models\CmsPageTranslation;
use Webkul\CMS\Models\CmsPageTranslationProxy;
class CmsRepository extends Repository
{
@ -76,7 +76,7 @@ class CmsRepository extends Repository
*/
public function isUrlKeyUnique($id, $urlKey)
{
$exists = CmsPageTranslation::where('cms_page_id', '<>', $id)
$exists = CmsPageTranslationProxy::modelClass()::where('cms_page_id', '<>', $id)
->where('url_key', $urlKey)
->limit(1)
->select(\DB::raw(1))

13
packages/Webkul/Category/src/Http/Controllers/CategoryController.php
View File

@ -4,7 +4,6 @@ namespace Webkul\Category\Http\Controllers;
use Illuminate\Support\Facades\Event;
use Webkul\Category\Repositories\CategoryRepository;
use Webkul\Category\Models\CategoryTranslation;
use Webkul\Attribute\Repositories\AttributeRepository;
class CategoryController extends Controller
@ -87,18 +86,6 @@ class CategoryController extends Controller
'description' => 'required_if:display_mode,==,description_only,products_and_description',
]);
if (strtolower(request()->input('name')) == 'root') {
$categoryTransalation = new CategoryTranslation();
$result = $categoryTransalation->where('name', request()->input('name'))->get();
if(count($result) > 0) {
session()->flash('error', trans('admin::app.response.create-root-failure'));
return redirect()->back();
}
}
$category = $this->categoryRepository->create(request()->all());
session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Category']));

4
packages/Webkul/Category/src/Repositories/CategoryRepository.php
View File

@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Event;
use Webkul\Core\Eloquent\Repository;
use Webkul\Category\Models\Category;
use Webkul\Category\Models\CategoryTranslation;
use Webkul\Category\Models\CategoryTranslationProxy;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Support\Facades\DB;
@ -121,7 +121,7 @@ class CategoryRepository extends Repository
*/
public function isSlugUnique($id, $slug)
{
$exists = CategoryTranslation::where('category_id', '<>', $id)
$exists = CategoryTranslationProxy::modelClass()::where('category_id', '<>', $id)
->where('slug', $slug)
->limit(1)
->select(DB::raw(1))

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

@ -5,7 +5,7 @@ namespace Webkul\Product\Repositories;
use Illuminate\Container\Container as App;
use Webkul\Attribute\Repositories\AttributeRepository;
use Webkul\Core\Eloquent\Repository;
use Webkul\Product\Models\ProductAttributeValue;
use Webkul\Product\Models\ProductAttributeValueProxy;
class ProductAttributeValueRepository extends Repository
{
@ -59,7 +59,7 @@ class ProductAttributeValueRepository extends Repository
return;
}
$data[ProductAttributeValue::$attributeTypeFields[$attribute->type]] = $data['value'];
$data[ProductAttributeValueProxy::modelClass()::$attributeTypeFields[$attribute->type]] = $data['value'];
return $this->model->create($data);
}

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

@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Event;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Webkul\Attribute\Repositories\AttributeRepository;
use Webkul\Core\Eloquent\Repository;
use Webkul\Product\Models\ProductAttributeValue;
use Webkul\Product\Models\ProductAttributeValueProxy;
class ProductRepository extends Repository
{
@ -175,7 +175,7 @@ class ProductRepository extends Repository
foreach ($attributeFilters as $attribute) {
$filterQuery->orWhere(function ($attributeQuery) use ($attribute) {
$column = 'product_attribute_values.' . ProductAttributeValue::$attributeTypeFields[$attribute->type];
$column = 'product_attribute_values.' . ProductAttributeValueProxy::modelClass()::$attributeTypeFields[$attribute->type];
$filterInputValues = explode(',', request()->get($attribute->code));