From c8505d3fbc7b2312b66fb280f632a531fdd682c7 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Wed, 9 Oct 2019 19:59:53 +0530
Subject: [PATCH] Updated refund with new product types

---
 .../views/sales/refunds/create.blade.php      | 10 ++++--
 .../views/sales/refunds/view.blade.php        | 10 ++++--
 .../Webkul/Sales/src/Models/RefundItem.php    | 17 ---------
 .../emails/sales/new-admin-order.blade.php    | 13 ++++---
 .../views/emails/sales/order-cancel.blade.php | 35 ++++++++++++-------
 5 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php
index 8e3ede016..8a273df8b 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php
@@ -246,8 +246,14 @@
                                 <td>
                                     {{ $item->name }}
 
-                                    @if ($html = $item->getOptionDetailHtml())
-                                        <p>{{ $html }}</p>
+                                    @if (isset($item->additional['attributes']))
+                                        <div class="item-options">
+                                            
+                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            @endforeach
+
+                                        </div>
                                     @endif
                                 </td>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
index d056cf5a4..e9f835d2a 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
@@ -227,8 +227,14 @@
                                             <td>
                                                 {{ $item->name }}
 
-                                                @if ($html = $item->getOptionDetailHtml())
-                                                    <p>{{ $html }}</p>
+                                                @if (isset($item->additional['attributes']))
+                                                    <div class="item-options">
+                                                        
+                                                        @foreach ($item->additional['attributes'] as $attribute)
+                                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                                        @endforeach
+
+                                                    </div>
                                                 @endif
                                             </td>
 
diff --git a/packages/Webkul/Sales/src/Models/RefundItem.php b/packages/Webkul/Sales/src/Models/RefundItem.php
index 6285e2591..f6fd52b33 100644
--- a/packages/Webkul/Sales/src/Models/RefundItem.php
+++ b/packages/Webkul/Sales/src/Models/RefundItem.php
@@ -44,21 +44,4 @@ class RefundItem extends Model implements RefundItemContract
     {
         return $this->hasOne(RefundItemProxy::modelClass(), 'parent_id');
     }
-
-    /**
-     * Returns configurable option html
-     */
-    public function getOptionDetailHtml()
-    {
-
-        if ($this->type == 'configurable' && isset($this->additional['attributes'])) {
-            $labels = [];
-
-            foreach ($this->additional['attributes'] as $attribute) {
-                $labels[] = $attribute['attribute_name'] . ' : ' . $attribute['option_label'];
-            }
-
-            return implode(', ', $labels);
-        }
-    }
 }
\ 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 5af8e71ff..1fadcec7e 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
@@ -110,11 +110,13 @@
                     <tbody>
                         @foreach ($order->items as $item)
                             <tr>
-                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">{{ $item->getTypeInstance()->getOrderedItem($item)->sku }}</td>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                </td>
 
                                 <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
                                     {{ $item->name }}
-                                    
+
                                     @if (isset($item->additional['attributes']))
                                         <div class="item-options">
                                             
@@ -126,10 +128,13 @@
                                     @endif
                                 </td>
 
-                                <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 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>
+                                <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">
+                                    {{ $item->qty_ordered }}
+                                </td>
                             </tr>
                         @endforeach
                     </tbody>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
index ee39658e8..cd6b9600e 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
@@ -110,22 +110,31 @@
                     <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>
-
-                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">{{ $item->name }}</td>
-
-                            <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 data-value="{{ __('shop::app.customer.account.order.view.SKU') }}" style="text-align: left;padding: 8px">
+                                {{ $item->child ? $item->child->sku : $item->sku }}
                             </td>
 
-                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}" style="text-align: left;padding: 8px">{{ $item->qty_canceled }}</td>
+                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}" style="text-align: left;padding: 8px">
+                                {{ $item->name }}
 
-                            @if ($html = $item->getOptionDetailHtml())
-                                <div style="">
-                                    <label style="margin-top: 10px; font-size: 16px;color: #5E5E5E; display: block;">
-                                        {{ $html }}
-                                    </label>
-                                </div>
-                            @endif
+                                @if (isset($item->additional['attributes']))
+                                    <div class="item-options">
+                                        
+                                        @foreach ($item->additional['attributes'] as $attribute)
+                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                        @endforeach
+
+                                    </div>
+                                @endif
+                            </td>
+
+                            <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_canceled }}
+                            </td>
                         </tr>
                     @endforeach
                     </tbody>