From d5b66ebf9e9a9d422a8711c1d335b5c464fbacc1 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 28 Jun 2019 17:05:08 +0530
Subject: [PATCH] table in email template

---
 .../emails/sales/new-admin-order.blade.php    | 71 ++++++++++---------
 .../views/emails/sales/new-order.blade.php    | 71 ++++++++++---------
 2 files changed, 76 insertions(+), 66 deletions(-)

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 e5bdd6b27..778954ade 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
@@ -52,11 +52,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
                 </div>
 
-                <div style="font-size: 16px;color: #242424;">
+                <div style="font-size: 16px;color: #242424; font-weight: bold">
                     {{ __('shop::app.mail.order.shipping') }}
                 </div>
 
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                <div style="font-size: 16px;color: #242424;">
                     {{ $order->shipping_title }}
                 </div>
             </div>
@@ -84,49 +84,54 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div style="font-size: 16px; color: #242424;">
+                <div style="font-size: 16px; color: #242424; font-weight: bold">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                <div style="font-size: 16px; color: #242424;">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>
         </div>
 
-        @foreach ($order->items as $item)
-            <div style="background: #FFFFFF;border: 1px solid #E8E8E8;border-radius: 3px;padding: 20px;margin-bottom: 10px">
-                <p style="font-size: 18px;color: #242424;line-height: 24px;margin-top: 0;margin-bottom: 10px;font-weight: bold;">
-                    {{ $item->name }}
-                </p>
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                        <tr style="background-color: #f2f2f2">
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                        </tr>
+                    </thead>
 
-                <div style="margin-bottom: 10px;">
-                    <label style="font-size: 16px;color: #5E5E5E;">
-                        {{ __('shop::app.mail.order.price') }}
-                    </label>
-                    <span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
-                        {{ core()->formatBasePrice($item->base_price) }}
-                    </span>
-                </div>
+                    <tbody>
+                        @foreach ($order->items as $item)
+                            <tr>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->child ? $item->child->sku : $item->sku }}</td>
 
-                <div style="margin-bottom: 10px;">
-                    <label style="font-size: 16px;color: #5E5E5E;">
-                        {{ __('shop::app.mail.order.quantity') }}
-                    </label>
-                    <span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
-                        {{ $item->qty_ordered }}
-                    </span>
-                </div>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">{{ $item->name }}</td>
 
-                @if ($html = $item->getOptionDetailHtml())
-                    <div style="">
-                        <label style="margin-top: 10px; font-size: 16px;color: #5E5E5E; display: block;">
-                            {{ $html }}
-                        </label>
-                    </div>
-                @endif
+                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty_ordered }}</td>
+
+                                @if ($html = $item->getOptionDetailHtml())
+                                <div style="">
+                                    <label style="margin-top: 10px; font-size: 16px;color: #5E5E5E; display: block;">
+                                        {{ $html }}
+                                    </label>
+                                </div>
+                            @endif
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
             </div>
-        @endforeach
+        </div>
 
         <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
             <div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
index 6d0150bd7..5a7c13011 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
@@ -52,11 +52,11 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
                 </div>
 
-                <div style="font-size: 16px;color: #242424;">
+                <div style="font-size: 16px;color: #242424; font-weight: bold">
                     {{ __('shop::app.mail.order.shipping') }}
                 </div>
 
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                <div style="font-size: 16px;color: #242424;">
                     {{ $order->shipping_title }}
                 </div>
             </div>
@@ -84,49 +84,54 @@
                     {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
                 </div>
 
-                <div style="font-size: 16px; color: #242424;">
+                <div style="font-size: 16px; color: #242424; font-weight: bold">
                     {{ __('shop::app.mail.order.payment') }}
                 </div>
 
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                <div style="font-size: 16px; color: #242424;">
                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                 </div>
             </div>
         </div>
 
-        @foreach ($order->items as $item)
-            <div style="background: #FFFFFF;border: 1px solid #E8E8E8;border-radius: 3px;padding: 20px;margin-bottom: 10px">
-                <p style="font-size: 18px;color: #242424;line-height: 24px;margin-top: 0;margin-bottom: 10px;font-weight: bold;">
-                    {{ $item->name }}
-                </p>
+        <div class="section-content">
+            <div class="table mb-20">
+                <table style="overflow-x: auto; border-collapse: collapse;
+                border-spacing: 0;width: 100%">
+                    <thead>
+                        <tr style="background-color: #f2f2f2">
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.price') }}</th>
+                            <th style="text-align: left;padding: 8px">{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                        </tr>
+                    </thead>
 
-                <div style="margin-bottom: 10px;">
-                    <label style="font-size: 16px;color: #5E5E5E;">
-                        {{ __('shop::app.mail.order.price') }}
-                    </label>
-                    <span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
-                        {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                    </span>
-                </div>
+                    <tbody>
+                        @foreach ($order->items as $item)
+                            <tr>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->child ? $item->child->sku : $item->sku }}</td>
 
-                <div style="margin-bottom: 10px;">
-                    <label style="font-size: 16px;color: #5E5E5E;">
-                        {{ __('shop::app.mail.order.quantity') }}
-                    </label>
-                    <span style="font-size: 18px;color: #242424;margin-left: 40px;font-weight: bold;">
-                        {{ $item->qty_ordered }}
-                    </span>
-                </div>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">{{ $item->name }}</td>
 
-                @if ($html = $item->getOptionDetailHtml())
-                    <div style="">
-                        <label style="margin-top: 10px; font-size: 16px;color: #5E5E5E; display: block;">
-                            {{ $html }}
-                        </label>
-                    </div>
-                @endif
+                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}" style="text-align: left;padding: 8px">{{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                </td>
+
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty_ordered }}</td>
+
+                                @if ($html = $item->getOptionDetailHtml())
+                                <div style="">
+                                    <label style="margin-top: 10px; font-size: 16px;color: #5E5E5E; display: block;">
+                                        {{ $html }}
+                                    </label>
+                                </div>
+                            @endif
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
             </div>
-        @endforeach
+        </div>
 
         <div style="font-size: 16px;color: #242424;line-height: 30px;float: right;width: 40%;margin-top: 20px;">
             <div>