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

Issue #5967 fixed

This commit is contained in:
jitendra 2022-04-05 19:24:58 +05:30
parent ad427a0ef8
commit 622079a26b
23 changed files with 136 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,6 +373,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/ben/app.php
View File

@ -376,6 +376,7 @@ return [
'share-wishlist' => 'ইচ্ছা তালিকা ভাগ করুন',
'wishlist-sharing' => 'ইচ্ছা তালিকা শেয়ারিং',
'shared-link' => 'শেয়ারড লিংক',
'copy' => 'Copy',
'visibility' => 'দৃশ্যমানতা',
'public' => 'পাবলিক',
'private' => 'ব্যক্তিগত',

1
packages/Webkul/Shop/src/Resources/lang/de/app.php
View File

@ -371,6 +371,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

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

@ -376,6 +376,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/es/app.php
View File

@ -374,6 +374,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/fa/app.php
View File

@ -370,6 +370,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/fr/app.php
View File

@ -372,6 +372,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/he/app.php
View File

@ -375,6 +375,7 @@ return [
'share-wishlist' => 'שתף משאלות',
'wishlist-sharing' => 'שיתוף רשימת המשאלות',
'shared-link' => 'קישור משותף',
'copy' => 'Copy',
'visibility' => 'רְאוּת',
'public' => 'פּוּמְבֵּי',
'private' => 'פְּרָטִי',

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

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

1
packages/Webkul/Shop/src/Resources/lang/it/app.php
View File

@ -372,6 +372,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/ja/app.php
View File

@ -352,6 +352,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -378,6 +378,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/pl/app.php
View File

@ -372,6 +372,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

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

@ -366,6 +366,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/ru/app.php
View File

@ -376,6 +376,7 @@ return [
'share-wishlist' => '«Поделиться списком желаний»',
'wishlist-sharing' => '«Обмен списком желаний»',
'shared-link' => '«Общая ссылка»',
'copy' => 'Copy',
'visibility' => '«Видимость»',
'public' => '«Общественный»',
'private' => 'Частный',

1
packages/Webkul/Shop/src/Resources/lang/sin/app.php
View File

@ -376,6 +376,7 @@ return [
'share-wishlist' => 'පැතුම් ලැයිස්තුව බෙදාගන්න',
'wishlist-sharing' => 'පැතුම් ලැයිස්තු බෙදාගැනීම',
'shared-link' => 'බෙදාගත් සබැඳිය',
'copy' => 'Copy',
'visibility' => 'දෘෂ්‍යතාව',
'public' => 'මහජන',
'private' => 'පුද්ගලික',

1
packages/Webkul/Shop/src/Resources/lang/tr/app.php
View File

@ -371,6 +371,7 @@ return [
'share-wishlist' => 'Share Wishlist',
'wishlist-sharing' => 'Wishlist Sharing',
'shared-link' => 'Shared Link',
'copy' => 'Copy',
'visibility' => 'Visibility',
'public' => 'Public',
'private' => 'Private',

1
packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php
View File

@ -375,6 +375,7 @@ return [
'share-wishlist' => '分享愿望清单',
'wishlist-sharing' => '愿望清单分享',
'shared-link' => '已共享链接',
'copy' => 'Copy',
'visibility' => '可见度',
'public' => '公开的',
'private' => '私有的',

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

@ -110,8 +110,25 @@
<label class="required">{{ __('shop::app.customer.account.wishlist.shared-link') }}</label>
<div style="margin-top: 10px; margin-bottom: 5px;">
<a href="{{ $wishlistSharedLink ?? 'javascript:void(0);' }}" target="_blank" v-if="isWishlistShared" v-text="wishlistSharedLink">
</a>
<div class="input-group" v-if="isWishlistShared">
<input
type="text"
class="control"
v-model="wishlistSharedLink"
v-on:focus="$event.target.select()"
ref="sharedLink"
/>
<div class="input-group-append">
<button
class="btn btn-primary btn-md"
type="button"
@click="copyToClipboard"
>
{{ __('shop::app.customer.account.wishlist.copy') }}
</button>
</div>
</div>
<p class="alert alert-danger" v-else>
{{ __('shop::app.customer.account.wishlist.enable-wishlist-info') }}
@ -165,6 +182,12 @@
window.location.reload();
})
},
copyToClipboard: function() {
this.$refs.sharedLink.focus();
document.execCommand('copy');
}
}
});

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=a13fbc5b58c0a7b9c6ee",
"/css/ui.css": "/css/ui.css?id=35f409e9ac92e008f443"
"/css/ui.css": "/css/ui.css?id=73b0d27c55027b8c1e81"
}

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

@ -865,6 +865,68 @@ h5 {
display: inline-block;
}
}
&.input-group {
margin-bottom: 0;
}
.input-group {
position: relative;
display: -ms-flexbox;
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
width: 100%;
.input-group-append,
.input-group-prepend {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
}
> .control {
margin: 0;
position: relative;
-webkit-box-flex: 1;
-ms-flex: 1 1 auto;
flex: 1 1 auto;
width: 1% !important;
&:not(:first-child) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
&:not(:last-child) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
}
.input-group-prepend {
margin-right: -1px;
.control,
.btn {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
}
.input-group-append {
margin-left: -1px;
.control,
.btn {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
}
}
.table {

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

@ -117,14 +117,30 @@
{{ __('shop::app.customer.account.wishlist.shared-link') }}
</label>
<div>
<a href="{{ $wishlistSharedLink ?? 'javascript:void(0);' }}" target="_blank" v-if="isWishlistShared" v-text="wishlistSharedLink">
</a>
<p class="alert alert-danger" v-else>
{{ __('shop::app.customer.account.wishlist.enable-wishlist-info') }}
</p>
<div class="input-group" v-if="isWishlistShared">
<input
type="text"
class="form-control"
v-model="wishlistSharedLink"
v-on:focus="$event.target.select()"
ref="sharedLink"
/>
<div class="input-group-append">
<button
class="btn btn-outline-secondary theme-btn"
style="padding: 6px 20px"
type="button"
@click="copyToClipboard"
>
{{ __('shop::app.customer.account.wishlist.copy') }}
</button>
</div>
</div>
<p class="alert alert-danger" v-else>
{{ __('shop::app.customer.account.wishlist.enable-wishlist-info') }}
</p>
</div>
</form>
</script>
@ -173,6 +189,12 @@
window.location.reload();
})
},
copyToClipboard: function() {
this.$refs.sharedLink.focus();
document.execCommand('copy');
}
}
});