[26/09/2024] MAJ du module PayBox en 1.2.5, pour contrainte 3DSv2

This commit is contained in:
2024-09-26 15:54:12 +02:00
parent e288ca861d
commit 0359d96baf
27 changed files with 2860 additions and 2420 deletions

View File

@@ -62,7 +62,8 @@
"ramsey/array_column": "~1.1", "ramsey/array_column": "~1.1",
"propel/propel": "dev-thelia-2.3", "propel/propel": "dev-thelia-2.3",
"commerceguys/addressing": "0.8.*", "commerceguys/addressing": "0.8.*",
"thelia/paypal-module": "~3.0.0" "thelia/paypal-module": "~3.0.0",
"giggsey/libphonenumber-for-php": "^8.1.3"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "1.5.*", "fzaninotto/faker": "1.5.*",

136
composer.lock generated
View File

@@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "8fbc68f5bab568a5ff0999a67a6fef4f", "content-hash": "9adcc003d8cd7a382d5fedd229b5e860",
"packages": [ "packages": [
{ {
"name": "commerceguys/addressing", "name": "commerceguys/addressing",
@@ -349,17 +349,134 @@
"abandoned": "tecnickcom/tcpdf", "abandoned": "tecnickcom/tcpdf",
"time": "2013-09-12T17:00:40+00:00" "time": "2013-09-12T17:00:40+00:00"
}, },
{
"name": "giggsey/libphonenumber-for-php",
"version": "8.12.4",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
"reference": "cb79970730aacaedb74c8288214a5576572fa7b0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/cb79970730aacaedb74c8288214a5576572fa7b0",
"reference": "cb79970730aacaedb74c8288214a5576572fa7b0",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"giggsey/locale": "^1.7",
"php": ">=5.3.2"
},
"require-dev": {
"pear/pear-core-minimal": "^1.9",
"pear/pear_exception": "^1.0",
"pear/versioncontrol_git": "^0.5",
"phing/phing": "^2.7",
"php-coveralls/php-coveralls": "^1.0|^2.0",
"phpunit/phpunit": "^4.8.36|^5.0",
"symfony/console": "^2.8|^3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "8.x-dev"
}
},
"autoload": {
"psr-4": {
"libphonenumber\\": "src/"
},
"exclude-from-classmap": [
"/src/data/",
"/src/carrier/data/",
"/src/geocoding/data/",
"/src/timezone/data/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Joshua Gigg",
"email": "giggsey@gmail.com",
"homepage": "https://giggsey.com/"
}
],
"description": "PHP Port of Google's libphonenumber",
"homepage": "https://github.com/giggsey/libphonenumber-for-php",
"keywords": [
"geocoding",
"geolocation",
"libphonenumber",
"mobile",
"phonenumber",
"validation"
],
"time": "2020-05-19T11:20:54+00:00"
},
{
"name": "giggsey/locale",
"version": "1.9",
"source": {
"type": "git",
"url": "https://github.com/giggsey/Locale.git",
"reference": "b07f1eace8072ccc61445ad8fbd493ff9d783043"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/Locale/zipball/b07f1eace8072ccc61445ad8fbd493ff9d783043",
"reference": "b07f1eace8072ccc61445ad8fbd493ff9d783043",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"require-dev": {
"pear/pear-core-minimal": "^1.9",
"pear/pear_exception": "^1.0",
"pear/versioncontrol_git": "^0.5",
"phing/phing": "~2.7",
"php-coveralls/php-coveralls": "^1.0|^2.0",
"phpunit/phpunit": "^4.8|^5.0",
"symfony/console": "^2.8|^3.0|^4.0",
"symfony/filesystem": "^2.8|^3.0|^4.0",
"symfony/finder": "^2.8|^3.0|^4.0",
"symfony/process": "^2.8|^3.0|^4.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Giggsey\\Locale\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Joshua Gigg",
"email": "giggsey@gmail.com",
"homepage": "http://giggsey.com/"
}
],
"description": "Locale functions required by libphonenumber-for-php",
"time": "2020-07-07T11:16:24+00:00"
},
{ {
"name": "imagine/imagine", "name": "imagine/imagine",
"version": "v0.6.3", "version": "v0.6.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/avalanche123/Imagine.git", "url": "https://github.com/php-imagine/Imagine.git",
"reference": "149041d2a1b517107bfe270ca2b1a17aa341715d" "reference": "149041d2a1b517107bfe270ca2b1a17aa341715d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/avalanche123/Imagine/zipball/149041d2a1b517107bfe270ca2b1a17aa341715d", "url": "https://api.github.com/repos/php-imagine/Imagine/zipball/149041d2a1b517107bfe270ca2b1a17aa341715d",
"reference": "149041d2a1b517107bfe270ca2b1a17aa341715d", "reference": "149041d2a1b517107bfe270ca2b1a17aa341715d",
"shasum": "" "shasum": ""
}, },
@@ -714,6 +831,7 @@
"php", "php",
"stylesheet" "stylesheet"
], ],
"abandoned": true,
"time": "2015-12-30T05:47:36+00:00" "time": "2015-12-30T05:47:36+00:00"
}, },
{ {
@@ -811,6 +929,7 @@
"rest", "rest",
"sdk" "sdk"
], ],
"abandoned": true,
"time": "2016-04-22T03:29:29+00:00" "time": "2016-04-22T03:29:29+00:00"
}, },
{ {
@@ -1001,6 +1120,7 @@
"array_column", "array_column",
"column" "column"
], ],
"abandoned": "it-for-free/array_column",
"time": "2015-03-20T22:07:39+00:00" "time": "2015-03-20T22:07:39+00:00"
}, },
{ {
@@ -1159,6 +1279,7 @@
"keywords": [ "keywords": [
"stack" "stack"
], ],
"abandoned": true,
"time": "2014-11-23T20:37:11+00:00" "time": "2014-11-23T20:37:11+00:00"
}, },
{ {
@@ -1212,6 +1333,7 @@
"mail", "mail",
"mailer" "mailer"
], ],
"abandoned": "symfony/mailer",
"time": "2015-06-06T14:19:39+00:00" "time": "2015-06-06T14:19:39+00:00"
}, },
{ {
@@ -1378,6 +1500,7 @@
], ],
"description": "Symfony ClassLoader Component", "description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"abandoned": true,
"time": "2016-01-03T15:33:41+00:00" "time": "2016-01-03T15:33:41+00:00"
}, },
{ {
@@ -1545,6 +1668,7 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"abandoned": "symfony/error-handler",
"time": "2016-01-13T10:28:07+00:00" "time": "2016-01-13T10:28:07+00:00"
}, },
{ {
@@ -2916,6 +3040,7 @@
], ],
"description": "Symfony Security Component", "description": "Symfony Security Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"abandoned": true,
"time": "2016-01-14T09:10:32+00:00" "time": "2016-01-14T09:10:32+00:00"
}, },
{ {
@@ -4450,5 +4575,6 @@
"platform": { "platform": {
"php": ">=5.4" "php": ">=5.4"
}, },
"platform-dev": [] "platform-dev": [],
"plugin-api-version": "1.1.0"
} }

BIN
composer.phar Normal file

Binary file not shown.

View File

@@ -0,0 +1,7 @@
name: "Auto Release"
on:
push:
branches: [ master, main ]
jobs:
release:
uses: thelia-modules/ReusableWorkflow/.github/workflows/auto_release.yml@main

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="module_configuration.html" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
</dwsync>

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="clef-publique-paybox.pem" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
<file name="config.xml" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
<file name="iso4217.xml" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
<file name="module.xml" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
<file name="routing.xml" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
</dwsync>

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@
<descriptive locale="fr_FR"> <descriptive locale="fr_FR">
<title>Paiement en carte bancaire avec Paybox</title> <title>Paiement en carte bancaire avec Paybox</title>
</descriptive> </descriptive>
<version>1.0.0</version> <version>1.2.5</version>
<author> <author>
<name>Franck Allimant</name> <name>Franck Allimant</name>
<email>franck@cqfdev.fr</email> <email>franck@cqfdev.fr</email>

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="ConfigurationController.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
<file name="PaymentController.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
</dwsync>

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="SendConfirmationEmail.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
</dwsync>

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="ConfigurationForm.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
</dwsync>

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="en_US.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="fr_FR.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
</dwsync>

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="en_US.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="fr_FR.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
</dwsync>

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="fr_FR.php" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
</dwsync>

View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="en.html" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="en.txt" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="fr.html" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="fr.txt" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="notification-en.html" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="notification-en.txt" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="notification-fr.html" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="notification-fr.txt" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
</dwsync>

View File

@@ -12,6 +12,7 @@ return array(
'Failed to open %file, please check Paybox configuration' => 'Failed to open %file, please check Paybox configuration', 'Failed to open %file, please check Paybox configuration' => 'Failed to open %file, please check Paybox configuration',
'Identifiant interne' => 'Internal identifier', 'Identifiant interne' => 'Internal identifier',
'Identifiant interne, tel que fourni par Paybox' => 'Internal identifier, provided by Paybox', 'Identifiant interne, tel que fourni par Paybox' => 'Internal identifier, provided by Paybox',
'Invalid phone number %num for country %country' => 'Invalid phone number %num for country %country',
'Le fichier de log est vide.' => 'The log file is empty.', 'Le fichier de log est vide.' => 'The log file is empty.',
'Le fichier de log n\'a pas été trouvé.' => 'The log file could not be found.', 'Le fichier de log n\'a pas été trouvé.' => 'The log file could not be found.',
'Maximum order total' => 'Maximum order total', 'Maximum order total' => 'Maximum order total',
@@ -32,6 +33,7 @@ return array(
'Paybox configuration' => 'Paybox configuration', 'Paybox configuration' => 'Paybox configuration',
'Paybox platform request processing terminated.' => 'Paybox platform request processing terminated.', 'Paybox platform request processing terminated.' => 'Paybox platform request processing terminated.',
'Paybox platform request received.' => 'Paybox platform request received.', 'Paybox platform request received.' => 'Paybox platform request received.',
'Please enter a valid phone number in your invoice address (error is : %err)' => 'Please enter a valid phone number in your invoice address (error is : %err)',
'Production' => 'Production', 'Production' => 'Production',
'Request parameters signature verification failed.' => 'Request parameters signature verification failed.', 'Request parameters signature verification failed.' => 'Request parameters signature verification failed.',
'Test' => 'Test', 'Test' => 'Test',

View File

@@ -12,6 +12,7 @@ return array(
'Failed to open %file, please check Paybox configuration' => 'Le fichier %file est inaccessible, merci de vérifier la configuration Paybox', 'Failed to open %file, please check Paybox configuration' => 'Le fichier %file est inaccessible, merci de vérifier la configuration Paybox',
'Identifiant interne' => 'Identifiant interne', 'Identifiant interne' => 'Identifiant interne',
'Identifiant interne, tel que fourni par Paybox' => 'Identifiant interne, tel que fourni par Paybox', 'Identifiant interne, tel que fourni par Paybox' => 'Identifiant interne, tel que fourni par Paybox',
'Invalid phone number %num for country %country' => 'Le numéro de téléphone %num est invalide pour le pays %country',
'Le fichier de log est vide.' => 'Le fichier de log est vide.', 'Le fichier de log est vide.' => 'Le fichier de log est vide.',
'Le fichier de log n\'a pas été trouvé.' => 'Le fichier de log n\'a pas été trouvé.', 'Le fichier de log n\'a pas été trouvé.' => 'Le fichier de log n\'a pas été trouvé.',
'Maximum order total' => 'Montant de commande maximum', 'Maximum order total' => 'Montant de commande maximum',
@@ -32,6 +33,7 @@ return array(
'Paybox configuration' => 'Configuration Paybox', 'Paybox configuration' => 'Configuration Paybox',
'Paybox platform request processing terminated.' => 'Traitement de la requête Paybox terminé.', 'Paybox platform request processing terminated.' => 'Traitement de la requête Paybox terminé.',
'Paybox platform request received.' => 'Réception d\'une requête de la plate-form Paybox', 'Paybox platform request received.' => 'Réception d\'une requête de la plate-form Paybox',
'Please enter a valid phone number in your invoice address (error is : %err)' => 'Merci d\'entrer un numero de téléphone mobile valide dans votre adresse de facturation (détail de l\'erreur : %err)',
'Production' => 'Production', 'Production' => 'Production',
'Request parameters signature verification failed.' => 'La vérification de la signature de la requête a échoué.', 'Request parameters signature verification failed.' => 'La vérification de la signature de la requête a échoué.',
'Test' => 'Test', 'Test' => 'Test',

View File

@@ -1,17 +1,25 @@
<?php <?php
/*************************************************************************************/ /*
* This file is part of the Thelia package.
/* */ * http://www.thelia.net
*
/* Thelia 2 Paybox payment module */ * (c) OpenStudio <info@thelia.net>
*
/* */ * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/* Copyright (c) CQFDev */
/* email : thelia@cqfdev.fr */
/* web : http://www.cqfdev.fr */
namespace Paybox; namespace Paybox;
use libphonenumber\NumberParseException;
use libphonenumber\PhoneNumberUtil;
use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Exception\PropelException;
use Thelia\Core\HttpFoundation\Response; use Thelia\Core\HttpFoundation\Response;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Log\Tlog; use Thelia\Log\Tlog;
@@ -22,17 +30,17 @@ use Thelia\Model\Order;
use Thelia\Module\AbstractPaymentModule; use Thelia\Module\AbstractPaymentModule;
/** /**
* Paybox payment module.
* *
* @author Franck Allimant <franck@cqfdev.fr> * @author Franck Allimant <franck@cqfdev.fr>
*/ */
class Paybox extends AbstractPaymentModule class Paybox extends AbstractPaymentModule
{ {
/** The module domain for internationalisation */ /** The module domain for internationalisation */
const MODULE_DOMAIN = 'paybox';
/** The module domain for internationalisation */ /** The module domain for internationalisation */
use Thelia\Model\Message; const MODULE_CODE = 'Paybox';
/** The confirmation message identifier */ /** The confirmation message identifier */
const CONFIRMATION_MESSAGE_NAME = 'paybox_payment_confirmation'; const CONFIRMATION_MESSAGE_NAME = 'paybox_payment_confirmation';
@@ -43,13 +51,10 @@ class Paybox extends AbstractPaymentModule
/** The notification of payment confirmation */ /** The notification of payment confirmation */
const NOTIFICATION_MESSAGE_NAME = 'paybox_payment_status_notification'; const NOTIFICATION_MESSAGE_NAME = 'paybox_payment_status_notification';
public function postActivation(ConnectionInterface $con = null): void
/**
* Paybox payment module
{ {
// Create payment confirmation message from templates, if not already defined // Create payment confirmation message from templates, if not already defined
$email_templates_dir = __DIR__.DS.'I18n'.DS.'email-templates'.DS;
if (null === MessageQuery::create()->findOneByName(self::CONFIRMATION_MESSAGE_NAME)) { if (null === MessageQuery::create()->findOneByName(self::CONFIRMATION_MESSAGE_NAME)) {
$message = new Message(); $message = new Message();
@@ -60,14 +65,14 @@ class Paybox extends AbstractPaymentModule
->setLocale('en_US') ->setLocale('en_US')
->setTitle('Paybox payment confirmation') ->setTitle('Paybox payment confirmation')
->setSubject('Payment of order {$order_ref}') ->setSubject('Payment of order {$order_ref}')
const MODULE_DOMAIN = "paybox"; ->setHtmlMessage(file_get_contents($email_templates_dir.'en.html'))
->setTextMessage(file_get_contents($email_templates_dir.'en.txt'))
->setLocale('fr_FR') ->setLocale('fr_FR')
->setTitle('Confirmation de paiement par PayBox') ->setTitle('Confirmation de paiement par PayBox')
->setSubject('Confirmation du paiement de votre commande {$order_ref}') ->setSubject('Confirmation du paiement de votre commande {$order_ref}')
const MODULE_CODE = "Paybox"; ->setHtmlMessage(file_get_contents($email_templates_dir.'fr.html'))
->setTextMessage(file_get_contents($email_templates_dir.'fr.txt'))
->save(); ->save();
} }
@@ -80,24 +85,26 @@ class Paybox extends AbstractPaymentModule
->setLocale('en_US') ->setLocale('en_US')
->setTitle('Paybox payment status notification') ->setTitle('Paybox payment status notification')
->setSubject('Paybox payment status for order {$order_ref}: {$paybox_payment_status}') ->setSubject('Paybox payment status for order {$order_ref}: {$paybox_payment_status}')
->setHtmlMessage(file_get_contents($email_templates_dir.'notification-en.html'))
->setTextMessage(file_get_contents($email_templates_dir.'notification-en.txt'))
->setLocale('fr_FR') ->setLocale('fr_FR')
->setTitle('Notification du résultat d\'un paiement par Paybox') ->setTitle('Notification du résultat d\'un paiement par Paybox')
->setSubject('Résultats du paiement Paybox de la commande {$order_ref} : {$paybox_payment_status}') ->setSubject('Résultats du paiement Paybox de la commande {$order_ref} : {$paybox_payment_status}')
->setHtmlMessage(file_get_contents($email_templates_dir.'notification-fr.html'))
->setTextMessage(file_get_contents($email_templates_dir.'notification-fr.txt'))
->save(); ->save();
} }
/* Deploy the module's image */
$module = $this->getModuleModel();
if (ModuleImageQuery::create()->filterByModule($module)->count() == 0) {
$this->deployImageFolder($module, sprintf('%s'.DS.'images', __DIR__), $con);
}
} }
public function postActivation(ConnectionInterface $con = null) public function destroy(ConnectionInterface $con = null, $deleteModuleData = false): void
{
{ {
// Delete config table and messages if required // Delete config table and messages if required
if ($deleteModuleData) { if ($deleteModuleData) {
@@ -115,71 +122,55 @@ class Paybox extends AbstractPaymentModule
* In many cases, it's necessary to send a form to the payment gateway. * In many cases, it's necessary to send a form to the payment gateway.
* On your response you can return this form already completed, ready to be sent * On your response you can return this form already completed, ready to be sent
* *
* @param Order $order processed order
*
* @return Response the HTTP response * @return Response the HTTP response
*/ */
->setTitle('Paybox payment confirmation') public function pay(Order $order): Response
{ {
->setSubject('Payment of order {$order_ref}') return $this->doPay($order);
} }
/** /**
->setTextMessage(file_get_contents($email_templates_dir . 'en.txt')) * Payment gateway invocation.
*
* @param Order $order processed order
* *
* @return Response the HTTP response * @return Response the HTTP response
*/ */
protected function doPay(Order $order): Response
{ {
if ('TEST' === self::getConfigValue('mode', false)) {
->setSubject('Confirmation du paiement de votre commande {$order_ref}') $platformUrl = self::getConfigValue('url_serveur_test', false);
} else { } else {
->setHtmlMessage(file_get_contents($email_templates_dir . 'fr.html')) $platformUrl = self::getConfigValue('url_serveur', false);
} }
// Be sure to have a valid platform URL, otherwise give up // Be sure to have a valid platform URL, otherwise give up
if (false === $platformUrl) { if (false === $platformUrl) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
Translator::getInstance()->trans( Translator::getInstance()->trans(
'The platform URL is not defined, please check Paybox module configuration.',
[], [],
self::MODULE_DOMAIN
) )
); );
} }
$hashAlgo = $this->getHashAlgorithm(); $hashAlgo = $this->getHashAlgorithm();
$clefPrivee = self::getConfigValue('clef_privee');
$paybox_params = $this->doPayPayboxParameters($order)
->setName(self::NOTIFICATION_MESSAGE_NAME) + [
'PBX_HASH' => $hashAlgo,
'PBX_SECRET' => $clefPrivee,
];
->setLocale('en_US')
->setTitle('Paybox payment status notification')
->setSubject('Paybox payment status for order {$order_ref}: {$paybox_payment_status}')
->setHtmlMessage(file_get_contents($email_templates_dir . 'notification-en.html'))
->setTextMessage(file_get_contents($email_templates_dir . 'notification-en.txt'))
->setLocale('fr_FR')
->setTitle('Notification du résultat d\'un paiement par Paybox')
->setSubject('Résultats du paiement Paybox de la commande {$order_ref} : {$paybox_payment_status}')
// Generate signature // Generate signature
$param = ''; $param = '';
foreach ($paybox_params as $key => $value) { foreach ($paybox_params as $key => $value) {
$param .= '&'.$key.'='.$value;
} }
$param = ltrim($param, '&'); $param = ltrim($param, '&');
@@ -191,20 +182,109 @@ class Paybox extends AbstractPaymentModule
return $this->generateGatewayFormResponse($order, $platformUrl, $paybox_params); return $this->generateGatewayFormResponse($order, $platformUrl, $paybox_params);
} }
protected function doPayPayboxParameters(Order $order): array
{
// Generate a transaction ID
$transactionId = sprintf('%010d', $order->getId());
$order->setTransactionRef($transactionId)->save();
$paybox_params = [
'PBX_SITE' => self::getConfigValue('numero_site'),
'PBX_RANG' => self::getConfigValue('rang_site'),
'PBX_IDENTIFIANT' => self::getConfigValue('identifiant_interne'),
'PBX_RETOUR' => self::PARAMETRES_RETOUR,
'PBX_ANNULE' => self::getConfigValue('url_retour_abandon'),
'PBX_EFFECTUE' => self::getConfigValue('url_retour_succes'),
'PBX_REFUSE' => self::getConfigValue('url_retour_refus'),
'PBX_REPONDRE_A' => self::getConfigValue('url_ipn'),
'PBX_TOTAL' => round(100 * $order->getTotalAmount()),
'PBX_DEVISE' => $this->getCurrencyIso4217NumericCode($order->getCurrency()->getCode()),
'PBX_CMD' => $transactionId,
'PBX_PORTEUR' => $order->getCustomer()->getEmail(),
'PBX_TIME' => date('c'),
'PBX_RUF1' => 'POST',
'PBX_SHOPPINGCART' => $this->getShoppingCart($order),
'PBX_BILLING' => $this->getBilling($order),
];
return $paybox_params;
}
/** /**
* @throws PropelException
*
* @return array|bool|string|string[]
*/ */
protected function getBilling(Order $order)
{
$address = $order->getOrderAddressRelatedByInvoiceOrderAddressId();
// Decode phone number
$phoneNumber = empty($address->getCellphone()) ? $address->getPhone() : $address->getCellphone();
$phoneUtil = PhoneNumberUtil::getInstance();
// Default values
$phoneCountryCode = '00';
$phoneNationalNumber = '00000000';
try {
$phoneNumberProto = $phoneUtil->parse($phoneNumber, $address->getCountry()->getIsoalpha2());
$phoneNationalNumber = $phoneNumberProto->getNationalNumber();
$phoneCountryCode = $phoneNumberProto->getCountryCode();
} catch (NumberParseException $e) {
Tlog::getInstance()->error('Failed to parse phone number "'.$phoneNumber.'", error is : '.$e->getMessage());
}
$billingXml = new \SimpleXMLElement('<Billing/>');
$addressXml = $billingXml->addChild('Address');
$addressXml->addChild('FirstName', $address->getFirstname());
$addressXml->addChild('LastName', $address->getLastname());
$addressXml->addChild('Address1', $address->getAddress1());
$addressXml->addChild('ZipCode', $address->getZipcode());
$addressXml->addChild('City', $address->getCity());
$addressXml->addChild('CountryCode', $address->getCountry()->getIsocode());
$addressXml->addChild('CountryCodeMobilePhone', '+'.$phoneCountryCode);
$addressXml->addChild('MobilePhone', $phoneNationalNumber);
return str_replace(["\n", "\r"], '', $billingXml->asXML());
}
/**
* @return array|bool|string|string[]
*/
protected function getShoppingCart(Order $order)
{
$quantity = 0;
$shoppingCartXml = new \SimpleXMLElement('<shoppingcart/>');
foreach ($order->getOrderProducts() as $product) {
$quantity += $product->getQuantity();
}
$total = $shoppingCartXml->addChild('total');
$total->addChild('totalQuantity', $quantity);
return str_replace(["\n", "\r"], '', $shoppingCartXml->asXML());
}
/**
* @return bool true to allow usage of this payment module, false otherwise
*/
public function isValidPayment(): bool
{ {
$valid = false; $valid = false;
$mode = self::getConfigValue('mode', false);
// If we're in test mode, do not display Paybox on the front office, except for allowed IP addresses. // If we're in test mode, do not display Paybox on the front office, except for allowed IP addresses.
public function destroy(ConnectionInterface $con = null, $deleteModuleData = false) if ('TEST' === $mode) {
$raw_ips = explode("\n", self::getConfigValue('allowed_ip_list', ''));
$allowed_client_ips = [];
foreach ($raw_ips as $ip) { foreach ($raw_ips as $ip) {
$allowed_client_ips[] = trim($ip); $allowed_client_ips[] = trim($ip);
@@ -212,8 +292,8 @@ class Paybox extends AbstractPaymentModule
$client_ip = $this->getRequest()->getClientIp(); $client_ip = $this->getRequest()->getClientIp();
$valid = \in_array($client_ip, $allowed_client_ips);
} } elseif ('PRODUCTION' === $mode) {
$valid = true; $valid = true;
} }
@@ -226,40 +306,39 @@ class Paybox extends AbstractPaymentModule
} }
/** /**
* Check if total order amount is in the module's limits.
* *
* @return bool true if the current order total is within the min and max limits * @return bool true if the current order total is within the min and max limits
*/ */
protected function checkMinMaxAmount(): bool
{ {
// Check if total order amount is in the module's limits // Check if total order amount is in the module's limits
$order_total = $this->getCurrentOrderTotalAmount(); $order_total = $this->getCurrentOrderTotalAmount();
* $min_amount = self::getConfigValue('minimum_amount', 0);
$max_amount = self::getConfigValue('maximum_amount', 0);
return $order_total > 0 return $order_total > 0
* @return Response the HTTP response && ($min_amount <= 0 || $order_total >= $min_amount)
&& ($max_amount <= 0 || $order_total <= $max_amount);
*/
} }
/** /**
* Get the numeric ISO 4217 code of a currency.
* *
* @param string $textCurrencyCode currency textual code, like EUR or USD * @param string $textCurrencyCode currency textual code, like EUR or USD
*
* @return string the algorithm * @return string the algorithm
*
* @throw \RuntimeException if no algorithm was found. * @throw \RuntimeException if no algorithm was found.
*/ */
protected function getCurrencyIso4217NumericCode($textCurrencyCode) protected function getCurrencyIso4217NumericCode($textCurrencyCode)
{ {
$currencies = null; $currencies = null;
* $localIso417data = __DIR__.DS.'Config'.DS.'iso4217.xml';
* @param Order $order processed order $currencyXmlDataUrl = 'http://www.currency-iso.org/dam/downloads/lists/list_one.xml';
$xmlData = @file_get_contents($currencyXmlDataUrl); $xmlData = @file_get_contents($currencyXmlDataUrl);
@@ -299,19 +378,20 @@ class Paybox extends AbstractPaymentModule
throw new \RuntimeException( throw new \RuntimeException(
Translator::getInstance()->trans( Translator::getInstance()->trans(
} 'Failed to get ISO 4217 data for currency %curr, payment is not possible.',
['%curr' => $textCurrencyCode] ['%curr' => $textCurrencyCode]
) )
); );
} }
/** /**
* Find a suitable hashing algorithm.
* *
* @return string the algorithm * @return string the algorithm
*
* @throw \RuntimeException if no algorithm was found. * @throw \RuntimeException if no algorithm was found.
*/ */
$transactionId = sprintf("%010d", $order->getId()); protected function getHashAlgorithm(): string
{ {
// Possible hashes // Possible hashes
$hashes = [ $hashes = [
@@ -320,20 +400,20 @@ class Paybox extends AbstractPaymentModule
'sha384', 'sha384',
'ripemd160', 'ripemd160',
'sha224', 'sha224',
'mdc2',
]; ];
$hashEnabled = hash_algos(); $hashEnabled = hash_algos();
foreach ($hashes as $hash) { foreach ($hashes as $hash) {
if (\in_array($hash, $hashEnabled)) {
return strtoupper($hash); return strtoupper($hash);
} }
} }
throw new \RuntimeException( throw new \RuntimeException(
Translator::getInstance()->trans( Translator::getInstance()->trans(
'PBX_ANNULE' => Paybox::getConfigValue('url_retour_abandon'), 'Failed to find a suitable hash algorithm. Please check your PHP configuration.'
) )
); );
} }

View File

@@ -3,6 +3,8 @@
Ce module vous permet de proposer à vos clients le système de paiement Paybox. Ce module vous permet de proposer à vos clients le système de paiement Paybox.
> Compatible 3Dsv2
### Installation ### Installation
> Ce module requiert Thelia 2.1 beta1 au minimum > Ce module requiert Thelia 2.1 beta1 au minimum
@@ -29,6 +31,8 @@ This module offers to your customers the Paybox payment system.
> This module requires Thelia 2.1 beta1 or newer > This module requires Thelia 2.1 beta1 or newer
> Compatible 3Dsv2
To install the Paybox module, uncompress the archive in the `<thelia root>/local/modules` directory. Be sure that the name of the module's directory is `Paybox` (and not `Paybox-master`, for exemple). To install the Paybox module, uncompress the archive in the `<thelia root>/local/modules` directory. Be sure that the name of the module's directory is `Paybox` (and not `Paybox-master`, for exemple).
### Usage ### Usage

View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="LICENSE.txt" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="Paybox.php" server="51.254.220.106//web/" local="131390920547656250" remote="131390920800000000" />
<file name="README.md" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="composer.json" server="51.254.220.106//web/" local="131353051200000000" remote="131390168400000000" />
</dwsync>

View File

@@ -4,9 +4,18 @@
"license": "LGPL-3.0+", "license": "LGPL-3.0+",
"type": "thelia-module", "type": "thelia-module",
"require": { "require": {
"thelia/installer": "~1.0" "thelia/installer": "~1.0",
"giggsey/libphonenumber-for-php": "^8.13"
},
"suggest": {
"thelia/paybox3x-module": "This module offers to your customers the Paybox 3x payment system"
}, },
"extra": { "extra": {
"installer-name": "Paybox" "installer-name": "Paybox"
},
"config": {
"allow-plugins": {
"thelia/installer": true
}
} }
} }

280
local/modules/Paybox/composer.lock generated Normal file
View File

@@ -0,0 +1,280 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "817096e4d966c233d7648d2c037f288d",
"packages": [
{
"name": "giggsey/libphonenumber-for-php",
"version": "8.13.45",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
"reference": "142ccdd603e4eeef7de9a7ddbd9ae18c2651dbd6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/142ccdd603e4eeef7de9a7ddbd9ae18c2651dbd6",
"reference": "142ccdd603e4eeef7de9a7ddbd9ae18c2651dbd6",
"shasum": ""
},
"require": {
"giggsey/locale": "^1.7|^2.0",
"php": ">=5.3.2",
"symfony/polyfill-mbstring": "^1.17"
},
"replace": {
"giggsey/libphonenumber-for-php-lite": "self.version"
},
"require-dev": {
"pear/pear-core-minimal": "^1.9",
"pear/pear_exception": "^1.0",
"pear/versioncontrol_git": "^0.5",
"phing/phing": "^2.7",
"php-coveralls/php-coveralls": "^1.0|^2.0",
"symfony/console": "^2.8|^3.0|^v4.4|^v5.2",
"symfony/phpunit-bridge": "^4.2 || ^5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "8.x-dev"
}
},
"autoload": {
"psr-4": {
"libphonenumber\\": "src/"
},
"exclude-from-classmap": [
"/src/data/",
"/src/carrier/data/",
"/src/geocoding/data/",
"/src/timezone/data/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Joshua Gigg",
"email": "giggsey@gmail.com",
"homepage": "https://giggsey.com/"
}
],
"description": "PHP Port of Google's libphonenumber",
"homepage": "https://github.com/giggsey/libphonenumber-for-php",
"keywords": [
"geocoding",
"geolocation",
"libphonenumber",
"mobile",
"phonenumber",
"validation"
],
"support": {
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php"
},
"time": "2024-09-06T11:22:54+00:00"
},
{
"name": "giggsey/locale",
"version": "2.6",
"source": {
"type": "git",
"url": "https://github.com/giggsey/Locale.git",
"reference": "37874fa473131247c348059fb7b8985efc18b5ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/Locale/zipball/37874fa473131247c348059fb7b8985efc18b5ea",
"reference": "37874fa473131247c348059fb7b8985efc18b5ea",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"require-dev": {
"ext-json": "*",
"pear/pear-core-minimal": "^1.9",
"pear/pear_exception": "^1.0",
"pear/versioncontrol_git": "^0.5",
"phing/phing": "^2.7",
"php-coveralls/php-coveralls": "^2.0",
"phpunit/phpunit": "^8.5|^9.5",
"symfony/console": "^5.0|^6.0",
"symfony/filesystem": "^5.0|^6.0",
"symfony/finder": "^5.0|^6.0",
"symfony/process": "^5.0|^6.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Giggsey\\Locale\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Joshua Gigg",
"email": "giggsey@gmail.com",
"homepage": "https://giggsey.com/"
}
],
"description": "Locale functions required by libphonenumber-for-php",
"support": {
"issues": "https://github.com/giggsey/Locale/issues",
"source": "https://github.com/giggsey/Locale/tree/2.6"
},
"time": "2024-04-18T19:31:19+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
},
"suggest": {
"ext-mbstring": "For best performance"
},
"type": "library",
"extra": {
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for the Mbstring extension",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"mbstring",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-09-09T11:45:10+00:00"
},
{
"name": "thelia/installer",
"version": "1.5",
"source": {
"type": "git",
"url": "https://github.com/thelia/installer.git",
"reference": "30b7a084e64bd3a4ffb290fa6d9bf096b64b2b56"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thelia/installer/zipball/30b7a084e64bd3a4ffb290fa6d9bf096b64b2b56",
"reference": "30b7a084e64bd3a4ffb290fa6d9bf096b64b2b56",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0||^2.0"
},
"require-dev": {
"composer/composer": "1.0.*@dev||2.0.*@dev"
},
"type": "composer-plugin",
"extra": {
"class": "Thelia\\Composer\\TheliaInstallerPlugin"
},
"autoload": {
"psr-0": {
"Thelia\\Composer": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0-or-later"
],
"authors": [
{
"name": "Manuel Raynaud",
"email": "raynaud.manu@gmail.com",
"homepage": "https://github.com/lunika"
}
],
"description": "custom installer for Thelia.",
"keywords": [
"Thelia",
"Thelia-module",
"Thelia-template"
],
"support": {
"issues": "https://github.com/thelia/installer/issues",
"source": "https://github.com/thelia/installer/tree/1.5"
},
"time": "2024-08-12T13:48:42+00:00"
}
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "2.6.0"
}

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="ManuelIntegrationPayboxSystem_V6.2_EN.pdf" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
<file name="PayboxTestParameters_V6.2_EN.pdf" server="51.254.220.106//web/" local="131353051200000000" remote="131390169000000000" />
</dwsync>

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="paybox-logo.png" server="51.254.220.106//web/" local="131390905800000000" remote="131390905800000000" />
</dwsync>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB