From 4b447bf6c54649447cdf8aa3884f6a6bd0207b11 Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Sat, 3 Sep 2022 15:37:17 +0500
Subject: [PATCH] order item kilogram price

---
 .../Sarga/API/Http/Controllers/Products.php     |  4 ----
 .../Resources/views/sales/orders/view.blade.php | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

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 @@
                                                 <div class="section-content">
                                                     @include ('admin::sales.address', ['address' => $order->billing_address])
 
-                                                    {!! view_render_event('sales.order.billing_address.after', ['order' => $order]) !!}
                                                 </div>
                                             </div>
                                         @endif
@@ -229,7 +228,7 @@
 
                                         </div>
                                     </div>
-
+@php $totalWeight = $order->items->sum('total_weight') ?:1;@endphp
                                     @if ($order->shipping_address)
                                         <div class="sale-section">
                                             <div class="secton-title">
@@ -256,6 +255,14 @@
                                                         {{ core()->formatPrice($order->shipping_amount,$order->order_currency_code) }}
                                                     </span>
                                                 </div>
+                                                <div class="row">
+                                                    <span class="title">
+                                                        Total Weight
+                                                    </span>
+                                                    <span class="value">
+                                                        {{$totalWeight}}
+                                                    </span>
+                                                </div>
                                             </div>
                                         </div>
                                     @endif
@@ -274,6 +281,7 @@
                                                     <th>{{ __('admin::app.sales.orders.product-name') }}</th>
                                                     <th>{{ __('admin::app.sales.orders.price') }}</th>
                                                     <th>{{ __('admin::app.sales.orders.item-status') }}</th>
+                                                    <th>Weight price</th>
                                                     <th>{{ __('admin::app.sales.orders.subtotal') }}</th>
                                                     @if ($order->base_discount_amount != 0)
                                                         <th>{{ __('admin::app.sales.orders.discount-amount') }}</th>
@@ -295,7 +303,7 @@
                                                                      alt="suraty" height="150" width="150">
                                                             </a>
                                                             @else
-                                                                {{$item->sku}}
+                                                                {{$item->sku}} Product not found
                                                             @endif
                                                         </td>
 
@@ -342,6 +350,9 @@
                                                         </td>
 
                                                         <td>{{ core()->formatPrice($item->total,$order->order_currency_code) }}</td>
+                                                        <td>
+                                                            {{core()->formatPrice($order->shipping_amount * $item->total_weight/$totalWeight)}}
+                                                        </td>
 
                                                         @if ($order->base_discount_amount != 0)
                                                             <td>{{ core()->formatPrice($item->discount_amount,$order->order_currency_code) }}</td>