Changeset 2206525

Timestamp:

12/05/2019 11:57:22 AM (5 years ago)

Author:

wido

Message:

bump 5.4.1

Location:

mollie-payments-for-woocommerce/trunk

Files:

• inc/utils.php (modified) (2 diffs)
• mollie-payments-for-woocommerce.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• src/Mollie/WC/Helper/Settings.php (modified) (4 diffs)
• src/Mollie/WC/Plugin.php (modified) (2 diffs)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/autoload_real.php (modified) (5 diffs)
• vendor/composer/autoload_static.php (modified) (2 diffs)
• vendor/guzzlehttp/promises/README.md (added)
• vendor/guzzlehttp/psr7/README.md (added)
• vendor/ralouphie/getallheaders/composer.json (added)

mollie-payments-for-woocommerce/trunk/inc/utils.php

@@ -50 +50 @@
     static $profile = null;
 
-    if (null === $profile) {
+    if () {
         $isTestMode = isTestModeEnabled();
 
@@ -68 +68 @@
 function merchantProfileId()
 {
-    $merchantProfile = merchantProfile();
+    static $merchantProfileId = null;
+    $merchantProfileIdOptionKey = Mollie_WC_Plugin::PLUGIN_ID . '_merchant_profile_id';
 
-    return isset($merchantProfile->id) ? $merchantProfile->id : 0;
+    if ($merchantProfileId === null) {
+        $merchantProfileId = get_option($merchantProfileIdOptionKey, '');
+
+        /*
+         * Try to retrieve the merchant profile ID from an Api Request if not stored already,
+         * then store it into the database
+         */
+        if (!$merchantProfileId) {
+            try {
+                $merchantProfile = merchantProfile();
+                $merchantProfileId = isset($merchantProfile->id) ? $merchantProfile->id : '';
+            } catch (ApiException $exception) {
+                $merchantProfileId = '';
+            }
+
+            if ($merchantProfileId) {
+                update_option($merchantProfileIdOptionKey, $merchantProfileId, false);
+            }
+        }
+    }
+
+    return $merchantProfileId;
 }
 

mollie-payments-for-woocommerce/trunk/mollie-payments-for-woocommerce.php

@@ -4 +4 @@
  * Plugin URI: https://www.mollie.com
  * Description: Accept payments in WooCommerce with the official Mollie plugin
- * Version: 5.4.0
+ * Version: 5.4.
  * Author: Mollie
  * Author URI: https://www.mollie.com

mollie-payments-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.8
 Tested up to: 5.3
-Stable tag: 5.4.0
+Stable tag: 5.4.
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -182 +182 @@
 == Changelog ==
 
+
+
+
+
 = 5.4.0 - 04-12-2019 =
 

mollie-payments-for-woocommerce/trunk/src/Mollie/WC/Helper/Settings.php

@@ -1 +1 @@
 <?php
+
+
+
 class Mollie_WC_Helper_Settings
 {
@@ -52 +55 @@
         $setting_id = $test_mode ? 'test_api_key' : 'live_api_key';
 
-        return trim(get_option($this->getSettingId($setting_id)));
+        $apiKeyId = $this->getSettingId($setting_id);
+        $apiKey = get_option($apiKeyId);
+
+        if (!$apiKey && is_admin()) {
+            $apiKey = filter_input(INPUT_POST, $apiKeyId, FILTER_SANITIZE_STRING);
+        }
+
+        return trim($apiKey);
     }
 
@@ -134 +144 @@
      * @return string
      */
-    public function getLogsUrl ()
+    public function getLogsUrl()
     {
         return admin_url('admin.php?page=wc-status&tab=logs');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -147 +183 @@
      * @return string
      */
-    protected function getPluginStatus ()
+    protected function getPluginStatus()
     {
         $status = Mollie_WC_Plugin::getStatusHelper();
 
-        if (!$status->isCompatible())
-        {
+        if (!$status->isCompatible()) {
             // Just stop here!
             return ''
                 . '<div class="notice notice-error">'
-                . '<p><strong>' . __('Error', 'mollie-payments-for-woocommerce') . ':</strong> ' . implode('<br/>', $status->getErrors())
+                . '<p><strong>' . __(
+                    'Error',
+                    'mollie-payments-for-woocommerce'
+                ) . ':</strong> ' . implode('<br/>', $status->getErrors())
                 . '</p></div>';
         }

mollie-payments-for-woocommerce/trunk/src/Mollie/WC/Plugin.php

@@ -9 +9 @@
     const PLUGIN_ID      = 'mollie-payments-for-woocommerce';
     const PLUGIN_TITLE   = 'Mollie Payments for WooCommerce';
-    const PLUGIN_VERSION = '5.4.0';
+    const PLUGIN_VERSION = '5.4.';
 
     const DB_VERSION     = '1.0';
@@ -205 +205 @@
                 }
             }
+
+
+
+
+
+
         );
 

mollie-payments-for-woocommerce/trunk/vendor/autoload.php

@@ -5 +5 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit3ea1880a2740a3571db7cff67650474a::getLoader();
+return ComposerAutoloaderInit::getLoader();

mollie-payments-for-woocommerce/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit3ea1880a2740a3571db7cff67650474a
+class ComposerAutoloaderInit
 {
     private static $loader;
@@ -20 +20 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit3ea1880a2740a3571db7cff67650474a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit3ea1880a2740a3571db7cff67650474a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
@@ -28 +28 @@
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit3ea1880a2740a3571db7cff67650474a::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
@@ -49 +49 @@
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit3ea1880a2740a3571db7cff67650474a::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire3ea1880a2740a3571db7cff67650474a($fileIdentifier, $file);
+            composerRequire($fileIdentifier, $file);
         }
 
@@ -61 +61 @@
 }
 
-function composerRequire3ea1880a2740a3571db7cff67650474a($fileIdentifier, $file)
+function composerRequire($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

mollie-payments-for-woocommerce/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInit3ea1880a2740a3571db7cff67650474a
+class ComposerStaticInit
 {
     public static $files = array (
@@ -287 +287 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit3ea1880a2740a3571db7cff67650474a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit3ea1880a2740a3571db7cff67650474a::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit3ea1880a2740a3571db7cff67650474a::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit3ea1880a2740a3571db7cff67650474a::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit::$classMap;
 
         }, null, ClassLoader::class);