Merge pull request #6245 from devansh-webkul/currency-symbol-and-prod…

…uct-listing-issue Currency Symbol #6244 And Product Listing Fixed #6246
bagisto · Apr 6, 2022 · 0c5cb7e · 0c5cb7e
2 parents 0da87c7 + 1308341
commit 0c5cb7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
@@ -168,7 +168,11 @@ public function addColumns()
             '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->product_name;
             },
         ]);
 

diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
@@ -68,8 +68,7 @@ public function __construct(
         protected LocaleRepository $localeRepository,
         protected CustomerGroupRepository $customerGroupRepository,
         protected CoreConfigRepository $coreConfigRepository
-    )
-    {
+    ) {
     }
 
     /**
@@ -246,7 +245,7 @@ public function getAllLocalesByRequestedChannel()
 
         return $data = [
             'channel' => $channel,
-            'locales' => $channel->locales()->orderBy('name')->get()
+            'locales' => $channel->locales()->orderBy('name')->get(),
         ];
     }
 
@@ -598,11 +597,13 @@ public function currency($amount = 0)
     /**
      * Return currency symbol from currency code.
      *
-     * @param  float  $price
+     * @param  string|\Webkul\Core\Contracts\Currency  $currency
      * @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 @@ public function getAdminEmailDetails()
      * @param  array  $array2
      * @return array
      */
-    protected function arrayMerge(array &$array1, array &$array2)
+    protected function arrayMerge(array&$array1, array&$array2)
     {
         $merged = $array1;