Skip to content

Commit 1b3d645

Browse files
authored
Remove cancellation logic from refund observer (#749)
1 parent 57fb2cc commit 1b3d645

File tree

1 file changed

+25
-32
lines changed

1 file changed

+25
-32
lines changed

app/code/Meta/Sales/Observer/Order/Refund.php

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -177,39 +177,32 @@ protected function executeImpl(Observer $observer)
177177
$shippingRefundAmount += $creditmemo->getShippingTaxAmount();
178178
}
179179

180-
if ($payment->getOrder()->hasShipments()) {
181-
try {
182-
$refundItemsBySku = $this->getRefundItems($creditmemo, $payment, false);
183-
$this->refundOrder(
184-
(int)$storeId,
185-
$facebookOrder->getFacebookOrderId(),
186-
$refundItemsBySku,
187-
$shippingRefundAmount,
188-
$deductionAmount,
189-
$adjustmentAmount,
190-
$currencyCode,
191-
$reasonText
192-
);
193-
} catch (LocalizedException $e) {
194-
$refundItemsByID = $this->getRefundItems($creditmemo, $payment, true);
195-
$this->refundOrder(
196-
(int)$storeId,
197-
$facebookOrder->getFacebookOrderId(),
198-
$refundItemsByID,
199-
$shippingRefundAmount,
200-
$deductionAmount,
201-
$adjustmentAmount,
202-
$currencyCode,
203-
$reasonText
204-
);
205-
}
206-
$payment->getOrder()->addCommentToStatusHistory('Order Refunded on Meta');
207-
} else {
208-
$canceledItemsByID = $this->getCanceledItems($creditmemo, false);
209-
$this->commerceHelper->cancelOrder((int)$storeId, $facebookOrder->getFacebookOrderId(), $canceledItemsByID);
210-
211-
$payment->getOrder()->addCommentToStatusHistory('Order Canceled on Meta');
180+
try {
181+
$refundItemsBySku = $this->getRefundItems($creditmemo, $payment, false);
182+
$this->refundOrder(
183+
(int)$storeId,
184+
$facebookOrder->getFacebookOrderId(),
185+
$refundItemsBySku,
186+
$shippingRefundAmount,
187+
$deductionAmount,
188+
$adjustmentAmount,
189+
$currencyCode,
190+
$reasonText
191+
);
192+
} catch (LocalizedException $e) {
193+
$refundItemsByID = $this->getRefundItems($creditmemo, $payment, true);
194+
$this->refundOrder(
195+
(int)$storeId,
196+
$facebookOrder->getFacebookOrderId(),
197+
$refundItemsByID,
198+
$shippingRefundAmount,
199+
$deductionAmount,
200+
$adjustmentAmount,
201+
$currencyCode,
202+
$reasonText
203+
);
212204
}
205+
$payment->getOrder()->addCommentToStatusHistory('Order Refunded on Meta');
213206
}
214207

215208
/**

0 commit comments

Comments
 (0)