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

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahul shukla 2020-12-29 15:53:57 +05:30
parent 759ca310f4 c3ef6ed9d3
commit e723eb0872
4 changed files with 550 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
composer.json
View File

@ -21,6 +21,7 @@
"astrotomic/laravel-translatable": "^11.0.0",
"babenkoivan/elastic-scout-driver": "^1.1",
"bagistobrasil/bagisto-product-social-share": "^0.1.2",
"barryvdh/laravel-debugbar": "^3.1",
"barryvdh/laravel-dompdf": "0.8.6",
"doctrine/dbal": "2.9.2",
"fideloper/proxy": "^4.2",
@ -43,7 +44,6 @@
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.1",
"codeception/codeception": "4.1.1",
"codeception/module-asserts": "^1.1",
"codeception/module-filesystem": "^1.0",
@ -151,6 +151,13 @@
"vendor/bin/codecept run unit",
"vendor/bin/codecept run functional",
"vendor/bin/codecept run trigger"
],
"test-win": [
"@set -e",
"@php artisan migrate:fresh --env=testing",
"vendor\\bin\\codecept.bat run unit",
"vendor\\bin\\codecept.bat run functional",
"vendor\\bin\\codecept.bat run trigger"
]
},
"config": {

1060
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

5
packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
View File

@ -53,6 +53,11 @@ class ChannelDataGrid extends DataGrid
->addSelect('channels.id', 'channels.code', 'channel_translations.locale', 'channel_translations.name as translated_name', 'channels.hostname')
->where('channel_translations.locale', '=', $this->locale);
$this->addFilter('id', 'channels.id');
$this->addFilter('code', 'channels.code');
$this->addFilter('hostname', 'channels.hostname');
$this->addFilter('translated_name', 'channel_translations.name');
$this->setQueryBuilder($queryBuilder);
}

2
packages/Webkul/Core/src/Repositories/ChannelRepository.php
View File

@ -61,7 +61,7 @@ class ChannelRepository extends Repository
{
$channel = $this->find($id);
parent::update($data, $id, $attribute);
$channel = parent::update($data, $id, $attribute);
$channel->locales()->sync($data['locales']);