diff --git a/.env.example b/.env.example index c3e5febd2..c62b5b3ed 100644 --- a/.env.example +++ b/.env.example @@ -4,10 +4,10 @@ APP_VERSION=1.0.0 APP_KEY= APP_DEBUG=true APP_URL=http://localhost -APP_TIMEZONE= -APP_LOCALE= +APP_TIMEZONE=Asia/Kolkata +APP_LOCALE=en LOG_CHANNEL=stack -APP_CURRENCY= +APP_CURRENCY=USD DB_CONNECTION=mysql DB_HOST=127.0.0.1 diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index e08917649..55827b319 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -21,13 +21,9 @@ class ProductDataGrid extends DataGrid { parent::__construct(); - $this->locale = request()->get('locale') == 'all' - ? app()->getLocale() - : (request()->get('locale') ?? app()->getLocale()); + $this->locale = request()->get('locale') ?? 'all'; - $this->channel = request()->get('channel') == 'all' - ? core()->getDefaultChannelCode() - : (request()->get('channel') ?? core()->getDefaultChannelCode()); + $this->channel = request()->get('channel') ?? 'all'; } public function prepareQueryBuilder() @@ -45,7 +41,17 @@ class ProductDataGrid extends DataGrid 'product_flat.price', 'attribute_families.name as attribute_family', DB::raw('SUM(DISTINCT ' . DB::getTablePrefix() . 'product_inventories.qty) as quantity') - )->where('locale', $this->locale)->where('locale', $this->locale); + ); + + if ($this->locale !== 'all') { + $queryBuilder->where('locale', $this->locale); + } else { + $queryBuilder->whereNotNull('product_flat.name'); + } + + if ($this->channel !== 'all') { + $queryBuilder->where('channel', $this->channel); + } $queryBuilder->groupBy('product_flat.product_id'); diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index 94477e2ca..a52168b11 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -213,6 +213,14 @@ +
+ + +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.configuration.controls.after') !!} diff --git a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php index 2ad5a0f13..d833e4911 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php @@ -11,7 +11,7 @@ {!! view_render_event('bagisto.shop.products.view.short_description.before', ['product' => $product]) !!} diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/attributes.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/attributes.blade.php index 404c208fc..e4a700d1b 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/attributes.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/attributes.blade.php @@ -5,7 +5,7 @@ $customAttributeValues = $productViewHelper->getAdditionalData($product); @endphp - @if ($customAttributeValues && $customAttributeValues[0]['value']) + @if ($customAttributeValues)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php index 832869db0..5d3f9e18e 100755 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php @@ -24,8 +24,11 @@ + product-id="{{ $product->id }}" + product-slug="{{ $product->url_key }}" + add-class="{{ $addWishlistClass ?? '' }}" + added-text="{{ __('shop::app.customer.account.wishlist.add') }}" + remove-text="{{ __('shop::app.customer.account.wishlist.remove') }}"> @endauth {!! view_render_event('bagisto.shop.products.wishlist.after') !!} \ No newline at end of file