Merge branch 'llp_gift_26_04_10' into dev

packages/Longyi/Gift/src/Providers/GiftServiceProvider.php

@@ -8,6 +8,8 @@ use Illuminate\Support\Facades\Event;
 use Longyi\Gift\Providers\EventServiceProvider;
 use Longyi\Gift\Repositories\GiftCardsRepository;
 use Webkul\Sales\Repositories\InvoiceRepository;
+use Webkul\Sales\Repositories\OrderRepository;
+use Longyi\Gift\Repositories\CustomOrderRepository;
 
 class GiftServiceProvider extends ServiceProvider
 {
@@ -17,6 +19,7 @@ class GiftServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->app->bind(InvoiceRepository::class, CustomInvoiceRepository::class);
+        $this->app->bind(OrderRepository::class, CustomOrderRepository::class);
         $this->registerConfig();
     }
 

packages/Longyi/Gift/src/Repositories/CustomOrderRepository.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Longyi\Gift\Repositories;
+
+use Webkul\Sales\Repositories\OrderRepository as BaseOrderRepository;
+
+class CustomOrderRepository extends BaseOrderRepository
+{
+     public function collectTotals($order)
+    {
+        // order invoice total
+        $order->sub_total_invoiced = $order->base_sub_total_invoiced = 0;
+        $order->shipping_invoiced = $order->base_shipping_invoiced = 0;
+        $order->tax_amount_invoiced = $order->base_tax_amount_invoiced = 0;
+        $order->discount_invoiced = $order->base_discount_invoiced = 0;
+        $order->giftcard_amount = $order->base_giftcard_amount = 0;
+
+        foreach ($order->invoices as $invoice) {
+            $order->sub_total_invoiced += $invoice->sub_total;
+            $order->base_sub_total_invoiced += $invoice->base_sub_total;
+
+            $order->shipping_invoiced += $invoice->shipping_amount;
+            $order->base_shipping_invoiced += $invoice->base_shipping_amount;
+
+            $order->tax_amount_invoiced += $invoice->tax_amount;
+            $order->base_tax_amount_invoiced += $invoice->base_tax_amount;
+
+            $order->discount_invoiced += $invoice->discount_amount;
+            $order->base_discount_invoiced += $invoice->base_discount_amount;
+
+            $order->giftcard_amount += $invoice->giftcard_amount;
+            $order->base_giftcard_amount += $invoice->base_giftcard_amount;
+        }
+
+        $order->grand_total_invoiced = $order->sub_total_invoiced + $order->shipping_invoiced + $order->tax_amount_invoiced - $order->discount_invoiced - $order->giftcard_amount;
+        $order->base_grand_total_invoiced = $order->base_sub_total_invoiced + $order->base_shipping_invoiced + $order->base_tax_amount_invoiced - $order->base_discount_invoiced - $order->base_giftcard_amount;
+
+        // order refund total
+        $order->sub_total_refunded = $order->base_sub_total_refunded = 0;
+        $order->shipping_refunded = $order->base_shipping_refunded = 0;
+        $order->tax_amount_refunded = $order->base_tax_amount_refunded = 0;
+        $order->discount_refunded = $order->base_discount_refunded = 0;
+        $order->grand_total_refunded = $order->base_grand_total_refunded = 0;
+
+        foreach ($order->refunds as $refund) {
+            $order->sub_total_refunded += $refund->sub_total;
+            $order->base_sub_total_refunded += $refund->base_sub_total;
+
+            $order->shipping_refunded += $refund->shipping_amount;
+            $order->base_shipping_refunded += $refund->base_shipping_amount;
+
+            $order->tax_amount_refunded += $refund->tax_amount;
+            $order->base_tax_amount_refunded += $refund->base_tax_amount;
+
+            $order->discount_refunded += $refund->discount_amount;
+            $order->base_discount_refunded += $refund->base_discount_amount;
+
+            $order->grand_total_refunded += $refund->adjustment_refund - $refund->adjustment_fee;
+            $order->base_grand_total_refunded += $refund->base_adjustment_refund - $refund->base_adjustment_fee;
+        }
+
+        $order->grand_total_refunded += $order->sub_total_refunded + $order->shipping_refunded + $order->tax_amount_refunded - $order->discount_refunded;
+        $order->base_grand_total_refunded += $order->base_sub_total_refunded + $order->base_shipping_refunded + $order->base_tax_amount_refunded - $order->base_discount_refunded;
+
+        $order->save();
+
+        return $order;
+    }
+}