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

previous changes

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-06-15 13:45:59 +05:30
parent 7d350178ea
commit 90eed2792b
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/customer-group-price.blade.php
View File

@ -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>

2
packages/Webkul/Product/src/Type/Grouped.php
View File

@ -124,7 +124,7 @@ class Grouped extends AbstractType
*
* @return float
*/
public function getMinimalPrice()
public function getMinimalPrice($qty = null)
{
$minPrices = [];

31
packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/locale-currency.blade.php
View File

@ -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
@ -30,9 +49,9 @@
@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