Skip to content

Commit

Permalink
Merge branch 'hotfix/2.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@etiennelandais
etiennelandais committed Mar 7, 2018
2 parents d7c59f0 + eaff270 commit 197bad3
Show file tree
Hide file tree
Showing 9 changed files with 345 additions and 15 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Version 2.1.5

- Fix: Fix Js error

# Version 2.1.4

- Fix: credit card block are displaying even if no credit card payment are activated
Expand Down
4 changes: 2 additions & 2 deletions conf/docker/Dockerfile17
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM prestashop/prestashop:1.7.2.0
FROM prestashop/prestashop:1.7.2.2

MAINTAINER support.wallet <[email protected]>

Expand All @@ -20,4 +20,4 @@ RUN sed -i "/exec apache2-foreground/d" /tmp/docker_run.sh \
&& sed -i "/Almost ! Starting Apache now/d" /tmp/docker_run.sh \
&& chmod 777 -R /tmp

ENTRYPOINT ["/tmp/entrypoint.sh"]
ENTRYPOINT ["/tmp/entrypoint.sh"]
9 changes: 8 additions & 1 deletion docker-compose.dev.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
mysql:
image: mysql:5.7
ports:
- "3318:3306"
- "3318:3306"
env_file:
- ./conf/env_file/development/env
smtp:
image: schickling/mailcatcher
ports:
- "1018:1080"
2 changes: 1 addition & 1 deletion src/hipay_enterprise/hipay_enterprise.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function __construct()

$this->name = 'hipay_enterprise';
$this->tab = 'payments_gateways';
$this->version = '2.1.4';
$this->version = '2.1.5';
$this->module_key = 'c3c030302335d08603e8669a5210c744';
$this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
$this->currencies = true;
Expand Down
318 changes: 318 additions & 0 deletions src/hipay_enterprise/upgrade/Upgrade-2.1.5.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,318 @@
<?php
/**
* HiPay Enterprise SDK Prestashop
*
* 2017 HiPay
*
* NOTICE OF LICENSE
*
* @author HiPay <[email protected]>
* @copyright 2017 HiPay
* @license https://github.com/hipay/hipay-enterprise-sdk-prestashop/blob/master/LICENSE.md
*/

function upgrade_module_2_1_5($module)
{

$log = $module->getLogs();

$log->logInfos("Upgrade to 2.1.5");

$keepParameters = array(
"visa" => array(
"currencies" => "",
"countries" => "",
"minAmount" => "",
"maxAmount" => "",
"frontPosition" => "",
"activated" => ""
),
"mastercard" => array(
"currencies" => "",
"minAmount" => "",
"maxAmount" => "",
"countries" => "",
"frontPosition" => "",
"activated" => ""
),
"cb" => array(
"currencies" => "",
"minAmount" => "",
"maxAmount" => "",
"countries" => "",
"frontPosition" => "",
"activated" => ""
),
"maestro" => array(
"currencies" => "",
"minAmount" => "",
"maxAmount" => "",
"countries" => "",
"frontPosition" => "",
"activated" => ""
),
"american-express" => array(
"currencies" => "",
"minAmount" => "",
"maxAmount" => "",
"countries" => "",
"frontPosition" => "",
"activated" => ""
),
"bcmc" => array(
"currencies" => "",
"minAmount" => "",
"maxAmount" => "",
"countries" => "",
"frontPosition" => "",
"activated" => ""
),
"3xcb" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"3xcb-no-fees" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"4xcb" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"4xcb-no-fees" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"4xcb-no-fees" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"aura" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"banamex" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"banco-do-brasil" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"bbva-bancomer" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"boleto-bancario" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"bradesco" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"caixa" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"itau" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"oxxo" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"santander-cash" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"santander-home-banking" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"dexia-directnet" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"bnpp-3xcb" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"bnpp-4xcb" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"giropay" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"ideal" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"ing-homepay" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"klarna" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"paypal" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"postfinance-card" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"postfinance-efinance" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"przelewy24" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"sdd" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => "",
"electronicSignature" => ""
),
"sisal" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"sofort-uberweisung" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => "",
"currencies" => "",
"countries" => ""
),
"webmoney-transfert" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
),
"yandex" => array(
"displayName" => "",
"frontPosition" => "",
"minAmount" => "",
"maxAmount" => "",
"activated" => ""
)
);

$module->hipayConfigTool->updateFromJSONFile($keepParameters);

return true;
}
2 changes: 1 addition & 1 deletion src/hipay_enterprise/views/js/card-js.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 197bad3

Please sign in to comment.