Merge branch 'release/1.9.4'

.gitlab-ci.yml

@@ -37,9 +37,9 @@ stages:
  - build-test-2
  - test-2
  - clean-stack
- - build
  - analysis
  - package
+ - build
  - deploy
  - sync
 
@@ -225,7 +225,7 @@ package:
  - rm -Rf ./vendor && cp ./composer.json.dist ./composer.json && composer install && sh ./bin/deployment/packaging.sh
  - mkdir $CI_COMMIT_REF_SLUG
  - mkdir $CI_COMMIT_REF_SLUG/package
- - cp ./dist/*.tgz $CI_COMMIT_REF_SLUG/package
+ - cp ./dist/*.tgz $CI_COMMIT_REF_SLUG/package/Allopass_Hipay-${CI_COMMIT_REF_SLUG}.tgz
  - ./bin/deployment/deploy_project.sh
  tags:
  - pi-commerce-no-overlay

CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 1.9.4
+
+ - Remove electronic signature from SDD
+ - [#141](https://github.com/hipay/hipay-fullservice-sdk-magento1/issues/141) Fix issue [#141] : Js iframe config bug 
+ - [#140](https://github.com/hipay/hipay-fullservice-sdk-magento1/issues/140) Fix issue [#140] : Wrong method declaration 
+
 # Version 1.9.3
 
  - Fix : Change refund workflow

bin/deployment/deploy_project.sh

@@ -3,7 +3,7 @@ echo "\nCreate Artifact project for project $CI_PROJECT_NAME and branch $CI_COMM
 sshpass -p $PASS_DEPLOY ssh [email protected] -p $PORT_SSH_DOCKER -o StrictHostKeyChecking=no mkdir /deploy/project/artifactory/$CI_JOB_ID
 
 echo "\nTransfert Artifact project for project $CI_PROJECT_NAME and branch $CI_COMMIT_REF_SLUG"
-sshpass -p $PASS_DEPLOY scp -P $PORT_SSH_DOCKER -o StrictHostKeyChecking=no ./dist/*.tgz [email protected]:/deploy/project/artifactory/$CI_JOB_ID
+sshpass -p $PASS_DEPLOY scp -P $PORT_SSH_DOCKER -o StrictHostKeyChecking=no ./$CI_COMMIT_REF_SLUG/package/*.tgz [email protected]:/deploy/project/artifactory/$CI_JOB_ID
 
 echo "\nDeploy project in artifactory"
 docker exec $(docker ps | grep common-artifactory| awk '{print $1}') /tmp/jfrog rt u /deploy/project/artifactory/$CI_JOB_ID/*.tgz $CI_PROJECT_NAME/snapshot/ \

bin/tests/004_SEPA/1_frontend/0400-SEPA_FRONTEND.js

@@ -0,0 +1,64 @@
+/**********************************************************************************************
+ *
+ * VALIDATION TEST METHOD : SEPA DIRECT DEBIT
+ *
+ * To launch test, please pass two arguments URL (BASE URL) and TYPE_CC ( CB,VI,MC )
+ *
+ /**********************************************************************************************/
+
+var paymentType = "HiPay Enterprise SEPA Direct Debit";
+
+casper.test.begin('Test Checkout ' + paymentType, function (test) {
+ phantom.clearCookies();
+
+ casper.start(baseURL + "admin/")
+ .then(function () {
+ this.logToBackend();
+ method.proceed(test, paymentType, "sdd");
+ })
+ .thenOpen(baseURL, function () {
+ this.waitUntilVisible('div.footer', function success() {
+ this.selectItemAndOptions();
+ }, function fail() {
+ test.assertVisible("div.footer", "'Footer' exists");
+ }, 10000);
+ })
+ .then(function () {
+ this.addItemGoCheckout();
+ })
+ .then(function () {
+ this.checkoutMethod();
+ })
+ .then(function () {
+ this.billingInformation();
+ })
+ .then(function () {
+ this.shippingMethod();
+ })
+ .then(function () {
+ this.choosingPaymentMethod('method_hipay_sdd');
+ })
+ .then(function() {
+ this.echo("Filling payment formular sdd ", "INFO");
+ this.fillSelectors('form#co-payment-form', {
+ 'select[name="payment[cc_gender]"]': "M",
+ 'input[name="payment[cc_firstname]"]': "TEST",
+ 'input[name="payment[cc_lastname]"]': "TEST",
+ 'input[name="payment[cc_iban]"]': ibanNumber.gb,
+ 'input[name="payment[cc_code_bic]"]': bicNumber.gb,
+ 'input[name="payment[cc_bank_name]"]': "BANK TEST"
+ }, false);
+ this.click("div#payment-buttons-container>button");
+ test.info("Done");
+ })
+ .then(function () {
+ this.orderReview(paymentType);
+ })
+ .then(function () {
+ test.info("Done");
+ this.orderResult(paymentType);
+ })
+ .run(function () {
+ test.done();
+ });
+});

config.php

@@ -13,9 +13,9 @@
  'license' => 'General Public License (GPL)',
  'channel' => 'community',
 
- 'author_name' => 'Kassim Belghait',
- 'author_user' => 'Sirateck',
- 'author_email' => 'kassim@sirateck.com',
+ 'author_name' => 'HiPay',
+ 'author_user' => 'HiPay',
+ 'author_email' => 'support.tpp@hipay.com',
 
  'base_dir' => __DIR__.'/dist',
  'archive_files' => 'Allopass_Hipay.tar',

docker-compose.acceptance.yml

@@ -21,6 +21,15 @@ services:
  - ./bin/docker/conf/acceptance/hipay.env.sample
  - ./bin/docker/conf/acceptance/mage.env.sample
  - ./bin/docker/conf/acceptance/mysql.env.sample
+ labels:
+ - "com.hipay.ir.publish=1"
+ - "com.hipay.ir.name=web"
+ - "com.hipay.ir.branch=${CI_COMMIT_REF_SLUG}"
+ - "com.hipay.ir.gitlab.feature.link=${CI_PROJECT_URL}/tree/${CI_COMMIT_REF_NAME}"
+ - "com.hipay.ir.gitlab.org=pi-ecommerce"
+ - "com.hipay.ir.gitlab.project=hipay-fullservice-sdk-magento1"
+ - "com.hipay.ir.admin.url=${DOCKER_STACK}-${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}.hipay-pos-platform.com/admin"
+ - "com.hipay.ir.url=${DOCKER_STACK}-${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}.hipay-pos-platform.com"
  deploy:
  labels:
  - "traefik.frontend.rule=Host:${DOCKER_STACK}-${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}.hipay-pos-platform.com"
@@ -68,6 +77,14 @@ services:
  delay: 30s
  restart_policy:
  condition: on-failure
+ labels:
+ - "com.hipay.ir.publish=1"
+ - "com.hipay.ir.name=mail"
+ - "com.hipay.ir.branch=${CI_COMMIT_REF_SLUG}"
+ - "com.hipay.ir.gitlab.feature.link=${CI_PROJECT_URL}/tree/${CI_COMMIT_REF_NAME}"
+ - "com.hipay.ir.gitlab.org=pi-ecommerce"
+ - "com.hipay.ir.gitlab.project=hipay-fullservice-sdk-magento1"
+ - "com.hipay.ir.url=${DOCKER_STACK}-${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-mail.hipay-pos-platform.com"
  networks:
  traefik_traefik:
  magento:

magento.sh

@@ -57,7 +57,7 @@ if [ "$1" = '' ] || [ "$1" = '--help' ]; then
  echo " - notif : Simulate a notification to Magento server"
  echo ""
 elif [ "$1" = 'init' ]; then
- if [ -f ./bin/conf/development/hipay.env ]; then
+ if [ -f ./bin/docker/conf/development/hipay.env ]; then
 
 
  docker-compose -f docker-compose.dev.yml stop

sonar-project.properties

@@ -2,7 +2,7 @@
 sonar.projectKey=hipay-fullservice-sdk-magento1
 # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
 sonar.projectName=HiPay Fullservice extension for Magento v1
-sonar.projectVersion=1.9.3
+sonar.projectVersion=1.9.4
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 # This property is optional if sonar.modules is set.

src/app/code/community/Allopass/Hipay/Block/Adminhtml/System/Config/Form/Field/ListDisabled.php

@@ -29,7 +29,7 @@ class Allopass_Hipay_Block_Adminhtml_System_Config_Form_Field_ListDisabled exten
  * @param Varien_Data_Form_Element_Abstract $element
  * @return string
  */
- protected function _getElementHtml($element)
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
  {
  $element->setDisabled('disabled');
  return parent::_getElementHtml($element);

src/app/code/community/Allopass/Hipay/Block/Form/Abstract.php

@@ -173,13 +173,22 @@ protected function allowUseOneClick()
  public function getIframeConfig()
  {
  $iframe = array();
- $iframe['iframe_width'] = $this->getMethod()->getConfigData('iframe_width');
- $iframe['iframe_height'] = $this->getMethod()->getConfigData('iframe_height');
- $iframe['iframe_style'] = $this->getMethod()->getConfigData('iframe_style');
- $iframe['iframe_wrapper_style'] = $this->getMethod()->getConfigData('iframe_style');
+ $iframe['iframe_width'] = $this->getMethodConfigData('iframe_width');
+ $iframe['iframe_height'] = $this->getMethodConfigData('iframe_height');
+ $iframe['iframe_style'] = $this->getMethodConfigData('iframe_style');
+ $iframe['iframe_wrapper_style'] = $this->getMethodConfigData('iframe_style');
  return $iframe;
  }
 
+ protected function getMethodConfigData($code, $default = "")
+ {
+ if ($this->getMethod()->getConfigData($code) !== null) {
+ return $this->getMethod()->getConfigData($code);
+ }
+
+ return $default;
+ }
+
  /**
  * Render block HTML
  *