Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INTER-3722: Update Bold order platform ID during process order flow #286

Merged
merged 2 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 98 additions & 0 deletions Model/Order/CompleteOrder.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?php

declare(strict_types=1);

namespace Bold\Checkout\Model\Order;

use Bold\Checkout\Api\Http\ClientInterface;
use Bold\Checkout\Model\ResourceModel\Order\OrderExtensionData;
use Bold\Checkout\Model\ResourceModel\Order\OrderExtensionData as OrderExtensionDataResource;
use Magento\Framework\Exception\LocalizedException;
use Magento\Sales\Api\Data\OrderInterface;
use Psr\Log\LoggerInterface;

/**
* Mark the Order as created on the Bold side.
*/
class CompleteOrder
{
private const COMPLETE_URL = 'checkout/orders/{{shop_id}}/%s/complete';

/**
* @var ClientInterface
*/
private $client;

/**
* @var OrderExtensionDataFactory
*/
private $orderExtensionDataFactory;

/**
* @var OrderExtensionDataResource
*/
private $orderExtensionDataResource;

/**
* @var LoggerInterface
*/
private $logger;

/**
* @param ClientInterface $client
* @param OrderExtensionDataFactory $orderExtensionDataFactory
* @param OrderExtensionDataResource $orderExtensionDataResource
* @param LoggerInterface $logger
*/
public function __construct(
ClientInterface $client,
OrderExtensionDataFactory $orderExtensionDataFactory,
OrderExtensionDataResource $orderExtensionDataResource,
LoggerInterface $logger
) {
$this->client = $client;
$this->orderExtensionDataFactory = $orderExtensionDataFactory;
$this->orderExtensionDataResource = $orderExtensionDataResource;
$this->logger = $logger;
}

/**
* Mark the Order as created on the Bold side.
*
* @param OrderInterface $order
* @return void
* @throws LocalizedException
*/
public function execute(OrderInterface $order): void
{
$websiteId = (int)$order->getStore()->getWebsiteId();
$publicOrderId = $this->getOrderPublicId($order);
$orderId = $order->getEntityId();
$body = [
'platform_order_id' => $orderId,
];
$url = sprintf(self::COMPLETE_URL, $publicOrderId);
$response = $this->client->post($websiteId, $url, $body);
if ($response->getStatus() !== 200) {
$this->logger->error(__('Failed to complete order with id="%1"', $orderId));
}
}

/**
* Retrieve order public id.
*
* @param OrderInterface $order
* @return string
* @throws LocalizedException
*/
private function getOrderPublicId(OrderInterface $order): string
{
$orderExtensionData = $this->orderExtensionDataFactory->create();
$this->orderExtensionDataResource->load($orderExtensionData, $order->getId(), OrderExtensionData::ORDER_ID);
if (!$orderExtensionData->getPublicId()) {
throw new LocalizedException(__('Order public id is not set.'));
}

return $orderExtensionData->getPublicId();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ public function create(CartInterface $quote, OrderDataInterface $orderPayload):
[
'order' => $order,
'quote' => $quote,
'order_payload' => $orderPayload,
]
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@

namespace Bold\Checkout\Observer\Order;

use Bold\Checkout\Api\Data\PlaceOrder\Request\OrderDataInterface;
use Bold\Checkout\Model\Order\CompleteOrder;
use Bold\Checkout\Model\Order\OrderExtensionDataFactory;
use Bold\Checkout\Model\ResourceModel\Order\OrderExtensionData as OrderExtensionDataResource;
use Exception;
use Magento\Checkout\Model\Session;
use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
use Magento\Framework\Exception\LocalizedException;

/**
* Save order extension data.
* Perform after order submit actions.
*/
class SaveOrderExtensionDataObserver implements ObserverInterface
class CheckoutSubmitAllAfterObserver implements ObserverInterface
{
/**
* @var OrderExtensionDataFactory
Expand All @@ -41,32 +44,41 @@ class SaveOrderExtensionDataObserver implements ObserverInterface
*/
private $boldPaymentMethods;

/**
* @var CompleteOrder
*/
private $completeOrder;

/**
* @param OrderExtensionDataFactory $orderExtensionDataFactory
* @param OrderExtensionDataResource $orderExtensionDataResource
* @param Session $checkoutSession
* @param EventManagerInterface $eventManager
* @param CompleteOrder $completeOrder
* @param array $boldPaymentMethods
*/
public function __construct(
OrderExtensionDataFactory $orderExtensionDataFactory,
OrderExtensionDataResource $orderExtensionDataResource,
Session $checkoutSession,
EventManagerInterface $eventManager,
CompleteOrder $completeOrder,
array $boldPaymentMethods = []
) {
$this->orderExtensionDataFactory = $orderExtensionDataFactory;
$this->orderExtensionDataResource = $orderExtensionDataResource;
$this->checkoutSession = $checkoutSession;
$this->eventManager = $eventManager;
$this->boldPaymentMethods = $boldPaymentMethods;
$this->completeOrder = $completeOrder;
}

/**
* Save order extension data.
* Perform after order submit actions.
*
* @param Observer $observer
* @return void
* @throws LocalizedException
*/
public function execute(Observer $observer)
{
Expand All @@ -80,6 +92,11 @@ public function execute(Observer $observer)
$orderId = (int)$order->getEntityId();
$publicOrderId = $this->checkoutSession->getBoldCheckoutData()['data']['public_order_id'] ?? null;
$this->checkoutSession->setBoldCheckoutData(null);
if (!$publicOrderId) {
/** @var OrderDataInterface $orderPayload */
$orderPayload = $observer->getEvent()->getOrderPayload();
$publicOrderId = $orderPayload ? $orderPayload->getPublicId() : null;
}
if (!$publicOrderId) {
return;
}
Expand All @@ -95,5 +112,6 @@ public function execute(Observer $observer)
} catch (Exception $e) {
return;
}
$this->completeOrder->execute($order);
}
}
7 changes: 6 additions & 1 deletion etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
<argument name="client" xsi:type="object">Bold\Checkout\Model\Http\BoldClient</argument>
</arguments>
</type>
<type name="Bold\Checkout\Model\Order\CompleteOrder">
<arguments>
<argument name="client" xsi:type="object">Bold\Checkout\Model\Http\BoldClient</argument>
</arguments>
</type>
<type name="Bold\Checkout\Model\Payment\Gateway\Service">
<arguments>
<argument name="httpClient" xsi:type="object">Bold\Checkout\Model\Http\BoldClient</argument>
Expand Down Expand Up @@ -146,7 +151,7 @@
</argument>
</arguments>
</type>
<type name="Bold\Checkout\Observer\Order\SaveOrderExtensionDataObserver">
<type name="Bold\Checkout\Observer\Order\CheckoutSubmitAllAfterObserver">
<arguments>
<argument name="boldPaymentMethods" xsi:type="array">
<item name="bold_checkout" xsi:type="string">bold</item>
Expand Down
2 changes: 1 addition & 1 deletion etc/events.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
<event name="checkout_submit_all_after">
<observer name="save_order_extension_data" instance="Bold\Checkout\Observer\Order\SaveOrderExtensionDataObserver"/>
<observer name="bold_checkout_submit_all_after" instance="Bold\Checkout\Observer\Order\CheckoutSubmitAllAfterObserver"/>
</event>
<event name="sales_order_shipment_save_after">
<observer name="fulfill_order_items" instance="Bold\Checkout\Observer\Order\Shipment\FulfillOrderItemsObserver"/>
Expand Down