Changeset 3180058

Timestamp:

11/01/2024 03:57:17 PM (15 months ago)

Author:

zaytseff

Message:

v2.0.0

Location:

multi-crypto-currency-payment/trunk

Files:

• assets/mccp-admin.css (modified) (2 diffs)
• assets/mccp.css (modified) (1 diff)
• inc/activate-plugin.php (deleted)
• inc/apirone_api (deleted)
• inc/assets-assign.php (deleted)
• inc/class-mccp-gateway.php (added)
• inc/invoice-admin-trait.php (deleted)
• inc/invoice-class.php (deleted)
• inc/invoice-db-trait.php (deleted)
• inc/invoice-utils-trait.php (deleted)
• mccp.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

multi-crypto-currency-payment/trunk/assets/mccp-admin.css

@@ -2 +2 @@
 
 .currency-icon {
-    width: 32px;
-    height: 32px;
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+    margin-right: .25rem;
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/aprn.svg);
+
 }
+
+.currency-icon.btc {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/btc.svg);
+    background-size: cover;
+}
+
+.currency-icon.tbtc {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/btc.svg);
+    filter: grayscale();
+    background-size: cover;
+}
+
+.currency-icon.ltc {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/ltc.svg);
+    background-size: cover;
+}
+
+.currency-icon.bch {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/bch.svg);
+    background-size: cover;
+}
+
+.currency-icon.doge {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/doge.svg);
+    background-size: cover;
+}
+
+.currency-icon.trx {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/trx.svg);
+    background-size: cover;
+}
+
+.currency-icon.usdt_trx {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/usdt_trx.svg);
+    background-size: cover;
+}
+.currency-icon.usdc_trx {
+    background-image: url(../vendor/apirone/apirone-sdk-php/src/assets/css/icons/crypto/usdc_trx.svg);
+    background-size: cover;
+}
+
+.token_item {
+    display: flex;
+    align-items: center;
+    margin: .5rem 0;
+}
+
 @media only screen and (max-width: 782px){
     table.form-table.mccp-settings label.currency-label .woocommerce-help-tip {
@@ -10 +61 @@
         top: 4px;
     }
+}
+
+table.form-table.mccp-settings label.currency-label{
+    display: flex;
+    align-items: center;
 }
 

multi-crypto-currency-payment/trunk/assets/mccp.css

@@ -1 @@
-.mccp-wrapper {
+.invoice-wrapper {
     height: unset;
     min-height: unset;
+    flex-direction: column;
 }
+.invoice-wrapper > .woocommerce-order {
+    width: 100%;
+}
+
+.invoice-wrapper p {
+    margin: 0;
+}
+
+.invoice .btn__copy, .invoice .btn__copy:hover, .invoice .btn__copy:focus, .invoice .btn__copy:active,
+.invoice .btn, .invoice .btn:hover, .invoice .btn:focus, .invoice .btn:active {
+    outline: none;
+    border: none;
+    border-color: unset;
+    color: unset;
+}
+.invoice .btn__copy:hover {
+    background-color: unset;
+}

multi-crypto-currency-payment/trunk/mccp.php

@@ -4 +4 @@
  * Plugin URI: https://github.com/zaytseff/mccp-woo
  * Description: Multi currency crypto payments for WooCommerce. Uses Apirone Processing Provider
- * Version: 1.2.9
- * Tested up to: 6.5
+ * Version: 2.0.0
  * Author: Alex Zaytseff
  * Author URI: https://github.com/zaytseff
+ * Tested up to: 6.5
  */
 
-if (!defined('ABSPATH'))
-    exit; // Exit if accessed directly
-
-require_once('inc/apirone_api/Apirone.php');
-require_once('inc/apirone_api/Payment.php');
+defined('ABSPATH') || exit;
 
 define('MCCP_ROOT', __DIR__);
@@ -20 +16 @@
 define('MCCP_URL', plugin_dir_url(__FILE__));
 
-require_once('inc/assets-assign.php');
-require_once('inc/activate-plugin.php');
+use Apirone\API\Log\LoggerWrapper;
+use Apirone\SDK\Service\InvoiceDb;
+use Apirone\SDK\Service\InvoiceQuery;
 
-// Add MCCP payment gateway to WooCommerce
-add_action ('plugin_loaded', 'mccp_payment', 0);
+if (!in_array('woocommerce/woocommerce.php', apply_filters('active_plugins', get_option('active_plugins')))) {
+    return;
+}
+
+require_once(__DIR__ . '/vendor/autoload.php');
+
+add_filter('woocommerce_payment_gateways', function ($plugins) {
+    return array_merge($plugins, [WC_MCCP::class]);
+});
+
+// Show settings link on plugins page
+add_filter('plugin_action_links_' . plugin_basename(__FILE__), function ($links) {
+    $url = admin_url('admin.php?page=wc-settings&tab=checkout&section=mccp');
+    return array_merge(['<a href="' . $url . '">' . __('Settings') . '</a>'], $links);
+});
 
 
-/**
- * Wrapper for MCCP payment gateway class
- * 
- * @return void 
- */
-function mccp_payment() {
-    if (!class_exists('WC_Payment_Gateway'))
-        return;
-    if (class_exists('WC_MCCP'))
-        return;
+if ( in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
+    add_action( 'plugins_loaded', function() {
+        require_once __DIR__ . '/inc/class-mccp-gateway.php';
+    });
+}
+else {
+    add_action( 'admin_notices', function() {
+        ?>
+        <div class="notice notice-error">
+            <p><?php esc_attr_e( 'Please activate', 'woocommerce' );?> <a href="https://wordpress.org/plugins/woocommerce/"><?php esc_attr_e( 'Woocommerce', 'woocommerce' ); ?></a> <?php esc_attr_e( 'to use MCCP gateway.', 'woocommerce' ); ?></p>
+        </div>
+        <?php    
+    } );
+}
 
-    require_once 'inc/invoice-class.php';
+add_action('admin_enqueue_scripts', function() {
+    if (isset($_GET['page']) && $_GET['page'] === 'wc-settings' && isset($_GET['tab']) && $_GET['tab'] === 'checkout' && isset($_GET['section']) && $_GET['section'] === 'mccp') {
+        wp_enqueue_style( 'mccp_style', MCCP_URL . 'assets/mccp-admin.css' );
+    }
+});
 
-    /**
-     * Add MCCP gateway to WooCommerce
-     */
-    function add_mccp_gateway($methods) {
-            $methods[] = 'WC_MCCP';
-            return $methods;
-    }
-    add_filter('woocommerce_payment_gateways', 'add_mccp_gateway');
+add_action('get_footer', function() {
+        wp_enqueue_style ( 'mccp_style_invoice', MCCP_URL . 'vendor/apirone/apirone-sdk-php/src/assets/css/styles.min.css' );
+        wp_enqueue_script('mccp_script_invoice', MCCP_URL . '/vendor/apirone/apirone-sdk-php/src/assets/js/script.min.js', array( 'jquery'));
+        wp_enqueue_style( 'mccp_style', MCCP_URL . 'assets/mccp.css' );
+    }
+);
+
+if (!function_exists('mccp_create_table')) {
+    function mccp_create_table() {
+        global $wpdb;
+        
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+
+        $sql = InvoiceQuery::createInvoicesTable($wpdb->prefix, $wpdb->charset, $wpdb->collate);
+
+        dbDelta($sql);
+
+        if ($wpdb->last_error && class_exists('WC_Logger')) {
+            $log = new WC_Logger();
+            $log->error($wpdb->last_error, ['source' => 'mccp_install_error']);    
+        }
+
+        // Remove unused options from v1.0.0
+        if ( get_option('mccp_db_version' ) ){
+            delete_option('mccp_db_version');
+        }
+    }
+    register_activation_hook( MCCP_MAIN, 'mccp_create_table' );
 }
+
 
 /**

multi-crypto-currency-payment/trunk/readme.txt

@@ -3 +3 @@
 Contributors: zaytseff
 Tags: accept, bitcoin, litecoin, usdt, crypto
-Stable tag: 1.2.9
+Stable tag: 2.0.0
 Requires PHP: 7.4
-Tested up to: 6.5
+Tested up to: 6.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
 WooCommerce plugin - Multi CryptoCurrency Payments
-Requires at least WooCommerce: 6.0 Tested up to: 8.7.0 License: GPLv2 or later
+Requires at least WooCommerce: 6.0 Tested up to: 9.3.3 License: GPLv2 or later
 
 == Description ==
@@ -78 +78 @@
 == Changelog ==
 
+= Version 2.0.0 | 01/11/2024 =
+- Started using the official Apirone SDK PHP library
+- New official Apirone invoice design
+- Splitted networks & tokens on the plugin settings page
+- Fixed the "lost merchant address" bug for TRON network & tokens
+
+= Version 1.2.10 | 11/07/2024 =
+- Show tbts to unauthenticated users if test_customer is set to * (asterisk symbol)
+
 = Version 1.2.9 | 04/04/2024 =
 - Add settings saver when account recreated