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 @@
{{ $item->name }}
- @if ($html = $item->getOptionDetailHtml())
- {{ $html }}
+ @if (isset($item->additional['attributes']))
+
+
+ @foreach ($item->additional['attributes'] as $attribute)
+ {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
+ @endforeach
+
+
@endif
|
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 @@
{{ $item->name }}
- @if ($html = $item->getOptionDetailHtml())
- {{ $html }}
+ @if (isset($item->additional['attributes']))
+
+
+ @foreach ($item->additional['attributes'] as $attribute)
+ {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
+ @endforeach
+
+
@endif
|
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 @@
@foreach ($order->items as $item)
- | {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} |
+
+ {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+ |
{{ $item->name }}
-
+
@if (isset($item->additional['attributes']))
@@ -126,10 +128,13 @@
@endif
|
- {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+ |
+ {{ core()->formatPrice($item->price, $order->order_currency_code) }}
|
- {{ $item->qty_ordered }} |
+
+ {{ $item->qty_ordered }}
+ |
@endforeach
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 @@
@foreach ($order->items as $item)
- | {{ $item->child ? $item->child->sku : $item->sku }} |
-
- {{ $item->name }} |
-
- {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+ |
+ {{ $item->child ? $item->child->sku : $item->sku }}
|
- {{ $item->qty_canceled }} |
+
+ {{ $item->name }}
- @if ($html = $item->getOptionDetailHtml())
-
-
-
- @endif
+ @if (isset($item->additional['attributes']))
+
+
+ @foreach ($item->additional['attributes'] as $attribute)
+ {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
+ @endforeach
+
+
+ @endif
+ |
+
+
+ {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+ |
+
+
+ {{ $item->qty_canceled }}
+ |
@endforeach