PISHPS-306: line item refund fix and status fix (#848)

src/Service/Refund/RefundCreditNoteService.php

@@ -85,7 +85,11 @@ public function addCreditNoteToOrder(string $orderId, string $refundId, array $l
 
         $data = ['id' => $orderId, 'lineItems' => []];
 
-        foreach ($lineItems as ['id' => $lineItemId]) {
+        foreach ($lineItems as ['id' => $lineItemId, 'amount' => $amount]) {
+            if ($amount === 0) {
+                // refund manager front end sends all line items, even if they are not going to be refunded
+                continue;
+            }
             $lineItem = $this->orderLineItemRepository->search(new Criteria([$lineItemId]), $context)->first();
             if (!$lineItem instanceof OrderLineItemEntity) {
                 continue;

src/Service/Transition/DeliveryTransitionService.php

@@ -112,7 +112,7 @@ public function partialShipDelivery(OrderDeliveryEntity $delivery, Context $cont
     {
         $statusTechnical = $this->getStatusTechnicalName($delivery);
 
-        if ($statusTechnical === OrderDeliveryStates::STATE_PARTIALLY_SHIPPED) {
+        if ($statusTechnical === OrderDeliveryStates::STATE_PARTIALLY_SHIPPED || $statusTechnical === OrderDeliveryStates::STATE_PARTIALLY_RETURNED) {
             return;
         }
 

tests/PHPUnit/Service/Refund/RefundCreditNoteServiceTest.php

@@ -116,7 +116,7 @@ public function throwsExceptionWhenNoLineItemsAreProvided(): void
     public function testCanAddRefundLineItems(): void
     {
         $data = [
-            ['id' => $lineItemId = Uuid::randomBytes()]
+            ['id' => $lineItemId = Uuid::randomBytes(), 'amount' => 1]
         ];
 
         $price = $this->createConfiguredMock(CalculatedPrice::class, [
@@ -185,7 +185,7 @@ public function testThrowsExceptionWhenNoCreditLineItemsWouldBeUpserted(): void
         $this->expectException(CreditNoteException::class);
 
         $data = [
-            ['id' => Uuid::randomBytes()]
+            ['id' => Uuid::randomBytes(), 'amount' => 1]
         ];
 
         $searchResult = $this->createConfiguredMock(EntitySearchResult::class, ['first' => null]);