The methods \Magento\Sales\Model\Order\Payment\Operations\AbstractOperation::getInvoiceForTransactionId() and \Magento\Sales\Model\Order\Payment::_getInvoiceForTransactionId() duplicate almost the same code

dmitry_fedyuk · March 27, 2016, 7:53pm

\Magento\Sales\Model\Order\Payment\Operations\AbstractOperation::getInvoiceForTransactionId()

magento/magento2/blob/9546277/app/code/Magento/Sales/Model/Order/Payment/Operations/AbstractOperation.php#L95-L102


/**
 * Return invoice model for transaction
 *
 * @param OrderInterface $order
 * @param string $transactionId
 * @return false|Invoice
 */
protected function getInvoiceForTransactionId(OrderInterface $order, $transactionId)

github.com

magento/magento2/blob/9546277/app/code/Magento/Sales/Model/Order/Payment/Operations/AbstractOperation.php#L103-L120


{
    foreach ($order->getInvoiceCollection() as $invoice) {
        if ($invoice->getTransactionId() == $transactionId) {
            $invoice->load($invoice->getId());
            // to make sure all data will properly load (maybe not required)
            return $invoice;
        }
    }
    foreach ($order->getInvoiceCollection() as $invoice) {
        if ($invoice->getState() == \Magento\Sales\Model\Order\Invoice::STATE_OPEN
            && $invoice->load($invoice->getId())
        ) {
            $invoice->setTransactionId($transactionId);
            return $invoice;
        }
    }
    return false;
}

\Magento\Sales\Model\Order\Payment::_getInvoiceForTransactionId()

github.com

magento/magento2/blob/9546277/app/code/Magento/Sales/Model/Order/Payment.php#L1364-L1370


/**
 * Return invoice model for transaction
 *
 * @param string $transactionId
 * @return Invoice|false
 */
protected function _getInvoiceForTransactionId($transactionId)

github.com

magento/magento2/blob/9546277/app/code/Magento/Sales/Model/Order/Payment.php#L1371-L1389


{
    foreach ($this->getOrder()->getInvoiceCollection() as $invoice) {
        if ($invoice->getTransactionId() == $transactionId) {
            $invoice->load($invoice->getId());
            // to make sure all data will properly load (maybe not required)
            return $invoice;
        }
    }
    foreach ($this->getOrder()->getInvoiceCollection() as $invoice) {
        if ($invoice->getState() == \Magento\Sales\Model\Order\Invoice::STATE_OPEN && $invoice->load(
                $invoice->getId()
            )
        ) {
            $invoice->setTransactionId($transactionId);
            return $invoice;
        }
    }
    return false;
}