From da7ab87fa2aea801246a5f45dd40cf8daaa1afa9 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Sat, 27 Oct 2018 15:48:03 +0530
Subject: [PATCH] customer changes

---
 .../Shop/publishable/assets/css/shop.css      | 64 ++++++++-------
 .../Shop/src/Resources/assets/sass/app.scss   | 66 ++++++++-------
 .../customers/account/orders/view.blade.php   | 80 +++++++++++++++++++
 .../account/partials/sidemenu.blade.php       | 12 ++-
 4 files changed, 157 insertions(+), 65 deletions(-)

diff --git a/packages/Webkul/Shop/publishable/assets/css/shop.css b/packages/Webkul/Shop/publishable/assets/css/shop.css
index d72248683..55fd461f8 100644
--- a/packages/Webkul/Shop/publishable/assets/css/shop.css
+++ b/packages/Webkul/Shop/publishable/assets/css/shop.css
@@ -2897,6 +2897,33 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
   display: none;
 }
 
+.account-table-content {
+  color: #242424;
+  margin-top: 1.4%;
+}
+
+.account-table-content table tbody tr {
+  height: 45px;
+}
+
+.account-table-content table tbody tr td {
+  width: 250px;
+  text-transform: capitalize;
+}
+
+.edit-form {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  border: 1px solid #C7C7C7;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  min-height: 345px;
+  padding: 25px;
+}
+
 @media only screen and (max-width: 770px) {
   .account-content {
     -webkit-box-orient: vertical;
@@ -2919,7 +2946,7 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
   .account-content .responsive-side-menu {
     cursor: pointer;
     padding-top: 13px;
-    display: block;
+    display: block !important;
     height: 46px;
     border-bottom: 1px solid #C7C7C7;
     border-top: 1px solid #C7C7C7;
@@ -2956,44 +2983,23 @@ section.review .review-layouter .ratings-reviews .right-side .rater .line-bar .l
     margin-top: 2%;
   }
   .account-content .account-layout .account-table-content table tbody tr {
-    display: grid;
     margin-bottom: 20px;
   }
+  .account-content .account-layout .account-table-content table tbody tr td {
+    display: block;
+    padding-top: 5px;
+  }
   .account-content .account-items-list, .account-content .edit-form {
     margin-top: 20px;
   }
+  .account-content .account-items-list.table {
+    display: none;
+  }
   .account-content .control-group .control {
     width: 100%;
   }
 }
 
-.account-table-content {
-  color: #242424;
-  margin-top: 1.4%;
-}
-
-.account-table-content table tbody tr {
-  height: 45px;
-}
-
-.account-table-content table tbody tr td {
-  width: 250px;
-  text-transform: capitalize;
-}
-
-.edit-form {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  border: 1px solid #C7C7C7;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
-  min-height: 345px;
-  padding: 25px;
-}
-
 .sale-container {
   color: #5E5E5E;
 }
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index a7e96627a..88f2de618 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -2709,6 +2709,33 @@ section.review {
     }
 }
 
+//Account content inside a table
+.account-table-content {
+    color: $font-color;
+    margin-top: 1.4%;
+
+    table {
+        tbody {
+            tr {
+                height: 45px;
+
+                td {
+                    width: 250px;
+                    text-transform: capitalize;
+                }
+            }
+        }
+    }
+}
+
+.edit-form {
+    display: flex;
+    border: 1px solid $border-color;
+    flex-direction: column;
+    min-height: 345px;
+    padding: 25px;
+}
+
 //customer account page responsive layout
 @media only screen and (max-width: 770px) {
     .account-content {
@@ -2732,7 +2759,7 @@ section.review {
         .responsive-side-menu {
             cursor: pointer;
             padding-top:13px;
-            display: block;
+            display: block !important;
             height: 46px;
             border-bottom: 1px solid $border-color;
             border-top: 1px solid $border-color;
@@ -2771,8 +2798,12 @@ section.review {
                 margin-top: 2%;
 
                 table tbody tr {
-                    display: grid;
                     margin-bottom: 20px;
+
+                    td {
+                        display: block;
+                        padding-top: 5px;
+                    }
                 }
             }
         }
@@ -2781,39 +2812,16 @@ section.review {
             margin-top: 20px;
         }
 
+        .account-items-list.table {
+            display: none;
+        }
+
         .control-group .control {
             width: 100%;
         }
     }
 }
 
-//Account content inside a table
-.account-table-content {
-    color: $font-color;
-    margin-top: 1.4%;
-
-    table {
-        tbody {
-            tr {
-                height: 45px;
-
-                td {
-                    width: 250px;
-                    text-transform: capitalize;
-                }
-            }
-        }
-    }
-}
-
-.edit-form {
-    display: flex;
-    border: 1px solid $border-color;
-    flex-direction: column;
-    min-height: 345px;
-    padding: 25px;
-}
-
 .sale-container {
     color: #5E5E5E;
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index e9fb8a52c..879212312 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -230,6 +230,8 @@
                         </div>
                     </tab>
 
+                    {{--  {{ dd($order->invoices) }}  --}}
+
                     @if ($order->invoices->count())
                         <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
 
@@ -272,6 +274,59 @@
                                             </table>
                                         </div>
 
+                                        @foreach ($invoice->items as $item)
+                                            <table class="responsive-table">
+                                                <tbody>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.SKU') }}
+                                                        </td>
+                                                        <td>{{ $item->child ? $item->child->sku : $item->sku }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.product-name') }}
+                                                        </td>
+                                                        <td>{{ $item->name }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.price') }}
+                                                        </td>
+                                                        <td>
+                                                            {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.qty') }}
+                                                        </td>
+                                                        <td>{{ $item->qty }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                                                        <td>
+                                                            {{ core()->formatPrice($item->total, $order->order_currency_code) }}
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.tax-amount') }}
+                                                        </td>
+                                                        <td>{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.grand-total') }}
+                                                        </td>
+                                                        <td>
+                                                            {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        @endforeach
+
                                         <div class="totals">
                                             <table class="sale-summary">
                                                 <tr>
@@ -345,6 +400,31 @@
                                             </table>
                                         </div>
 
+                                        @foreach ($shipment->items as $item)
+                                            <table class="responsive-table">
+                                                <tbody>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.SKU') }}
+                                                        </td>
+                                                        <td>{{ $item->sku }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.product-name') }}
+                                                        </td>
+                                                        <td>{{ $item->name }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            {{ __('shop::app.customer.account.order.view.qty') }}
+                                                        </td>
+                                                        <td> {{ $item->qty }} </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        @endforeach
+
                                     </div>
                                 </div>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
index cc43c0382..d2902b384 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
@@ -1,4 +1,4 @@
-<div class="responsive-side-menu" id="responsive-side-menu" style="display:none">
+<div class="responsive-side-menu" id="responsive-side-menu" style="display: none">
     Menu
     <i class="icon icon-arrow-down right" id="down-icon"></i>
 </div>
@@ -22,18 +22,16 @@
         var downIcon = document.getElementById("down-icon");
         var accountSideMenu = document.getElementsByClassName("account-side-menu");
 
-        console.log(accountSideMenu);
-
         sideMenuTitle.addEventListener("click", function(){
-            if(downIcon.className == 'icon icon-arrow-down right'){
-                for(let i=0 ; i < accountSideMenu.length ; i++){
+            if(downIcon.className == 'icon icon-arrow-down right') {
+                for(let i=0 ; i < accountSideMenu.length ; i++) {
                     accountSideMenu[i].style.display="block";
                 }
 
                 downIcon.classList.remove("icon","icon-arrow-down","right");
                 downIcon.classList.add("icon","icon-arrow-up","right");
-            }else{
-                for(let i=0 ; i < accountSideMenu.length ; i++){
+            }else {
+                for(let i=0 ; i < accountSideMenu.length ; i++) {
                     accountSideMenu[i].style.display="none";
                 }