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

Currency Symbol And Product Listing Fixed

This commit is contained in:
Devansh 2022-04-06 12:53:07 +05:30
parent a181eeed4e
commit 3bcde84226
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,11 @@ class ProductDataGrid extends DataGrid
'sortable' => true,
'filterable' => true,
'closure' => function ($row) {
return "<a href='" . route('shop.productOrCategory.index', $row->url_key) . "' target='_blank'>" . $row->product_name . "</a>";
if (! empty($row->url_key)) {
return "<a href='" . route('shop.productOrCategory.index', $row->url_key) . "' target='_blank'>" . $row->product_name . "</a>";
}
return $row->url_key;
},
]);

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

@ -68,8 +68,7 @@ class Core
protected LocaleRepository $localeRepository,
protected CustomerGroupRepository $customerGroupRepository,
protected CoreConfigRepository $coreConfigRepository
)
{
) {
}
/**
@ -246,7 +245,7 @@ class Core
return $data = [
'channel' => $channel,
'locales' => $channel->locales()->orderBy('name')->get()
'locales' => $channel->locales()->orderBy('name')->get(),
];
}
@ -598,11 +597,13 @@ class Core
/**
* Return currency symbol from currency code.
*
* @param float $price
* @param string|\Webkul\Core\Contracts\Currency $code
* @return string
*/
public function currencySymbol($code)
public function currencySymbol($currency)
{
$code = $currency instanceof \Webkul\Core\Contracts\Currency ? $currency->code : $currency;
$formatter = new \NumberFormatter(app()->getLocale() . '@currency=' . $code, \NumberFormatter::CURRENCY);
return $formatter->getSymbol(\NumberFormatter::CURRENCY_SYMBOL);
@ -1206,7 +1207,7 @@ class Core
* @param array $array2
* @return array
*/
protected function arrayMerge(array &$array1, array &$array2)
protected function arrayMerge(array&$array1, array&$array2)
{
$merged = $array1;