From daf46c7a5f7f895da0515c18868113735aac57df Mon Sep 17 00:00:00 2001 From: Pieter Poorthuis Date: Fri, 16 Mar 2018 12:39:19 +0100 Subject: [PATCH] Update for v2.1.18 --- CHANGELOG | 8 ++++++++ GUIDE.md | 2 +- LICENSE | 2 +- README.md | 4 ++-- app/code/community/Bitpay/Core/etc/config.xml | 4 ++-- composer.json | 5 ++--- scripts/package | 6 +++++- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0dbc3cc..5472f8d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +2.1.18 (2018-03-16) + Fixed dependencies in composer.json (#127) + Fixed landing page after failure or expired payment (#124, #123, #117, #120) + Fixed missing apikeys configuration in system.xml (#122) + Fixed IPN creating 2nd invoice instead of updating invoice (#121) + Fixed non-debug logging (#115) + Fixed checkout page text (#112) + 2.1.17 Added missing methods in the Magento version below 1.9: _isSameCurrency, getStatusStatuses, addStatusfilter. 2.1.16 diff --git a/GUIDE.md b/GUIDE.md index 275b1d7..8995913 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -6,7 +6,7 @@ You must have a BitPay merchant account to use this plugin. It's free to [sign- ## Server Requirements -* Last Cart Version Tested: 1.9.3.1 +* Last Cart Version Tested: 1.9.3.8 * [Magento CE](http://magento.com/resources/system-requirements) 1.9.0.1 or higher. Older versions might work, however this plugin has been validated to work against the 1.9.0.1 Community Edition release. * [GMP](http://us2.php.net/gmp) or [BC Math](http://us2.php.net/manual/en/book.bc.php) PHP extensions. GMP is preferred for performance reasons but you may have to install this as most servers do not come with it installed by default. BC Math is commonly installed however and the plugin will fall back to this method if GMP is not found. * [OpenSSL](http://us2.php.net/openssl) Must be compiled with PHP and is used for certain cryptographic operations. diff --git a/LICENSE b/LICENSE index 328b352..e6a7a65 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2011-2014 BitPay, Inc. +Copyright (c) 2011-2018 BitPay, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2d30b02..43af0ae 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ To get up and running with our plugin quickly, see the GUIDE here: https://githu **BitPay Support:** -* Last Cart Version Tested: 1.9.3.1 +* Last Cart Version Tested: 1.9.3.8 * [GitHub Issues](https://github.com/bitpay/magento-plugin/issues) * Open an issue if you are having issues with this plugin. * [Support](https://help.bitpay.com) @@ -65,7 +65,7 @@ If you encounter any issues or implement any updates or changes, please open an The MIT License (MIT) -Copyright (c) 2011-2015 BitPay, Inc. +Copyright (c) 2011-2018 BitPay, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/app/code/community/Bitpay/Core/etc/config.xml b/app/code/community/Bitpay/Core/etc/config.xml index c20cd77..6e0bd45 100644 --- a/app/code/community/Bitpay/Core/etc/config.xml +++ b/app/code/community/Bitpay/Core/etc/config.xml @@ -1,14 +1,14 @@ - 2.1.9 + 2.1.18 diff --git a/composer.json b/composer.json index 42ce0dc..c33070e 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "bitpay/magento-plugin", "description": "Bitcoin payment module using the bitpay.com service", - "keywords": ["magento","bitcoin"], + "keywords": ["magento","bitcoin", "bitcoin cash"], "minimum-stability": "stable", "type": "magento-plugin", "homepage": "https://github.com/bitpay/magento-plugin", @@ -12,8 +12,7 @@ "source": "https://github.com/bitpay/magento-plugin" }, "require": { - "composer/installers": "~1.0", - "bitpay/php-client": "dev-master#9027ce67e4b28516ff1ebd1046bdd15c37a7a59f" + "bitpay/php-client": "~2.2" }, "require-dev": { "symfony/finder": "~2.3", diff --git a/scripts/package b/scripts/package index 8efdcd9..fe49432 100755 --- a/scripts/package +++ b/scripts/package @@ -11,7 +11,7 @@ date_default_timezone_set('America/New_York'); // Main Office is in Eastern Time /** * Various Configuration Settings */ -$version = '2.1.13'; +$version = '2.1.18'; $vendorDir = __DIR__ . '/../vendor'; $distDir = __DIR__ . '/../build/dist'; $tmpDistDir = $distDir . '/tmp'; // Files will be placed here temporarly so we can zip/tar them. @@ -143,7 +143,11 @@ $filesystem->remove($distFile.'.tgz'); $process = new \Symfony\Component\Process\Process( sprintf('cd %s; tar -czf %s *', $tmpDistDir, $distFile.'.tgz') ); +$process->run(); +$process = new \Symfony\Component\Process\Process( + sprintf('cd %s; zip -r %s *', $tmpDistDir, $distFile.'.zip') +); $process->run(); // Cleanup