AC-7901: Can't create credit memo - free shipping related,Resolve the conflicts

Author: glo71317

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php

@@ -466,7 +466,7 @@ public function firstPartDateRangeDataProvider(): array
         return [
             ['', '', '', '0 0 0 23:59:59'],
             ['24h', '', '', '0 0 1 0:0:0'],
-            ['7d', '', '', '0 0 6 22:59:59']
+            ['7d', '', '', '0 0 6 23:59:59']
         ];
     }
 

app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php

@@ -134,16 +134,10 @@ public function collect(Creditmemo $creditmemo)
             $baseShippingDiscountTaxCompensationAmount = 0;
             $shippingDelta = $baseOrderShippingAmount - $baseOrderShippingRefundedAmount;
 
-            if ($shippingDelta > $creditmemo->getBaseShippingAmount() ||
-                $this->isShippingIncludeTaxWithTaxAfterDiscount($order->getStoreId())) {
-                $part = $creditmemo->getShippingAmount();
-                if ($orderShippingAmount > 0) {
-                    $part = $creditmemo->getShippingAmount() / $orderShippingAmount;
-                }
-                $basePart = $creditmemo->getBaseShippingAmount();
-                if ($baseOrderShippingAmount > 0) {
-                    $basePart = $creditmemo->getBaseShippingAmount() / $baseOrderShippingAmount;
-                }
+            if ($orderShippingAmount > 0 && ($shippingDelta > $creditmemo->getBaseShippingAmount() ||
+                $this->isShippingIncludeTaxWithTaxAfterDiscount($order->getStoreId()))) {
+                $part = $creditmemo->getShippingAmount() / $orderShippingAmount;
+                $basePart = $creditmemo->getBaseShippingAmount() / $baseOrderShippingAmount;
                 $shippingTaxAmount = $order->getShippingTaxAmount() * $part;
                 $baseShippingTaxAmount = $order->getBaseShippingTaxAmount() * $basePart;
                 $shippingDiscountTaxCompensationAmount = $order->getShippingDiscountTaxCompensationAmount() * $part;

app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php

@@ -860,7 +860,7 @@ public function collectDataProvider()
                     ],
                 ],
                 'creditmemo_data' => [
-                    'grand_total' => 13.4,
+                    'grand_total' => 14.76,
                     'base_grand_total' => 13.4,
                     'tax_amount' => 1.22,
                     'base_tax_amount' => 1.22,