From c15e614c3e84f191934c1d9acc735865dbc45e76 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Thu, 24 Feb 2022 22:10:20 +0800
Subject: [PATCH] added shipping cost

---
 resources/views/emails/orders.blade.php | 61 +++++++++++++------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php
index f913b3e..a2bdd48 100755
--- a/resources/views/emails/orders.blade.php
+++ b/resources/views/emails/orders.blade.php
@@ -28,7 +28,7 @@
             padding: 0;
             -ms-text-size-adjust: 100%;
             -webkit-text-size-adjust: 100%;
-}
+        }
 
         table {
             border-collapse: separate;
@@ -419,6 +419,11 @@
                                                     <td>{{ $array_payment_details[0]->Tax . ' ' . $array_payment_details[0]->Currency }}
                                                     </td>
                                                 </tr>
+                                                <tr>
+                                                    <td class="col-md-3">Shipping Cost</td>
+                                                    <td>{{ $array_payment_details[0]->ShippingCost . ' ' . $array_payment_details[0]->Currency }}
+                                                    </td>
+                                                </tr>
                                                 <tr>
                                                     <td class="col-md-3">Total</td>
                                                     <td>{{ $array_payment_details[0]->Total . ' ' . $array_payment_details[0]->Currency }}
@@ -430,6 +435,7 @@
                                                 </tr>
                                             </table>
                                             <br>
+                                            
                                             <p>Item Order(s):</p>
                                             @foreach ($item_goup_array as $item)
                                                 @if ($item->VoucherId == null)
@@ -466,27 +472,25 @@
                                                                                     <td><b>Price</b></td>
                                                                                     <td><b>Quantity</b></td>
                                                                                 </tr>
-                                                                            @elseif($item->FormUsed=="tshirt-form")
+                                                                            @elseif($item->FormUsed == 'tshirt-form')
                                                                                 <tr>
                                                                                     <td><b>Size</b></td>
                                                                                     <td><b>Price</b></td>
                                                                                     <td><b>Quantity</b></td>
                                                                                 </tr>
-                                                                            @elseif($item->FormUsed=="quantity-form")
+                                                                            @elseif($item->FormUsed == 'quantity-form')
                                                                                 <tr>
                                                                                     <td><b>Price</b></td>
                                                                                     <td>Quantity</b></td>
                                                                                 </tr>
-
-                                                                            @elseif($item->FormUsed=="name-number-form")
+                                                                            @elseif($item->FormUsed == 'name-number-form')
                                                                                 <tr>
                                                                                     <td><b>Name</b></td>
                                                                                     <td><b>Number</b></td>
                                                                                     <td><b>Price</b></td>
                                                                                     <td><b>Quantity</b></td>
                                                                                 </tr>
-
-                                                                            @elseif($item->FormUsed=="name-number-size-form")
+                                                                            @elseif($item->FormUsed == 'name-number-size-form')
                                                                                 <tr>
                                                                                     <th>Name</th>
                                                                                     <th>Number</th>
@@ -494,15 +498,13 @@
                                                                                     <th>Price</th>
                                                                                     <th>Quantity</th>
                                                                                 </tr>
-
-                                                                            @elseif($item->FormUsed=="number-form")
+                                                                            @elseif($item->FormUsed == 'number-form')
                                                                                 <tr>
                                                                                     <th>Number</th>
                                                                                     <th>Price</th>
                                                                                     <th>Quantity</th>
                                                                                 </tr>
-
-                                                                            @elseif($item->FormUsed=="name-name2-size-form")
+                                                                            @elseif($item->FormUsed == 'name-name2-size-form')
                                                                                 <tr>
                                                                                     <th>Gamer Tag</th>
                                                                                     <th>Name</th>
@@ -510,21 +512,21 @@
                                                                                     <th>Price</th>
                                                                                     <th>Quantity</th>
                                                                                 </tr>
-                                                                            @elseif($item->FormUsed=="name-size-form")
+                                                                            @elseif($item->FormUsed == 'name-size-form')
                                                                                 <tr>
                                                                                     <th>Name</th>
                                                                                     <th>Size</th>
                                                                                     <th>Price</th>
                                                                                     <th>Quantity</th>
                                                                                 </tr>
-                                                                            @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                                            @elseif($item->FormUsed == 'jersey-and-shorts-quantity-form')
                                                                                 <tr>
                                                                                     <th>Jersey Size</th>
                                                                                     <th>Shorts Size</th>
                                                                                     <th>Price</th>
                                                                                     <th>Quantity</th>
                                                                                 </tr>
-                                                                            @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                                            @elseif($item->FormUsed == 'number-jersey-shorts-form')
                                                                                 <tr>
                                                                                     <td><b>Number</b></td>
                                                                                     <td><b>Jersey Size</b></td>
@@ -533,17 +535,19 @@
                                                                                     <td><b>Quantity</b></td>
                                                                                 </tr>
                                                                             @else
-
-
                                                                             @endif
                                                                             <!-- table header  -->
                                                                             <!-- table body -->
                                                                             @foreach ($order_item_array as $sub_item)
                                                                                 @if ($sub_item->ProductId == $item->ProductId)
-
                                                                                     @if ($item->FormUsed == 'jersey-and-shorts-form')
                                                                                         <tr>
-                                                                                            <td> @if ($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif
+                                                                                            <td>
+                                                                                                @if ($sub_item->Name != '')
+                                                                                                    {{ $sub_item->Name }}
+                                                                                                @else
+                                                                                                    --
+                                                                                                @endif
                                                                                             </td>
                                                                                             <td>{{ $sub_item->Number }}
                                                                                             </td>
@@ -557,7 +561,7 @@
                                                                                             </td>
 
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="tshirt-form")
+                                                                                    @elseif($item->FormUsed == 'tshirt-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Size }}
                                                                                             </td>
@@ -567,14 +571,14 @@
                                                                                             </td>
 
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="quantity-form")
+                                                                                    @elseif($item->FormUsed == 'quantity-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Price }}
                                                                                             </td>
                                                                                             <td>{{ $sub_item->Quantity }}
                                                                                             </td>
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="name-number-form")
+                                                                                    @elseif($item->FormUsed == 'name-number-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Name }}
                                                                                             </td>
@@ -586,7 +590,7 @@
                                                                                             </td>
 
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="name-number-size-form")
+                                                                                    @elseif($item->FormUsed == 'name-number-size-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Name }}
                                                                                             </td>
@@ -599,8 +603,7 @@
                                                                                             <td>{{ $sub_item->Quantity }}
                                                                                             </td>
                                                                                         </tr>
-
-                                                                                    @elseif($item->FormUsed=="number-form")
+                                                                                    @elseif($item->FormUsed == 'number-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Number }}
                                                                                             </td>
@@ -609,7 +612,7 @@
                                                                                             <td>{{ $sub_item->Quantity }}
                                                                                             </td>
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="name-name2-size-form")
+                                                                                    @elseif($item->FormUsed == 'name-name2-size-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Name }}
                                                                                             </td>
@@ -622,7 +625,7 @@
                                                                                             <td>{{ $sub_item->Quantity }}
                                                                                             </td>
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="name-size-form")
+                                                                                    @elseif($item->FormUsed == 'name-size-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Name }}
                                                                                             </td>
@@ -633,7 +636,7 @@
                                                                                             <td>{{ $sub_item->Quantity }}
                                                                                             </td>
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                                                    @elseif($item->FormUsed == 'jersey-and-shorts-quantity-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->JerseySize }}
                                                                                             </td>
@@ -644,7 +647,7 @@
                                                                                             <td>{{ $sub_item->Quantity }}
                                                                                             </td>
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                                                    @elseif($item->FormUsed == 'number-jersey-shorts-form')
                                                                                         <tr>
                                                                                             <td>{{ $sub_item->Number }}
                                                                                             </td>
@@ -658,9 +661,7 @@
                                                                                             </td>
                                                                                         </tr>
                                                                                     @else
-
                                                                                     @endif
-
                                                                                 @endif
                                                                             @endforeach
                                                                         </table>