updated

BeycanPress · Jul 20, 2024 · d55e2b9 · d55e2b9
1 parent 2d0c93e
commit d55e2b9
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 45 deletions.
diff --git a/assets/js/main.js b/assets/js/main.js
@@ -1,11 +1,11 @@
 ;(($) => {
     $(document).ready(() => {
-        if (window.CryptoPayModal) {
-            $(document).on('click', '#mb-cryptopay-start', CryptoPayModal.open);
+        if (window.CryptoPayApp) {
+            $(document).on('click', '#mb-cryptopay-start', CryptoPayApp.modal.open);
         }
 
-        if (window.CryptoPayLiteModal) {
-            $(document).on('click', '#mb-cryptopay-lite-start', CryptoPayLiteModal.open);
+        if (window.CryptoPayLiteApp) {
+            $(document).on('click', '#mb-cryptopay-lite-start', CryptoPayLiteApp.modal.open);
         }
     });
 })(jQuery);
diff --git a/composer.json b/composer.json
@@ -10,6 +10,6 @@
         }
     },
     "require": {
-        "beycanpress/cryptopay-integrator": "^0.1.11"
+        "beycanpress/cryptopay-integrator": "^0.1.13"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/cryptopay-gateway-for-memberdash.php b/cryptopay-gateway-for-memberdash.php
@@ -19,9 +19,9 @@
  * License:     GPLv3
  * License URI: https://www.gnu.org/licenses/gpl-3.0.html
  * Text Domain: md-cryptopay
- * Tags: Cryptopay, Cryptocurrency, WooCommerce, WordPress, MetaMask, Trust, Binance, Wallet, Ethereum, Bitcoin, Binance smart chain, Payment, Plugin, Gateway, Moralis, Converter, API, coin market cap, CMC
+ * Tags: Bitcoin, Ethereum, Cryptocurrency, Payments, MemberDash
  * Requires at least: 5.0
- * Tested up to: 6.5.0
+ * Tested up to: 6.6
  * Requires PHP: 8.1
 */
 
@@ -54,10 +54,7 @@ function memberdash_cryptopay_addModels(): void
 
     if (!defined('MEMBERDASH_VERSION')) {
         Helpers::requirePluginMessage('MemberDash', 'https://www.learndash.com/memberdash-plugin/', false);
-        return;
-    }
-
-    if (Helpers::bothExists()) {
+    } elseif (Helpers::bothExists()) {
         new BeycanPress\CryptoPay\MemberDash\Loader();
     } else {
         Helpers::requireCryptoPayMessage('MemberDash');

diff --git a/readme.txt b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: BeycanPress
 Tags: Bitcoin, Ethereum, Cryptocurrency, Payments, MemberDash
 Requires at least: 5.0
-Tested up to: 6.5.0
+Tested up to: 6.6
 Requires PHP: 8.1
 Stable Tag: 1.0.0
 Version: 1.0.0

diff --git a/vendor/beycanpress/cryptopay-integrator/composer.json b/vendor/beycanpress/cryptopay-integrator/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "beycanpress/cryptopay-integrator",
-    "version": "0.1.11",
+    "version": "0.1.13",
     "description": "CryptoPay and CryptoPay Lite integration wrapper",
     "type": "library",
     "license": "MIT",

diff --git a/vendor/beycanpress/cryptopay-integrator/src/Helpers.php b/vendor/beycanpress/cryptopay-integrator/src/Helpers.php
@@ -37,15 +37,15 @@ public static function bothExists(): bool
      */
     public static function liteExists(): bool
     {
-        return class_exists(LiteLoader::class);
+        return defined('CRYPTOPAY_LITE_LOADED');
     }
 
     /**
      * @return bool
      */
     public static function exists(): bool
     {
-        return class_exists(Loader::class);
+        return defined('CRYPTOPAY_LOADED');
     }
 
     /**

diff --git a/vendor/beycanpress/cryptopay-integrator/src/Session.php b/vendor/beycanpress/cryptopay-integrator/src/Session.php
@@ -11,7 +11,7 @@ class Session
      */
     public static function start(): void
     {
-        if (PHP_SESSION_NONE === session_status()) {
+        if (PHP_SESSION_NONE === session_status() && !headers_sent()) {
             session_start();
         }
     }

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -2,23 +2,23 @@
     "packages": [
         {
             "name": "beycanpress/cryptopay-integrator",
-            "version": "0.1.11",
-            "version_normalized": "0.1.11.0",
+            "version": "0.1.13",
+            "version_normalized": "0.1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/BeycanPress/cryptopay-integrator.git",
-                "reference": "cd50c21a0daf9bbcc5b86a292d620b74b47aa73e"
+                "reference": "b981bcc7cf021d653acd938d817b51f1cbb27d4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/BeycanPress/cryptopay-integrator/zipball/cd50c21a0daf9bbcc5b86a292d620b74b47aa73e",
-                "reference": "cd50c21a0daf9bbcc5b86a292d620b74b47aa73e",
+                "url": "https://api.github.com/repos/BeycanPress/cryptopay-integrator/zipball/b981bcc7cf021d653acd938d817b51f1cbb27d4f",
+                "reference": "b981bcc7cf021d653acd938d817b51f1cbb27d4f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1"
             },
-            "time": "2024-04-04T08:02:22+00:00",
+            "time": "2024-07-20T03:27:42+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -34,7 +34,7 @@
             "homepage": "https://github.com/BeycanPress/cryptopay-integrator",
             "support": {
                 "issues": "https://github.com/BeycanPress/cryptopay-integrator/issues",
-                "source": "https://github.com/BeycanPress/cryptopay-integrator/tree/0.1.11"
+                "source": "https://github.com/BeycanPress/cryptopay-integrator/tree/0.1.13"
             },
             "install-path": "../beycanpress/cryptopay-integrator"
         }

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'bbf6f92408d9737beb4465415a18d7c1a12d7c08',
+        'reference' => '2d0c93e77448a00bedfc26533fe7865a7b50f01c',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,16 +13,16 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'bbf6f92408d9737beb4465415a18d7c1a12d7c08',
+            'reference' => '2d0c93e77448a00bedfc26533fe7865a7b50f01c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'beycanpress/cryptopay-integrator' => array(
-            'pretty_version' => '0.1.11',
-            'version' => '0.1.11.0',
-            'reference' => 'cd50c21a0daf9bbcc5b86a292d620b74b47aa73e',
+            'pretty_version' => '0.1.13',
+            'version' => '0.1.13.0',
+            'reference' => 'b981bcc7cf021d653acd938d817b51f1cbb27d4f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../beycanpress/cryptopay-integrator',
             'aliases' => array(),

diff --git a/views/MS_Gateway_CryptoPay_Lite_View_Button.php b/views/MS_Gateway_CryptoPay_Lite_View_Button.php
@@ -60,11 +60,9 @@ public function to_html(): string
             $this
         );
 
-        // Cp modal css
-        Helpers::addStyle('main.min.css');
-
-        Hook::addFilter('theme', function () use ($gateway) {
-            return $gateway->theme ?? 'light';
+        Hook::addFilter('theme', function (array $theme) use ($gateway) {
+            $theme['mode'] = isset($gateway->theme) ? $gateway->theme : 'light';
+            return $theme;
         });
 
         Hook::addFilter('lang', function(array $lang) {

diff --git a/views/MS_Gateway_CryptoPay_View_Button.php b/views/MS_Gateway_CryptoPay_View_Button.php
@@ -60,11 +60,9 @@ public function to_html(): string
             $this
         );
 
-        // Cp modal css
-        Helpers::addStyle('main.min.css');
-
-        Hook::addFilter('theme', function () use ($gateway) {
-            return $gateway->theme ?? 'light';
+        Hook::addFilter('theme', function (array $theme) use ($gateway) {
+            $theme['mode'] = isset($gateway->theme) ? $gateway->theme : 'light';
+            return $theme;
         });
 
         Hook::addFilter('lang', function(array $lang) {