diff --git a/packages/Sarga/API/Http/Controllers/Products.php b/packages/Sarga/API/Http/Controllers/Products.php
index eb917f99b..7894579f2 100644
--- a/packages/Sarga/API/Http/Controllers/Products.php
+++ b/packages/Sarga/API/Http/Controllers/Products.php
@@ -97,10 +97,6 @@ class Products extends ProductController
foreach($distinctVariants as $variant)
{
$option = $attribute->options->firstWhere('id',$variant->{$attribute->code});
- Log::info($attribute);
- Log::info($option,);
- Log::info($variant);
- Log::info($variant->{$attribute->code});
$item = [
'option' => $option->admin_name,
diff --git a/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php
index 37fb27556..f05f90519 100644
--- a/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -162,7 +162,6 @@
@include ('admin::sales.address', ['address' => $order->billing_address])
- {!! view_render_event('sales.order.billing_address.after', ['order' => $order]) !!}
@endif
@@ -229,7 +228,7 @@
-
+@php $totalWeight = $order->items->sum('total_weight') ?:1;@endphp
@if ($order->shipping_address)
@@ -256,6 +255,14 @@
{{ core()->formatPrice($order->shipping_amount,$order->order_currency_code) }}
+
+
+ Total Weight
+
+
+ {{$totalWeight}}
+
+
@endif
@@ -274,6 +281,7 @@
{{ __('admin::app.sales.orders.product-name') }} |
{{ __('admin::app.sales.orders.price') }} |
{{ __('admin::app.sales.orders.item-status') }} |
+ Weight price |
{{ __('admin::app.sales.orders.subtotal') }} |
@if ($order->base_discount_amount != 0)
{{ __('admin::app.sales.orders.discount-amount') }} |
@@ -295,7 +303,7 @@
alt="suraty" height="150" width="150">
@else
- {{$item->sku}}
+ {{$item->sku}} Product not found
@endif
@@ -342,6 +350,9 @@
{{ core()->formatPrice($item->total,$order->order_currency_code) }} |
+
+ {{core()->formatPrice($order->shipping_amount * $item->total_weight/$totalWeight)}}
+ |
@if ($order->base_discount_amount != 0)
{{ core()->formatPrice($item->discount_amount,$order->order_currency_code) }} |