CC-33282: Display Commissions Amount in Backoffice and Merchant Portal UI (#10987)

Display Commissions Amount in Backoffice and Merchant Portal UI

Author: dmiseev

composer.json

@@ -45,6 +45,7 @@
     },
     "suggest": {
         "spryker/checkout": "If you want to use Checkout plugins. ^4.0.0",
+        "spryker/sales-merchant-commission-merchant-portal-gui": "Use this module if you want to use templates with merchant commission totals.",
         "spryker/sales-product-configuration-gui": "Add the module if you want to display order item configuration."
     },
     "autoload": {

src/Spryker/Zed/Sales/Business/Model/Order/OrderHydrator.php

@@ -553,12 +553,16 @@ protected function hydrateOrderTotals(SpySalesOrder $orderEntity, OrderTransfer
         $taxTotalTransfer->setAmount($salesOrderTotalsEntity->getTaxTotal());
         $totalsTransfer->setTaxTotal($taxTotalTransfer);
 
-        $totalsTransfer->setExpenseTotal($salesOrderTotalsEntity->getOrderExpenseTotal());
-        $totalsTransfer->setRefundTotal($salesOrderTotalsEntity->getRefundTotal());
-        $totalsTransfer->setGrandTotal($salesOrderTotalsEntity->getGrandTotal());
-        $totalsTransfer->setSubtotal($salesOrderTotalsEntity->getSubtotal());
-        $totalsTransfer->setDiscountTotal($salesOrderTotalsEntity->getDiscountTotal());
-        $totalsTransfer->setCanceledTotal($salesOrderTotalsEntity->getCanceledTotal());
+        $plainTotal = $salesOrderTotalsEntity->toArray();
+        unset($plainTotal['tax_total']);
+
+        $totalsTransfer->fromArray($plainTotal, true)
+            ->setExpenseTotal($salesOrderTotalsEntity->getOrderExpenseTotal())
+            ->setRefundTotal($salesOrderTotalsEntity->getRefundTotal())
+            ->setGrandTotal($salesOrderTotalsEntity->getGrandTotal())
+            ->setSubtotal($salesOrderTotalsEntity->getSubtotal())
+            ->setDiscountTotal($salesOrderTotalsEntity->getDiscountTotal())
+            ->setCanceledTotal($salesOrderTotalsEntity->getCanceledTotal());
 
         $orderTransfer->setTotals($totalsTransfer);
     }

src/Spryker/Zed/Sales/Presentation/Detail/boxes/order-overview.twig

@@ -73,6 +73,13 @@
                             <div class="col-xs-4">{{ order.totals.canceledTotal | default(0) | money(true, order.currencyIsoCode) }}</div>
                         </div>
                     </div>
+
+                    {% include [
+                        '@SalesMerchantCommissionMerchantPortalGui/Partials/order-commission-totals.twig',
+                        '@SalesMerchantCommission/Partials/commission-totals.twig',
+                    ] ignore missing with {
+                        order: order,
+                    } %}
                 </div>
             </div>