From 08e87ccf8d800064cd640fe89436e7776fb240fa Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Tue, 5 Nov 2019 16:23:43 +0530
Subject: [PATCH] Issue #1559 fixed

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php         | 2 +-
 packages/Webkul/Shop/src/Resources/lang/en/app.php          | 2 +-
 .../Resources/views/emails/admin/forget-password.blade.php  | 6 +++++-
 .../Shop/src/Resources/views/emails/layouts/logo.blade.php  | 4 ++--
 .../Resources/views/emails/sales/new-admin-order.blade.php  | 6 +++++-
 .../emails/sales/new-inventorysource-shipment.blade.php     | 6 +++++-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 321cc3ac9..477660208 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/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' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 273ce1b3b..7095c10b6 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/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'
         ],
 
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php
index acf91c918..4e312d436 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/admin/forget-password.blade.php
+++ b/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>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/layouts/logo.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/layouts/logo.blade.php
index 23ec69da3..2397fc033 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/layouts/logo.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/layouts/logo.blade.php
@@ -1,5 +1,5 @@
-@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;"/>
+@if ($logo = core()->getCurrentChannel()->logo_url)
+    <img src="{{ $logo }}" alt="{{ config('app.name') }}" style="height: 40px; width: 110px;"/>
 @else
     <img src="{{ bagisto_asset('images/logo.svg') }}">
 @endif
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
index 1fadcec7e..b62a8bc98 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
+++ b/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>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
index c6962c52f..889124a65 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
+++ b/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>