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

Merge branch 'bagisto:master' into master

This commit is contained in:
Abdelrhman Gamal 2022-06-07 22:41:57 +02:00 committed by GitHub
parent 2aa1842262 8ef00596f7
commit 6261e0f6a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 79 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
composer.lock generated
View File

@ -1724,16 +1724,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": {
@ -1828,7 +1828,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": [
{
@ -1844,7 +1844,7 @@
"type": "tidelift"
}
],
"time": "2022-03-20T14:16:28+00:00"
"time": "2022-05-25T13:24:33+00:00"
},
{
"name": "guzzlehttp/promises",
@ -7147,16 +7147,16 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.0.0",
"version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced"
"reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
"reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
"reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
"shasum": ""
},
"require": {
@ -7194,7 +7194,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
},
"funding": [
{
@ -7210,7 +7210,7 @@
"type": "tidelift"
}
],
"time": "2021-11-01T23:48:49+00:00"
"time": "2022-01-02T09:55:41+00:00"
},
{
"name": "symfony/dom-crawler",

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

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

1
packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php
View File

@ -62,6 +62,7 @@ class CMSPageDataGrid extends DataGrid
'method' => 'GET',
'route' => 'shop.cms.page',
'index' => 'url_key',
'target' => '_blank',
'icon' => 'icon eye-icon',
]);

1
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -349,7 +349,6 @@ body {
.arrow-icon {
display: inline-block;
position: absolute;
right: 0;
}
}

2
packages/Webkul/Shop/src/Resources/lang/ar/app.php
View File

@ -374,6 +374,8 @@ return [
'wishlist-sharing' => 'تقاسم قائمة الرغبات',
'shared-link' => 'رابط مشترك',
'copy' => 'ينسخ',
'copy-link' => 'انسخ الرابط',
'copied' => 'نسخ!',
'visibility' => 'الرؤية',
'public' => 'عام',
'private' => 'نشر',

2
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

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

4
packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php
View File

@ -375,7 +375,9 @@ return [
'share-wishlist' => 'शेयर विशलिस्ट',
'wishlist-sharing' => 'विशलिस्ट शेयरिंग',
'shared-link' => 'साझा लिंक',
'copy' => 'Copy',
'copy' => 'प्रतिलिपि',
'copy-link' => 'प्रतिरूप जोड़ना',
'copied' => 'कॉपी किया गया!',
'visibility' => 'दृश्यता',
'public' => 'जनता',
'private' => 'निजी',

4
packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
View File

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

10
packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
View File

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

4
packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
View File

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

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

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

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

2
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -1430,7 +1430,7 @@ modal {
margin-bottom: 20px;
margin-top: 10px;
display: inline-block;
width: 100%;
width: 200px;
.image-item {
width: 200px;

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

File diff suppressed because one or more lines are too long

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

@ -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=b632558e8d30eba59c21f881e4e74d5e",
"/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"
}

1
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -2457,7 +2457,6 @@
position: relative;
.btn-add-to-cart {
width: 125px !important;
white-space: pre-wrap;
}

16
packages/Webkul/Velocity/src/Resources/assets/sass/components/datagrid.scss vendored
View File

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

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

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