Issue #1559 fixed

packages/Webkul/Admin/src/Resources/lang/en/app.php

@@ -226,7 +226,7 @@ return [
             'password' => 'Password',
             'confirm-password' => 'Confirm Password',
             'back-link-title' => 'Back to Sign In',
-            'submit-btn-title' => 'Email Password Reset Link'
+            'submit-btn-title' => 'Send Password Reset Email'
         ],
 
         'reset-password' => [

packages/Webkul/Shop/src/Resources/lang/en/app.php

@@ -155,7 +155,7 @@ return [
         'forgot-password' => [
             'title' => 'Recover Password',
             'email' => 'Email',
-            'submit' => 'Submit',
+            'submit' => 'Send Password Reset Email',
             'page_title' => 'Customer - Forgot Password Form'
         ],
 

packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php

@@ -1,7 +1,11 @@
 @component('shop::emails.layouts.master')
     <div style="text-align: center;">
         <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
         </a>
     </div>
 

packages/Webkul/Shop/src/Resources/views/emails/layouts/logo.blade.php

@@ -1,5 +1,5 @@
-@if (core()->getConfigData('general.design.admin_logo.logo_image'))
+@if ($logo = core()->getCurrentChannel()->logo_url)
-    <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+    <img src="{{ $logo }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
 @else
     <img src="{{ bagisto_asset('images/logo.svg') }}">
 @endif

packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php

@@ -1,7 +1,11 @@
 @component('shop::emails.layouts.master')
     <div style="text-align: center;">
         <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
         </a>
     </div>
 

packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php

@@ -1,7 +1,11 @@
 @component('shop::emails.layouts.master')
     <div style="text-align: center;">
         <a href="{{ config('app.url') }}">
-            @include ('shop::emails.layouts.logo')
+            @if (core()->getConfigData('general.design.admin_logo.logo_image'))
+                <img src="{{ \Illuminate\Support\Facades\Storage::url(core()->getConfigData('general.design.admin_logo.logo_image')) }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
+            @else
+                <img src="{{ asset('vendor/webkul/ui/assets/images/logo.png') }}" alt="{{ config('app.name') }}"/>
+            @endif
         </a>
     </div>