Conflicts resolved
This commit is contained in:
Pranshu Tomar
commit
b1049ac3ea
|
|
@ -13,6 +13,7 @@ class AddressDataGrid extends DataGrid
|
|||
*/
|
||||
public $index = 'address_id';
|
||||
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
|
|
@ -168,4 +169,4 @@ class AddressDataGrid extends DataGrid
|
|||
'method' => 'DELETE',
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,9 +91,12 @@
|
|||
<div class="container">
|
||||
|
||||
<div class="header">
|
||||
<div class="image">
|
||||
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}"/>
|
||||
</div>
|
||||
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.logo'))
|
||||
<div class="image">
|
||||
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}"/>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="address">
|
||||
<p>
|
||||
<b> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }} </b>
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@
|
|||
data: function() {
|
||||
let maxPrice = '{{ core()->convertPrice($productFlatRepository->getCategoryProductMaximumPrice($category)) }}';
|
||||
|
||||
maxPrice = (parseInt(maxPrice) !== 0) ? parseInt(maxPrice) : 500;
|
||||
maxPrice = maxPrice ? ((parseInt(maxPrice) !== 0 || maxPrice) ? parseInt(maxPrice) : 500) : 500;
|
||||
|
||||
return {
|
||||
appliedFilters: [],
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,9 @@
|
|||
{
|
||||
"/js/velocity.js": "/js/velocity.js?id=402de46225161bbc3aa8",
|
||||
"/js/velocity.js": "/js/velocity.js?id=d3f7d56e990550452f19",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
|
||||
<<<<<<< HEAD
|
||||
"/css/velocity.css": "/css/velocity.css?id=d047a8c4cfcb4ce793e3"
|
||||
=======
|
||||
"/css/velocity.css": "/css/velocity.css?id=52109e4f344a8b0bce61"
|
||||
>>>>>>> e6e84dfdf9e8125b3ebf5afdd139a420ad256f35
|
||||
}
|
||||
|
|
|
|||
|
|
@ -279,7 +279,8 @@ class Helper extends Review
|
|||
|
||||
/**
|
||||
* @param \Webkul\Product\Contracts\Product $product
|
||||
* @param bool $list
|
||||
* @param bool $list
|
||||
* @param array $metaInformation
|
||||
* @return array
|
||||
*/
|
||||
public function formatProduct($product, $list = false, $metaInformation = [])
|
||||
|
|
@ -322,11 +323,9 @@ class Helper extends Review
|
|||
'product' => $product,
|
||||
'addWishlistClass' => ! (isset($list) && $list) ? '' : '',
|
||||
'btnText' => (isset($metaInformation['btnText']) && $metaInformation['btnText'])
|
||||
? $metaInformation['btnText']
|
||||
: null,
|
||||
'moveToCart' => (isset($metaInformation['moveToCart']) && $metaInformation['moveToCart'])
|
||||
? $metaInformation['moveToCart']
|
||||
: null,
|
||||
? $metaInformation['btnText'] : null,
|
||||
'moveToCart' => (isset($metaInformation['moveToCart']) && $metaInformation['moveToCart'])
|
||||
? $metaInformation['moveToCart'] : null,
|
||||
'addToCartBtnClass' => ! (isset($list) && $list) ? 'small-padding' : '',
|
||||
])->render(),
|
||||
];
|
||||
|
|
|
|||
|
|
@ -244,12 +244,13 @@ class ShopController extends Controller
|
|||
array_push($formattedProducts, $this->velocityHelper->formatProduct($product));
|
||||
}
|
||||
|
||||
$products = $products->toArray();
|
||||
$products['data'] = $formattedProducts;
|
||||
$productsArray = $products->toArray();
|
||||
$productsArray['data'] = $formattedProducts;
|
||||
}
|
||||
|
||||
|
||||
return response()->json($response ?? [
|
||||
'products' => $products
|
||||
'products' => $productsArray,
|
||||
'paginationHTML' => $products->appends(request()->input())->links()->toHtml(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
'isEnable',
|
||||
'csrfToken',
|
||||
'productId',
|
||||
'reloadPage',
|
||||
'moveToCart',
|
||||
'showCartIcon',
|
||||
'addClassToBtn',
|
||||
|
|
@ -59,6 +60,10 @@
|
|||
}
|
||||
|
||||
window.showAlert(`alert-success`, this.__('shop.general.alert.success'), response.data.message);
|
||||
|
||||
if (this.reloadPage == "1") {
|
||||
window.location.reload();
|
||||
}
|
||||
} else {
|
||||
window.showAlert(`alert-${response.data.status}`, response.data.label ? response.data.label : this.__('shop.general.alert.error'), response.data.message);
|
||||
|
||||
|
|
|
|||
|
|
@ -2219,6 +2219,37 @@
|
|||
.pagination {
|
||||
.page-item {
|
||||
padding: 0 10px;
|
||||
|
||||
&.active {
|
||||
font-weight: 600;
|
||||
color: $theme-color !important;
|
||||
border-bottom: 2px solid $theme-color;
|
||||
}
|
||||
|
||||
&.next,
|
||||
&.previous {
|
||||
.angle-right-icon,
|
||||
.angle-left-icon {
|
||||
@extend .rango-default;
|
||||
|
||||
margin: 0;
|
||||
font-size: 24px;
|
||||
background: unset;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
&.next {
|
||||
.angle-right-icon::before {
|
||||
content: "\E908";
|
||||
}
|
||||
}
|
||||
|
||||
&.previous {
|
||||
.angle-left-icon::before {
|
||||
content: "\E907";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
a {
|
||||
|
|
@ -2280,6 +2311,7 @@
|
|||
.col,
|
||||
.col-2 {
|
||||
max-width: 20%;
|
||||
min-width: 17%;
|
||||
padding-left: 0;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -255,6 +255,8 @@ return [
|
|||
'female' => 'أنثى',
|
||||
],
|
||||
'general' => [
|
||||
'no' => 'No',
|
||||
'yes' => 'Yes',
|
||||
'view' => 'رأي',
|
||||
'filter' => 'منقي',
|
||||
'update' => 'تحديث',
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
'admin' => [
|
||||
'system' => [
|
||||
'admin' => [
|
||||
'system' => [
|
||||
'velocity' => [
|
||||
'general' => 'General',
|
||||
'category' => 'Category',
|
||||
|
|
@ -39,14 +39,14 @@ return [
|
|||
'num-sub-category' => 'Number Of Sub Category',
|
||||
]
|
||||
],
|
||||
'layouts' => [
|
||||
'layouts' => [
|
||||
'velocity' => 'Velocity',
|
||||
'cms-pages' => 'CMS Pages',
|
||||
'meta-data' => 'Meta Data',
|
||||
'category-menu' => 'Category Menu',
|
||||
'header-content' => 'Header Content',
|
||||
],
|
||||
'contents' => [
|
||||
'contents' => [
|
||||
'self' => 'Self',
|
||||
'active' => 'Active',
|
||||
'new-tab' => 'New Tab',
|
||||
|
|
@ -112,7 +112,7 @@ return [
|
|||
'general' => 'General',
|
||||
'add-image-btn-title' => 'Add Image'
|
||||
],
|
||||
'category' => [
|
||||
'category' => [
|
||||
'save-btn-title' => 'Save Menu',
|
||||
'title' => 'Category Menu List',
|
||||
'add-title' => 'Add Menu Content',
|
||||
|
|
@ -136,151 +136,153 @@ return [
|
|||
'tooltip-content' => 'Tooltip Content',
|
||||
'mass-delete-success' => 'Selected categories menu deleted successfully.',
|
||||
],
|
||||
'general' => [
|
||||
'general' => [
|
||||
'locale_logo' => 'Locale Logo',
|
||||
],
|
||||
],
|
||||
|
||||
'home' => [
|
||||
'view-all' => 'View All',
|
||||
'add-to-cart' => 'Add To Cart',
|
||||
'hot-categories' => 'Hot Categories',
|
||||
'payment-methods' => 'Payment Methods',
|
||||
'customer-reviews' => 'Customer Reviews',
|
||||
'shipping-methods' => 'Shipping Methods',
|
||||
'home' => [
|
||||
'view-all' => 'View All',
|
||||
'add-to-cart' => 'Add To Cart',
|
||||
'hot-categories' => 'Hot Categories',
|
||||
'payment-methods' => 'Payment Methods',
|
||||
'customer-reviews' => 'Customer Reviews',
|
||||
'shipping-methods' => 'Shipping Methods',
|
||||
'popular-categories' => 'Popular Categories',
|
||||
],
|
||||
|
||||
'header' => [
|
||||
'cart' => 'Cart',
|
||||
'cart' => 'Cart',
|
||||
'guest' => 'Guest',
|
||||
'logout' => 'Logout',
|
||||
'title' => 'Account',
|
||||
'account' => 'Account',
|
||||
'profile' => 'Profile',
|
||||
'wishlist' => 'Wishlist',
|
||||
'all-categories' => 'All Categories',
|
||||
'search-text' => 'Search products here',
|
||||
'welcome-message' => 'Welcome, :customer_name',
|
||||
'dropdown-text' => 'Manage Cart, Orders & Wishlist',
|
||||
'header' => [
|
||||
'cart' => 'Cart',
|
||||
'cart' => 'Cart',
|
||||
'guest' => 'Guest',
|
||||
'logout' => 'Logout',
|
||||
'title' => 'Account',
|
||||
'account' => 'Account',
|
||||
'profile' => 'Profile',
|
||||
'wishlist' => 'Wishlist',
|
||||
'all-categories' => 'All Categories',
|
||||
'search-text' => 'Search products here',
|
||||
'welcome-message' => 'Welcome, :customer_name',
|
||||
'dropdown-text' => 'Manage Cart, Orders & Wishlist',
|
||||
],
|
||||
|
||||
'menu-navbar' => [
|
||||
'text-more' => 'More',
|
||||
'menu-navbar' => [
|
||||
'text-more' => 'More',
|
||||
'text-category' => 'Shop by Category',
|
||||
],
|
||||
|
||||
'minicart' => [
|
||||
'cart' => 'Cart',
|
||||
'minicart' => [
|
||||
'cart' => 'Cart',
|
||||
'view-cart' => 'View Cart',
|
||||
],
|
||||
|
||||
'checkout' => [
|
||||
'qty' => 'Qty',
|
||||
'checkout' => 'Checkout',
|
||||
'cart' => [
|
||||
'view-cart' => 'View Cart',
|
||||
'cart-summary' => 'Cart Summary',
|
||||
'checkout' => [
|
||||
'qty' => 'Qty',
|
||||
'checkout' => 'Checkout',
|
||||
'cart' => [
|
||||
'view-cart' => 'View Cart',
|
||||
'cart-summary' => 'Cart Summary',
|
||||
],
|
||||
'qty' => 'Qty',
|
||||
'items' => 'Items',
|
||||
'subtotal' => 'Subtotal',
|
||||
'qty' => 'Qty',
|
||||
'items' => 'Items',
|
||||
'subtotal' => 'Subtotal',
|
||||
'sub-total' => 'Sub Total',
|
||||
'proceed' => 'Proceed to checkout',
|
||||
'proceed' => 'Proceed to checkout',
|
||||
],
|
||||
|
||||
'customer' => [
|
||||
'compare' => [
|
||||
'text' => 'Compare',
|
||||
'customer' => [
|
||||
'compare' => [
|
||||
'text' => 'Compare',
|
||||
'compare_similar_items' => 'Compare Similar Items',
|
||||
'added' => 'Item successfully added to compare list',
|
||||
'already_added' => 'Item already added to compare list',
|
||||
'removed' => 'Item successfully removed from compare list',
|
||||
'empty-text' => "You don't have any items in your compare list",
|
||||
'added' => 'Item successfully added to compare list',
|
||||
'already_added' => 'Item already added to compare list',
|
||||
'removed' => 'Item successfully removed from compare list',
|
||||
'empty-text' => "You don't have any items in your compare list",
|
||||
],
|
||||
'login-form' => [
|
||||
'sign-up' => 'Sign up',
|
||||
'new-customer' => 'New Customer',
|
||||
'customer-login' => 'Customer Login',
|
||||
'registered-user' => 'Registered User',
|
||||
'your-email-address' => 'Your email address',
|
||||
'form-login-text' => 'If you have an account, sign in with your email address.',
|
||||
'login-form' => [
|
||||
'sign-up' => 'Sign up',
|
||||
'new-customer' => 'New Customer',
|
||||
'customer-login' => 'Customer Login',
|
||||
'registered-user' => 'Registered User',
|
||||
'your-email-address' => 'Your email address',
|
||||
'form-login-text' => 'If you have an account, sign in with your email address.',
|
||||
],
|
||||
'signup-form' => [
|
||||
'login' => 'Login',
|
||||
'become-user' => 'Become User',
|
||||
'signup-form' => [
|
||||
'login' => 'Login',
|
||||
'become-user' => 'Become User',
|
||||
'user-registration' => 'User Registration',
|
||||
'form-sginup-text' => 'If you are new to our store, we glab to have you as member.',
|
||||
'form-sginup-text' => 'If you are new to our store, we glab to have you as member.',
|
||||
],
|
||||
'forget-password' => [
|
||||
'login' => 'Login',
|
||||
'forgot-password' => 'Forgot Password',
|
||||
'recover-password' => 'Recover Password',
|
||||
'forget-password' => [
|
||||
'login' => 'Login',
|
||||
'forgot-password' => 'Forgot Password',
|
||||
'recover-password' => 'Recover Password',
|
||||
'recover-password-text' => 'If you forgot your password, recover it by entering your email address.',
|
||||
]
|
||||
],
|
||||
|
||||
'error' => [
|
||||
'go-to-home' => 'Go to home',
|
||||
'page-lost-short' => 'Page lost content',
|
||||
'something_went_wrong' => 'something went wrong',
|
||||
'error' => [
|
||||
'go-to-home' => 'Go to home',
|
||||
'page-lost-short' => 'Page lost content',
|
||||
'something_went_wrong' => 'something went wrong',
|
||||
'page-lost-description' => "The page you're looking for isn't available. Try to search again or use the Go Back button below.",
|
||||
],
|
||||
|
||||
'products' => [
|
||||
'text' => 'Products',
|
||||
'details' => 'Details',
|
||||
'reviews-title' => 'Reviews',
|
||||
'reviewed' => 'Reviewed',
|
||||
'review-by' => 'Review by',
|
||||
'quick-view' => 'Quick View',
|
||||
'not-available' => 'Not Available',
|
||||
'submit-review' => 'Submit Review',
|
||||
'ratings' => ':totalRatings Ratings',
|
||||
'reviews-count' => ':totalReviews Reviews',
|
||||
'customer-rating' => 'Customer Rating',
|
||||
'more-infomation' => 'More Information',
|
||||
'view-all-reviews' => 'View All Reviews',
|
||||
'products' => [
|
||||
'text' => 'Products',
|
||||
'details' => 'Details',
|
||||
'reviews-title' => 'Reviews',
|
||||
'reviewed' => 'Reviewed',
|
||||
'review-by' => 'Review by',
|
||||
'quick-view' => 'Quick View',
|
||||
'not-available' => 'Not Available',
|
||||
'submit-review' => 'Submit Review',
|
||||
'ratings' => ':totalRatings Ratings',
|
||||
'reviews-count' => ':totalReviews Reviews',
|
||||
'customer-rating' => 'Customer Rating',
|
||||
'more-infomation' => 'More Information',
|
||||
'view-all-reviews' => 'View All Reviews',
|
||||
'write-your-review' => 'Write Your Review',
|
||||
'short-description' => 'Short Descriptions',
|
||||
'recently-viewed' => 'Recently Viewed Products',
|
||||
'be-first-review' => 'Be the first to write a review',
|
||||
'recently-viewed' => 'Recently Viewed Products',
|
||||
'be-first-review' => 'Be the first to write a review',
|
||||
],
|
||||
|
||||
'shop' => [
|
||||
'gender' => [
|
||||
'male' => 'Male',
|
||||
'other' => 'Other',
|
||||
'shop' => [
|
||||
'gender' => [
|
||||
'male' => 'Male',
|
||||
'other' => 'Other',
|
||||
'female' => 'Female',
|
||||
],
|
||||
'general' => [
|
||||
'view' => 'View',
|
||||
'filter' => 'Filter',
|
||||
'orders' => 'Orders',
|
||||
'update' => 'Update',
|
||||
'reviews' => 'Reviews',
|
||||
'addresses' => 'Addresses',
|
||||
'top-brands' => 'Top Brands',
|
||||
'new-password' => 'New password',
|
||||
'downloadables' => 'Downloadable Products',
|
||||
'confirm-new-password' => 'Confirm new password',
|
||||
'general' => [
|
||||
'no' => 'No',
|
||||
'yes' => 'Yes',
|
||||
'view' => 'View',
|
||||
'filter' => 'Filter',
|
||||
'orders' => 'Orders',
|
||||
'update' => 'Update',
|
||||
'reviews' => 'Reviews',
|
||||
'addresses' => 'Addresses',
|
||||
'top-brands' => 'Top Brands',
|
||||
'new-password' => 'New password',
|
||||
'downloadables' => 'Downloadable Products',
|
||||
'confirm-new-password' => 'Confirm new password',
|
||||
'enter-current-password' => 'Enter your current password',
|
||||
|
||||
'alert' => [
|
||||
'info' => 'Info',
|
||||
'error' => 'Error',
|
||||
'success' => 'Success',
|
||||
'warning' => 'Warning',
|
||||
'info' => 'Info',
|
||||
'error' => 'Error',
|
||||
'success' => 'Success',
|
||||
'warning' => 'Warning',
|
||||
],
|
||||
],
|
||||
'wishlist' => [
|
||||
'add-wishlist-text' => 'Add product to wishlist',
|
||||
'remove-wishlist-text' => 'Remove product from wishlist'
|
||||
'wishlist' => [
|
||||
'add-wishlist-text' => 'Add product to wishlist',
|
||||
'remove-wishlist-text' => 'Remove product from wishlist'
|
||||
]
|
||||
],
|
||||
|
||||
'responsive' => [
|
||||
'responsive' => [
|
||||
'header' => [
|
||||
'greeting' => 'Welcome, :customer !',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -255,6 +255,8 @@ return [
|
|||
'female' => 'زن',
|
||||
],
|
||||
'general' => [
|
||||
'no' => 'No',
|
||||
'yes' => 'Yes',
|
||||
'view' => 'چشم انداز',
|
||||
'filter' => 'فیلتر',
|
||||
'orders' => 'سفارشات',
|
||||
|
|
|
|||
|
|
@ -255,6 +255,8 @@ return [
|
|||
'female' => 'Vrouw',
|
||||
],
|
||||
'general' => [
|
||||
'no' => 'No',
|
||||
'yes' => 'Yes',
|
||||
'view' => 'View',
|
||||
'filter' => 'Filter',
|
||||
'orders' => 'Orders',
|
||||
|
|
|
|||
|
|
@ -255,6 +255,8 @@ return [
|
|||
'other' => 'De outros',
|
||||
],
|
||||
'general' => [
|
||||
'no' => 'No',
|
||||
'yes' => 'Yes',
|
||||
'view' => 'Visão',
|
||||
'filter' => 'Filtro',
|
||||
'update' => 'Atualizar',
|
||||
|
|
|
|||
|
|
@ -70,9 +70,10 @@
|
|||
href="{{ route('shop.productOrCategory.index', $product->url_key) }}">
|
||||
|
||||
<img
|
||||
src="{{ $productBaseImage['medium_image_url'] }}"
|
||||
class="card-img-top"
|
||||
alt="{{ $product->name }}">
|
||||
alt="{{ $product->name }}"
|
||||
src="{{ $productBaseImage['large_image_url'] }}"
|
||||
:onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`">
|
||||
</a>
|
||||
|
||||
<div class="product-details-content col-7 pr0">
|
||||
|
|
|
|||
|
|
@ -33,12 +33,14 @@
|
|||
@endphp
|
||||
|
||||
@include ('shop::products.list.card', [
|
||||
'checkmode' => true,
|
||||
'itemId' => $item->id,
|
||||
'addToCartForm' => true,
|
||||
'removeWishlist' => true,
|
||||
'product' => $item->product,
|
||||
'btnText' => $moveToCartText,
|
||||
'checkmode' => true,
|
||||
'moveToCart' => true,
|
||||
'addToCartForm' => true,
|
||||
'removeWishlist' => true,
|
||||
'reloadPage' => true,
|
||||
'itemId' => $item->id,
|
||||
'product' => $item->product,
|
||||
'btnText' => $moveToCartText,
|
||||
'addToCartBtnClass' => 'small-padding',
|
||||
])
|
||||
@endforeach
|
||||
|
|
|
|||
|
|
@ -54,7 +54,10 @@
|
|||
|
||||
@case('image')
|
||||
<a :href="`${$root.baseUrl}/${product.url_key}`" class="unset">
|
||||
<img :src="product['{{ $attribute['code'] }}']" class="image-wrapper"></span>
|
||||
<img
|
||||
class="image-wrapper"
|
||||
:src="product['{{ $attribute['code'] }}']"
|
||||
:onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
|
||||
</a>
|
||||
@break
|
||||
|
||||
|
|
@ -88,7 +91,19 @@
|
|||
@break
|
||||
|
||||
@default
|
||||
<span v-html="product['{{ $attribute['code'] }}']" class="fs16"></span>
|
||||
@switch ($attribute['type'])
|
||||
@case('boolean')
|
||||
<span
|
||||
v-text="product.product['{{ $attribute['code'] }}']
|
||||
? '{{ __('velocity::app.shop.general.yes') }}'
|
||||
: '{{ __('velocity::app.shop.general.no') }}'"
|
||||
></span>
|
||||
@break;
|
||||
@default
|
||||
<span v-html="product.product['{{ $attribute['code'] }}']" class="fs16"></span>
|
||||
@break;
|
||||
@endswitch
|
||||
|
||||
@break
|
||||
|
||||
@endswitch
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
csrf-token='{{ csrf_token() }}'
|
||||
product-flat-id="{{ $product->id }}"
|
||||
product-id="{{ $product->product_id }}"
|
||||
reload-page="{{ $reloadPage ?? false }}"
|
||||
move-to-cart="{{ $moveToCart ?? false }}"
|
||||
add-class-to-btn="{{ $addToCartBtnClass ?? '' }}"
|
||||
is-enable={{ ! $product->isSaleable() ? 'false' : 'true' }}
|
||||
|
|
|
|||
|
|
@ -57,12 +57,14 @@
|
|||
<div class="pl0 col-12">
|
||||
<h1 class="fw6 mb10">{{ $category->name }}</h1>
|
||||
|
||||
@if ($isDisplayMode && $products->count())
|
||||
@if ($category->description)
|
||||
<div class="category-description">
|
||||
{!! $category->description !!}
|
||||
</div>
|
||||
@endif
|
||||
@if ($isDisplayMode)
|
||||
<template v-if="products.length > 0">
|
||||
@if ($category->description)
|
||||
<div class="category-description">
|
||||
{!! $category->description !!}
|
||||
</div>
|
||||
@endif
|
||||
</template>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
|
|
@ -137,6 +139,7 @@
|
|||
return {
|
||||
'products': [],
|
||||
'isLoading': true,
|
||||
'paginationHTML': '',
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -150,6 +153,7 @@
|
|||
.then(response => {
|
||||
this.isLoading = false;
|
||||
this.products = response.data.products.data;
|
||||
this.paginationHTML = response.data.paginationHTML;
|
||||
})
|
||||
.catch(error => {
|
||||
this.isLoading = false;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@
|
|||
title="{{ $product->name }}"
|
||||
href="{{ route('shop.productOrCategory.index', $product->url_key) }}">
|
||||
|
||||
<img src="{{ $productBaseImage['medium_image_url'] }}" />
|
||||
<img
|
||||
src="{{ $productBaseImage['medium_image_url'] }}"
|
||||
:onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
|
@ -83,10 +85,11 @@
|
|||
<img
|
||||
loading="lazy"
|
||||
class="card-img-top"
|
||||
src="{{ $productBaseImage['medium_image_url'] }}"
|
||||
alt="{{ $product->name }}">
|
||||
alt="{{ $product->name }}"
|
||||
src="{{ $productBaseImage['large_image_url'] }}"
|
||||
:onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
|
||||
|
||||
{{-- <quick-view-btn details="{{ $product }}"></quick-view-btn> --}}
|
||||
{{-- <product-quick-view-btn :quick-view-details="product"></product-quick-view-btn> --}}
|
||||
</a>
|
||||
|
||||
<div class="card-body">
|
||||
|
|
@ -122,6 +125,8 @@
|
|||
'showCompare' => true,
|
||||
'product' => $product,
|
||||
'btnText' => $btnText ?? null,
|
||||
'moveToCart' => $moveToCart ?? null,
|
||||
'reloadPage' => $reloadPage ?? null,
|
||||
'addToCartForm' => $addToCartForm ?? false,
|
||||
'addToCartBtnClass' => $addToCartBtnClass ?? '',
|
||||
])
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@
|
|||
data: function() {
|
||||
let maxPrice = '{{ core()->convertPrice($productFlatRepository->getCategoryProductMaximumPrice($category)) }}';
|
||||
|
||||
maxPrice = (parseInt(maxPrice) !== 0) ? parseInt(maxPrice) : 500;
|
||||
maxPrice = maxPrice ? ((parseInt(maxPrice) !== 0 || maxPrice) ? parseInt(maxPrice) : 500) : 500;
|
||||
|
||||
return {
|
||||
active: false,
|
||||
|
|
|
|||
Loading…
Reference in New Issue