From 90eed2792bbf01d5a389c2b50effb26e4dba8015 Mon Sep 17 00:00:00 2001
From: "shubhammehrotra.symfony@webkul.com"
 <shubhammehrotra.symfony@webkul.com>
Date: Mon, 15 Jun 2020 13:45:59 +0530
Subject: [PATCH] previous changes

---
 .../accordians/customer-group-price.blade.php |  2 +-
 packages/Webkul/Product/src/Type/Grouped.php  |  8 ++---
 .../layouts/top-nav/locale-currency.blade.php | 33 +++++++++++++++----
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php
index a8295f37d..a32509ed9 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php
@@ -85,7 +85,7 @@
 
                 <div class="control-group">
                     <div class="control-group" :class="[errors.has(inputName + '[value]') ? 'has-error' : '']">
-                        <input type="number" v-validate="'required|min_value:0'" :name="[inputName + '[value]']" v-model="customerGroupPrice.value" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.products.value') }}&quot;"/>
+                        <input type="number" v-validate="'required|min_value:0'" :name="[inputName + '[value]']" v-model="customerGroupPrice.value" class="control" data-vv-as="&quot;{{ __('admin::app.datagrid.price') }}&quot;"/>
                         <span class="control-error" v-if="errors.has(inputName + '[value]')">@{{ errors.first(inputName + '[value]') }}</span>
                     </div>
                 </div>
diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php
index aba9c455f..bb13a3e8a 100644
--- a/packages/Webkul/Product/src/Type/Grouped.php
+++ b/packages/Webkul/Product/src/Type/Grouped.php
@@ -20,7 +20,7 @@ class Grouped extends AbstractType
      * @var \Webkul\Product\Repositories\ProductGroupedProductRepository
      */
     protected $productGroupedProductRepository;
-    
+
     /**
      * Skip attribute for downloadable product type
      *
@@ -30,7 +30,7 @@ class Grouped extends AbstractType
 
     /**
      * These blade files will be included in product edit page
-     * 
+     *
      * @var array
      */
     protected $additionalViews = [
@@ -124,7 +124,7 @@ class Grouped extends AbstractType
      *
      * @return float
      */
-    public function getMinimalPrice()
+    public function getMinimalPrice($qty = null)
     {
         $minPrices = [];
 
@@ -180,7 +180,7 @@ class Grouped extends AbstractType
             if (is_string($cartProducts)) {
                 return $cartProducts;
             }
-                
+
             $products = array_merge($products, $cartProducts);
         }
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/locale-currency.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/locale-currency.blade.php
index fa3937b6f..7b71afaf8 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/locale-currency.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/locale-currency.blade.php
@@ -1,11 +1,30 @@
-{!! view_render_event('bagisto.shop.layout.header.locale.before') !!}
+@php
+    $searchQuery = request()->input();
 
+    if ($searchQuery && ! empty($searchQuery)) {
+        $searchQuery = implode('&', array_map(
+            function ($v, $k) {
+                if (is_array($v)) {
+                    return $k. '[]=' . implode('&' . $k . '[]=', $v);
+                } else {
+                    return $k . '=' . $v;
+                }
+            },
+            $searchQuery,
+            array_keys($searchQuery)
+        ));
+    } else {
+        $searchQuery = false;
+    }
+@endphp
+
+{!! view_render_event('bagisto.shop.layout.header.locale.before') !!}
     <div class="pull-left">
         <div class="dropdown">
-
             @php
                 $localeImage = null;
             @endphp
+
             @foreach (core()->getCurrentChannel()->locales as $locale)
                 @if ($locale->code == app()->getLocale())
                     @php
@@ -28,11 +47,11 @@
                 @if (count(core()->getCurrentChannel()->locales) == 1)
                     disabled="disabled"
                 @endif>
-                
+
                 @foreach (core()->getCurrentChannel()->locales as $locale)
-                    @if (isset($serachQuery))
+                    @if (isset($searchQuery) && $searchQuery)
                         <option
-                            value="?{{ $serachQuery }}&locale={{ $locale->code }}"
+                            value="?{{ $searchQuery }}&locale={{ $locale->code }}"
                             {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>
                             {{ $locale->name }}
                         </option>
@@ -59,8 +78,8 @@
                     class="btn btn-link dropdown-toggle control locale-switcher styled-select"
                     onchange="window.location.href = this.value">
                     @foreach (core()->getCurrentChannel()->currencies as $currency)
-                        @if (isset($serachQuery))
-                            <option value="?{{ $serachQuery }}&currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
+                        @if (isset($searchQuery) && $searchQuery)
+                            <option value="?{{ $searchQuery }}&currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
                         @else
                             <option value="?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
                         @endif