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

Merge pull request #6618 from papnoisanjeev/customer-profile-image-show-when-login 

Showing profile image when customer login.
This commit is contained in:
Jitendra Singh 2022-08-02 18:52:56 +05:30 committed by GitHub
parent 8955477d6e e469eda82f
commit b2c357f103
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
View File

@ -79,6 +79,13 @@ class CustomerController extends Controller
unset($data['date_of_birth']);
}
if (
core()->getCurrentChannel()->theme === 'default'
&& ! isset($data['image'])
) {
$data['image']['image_0'] = '';
}
$data['subscribed_to_news_letter'] = isset($data['subscribed_to_news_letter']) ? 1 : 0;
if (isset($data['oldpassword'])) {

2
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -99,7 +99,7 @@
<li>
<span class="dropdown-toggle">
<i class="icon account-icon"></i>
<span class="name">{{ __('shop::app.header.account') }}</span>
<i class="icon arrow-down-icon"></i>

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css 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

@ -4,7 +4,7 @@
"/js/velocity.js": "/js/velocity.js?id=467af54e0d8f4cabef0750308394df2b",
"/js/manifest.js": "/js/manifest.js?id=4113cf6789cdd4f2768f508bc32cad2d",
"/js/components.js": "/js/components.js?id=e41c3e8d43f6cb0d9ba4a2191c948b3b",
"/css/velocity.css": "/css/velocity.css?id=777db319d7c4a932a4d423857f25e346",
"/css/velocity.css": "/css/velocity.css?id=8eae190fe7c375c7e85eec24b6d0d592",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
"/images/Icon-Arrow-Right.svg": "/images/Icon-Arrow-Right.svg?id=e30f624f1a70197dc9ad9011b240aa8e",

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

@ -217,6 +217,14 @@ label {
padding-left: 5px;
}
.profile-small-icon {
width: 20px;
margin-right: 5px;
height: 20px;
border-radius: 50%;
vertical-align: top;
}
.welcome-content {
@extend .unselectable;

6
packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
View File

@ -2,7 +2,11 @@
<div id="account">
<div class="d-inline-block welcome-content dropdown-toggle">
<i class="material-icons align-vertical-top">perm_identity</i>
@if (auth()->guard('customer')->user() && auth()->guard('customer')->user()->image)
<i class="align-vertical-top"><img class= "profile-small-icon" src="{{ auth('customer')->user()->image_url }}" alt="{{ auth('customer')->user()->first_name }}"/></i>
@else
<i class="material-icons align-vertical-top">perm_identity</i>
@endif
<span class="text-center">
{{ __('velocity::app.header.welcome-message', [