From f6094287c1a419e86cea9288e26ac722d1c728d4 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Wed, 2 Sep 2020 18:38:04 +0530
Subject: [PATCH 1/5] Minor CSS Changed

---
 .../sales/new-inventorysource-shipment.blade.php       |  8 ++++----
 .../views/emails/sales/new-shipment.blade.php          | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

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 287eaf453..9734016f2 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
@@ -71,11 +71,11 @@
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} </span>{{ $shipment->carrier_title }}
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} </span>{{ $shipment->track_number }}
                     </div>
                 </div>
             </div>
@@ -107,11 +107,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div style="font-size: 16px; color: #242424;">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index a4d99b383..2d7599c3c 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -68,11 +68,11 @@
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} </span>{{ $shipment->carrier_title }}
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} </span>{{ $shipment->track_number }}
                     </div>
                 </div>
             </div>
@@ -104,11 +104,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>
@@ -171,4 +171,4 @@
             </p>
         </div>
     </div>
-@endcomponent
+@endcomponent
\ No newline at end of file

From 21bf97719e4ed4062e68acfcd9ece381dbf3d748 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Wed, 2 Sep 2020 19:04:47 +0530
Subject: [PATCH 2/5] Added : Back

---
 .../views/emails/sales/new-inventorysource-shipment.blade.php | 4 ++--
 .../src/Resources/views/emails/sales/new-shipment.blade.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 9734016f2..487d297ca 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
@@ -71,11 +71,11 @@
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} </span>{{ $shipment->carrier_title }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} </span>{{ $shipment->track_number }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
                     </div>
                 </div>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index 2d7599c3c..10d93391d 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -68,11 +68,11 @@
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} </span>{{ $shipment->carrier_title }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
                     </div>
 
                     <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} </span>{{ $shipment->track_number }}
+                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
                     </div>
                 </div>
             </div>

From 93bc55f507b110e9bb394030a6e754ae4e45071f Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Thu, 3 Sep 2020 12:15:16 +0530
Subject: [PATCH 3/5] Inline CSS Removed

---
 .../src/Resources/views/emails/layouts/master.blade.php    | 7 +++++++
 .../emails/sales/new-inventorysource-shipment.blade.php    | 4 ++--
 .../Resources/views/emails/sales/new-shipment.blade.php    | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
index 9451f8cf1..290e99ef4 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
@@ -4,6 +4,13 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet" type="text/css">
+        <style>
+            .payment-method {
+                font-weight: bold;
+                font-size: 16px;
+                color: #242424;
+            }
+        </style>
     </head>
 
     <body style="font-family: montserrat, sans-serif;">
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 487d297ca..b9ef51f4f 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
@@ -107,11 +107,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                <div class="payment-method">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                <div class="payment-method">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index 10d93391d..3897b53a3 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -104,11 +104,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                <div class="payment-method">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                <div class="payment-method">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>

From 606e6b1d4b3a6da2227db36647b89022c8640c19 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Thu, 3 Sep 2020 13:16:31 +0530
Subject: [PATCH 4/5] Added Yielding For Custom CSS

---
 .../Resources/views/emails/layouts/master.blade.php    | 10 +++-------
 .../sales/new-inventorysource-shipment.blade.php       | 10 ++++++++++
 .../views/emails/sales/new-shipment.blade.php          | 10 ++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
index 290e99ef4..d8c954a7d 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
@@ -4,13 +4,9 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet" type="text/css">
-        <style>
-            .payment-method {
-                font-weight: bold;
-                font-size: 16px;
-                color: #242424;
-            }
-        </style>
+
+        {{-- custom css --}}
+        @yield('custom-css')
     </head>
 
     <body style="font-family: montserrat, sans-serif;">
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 b9ef51f4f..23e19651e 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,3 +1,13 @@
+@section('custom-css')
+    <style>
+        .payment-method {
+            font-weight: bold;
+            font-size: 16px;
+            color: #242424;
+        }
+    </style>
+@endsection
+
 @component('shop::emails.layouts.master')
     <div style="text-align: center;">
         <a href="{{ config('app.url') }}">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index 3897b53a3..c6fd86344 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -1,3 +1,13 @@
+@section('custom-css')
+    <style>
+        .payment-method {
+            font-weight: bold;
+            font-size: 16px;
+            color: #242424;
+        }
+    </style>
+@endsection
+
 @component('shop::emails.layouts.master')
     <div style="text-align: center;">
         <a href="{{ config('app.url') }}">

From bc8ab08f4776a6ec526960149364d5900683a765 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Thu, 3 Sep 2020 13:52:04 +0530
Subject: [PATCH 5/5] Reverted Changes to This Commit 21bf977

---
 .../views/emails/layouts/master.blade.php          |  3 ---
 .../sales/new-inventorysource-shipment.blade.php   | 14 ++------------
 .../views/emails/sales/new-shipment.blade.php      | 14 ++------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
index d8c954a7d..9451f8cf1 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/layouts/master.blade.php
@@ -4,9 +4,6 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet" type="text/css">
-
-        {{-- custom css --}}
-        @yield('custom-css')
     </head>
 
     <body style="font-family: montserrat, sans-serif;">
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 23e19651e..487d297ca 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,13 +1,3 @@
-@section('custom-css')
-    <style>
-        .payment-method {
-            font-weight: bold;
-            font-size: 16px;
-            color: #242424;
-        }
-    </style>
-@endsection
-
 @component('shop::emails.layouts.master')
     <div style="text-align: center;">
         <a href="{{ config('app.url') }}">
@@ -117,11 +107,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div class="payment-method">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div class="payment-method">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index c6fd86344..10d93391d 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -1,13 +1,3 @@
-@section('custom-css')
-    <style>
-        .payment-method {
-            font-weight: bold;
-            font-size: 16px;
-            color: #242424;
-        }
-    </style>
-@endsection
-
 @component('shop::emails.layouts.master')
     <div style="text-align: center;">
         <a href="{{ config('app.url') }}">
@@ -114,11 +104,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div class="payment-method">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div class="payment-method">
+                <div style="font-weight: bold; font-size: 16px; color: #242424;">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>