Skip to content
Open
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
14 changes: 5 additions & 9 deletions Classes/Controller/Order/PaymentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,10 @@ public function cancelAction(): void
}
}

public function notifyAction(): void
public function notifyAction()
{
if ($this->request->getMethod() !== 'POST') {
$this->response->setStatus(405);
exit();
return $this->htmlResponse()->withStatus(405, 'Method not allowed.');
}

$postData = GeneralUtility::_POST();
Expand All @@ -208,15 +207,13 @@ public function notifyAction(): void

$cartSHash = $postData['custom'];
if (empty($cartSHash)) {
$this->response->setStatus(403);
exit();
return $this->htmlResponse()->withStatus(403, 'Not allowed.');
}

$this->loadCartByHash($this->request->getArgument('hash'));

if ($this->cart === null) {
$this->response->setStatus(404);
exit();
return $this->htmlResponse()->withStatus(404, 'Page / Cart not found.');
}

$orderItem = $this->cart->getOrderItem();
Expand All @@ -231,8 +228,7 @@ public function notifyAction(): void
$this->eventDispatcher->dispatch($notifyEvent);
}

$this->response->setStatus(200);
exit();
return $this->htmlResponse()->withStatus(200);
}

protected function restoreCartSession(): void
Expand Down
16 changes: 15 additions & 1 deletion Classes/EventListener/Order/Payment/ClearCart.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,23 @@
*/

use Extcode\Cart\Event\Order\EventInterface;
use Extcode\Cart\EventListener\Order\Finish\ClearCart as FinishClearCart;
use Extcode\Cart\Service\SessionHandler;
use Extcode\Cart\Utility\CartUtility;
use Extcode\Cart\Utility\ParserUtility;

class ClearCart extends \Extcode\Cart\EventListener\ProcessOrderCreate\ClearCart
class ClearCart extends FinishClearCart
{
public function __construct(
CartUtility $cartUtility,
ParserUtility $parserUtility,
SessionHandler $sessionHandler
) {
$this->cartUtility = $cartUtility;
$this->parserUtility = $parserUtility;
$this->sessionHandler = $sessionHandler;
}

public function __invoke(EventInterface $event): void
{
$orderItem = $event->getOrderItem();
Expand Down
6 changes: 5 additions & 1 deletion Configuration/Services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ services:
$paymentRepository: '@Extcode\Cart\Domain\Repository\Order\PaymentRepository'

Extcode\CartPaypal\EventListener\Order\Payment\ClearCart:
arguments:
$cartUtility: '@Extcode\Cart\Utility\CartUtility'
$parserUtility: '@Extcode\Cart\Utility\ParserUtility'
$sessionHandler: '@Extcode\Cart\Service\SessionHandler'
tags:
- name: event.listener
identifier: 'cart-paypal--order--payment--clear-cart'
Expand All @@ -35,7 +39,7 @@ services:
event: Extcode\Cart\Event\Order\PaymentEvent

Extcode\CartPaypal\EventListener\Order\Notify\Email:
class: 'Extcode\Cart\EventListener\ProcessOrderCreate\Email'
class: 'Extcode\Cart\EventListener\Order\Finish\Email'
tags:
- name: event.listener
identifier: 'cart-paypal--order--notify--email'
Expand Down
2 changes: 1 addition & 1 deletion Configuration/TCA/Overrides/sys_template.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
defined('TYPO3_MODE') or die();
defined('TYPO3') or die();

call_user_func(function () {
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

defined('TYPO3_MODE') or die();
defined('TYPO3') or die();

$_LLL = 'LLL:EXT:cart_paypal/Resources/Private/Language/locallang_db.xlf';

Expand Down
11 changes: 11 additions & 0 deletions Resources/Private/Templates/Order/Payment/Notify.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<f:layout name="Default"/>

<f:section name="main">
<f:flashMessages/>

<f:if condition="{orderItem}">
<div class="col-sm-12 col-md-12 col-lg-12">
<f:translate key="tx_cart.controller.order.action.payment_cancel.thank_you"/>
</div>
</f:if>
</f:section>
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"PayPal",
"cart"
],
"version": "5.1.0",
"authors": [
{
"name": "Daniel Gohlke",
Expand Down Expand Up @@ -41,10 +42,10 @@
"require": {
"php": ">=7.2.0 <7.5",
"ext-curl": "*",
"typo3/cms-core": "^10.4",
"typo3/cms-extbase": "^10.4",
"typo3/cms-frontend": "^10.4",
"extcode/cart": "^7.4"
"typo3/cms-core": "^11.5",
"typo3/cms-extbase": "^11.5",
"typo3/cms-frontend": "^11.5",
"extcode/cart": "^8.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",
Expand Down
2 changes: 1 addition & 1 deletion ext_localconf.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

defined('TYPO3_MODE') or die();
defined('TYPO3') or die();

// configure plugins

Expand Down