WordPress.org
Get WordPress

Plugin Directory

Changeset 3343740


Ignore:
Timestamp:
08/12/2025 06:26:53 PM (5 months ago)
Author:
bbioon
Message:

version 2.1.6

Location:
merchant
Files:
989 added
5 edited

Legend:

Unmodified
Added
Removed

  • merchant/trunk/inc/class-merchant-loader.php

    r3338013 r3343740  
    217217         */
    218218        public function settings_link( $links ) {
    219             if ( ! merchant_pro_is_active() || ! merchant_pro_license_exists() ) {
     219            if ( ! merchant_pro_is_active() ) {
    220220                $url = merchant_admin_upgrade_link(
    221221                    'https://athemes.com/merchant/#pricing',

  • merchant/trunk/inc/compatibility/class-merchant-woo-multi-currency.php

    r3321967 r3343740  
    1717        public function __construct() {
    1818            add_filter( 'merchant_discounted_price', array( $this, 'multi_currency_free_support' ) );
     19            add_filter( 'merchant_discounted_price', array( $this, 'multi_currency_pro_support' ) );
     20
    1921            add_filter( 'merchant_pre_order_cart_sale_price', array( $this, 'multi_currency_free_support' ) );
    20             add_filter( 'merchant_discounted_price', array( $this, 'multi_currency_pro_support' ) );
    2122            add_filter( 'merchant_pre_order_cart_sale_price', array( $this, 'multi_currency_pro_support' ) );
     23
     24            // Add multi-currency support for Frequently Bought Together (FBT) cart item price
     25            add_filter( 'merchant_fbt_cart_item_price', array( $this, 'multi_currency_free_support' ) );
     26            add_filter( 'merchant_fbt_cart_item_price', array( $this, 'multi_currency_pro_support' ) );
     27
     28            // Add multi-currency support for Storewide sale cart item price
     29            add_filter( 'merchant_storewide_sale_cart_item_price', array( $this, 'multi_currency_free_support' ) );
     30            add_filter( 'merchant_storewide_sale_cart_item_price', array( $this, 'multi_currency_pro_support' ) );
     31
    2232            add_filter( 'merchant_free_gifts_min_amount', array( $this, 'multi_currency_support_free_gifts' )  );
    2333            add_filter( 'merchant_free_gifts_min_amount', array( $this, 'multi_currency_pro_support_free_gifts' )  );

  • merchant/trunk/languages/merchant.pot

    r3338013 r3343740  
    99"Language-Team: aThemes <[email protected]>\n"
    1010"Last-Translator: aThemes <[email protected]>\n"
    11 "POT-Creation-Date: 2025-08-01 20:32+0000\n"
     11"POT-Creation-Date: 2025-08-12 18:10+0000\n"
    1212"Report-Msgid-Bugs-To: https://athemes.com/contact/\n"
    1313"X-Poedit-Basepath: ..\n"

  • merchant/trunk/merchant.php

    r3338013 r3343740  
    44 * Plugin URI:  https://athemes.com/merchant
    55 * Description: All-in-one WooCommerce plugin for pre-orders, product labels, buy now, quick view, discount rules and more.
    6  * Version:     2.1.5
     6 * Version:     2.1.6
    77 * Author:      aThemes
    88 * Author URI:  https://athemes.com
    … …  
    2525
    2626// Merchant constants.
    27 define( 'MERCHANT_VERSION', '2.1.5' );
     27define( 'MERCHANT_VERSION', '2.1.6' );
    2828define( 'MERCHANT_DB_VERSION', '1.1.0' ); // Update only when the database structure changes. In inc/classes/class-merchant-db-tables.php
    2929define( 'MERCHANT_FILE', __FILE__ );

  • merchant/trunk/readme.txt

    r3338013 r3343740  
    44Tested up to: 6.8
    55Requires PHP: 7.3
    6 Stable tag: 2.1.5
     6Stable tag: 2.1.6
    77Contributors: aThemes
    88License: GPLv3 or later
    … …  
    219219
    220220== Changelog ==
     221= 2.1.6 =
     222* Added - Compatibility with Curcy Multi-Currency Switcher
     223
    221224= 2.1.5 =
    222225* Added - Wrapper function for UTM links
Note: See TracChangeset for help on using the changeset viewer.