Changeset 3768791

Timestamp:

10/27/2026 02:27:24 PM (4 days ago)

Author:

mintagepay

Message:

Release 1.18.0: Connect to Mintage Pay (no key to copy), Get started box, automatic-update setting, WooCommerce Payments page support, app icon fix.

Location:

mintage-pay

Files:

• tags/1.18.0 (copied) (copied from mintage-pay/trunk )
• tags/1.18.0/assets/img/mintage-pay.svg (added)
• tags/1.18.0/includes/class-mintagepay-admin.php (modified) (1 diff)
• tags/1.18.0/includes/class-mintagepay-blocks.php (modified) (2 diffs)
• tags/1.18.0/includes/class-mintagepay-connect.php (added)
• tags/1.18.0/includes/class-mintagepay-two-rail.php (modified) (6 diffs)
• tags/1.18.0/includes/class-wc-gateway-mintagepay.php (modified) (8 diffs)
• tags/1.18.0/mintage-pay.php (modified) (5 diffs)
• tags/1.18.0/readme.txt (modified) (8 diffs)
• trunk/assets/img/mintage-pay.svg (added)
• trunk/includes/class-mintagepay-admin.php (modified) (1 diff)
• trunk/includes/class-mintagepay-blocks.php (modified) (2 diffs)
• trunk/includes/class-mintagepay-connect.php (added)
• trunk/includes/class-mintagepay-two-rail.php (modified) (6 diffs)
• trunk/includes/class-wc-gateway-mintagepay.php (modified) (8 diffs)
• trunk/mintage-pay.php (modified) (5 diffs)
• trunk/readme.txt (modified) (8 diffs)

mintage-pay/tags/1.18.0/includes/class-mintagepay-admin.php

@@ -166 +166 @@
          * Webhook connection
          * ------------------------------------------------------------------ */
+
+        /**
+         * After the API key was saved (the settings form, or "Connect to Mintage Pay", 1.18.0): check the new key with
+         * GET /v1/me, remember it as verified, and connect the webhook (deleting the old key's endpoint). The same steps for
+         * both, so a connected store is set up exactly like one where the key was pasted.
+         *
+         * @param string $old_key      The key saved before.
+         * @param string $old_base     The API base the old key used (Mintage_Pay::api_base_for()).
+         * @param string $new_key      The key saved now ('' = removed).
+         * @param string $base_setting The saved "API base URL" setting ('' = automatic).
+         * @return string 'removed', 'unchanged', 'verified' (the webhook was already connected), 'connected', or 'failed'.
+         */
+        public static function activate_key( $old_key, $old_base, $new_key, $base_setting ) {
+                $old_key  = (string) $old_key;
+                $new_key  = (string) $new_key;
+                $new_base = Mintage_Pay::api_base_for( $new_key, (string) $base_setting );
+                delete_transient( Mintage_Pay::RAILS_TRANSIENT );
+                $old_api = '' !== $old_key ? Mintage_Pay::api( $old_key, $old_base ) : null;
+
+                if ( '' === $new_key ) {
+                        // Key removed: disable the old endpoint and forget the secret.
+                        $hook = Mintage_Pay::get_webhook();
+                        if ( $hook && $old_api && isset( $hook['fingerprint'] ) && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
+                                $old_api->delete_webhook( $hook['id'] );
+                        }
+                        Mintage_Pay::clear_webhook();
+                        Mintage_Pay::clear_key_verified();
+                        return 'removed';
+                }
+
+                $credentials_changed = ( $new_key !== $old_key || $new_base !== $old_base );
+                $hook                = Mintage_Pay::get_webhook();
+                $fingerprint         = Mintage_Pay::fingerprint( $new_base, $new_key );
+                $hook_ok             = $hook && ! empty( $hook['secret'] ) && isset( $hook['fingerprint'] ) && $hook['fingerprint'] === $fingerprint;
+
+                if ( ! $credentials_changed && $hook_ok && Mintage_Pay::is_key_verified() ) {
+                        return 'unchanged';
+                }
+
+                $api = Mintage_Pay::api( $new_key, $new_base );
+                $me  = $api->get_me();
+                if ( is_wp_error( $me ) ) {
+                        // A new key is unverified by definition (the stored flag holds another key's fingerprint).
+                        self::handle_me_error( $me );
+                        Mintage_Pay::add_notice(
+                                'error',
+                                sprintf(
+                                        /* translators: %s: error message */
+                                        __( 'Mintage Pay: the API key could not be verified (%s). The payment method stays hidden at checkout until the key is verified. Check the key and save again.', 'mintage-pay' ),
+                                        self::me_error_text( $me, $new_key, (string) $base_setting )
+                                )
+                        );
+                        return 'failed';
+                }
+
+                $merchant_id = self::merchant_id( $me );
+                $name        = self::merchant_name( $me );
+                Mintage_Pay::mark_key_verified( $api->fingerprint(), $merchant_id, $name );
+                Mintage_Pay::cache_rails( $me );
+
+                if ( $hook_ok ) {
+                        Mintage_Pay::add_notice( 'success', self::connected_message( $name, $new_key ) );
+                        return 'verified';
+                }
+
+                $previous_api = null;
+                if ( $hook && isset( $hook['fingerprint'] ) ) {
+                        if ( $old_api && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
+                                $previous_api = $old_api;
+                        } elseif ( $hook['fingerprint'] === $fingerprint ) {
+                                $previous_api = $api;
+                        }
+                }
+
+                $result = self::connect_webhook( $api, $previous_api, $merchant_id );
+                if ( true === $result ) {
+                        Mintage_Pay::add_notice( 'success', self::connected_message( $name, $new_key ) . ' ' . __( 'Webhook connected.', 'mintage-pay' ) );
+                        return 'connected';
+                }
+                return 'failed';
+        }
+
+        /**
+         * "Mintage Pay: API key verified for X (live)."
+         *
+         * @param string $name    Merchant name.
+         * @param string $api_key The key (test or live).
+         * @return string
+         */
+        public static function connected_message( $name, $api_key ) {
+                $mode = Mintage_Pay::is_test_key( (string) $api_key )
+                        ? __( 'TEST MODE: sandbox, test money only', 'mintage-pay' )
+                        : __( 'live', 'mintage-pay' );
+                return '' !== $name
+                        /* translators: 1: merchant business name, 2: "live" or "TEST MODE: ..." */
+                        ? sprintf( __( 'Mintage Pay: API key verified for %1$s (%2$s).', 'mintage-pay' ), $name, $mode )
+                        /* translators: %s: "live" or "TEST MODE: ..." */
+                        : sprintf( __( 'Mintage Pay: API key verified (%s).', 'mintage-pay' ), $mode );
+        }
 
         /**

mintage-pay/tags/1.18.0/includes/class-mintagepay-blocks.php

@@ -105 +105 @@
 
         /**
-         * The apps' marks for this method's own row (WC_Gateway_MintagePay::get_icon() for the classic checkout): Cash App,
-         * plus Apple Pay / Google Pay where Mintage Pay offers the card route for the cart's total. None while the two
-         * choices are inside the method (the marks are on the choices then) or when it is the only rail.
+         * The apps' marks for this method's own row (WC_Gateway_MintagePay::get_icon() for the classic checkout), by the one
+         * rule in Mintage_Pay_Two_Rail::row_marks(): only what Pay by app offers this store for the cart's total, none while
+         * the two choices are inside the method (the marks are on the choices then).
          *
          * @return array[]
@@ -117 +117 @@
                 $currency = function_exists( 'get_woocommerce_currency' ) ? (string) get_woocommerce_currency() : 'USD';
                 $total    = $this->cart_total();
-                $apps     = Mintage_Pay::split_on()
-                        || ( Mintage_Pay::crypto_on() && ! ( $total > 0 && Mintage_Pay_Two_Rail::offered( $total, $currency ) ) );
-                if ( ! $apps ) {
-                        return array();
-                }
-                $wallets = $total > 0 ? Mintage_Pay_Two_Rail::card_status( $total, $currency )['available'] : true;
-                return Mintage_Pay_Two_Rail::mark_images( 'app', $wallets );
+                // The same rule as the classic checkout (Mintage_Pay_Two_Rail::row_marks()); no cart (the editor): $total is 0.
+                return Mintage_Pay_Two_Rail::row_mark_images( $total, $currency, $total <= 0 );
         }
 

mintage-pay/tags/1.18.0/includes/class-mintagepay-two-rail.php

@@ -223 +223 @@
          */
         public static function card_status( $total, $currency ) {
-                $none     = self::card_from_options( null );
+                return self::status( $total, $currency )['card'];
+        }
+
+        /**
+         * Read `options.cash_app` and `options.wallet` of a GET /v1/payment-options response (1.18.0): whether Pay by app
+         * offers Cash App, and crypto, for this store and total. Pure. A server that does not send them offers neither.
+         *
+         * @param mixed $options Response.
+         * @return array { cash_app: bool, wallet: bool }
+         */
+        public static function apps_from_options( $options ) {
+                $o = is_array( $options ) && isset( $options['options'] ) && is_array( $options['options'] ) ? $options['options'] : array();
+                return array(
+                        'cash_app' => isset( $o['cash_app'] ) && true === $o['cash_app'],
+                        'wallet'   => isset( $o['wallet'] ) && true === $o['wallet'],
+                );
+        }
+
+        /**
+         * The card route and the apps for an amount, from one GET /v1/payment-options (card_status() caching: 10 minutes per
+         * amount, 2 after a failure). Unknown (no verified key, the API failed): no card, no apps.
+         *
+         * @param float|string $total    Order total in the store currency.
+         * @param string       $currency ISO 4217.
+         * @return array { card: card_from_options(), apps: apps_from_options() }
+         */
+        public static function status( $total, $currency ) {
+                $none     = array(
+                        'card' => self::card_from_options( null ),
+                        'apps' => self::apps_from_options( null ),
+                );
                 $currency = strtoupper( (string) $currency );
                 if ( ! class_exists( 'Mintage_Pay_Webhook' ) || ! Mintage_Pay_Webhook::currency_supported( $currency ) || ! Mintage_Pay::is_key_verified() ) {
@@ -238 +268 @@
                 $key    = self::TRANSIENT . md5( $api->fingerprint() . '|' . $currency . '|' . $minor );
                 $cached = get_transient( $key );
-                if ( is_array( $cached ) && isset( $cached['available'] ) ) {
-                        return self::card_from_options( array( 'card' => $cached ) );
+                // A value cached by 1.17.0 has no 'apps': asked again.
+                if ( is_array( $cached ) && isset( $cached['available'] ) && isset( $cached['apps'] ) && is_array( $cached['apps'] ) ) {
+                        return array(
+                                'card' => self::card_from_options( array( 'card' => $cached ) ),
+                                'apps' => self::apps_from_options( array( 'options' => $cached['apps'] ) ),
+                        );
                 }
                 $options = $api->payment_options( Mintage_Pay_Webhook::format_minor( $minor, $currency ), $currency, 5 );
                 $card    = self::card_from_options( is_wp_error( $options ) ? null : $options );
-                set_transient( $key, $card, is_wp_error( $options ) ? 2 * MINUTE_IN_SECONDS : 10 * MINUTE_IN_SECONDS );
+                $apps    = self::apps_from_options( is_wp_error( $options ) ? null : $options );
+                set_transient( $key, $card + array( 'apps' => $apps ), is_wp_error( $options ) ? 2 * MINUTE_IN_SECONDS : 10 * MINUTE_IN_SECONDS );
                 if ( is_wp_error( $options ) ) {
                         Mintage_Pay::log( 'payment options could not be read (the card choice stays hidden for now): ' . $options->get_error_message(), 'warning' );
                 }
-                return $card;
+                return array(
+                        'card' => $card,
+                        'apps' => $apps,
+                );
+        }
+
+        /**
+         * The marks on the main method's own row at checkout (classic get_icon() and the block checkout's data use this
+         * one rule, 1.18.0). Pure.
+         *  - The two choices are inside the method: none (the marks are on the choices).
+         *  - No cart (admin, the block editor): the apps' marks where the method is the apps (split, or crypto its own
+         *    method), none otherwise, as before 1.18.0.
+         *  - Otherwise only where Pay by app offers Cash App for this store (options.cash_app): Cash App, then Apple Pay and
+         *    Google Pay where the card route is offered, then USDC and USDT where crypto is inside Pay by app (crypto not its
+         *    own method) and offered (options.wallet). A store without Cash App, or a failed read, shows none.
+         *
+         * @param bool       $split   "Pay by card" is its own method (Mintage_Pay::split_on()).
+         * @param bool       $crypto  "Pay with crypto" is its own method (Mintage_Pay::crypto_on()).
+         * @param bool       $offered The two choices are offered inside the method for this total.
+         * @param array|null $status  status() for the cart's total, or null when there is no cart.
+         * @return array[] marks() entries.
+         */
+        public static function row_marks( $split, $crypto, $offered, $status ) {
+                if ( ! $split && $offered ) {
+                        return array();
+                }
+                if ( null === $status ) {
+                        return ( $split || $crypto ) ? self::marks( 'app', true ) : array();
+                }
+                if ( empty( $status['apps']['cash_app'] ) ) {
+                        return array();
+                }
+                return self::marks( 'app', ! empty( $status['card']['available'] ), ! $crypto && ! empty( $status['apps']['wallet'] ) );
+        }
+
+        /**
+         * row_marks() for this store and cart, as image addresses.
+         *
+         * @param float|string $total    Cart or order total.
+         * @param string       $currency ISO 4217.
+         * @param bool         $no_cart  There is no cart (admin, the block editor).
+         * @return array[]
+         */
+        public static function row_mark_images( $total, $currency, $no_cart ) {
+                $status  = $no_cart ? null : self::status( $total, $currency );
+                $offered = ! $no_cart && self::offered( $total, $currency );
+                return self::images( self::row_marks( Mintage_Pay::split_on(), Mintage_Pay::crypto_on(), $offered, $status ) );
         }
 
@@ -329 +410 @@
          * @param string $choice  'card', 'app' or 'crypto'.
          * @param bool   $wallets Apple Pay and Google Pay are offered on Pay by app.
+         * @param bool   $coins   USDC and USDT after the apps (Pay by app with crypto inside it, row_marks()).
          * @return array[]
          */
-        public static function marks( $choice, $wallets = true ) {
+        public static function marks( $choice, $wallets = true, $coins = false ) {
                 if ( 'card' === $choice ) {
                         return array(
@@ -350 +432 @@
                         $out[] = array( 'google-pay', 'Google Pay', 45 );
                 }
+                if ( $coins ) {
+                        $out[] = array( 'usdc', 'USDC', 38 );
+                        $out[] = array( 'usdt', 'USDT', 38 );
+                }
                 return $out;
         }
@@ -361 +447 @@
          */
         public static function mark_images( $choice, $wallets = true ) {
+                return self::images( self::marks( $choice, $wallets ) );
+        }
+
+        /**
+         * marks() entries as addresses: file, label, width.
+         *
+         * @param array[] $marks marks() entries.
+         * @return array[]
+         */
+        public static function images( array $marks ) {
                 $base = plugins_url( 'assets/img/marks/', MINTAGE_PAY_FILE );
                 $out  = array();
-                foreach ( self::marks( $choice, $wallets ) as $m ) {
+                foreach ( $marks as $m ) {
                         $out[] = array(
                                 'src'   => $base . $m[0] . '.svg?ver=' . MINTAGE_PAY_VERSION,
@@ -382 +478 @@
          */
         public static function marks_html( $choice, $wallets = true ) {
+                return self::images_html( self::mark_images( $choice, $wallets ) );
+        }
+
+        /**
+         * Image addresses (images()) as the payment method row's HTML.
+         *
+         * @param array[] $images images() entries.
+         * @return string
+         */
+        public static function images_html( array $images ) {
                 $html = '';
-                foreach ( self::mark_images( $choice, $wallets ) as $m ) {
+                foreach ( $images as $m ) {
                         $html .= '<img class="mintagepay-method-mark" src="' . esc_url( $m['src'] ) . '" alt="' . esc_attr( $m['alt'] ) . '" title="' . esc_attr( $m['alt'] ) . '" width="' . (int) $m['width'] . '" height="24" decoding="async" />';
                 }

mintage-pay/tags/1.18.0/includes/class-wc-gateway-mintagepay.php

@@ -27 +27 @@
                 // claiming a refund was sent (WooCommerce would otherwise only offer "Refund manually").
                 $this->supports           = array_merge( Mintage_Pay_Subscriptions::supports(), array( 'refunds' ) );
+                // The square Mintage Pay mark for WooCommerce's Payments page (it reads this property, over REST too). The
+                // checkout row never shows it: get_icon() below does not call parent::get_icon().
+                $this->icon               = plugins_url( 'assets/img/mintage-pay.svg', MINTAGE_PAY_FILE );
 
                 $this->init_form_fields();
@@ -80 +83 @@
         public function get_icon() {
                 $rail = $this->method_rail();
-                // With "Pay with crypto" as its own method (1.17.0) this method is the apps, unless it shows the two choices
-                // inside itself (their marks are on the choices then).
-                if ( '' === $rail && Mintage_Pay::crypto_on() && ! $this->two_rail_offered() ) {
-                        $rail = 'app';
-                }
-                if ( '' === $rail ) {
-                        return parent::get_icon();
-                }
-                return apply_filters( 'woocommerce_gateway_icon', Mintage_Pay_Two_Rail::marks_html( $rail, $this->wallets_offered() ), $this->id );
+                if ( 'card' === $rail || 'crypto' === $rail ) {
+                        return apply_filters( 'woocommerce_gateway_icon', Mintage_Pay_Two_Rail::marks_html( $rail, $this->wallets_offered() ), $this->id );
+                }
+                // This method (Pay by app): one rule with the block checkout (Mintage_Pay_Two_Rail::row_marks(), 1.18.0). Never
+                // parent::get_icon(): $this->icon is set for the WooCommerce Payments page only, not for the checkout row.
+                $no_cart  = is_admin() && ! wp_doing_ajax();
+                $currency = function_exists( 'get_woocommerce_currency' ) ? (string) get_woocommerce_currency() : 'USD';
+                $images   = Mintage_Pay_Two_Rail::row_mark_images( $no_cart ? 0 : $this->get_order_total(), $currency, $no_cart );
+                return apply_filters( 'woocommerce_gateway_icon', Mintage_Pay_Two_Rail::images_html( $images ), $this->id );
         }
 
@@ -306 +309 @@
                                 'title'       => __( 'API key', 'mintage-pay' ),
                                 'type'        => 'password',
-                                'description' => __( 'Create one in the Mintage Pay dashboard under Developers > API keys. Saving a new key checks it and connects the webhook automatically.', 'mintage-pay' ),
+                                'description' => __( 'Easiest: click "Connect to Mintage Pay" at the top of this page and the key is filled in for you. Or create one in the Mintage Pay dashboard under Developers > API keys and paste it here. Saving a new key checks it and connects the webhook automatically.', 'mintage-pay' ),
                                 'default'     => '',
                         ),
@@ -366 +369 @@
                                 'type'  => 'mintagepay_webhook',
                         ),
+                        'auto_update'        => array(
+                                'title' => __( 'Plugin updates', 'mintage-pay' ),
+                                'type'  => 'mintagepay_auto_update',
+                        ),
                         'debug'              => array(
                                 'title'       => __( 'Debug log', 'mintage-pay' ),
@@ -399 +406 @@
                         <td class="forminp">
                                 <?php if ( '' === (string) $this->get_option( 'api_key' ) ) : ?>
-                                        <p><?php esc_html_e( 'Not connected. Save an API key first.', 'mintage-pay' ); ?></p>
+                                        <p><?php esc_html_e( 'Not connected yet.', 'mintage-pay' ); ?></p>
+                                        <p><?php $this->connect_buttons(); ?></p>
                                 <?php else : ?>
                                         <?php if ( $hook && ! empty( $hook['secret'] ) && isset( $hook['fingerprint'] ) && $hook['fingerprint'] === $fingerprint ) : ?>
@@ -446 +454 @@
 
         /**
+         * The two Connect buttons (live account, sandbox test account).
+         */
+        protected function connect_buttons() {
+                ?>
+                <a class="button button-primary" href="<?php echo esc_url( Mintage_Pay_Connect::start_url( 'live' ) ); ?>"><?php esc_html_e( 'Connect to Mintage Pay', 'mintage-pay' ); ?></a>
+                <a class="button" href="<?php echo esc_url( Mintage_Pay_Connect::start_url( 'test' ) ); ?>"><?php esc_html_e( 'Connect a test (sandbox) account', 'mintage-pay' ); ?></a>
+                <?php
+        }
+
+        /**
+         * Settings page: the "Get started" panel (no key yet) or the "Replace the key?" box (a Connect came back while a
+         * working key is saved), then the settings. Only on this method's own page, not the card or crypto method's.
+         */
+        public function admin_options() {
+                if ( Mintage_Pay::GATEWAY_ID === $this->id ) {
+                        $pending = Mintage_Pay_Connect::pending();
+                        if ( $pending ) {
+                                $this->confirm_box( $pending );
+                        } elseif ( '' === (string) $this->get_option( 'api_key' ) ) {
+                                $this->get_started_panel();
+                        }
+                }
+                parent::admin_options();
+        }
+
+        /**
+         * "Get started": connect, try the sandbox, apply, read the guide.
+         */
+        private function get_started_panel() {
+                ?>
+                <div class="notice notice-info inline" style="padding:12px 16px;margin:16px 0;">
+                        <h3 style="margin-top:0;"><?php esc_html_e( 'Get started with Mintage Pay', 'mintage-pay' ); ?></h3>
+                        <ol style="margin-left:1.5em;">
+                                <li><?php esc_html_e( 'Have a Mintage Pay account? Click "Connect to Mintage Pay", sign in and approve this store. The API key and the webhook are set up for you and the payment method is switched on.', 'mintage-pay' ); ?></li>
+                                <li>
+                                        <?php
+                                        printf(
+                                                /* translators: %s: link to the Mintage Pay application form */
+                                                esc_html__( 'No account yet? %s (a few minutes).', 'mintage-pay' ),
+                                                '<a href="https://mintagepay.com/#apply" target="_blank" rel="noopener noreferrer">' . esc_html__( 'Apply for a Mintage Pay account', 'mintage-pay' ) . '</a>'
+                                        );
+                                        ?>
+                                </li>
+                                <li>
+                                        <?php
+                                        printf(
+                                                /* translators: %s: link to the sandbox */
+                                                esc_html__( 'Want to try it first? Make a free test account on the %s, then click "Connect a test (sandbox) account". Test orders use test money only.', 'mintage-pay' ),
+                                                '<a href="https://sandbox.mintagepay.com/" target="_blank" rel="noopener noreferrer">' . esc_html__( 'Mintage Pay sandbox', 'mintage-pay' ) . '</a>'
+                                        );
+                                        ?>
+                                </li>
+                        </ol>
+                        <p><?php $this->connect_buttons(); ?></p>
+                        <p class="description">
+                                <?php
+                                printf(
+                                        /* translators: %s: link to the setup guide */
+                                        esc_html__( 'Step by step: %s.', 'mintage-pay' ),
+                                        '<a href="https://mintagepay.com/docs/integrations/#woocommerce" target="_blank" rel="noopener noreferrer">' . esc_html__( 'the WooCommerce setup guide', 'mintage-pay' ) . '</a>'
+                                );
+                                ?>
+                        </p>
+                </div>
+                <?php
+        }
+
+        /**
+         * A Connect came back while a working key is saved: replace it, or keep it.
+         *
+         * @param array $pending The waiting connect (code, verifier, base).
+         */
+        private function confirm_box( array $pending ) {
+                $current_name = Mintage_Pay::verified_merchant_name();
+                $current_mode = Mintage_Pay::is_test_key( (string) $this->get_option( 'api_key' ) ) ? __( 'test mode (sandbox)', 'mintage-pay' ) : __( 'live', 'mintage-pay' );
+                $new_mode     = Mintage_Pay::SANDBOX_API_BASE === $pending['base'] ? __( 'test mode (sandbox)', 'mintage-pay' ) : __( 'live', 'mintage-pay' );
+                ?>
+                <div class="notice notice-warning inline" style="padding:12px 16px;margin:16px 0;">
+                        <h3 style="margin-top:0;"><?php esc_html_e( 'Replace the Mintage Pay key?', 'mintage-pay' ); ?></h3>
+                        <p>
+                                <?php
+                                if ( '' !== $current_name ) {
+                                        /* translators: 1: Mintage Pay business name, 2: "live" or "test mode (sandbox)" */
+                                        echo esc_html( sprintf( __( 'This store takes payments for %1$s (%2$s) now.', 'mintage-pay' ), $current_name, $current_mode ) );
+                                } else {
+                                        /* translators: %s: "live" or "test mode (sandbox)" */
+                                        echo esc_html( sprintf( __( 'This store has a working Mintage Pay key now (%s).', 'mintage-pay' ), $current_mode ) );
+                                }
+                                echo ' ';
+                                /* translators: %s: "live" or "test mode (sandbox)" */
+                                echo esc_html( sprintf( __( 'You just approved a new connection (%s). Replacing the key sends new payments to the account you approved.', 'mintage-pay' ), $new_mode ) );
+                                ?>
+                        </p>
+                        <?php if ( Mintage_Pay::SANDBOX_API_BASE === $pending['base'] && ! Mintage_Pay::is_test_key( (string) $this->get_option( 'api_key' ) ) ) : ?>
+                                <p><strong style="color:#b32d2e;"><?php esc_html_e( 'The new key is a test key: customers would pay with test money and no real payment would reach you.', 'mintage-pay' ); ?></strong></p>
+                        <?php endif; ?>
+                        <p>
+                                <a class="button button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin-post.php?action=' . Mintage_Pay_Connect::CONFIRM_ACTION ), Mintage_Pay_Connect::CONFIRM_ACTION ) ); ?>"><?php esc_html_e( 'Replace the key', 'mintage-pay' ); ?></a>
+                                <a class="button" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin-post.php?action=' . Mintage_Pay_Connect::CANCEL_ACTION ), Mintage_Pay_Connect::CANCEL_ACTION ) ); ?>"><?php esc_html_e( 'Keep the current key', 'mintage-pay' ); ?></a>
+                        </p>
+                </div>
+                <?php
+        }
+
+        /**
+         * The "Plugin updates" row: WordPress's own auto-update choice for this plugin (the Plugins page's "Enable
+         * auto-updates" link), shown as a checkbox.
+         *
+         * @param string $key  Field key.
+         * @param array  $data Field data.
+         * @return string
+         */
+        public function generate_mintagepay_auto_update_html( $key, $data ) {
+                $state     = Mintage_Pay_Connect::auto_update_state();
+                $field_key = $this->get_field_key( $key );
+                ob_start();
+                ?>
+                <tr valign="top">
+                        <th scope="row" class="titledesc"><label for="<?php echo esc_attr( $field_key ); ?>"><?php echo esc_html( $data['title'] ); ?></label></th>
+                        <td class="forminp">
+                                <fieldset>
+                                        <label for="<?php echo esc_attr( $field_key ); ?>">
+                                                <input type="checkbox" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" value="1" <?php checked( $state['on'] ); ?> <?php disabled( ! $state['allowed'] ); ?> />
+                                                <?php esc_html_e( 'Update Mintage Pay automatically when a new version is out', 'mintage-pay' ); ?>
+                                        </label>
+                                        <p class="description">
+                                                <?php
+                                                if ( $state['allowed'] ) {
+                                                        esc_html_e( 'The same as "Enable auto-updates" for Mintage Pay on the Plugins page. Recommended: fixes and new payment options reach your checkout without you doing anything. If your host or a tool such as MainWP manages your updates, that may already cover this site.', 'mintage-pay' );
+                                                } else {
+                                                        esc_html_e( 'Your host or your site settings manage plugin updates here, or your user cannot update plugins, so this cannot be changed from this page.', 'mintage-pay' );
+                                                }
+                                                ?>
+                                        </p>
+                                </fieldset>
+                        </td>
+                </tr>
+                <?php
+                return (string) ob_get_clean();
+        }
+
+        /**
+         * The auto-update checkbox: 'yes' or 'no' (WordPress's own setting is the one that counts, see process_admin_options()).
+         *
+         * @param string $key   Key.
+         * @param mixed  $value Value.
+         * @return string
+         */
+        public function validate_mintagepay_auto_update_field( $key, $value ) {
+                return ! empty( $value ) ? 'yes' : 'no';
+        }
+
+        /* ------------------------------------------------------------------ *
+         * WooCommerce's Payments page (WooCommerce 9.6+ calls these; older versions never do). The card and crypto methods
+         * share the main method's key, so "set up", "connected" and "test mode" are the same for all three.
+         * ------------------------------------------------------------------ */
+
+        /**
+         * Needs setup until a key has been checked with Mintage Pay. Not "is usable": that also needs the method switched
+         * on, and WooCommerce will not switch on a method that says it needs setup.
+         *
+         * @return bool
+         */
+        public function needs_setup() {
+                return ! Mintage_Pay::is_key_verified();
+        }
+
+        /**
+         * Connected: a key is saved and Mintage Pay accepted it.
+         *
+         * @return bool
+         */
+        public function is_account_connected() {
+                return Mintage_Pay::is_key_verified();
+        }
+
+        /**
+         * Test mode: the saved key is a sandbox key.
+         *
+         * @return bool
+         */
+        public function is_test_mode() {
+                return Mintage_Pay::is_test_key( (string) Mintage_Pay::setting( 'api_key', '' ) );
+        }
+
+        /**
+         * This method's own settings page.
+         *
+         * @return string
+         */
+        public function get_settings_url() {
+                return admin_url( 'admin.php?page=wc-settings&tab=checkout&section=' . $this->id );
+        }
+
+        /**
+         * Where "Complete setup" goes: the main method's settings, with the Connect buttons.
+         *
+         * @param string $return_url Where WooCommerce would like to come back to (not used: the settings page is the end).
+         * @return string
+         */
+        public function get_connection_url( $return_url = '' ) {
+                return Mintage_Pay::settings_url();
+        }
+
+        /**
+         * Links on the Payments page's menu for this method.
+         *
+         * @param string $country_code Store country (not used: the same links everywhere).
+         * @return array[]
+         */
+        public function get_provider_links( $country_code = '' ) {
+                return self::provider_links();
+        }
+
+        /**
+         * The Payments page links (pure, tested in tests/payments-page-test.php).
+         *
+         * @return array[]
+         */
+        public static function provider_links() {
+                return array(
+                        array(
+                                '_type' => 'about',
+                                'url'   => 'https://mintagepay.com/',
+                        ),
+                        array(
+                                '_type' => 'documentation',
+                                'url'   => 'https://mintagepay.com/docs/integrations/#woocommerce',
+                        ),
+                        array(
+                                '_type' => 'support',
+                                'url'   => 'https://mintagepay.com/docs/',
+                        ),
+                        array(
+                                '_type' => 'pricing',
+                                'url'   => 'https://mintagepay.com/#pricing',
+                        ),
+                        array(
+                                '_type' => 'terms',
+                                'url'   => 'https://mintagepay.com/terms.html',
+                        ),
+                );
+        }
+
+        /**
          * The webhook row stores nothing.
          *
@@ -521 +774 @@
 
         /**
-         * Save settings, then validate a new key with GET /v1/me and register the webhook.
+         * Save settings, then validate a new key with GET /v1/me and register the webhook (Mintage_Pay_Admin::activate_key(),
+         * the same steps "Connect to Mintage Pay" runs), and apply the auto-update choice.
          *
          * @return bool
@@ -536 +790 @@
                 $this->enabled     = $this->get_option( 'enabled' );
 
-                $new_key  = (string) $this->get_option( 'api_key' );
-                $new_base = Mintage_Pay::api_base_for( $new_key, (string) $this->get_option( 'api_base_url' ) );
-                delete_transient( Mintage_Pay::RAILS_TRANSIENT );
-                $old_api  = '' !== $old_key ? Mintage_Pay::api( $old_key, $old_base ) : null;
-
-                if ( '' === $new_key ) {
-                        // Key removed: disable the old endpoint and forget the secret.
-                        $hook = Mintage_Pay::get_webhook();
-                        if ( $hook && $old_api && isset( $hook['fingerprint'] ) && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
-                                $old_api->delete_webhook( $hook['id'] );
-                        }
-                        Mintage_Pay::clear_webhook();
-                        Mintage_Pay::clear_key_verified();
-                        return $saved;
-                }
-
-                $credentials_changed = ( $new_key !== $old_key || $new_base !== $old_base );
-                $hook                = Mintage_Pay::get_webhook();
-                $fingerprint         = Mintage_Pay::fingerprint( $new_base, $new_key );
-                $hook_ok             = $hook && ! empty( $hook['secret'] ) && isset( $hook['fingerprint'] ) && $hook['fingerprint'] === $fingerprint;
-
-                if ( ! $credentials_changed && $hook_ok && Mintage_Pay::is_key_verified() ) {
-                        return $saved;
-                }
-
-                $api = Mintage_Pay::api( $new_key, $new_base );
-                $me  = $api->get_me();
-                if ( is_wp_error( $me ) ) {
-                        // A new key is unverified by definition (the stored flag holds another key's fingerprint).
-                        Mintage_Pay_Admin::handle_me_error( $me );
-                        Mintage_Pay::add_notice(
-                                'error',
-                                sprintf(
-                                        /* translators: %s: error message */
-                                        __( 'Mintage Pay: the API key could not be verified (%s). The payment method stays hidden at checkout until the key is verified. Check the key and save again.', 'mintage-pay' ),
-                                        Mintage_Pay_Admin::me_error_text( $me, $new_key, (string) $this->get_option( 'api_base_url' ) )
-                                )
-                        );
-                        return $saved;
-                }
-
-                $merchant_id = Mintage_Pay_Admin::merchant_id( $me );
-                $name        = isset( $me['merchant']['name'] ) && is_string( $me['merchant']['name'] ) ? $me['merchant']['name'] : '';
-                Mintage_Pay::mark_key_verified( $api->fingerprint(), $merchant_id, $name );
-                Mintage_Pay::cache_rails( $me );
-
-                if ( $hook_ok ) {
-                        Mintage_Pay::add_notice( 'success', $this->connected_message( $name ) );
-                        return $saved;
-                }
-
-                $previous_api = null;
-                if ( $hook && isset( $hook['fingerprint'] ) ) {
-                        if ( $old_api && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
-                                $previous_api = $old_api;
-                        } elseif ( $hook['fingerprint'] === $fingerprint ) {
-                                $previous_api = $api;
-                        }
-                }
-
-                $result = Mintage_Pay_Admin::connect_webhook( $api, $previous_api, $merchant_id );
-                if ( true === $result ) {
-                        Mintage_Pay::add_notice( 'success', $this->connected_message( $name ) . ' ' . __( 'Webhook connected.', 'mintage-pay' ) );
-                }
+                Mintage_Pay_Admin::activate_key( $old_key, $old_base, (string) $this->get_option( 'api_key' ), (string) $this->get_option( 'api_base_url' ) );
+                Mintage_Pay_Connect::save_auto_update( 'yes' === $this->get_option( 'auto_update' ) );
                 return $saved;
-        }
-
-        /**
-         * "Connected to Mintage Pay as X."
-         *
-         * @param string $name Merchant name.
-         * @return string
-         */
-        private function connected_message( $name ) {
-                $mode = Mintage_Pay::is_test_key( (string) $this->get_option( 'api_key' ) )
-                        ? __( 'TEST MODE: sandbox, test money only', 'mintage-pay' )
-                        : __( 'live', 'mintage-pay' );
-                return '' !== $name
-                        /* translators: 1: merchant business name, 2: "live" or "TEST MODE: ..." */
-                        ? sprintf( __( 'Mintage Pay: API key verified for %1$s (%2$s).', 'mintage-pay' ), $name, $mode )
-                        /* translators: %s: "live" or "TEST MODE: ..." */
-                        : sprintf( __( 'Mintage Pay: API key verified (%s).', 'mintage-pay' ), $mode );
         }
 

mintage-pay/tags/1.18.0/mintage-pay.php

@@ -4 +4 @@
  * Plugin URI:           https://mintagepay.com/docs/integrations/#woocommerce
  * Description:          Accept USDC and USDT stablecoin payments through the Mintage Pay hosted checkout, with prices in USD, EUR, GBP and more.
- * Version:              1.17.0
+ * Version:              1.18.0
  * Requires at least:    6.4
  * Requires PHP:         7.4
@@ -14 +14 @@
  * Text Domain:          mintage-pay
  * WC requires at least: 8.0
- * WC tested up to:      11.1
+ * WC tested up to:      11.2
  *
  * @package MintagePay
@@ -21 +21 @@
 defined( 'ABSPATH' ) || exit;
 
-define( 'MINTAGE_PAY_VERSION', '1.17.0' );
+define( 'MINTAGE_PAY_VERSION', '1.18.0' );
 define( 'MINTAGE_PAY_FILE', __FILE__ );
 define( 'MINTAGE_PAY_PATH', plugin_dir_path( __FILE__ ) );
@@ -153 +153 @@
                 require_once MINTAGE_PAY_PATH . 'includes/class-mintagepay-reminder.php';
                 require_once MINTAGE_PAY_PATH . 'includes/class-mintagepay-two-rail.php';
+                require_once MINTAGE_PAY_PATH . 'includes/class-mintagepay-connect.php';
 
                 add_filter( 'woocommerce_payment_gateways', array( __CLASS__, 'add_gateway' ) );
@@ -176 +177 @@
                 Mintage_Pay_Discount::init();
                 Mintage_Pay_Reminder::init();
+                Mintage_Pay_Connect::init();
         }
 

mintage-pay/tags/1.18.0/readme.txt

@@ -7 +7 @@
 WC requires at least: 8.0
 WC tested up to: 11.2
-Stable tag: 1.17.0
+Stable tag: 1.18.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -21 +21 @@
 * **Pay by app**: Cash App in one tap, plus Apple Pay and Google Pay where Mintage Pay offers them for the total.
 
-**Get started in minutes:** install, try it with test money in the sandbox, then apply for a live account. See Installation below, or the full guide at https://mintagepay.com/docs/integrations/#woocommerce
+**Get started in minutes:** install, click "Connect to Mintage Pay" and approve your store. No key to copy. Try it with test money in the sandbox first if you like, then apply for a live account. See Installation below, or the full guide at https://mintagepay.com/docs/integrations/#woocommerce
 
 Mintage Pay sends your customer to a secure hosted checkout where they pay in stablecoins (USDC or USDT) from a wallet or an exchange, on the networks you turn on in your Mintage Pay dashboard (for example Base, Polygon, Solana or TRON). A network appears at checkout only when you have set a payout address for it.
@@ -53 +53 @@
 What is sent, and when:
 
+* When you click "Connect to Mintage Pay" (or "Connect a test (sandbox) account"): your browser opens app.mintagepay.com (or sandbox.mintagepay.com) with this site's address, its name, the plugin version, a random value and a code challenge (PKCE). You sign in there and approve this store. Your browser then comes back to this site with a one-time code, and the plugin sends that code and its secret to Mintage Pay to receive this store's API key. Nothing is sent before you click.
 * When you save the settings, reconnect the webhook, or activate, deactivate or delete the plugin: your API key (in the Authorization header), this store's webhook URL and the store name, to check the key and to add or remove the webhook endpoint.
 * When a customer chooses Mintage Pay at checkout: the order total and currency, the order number, a description ("Order #1042 from Your Store"), the thank-you and cancel page addresses, the WooCommerce order id and order key, the invoice expiry, and the customer's billing email address. Mintage Pay emails the customer a receipt only if you turn off "Let WooCommerce send the order emails"; otherwise it writes to them only when they ask for a refund on Mintage Pay's refund page. For an order paid by card, the email is also kept as part of the record of that card payment, in case the customer disputes the charge.
@@ -74 +75 @@
 **3. Go live.** Apply at https://mintagepay.com/#apply. Once your account is approved, sign in at https://app.mintagepay.com, set a payout address for each network you want to be paid on, and create a live key (mp_live_...).
 
-**4. Connect your store.** Go to WooCommerce > Settings > Payments > Mintage Pay, paste the key, tick Enable and save. Saving checks the key and registers this store's webhook automatically. The settings page shows "Connected to (your business name) (live)" when it is done, or "(TEST MODE: sandbox, test money only)" for a sandbox key.
-
-To try it first, use a sandbox key (mp_test_...) from https://sandbox.mintagepay.com. Leave "API base URL" empty: the key decides whether the plugin talks to the sandbox or the live service. Replace it with a live key (mp_live_...) before you take real orders.
+**4. Connect your store.** Go to WooCommerce > Settings > Payments > Mintage Pay and click "Connect to Mintage Pay" (or "Connect a test (sandbox) account"). Sign in to Mintage Pay, check that the store address shown is yours, and click Approve. You come back to WordPress with the key saved, the webhook registered and the payment method switched on. You can also paste a key from Developers > API keys instead: tick Enable and save. Saving checks the key and registers this store's webhook automatically. The settings page shows "Connected to (your business name) (live)" when it is done, or "(TEST MODE: sandbox, test money only)" for a sandbox key.
+
+To try it first, connect a sandbox account, or paste a sandbox key (mp_test_...) from https://sandbox.mintagepay.com. Click "Connect to Mintage Pay" again later to switch to your live account: the plugin asks before it replaces a working key. Leave "API base URL" empty: the key decides whether the plugin talks to the sandbox or the live service. Replace it with a live key (mp_live_...) before you take real orders.
 
 If you move the store to a new address or the webhook shows "Not connected", click "Reconnect webhook" on the settings page.
@@ -82 +83 @@
 **5. Choose your methods.** Under WooCommerce > Settings > Payments, switch on "Mintage Pay: Pay by card" and "Mintage Pay: Pay with crypto" if you want them as their own methods, and drag the methods into the order you want.
 
-**6. Stay up to date automatically.** On the Plugins screen, click "Enable auto-updates" next to Mintage Pay. Fixes and new payment options then install on their own.
+**6. Stay up to date automatically.** Tick "Update Mintage Pay automatically" on the settings page, or click "Enable auto-updates" next to Mintage Pay on the Plugins screen (it is the same setting). Fixes and new payment options then install on their own.
 
 = Documentation =
@@ -100 +101 @@
 Yes. A sandbox account for testing is free and instant at https://sandbox.mintagepay.com. A live account is by application at https://mintagepay.com/#apply.
 
+= What does "Connect to Mintage Pay" do? =
+
+It makes an API key for this store in your Mintage Pay account and saves it here, so you never copy a key by hand. You approve it on Mintage Pay's own site, signed in to your account, and the page shows the store address that asked. Only approve if you just clicked Connect in your own WordPress. The key appears under Developers > API keys as "WooCommerce (your store address)" and the account owner gets an email. If you connect the same store again, the key from the earlier Connect is revoked as soon as the new one is used. Keys you made by hand are never touched.
+
 = Why don't I see Pay by card or Pay by app? =
 
@@ -151 +156 @@
 
 == Changelog ==
+
+= 1.18.0 =
+* New: "Connect to Mintage Pay". Click it on the settings page, sign in to Mintage Pay and approve your store: the API key is saved, the webhook is registered and the payment method is switched on. No key to copy. "Connect a test (sandbox) account" does the same with test money. If a working key is already saved, the plugin asks before replacing it.
+* New: a "Get started" box on the settings page while no key is saved, with Connect, the sandbox, the application form and the setup guide.
+* New: "Update Mintage Pay automatically" on the settings page (WordPress's own auto-update setting for this plugin).
+* WooCommerce's Payments page now shows the Mintage Pay icon, says the method needs setup until a key is verified and shows test mode for a sandbox key, and links to the guide, pricing and terms. Each Mintage Pay method opens its own settings.
+* Fix: with only the main method on, its row showed the Cash App, Apple Pay and Google Pay icons even where Mintage Pay does not offer those apps for the store. The icons now follow what Mintage Pay offers, on the classic and the block checkout.
+* Tested with WooCommerce 11.2.
 
 = 1.17.0 =
@@ -269 +282 @@
 = 1.0.0 =
 * First release.
+
+== Upgrade Notice ==
+
+= 1.18.0 =
+One-click "Connect to Mintage Pay" (no key to copy), a Get started box, an "Update Mintage Pay automatically" setting, and a fix for app icons shown where the apps are not offered.

mintage-pay/trunk/includes/class-mintagepay-admin.php

@@ -166 +166 @@
          * Webhook connection
          * ------------------------------------------------------------------ */
+
+        /**
+         * After the API key was saved (the settings form, or "Connect to Mintage Pay", 1.18.0): check the new key with
+         * GET /v1/me, remember it as verified, and connect the webhook (deleting the old key's endpoint). The same steps for
+         * both, so a connected store is set up exactly like one where the key was pasted.
+         *
+         * @param string $old_key      The key saved before.
+         * @param string $old_base     The API base the old key used (Mintage_Pay::api_base_for()).
+         * @param string $new_key      The key saved now ('' = removed).
+         * @param string $base_setting The saved "API base URL" setting ('' = automatic).
+         * @return string 'removed', 'unchanged', 'verified' (the webhook was already connected), 'connected', or 'failed'.
+         */
+        public static function activate_key( $old_key, $old_base, $new_key, $base_setting ) {
+                $old_key  = (string) $old_key;
+                $new_key  = (string) $new_key;
+                $new_base = Mintage_Pay::api_base_for( $new_key, (string) $base_setting );
+                delete_transient( Mintage_Pay::RAILS_TRANSIENT );
+                $old_api = '' !== $old_key ? Mintage_Pay::api( $old_key, $old_base ) : null;
+
+                if ( '' === $new_key ) {
+                        // Key removed: disable the old endpoint and forget the secret.
+                        $hook = Mintage_Pay::get_webhook();
+                        if ( $hook && $old_api && isset( $hook['fingerprint'] ) && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
+                                $old_api->delete_webhook( $hook['id'] );
+                        }
+                        Mintage_Pay::clear_webhook();
+                        Mintage_Pay::clear_key_verified();
+                        return 'removed';
+                }
+
+                $credentials_changed = ( $new_key !== $old_key || $new_base !== $old_base );
+                $hook                = Mintage_Pay::get_webhook();
+                $fingerprint         = Mintage_Pay::fingerprint( $new_base, $new_key );
+                $hook_ok             = $hook && ! empty( $hook['secret'] ) && isset( $hook['fingerprint'] ) && $hook['fingerprint'] === $fingerprint;
+
+                if ( ! $credentials_changed && $hook_ok && Mintage_Pay::is_key_verified() ) {
+                        return 'unchanged';
+                }
+
+                $api = Mintage_Pay::api( $new_key, $new_base );
+                $me  = $api->get_me();
+                if ( is_wp_error( $me ) ) {
+                        // A new key is unverified by definition (the stored flag holds another key's fingerprint).
+                        self::handle_me_error( $me );
+                        Mintage_Pay::add_notice(
+                                'error',
+                                sprintf(
+                                        /* translators: %s: error message */
+                                        __( 'Mintage Pay: the API key could not be verified (%s). The payment method stays hidden at checkout until the key is verified. Check the key and save again.', 'mintage-pay' ),
+                                        self::me_error_text( $me, $new_key, (string) $base_setting )
+                                )
+                        );
+                        return 'failed';
+                }
+
+                $merchant_id = self::merchant_id( $me );
+                $name        = self::merchant_name( $me );
+                Mintage_Pay::mark_key_verified( $api->fingerprint(), $merchant_id, $name );
+                Mintage_Pay::cache_rails( $me );
+
+                if ( $hook_ok ) {
+                        Mintage_Pay::add_notice( 'success', self::connected_message( $name, $new_key ) );
+                        return 'verified';
+                }
+
+                $previous_api = null;
+                if ( $hook && isset( $hook['fingerprint'] ) ) {
+                        if ( $old_api && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
+                                $previous_api = $old_api;
+                        } elseif ( $hook['fingerprint'] === $fingerprint ) {
+                                $previous_api = $api;
+                        }
+                }
+
+                $result = self::connect_webhook( $api, $previous_api, $merchant_id );
+                if ( true === $result ) {
+                        Mintage_Pay::add_notice( 'success', self::connected_message( $name, $new_key ) . ' ' . __( 'Webhook connected.', 'mintage-pay' ) );
+                        return 'connected';
+                }
+                return 'failed';
+        }
+
+        /**
+         * "Mintage Pay: API key verified for X (live)."
+         *
+         * @param string $name    Merchant name.
+         * @param string $api_key The key (test or live).
+         * @return string
+         */
+        public static function connected_message( $name, $api_key ) {
+                $mode = Mintage_Pay::is_test_key( (string) $api_key )
+                        ? __( 'TEST MODE: sandbox, test money only', 'mintage-pay' )
+                        : __( 'live', 'mintage-pay' );
+                return '' !== $name
+                        /* translators: 1: merchant business name, 2: "live" or "TEST MODE: ..." */
+                        ? sprintf( __( 'Mintage Pay: API key verified for %1$s (%2$s).', 'mintage-pay' ), $name, $mode )
+                        /* translators: %s: "live" or "TEST MODE: ..." */
+                        : sprintf( __( 'Mintage Pay: API key verified (%s).', 'mintage-pay' ), $mode );
+        }
 
         /**

mintage-pay/trunk/includes/class-mintagepay-blocks.php

@@ -105 +105 @@
 
         /**
-         * The apps' marks for this method's own row (WC_Gateway_MintagePay::get_icon() for the classic checkout): Cash App,
-         * plus Apple Pay / Google Pay where Mintage Pay offers the card route for the cart's total. None while the two
-         * choices are inside the method (the marks are on the choices then) or when it is the only rail.
+         * The apps' marks for this method's own row (WC_Gateway_MintagePay::get_icon() for the classic checkout), by the one
+         * rule in Mintage_Pay_Two_Rail::row_marks(): only what Pay by app offers this store for the cart's total, none while
+         * the two choices are inside the method (the marks are on the choices then).
          *
          * @return array[]
@@ -117 +117 @@
                 $currency = function_exists( 'get_woocommerce_currency' ) ? (string) get_woocommerce_currency() : 'USD';
                 $total    = $this->cart_total();
-                $apps     = Mintage_Pay::split_on()
-                        || ( Mintage_Pay::crypto_on() && ! ( $total > 0 && Mintage_Pay_Two_Rail::offered( $total, $currency ) ) );
-                if ( ! $apps ) {
-                        return array();
-                }
-                $wallets = $total > 0 ? Mintage_Pay_Two_Rail::card_status( $total, $currency )['available'] : true;
-                return Mintage_Pay_Two_Rail::mark_images( 'app', $wallets );
+                // The same rule as the classic checkout (Mintage_Pay_Two_Rail::row_marks()); no cart (the editor): $total is 0.
+                return Mintage_Pay_Two_Rail::row_mark_images( $total, $currency, $total <= 0 );
         }
 

mintage-pay/trunk/includes/class-mintagepay-two-rail.php

@@ -223 +223 @@
          */
         public static function card_status( $total, $currency ) {
-                $none     = self::card_from_options( null );
+                return self::status( $total, $currency )['card'];
+        }
+
+        /**
+         * Read `options.cash_app` and `options.wallet` of a GET /v1/payment-options response (1.18.0): whether Pay by app
+         * offers Cash App, and crypto, for this store and total. Pure. A server that does not send them offers neither.
+         *
+         * @param mixed $options Response.
+         * @return array { cash_app: bool, wallet: bool }
+         */
+        public static function apps_from_options( $options ) {
+                $o = is_array( $options ) && isset( $options['options'] ) && is_array( $options['options'] ) ? $options['options'] : array();
+                return array(
+                        'cash_app' => isset( $o['cash_app'] ) && true === $o['cash_app'],
+                        'wallet'   => isset( $o['wallet'] ) && true === $o['wallet'],
+                );
+        }
+
+        /**
+         * The card route and the apps for an amount, from one GET /v1/payment-options (card_status() caching: 10 minutes per
+         * amount, 2 after a failure). Unknown (no verified key, the API failed): no card, no apps.
+         *
+         * @param float|string $total    Order total in the store currency.
+         * @param string       $currency ISO 4217.
+         * @return array { card: card_from_options(), apps: apps_from_options() }
+         */
+        public static function status( $total, $currency ) {
+                $none     = array(
+                        'card' => self::card_from_options( null ),
+                        'apps' => self::apps_from_options( null ),
+                );
                 $currency = strtoupper( (string) $currency );
                 if ( ! class_exists( 'Mintage_Pay_Webhook' ) || ! Mintage_Pay_Webhook::currency_supported( $currency ) || ! Mintage_Pay::is_key_verified() ) {
@@ -238 +268 @@
                 $key    = self::TRANSIENT . md5( $api->fingerprint() . '|' . $currency . '|' . $minor );
                 $cached = get_transient( $key );
-                if ( is_array( $cached ) && isset( $cached['available'] ) ) {
-                        return self::card_from_options( array( 'card' => $cached ) );
+                // A value cached by 1.17.0 has no 'apps': asked again.
+                if ( is_array( $cached ) && isset( $cached['available'] ) && isset( $cached['apps'] ) && is_array( $cached['apps'] ) ) {
+                        return array(
+                                'card' => self::card_from_options( array( 'card' => $cached ) ),
+                                'apps' => self::apps_from_options( array( 'options' => $cached['apps'] ) ),
+                        );
                 }
                 $options = $api->payment_options( Mintage_Pay_Webhook::format_minor( $minor, $currency ), $currency, 5 );
                 $card    = self::card_from_options( is_wp_error( $options ) ? null : $options );
-                set_transient( $key, $card, is_wp_error( $options ) ? 2 * MINUTE_IN_SECONDS : 10 * MINUTE_IN_SECONDS );
+                $apps    = self::apps_from_options( is_wp_error( $options ) ? null : $options );
+                set_transient( $key, $card + array( 'apps' => $apps ), is_wp_error( $options ) ? 2 * MINUTE_IN_SECONDS : 10 * MINUTE_IN_SECONDS );
                 if ( is_wp_error( $options ) ) {
                         Mintage_Pay::log( 'payment options could not be read (the card choice stays hidden for now): ' . $options->get_error_message(), 'warning' );
                 }
-                return $card;
+                return array(
+                        'card' => $card,
+                        'apps' => $apps,
+                );
+        }
+
+        /**
+         * The marks on the main method's own row at checkout (classic get_icon() and the block checkout's data use this
+         * one rule, 1.18.0). Pure.
+         *  - The two choices are inside the method: none (the marks are on the choices).
+         *  - No cart (admin, the block editor): the apps' marks where the method is the apps (split, or crypto its own
+         *    method), none otherwise, as before 1.18.0.
+         *  - Otherwise only where Pay by app offers Cash App for this store (options.cash_app): Cash App, then Apple Pay and
+         *    Google Pay where the card route is offered, then USDC and USDT where crypto is inside Pay by app (crypto not its
+         *    own method) and offered (options.wallet). A store without Cash App, or a failed read, shows none.
+         *
+         * @param bool       $split   "Pay by card" is its own method (Mintage_Pay::split_on()).
+         * @param bool       $crypto  "Pay with crypto" is its own method (Mintage_Pay::crypto_on()).
+         * @param bool       $offered The two choices are offered inside the method for this total.
+         * @param array|null $status  status() for the cart's total, or null when there is no cart.
+         * @return array[] marks() entries.
+         */
+        public static function row_marks( $split, $crypto, $offered, $status ) {
+                if ( ! $split && $offered ) {
+                        return array();
+                }
+                if ( null === $status ) {
+                        return ( $split || $crypto ) ? self::marks( 'app', true ) : array();
+                }
+                if ( empty( $status['apps']['cash_app'] ) ) {
+                        return array();
+                }
+                return self::marks( 'app', ! empty( $status['card']['available'] ), ! $crypto && ! empty( $status['apps']['wallet'] ) );
+        }
+
+        /**
+         * row_marks() for this store and cart, as image addresses.
+         *
+         * @param float|string $total    Cart or order total.
+         * @param string       $currency ISO 4217.
+         * @param bool         $no_cart  There is no cart (admin, the block editor).
+         * @return array[]
+         */
+        public static function row_mark_images( $total, $currency, $no_cart ) {
+                $status  = $no_cart ? null : self::status( $total, $currency );
+                $offered = ! $no_cart && self::offered( $total, $currency );
+                return self::images( self::row_marks( Mintage_Pay::split_on(), Mintage_Pay::crypto_on(), $offered, $status ) );
         }
 
@@ -329 +410 @@
          * @param string $choice  'card', 'app' or 'crypto'.
          * @param bool   $wallets Apple Pay and Google Pay are offered on Pay by app.
+         * @param bool   $coins   USDC and USDT after the apps (Pay by app with crypto inside it, row_marks()).
          * @return array[]
          */
-        public static function marks( $choice, $wallets = true ) {
+        public static function marks( $choice, $wallets = true, $coins = false ) {
                 if ( 'card' === $choice ) {
                         return array(
@@ -350 +432 @@
                         $out[] = array( 'google-pay', 'Google Pay', 45 );
                 }
+                if ( $coins ) {
+                        $out[] = array( 'usdc', 'USDC', 38 );
+                        $out[] = array( 'usdt', 'USDT', 38 );
+                }
                 return $out;
         }
@@ -361 +447 @@
          */
         public static function mark_images( $choice, $wallets = true ) {
+                return self::images( self::marks( $choice, $wallets ) );
+        }
+
+        /**
+         * marks() entries as addresses: file, label, width.
+         *
+         * @param array[] $marks marks() entries.
+         * @return array[]
+         */
+        public static function images( array $marks ) {
                 $base = plugins_url( 'assets/img/marks/', MINTAGE_PAY_FILE );
                 $out  = array();
-                foreach ( self::marks( $choice, $wallets ) as $m ) {
+                foreach ( $marks as $m ) {
                         $out[] = array(
                                 'src'   => $base . $m[0] . '.svg?ver=' . MINTAGE_PAY_VERSION,
@@ -382 +478 @@
          */
         public static function marks_html( $choice, $wallets = true ) {
+                return self::images_html( self::mark_images( $choice, $wallets ) );
+        }
+
+        /**
+         * Image addresses (images()) as the payment method row's HTML.
+         *
+         * @param array[] $images images() entries.
+         * @return string
+         */
+        public static function images_html( array $images ) {
                 $html = '';
-                foreach ( self::mark_images( $choice, $wallets ) as $m ) {
+                foreach ( $images as $m ) {
                         $html .= '<img class="mintagepay-method-mark" src="' . esc_url( $m['src'] ) . '" alt="' . esc_attr( $m['alt'] ) . '" title="' . esc_attr( $m['alt'] ) . '" width="' . (int) $m['width'] . '" height="24" decoding="async" />';
                 }

mintage-pay/trunk/includes/class-wc-gateway-mintagepay.php

@@ -27 +27 @@
                 // claiming a refund was sent (WooCommerce would otherwise only offer "Refund manually").
                 $this->supports           = array_merge( Mintage_Pay_Subscriptions::supports(), array( 'refunds' ) );
+                // The square Mintage Pay mark for WooCommerce's Payments page (it reads this property, over REST too). The
+                // checkout row never shows it: get_icon() below does not call parent::get_icon().
+                $this->icon               = plugins_url( 'assets/img/mintage-pay.svg', MINTAGE_PAY_FILE );
 
                 $this->init_form_fields();
@@ -80 +83 @@
         public function get_icon() {
                 $rail = $this->method_rail();
-                // With "Pay with crypto" as its own method (1.17.0) this method is the apps, unless it shows the two choices
-                // inside itself (their marks are on the choices then).
-                if ( '' === $rail && Mintage_Pay::crypto_on() && ! $this->two_rail_offered() ) {
-                        $rail = 'app';
-                }
-                if ( '' === $rail ) {
-                        return parent::get_icon();
-                }
-                return apply_filters( 'woocommerce_gateway_icon', Mintage_Pay_Two_Rail::marks_html( $rail, $this->wallets_offered() ), $this->id );
+                if ( 'card' === $rail || 'crypto' === $rail ) {
+                        return apply_filters( 'woocommerce_gateway_icon', Mintage_Pay_Two_Rail::marks_html( $rail, $this->wallets_offered() ), $this->id );
+                }
+                // This method (Pay by app): one rule with the block checkout (Mintage_Pay_Two_Rail::row_marks(), 1.18.0). Never
+                // parent::get_icon(): $this->icon is set for the WooCommerce Payments page only, not for the checkout row.
+                $no_cart  = is_admin() && ! wp_doing_ajax();
+                $currency = function_exists( 'get_woocommerce_currency' ) ? (string) get_woocommerce_currency() : 'USD';
+                $images   = Mintage_Pay_Two_Rail::row_mark_images( $no_cart ? 0 : $this->get_order_total(), $currency, $no_cart );
+                return apply_filters( 'woocommerce_gateway_icon', Mintage_Pay_Two_Rail::images_html( $images ), $this->id );
         }
 
@@ -306 +309 @@
                                 'title'       => __( 'API key', 'mintage-pay' ),
                                 'type'        => 'password',
-                                'description' => __( 'Create one in the Mintage Pay dashboard under Developers > API keys. Saving a new key checks it and connects the webhook automatically.', 'mintage-pay' ),
+                                'description' => __( 'Easiest: click "Connect to Mintage Pay" at the top of this page and the key is filled in for you. Or create one in the Mintage Pay dashboard under Developers > API keys and paste it here. Saving a new key checks it and connects the webhook automatically.', 'mintage-pay' ),
                                 'default'     => '',
                         ),
@@ -366 +369 @@
                                 'type'  => 'mintagepay_webhook',
                         ),
+                        'auto_update'        => array(
+                                'title' => __( 'Plugin updates', 'mintage-pay' ),
+                                'type'  => 'mintagepay_auto_update',
+                        ),
                         'debug'              => array(
                                 'title'       => __( 'Debug log', 'mintage-pay' ),
@@ -399 +406 @@
                         <td class="forminp">
                                 <?php if ( '' === (string) $this->get_option( 'api_key' ) ) : ?>
-                                        <p><?php esc_html_e( 'Not connected. Save an API key first.', 'mintage-pay' ); ?></p>
+                                        <p><?php esc_html_e( 'Not connected yet.', 'mintage-pay' ); ?></p>
+                                        <p><?php $this->connect_buttons(); ?></p>
                                 <?php else : ?>
                                         <?php if ( $hook && ! empty( $hook['secret'] ) && isset( $hook['fingerprint'] ) && $hook['fingerprint'] === $fingerprint ) : ?>
@@ -446 +454 @@
 
         /**
+         * The two Connect buttons (live account, sandbox test account).
+         */
+        protected function connect_buttons() {
+                ?>
+                <a class="button button-primary" href="<?php echo esc_url( Mintage_Pay_Connect::start_url( 'live' ) ); ?>"><?php esc_html_e( 'Connect to Mintage Pay', 'mintage-pay' ); ?></a>
+                <a class="button" href="<?php echo esc_url( Mintage_Pay_Connect::start_url( 'test' ) ); ?>"><?php esc_html_e( 'Connect a test (sandbox) account', 'mintage-pay' ); ?></a>
+                <?php
+        }
+
+        /**
+         * Settings page: the "Get started" panel (no key yet) or the "Replace the key?" box (a Connect came back while a
+         * working key is saved), then the settings. Only on this method's own page, not the card or crypto method's.
+         */
+        public function admin_options() {
+                if ( Mintage_Pay::GATEWAY_ID === $this->id ) {
+                        $pending = Mintage_Pay_Connect::pending();
+                        if ( $pending ) {
+                                $this->confirm_box( $pending );
+                        } elseif ( '' === (string) $this->get_option( 'api_key' ) ) {
+                                $this->get_started_panel();
+                        }
+                }
+                parent::admin_options();
+        }
+
+        /**
+         * "Get started": connect, try the sandbox, apply, read the guide.
+         */
+        private function get_started_panel() {
+                ?>
+                <div class="notice notice-info inline" style="padding:12px 16px;margin:16px 0;">
+                        <h3 style="margin-top:0;"><?php esc_html_e( 'Get started with Mintage Pay', 'mintage-pay' ); ?></h3>
+                        <ol style="margin-left:1.5em;">
+                                <li><?php esc_html_e( 'Have a Mintage Pay account? Click "Connect to Mintage Pay", sign in and approve this store. The API key and the webhook are set up for you and the payment method is switched on.', 'mintage-pay' ); ?></li>
+                                <li>
+                                        <?php
+                                        printf(
+                                                /* translators: %s: link to the Mintage Pay application form */
+                                                esc_html__( 'No account yet? %s (a few minutes).', 'mintage-pay' ),
+                                                '<a href="https://mintagepay.com/#apply" target="_blank" rel="noopener noreferrer">' . esc_html__( 'Apply for a Mintage Pay account', 'mintage-pay' ) . '</a>'
+                                        );
+                                        ?>
+                                </li>
+                                <li>
+                                        <?php
+                                        printf(
+                                                /* translators: %s: link to the sandbox */
+                                                esc_html__( 'Want to try it first? Make a free test account on the %s, then click "Connect a test (sandbox) account". Test orders use test money only.', 'mintage-pay' ),
+                                                '<a href="https://sandbox.mintagepay.com/" target="_blank" rel="noopener noreferrer">' . esc_html__( 'Mintage Pay sandbox', 'mintage-pay' ) . '</a>'
+                                        );
+                                        ?>
+                                </li>
+                        </ol>
+                        <p><?php $this->connect_buttons(); ?></p>
+                        <p class="description">
+                                <?php
+                                printf(
+                                        /* translators: %s: link to the setup guide */
+                                        esc_html__( 'Step by step: %s.', 'mintage-pay' ),
+                                        '<a href="https://mintagepay.com/docs/integrations/#woocommerce" target="_blank" rel="noopener noreferrer">' . esc_html__( 'the WooCommerce setup guide', 'mintage-pay' ) . '</a>'
+                                );
+                                ?>
+                        </p>
+                </div>
+                <?php
+        }
+
+        /**
+         * A Connect came back while a working key is saved: replace it, or keep it.
+         *
+         * @param array $pending The waiting connect (code, verifier, base).
+         */
+        private function confirm_box( array $pending ) {
+                $current_name = Mintage_Pay::verified_merchant_name();
+                $current_mode = Mintage_Pay::is_test_key( (string) $this->get_option( 'api_key' ) ) ? __( 'test mode (sandbox)', 'mintage-pay' ) : __( 'live', 'mintage-pay' );
+                $new_mode     = Mintage_Pay::SANDBOX_API_BASE === $pending['base'] ? __( 'test mode (sandbox)', 'mintage-pay' ) : __( 'live', 'mintage-pay' );
+                ?>
+                <div class="notice notice-warning inline" style="padding:12px 16px;margin:16px 0;">
+                        <h3 style="margin-top:0;"><?php esc_html_e( 'Replace the Mintage Pay key?', 'mintage-pay' ); ?></h3>
+                        <p>
+                                <?php
+                                if ( '' !== $current_name ) {
+                                        /* translators: 1: Mintage Pay business name, 2: "live" or "test mode (sandbox)" */
+                                        echo esc_html( sprintf( __( 'This store takes payments for %1$s (%2$s) now.', 'mintage-pay' ), $current_name, $current_mode ) );
+                                } else {
+                                        /* translators: %s: "live" or "test mode (sandbox)" */
+                                        echo esc_html( sprintf( __( 'This store has a working Mintage Pay key now (%s).', 'mintage-pay' ), $current_mode ) );
+                                }
+                                echo ' ';
+                                /* translators: %s: "live" or "test mode (sandbox)" */
+                                echo esc_html( sprintf( __( 'You just approved a new connection (%s). Replacing the key sends new payments to the account you approved.', 'mintage-pay' ), $new_mode ) );
+                                ?>
+                        </p>
+                        <?php if ( Mintage_Pay::SANDBOX_API_BASE === $pending['base'] && ! Mintage_Pay::is_test_key( (string) $this->get_option( 'api_key' ) ) ) : ?>
+                                <p><strong style="color:#b32d2e;"><?php esc_html_e( 'The new key is a test key: customers would pay with test money and no real payment would reach you.', 'mintage-pay' ); ?></strong></p>
+                        <?php endif; ?>
+                        <p>
+                                <a class="button button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin-post.php?action=' . Mintage_Pay_Connect::CONFIRM_ACTION ), Mintage_Pay_Connect::CONFIRM_ACTION ) ); ?>"><?php esc_html_e( 'Replace the key', 'mintage-pay' ); ?></a>
+                                <a class="button" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin-post.php?action=' . Mintage_Pay_Connect::CANCEL_ACTION ), Mintage_Pay_Connect::CANCEL_ACTION ) ); ?>"><?php esc_html_e( 'Keep the current key', 'mintage-pay' ); ?></a>
+                        </p>
+                </div>
+                <?php
+        }
+
+        /**
+         * The "Plugin updates" row: WordPress's own auto-update choice for this plugin (the Plugins page's "Enable
+         * auto-updates" link), shown as a checkbox.
+         *
+         * @param string $key  Field key.
+         * @param array  $data Field data.
+         * @return string
+         */
+        public function generate_mintagepay_auto_update_html( $key, $data ) {
+                $state     = Mintage_Pay_Connect::auto_update_state();
+                $field_key = $this->get_field_key( $key );
+                ob_start();
+                ?>
+                <tr valign="top">
+                        <th scope="row" class="titledesc"><label for="<?php echo esc_attr( $field_key ); ?>"><?php echo esc_html( $data['title'] ); ?></label></th>
+                        <td class="forminp">
+                                <fieldset>
+                                        <label for="<?php echo esc_attr( $field_key ); ?>">
+                                                <input type="checkbox" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" value="1" <?php checked( $state['on'] ); ?> <?php disabled( ! $state['allowed'] ); ?> />
+                                                <?php esc_html_e( 'Update Mintage Pay automatically when a new version is out', 'mintage-pay' ); ?>
+                                        </label>
+                                        <p class="description">
+                                                <?php
+                                                if ( $state['allowed'] ) {
+                                                        esc_html_e( 'The same as "Enable auto-updates" for Mintage Pay on the Plugins page. Recommended: fixes and new payment options reach your checkout without you doing anything. If your host or a tool such as MainWP manages your updates, that may already cover this site.', 'mintage-pay' );
+                                                } else {
+                                                        esc_html_e( 'Your host or your site settings manage plugin updates here, or your user cannot update plugins, so this cannot be changed from this page.', 'mintage-pay' );
+                                                }
+                                                ?>
+                                        </p>
+                                </fieldset>
+                        </td>
+                </tr>
+                <?php
+                return (string) ob_get_clean();
+        }
+
+        /**
+         * The auto-update checkbox: 'yes' or 'no' (WordPress's own setting is the one that counts, see process_admin_options()).
+         *
+         * @param string $key   Key.
+         * @param mixed  $value Value.
+         * @return string
+         */
+        public function validate_mintagepay_auto_update_field( $key, $value ) {
+                return ! empty( $value ) ? 'yes' : 'no';
+        }
+
+        /* ------------------------------------------------------------------ *
+         * WooCommerce's Payments page (WooCommerce 9.6+ calls these; older versions never do). The card and crypto methods
+         * share the main method's key, so "set up", "connected" and "test mode" are the same for all three.
+         * ------------------------------------------------------------------ */
+
+        /**
+         * Needs setup until a key has been checked with Mintage Pay. Not "is usable": that also needs the method switched
+         * on, and WooCommerce will not switch on a method that says it needs setup.
+         *
+         * @return bool
+         */
+        public function needs_setup() {
+                return ! Mintage_Pay::is_key_verified();
+        }
+
+        /**
+         * Connected: a key is saved and Mintage Pay accepted it.
+         *
+         * @return bool
+         */
+        public function is_account_connected() {
+                return Mintage_Pay::is_key_verified();
+        }
+
+        /**
+         * Test mode: the saved key is a sandbox key.
+         *
+         * @return bool
+         */
+        public function is_test_mode() {
+                return Mintage_Pay::is_test_key( (string) Mintage_Pay::setting( 'api_key', '' ) );
+        }
+
+        /**
+         * This method's own settings page.
+         *
+         * @return string
+         */
+        public function get_settings_url() {
+                return admin_url( 'admin.php?page=wc-settings&tab=checkout&section=' . $this->id );
+        }
+
+        /**
+         * Where "Complete setup" goes: the main method's settings, with the Connect buttons.
+         *
+         * @param string $return_url Where WooCommerce would like to come back to (not used: the settings page is the end).
+         * @return string
+         */
+        public function get_connection_url( $return_url = '' ) {
+                return Mintage_Pay::settings_url();
+        }
+
+        /**
+         * Links on the Payments page's menu for this method.
+         *
+         * @param string $country_code Store country (not used: the same links everywhere).
+         * @return array[]
+         */
+        public function get_provider_links( $country_code = '' ) {
+                return self::provider_links();
+        }
+
+        /**
+         * The Payments page links (pure, tested in tests/payments-page-test.php).
+         *
+         * @return array[]
+         */
+        public static function provider_links() {
+                return array(
+                        array(
+                                '_type' => 'about',
+                                'url'   => 'https://mintagepay.com/',
+                        ),
+                        array(
+                                '_type' => 'documentation',
+                                'url'   => 'https://mintagepay.com/docs/integrations/#woocommerce',
+                        ),
+                        array(
+                                '_type' => 'support',
+                                'url'   => 'https://mintagepay.com/docs/',
+                        ),
+                        array(
+                                '_type' => 'pricing',
+                                'url'   => 'https://mintagepay.com/#pricing',
+                        ),
+                        array(
+                                '_type' => 'terms',
+                                'url'   => 'https://mintagepay.com/terms.html',
+                        ),
+                );
+        }
+
+        /**
          * The webhook row stores nothing.
          *
@@ -521 +774 @@
 
         /**
-         * Save settings, then validate a new key with GET /v1/me and register the webhook.
+         * Save settings, then validate a new key with GET /v1/me and register the webhook (Mintage_Pay_Admin::activate_key(),
+         * the same steps "Connect to Mintage Pay" runs), and apply the auto-update choice.
          *
          * @return bool
@@ -536 +790 @@
                 $this->enabled     = $this->get_option( 'enabled' );
 
-                $new_key  = (string) $this->get_option( 'api_key' );
-                $new_base = Mintage_Pay::api_base_for( $new_key, (string) $this->get_option( 'api_base_url' ) );
-                delete_transient( Mintage_Pay::RAILS_TRANSIENT );
-                $old_api  = '' !== $old_key ? Mintage_Pay::api( $old_key, $old_base ) : null;
-
-                if ( '' === $new_key ) {
-                        // Key removed: disable the old endpoint and forget the secret.
-                        $hook = Mintage_Pay::get_webhook();
-                        if ( $hook && $old_api && isset( $hook['fingerprint'] ) && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
-                                $old_api->delete_webhook( $hook['id'] );
-                        }
-                        Mintage_Pay::clear_webhook();
-                        Mintage_Pay::clear_key_verified();
-                        return $saved;
-                }
-
-                $credentials_changed = ( $new_key !== $old_key || $new_base !== $old_base );
-                $hook                = Mintage_Pay::get_webhook();
-                $fingerprint         = Mintage_Pay::fingerprint( $new_base, $new_key );
-                $hook_ok             = $hook && ! empty( $hook['secret'] ) && isset( $hook['fingerprint'] ) && $hook['fingerprint'] === $fingerprint;
-
-                if ( ! $credentials_changed && $hook_ok && Mintage_Pay::is_key_verified() ) {
-                        return $saved;
-                }
-
-                $api = Mintage_Pay::api( $new_key, $new_base );
-                $me  = $api->get_me();
-                if ( is_wp_error( $me ) ) {
-                        // A new key is unverified by definition (the stored flag holds another key's fingerprint).
-                        Mintage_Pay_Admin::handle_me_error( $me );
-                        Mintage_Pay::add_notice(
-                                'error',
-                                sprintf(
-                                        /* translators: %s: error message */
-                                        __( 'Mintage Pay: the API key could not be verified (%s). The payment method stays hidden at checkout until the key is verified. Check the key and save again.', 'mintage-pay' ),
-                                        Mintage_Pay_Admin::me_error_text( $me, $new_key, (string) $this->get_option( 'api_base_url' ) )
-                                )
-                        );
-                        return $saved;
-                }
-
-                $merchant_id = Mintage_Pay_Admin::merchant_id( $me );
-                $name        = isset( $me['merchant']['name'] ) && is_string( $me['merchant']['name'] ) ? $me['merchant']['name'] : '';
-                Mintage_Pay::mark_key_verified( $api->fingerprint(), $merchant_id, $name );
-                Mintage_Pay::cache_rails( $me );
-
-                if ( $hook_ok ) {
-                        Mintage_Pay::add_notice( 'success', $this->connected_message( $name ) );
-                        return $saved;
-                }
-
-                $previous_api = null;
-                if ( $hook && isset( $hook['fingerprint'] ) ) {
-                        if ( $old_api && Mintage_Pay::fingerprint( $old_base, $old_key ) === $hook['fingerprint'] ) {
-                                $previous_api = $old_api;
-                        } elseif ( $hook['fingerprint'] === $fingerprint ) {
-                                $previous_api = $api;
-                        }
-                }
-
-                $result = Mintage_Pay_Admin::connect_webhook( $api, $previous_api, $merchant_id );
-                if ( true === $result ) {
-                        Mintage_Pay::add_notice( 'success', $this->connected_message( $name ) . ' ' . __( 'Webhook connected.', 'mintage-pay' ) );
-                }
+                Mintage_Pay_Admin::activate_key( $old_key, $old_base, (string) $this->get_option( 'api_key' ), (string) $this->get_option( 'api_base_url' ) );
+                Mintage_Pay_Connect::save_auto_update( 'yes' === $this->get_option( 'auto_update' ) );
                 return $saved;
-        }
-
-        /**
-         * "Connected to Mintage Pay as X."
-         *
-         * @param string $name Merchant name.
-         * @return string
-         */
-        private function connected_message( $name ) {
-                $mode = Mintage_Pay::is_test_key( (string) $this->get_option( 'api_key' ) )
-                        ? __( 'TEST MODE: sandbox, test money only', 'mintage-pay' )
-                        : __( 'live', 'mintage-pay' );
-                return '' !== $name
-                        /* translators: 1: merchant business name, 2: "live" or "TEST MODE: ..." */
-                        ? sprintf( __( 'Mintage Pay: API key verified for %1$s (%2$s).', 'mintage-pay' ), $name, $mode )
-                        /* translators: %s: "live" or "TEST MODE: ..." */
-                        : sprintf( __( 'Mintage Pay: API key verified (%s).', 'mintage-pay' ), $mode );
         }
 

mintage-pay/trunk/mintage-pay.php

@@ -4 +4 @@
  * Plugin URI:           https://mintagepay.com/docs/integrations/#woocommerce
  * Description:          Accept USDC and USDT stablecoin payments through the Mintage Pay hosted checkout, with prices in USD, EUR, GBP and more.
- * Version:              1.17.0
+ * Version:              1.18.0
  * Requires at least:    6.4
  * Requires PHP:         7.4
@@ -14 +14 @@
  * Text Domain:          mintage-pay
  * WC requires at least: 8.0
- * WC tested up to:      11.1
+ * WC tested up to:      11.2
  *
  * @package MintagePay
@@ -21 +21 @@
 defined( 'ABSPATH' ) || exit;
 
-define( 'MINTAGE_PAY_VERSION', '1.17.0' );
+define( 'MINTAGE_PAY_VERSION', '1.18.0' );
 define( 'MINTAGE_PAY_FILE', __FILE__ );
 define( 'MINTAGE_PAY_PATH', plugin_dir_path( __FILE__ ) );
@@ -153 +153 @@
                 require_once MINTAGE_PAY_PATH . 'includes/class-mintagepay-reminder.php';
                 require_once MINTAGE_PAY_PATH . 'includes/class-mintagepay-two-rail.php';
+                require_once MINTAGE_PAY_PATH . 'includes/class-mintagepay-connect.php';
 
                 add_filter( 'woocommerce_payment_gateways', array( __CLASS__, 'add_gateway' ) );
@@ -176 +177 @@
                 Mintage_Pay_Discount::init();
                 Mintage_Pay_Reminder::init();
+                Mintage_Pay_Connect::init();
         }
 

mintage-pay/trunk/readme.txt

@@ -7 +7 @@
 WC requires at least: 8.0
 WC tested up to: 11.2
-Stable tag: 1.17.0
+Stable tag: 1.18.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -21 +21 @@
 * **Pay by app**: Cash App in one tap, plus Apple Pay and Google Pay where Mintage Pay offers them for the total.
 
-**Get started in minutes:** install, try it with test money in the sandbox, then apply for a live account. See Installation below, or the full guide at https://mintagepay.com/docs/integrations/#woocommerce
+**Get started in minutes:** install, click "Connect to Mintage Pay" and approve your store. No key to copy. Try it with test money in the sandbox first if you like, then apply for a live account. See Installation below, or the full guide at https://mintagepay.com/docs/integrations/#woocommerce
 
 Mintage Pay sends your customer to a secure hosted checkout where they pay in stablecoins (USDC or USDT) from a wallet or an exchange, on the networks you turn on in your Mintage Pay dashboard (for example Base, Polygon, Solana or TRON). A network appears at checkout only when you have set a payout address for it.
@@ -53 +53 @@
 What is sent, and when:
 
+* When you click "Connect to Mintage Pay" (or "Connect a test (sandbox) account"): your browser opens app.mintagepay.com (or sandbox.mintagepay.com) with this site's address, its name, the plugin version, a random value and a code challenge (PKCE). You sign in there and approve this store. Your browser then comes back to this site with a one-time code, and the plugin sends that code and its secret to Mintage Pay to receive this store's API key. Nothing is sent before you click.
 * When you save the settings, reconnect the webhook, or activate, deactivate or delete the plugin: your API key (in the Authorization header), this store's webhook URL and the store name, to check the key and to add or remove the webhook endpoint.
 * When a customer chooses Mintage Pay at checkout: the order total and currency, the order number, a description ("Order #1042 from Your Store"), the thank-you and cancel page addresses, the WooCommerce order id and order key, the invoice expiry, and the customer's billing email address. Mintage Pay emails the customer a receipt only if you turn off "Let WooCommerce send the order emails"; otherwise it writes to them only when they ask for a refund on Mintage Pay's refund page. For an order paid by card, the email is also kept as part of the record of that card payment, in case the customer disputes the charge.
@@ -74 +75 @@
 **3. Go live.** Apply at https://mintagepay.com/#apply. Once your account is approved, sign in at https://app.mintagepay.com, set a payout address for each network you want to be paid on, and create a live key (mp_live_...).
 
-**4. Connect your store.** Go to WooCommerce > Settings > Payments > Mintage Pay, paste the key, tick Enable and save. Saving checks the key and registers this store's webhook automatically. The settings page shows "Connected to (your business name) (live)" when it is done, or "(TEST MODE: sandbox, test money only)" for a sandbox key.
-
-To try it first, use a sandbox key (mp_test_...) from https://sandbox.mintagepay.com. Leave "API base URL" empty: the key decides whether the plugin talks to the sandbox or the live service. Replace it with a live key (mp_live_...) before you take real orders.
+**4. Connect your store.** Go to WooCommerce > Settings > Payments > Mintage Pay and click "Connect to Mintage Pay" (or "Connect a test (sandbox) account"). Sign in to Mintage Pay, check that the store address shown is yours, and click Approve. You come back to WordPress with the key saved, the webhook registered and the payment method switched on. You can also paste a key from Developers > API keys instead: tick Enable and save. Saving checks the key and registers this store's webhook automatically. The settings page shows "Connected to (your business name) (live)" when it is done, or "(TEST MODE: sandbox, test money only)" for a sandbox key.
+
+To try it first, connect a sandbox account, or paste a sandbox key (mp_test_...) from https://sandbox.mintagepay.com. Click "Connect to Mintage Pay" again later to switch to your live account: the plugin asks before it replaces a working key. Leave "API base URL" empty: the key decides whether the plugin talks to the sandbox or the live service. Replace it with a live key (mp_live_...) before you take real orders.
 
 If you move the store to a new address or the webhook shows "Not connected", click "Reconnect webhook" on the settings page.
@@ -82 +83 @@
 **5. Choose your methods.** Under WooCommerce > Settings > Payments, switch on "Mintage Pay: Pay by card" and "Mintage Pay: Pay with crypto" if you want them as their own methods, and drag the methods into the order you want.
 
-**6. Stay up to date automatically.** On the Plugins screen, click "Enable auto-updates" next to Mintage Pay. Fixes and new payment options then install on their own.
+**6. Stay up to date automatically.** Tick "Update Mintage Pay automatically" on the settings page, or click "Enable auto-updates" next to Mintage Pay on the Plugins screen (it is the same setting). Fixes and new payment options then install on their own.
 
 = Documentation =
@@ -100 +101 @@
 Yes. A sandbox account for testing is free and instant at https://sandbox.mintagepay.com. A live account is by application at https://mintagepay.com/#apply.
 
+= What does "Connect to Mintage Pay" do? =
+
+It makes an API key for this store in your Mintage Pay account and saves it here, so you never copy a key by hand. You approve it on Mintage Pay's own site, signed in to your account, and the page shows the store address that asked. Only approve if you just clicked Connect in your own WordPress. The key appears under Developers > API keys as "WooCommerce (your store address)" and the account owner gets an email. If you connect the same store again, the key from the earlier Connect is revoked as soon as the new one is used. Keys you made by hand are never touched.
+
 = Why don't I see Pay by card or Pay by app? =
 
@@ -151 +156 @@
 
 == Changelog ==
+
+= 1.18.0 =
+* New: "Connect to Mintage Pay". Click it on the settings page, sign in to Mintage Pay and approve your store: the API key is saved, the webhook is registered and the payment method is switched on. No key to copy. "Connect a test (sandbox) account" does the same with test money. If a working key is already saved, the plugin asks before replacing it.
+* New: a "Get started" box on the settings page while no key is saved, with Connect, the sandbox, the application form and the setup guide.
+* New: "Update Mintage Pay automatically" on the settings page (WordPress's own auto-update setting for this plugin).
+* WooCommerce's Payments page now shows the Mintage Pay icon, says the method needs setup until a key is verified and shows test mode for a sandbox key, and links to the guide, pricing and terms. Each Mintage Pay method opens its own settings.
+* Fix: with only the main method on, its row showed the Cash App, Apple Pay and Google Pay icons even where Mintage Pay does not offer those apps for the store. The icons now follow what Mintage Pay offers, on the classic and the block checkout.
+* Tested with WooCommerce 11.2.
 
 = 1.17.0 =
@@ -269 +282 @@
 = 1.0.0 =
 * First release.
+
+== Upgrade Notice ==
+
+= 1.18.0 =
+One-click "Connect to Mintage Pay" (no key to copy), a Get started box, an "Update Mintage Pay automatically" setting, and a fix for app icons shown where the apps are not offered.