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

Merge pull request #6123 from jitendra-webkul/master 

Issue #6119 fixed
This commit is contained in:
Jitendra Singh 2022-03-25 11:47:21 +05:30 committed by GitHub
parent 0113171b6d 5fb810852f
commit f2e2ce2893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=7d73f64f6f160ecd8a23",
"/js/admin.js": "/js/admin.js?id=cd52020d82033197d2a5",
"/css/admin.css": "/css/admin.css?id=15d0ab8d01403f912469"
}

3
packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
View File

@ -59,7 +59,8 @@ class ProductDataGrid extends DataGrid
*
* @return void
*/
public function __construct() {
public function __construct()
{
/* locale */
$this->locale = core()->getRequestedLocaleCode();

2
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -6,7 +6,7 @@
'completed'=> trans('admin::app.notification.order-status-messages.completed'),
'processing' => trans('admin::app.notification.order-status-messages.processing')
];
$allLocales = core()->getAllLocales()->sortBy('name')->pluck('name', 'code');
$allLocales = core()->getAllLocales()->pluck('name', 'code');
$currentLocaleCode = core()->getRequestedLocaleCode('admin_locale');
@endphp

4
packages/Webkul/Core/src/Core.php
View File

@ -296,7 +296,7 @@ class Core
return $locales;
}
return $locales = $this->localeRepository->all();
return $locales = $this->localeRepository->orderBy('name')->all();
}
/**
@ -316,7 +316,7 @@ class Core
return $data = [
'channel' => $channel,
'locales' => $channel->locales,
'locales' => $channel->locales()->orderBy('name')->get()
];
}

2
packages/Webkul/Ui/src/DataGrid/Traits/ProvideDataGridPlus.php
View File

@ -91,7 +91,7 @@ trait ProvideDataGridPlus
/* handling cases for new locale if not present in current channel */
if ($channel !== 'all') {
$channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales;
$channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales()->orderBy('name')->get();
if ($channelLocales->contains('code', $locale)) {
$locales = $channelLocales;