Merge pull request #80 from pagantis/bugfix-version

Resolved module version bug
pagantis · Sep 21, 2020 · c0a6c13 · c0a6c13
2 parents a1c8c51 + 14e2773
commit c0a6c13
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -63,6 +63,7 @@ jobs:
           command: |
             export DOCKERHOST=$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1)
             vendor/bin/phpunit --group woocommerce3-buy
+
   pushRelease:
     docker:
       - image: circleci/php:7.1-node-browsers

diff --git a/WC_Pagantis.php b/WC_Pagantis.php
@@ -3,7 +3,7 @@
  * Plugin Name: Pagantis
  * Plugin URI: http://www.pagantis.com/
  * Description: Financiar con Pagantis
- * Version: 8.6.10
+ * Version: 8.6.11
  * Author: Pagantis
  *
  * Text Domain: pagantis
@@ -26,7 +26,7 @@
  */
 define('PG_WC_MAIN_FILE', __FILE__);
 define('PG_ABSPATH', trailingslashit(dirname(PG_WC_MAIN_FILE)));
-define('PG_VERSION', getModuleComposerVersion(PG_ABSPATH));
+define('PG_VERSION', getModuleVersion());
 define('PG_ROOT', dirname(__DIR__));
 define('PG_CONFIG_TABLE_NAME', 'pagantis_config');
 define('PG_LOGS_TABLE_NAME', 'pagantis_logs');
@@ -82,7 +82,6 @@ public function __construct()
     {
         require_once(plugin_dir_path(__FILE__).'/vendor/autoload.php');
         require_once(PG_ABSPATH . '/includes/pg-functions.php');
-
         $this->template_path = plugin_dir_path(__FILE__).'/templates/';
 
         $this->pagantisActivation();

diff --git a/composer.json b/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "pagantis/woocommerce",
     "description": "Woocommerce module to add Pagantis",
-  	"version": "8.6.10",
     "license": "proprietary",
     "type": "wordpress-plugin",
     "keywords": [

diff --git a/controllers/paymentController.php b/controllers/paymentController.php
@@ -50,6 +50,7 @@ class WcPagantisGateway extends WC_Payment_Gateway
      */
     public function __construct()
     {
+        require_once(plugin_dir_path(__FILE__).'../includes/pg-functions.php');
         //Mandatory vars for plugin
         $this->id = WcPagantisGateway::METHOD_ID;
         $this->has_fields = true;
@@ -58,6 +59,8 @@ public function __construct()
         //Useful vars
         $this->template_path = plugin_dir_path(__FILE__) . '../templates/';
         $this->allowed_currencies = getAllowedCurrencies();
+        $this->mainFileLocation = dirname(plugin_dir_path(__FILE__)) . '/WC_Pagantis.php';
+        $this->plugin_info = get_file_data($this->mainFileLocation, array('Version' => 'Version'), false);
         $this->language = strstr(get_locale(), '_', true);
         if ($this->language=='') {
             $this->language = 'ES';
@@ -247,7 +250,7 @@ public function pagantisReceiptPage($order_id)
             $metadataOrder = new Metadata();
             $metadata = array(
                 'pg_module' => 'woocommerce',
-                'pg_version' => PG_VERSION,
+                'pg_version' => getModuleVersion(),
                 'ec_module' => 'woocommerce',
                 'ec_version' => WC()->version
             );
@@ -689,4 +692,5 @@ private function unparseUrl($parsed_url)
         $path     = $parsed_url['path'];
         return $scheme . $host . $port . $path . $query . $fragment;
     }
+
 }
diff --git a/controllers/paymentController4x.php b/controllers/paymentController4x.php
@@ -215,7 +215,7 @@ public function pagantisReceiptPage($order_id)
             $metadataOrder = new Metadata();
             $metadata = array(
                 'pg_module' => 'woocommerce',
-                'pg_version' => PG_VERSION,
+                'pg_version' => getModuleVersion(),
                 'ec_module' => 'woocommerce',
                 'ec_version' => WC()->version
             );

diff --git a/includes/pg-functions.php b/includes/pg-functions.php
@@ -334,21 +334,14 @@ function getExtraConfig()
     return $response;
 }
 
-function getModuleComposerVersion($moduleAbsolutePath)
+function getModuleVersion()
 {
-    $maybe_composer_json = $moduleAbsolutePath . 'composer.json';
-    if (! file_exists($maybe_composer_json) && ! is_readable($maybe_composer_json)) {
-        return null;
-    }
-    $composer = json_decode(file_get_contents($maybe_composer_json));
-    if (empty($composer->version)) {
-        return null;
-    }
 
-    return $composer->version;
+    $mainFile = plugin_dir_path(PG_WC_MAIN_FILE). '/WC_Pagantis.php';
+    $version = get_file_data($mainFile, array('Version' => 'Version'), false);
+    return $version['Version'];
 }
 
-
 /**
  * @param $order
  *

diff --git a/test/selenium/buy/AbstractBuy.php b/test/selenium/buy/AbstractBuy.php
@@ -170,6 +170,8 @@ public function prepareProductAndCheckout()
 
     /**
      * STEP2: Prepare checkout and check pagantis form
+     *
+     * @throws \Exception
      */
     public function makeCheckoutAndPagantis()
     {
@@ -317,7 +319,7 @@ public function verifyOrderInformation()
     {
         $messageElementSearch = WebDriverBy::className('entry-title');
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated($messageElementSearch);
-        $this->waitUntil($condition);
+            $this->waitUntil($condition);
         $actualString = $this->webDriver->findElement($messageElementSearch)->getText();
         $this->assertNotEmpty($actualString, "PR45");
         $confString = ($this->woocommerceLanguage == 'EN') ? "Order received" : "Pedido recibido";