Merge branch 'hotfix/1.0.11'

etiennelandais · etiennelandais · commit b15dbe48ddb2 · 2019-11-18T15:23:10.000+01:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,17 +1,20 @@
-image: hipay/gitlab-ci-base:jessie
+image: gcr.io/pi-dev-sandbox/gitlab-ci-base:jessie
 
 stages:
  - build-test
  - test
- - clean-stack
- - analysis
  - package
  - build
  - deploy
- - sync
 
 variables:
-  PROJECT_NAME_TEST: ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_PIPELINE_ID}
+  DOCKER_HOST: tcp://localhost:2375/
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
+  GIT_DEPTH: 10
+
+services:
+  - docker:19.03.1-dind
 
 #########################
 ####  JOBS          ####
@@ -20,63 +23,21 @@ build-test:
   stage: build-test
   script:
     - docker-compose -f docker-compose.test.yml build
+    - docker-compose -f docker-compose.test.yml push
   tags:
-    - pi-commerce-no-overlay
+    - gcp-default-runner
 
 test:
   stage: test
-  before_script:
-    - sed -i -e "s/{DB_HOST\}/${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_database/" ./bin/docker/conf/test/env
-    - sed -i -e "s/{PS_DOMAIN\}/${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}-web-17/" ./bin/docker/conf/test/env17
-    - sed -i -e "s/{PS_DOMAIN\}/${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}-web-16/" ./bin/docker/conf/test/env16
   script:
-    - docker-compose -p $PROJECT_NAME_TEST -f docker-compose.test.yml stop
-    - docker-compose -p $PROJECT_NAME_TEST -f docker-compose.test.yml rm -fv
-    - docker-compose -p $PROJECT_NAME_TEST -f docker-compose.test.yml up -d
+    - docker-compose -f docker-compose.test.yml pull -q
+    - docker-compose -f docker-compose.test.yml up -d
     - sleep 250
-    - docker-compose -p $PROJECT_NAME_TEST -f docker-compose.test.yml logs
-    - curl --retry 10 --retry-delay 20 -v http:\/\/${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}-web-16/
-    - curl --retry 10 --retry-delay 20 -v http:\/\/${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}-web-17/
-  after_script:
-    - /tools/clean-job.sh $PROJECT_NAME_TEST docker-compose.test.yml prestashop ${DOCKER_STACK}-${DOCKER_SERVICE}_web17:${CI_COMMIT_REF_SLUG}
-    - /tools/clean-job.sh $PROJECT_NAME_TEST docker-compose.test.yml prestashop ${DOCKER_STACK}-${DOCKER_SERVICE}_web16:${CI_COMMIT_REF_SLUG}
+    - docker-compose -f docker-compose.test.yml logs
+    - curl --retry 10 --retry-delay 20 -v localhost:8076
+    - curl --retry 10 --retry-delay 20 -v localhost:8077
   tags:
-    - pi-commerce-no-overlay
-
-clean-stack-test:
-  stage: clean-stack
-  script:
-    - echo "Clean remaining containers, network and images"
-  after_script:
-    - /tools/clean-job.sh $PROJECT_NAME_TEST docker-compose.test.yml prestashop ${DOCKER_STACK}-${DOCKER_SERVICE}_web17:${CI_COMMIT_REF_SLUG}
-    - /tools/clean-job.sh $PROJECT_NAME_TEST docker-compose.test.yml prestashop ${DOCKER_STACK}-${DOCKER_SERVICE}_web16:${CI_COMMIT_REF_SLUG}
-  tags:
-    - pi-commerce-no-overlay
-  when: always
-
-sonarqube:
-  stage: analysis
-  image: ciricihq/gitlab-sonar-scanner
-  variables:
-    SONAR_URL: http://172.17.0.1:19000
-    SONAR_ANALYSIS_MODE: preview
-    SONAR_TOKEN: $SONAR_LOGIN
-  script:
-    - /usr/bin/sonar-scanner-run.sh
-  tags:
-    - pi-commerce-no-overlay
-
-sonarqube-reports:
-  stage: analysis
-  image: ciricihq/gitlab-sonar-scanner
-  variables:
-    SONAR_URL: http://172.17.0.1:19000
-    SONAR_ANALYSIS_MODE: "publish"
-    SONAR_TOKEN: $SONAR_LOGIN
-  script:
-    - unset CI_BUILD_REF && /usr/bin/sonar-scanner-run.sh
-  tags:
-    - pi-commerce-no-overlay
+    - gcp-high-load-runner
 
 package:
  stage: package
@@ -85,16 +46,15 @@ package:
  script:
   - echo "Package module $CI_COMMIT_REF_SLUG"
   - ./package-ready-for-prestashop/builder/module_builder.sh -v $CI_COMMIT_REF_SLUG
-  - chmod u+x bin/deployment/deploy_package.sh
-  - ./bin/deployment/deploy_package.sh
  artifacts:
   paths:
     - ./package-ready-for-prestashop
  tags:
-    - pi-commerce-no-overlay
+    - gcp-default-runner
 
 build:
   stage: build
+  when: manual
   before_script:
     - /tools/docker-rmi.sh ${REGISTRY_URL}/${DOCKER_STACK}-${DOCKER_SERVICE}_web-16:${CI_COMMIT_REF_SLUG}
     - /tools/docker-rmi.sh ${REGISTRY_URL}/${DOCKER_STACK}-${DOCKER_SERVICE}_web-17:${CI_COMMIT_REF_SLUG}
@@ -105,9 +65,10 @@ build:
     - docker rmi ${REGISTRY_URL}/${DOCKER_STACK}-${DOCKER_SERVICE}_web-16:${CI_COMMIT_REF_SLUG}
     - docker rmi ${REGISTRY_URL}/${DOCKER_STACK}-${DOCKER_SERVICE}_web-17:${CI_COMMIT_REF_SLUG}
   tags:
-    - pi-commerce-no-overlay
+    - gcp-default-runner
 
 deploy2recette:
+  when: manual
   stage: deploy
   before_script:
     - sed -i -e "s/{DB_HOST\}/${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_database/" ./bin/docker/conf/acceptance/env
@@ -123,14 +84,4 @@ deploy2recette:
     - bash /tools/deployToDockerMachine.sh -e ./bin/docker/conf/acceptance/env -e ./bin/docker/conf/acceptance/env16 -e ./bin/docker/conf/acceptance/env17 -s docker-compose.acceptance.yml -n $DOCKER_STACK-$DOCKER_SERVICE-$CI_COMMIT_REF_SLUG
   allow_failure: true
   tags:
-    - pi-commerce-no-overlay
-
-sync:
-  stage: sync
-  script:
-    - git clone --mirror https://$GITLAB_USER:$GITLAB_PASSWORD@gitlab.hipay.org/pi-ecommerce/hipay-professional-sdk-prestashop.git
-    - cd hipay-professional-sdk-prestashop.git
-    - git push --mirror https://$GITHUB_USER:$GITHUB_PASSWORD@github.com/hipay/hipay-professional-sdk-prestashop.git
-  allow_failure: true
-  tags:
-    - pi-commerce-no-overlay
+    - gcp-default-runner
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 1.0.11
+
+- **Fix**: PHP warning on order page
+
 # Version 1.0.10
 
 - Switch to old array syntax
diff --git a/bin/deployment/deploy_package.sh b/bin/deployment/deploy_package.sh
diff --git a/bin/docker/conf/test/env b/bin/docker/conf/test/env
@@ -8,7 +8,7 @@ PS_DEV_MODE=1
 PS_FOLDER_ADMIN=admin-hipay
 PS_FOLDER_INSTALL=installOLD
 PS_HANDLE_DYNAMIC_DOMAIN=0
-DB_SERVER={DB_HOST}
+DB_SERVER=database
 DB_USER=root
 DB_PASSWD=admin
 MYSQL_ROOT_PASSWORD=admin
diff --git a/bin/docker/conf/test/env16 b/bin/docker/conf/test/env16
@@ -1,2 +1,2 @@
-PS_DOMAIN={PS_DOMAIN}
+PS_DOMAIN=localhost:8076
 DB_NAME=prestashop16
diff --git a/bin/docker/conf/test/env17 b/bin/docker/conf/test/env17
@@ -1,2 +1,2 @@
-PS_DOMAIN={PS_DOMAIN}
+PS_DOMAIN=localhost:8077
 DB_NAME=prestashop17
diff --git a/bin/docker/images/prestashop/Dockerfile16 b/bin/docker/images/prestashop/Dockerfile16
@@ -3,11 +3,15 @@ FROM prestashop/prestashop:1.6-7.1-apache
 MAINTAINER support.wallet <support.wallet@hipay.com>
 
 RUN apt-get update \
-        && apt-get install -y ssmtp vim git cron \
+        && apt-get install -y curl gnupg \
+        && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+        && apt-get install -y msmtp vim git cron \
+        && apt-get install -y nodejs \
+        && npm install -g bower \
+                && echo '{ "allow_root": true }' > /root/.bowerrc \
                 && curl -sS https://getcomposer.org/installer | php -- --filename=composer -- --install-dir=/usr/local/bin \
-                && echo "sendmail_path = /usr/sbin/ssmtp -t" > /usr/local/etc/php/conf.d/sendmail.ini \
-                && echo '' \
-                && echo "mailhub=smtp:1025\nUseTLS=NO\nFromLineOverride=YES" > /etc/ssmtp/ssmtp.conf \
+                && echo "sendmail_path = /usr/sbin/msmtp -t" > /usr/local/etc/php/conf.d/sendmail.ini \
+                && echo "mailhub=common-smtp:1025\nUseTLS=NO\nFromLineOverride=YES" > /etc/msmtprc \
                 &&  rm -rf /var/lib/apt/lists/*
 
 COPY bin/docker /tmp
diff --git a/bin/docker/images/prestashop/Dockerfile17 b/bin/docker/images/prestashop/Dockerfile17
@@ -1,14 +1,18 @@
-FROM prestashop/prestashop:1.7-7.1-apache
+FROM prestashop/prestashop:1.7-7.2-apache
 
 MAINTAINER support.wallet <support.wallet@hipay.com>
 
 RUN apt-get update \
-        && apt-get install -y ssmtp vim git cron \
-                && curl -sS https://getcomposer.org/installer | php -- --filename=composer -- --install-dir=/usr/local/bin \
-                && echo "sendmail_path = /usr/sbin/ssmtp -t" > /usr/local/etc/php/conf.d/sendmail.ini \
-                && echo '' \
-                && echo "mailhub=smtp:1025\nUseTLS=NO\nFromLineOverride=YES" > /etc/ssmtp/ssmtp.conf \
-                &&  rm -rf /var/lib/apt/lists/*
+    && apt-get install -y curl gnupg \
+    && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+    && apt-get install -y msmtp vim git cron \
+    && apt-get install -y nodejs \
+    && npm install -g bower \
+    && echo '{ "allow_root": true }' > /root/.bowerrc \
+    && curl -sS https://getcomposer.org/installer | php -- --filename=composer -- --install-dir=/usr/local/bin \
+    && echo "sendmail_path = /usr/sbin/msmtp -t" > /usr/local/etc/php/conf.d/sendmail.ini \
+    && echo "mailhub=common-smtp:1025\nUseTLS=NO\nFromLineOverride=YES" > /etc/msmtprc \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY bin/docker /tmp
 
diff --git a/bin/docker/images/prestashop/entrypoint.sh b/bin/docker/images/prestashop/entrypoint.sh
@@ -4,11 +4,25 @@
 #       CALL PARENT ENTRYPOINT
 #===================================#
 echo "\n Execution PRESTASHOP Entrypoint \n";
+
+# wait until MySQL is really available
+maxcounter=45
+counter=1
+while ! mysql --protocol TCP -h $DB_SERVER -P $DB_PORT -u $DB_USER -p$DB_PASSWD -e "show databases;" > /dev/null 2>&1; do
+    sleep 1
+    counter=`expr $counter + 1`
+    if [ $counter -gt $maxcounter ]; then
+        >&2 echo "We have been waiting for MySQL too long already; failing."
+        exit 1
+    fi;
+done
+
 /tmp/docker_run.sh
 
 if [ $ACTIVE_XDEBUG ];then
     # INSTALL X DEBUG
-    echo '' | pecl install xdebug-2.5.0
+    echo '' | pecl install xdebug-2.6.1
+    echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini
     echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini
     echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini
 fi
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -1,15 +1,9 @@
 version: "3.3"
 
-networks:
-  prestashop:
-    internal: true
-  outside:
-    external: true
-
 services:
   web17:
-    container_name: ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_web-17
-    image: ${DOCKER_STACK}-${DOCKER_SERVICE}_web17:${CI_COMMIT_REF_SLUG}
+    container_name: prestashop_web_17
+    image: gcr.io/pi-dev-sandbox/test-jobs-${DOCKER_STACK}-${DOCKER_SERVICE}_web17:${CI_COMMIT_REF_SLUG}
     build:
       context: .
       dockerfile: ./bin/docker/images/prestashop/Dockerfile17
@@ -18,14 +12,12 @@ services:
     env_file:
       - ./bin/docker/conf/test/env
       - ./bin/docker/conf/test/env17
-    networks:
-      prestashop:
-      outside:
-        aliases:
-          - ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}-web-17
+    ports:
+      - "8077:80"
+
   web16:
-    container_name: ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_web-16
-    image: ${DOCKER_STACK}-${DOCKER_SERVICE}_web16:${CI_COMMIT_REF_SLUG}
+    container_name: prestashop_web_17_16
+    image: gcr.io/pi-dev-sandbox/test-jobs-${DOCKER_STACK}-${DOCKER_SERVICE}_web16:${CI_COMMIT_REF_SLUG}
     build:
       context: .
       dockerfile: ./bin/docker/images/prestashop/Dockerfile16
@@ -34,28 +26,15 @@ services:
     env_file:
       - ./bin/docker/conf/test/env
       - ./bin/docker/conf/test/env16
-    networks:
-      prestashop:
-      outside:
-        aliases:
-          - ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}-web-16
+    ports:
+      - "8076:80"
+
   database:
     image: mysql:5.7
-    container_name: ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_database
-    networks:
-      prestashop:
-        aliases:
-          - ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_database
+    container_name: prestashop_database
     env_file:
       - ./bin/docker/conf/test/env
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
       timeout: 20s
       retries: 10
-  smtp:
-    image: schickling/mailcatcher
-    container_name: ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_smtp
-    networks:
-      prestashop:
-        aliases:
-          - ${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}-${CI_JOB_ID}_smtp
diff --git a/src/hipay_professional/hipay_professional.php b/src/hipay_professional/hipay_professional.php
@@ -48,7 +48,7 @@ public function __construct()
     {
         $this->name = 'hipay_professional';
         $this->tab = 'payments_gateways';
-        $this->version = '1.0.10';
+        $this->version = '1.0.11';
         $this->module_key = 'ab188f639335535838c7ee492a2e89f8';
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
         $this->currencies = true;
@@ -433,8 +433,11 @@ public function hookDisplayAdminOrderLeft($params)
                 $messages = CustomerThread::getCustomerMessagesOrder($order->getCustomer()->id, $order->id);
             }
 
-            $message = array_pop($messages);
-            $details = Tools::jsonDecode($message['message']);
+            do {
+                $message = array_pop($messages);
+                $details = Tools::jsonDecode($message['message']);
+            } while ($details === null && !empty($messages));
+
             $params = http_build_query(array(
                 'id_order' => $order->id,
                 'sandbox' => (isset($details->Environment) && ($details->Environment != 'PRODUCTION') ? 1 : 0),
@@ -1570,8 +1573,12 @@ public function getAdminOrderRefundBlockDetails($order)
         } else {
             $messages = CustomerThread::getCustomerMessagesOrder($order->getCustomer()->id, $order->id);
         }
-        $message = array_pop($messages);
-        $details = Tools::jsonDecode($message['message']);
+
+        do {
+            $message = array_pop($messages);
+            $details = Tools::jsonDecode($message['message']);
+        } while ($details === null && !empty($messages));
+
         $id_transaction = $this->getTransactionId($details);
 
         $params = http_build_query(array(

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-PS_DOMAIN={PS_DOMAIN}`
	`1`	`+PS_DOMAIN=localhost:8076`
`2`	`2`	`DB_NAME=prestashop16`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-PS_DOMAIN={PS_DOMAIN}`
	`1`	`+PS_DOMAIN=localhost:8077`
`2`	`2`	`DB_NAME=prestashop17`