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

Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-4033

This commit is contained in:
vishal.kushwaha650 2020-10-12 15:10:26 +05:30
parent e42d032a0d e08d41ae0c
commit 016d0a23fa
61 changed files with 172 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/products.php
View File

@ -17,7 +17,5 @@ return [
// Return neither true nor false but null by default to not interrupt the default chain that
// defines if a product is saleable. It depends on the isSaleable() method of the product
// type if this callable is obeyed.
'isSaleable' => function (Product $product): ?bool {
return null;
},
'isSaleable' => null,
];

16
packages/Webkul/API/Http/Controllers/Shop/SessionController.php
View File

@ -103,23 +103,19 @@ class SessionController extends Controller
'password' => 'confirmed|min:6',
]);
$data = request()->all();
$data = request()->only('first_name', 'last_name', 'gender', 'date_of_birth', 'email', 'password');
if (! $data['date_of_birth']) {
unset($data['date_of_birth']);
}
if (!isset($data['password']) || ! $data['password']) {
if (! isset($data['password']) || ! $data['password']) {
unset($data['password']);
} else {
$data['password'] = bcrypt($data['password']);
}
$this->customerRepository->update($data, $customer->id);
$updatedCustomer = $this->customerRepository->update($data, $customer->id);
return response()->json([
'message' => 'Your account has been created successfully.',
'data' => new CustomerResource($this->customerRepository->find($customer->id)),
'message' => 'Your account has been updated successfully.',
'data' => new CustomerResource($updatedCustomer),
]);
}
@ -136,4 +132,4 @@ class SessionController extends Controller
'message' => 'Logged out successfully.',
]);
}
}
}

2
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
View File

@ -78,7 +78,7 @@
<div class="control-group" :class="[errors.has('tax_rate') ? 'has-error' : '']">
<label for="tax_rate" class="required">{{ __('admin::app.configuration.tax-rates.tax_rate') }}</label>
<input v-validate="'required|min_value:0.0001'" class="control" id="tax_rate" name="tax_rate" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.tax_rate') }}&quot;" value="{{ old('tax_rate') }}"/>
<input v-validate="'required|decimal|min_value:0.0001'" class="control" id="tax_rate" name="tax_rate" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.tax_rate') }}&quot;" value="{{ old('tax_rate') }}"/>
<span class="control-error" v-if="errors.has('tax_rate')">@{{ errors.first('tax_rate') }}</span>
</div>
</div>

2
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
View File

@ -62,7 +62,7 @@
<div class="control-group" :class="[errors.has('tax_rate') ? 'has-error' : '']">
<label for="tax_rate" class="required">{{ __('admin::app.configuration.tax-rates.tax_rate') }}</label>
<input v-validate="'required|min_value:0.0001'" class="control" id="tax_rate" name="tax_rate" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.tax_rate') }}&quot;" value="{{ old('tax_rate') ?: $taxRate->tax_rate }}" />
<input v-validate="'required|decimal|min_value:0.0001'" class="control" id="tax_rate" name="tax_rate" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.tax_rate') }}&quot;" value="{{ old('tax_rate') ?: $taxRate->tax_rate }}" />
<span class="control-error" v-if="errors.has('tax_rate')">@{{ errors.first('tax_rate') }}</span>
</div>

1
packages/Webkul/Checkout/src/Cart.php
View File

@ -708,6 +708,7 @@ class Cart
$item->save();
}
Event::dispatch('checkout.cart.calculate.items.tax.after', $cart);
}

2
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=13a4d80b6b4c45da1ee0",
"/js/shop.js": "/js/shop.js?id=73723ffa31b9e1876375",
"/css/shop.css": "/css/shop.css?id=4d6a80790b697b2dc931"
}

BIN
packages/Webkul/Velocity/publishable/assets/images/banner.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/big-sale-banner.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/deals.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/headphones.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/kids-2.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/kids.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/seasons.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/toster.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/trimmer.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
packages/Webkul/Velocity/publishable/assets/images/watch.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=98b67c23ee9f79a2071b",
"/js/velocity.js": "/js/velocity.js?id=93f3ffabc5a222cd5737",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=ea555a71cccc16f445e1"
}

19
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue
View File

@ -1,9 +1,25 @@
<template>
<form method="POST" @submit.prevent="addToCart">
<!-- for move to cart from wishlist -->
<a
:href="wishlistMoveRoute"
:disabled="isButtonEnable == 'false' || isButtonEnable == false"
:class="`btn btn-add-to-cart ${addClassToBtn}`"
v-if="moveToCart"
>
<i class="material-icons text-down-3" v-if="showCartIcon">shopping_cart</i>
<span class="fs14 fw6 text-uppercase text-up-4" v-text="btnText"></span>
</a>
<!-- for add to cart -->
<button
type="submit"
:disabled="isButtonEnable == 'false' || isButtonEnable == false"
:class="`btn btn-add-to-cart ${addClassToBtn}`">
:class="`btn btn-add-to-cart ${addClassToBtn}`"
v-else
>
<i class="material-icons text-down-3" v-if="showCartIcon">shopping_cart</i>
@ -22,6 +38,7 @@
'productId',
'reloadPage',
'moveToCart',
'wishlistMoveRoute',
'showCartIcon',
'addClassToBtn',
'productFlatId',

1
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/image-magnifier.vue
View File

@ -6,6 +6,7 @@
ref="activeProductImage"
id="active-product-image"
class="main-product-image"
alt=""
/>
</div>
</template>

18
packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View File

@ -166,19 +166,19 @@
@php
$images[4][] = [
'id' => 'image_1',
'url' => asset('/themes/velocity/assets/images/big-sale-banner.png'),
'url' => asset('/themes/velocity/assets/images/big-sale-banner.webp'),
];
$images[4][] = [
'id' => 'image_2',
'url' => asset('/themes/velocity/assets/images/seasons.png'),
'url' => asset('/themes/velocity/assets/images/seasons.webp'),
];
$images[4][] = [
'id' => 'image_3',
'url' => asset('/themes/velocity/assets/images/deals.png'),
'url' => asset('/themes/velocity/assets/images/deals.webp'),
];
$images[4][] = [
'id' => 'image_4',
'url' => asset('/themes/velocity/assets/images/kids.png'),
'url' => asset('/themes/velocity/assets/images/kids.webp'),
];
@endphp
@ -213,15 +213,15 @@
@php
$images[3][] = [
'id' => 'image_1',
'url' => asset('/themes/velocity/assets/images/headphones.png'),
'url' => asset('/themes/velocity/assets/images/headphones.webp'),
];
$images[3][] = [
'id' => 'image_2',
'url' => asset('/themes/velocity/assets/images/watch.png'),
'url' => asset('/themes/velocity/assets/images/watch.webp'),
];
$images[3][] = [
'id' => 'image_3',
'url' => asset('/themes/velocity/assets/images/kids-2.png'),
'url' => asset('/themes/velocity/assets/images/kids-2.webp'),
];
@endphp
@ -255,11 +255,11 @@
@php
$images[2][] = [
'id' => 'image_1',
'url' => asset('/themes/velocity/assets/images/toster.png'),
'url' => asset('/themes/velocity/assets/images/toster.webp'),
];
$images[2][] = [
'id' => 'image_2',
'url' => asset('/themes/velocity/assets/images/trimmer.png'),
'url' => asset('/themes/velocity/assets/images/trimmer.webp'),
];
@endphp

14
packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php
View File

@ -72,7 +72,7 @@
<img
class="category-icon"
v-if="category.category_icon_path"
:src="`${$root.baseUrl}/storage/${category.category_icon_path}`" />
:src="`${$root.baseUrl}/storage/${category.category_icon_path}`" alt="" />
</div>
<span v-text="category.name"></span>
</a>
@ -134,11 +134,11 @@
@if ($locale->locale_image)
<img
class="language-logo"
src="{{ asset('/storage/' . $locale->locale_image) }}" />
src="{{ asset('/storage/' . $locale->locale_image) }}" alt="" />
@elseif ($locale->code == "en")
<img
class="language-logo"
src="{{ asset('/themes/velocity/assets/images/flags/en.png') }}" />
src="{{ asset('/themes/velocity/assets/images/flags/en.png') }}" alt="" />
@endif
</div>
<span>{{ $locale->name }}</span>
@ -213,7 +213,7 @@
<img
class="category-icon"
v-if="nestedSubCategory.category_icon_path"
:src="`${$root.baseUrl}/storage/${nestedSubCategory.category_icon_path}`" />
:src="`${$root.baseUrl}/storage/${nestedSubCategory.category_icon_path}`" alt="" />
</div>
<span>@{{ nestedSubCategory.name }}</span>
</a>
@ -234,7 +234,7 @@
<img
class="category-icon"
v-if="thirdLevelCategory.category_icon_path"
:src="`${$root.baseUrl}/storage/${thirdLevelCategory.category_icon_path}`" />
:src="`${$root.baseUrl}/storage/${thirdLevelCategory.category_icon_path}`" alt="" />
</div>
<span>@{{ thirdLevelCategory.name }}</span>
</a>
@ -266,14 +266,14 @@
<div class="category-logo">
<img
class="category-icon"
src="{{ asset('/themes/velocity/assets/images/flags/en.png') }}" />
src="{{ asset('/themes/velocity/assets/images/flags/en.png') }}" alt="" />
</div>
@else
<div class="category-logo">
<img
class="category-icon"
src="{{ asset('/storage/' . $locale->locale_image) }}" />
src="{{ asset('/storage/' . $locale->locale_image) }}" alt="" />
</div>
@endif

23
packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
View File

@ -25,7 +25,7 @@
<script type="text/x-template" id="quantity-changer-template">
<div :class="`quantity control-group ${errors.has(controlName) ? 'has-error' : ''}`">
<label class="required">{{ __('shop::app.products.quantity') }}</label>
<label class="required" for="quantity-changer">{{ __('shop::app.products.quantity') }}</label>
<button type="button" class="decrease" @click="decreaseQty()">-</button>
<input
@ -33,6 +33,7 @@
class="control"
:name="controlName"
:v-validate="validations"
id="quantity-changer"
data-vv-as="&quot;{{ __('shop::app.products.quantity') }}&quot;"
readonly />
@ -49,12 +50,13 @@
<script type="text/x-template" id="logo-template">
<a
:class="`left ${addClass}`"
href="{{ route('shop.home.index') }}">
href="{{ route('shop.home.index') }}"
aria-label="Logo">
@if ($logo = core()->getCurrentChannel()->logo_url)
<img class="logo" src="{{ $logo }}" />
<img class="logo" src="{{ $logo }}" alt="" />
@else
<img class="logo" src="{{ asset('themes/velocity/assets/images/logo-text.png') }}" />
<img class="logo" src="{{ asset('themes/velocity/assets/images/logo-text.png') }}" alt="" />
@endif
</a>
</script>
@ -74,7 +76,7 @@
<div class="btn-group full-width">
<div class="selectdiv">
<select class="form-control fs13 styled-select" name="category" @change="focusInput($event)">
<select class="form-control fs13 styled-select" name="category" @change="focusInput($event)" aria-label="Category">
<option value="">
{{ __('velocity::app.header.all-categories') }}
</option>
@ -107,11 +109,12 @@
type="search"
class="form-control"
placeholder="{{ __('velocity::app.header.search-text') }}"
:value="searchedQuery.term ? searchedQuery.term.split('+').join(' ') : ''" />
aria-label="Search"
:value="searchedQuery.term ? decodeURIComponent(searchedQuery.term.split('+').join(' ')) : ''" />
<image-search-component></image-search-component>
<button class="btn" type="submit" id="header-search-icon">
<button class="btn" type="submit" id="header-search-icon" aria-label="Search">
<i class="fs16 fw6 rango-search"></i>
</button>
</div>
@ -165,8 +168,8 @@
</div>
</script>
<script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs" defer></script>
<script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/mobilenet" defer></script>
<script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs"></script>
<script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/mobilenet"></script>
<script type="text/x-template" id="image-search-component-template">
<div class="d-inline-block">
@ -183,7 +186,7 @@
<img
class="d-none"
id="uploaded-image-url"
:src="uploadedImageUrl" />
:src="uploadedImageUrl" alt="" />
</label>
</div>
</script>

0
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php Executable file → Normal file
View File

2
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php Executable file → Normal file
View File

@ -81,7 +81,7 @@
<div class="row col-12 no-padding">
<div class="col-2 max-sm-img-dimention">
<img src="{{ $productBaseImage['medium_image_url'] }}" />
<img src="{{ $productBaseImage['medium_image_url'] }}" alt="" />
</div>
<div class="col-10 no-padding fs16">

0
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php Executable file → Normal file
View File

0
packages/Webkul/Velocity/src/Resources/views/shop/checkout/success.blade.php Executable file → Normal file
View File

0
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/country-state.blade.php Executable file → Normal file
View File

2
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
View File

@ -40,7 +40,7 @@
href="{{ url()->to('/').'/'.$review->product->url_key }}"
title="{{ $review->product->name }}"
class="col-2 max-sm-img-dimention no-padding">
<img class="media" src="{{ $image['small_image_url'] }}"/>
<img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
</a>
<div class="col-8">

25
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php
View File

@ -23,7 +23,7 @@
{!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
<div class="account-items-list row wishlist-container">
<div class="wishlist-container">
@if ($items->count())
@foreach ($items as $item)
@ -33,19 +33,22 @@
@endphp
@include ('shop::products.list.card', [
'checkmode' => true,
'moveToCart' => true,
'addToCartForm' => true,
'removeWishlist' => true,
'reloadPage' => true,
'itemId' => $item->id,
'product' => $item->product,
'btnText' => $moveToCartText,
'addToCartBtnClass' => 'small-padding',
'list' => true,
'checkmode' => true,
'moveToCart' => true,
'wishlistMoveRoute' => route('customer.wishlist.move', $item->id),
'addToCartForm' => true,
'removeWishlist' => true,
'reloadPage' => true,
'itemId' => $item->id,
'product' => $item->product,
'additionalAttributes' => true,
'btnText' => $moveToCartText,
'addToCartBtnClass' => 'small-padding',
])
@endforeach
<div class="bottom-toolbar">
<div>
{{ $items->links() }}
</div>
@else

0
packages/Webkul/Velocity/src/Resources/views/shop/customers/session/index.blade.php Executable file → Normal file
View File

0
packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/forgot-password.blade.php Executable file → Normal file
View File

0
packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php Executable file → Normal file
View File

0
packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/reset-password.blade.php Executable file → Normal file
View File

6
packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
View File

@ -73,7 +73,8 @@
class="image-wrapper"
:src="product['{{ $attribute['code'] }}']"
onload="window.updateHeight ? window.updateHeight() : ''"
:onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
:onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`"
alt=""/>
</a>
@break
@ -133,7 +134,8 @@
class="image-wrapper"
onload="window.updateHeight ? window.updateHeight() : ''"
:src="'storage/' + product.product['{{ $attribute['code'] }}']"
:onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
:onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`"
alt=""/>
</a>
@break;

32
packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-four.blade.php
View File

@ -20,28 +20,28 @@
<div class="container-fluid advertisement-four-container">
<div class="row">
@if ( isset($advertisementFour[0]))
<a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-4 col-12 no-padding">
<img class="col-12" src="{{ asset('/storage/' . $advertisementFour[0]) }}" />
<a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-4 col-12 no-padding" aria-label="Advertisement">
<img class="col-12" src="{{ asset('/storage/' . $advertisementFour[0]) }}" alt="" />
</a>
@endif
<div class="col-lg-4 col-12 offers-ct-panel">
@if ( isset($advertisementFour[1]))
<a @if (isset($two)) href="{{ $two }}" @endif class="row col-12 remove-padding-margin">
<img class="col-12 offers-ct-top" src="{{ asset('/storage/' . $advertisementFour[1]) }}" />
<a @if (isset($two)) href="{{ $two }}" @endif class="row col-12 remove-padding-margin" aria-label="Advertisement">
<img class="col-12 offers-ct-top" src="{{ asset('/storage/' . $advertisementFour[1]) }}" alt="" />
</a>
@endif
@if ( isset($advertisementFour[2]))
<a @if (isset($three)) href="{{ $three }}" @endif class="row col-12 remove-padding-margin">
<img class="col-12 offers-ct-bottom" src="{{ asset('/storage/' . $advertisementFour[2]) }}" />
<a @if (isset($three)) href="{{ $three }}" @endif class="row col-12 remove-padding-margin" aria-label="Advertisement">
<img class="col-12 offers-ct-bottom" src="{{ asset('/storage/' . $advertisementFour[2]) }}" alt="" />
</a>
@endif
</div>
@if ( isset($advertisementFour[3]))
<a @if (isset($four)) href="{{ $four }}" @endif class="col-lg-4 col-12 no-padding">
<img class="col-12" src="{{ asset('/storage/' . $advertisementFour[3]) }}" />
<a @if (isset($four)) href="{{ $four }}" @endif class="col-lg-4 col-12 no-padding" aria-label="Advertisement">
<img class="col-12" src="{{ asset('/storage/' . $advertisementFour[3]) }}" alt="" />
</a>
@endif
</div>
@ -52,21 +52,21 @@
@if (! $isRendered)
<div class="container-fluid advertisement-four-container">
<div class="row">
<a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-4 col-12 no-padding">
<img class="col-12" src="{{ asset('/themes/velocity/assets/images/big-sale-banner.png') }}" />
<a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-4 col-12 no-padding" aria-label="Advertisement">
<img class="col-12" src="{{ asset('/themes/velocity/assets/images/big-sale-banner.webp') }}" alt="" />
</a>
<div class="col-lg-4 col-12 offers-ct-panel">
<a @if (isset($two)) href="{{ $two }}" @endif class="row col-12 remove-padding-margin">
<img class="col-12 offers-ct-top" src="{{ asset('/themes/velocity/assets/images/seasons.png') }}" />
<a @if (isset($two)) href="{{ $two }}" @endif class="row col-12 remove-padding-margin" aria-label="Advertisement">
<img class="col-12 offers-ct-top" src="{{ asset('/themes/velocity/assets/images/seasons.webp') }}" alt="" />
</a>
<a @if (isset($three)) href="{{ $three }}" @endif class="row col-12 remove-padding-margin">
<img class="col-12 offers-ct-bottom" src="{{ asset('/themes/velocity/assets/images/deals.png') }}" />
<a @if (isset($three)) href="{{ $three }}" @endif class="row col-12 remove-padding-margin" aria-label="Advertisement">
<img class="col-12 offers-ct-bottom" src="{{ asset('/themes/velocity/assets/images/deals.webp') }}" alt="" />
</a>
</div>
<a @if (isset($four)) href="{{ $four }}" @endif class="col-lg-4 col-12 no-padding">
<img class="col-12" src="{{ asset('/themes/velocity/assets/images/kids.png') }}" />
<a @if (isset($four)) href="{{ $four }}" @endif class="col-lg-4 col-12 no-padding" aria-label="Advertisement">
<img class="col-12" src="{{ asset('/themes/velocity/assets/images/kids.webp') }}" alt="" />
</a>
</div>
</div>

12
packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-three.blade.php
View File

@ -21,19 +21,19 @@
<div class="row">
@if ( isset($advertisementThree[0]))
<a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-6 col-md-12 no-padding">
<img src="{{ asset('/storage/' . $advertisementThree[0]) }}" class="full-width" />
<img src="{{ asset('/storage/' . $advertisementThree[0]) }}" class="full-width" alt="" />
</a>
@endif
<div class="col-lg-6 col-md-12 second-panel">
@if ( isset($advertisementThree[1]))
<a @if (isset($two)) href="{{ $two }}" @endif class="row top-container">
<img src="{{ asset('/storage/' . $advertisementThree[1]) }}" class="col-12 pr0" />
<img src="{{ asset('/storage/' . $advertisementThree[1]) }}" class="col-12 pr0" alt="" />
</a>
@endif
@if ( isset($advertisementThree[2]))
<a @if (isset($three)) href="{{ $three }}" @endif class="row bottom-container">
<img src="{{ asset('/storage/' . $advertisementThree[2]) }}" class="col-12 pr0" />
<img src="{{ asset('/storage/' . $advertisementThree[2]) }}" class="col-12 pr0" alt="" />
</a>
@endif
</div>
@ -46,15 +46,15 @@
<div class="container-fluid advertisement-three-container">
<div class="row">
<a @if (isset($one)) href="{{ $one }}" @endif class="col-lg-6 col-md-12 no-padding">
<img src="{{ asset('/themes/velocity/assets/images/headphones.png') }}" class="full-width" />
<img src="{{ asset('/themes/velocity/assets/images/headphones.webp') }}" class="full-width" alt="" />
</a>
<div class="col-lg-6 col-md-12 second-panel">
<a @if (isset($two)) href="{{ $two }}" @endif class="row top-container">
<img src="{{ asset('/themes/velocity/assets/images/watch.png') }}" class="col-12 pr0" />
<img src="{{ asset('/themes/velocity/assets/images/watch.webp') }}" class="col-12 pr0" alt="" />
</a>
<a @if (isset($three)) href="{{ $three }}" @endif class="row bottom-container">
<img src="{{ asset('/themes/velocity/assets/images/kids-2.png') }}" class="col-12 pr0" />
<img src="{{ asset('/themes/velocity/assets/images/kids-2.webp') }}" class="col-12 pr0" alt="" />
</a>
</div>
</div>

8
packages/Webkul/Velocity/src/Resources/views/shop/home/advertisements/advertisement-two.blade.php
View File

@ -21,13 +21,13 @@
<div class="row">
@if ( isset($advertisementTwo[0]))
<a class="col-lg-9 col-md-12 no-padding">
<img src="{{ asset('/storage/' . $advertisementTwo[0]) }}" />
<img src="{{ asset('/storage/' . $advertisementTwo[0]) }}" alt="" />
</a>
@endif
@if ( isset($advertisementTwo[1]))
<a class="col-lg-3 col-md-12 pr0">
<img src="{{ asset('/storage/' . $advertisementTwo[1]) }}" />
<img src="{{ asset('/storage/' . $advertisementTwo[1]) }}" alt="" />
</a>
@endif
</div>
@ -39,11 +39,11 @@
<div class="container-fluid advertisement-two-container">
<div class="row">
<a class="col-lg-9 col-md-12 no-padding">
<img src="{{ asset('/themes/velocity/assets/images/toster.png') }}" />
<img src="{{ asset('/themes/velocity/assets/images/toster.webp') }}" alt="" />
</a>
<a class="col-lg-3 col-md-12 pr0">
<img src="{{ asset('/themes/velocity/assets/images/trimmer.png') }}" />
<img src="{{ asset('/themes/velocity/assets/images/trimmer.webp') }}" alt="" />
</a>
</div>
</div>

10
packages/Webkul/Velocity/src/Resources/views/shop/home/category-with-custom-option.blade.php
View File

@ -8,7 +8,7 @@
<div class="container-fluid category-with-custom-options">
<div class="row">
<div class="col pr15">
<img src="{{ asset ('/storage/' . $category['2']->image) }}" />
<img src="{{ asset ('/storage/' . $category['2']->image) }}" alt="" />
</div>
<div class="col">
@ -37,7 +37,7 @@
</div>
<div class="col pr15">
<img src="{{ asset ('/storage/' . $category['0']->image) }}" />
<img src="{{ asset ('/storage/' . $category['0']->image) }}" alt=""/>
</div>
<div class="col">
@ -92,7 +92,7 @@
</div>
</div>
<div class="col mt15">
<img src="{{ asset ('/storage/' . $category['3']->image) }}" />
<img src="{{ asset ('/storage/' . $category['3']->image) }}" alt="" />
</div>
<div class="col mt15 mr15">
@ -121,7 +121,7 @@
</div>
<div class="col">
<img src="{{ asset ('/storage/' . $category['1']->image) }}" />
<img src="{{ asset ('/storage/' . $category['1']->image) }}" alt="" />
</div>
</div>
@ -131,7 +131,7 @@
@foreach ($category as $categoryItem)
<div class="smart-category-container">
<div class="col-12">
<img src="{{ asset ('/storage/' . $categoryItem->image) }}" />
<img src="{{ asset ('/storage/' . $categoryItem->image) }}" alt="" />
</div>
<div class="col-12">

4
packages/Webkul/Velocity/src/Resources/views/shop/home/customer-reviews.blade.php
View File

@ -22,9 +22,9 @@
</div>
<div>
<h4 class="fs20 fw6 no-margin display-block">
<h3 class="fs20 fw6 no-margin display-block">
{{ $review['name'] }}
</h4>
</h3>
<div class="product-info fs16">
<span>{{ __('velocity::app.products.reviewed') }}- <a class="remove-decoration link-color" href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}">{{$review->product->name}}</a></span>

2
packages/Webkul/Velocity/src/Resources/views/shop/home/hot-categories.blade.php
View File

@ -15,7 +15,7 @@
<div class="card">
<div class="row velocity-divide-page">
<div class="left">
<img :src="`${$root.baseUrl}/storage/${hotCategoryDetails.category_icon_path}`" />
<img :src="`${$root.baseUrl}/storage/${hotCategoryDetails.category_icon_path}`" alt="" />
</div>
<div class="right">

2
packages/Webkul/Velocity/src/Resources/views/shop/home/popular-categories.blade.php
View File

@ -12,7 +12,7 @@
<div class="col-lg-3 col-md-12 popular-category-wrapper">
<div class="card col-12 no-padding">
<div class="category-image">
<img src="{{ asset('/storage/' . $categoryDetails->image) }}" />
<img src="{{ asset('/storage/' . $categoryDetails->image) }}" alt="" />
</div>
<div class="card-description">

6
packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
View File

@ -28,7 +28,8 @@
<a @if($slider['slider_path']) href="{{ $slider['slider_path'] }}" @endif>
<img
class="col-12 no-padding banner-icon"
src="{{ url()->to('/') . '/storage/' . $slider['path'] }}" />
src="{{ url()->to('/') . '/storage/' . $slider['path'] }}"
alt=""/>
<div class="show-content" v-html="'{{ $textContent }}'">
</div>
@ -41,7 +42,8 @@
<img
loading="lazy"
class="col-12 no-padding banner-icon"
src="{{ asset('/themes/velocity/assets/images/banner.png') }}" />
src="{{ asset('/themes/velocity/assets/images/banner.webp') }}"
alt=""/>
</slide>
@endif

6
packages/Webkul/Velocity/src/Resources/views/shop/layouts/footer/footer-links/footer-left.blade.php
View File

@ -1,14 +1,14 @@
<div class="col-lg-4 col-md-12 col-sm-12 software-description">
<div class="logo">
<a href="{{ route('shop.home.index') }}">
<a href="{{ route('shop.home.index') }}" aria-label="Logo">
@if ($logo = core()->getCurrentChannel()->logo_url)
<img
src="{{ $logo }}"
class="logo full-img" />
class="logo full-img" alt="" />
@else
<img
src="{{ asset('themes/velocity/assets/images/static/logo-text-white.png') }}"
class="logo full-img" />
class="logo full-img" alt="" />
@endif
</a>

2
packages/Webkul/Velocity/src/Resources/views/shop/layouts/footer/footer-logo.blade.php
View File

@ -1,5 +1,5 @@
<a href="{{ route('shop.home.index') }}">
<img
src="{{ asset('themes/velocity/assets/images/static/logo-text-white.png') }}"
class="logo full-img" />
class="logo full-img" alt="" />
</a>

1
packages/Webkul/Velocity/src/Resources/views/shop/layouts/footer/newsletter-subscription.blade.php
View File

@ -20,6 +20,7 @@
name="subscriber_email"
class="control subscribe-field"
placeholder="{{ __('velocity::app.customer.login-form.your-email-address') }}"
aria-label="Newsletter"
required />
<button class="theme-btn subscribe-btn fw6">

0
packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php Executable file → Normal file
View File

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

@ -41,15 +41,16 @@
<div class="locale-icon">
@if ($localeImage)
<img src="{{ asset('/storage/' . $localeImage) }}" onerror="this.src = '{{ asset($localeImage) }}'" />
<img src="{{ asset('/storage/' . $localeImage) }}" onerror="this.src = '{{ asset($localeImage) }}'" alt="" />
@elseif (app()->getLocale() == 'en')
<img src="{{ asset('/themes/velocity/assets/images/flags/en.png') }}" />
<img src="{{ asset('/themes/velocity/assets/images/flags/en.png') }}" alt="" />
@endif
</div>
<select
class="btn btn-link dropdown-toggle control locale-switcher styled-select"
onchange="window.location.href = this.value"
aria-label="Locale"
@if (count(core()->getCurrentChannel()->locales) == 1)
disabled="disabled"
@endif>
@ -82,7 +83,7 @@
<div class="dropdown">
<select
class="btn btn-link dropdown-toggle control locale-switcher styled-select"
onchange="window.location.href = this.value">
onchange="window.location.href = this.value" aria-label="Locale">
@foreach (core()->getCurrentChannel()->currencies as $currency)
@if (isset($searchQuery) && $searchQuery)
<option value="?{{ $searchQuery }}&currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>

5
packages/Webkul/Velocity/src/Resources/views/shop/products/add-to-cart.blade.php
View File

@ -67,10 +67,11 @@
product-id="{{ $product->product_id }}"
reload-page="{{ $reloadPage ?? false }}"
move-to-cart="{{ $moveToCart ?? false }}"
wishlist-move-route="{{ $wishlistMoveRoute ?? false }}"
add-class-to-btn="{{ $addToCartBtnClass ?? '' }}"
is-enable={{ ! $product->isSaleable() ? 'false' : 'true' }}
show-cart-icon={{ !(isset($showCartIcon) && !$showCartIcon) }}
btn-text="{{ ($product->type == 'booking') ? __('shop::app.products.book-now') : $btnText ?? __('shop::app.products.add-to-cart') }}">
show-cart-icon={{ ! (isset($showCartIcon) && ! $showCartIcon) }}
btn-text="{{ (! isset($moveToCart) && $product->type == 'booking') ? __('shop::app.products.book-now') : $btnText ?? __('shop::app.products.add-to-cart') }}">
</add-to-cart>
@endif
</div>

2
packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php Executable file → Normal file
View File

@ -83,7 +83,7 @@
<div class="col-12 no-padding">
<div class="hero-image">
@if (!is_null($category->image))
<img class="logo" src="{{ $category->image_url }}" />
<img class="logo" src="{{ $category->image_url }}" alt="" />
@endif
</div>
</div>

31
packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
View File

@ -26,7 +26,7 @@
$galleryImages = $productImageHelper->getGalleryImages($product);
$priceHTML = view('shop::products.price', ['product' => $product])->render();
$product->__set('priceHTML', $priceHTML);
$product->__set('avgRating', $avgRatings);
$product->__set('totalReviews', $totalReviews);
@ -57,7 +57,7 @@
<img
src="{{ $productBaseImage['medium_image_url'] }}"
:onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
:onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" alt="" />
<div class="quick-view-in-list">
<product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
</div>
@ -73,6 +73,18 @@
<span class="fs16">{{ $product->name }}</span>
</a>
@if (isset($additionalAttributes) && $additionalAttributes)
@if (isset($item->additional['attributes']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
</div>
@endif
@endif
</div>
<div class="product-price">
@ -115,7 +127,7 @@
{{-- <product-quick-view-btn :quick-view-details="product"></product-quick-view-btn> --}}
<product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
</a>
@if ($product->new)
<div class="sticker new">
{{ __('shop::app.products.new') }}
@ -130,6 +142,18 @@
class="unset">
<span class="fs16">{{ $product->name }}</span>
@if (isset($additionalAttributes) && $additionalAttributes)
@if (isset($item->additional['attributes']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
</div>
@endif
@endif
</a>
</div>
@ -155,6 +179,7 @@
'product' => $product,
'btnText' => $btnText ?? null,
'moveToCart' => $moveToCart ?? null,
'wishlistMoveRoute' => $wishlistMoveRoute ?? null,
'reloadPage' => $reloadPage ?? null,
'addToCartForm' => $addToCartForm ?? false,
'addToCartBtnClass' => $addToCartBtnClass ?? '',

8
packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php
View File

@ -13,11 +13,11 @@
@endphp
<div class="rango-view-grid-container {{ $viewOption === 'grid' ? 'active' : '' }}">
<a href="{{ $toolbarHelper->getModeUrl('grid') }}" class="grid-view unset">
<a href="{{ $toolbarHelper->getModeUrl('grid') }}" class="grid-view unset" aria-label="Grid">
<span class="rango-view-grid fs24"></span>
</a>
</div>
<div class="rango-view-list-container {{ $viewOption === 'list' ? 'active' : '' }}">
<div class="rango-view-list-container {{ $viewOption === 'list' ? 'active' : '' }}" aria-label="List">
<a
href="{{ $toolbarHelper->getModeUrl('list') }}"
class="list-view unset">
@ -29,7 +29,7 @@
<div class="sorter">
<label>{{ __('shop::app.products.sort-by') }}</label>
<select class="selective-div border-normal styled-select" onchange="window.location.href = this.value">
<select class="selective-div border-normal styled-select" onchange="window.location.href = this.value" aria-label="Sort By">
@foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
<option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
{{ __('shop::app.products.' . $order) }}
@ -45,7 +45,7 @@
<div class="limiter">
<label>{{ __('shop::app.products.show') }}</label>
<select class="selective-div border-normal styled-select" onchange="window.location.href = this.value" style="width: 57px;">
<select class="selective-div border-normal styled-select" onchange="window.location.href = this.value" style="width: 57px;" aria-label="Show">
@foreach ($toolbarHelper->getAvailableLimits() as $limit)

2
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -193,7 +193,7 @@
)
@foreach (json_decode($velocityMetaData['product_view_images'], true) as $image)
@if ($image && $image !== '')
<img src="{{ url()->to('/') }}/storage/{{ $image }}" />
<img src="{{ url()->to('/') }}/storage/{{ $image }}" alt=""/>
@endif
@endforeach
@endif

2
packages/Webkul/Velocity/src/Resources/views/shop/products/view/attributes.blade.php
View File

@ -34,7 +34,7 @@
@elseif ($attribute['type'] == 'image' && $attribute['value'])
<td>
<a href="{{ route('shop.product.file.download', [$product->product_id, $attribute['id']])}}">
<img src="{{ Storage::url($attribute['value']) }}" style="height: 20px; width: 20px;"/>
<img src="{{ Storage::url($attribute['value']) }}" style="height: 20px; width: 20px;" alt=""/>
</a>
</td>
@else

2
packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php Executable file → Normal file
View File

@ -77,7 +77,7 @@
<span v-if="attribute.swatch_type == 'color'" :style="{ background: option.swatch_value }"></span>
<img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" />
<img v-if="attribute.swatch_type == 'image'" :src="option.swatch_value" alt="" />
<span v-if="attribute.swatch_type == 'text'">
@{{ option.label }}

2
packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
View File

@ -19,7 +19,7 @@
<img
v-else
class="vc-small-product-image"
src="{{ $images[0]['large_image_url'] }}" />
src="{{ $images[0]['large_image_url'] }}" alt="" />
</div>
<div class="row col-12">

2
packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php
View File

@ -6,7 +6,7 @@
<div class="col-lg-3 col-md-12">
<a class="row" href="{{ route('shop.productOrCategory.index', $product->url_key) }}">
<img src="{{ $productBaseImage['medium_image_url'] }}" class="col-12" />
<img src="{{ $productBaseImage['medium_image_url'] }}" class="col-12" alt="" />
</a>
<a class="row pt15 unset" href="{{ route('shop.productOrCategory.index', $product->url_key) }}">

0
packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php Executable file → Normal file
View File

2
packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
View File

@ -59,7 +59,7 @@
<script type="text/x-template" id="image-search-result-component-template">
<div class="image-search-result">
<div class="searched-image">
<img :src="searchedImageUrl"/>
<img :src="searchedImageUrl" alt=""/>
</div>
<div class="searched-terms">

2
storage/app/db-blade-compiler/views/.gitignore vendored
View File

@ -1,2 +0,0 @@
*
!.gitignore