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

Release 1.2.6 #23

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
051886d
module version update
202-ecommerce May 4, 2021
e5e3c18
refs #29628 translations
bogdan202 May 25, 2021
f0fda50
refs #29627 sca message
bogdan202 May 26, 2021
93b3418
refs #29627 show message on help page
bogdan202 May 26, 2021
fa828b5
refs #29718 validate order. Price rounding
bogdan202 Jun 9, 2021
f7fc1fc
refs #29627 logs page
bogdan202 Jun 9, 2021
b450035
refs #31218 partial refund is failed
bogdan202 Sep 22, 2021
22c20b9
refs #31548 header color
bogdan202 Oct 13, 2021
51339b1
refs #31218 partial refund error
bogdan202 Oct 27, 2021
c3becd7
refs #32353 error while refunding
bogdan202 Dec 22, 2021
d3367a0
refs #32353 order page. warning after partial refund
bogdan202 Dec 22, 2021
fb0ca50
refs #39131 error during installation
bogdan202 Mar 6, 2023
7cdf1e0
Merge pull request #13 from 202ecommerce/hotfix/39131-compatibility_w…
bogdan202 Mar 6, 2023
9138198
refs #40206 - Fix bug 3DS
kgleizes May 16, 2023
0c133c0
refs #40206 - Fix bug 3DS
kgleizes May 16, 2023
0821a63
refs #47726 device data + ip
bogdan202 Sep 2, 2024
192a290
refs #39277 unregistered hooks in PS 8.x
bogdan202 Sep 2, 2024
b77b7dd
refs #39277 install process
bogdan202 Sep 2, 2024
3016c1e
refs #40470 payment_error template
bogdan202 Sep 2, 2024
0ec672d
package.josn + webpack
bogdan202 Sep 3, 2024
eedfd7c
licence headers
bogdan202 Sep 3, 2024
a31f79f
refs #41047 deprecated Tools::jsonDecode() and Tools::jsonEncode()
bogdan202 Sep 3, 2024
2dd164b
build.xml
bogdan202 Sep 4, 2024
7e3793f
run_npm.sh
bogdan202 Sep 4, 2024
1278778
Merge pull request #14 from 202ecommerce/evol/40206-3DS-pay-with-paypal
kgleizes Sep 4, 2024
2396fc0
Merge pull request #19 from 202ecommerce/bugfix/41047-ps-81-compatibi…
bogdan202 Sep 4, 2024
eb2a37d
Merge pull request #17 from 202ecommerce/feature/40470-payment_error_tpl
bogdan202 Sep 4, 2024
05b1904
Merge pull request #16 from 202ecommerce/bugfix/39277-unregistered-hooks
bogdan202 Sep 4, 2024
25a42f1
Merge pull request #15 from 202ecommerce/feature/47726-3ds-verificati…
bogdan202 Sep 4, 2024
79566ab
merge develop into feature/licence
bogdan202 Sep 4, 2024
bb075a7
Merge pull request #18 from 202ecommerce/feature/41183-lisense-headers
bogdan202 Sep 4, 2024
5d632f3
refs #41181 ps validation
bogdan202 Sep 6, 2024
d0f4270
refs #47822 fail install if ps 1.7.0.x
bogdan202 Sep 6, 2024
ee13dd4
Merge pull request #20 from 202ecommerce/bugfix/47822-install-action
bogdan202 Sep 6, 2024
9d38c41
refs #47824 displying empty error on the order confirmation page
bogdan202 Sep 6, 2024
153f277
Merge pull request #21 from 202ecommerce/bugfix/47824-error-confirmat…
bogdan202 Sep 6, 2024
d28d7bd
refs #47860 duplication of the status section
bogdan202 Sep 11, 2024
998cb21
Merge pull request #22 from 202ecommerce/bugfix/47860-duplicated-stat…
bogdan202 Sep 11, 2024
48fb341
refs #47954 order status
bogdan202 Sep 12, 2024
88cba5a
Merge pull request #24 from 202ecommerce/feature/47954-order-status
bogdan202 Sep 12, 2024
88d4445
build.xml PSVERSION
bogdan202 Oct 22, 2024
7ef5675
phpcsfixer
bogdan202 Oct 22, 2024
1124b6a
psvalidator
bogdan202 Oct 22, 2024
bb0821e
file permissions
bogdan202 Oct 30, 2024
8c9fcf6
file permission
bogdan202 Oct 31, 2024
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
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 2007-2020 PayPal
* 2007-2021 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -17,7 +17,7 @@
* 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 2007-2021 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
Empty file modified .gitignore
100755 → 100644
Empty file.
16 changes: 16 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Apache 2.2
<IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
<Files ~ "(?i)^.*\.(jpg|jpeg|gif|png|bmp|tiff|svg|pdf|mov|mpeg|mp4|avi|mpg|wma|flv|webm|ico|webp|woff|woff2|ttf|eot|otf|css|js|map)$">
Allow from all
</Files>
</IfModule>

# Apache 2.4
<IfModule mod_authz_core.c>
Require all denied
<Files ~ "(?i)^.*\.(jpg|jpeg|gif|png|bmp|tiff|svg|pdf|mov|mpeg|mp4|avi|mpg|wma|flv|webm|ico|webp|woff|woff2|ttf|eot|otf|css|js|map)$">
Require all granted
</Files>
</IfModule>
11 changes: 11 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

$config = new PrestaShop\CodingStandards\CsFixer\Config();

$config
->setUsingCache(true)
->getFinder()
->in(__DIR__)
->exclude(['vendor', 'node_modules', '202']);

return $config;
Empty file modified .stylelintrc
100755 → 100644
Empty file.
24 changes: 16 additions & 8 deletions 202/build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 2007-2020 PayPal
~ 2007-2021 PayPal
~
~ NOTICE OF LICENSE
~
Expand All @@ -18,7 +18,7 @@
~ 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 2007-2021 PayPal
~ @author 202 ecommerce <[email protected]>
~ @copyright PayPal
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand All @@ -30,9 +30,9 @@
<property name="src-dir" value="${basedir}" />
<property name="TARGETNAME" value="braintreeofficial" />
<property name="TARGETBRANCH" value="${env.GIT_BRANCH}" />
<property name="TARGETVERSION" value="1.2.5" />
<property name="TARGETVERSION" value="1.2.6" />
<property name="PHPVERSION" value="5.6" />
<property name="PSVERSION" value="1.7.5.x" />
<property name="PSVERSION" value="1.7.8.x" />

<target name="build" depends="build-common,package-zip,psvalidator,tot-testing" />

Expand Down Expand Up @@ -111,6 +111,9 @@
<echo>Installing dependencies</echo>
<exec executable="composer" failonerror="true">
<arg value="install" />
<arg value="--no-dev" />
<arg value="--optimize-autoloader" />
<arg value="--ignore-platform-reqs" />
</exec>
</target>
<target name="composer-update" depends="composer.check" if="composer.lock.exist.in.gitignore" description="Updating dependencies">
Expand All @@ -121,14 +124,19 @@
</target>
<!-- end composer -->
<!-- start documentation -->
<target name="npm" depends="clean-npm,npm-install" description="Install or update node dependencies" />
<target name="npm" depends="clean-npm,npm-install,clean-npm-after" description="Install or update node dependencies" />
<target name="clean-npm" description="Empty node_modules folder">
<delete dir="${basedir}/202/node_modules" />
<delete file="${basedir}/package-lock.json" />
</target>
<target name="npm-install" description="Installing node deps">
<exec executable="npm">
<arg value="install" />
</exec>
<exec executable="./202/run_npm.sh"></exec>
</target>
<target name="clean-npm-after" description="Remove NPM JSON">
<delete dir="${basedir}/202/node_modules" />
<delete dir="${basedir}/${TARGETNAME}/_dev" />
<delete file="${basedir}/package-lock.json" />
<delete file="${basedir}/package.json" />
</target>
<target name="doc.check">
<condition property="doc.directory.exist">
Expand Down
4 changes: 2 additions & 2 deletions 202/doc/index.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/doc/src/assets/index.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/doc/src/index.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/index.php
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
24 changes: 24 additions & 0 deletions 202/licence/licence.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* since 2007 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
4 changes: 2 additions & 2 deletions 202/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ 2007-2020 PayPal
~ 2007-2021 PayPal
~
~ NOTICE OF LICENSE
~
Expand All @@ -19,7 +19,7 @@
~ 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 2007-2021 PayPal
~ @author 202 ecommerce <[email protected]>
~ @copyright PayPal
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
Empty file modified 202/ppbtlib.yml
100755 → 100644
Empty file.
37 changes: 37 additions & 0 deletions 202/run_npm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash

#
# Since 2007 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 Since 2007 PayPal
# @author 202 ecommerce <[email protected]>
# @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
# @copyright PayPal
#
#

export NVM_DIR="$HOME/.nvm" # set local path to NVM
. ~/.nvm/nvm.sh # add NVM into the Shell session
nvm install 14.17.3 # install version (done only one time)
nvm use 14.17.3 # use choosed version
npm install
npm rebuild node-sass # could be needed once if version changed
npm run build
rm views/js/*.map
rm views/css/*.map
4 changes: 2 additions & 2 deletions 202/tests/BraintreeLogTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/tests/BraintreeTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/tests/MethodBraintreeMock.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/tests/MethodBraintreeTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/tests/ServiceBraintreeCaptureTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/tests/ServiceBraintreeCustomerTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/tests/ServiceBraintreeLogTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
4 changes: 2 additions & 2 deletions 202/tests/ServiceBraintreeOrderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2007-2020 PayPal
* since 2007 PayPal
*
* NOTICE OF LICENSE
*
Expand All @@ -18,7 +18,7 @@
* 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 since 2007 PayPal
* @author 202 ecommerce <[email protected]>
* @copyright PayPal
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Expand Down
Loading