@@ -26,10 +31,10 @@ In local environment, the plugin will not work properly because you will not be
## Compatibility
-| | Version |
-| :--- |:----------------------|
-| PHP | 7.4, 8.0, 8.1 |
-| Sylius | 1.9, 1.10, 1.11, 1.12 |
+| | Version |
+| :--- |:--------|
+| PHP | ^8.2 |
+| Sylius | ^2.0 |
## Installation
@@ -46,14 +51,7 @@ In local environment, the plugin will not work properly because you will not be
bin/console doctrine:migrations:migrate
```
-3. Copy templates that are overridden by Sylius into `templates/bundles/SyliusAdminBundle`
-
- ```shell
- mkdir -p templates/bundles/SyliusAdminBundle/
- cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
- ```
-
-4. Add Payplug to refundable payment method for Sylius Refund Plugin in `config/services.yaml`
+3. Add Payplug to refundable payment method for Sylius Refund Plugin in `config/services.yaml`
```yaml
parameters:
@@ -66,14 +64,7 @@ In local environment, the plugin will not work properly because you will not be
- payplug_american_express
```
-5. Add Payplug routes in `config/routes.yaml`
-
- ```yaml
- sylius_payplug:
- resource: "@PayPlugSyliusPayPlugPlugin/config/routing.yaml"
- ```
-
-8. Add Traits for Customer and PaymentMethod entities
+4. Add Traits for Customer and PaymentMethod entities
* App\Entity\Customer\Customer
@@ -158,14 +149,14 @@ In local environment, the plugin will not work properly because you will not be
}
```
-9. Process translations
+5. Process translations
```bash
php bin/console translation:extract en PayPlugSyliusPayPlugPlugin --dump-messages
php bin/console translation:extract fr PayPlugSyliusPayPlugPlugin --dump-messages
```
-10. Clear cache:
+6. Clear cache:
```shell
php bin/console cache:clear
@@ -174,6 +165,60 @@ In local environment, the plugin will not work properly because you will not be
🎉 You are now ready to add Payplug Payment method.
In your back-office, go to `Configuration > Payment methods`, then click on `Create` and choose "**Payplug**".
+### Assets installation (only for Sylius 2.0.x)
+
+On sylius 2.0.x, there is no automatic load of assets.
+You need to add the following lines in `assets/shop/controllers.json` to allow Sylius to use our assets:
+
+```json
+{
+ "controllers": {
+ "@payplug/sylius-payplug-plugin": {
+ "oney-popin": {
+ "enabled": true,
+ "fetch": "lazy",
+ "autoimport": {
+ "@payplug/sylius-payplug-plugin/shop/dist/oney_common/index.css": true,
+ "@payplug/sylius-payplug-plugin/shop/dist/oney_popin/index.css": true
+ }
+ },
+ "integrated-payment": {
+ "enabled": true,
+ "fetch": "lazy",
+ "autoimport": {
+ "@payplug/sylius-payplug-plugin/shop/dist/payment/integrated.css": true
+ }
+ },
+ "oney-payment": {
+ "enabled": true,
+ "fetch": "lazy"
+ },
+ "payment-logo": {
+ "enabled": true,
+ "fetch": "lazy"
+ },
+ "checkout-select-payment": {
+ "enabled": true,
+ "fetch": "lazy",
+ "autoimport": {
+ "@payplug/sylius-payplug-plugin/shop/dist/payment/index.css": true
+ }
+ },
+ "apple-pay": {
+ "enabled": true,
+ "fetch": "lazy"
+ }
+ }
+ },
+ "entrypoints": []
+}
+```
+
+> [!NOTE]
+> On Sylius Standard >= 2.1, assets are automatically loaded when you install the plugin with flex.
+> If you are upgrading from a 2.0.x version, read the [upgrade guide](https://github.com/Sylius/Sylius/blob/2.1/UPGRADE-2.1.md#assets)
+
+
## Logs
If you want to follow the logs in the production environment, you need to add the configuration in `config/packages/prod/monolog.yaml`, logs should be in `var/log/prod.log` which can be searched after the phrase `[Payum]` or `[Payplug]`:
@@ -199,30 +244,6 @@ Run the below command to see what Symfony services are shared with this plugin:
$ bin/console debug:container payplug_sylius_payplug_plugin
```
-### Template overriding
-
-This plugin override some sylius templates.
-If you plan override them also, you should retrieve them in your application.
-
-Copy Sylius templates overridden in plugin to your templates directory (e.g templates/bundles/)
-
-```shell
-mkdir -p templates/bundles/SyliusAdminBundle/
-mkdir -p templates/bundles/SyliusShopBundle/
-mkdir -p templates/bundles/SyliusUiBundle/
-cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
-cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusShopBundle/* templates/bundles/SyliusShopBundle/
-cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusUiBundle/* templates/bundles/SyliusUiBundle/
-```
-
-You also need to edit your twig config to add your path to avoid our configuration to be prepended :
-```yaml
-twig:
- paths:
- '%kernel.project_dir%/templates/bundles/SyliusAdminBundle': SyliusAdmin
- '%kernel.project_dir%/templates/bundles/SyliusShopBundle': SyliusShop
- '%kernel.project_dir%/templates/bundles/SyliusUiBundle': SyliusUi
-```
## Development
See [How to contribute](CONTRIBUTING.md).
diff --git a/composer.json b/composer.json
index 079ccdb9..f7d338e1 100755
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"phpstan/phpstan-doctrine": "2.0.1",
"phpstan/phpstan-strict-rules": "2.0.1",
"phpstan/phpstan-webmozart-assert": "2.0.0",
- "phpunit/phpunit": "9.6.22",
+ "phpunit/phpunit": "^9.6",
"rector/rector": "2.0.4",
"sylius-labs/coding-standard": "4.4.0",
"sylius/test-application": "^2.1.0@alpha",
diff --git a/src/Command/Handler/StatusPaymentRequestHandler.php b/src/Command/Handler/StatusPaymentRequestHandler.php
index 4757f2ae..2515ed95 100644
--- a/src/Command/Handler/StatusPaymentRequestHandler.php
+++ b/src/Command/Handler/StatusPaymentRequestHandler.php
@@ -8,6 +8,7 @@
use PayPlug\SyliusPayPlugPlugin\ApiClient\PayPlugApiClientInterface;
use PayPlug\SyliusPayPlugPlugin\Command\StatusPaymentRequest;
use PayPlug\SyliusPayPlugPlugin\Handler\PaymentNotificationHandler;
+use Psr\Log\LoggerInterface;
use Sylius\Abstraction\StateMachine\StateMachineInterface;
use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestProviderInterface;
use Sylius\Component\Payment\Model\PaymentInterface;
@@ -24,6 +25,7 @@ public function __construct(
private StateMachineInterface $stateMachine,
private PayPlugApiClientFactoryInterface $apiClientFactory,
private PaymentNotificationHandler $paymentNotificationHandler,
+ private LoggerInterface $logger,
) {}
public function __invoke(StatusPaymentRequest $statusPaymentRequest): void
@@ -43,8 +45,16 @@ public function __invoke(StatusPaymentRequest $statusPaymentRequest): void
// We don't have a forced status, so we retrieve the payment status from PayPlug
$client = $this->apiClientFactory->createForPaymentMethod($method);
- // @phpstan-ignore-next-line - getDetails() return mixed
- $payplugPayment = $client->retrieve($payment->getDetails()['payment_id'] ?? throw new \LogicException('No PayPlug payment ID found in payment details.'));
+ /** @var null|string $payplugPaymentId */
+ $payplugPaymentId = $payment->getDetails()['payment_id'] ?? null;
+ if (null === $payplugPaymentId) {
+ $this->logger->warning('No PayPlug payment ID found in payment details.', ['payment_id' => $payment->getId(), 'order_id' => $payment->getOrder()?->getId()]);
+ $payment->setDetails(['status' => PayPlugApiClientInterface::FAILED]);
+ $this->updatePaymentState($payment);
+ return;
+ }
+
+ $payplugPayment = $client->retrieve($payplugPaymentId);
$paymentRequest->setResponseData((array) $payplugPayment);
$details = new \ArrayObject($payment->getDetails());
diff --git a/src/Creator/PayPlugPaymentDataCreator.php b/src/Creator/PayPlugPaymentDataCreator.php
index 940fe558..e9e32322 100644
--- a/src/Creator/PayPlugPaymentDataCreator.php
+++ b/src/Creator/PayPlugPaymentDataCreator.php
@@ -54,7 +54,8 @@ public function create(
/** @var CustomerInterface $customer */
$customer = $order->getCustomer();
- $details = new ArrayObject($payment->getDetails());
+ /** @var ArrayObject $details */
+ $details = new ArrayObject();
$details['amount'] = $payment->getAmount();
$details['currency'] = $payment->getCurrencyCode();
diff --git a/src/PaymentProcessing/AbortPaymentProcessor.php b/src/PaymentProcessing/AbortPaymentProcessor.php
index 60cf8d48..e03fceef 100644
--- a/src/PaymentProcessing/AbortPaymentProcessor.php
+++ b/src/PaymentProcessing/AbortPaymentProcessor.php
@@ -35,12 +35,18 @@ public function onFailedCompleteTransitionEvent(CompletedEvent $event): void
public function process(PaymentInterface $payment): void
{
+ $paymentId = $payment->getDetails()['payment_id'] ?? null;
+ if (null === $paymentId) {
+ // Payment not even started on payplug
+ return;
+ }
+
try {
// When a payment is failed on Sylius, also abort it on PayPlug.
// This should prevent the case that if we are already on PayPlug payment page
// and go to the order history in another tab to click on pay again, then fail the transaction
// and go back on the first PayPlug payment page and succeed it, it stays failed as its first payment model is already failed
- $this->payPlugApiClient->abortPayment($payment->getDetails()['payment_id']);
+ $this->payPlugApiClient->abortPayment($paymentId);
} catch (HttpException) {
}
}
+ 
+