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

Set order status to canceled if exist when payment approval is reversed PS6 #1094

Merged
merged 1 commit into from
Jul 13, 2023
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
8 changes: 8 additions & 0 deletions config/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ services:
PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForPaymentPendingQuery: "ps_checkout.query.handler.order.get_order_for_payment_pending"
PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForPaymentRefundedQuery: "ps_checkout.query.handler.order.get_order_for_payment_refunded"
PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForPaymentReversedQuery: "ps_checkout.query.handler.order.get_order_for_payment_reversed"
PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForApprovalReversedQuery: "ps_checkout.query.handler.order.get_order_for_approval_reversed"
PrestaShop\Module\PrestashopCheckout\PayPal\Identity\Query\GetClientTokenPayPalQuery: "ps_checkout.query.handler.paypal.identity.get_client_token"
PrestaShop\Module\PrestashopCheckout\PayPal\Order\Query\GetCurrentPayPalOrderStatusQuery: "ps_checkout.query.handler.paypal.order.get_current_paypal_order_status"
PrestaShop\Module\PrestashopCheckout\PayPal\Order\Query\GetPayPalOrderForCheckoutCompletedQuery: "ps_checkout.query.handler.paypal.order.get_paypal_order_for_checkout_completed"
Expand Down Expand Up @@ -497,6 +498,7 @@ services:
- "@ps_checkout.cache.paypal.order"
- "@ps_checkout.checkout.checker"
- "@ps_checkout.paypal.order.service.check_transition_paypal_order_status"
- "@ps_checkout.order.state.service.order_state_mapper"

ps_checkout.event.subscriber.paypal.capture:
class: 'PrestaShop\Module\PrestashopCheckout\PayPal\Payment\Capture\EventSubscriber\PayPalCaptureEventSubscriber'
Expand Down Expand Up @@ -604,6 +606,12 @@ services:
arguments:
- "@ps_checkout.repository.pscheckoutcart"

ps_checkout.query.handler.order.get_order_for_approval_reversed:
class: 'PrestaShop\Module\PrestashopCheckout\Order\QueryHandler\GetOrderForApprovalReversedQueryHandler'
public: true
arguments:
- "@ps_checkout.repository.pscheckoutcart"

ps_checkout.query.handler.paypal.identity.get_client_token:
class: 'PrestaShop\Module\PrestashopCheckout\PayPal\Identity\QueryHandler\GetClientTokenPayPalQueryHandler'
public: true
Expand Down
50 changes: 50 additions & 0 deletions src/Order/Query/GetOrderForApprovalReversedQuery.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php
/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License version 3.0
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/AFL-3.0
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* @author PrestaShop SA and Contributors <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
*/

namespace PrestaShop\Module\PrestashopCheckout\Order\Query;

use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Exception\PayPalOrderException;
use PrestaShop\Module\PrestashopCheckout\PayPal\Order\ValueObject\PayPalOrderId;

class GetOrderForApprovalReversedQuery
{
/**
* @var PayPalOrderId
*/
private $orderPayPalId;

/**
* @param string $orderPayPalId
*
* @throws PayPalOrderException
*/
public function __construct($orderPayPalId)
{
$this->orderPayPalId = new PayPalOrderId($orderPayPalId);
}

/**
* @return PayPalOrderId
*/
public function getOrderPayPalId()
{
return $this->orderPayPalId;
}
}
102 changes: 102 additions & 0 deletions src/Order/Query/GetOrderForApprovalReversedQueryResult.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?php
/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License version 3.0
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/AFL-3.0
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* @author PrestaShop SA and Contributors <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
*/

namespace PrestaShop\Module\PrestashopCheckout\Order\Query;

use PrestaShop\Module\PrestashopCheckout\Order\Exception\OrderException;
use PrestaShop\Module\PrestashopCheckout\Order\State\Exception\OrderStateException;
use PrestaShop\Module\PrestashopCheckout\Order\State\ValueObject\OrderStateId;
use PrestaShop\Module\PrestashopCheckout\Order\ValueObject\OrderId;

class GetOrderForApprovalReversedQueryResult
{
/**
* @var OrderId
*/
private $orderId;

/**
* @var OrderStateId
*/
private $currentStateId;

/**
* @var bool
*/
private $hasBeenPaid;

/**
* @var bool
*/
private $hasBeenCanceled;

/**
* @param int $orderId
* @param int $currentStateId
* @param bool $hasBeenPaid
* @param bool $hasBeenCanceled
*
* @throws OrderException
* @throws OrderStateException
*/
public function __construct(
$orderId,
$currentStateId,
$hasBeenPaid,
$hasBeenCanceled
) {
$this->orderId = new OrderId($orderId);
$this->currentStateId = new OrderStateId($currentStateId);
$this->hasBeenPaid = $hasBeenPaid;
$this->hasBeenCanceled = $hasBeenCanceled;
}

/**
* @return OrderId
*/
public function getOrderId()
{
return $this->orderId;
}

/**
* @return OrderStateId
*/
public function getCurrentStateId()
{
return $this->currentStateId;
}

/**
* @return bool
*/
public function hasBeenPaid()
{
return $this->hasBeenPaid;
}

/**
* @return bool
*/
public function hasBeenCanceled()
{
return $this->hasBeenCanceled;
}
}
92 changes: 92 additions & 0 deletions src/Order/QueryHandler/GetOrderForApprovalReversedQueryHandler.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?php

/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License version 3.0
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/AFL-3.0
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* @author PrestaShop SA and Contributors <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
*/

namespace PrestaShop\Module\PrestashopCheckout\Order\QueryHandler;

use Configuration;
use Order;
use PrestaShop\Module\PrestashopCheckout\Cart\Exception\CartNotFoundException;
use PrestaShop\Module\PrestashopCheckout\Exception\PsCheckoutException;
use PrestaShop\Module\PrestashopCheckout\Order\Exception\OrderNotFoundException;
use PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForApprovalReversedQuery;
use PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForApprovalReversedQueryResult;
use PrestaShop\Module\PrestashopCheckout\Order\State\OrderStateConfigurationKeys;
use PrestaShop\Module\PrestashopCheckout\Repository\PsCheckoutCartRepository;
use PrestaShopCollection;
use PrestaShopDatabaseException;
use PrestaShopException;
use PsCheckoutCart;
use Validate;

class GetOrderForApprovalReversedQueryHandler
{
/**
* @var PsCheckoutCartRepository
*/
private $psCheckoutCartRepository;

public function __construct(PsCheckoutCartRepository $psCheckoutCartRepository)
{
$this->psCheckoutCartRepository = $psCheckoutCartRepository;
}

/**
* @param GetOrderForApprovalReversedQuery $query
*
* @return GetOrderForApprovalReversedQueryResult
*
* @throws PsCheckoutException
* @throws PrestaShopDatabaseException
* @throws PrestaShopException
*/
public function handle(GetOrderForApprovalReversedQuery $query)
{
/** @var PsCheckoutCart|false $psCheckoutCart */
$psCheckoutCart = $this->psCheckoutCartRepository->findOneByPayPalOrderId($query->getOrderPayPalId()->getValue());

if (!$psCheckoutCart) {
throw new CartNotFoundException('No PrestaShop Cart associated to this PayPal Order at this time.');
}

$orders = new PrestaShopCollection(Order::class);
$orders->where('id_cart', '=', $psCheckoutCart->getIdCart());

if (!$orders->count()) {
throw new OrderNotFoundException('No PrestaShop Order associated to this PayPal Order at this time.');
}

/** @var Order $order */
$order = $orders->getFirst();

if (!Validate::isLoadedObject($order)) {
throw new OrderNotFoundException('No PrestaShop Order associated to this PayPal Order at this time.');
}

$hasBeenCanceled = count($order->getHistory($order->id_lang, (int) Configuration::getGlobalValue(OrderStateConfigurationKeys::CANCELED)));

return new GetOrderForApprovalReversedQueryResult(
(int) $order->id,
(int) $order->getCurrentState(),
(bool) $order->hasBeenPaid(),
(bool) $hasBeenCanceled
);
}
}
Loading