Skip to content

Commit

Permalink
Merge pull request #11 from 202-ecommerce/develop
Browse files Browse the repository at this point in the history
1.2.3
  • Loading branch information
202-ecommerce authored Aug 13, 2020
2 parents ba2899d + 9923c73 commit f7be3f9
Show file tree
Hide file tree
Showing 172 changed files with 2,801 additions and 1,901 deletions.
30 changes: 20 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
/**
* 2007-2019 PrestaShop
/*
* 2007-2020 PayPal
*
* DISCLAIMER
* NOTICE OF LICENSE
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
*
* @author 202-ecommerce <[email protected]>
* @copyright Copyright (c) 202-ecommerce
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author 2007-2020 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

// http://eslint.org/docs/user-guide/configuring
Expand Down
27 changes: 26 additions & 1 deletion 202/build.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 2007-2020 PayPal
~
~ NOTICE OF LICENSE
~
~ This source file is subject to the Academic Free License (AFL 3.0)
~ that is bundled with this package in the file LICENSE.txt.
~ It is also available through the world-wide-web at this URL:
~ http://opensource.org/licenses/afl-3.0.php
~ 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 [email protected] so we can send you a copy immediately.
~
~ DISCLAIMER
~
~ Do not edit or add to this file if you wish to upgrade PrestaShop to newer
~ versions in the future. If you wish to customize PrestaShop for your
~ needs please refer to http://www.prestashop.com for more information.
~
~ @author 2007-2020 PayPal
~ @author 202 ecommerce <[email protected]>
~ @copyright PayPal
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
-->

<project name="Braintree addons" default="build" basedir="..//">
<property environment="env" />
<property name="build-dir" value="${basedir}/202/build" />
<property name="src-dir" value="${basedir}" />
<property name="TARGETNAME" value="braintreeofficial" />
<property name="TARGETBRANCH" value="${env.GIT_BRANCH}" />
<property name="TARGETVERSION" value="1.2.2" />
<property name="TARGETVERSION" value="1.2.3" />
<property name="PHPVERSION" value="5.6" />
<property name="PSVERSION" value="1.7.5.x" />

Expand Down
32 changes: 16 additions & 16 deletions 202/doc/index.php
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?php
/**
* 2007-2018 PrestaShop
* 2007-2020 PayPal
*
* NOTICE OF LICENSE
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author 202-ecommerce <[email protected]>
* @copyright Copyright (c) 202-ecommerce
* @author 2007-2020 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/

header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
Expand Down
32 changes: 16 additions & 16 deletions 202/doc/src/assets/index.php
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?php
/**
* 2007-2018 PrestaShop
* 2007-2020 PayPal
*
* NOTICE OF LICENSE
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author 202-ecommerce <[email protected]>
* @copyright Copyright (c) 202-ecommerce
* @author 2007-2020 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/

header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
Expand Down
32 changes: 16 additions & 16 deletions 202/doc/src/index.php
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?php
/**
* 2007-2018 PrestaShop
* 2007-2020 PayPal
*
* NOTICE OF LICENSE
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author 202-ecommerce <[email protected]>
* @copyright Copyright (c) 202-ecommerce
* @author 2007-2020 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/

header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
Expand Down
32 changes: 16 additions & 16 deletions 202/index.php
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?php
/**
* 2007-2018 PrestaShop
* 2007-2020 PayPal
*
* NOTICE OF LICENSE
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author 202-ecommerce <[email protected]>
* @copyright Copyright (c) 202-ecommerce
* @author 2007-2020 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/

header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
Expand Down
25 changes: 25 additions & 0 deletions 202/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ 2007-2020 PayPal
~
~ NOTICE OF LICENSE
~
~ This source file is subject to the Academic Free License (AFL 3.0)
~ that is bundled with this package in the file LICENSE.txt.
~ It is also available through the world-wide-web at this URL:
~ http://opensource.org/licenses/afl-3.0.php
~ 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 [email protected] so we can send you a copy immediately.
~
~ DISCLAIMER
~
~ Do not edit or add to this file if you wish to upgrade PrestaShop to newer
~ versions in the future. If you wish to customize PrestaShop for your
~ needs please refer to http://www.prestashop.com for more information.
~
~ @author 2007-2020 PayPal
~ @author 202 ecommerce <[email protected]>
~ @copyright PayPal
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
-->

<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
<phpunit
backupGlobals="false"
Expand Down
36 changes: 19 additions & 17 deletions 202/tests/BraintreeLogTest.php
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<?php
/**
* NOTICE OF LICENSE
* 2007-2020 PayPal
*
* This source file is subject to a commercial license from SARL 202 ecommence
* Use, copy, modification or distribution of this source file without written
* license agreement from the SARL 202 ecommence is strictly forbidden.
* In order to obtain a license, please contact us: [email protected]
* ...........................................................................
* INFORMATION SUR LA LICENCE D'UTILISATION
* NOTICE OF LICENSE
*
* L'utilisation de ce fichier source est soumise a une licence commerciale
* concedee par la societe 202 ecommence
* Toute utilisation, reproduction, modification ou distribution du present
* fichier source sans contrat de licence ecrit de la part de la SARL 202 ecommence est
* expressement interdite.
* Pour obtenir une licence, veuillez contacter 202-ecommerce <[email protected]>
* ...........................................................................
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
*
* @author 202-ecommerce <[email protected]>
* @copyright Copyright (c) 202-ecommerce
* @license Commercial license
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author 2007-2020 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace BraintreeTest;
Expand Down
36 changes: 19 additions & 17 deletions 202/tests/BraintreeTest.php
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<?php
/**
* NOTICE OF LICENSE
* 2007-2020 PayPal
*
* This source file is subject to a commercial license from SARL 202 ecommence
* Use, copy, modification or distribution of this source file without written
* license agreement from the SARL 202 ecommence is strictly forbidden.
* In order to obtain a license, please contact us: [email protected]
* ...........................................................................
* INFORMATION SUR LA LICENCE D'UTILISATION
* NOTICE OF LICENSE
*
* L'utilisation de ce fichier source est soumise a une licence commerciale
* concedee par la societe 202 ecommence
* Toute utilisation, reproduction, modification ou distribution du present
* fichier source sans contrat de licence ecrit de la part de la SARL 202 ecommence est
* expressement interdite.
* Pour obtenir une licence, veuillez contacter 202-ecommerce <[email protected]>
* ...........................................................................
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* 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 [email protected] so we can send you a copy immediately.
*
* @author 202-ecommerce <[email protected]>
* @copyright Copyright (c) 202-ecommerce
* @license Commercial license
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author 2007-2020 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace BraintreeTest;
Expand Down
Loading

0 comments on commit f7be3f9

Please sign in to comment.