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

Version 2.2.7 #7

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
2.2.7
===
<h2>released on 2020-08-14</h2>
<ul>
<li>Fix translation.</li>
</ul>

2.2.6
===
<h2>released on 2020-03-06</h2>
<ul>
<li>Update properly order.total_paid_real on partial refund.</li>
<li>Correct french translation backoffice "alternative contracts"</li>
<li>Backoffice : delete need help block</li>
</ul>

2.2.5
===
<h2>released on 2019-04-04</h2>
<ul>
<li>Use PaylineSDK v4.59</li>
</ul>

2.2.4
===
<h2>released on 2018-11-12</h2>
Expand Down
3 changes: 3 additions & 0 deletions class/PaylinePaymentGateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,9 @@ public static function captureTransaction($transactionId, $paymentMode = 'CPT',
// Do re-autorization
$params['payment']['action'] = 101;
$params['order'] = $transaction['order'];
// Format Order Date for Payline dd/mm/YYYY h:m
$dt = new DateTime($params['order']['date']);
$params['order']['date'] = $dt->format('d/m/Y h:m');
$result = $instance->doReAuthorization($params);
} else {
// Do capture
Expand Down
8 changes: 4 additions & 4 deletions lib/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}

/**
Expand Down Expand Up @@ -377,11 +377,11 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
$length = $this->prefixLengthsPsr4[$first][$search];
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
Expand Down
95 changes: 49 additions & 46 deletions lib/composer/installed.json
Original file line number Diff line number Diff line change
@@ -1,66 +1,65 @@
[
{
"name": "psr/log",
"version": "1.0.2",
"version_normalized": "1.0.2.0",
"name": "monext/payline-sdk",
"version": "4.59.5",
"version_normalized": "4.59.5.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
"url": "https://github.com/PaylineByMonext/payline-php-sdk.git",
"reference": "f73fc72b63547e42b00de7fc27432c5b7aff0285"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"url": "https://api.github.com/repos/PaylineByMonext/payline-php-sdk/zipball/f73fc72b63547e42b00de7fc27432c5b7aff0285",
"reference": "f73fc72b63547e42b00de7fc27432c5b7aff0285",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-soap": "*",
"monolog/monolog": "1.* || ~2.0",
"php": ">=5.3.0"
},
"time": "2016-10-10T12:19:37+00:00",
"time": "2020-01-03T12:41:19+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Psr\\Log\\": "Psr/Log/"
"Payline\\": "src/Payline"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
"LGPL-3.0"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
"name": "Fabien SUAREZ",
"email": "[email protected]",
"homepage": "http://www.payline.com"
}
],
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"description": "Payline library for PHP",
"keywords": [
"log",
"psr",
"psr-3"
"Monext",
"Payline",
"payment"
]
},
{
"name": "monolog/monolog",
"version": "1.23.0",
"version_normalized": "1.23.0.0",
"version": "1.25.3",
"version_normalized": "1.25.3.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
"reference": "fa82921994db851a8becaf3787a9e73c5976b6f1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
"reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1",
"reference": "fa82921994db851a8becaf3787a9e73c5976b6f1",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -96,7 +95,7 @@
"ruflin/elastica": "Allow sending log messages to an Elastic Search server",
"sentry/sentry": "Allow sending log messages to a Sentry server"
},
"time": "2017-06-19T01:22:40+00:00",
"time": "2019-12-20T14:15:16+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -129,48 +128,52 @@
]
},
{
"name": "monext/payline-sdk",
"version": "4.52.1",
"version_normalized": "4.52.1.0",
"name": "psr/log",
"version": "1.1.2",
"version_normalized": "1.1.2.0",
"source": {
"type": "git",
"url": "https://github.com/PaylineByMonext/payline-php-sdk.git",
"reference": "25a04234f2a826c572e104834f6f851606137ff9"
"url": "https://github.com/php-fig/log.git",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PaylineByMonext/payline-php-sdk/zipball/25a04234f2a826c572e104834f6f851606137ff9",
"reference": "25a04234f2a826c572e104834f6f851606137ff9",
"url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
"shasum": ""
},
"require": {
"monolog/monolog": "1.*",
"php": ">=5.3.0"
},
"time": "2017-10-24T09:55:59+00:00",
"time": "2019-11-01T11:05:21+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Payline\\": "src/Payline"
"Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0"
"MIT"
],
"authors": [
{
"name": "Fabien SUAREZ",
"email": "[email protected]",
"homepage": "http://www.payline.com"
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Payline library for PHP",
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"keywords": [
"Monext",
"Payline",
"payment"
"log",
"psr",
"psr-3"
]
}
]
28 changes: 27 additions & 1 deletion lib/monext/payline-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
* 4.52 (2017-10-16)
* 4.59 (2019-07-28)
* wsdl upgrade
* new threeDSInfo parameter for manageWebWallet and doWebPayment
* new browser in threeDSInfo
* new sdk in threeDSInfo
* new streetNumber, addressCreateDate and email in address
* new resultContainer and authenticationResult in Authentication3DSecure
* new buyerExtended, merchantAuthentication and loyaltyMemberType in buyer
* new discountAmount, otaPackageType, otaDestinationCountry, bookingReference, orderDetail, orderExtended and orderOTA in order
* new seller and sellerType in OrderDetail
* new cumulatedAmount in payment
* new billingBank in recurring

* 4.54 & 4.55 (2018-06-27)
* new asynchronousRetryTimeout parameter for doAuthorization and doWebPayment (4.55)
* new miscData parameter for isRegistered (4.54)

* 4.53 (2018-01-10)
* new deliveryCharge attribute in order object
* new registrationToken attribute in payment object
* new object subMerchant
* new method isRegistered
* new subMerchant parameter for doAuthorization, doWebPayment, doCredit, doDebit, doImmediateWalletPayment, doScheduledWalletPayment
* new miscData parameter for doWebPayment
* new returnUrl parameter for verifyEnrollment

* 4.52 (2017-10-16)
* new avs child node in transaction object

* 4.51 (2017-08-11)
Expand Down
2 changes: 1 addition & 1 deletion lib/monext/payline-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Requires monolog/monolog, just let Composer do the job
Author
------

Fabien SUAREZ - <fabien.suarez@payline.com>
Payline support - <support@payline.com>

License
-------
Expand Down
7 changes: 5 additions & 2 deletions lib/monext/payline-sdk/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
],
"require" : {
"php" : ">=5.3.0",
"monolog/monolog" : "1.*"
"ext-soap": "*",
"monolog/monolog" : "1.* || ~2.0",
"ext-openssl": "*",
"ext-mbstring": "*"
},
"support" : {
"email" : "[email protected]",
Expand All @@ -26,6 +29,6 @@
"psr-4" : {
"Payline\\" : "src/Payline"
}

}
}
8 changes: 7 additions & 1 deletion lib/monext/payline-sdk/src/Payline/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,10 @@ class Address
public $phoneType;

public $phone;
}

public $streetNumber;

public $addressCreateDate;

public $email;
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@ class Authentication3DSecure
public $PaResStatus;

public $VeResStatus;
}

public $resultContainer;

public $authenticationResult;
}
29 changes: 29 additions & 0 deletions lib/monext/payline-sdk/src/Payline/Browser.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php
/*
* This file is part of the Payline package.
*
* (c) Monext <http://www.monext.net>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Payline;
class Browser {
public $acceptHeader;

public $javaEnabled;

public $javascriptEnabled;

public $language;

public $colorDepth;

public $screenHeight;

public $screenWidth;

public $timeZoneOffset;

public $userAgent;
}
8 changes: 7 additions & 1 deletion lib/monext/payline-sdk/src/Payline/Buyer.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,10 @@ class Buyer
public $isRooted;

public $hasTimezoneMismatch;
}

public $buyerExtended;

public $merchantAuthentication;

public $loyaltyMemberType;
}
16 changes: 16 additions & 0 deletions lib/monext/payline-sdk/src/Payline/MerchantAuthentication.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

/*
* This file is part of the Payline package.
*
* (c) Monext <http://www.monext.net>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Payline;
class MerchantAuthentication {
public $method;

public $date;
}
Loading