Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
This commit is contained in:
commit
2e4417ec06
|
|
@ -2360,16 +2360,16 @@
|
|||
},
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
"version": "7.4.2",
|
||||
"version": "7.4.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/guzzle.git",
|
||||
"reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
|
||||
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
|
||||
"reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
|
||||
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2464,7 +2464,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/guzzle/issues",
|
||||
"source": "https://github.com/guzzle/guzzle/tree/7.4.2"
|
||||
"source": "https://github.com/guzzle/guzzle/tree/7.4.3"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2480,7 +2480,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-03-20T14:16:28+00:00"
|
||||
"time": "2022-05-25T13:24:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/promises",
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/admin.js": "/js/admin.js?id=551bdd2fab3e31a7d5b1",
|
||||
"/css/admin.css": "/css/admin.css?id=0a408f23127642584bbc"
|
||||
"/js/admin.js": "/js/admin.js?id=fecd2e4463e43c5595a5",
|
||||
"/css/admin.css": "/css/admin.css?id=e4ebf1879c19e72942f5"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ class CMSPageDataGrid extends DataGrid
|
|||
'method' => 'GET',
|
||||
'route' => 'shop.cms.page',
|
||||
'index' => 'url_key',
|
||||
'target' => '_blank',
|
||||
'icon' => 'icon eye-icon',
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -349,7 +349,6 @@ body {
|
|||
.arrow-icon {
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -76,14 +76,7 @@ class ProductFlatRepository extends Repository
|
|||
{
|
||||
$qb = $this->categoryProductQuerybuilder($categoryId);
|
||||
|
||||
$productFlatIds = $qb->pluck('id')->toArray();
|
||||
$productIds = $qb->pluck('product_flat.product_id')->toArray();
|
||||
|
||||
$childProductIds = $this->model->distinct()
|
||||
->whereIn('parent_id', $productFlatIds)
|
||||
->pluck('product_id')->toArray();
|
||||
|
||||
$productIds = array_merge($productIds, $childProductIds);
|
||||
$childQuery = $this->model->distinct()->whereIn('parent_id', $qb->distinct()->select(['id']));
|
||||
|
||||
$attributeValues = $this->model
|
||||
->distinct()
|
||||
|
|
@ -92,7 +85,10 @@ class ProductFlatRepository extends Repository
|
|||
->leftJoin('product_super_attributes as ps', 'product_flat.product_id', 'ps.product_id')
|
||||
->select('pa.integer_value', 'pa.text_value', 'pa.attribute_id', 'ps.attribute_id as attributeId')
|
||||
->where('is_filterable', 1)
|
||||
->WhereIn('pa.product_id', $productIds)
|
||||
->where(function ($query) use ($qb, $childQuery) {
|
||||
$query->whereIn('pa.product_id', $qb->distinct()->select(['product_flat.product_id']));
|
||||
$query->orWhereIn('pa.product_id', $childQuery->select(['product_flat.product_id']));
|
||||
})
|
||||
->get();
|
||||
|
||||
$attributeInfo['attributeOptions'] = $attributeInfo['attributes'] = [];
|
||||
|
|
|
|||
|
|
@ -374,6 +374,8 @@ return [
|
|||
'wishlist-sharing' => 'تقاسم قائمة الرغبات',
|
||||
'shared-link' => 'رابط مشترك',
|
||||
'copy' => 'ينسخ',
|
||||
'copy-link' => 'انسخ الرابط',
|
||||
'copied' => 'نسخ!',
|
||||
'visibility' => 'الرؤية',
|
||||
'public' => 'عام',
|
||||
'private' => 'نشر',
|
||||
|
|
|
|||
|
|
@ -377,6 +377,8 @@ return [
|
|||
'wishlist-sharing' => 'Wishlist Sharing',
|
||||
'shared-link' => 'Shared Link',
|
||||
'copy' => 'Copy',
|
||||
'copy-link' => 'Copy Link',
|
||||
'copied' => 'Copied!',
|
||||
'visibility' => 'Visibility',
|
||||
'public' => 'Public',
|
||||
'private' => 'Private',
|
||||
|
|
|
|||
|
|
@ -375,7 +375,9 @@ return [
|
|||
'share-wishlist' => 'शेयर विशलिस्ट',
|
||||
'wishlist-sharing' => 'विशलिस्ट शेयरिंग',
|
||||
'shared-link' => 'साझा लिंक',
|
||||
'copy' => 'Copy',
|
||||
'copy' => 'प्रतिलिपि',
|
||||
'copy-link' => 'प्रतिरूप जोड़ना',
|
||||
'copied' => 'कॉपी किया गया!',
|
||||
'visibility' => 'दृश्यता',
|
||||
'public' => 'जनता',
|
||||
'private' => 'निजी',
|
||||
|
|
|
|||
|
|
@ -367,7 +367,9 @@ return [
|
|||
'wishlist-sharing' => 'Wishlist Sharing',
|
||||
'shared-link' => 'Shared Link',
|
||||
'copy' => 'Copy',
|
||||
'visibility' => 'Visibility',
|
||||
'copy-link' => 'Link de cópia',
|
||||
'copied' => 'Copiado!',
|
||||
'visibility' => 'Visibilidade',
|
||||
'public' => 'Public',
|
||||
'private' => 'Private',
|
||||
'enable' => 'Enable',
|
||||
|
|
|
|||
|
|
@ -63,12 +63,12 @@
|
|||
</div>
|
||||
|
||||
<div class="operations">
|
||||
<form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
|
||||
<form id="deleteReviewForm{{ $review->id }}" action="{{ route('customer.review.delete', $review->id) }}" method="post">
|
||||
@method('delete')
|
||||
@csrf
|
||||
</form>
|
||||
|
||||
<a class="mb-50" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
|
||||
<a class="mb-50" href="javascript:void(0);" onclick="deleteReview('{{ $review->id }}')">
|
||||
<span class="icon trash-icon"></span>
|
||||
</a>
|
||||
</div>
|
||||
|
|
@ -90,3 +90,15 @@
|
|||
{!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@push('scripts')
|
||||
<script>
|
||||
function deleteReview(reviewId) {
|
||||
if (! confirm('{{ __("shop::app.customer.account.review.delete.confirmation-message") }}')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$(`#deleteReviewForm${reviewId}`).submit();
|
||||
}
|
||||
</script>
|
||||
@endpush
|
||||
|
|
|
|||
|
|
@ -123,6 +123,8 @@
|
|||
<button
|
||||
class="btn btn-primary btn-md"
|
||||
type="button"
|
||||
id="copy-btn"
|
||||
title="{{ __('shop::app.customer.account.wishlist.copy-link') }}"
|
||||
@click="copyToClipboard"
|
||||
>
|
||||
{{ __('shop::app.customer.account.wishlist.copy') }}
|
||||
|
|
@ -188,6 +190,7 @@
|
|||
this.$refs.sharedLink.focus();
|
||||
|
||||
document.execCommand('copy');
|
||||
showCopyMessage();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -203,5 +206,12 @@
|
|||
|
||||
return;
|
||||
}
|
||||
|
||||
function showCopyMessage()
|
||||
{
|
||||
$('#copy-btn').text("{{ __('shop::app.customer.account.wishlist.copied') }}");
|
||||
$('#copy-btn').css({backgroundColor: '#146e24'});
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
@endpush
|
||||
|
|
@ -43,14 +43,14 @@
|
|||
@foreach ($comparableAttributes as $attribute)
|
||||
<tr>
|
||||
<td>
|
||||
<span class="fs16">{{ $attribute['admin_name'] }}</span>
|
||||
<h4 class="fs16">{{ $attribute['admin_name'] }}</h4>
|
||||
</td>
|
||||
|
||||
<td :key="`title-${index}`" v-for="(product, index) in products">
|
||||
@switch ($attribute['code'])
|
||||
@case('name')
|
||||
<a :href="`${baseUrl}/${product.url_key}`" class="unset remove-decoration active-hover">
|
||||
<h3 class="fw6 fs18 mt-0" v-text="product['{{ $attribute['code'] }}']"></h3>
|
||||
<h5 class="fw6 fs18 mt-0" v-text="product['{{ $attribute['code'] }}']"></h5>
|
||||
</a>
|
||||
@break
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/ui.js": "/js/ui.js?id=28450da875b7d84b30dd",
|
||||
"/css/ui.css": "/css/ui.css?id=dbf1b2df5e3052f61d06"
|
||||
"/css/ui.css": "/css/ui.css?id=1ed0d19988916084ff87"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1430,7 +1430,7 @@ modal {
|
|||
margin-bottom: 20px;
|
||||
margin-top: 10px;
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
width: 200px;
|
||||
|
||||
.image-item {
|
||||
width: 200px;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8f",
|
||||
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151",
|
||||
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba",
|
||||
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290",
|
||||
"/js/components.js": "/js/components.js?id=13ebf112e40292178d23",
|
||||
"/css/velocity.css": "/css/velocity.css?id=dc79a6ba53b2f91384ce",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3f",
|
||||
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a5837742276",
|
||||
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e2",
|
||||
"/images/icon-crossed.svg": "/images/icon-crossed.svg?id=c72c3c1ef790bd4fd993",
|
||||
"/images/icon-eye.svg": "/images/icon-eye.svg?id=9345f20b862e21aa30c6",
|
||||
"/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b2"
|
||||
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
|
||||
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
|
||||
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba57f77b9a4344",
|
||||
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290bcca8fab930e",
|
||||
"/js/components.js": "/js/components.js?id=13ebf112e40292178d2386143e9d75cd",
|
||||
"/css/velocity.css": "/css/velocity.css?id=ec34d72f944454aab702353cf01585f7",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
|
||||
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
|
||||
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
|
||||
"/images/icon-crossed.svg": "/images/icon-crossed.svg?id=c72c3c1ef790bd4fd99376bd4ba7bd5b",
|
||||
"/images/icon-eye.svg": "/images/icon-eye.svg?id=9345f20b862e21aa30c675df49d56fd5",
|
||||
"/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b24952561263f1"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -730,7 +730,6 @@
|
|||
.product-image-container {
|
||||
padding: 0;
|
||||
max-width: 110px;
|
||||
max-height: 110px;
|
||||
}
|
||||
|
||||
.wishlist-icon {
|
||||
|
|
@ -2457,7 +2456,6 @@
|
|||
position: relative;
|
||||
|
||||
.btn-add-to-cart {
|
||||
width: 125px !important;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@
|
|||
border-radius: 3px;
|
||||
height: 36px;
|
||||
max-width: 300px;
|
||||
position: relative;
|
||||
|
||||
.control {
|
||||
font-size: 15px;
|
||||
|
|
@ -210,11 +211,22 @@
|
|||
height: 36px;
|
||||
width: 36px;
|
||||
padding: 5px;
|
||||
float: right;
|
||||
display: none;
|
||||
right: 0px;
|
||||
top: 0px;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
.search-icon {
|
||||
background-image: url(../images/icon-search.svg);
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
.icon {
|
||||
display: inline-block;
|
||||
background-size: cover;
|
||||
}
|
||||
|
||||
.grid-dropdown-header {
|
||||
display: inline-flex;
|
||||
justify-content: space-between;
|
||||
|
|
|
|||
|
|
@ -58,13 +58,13 @@
|
|||
</div>
|
||||
|
||||
<div>
|
||||
<form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
|
||||
<form id="deleteReviewForm{{ $review->id }}" action="{{ route('customer.review.delete', $review->id) }}" method="post">
|
||||
@method('delete')
|
||||
|
||||
@csrf
|
||||
</form>
|
||||
|
||||
<a class="unset" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
|
||||
<a class="unset" href="javascript:void(0);" onclick="deleteReview('{{ $review->id }}')">
|
||||
<span class="rango-delete fs24"></span>
|
||||
|
||||
<span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
|
||||
|
|
@ -119,5 +119,13 @@
|
|||
}
|
||||
});
|
||||
})();
|
||||
|
||||
function deleteReview(reviewId) {
|
||||
if (! confirm('{{ __("shop::app.customer.account.review.delete.confirmation-message") }}')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$(`#deleteReviewForm${reviewId}`).submit();
|
||||
}
|
||||
</script>
|
||||
@endpush
|
||||
|
|
|
|||
|
|
@ -130,12 +130,14 @@
|
|||
<button
|
||||
class="btn btn-outline-secondary theme-btn"
|
||||
style="padding: 6px 20px"
|
||||
id="copy-btn"
|
||||
title="{{ __('shop::app.customer.account.wishlist.copy-link') }}"
|
||||
type="button"
|
||||
@click="copyToClipboard"
|
||||
>
|
||||
{{ __('shop::app.customer.account.wishlist.copy') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="alert alert-danger" v-else>
|
||||
|
|
@ -193,8 +195,8 @@
|
|||
|
||||
copyToClipboard: function() {
|
||||
this.$refs.sharedLink.focus();
|
||||
|
||||
document.execCommand('copy');
|
||||
showCopyMessage();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -210,5 +212,11 @@
|
|||
|
||||
return;
|
||||
}
|
||||
|
||||
function showCopyMessage()
|
||||
{
|
||||
$('#copy-btn').text("{{ __('shop::app.customer.account.wishlist.copied') }}");
|
||||
$('#copy-btn').css({backgroundColor: '#146e24'});
|
||||
}
|
||||
</script>
|
||||
@endpush
|
||||
Loading…
Reference in New Issue