WordPress.org
Get WordPress

Plugin Directory

Changeset 1485883


Ignore:
Timestamp:
08/29/2016 07:45:15 PM (10 years ago)
Author:
nickhamze
Message:

Update to version 1.2

Location:
connect-shopify-and-woocommerce
Files:
13 added
4 edited

Legend:

Unmodified
Added
Removed

  • connect-shopify-and-woocommerce/trunk/inc/wc-hooks.php

    r1480144 r1485883  
    139139    // if we have a site we can use, then redirect (in shopify-connect.php) will kick in instead of adding these tabs
    140140    $shopify_site = get_option( 'secp_shop', false );
    141     if ( ! $shopify_site || false !== strpos( $shopify_site, 'embeds.shopify.com' ) ) {
     141    if ( ! $shopify_site || false !== strpos( $shopify_site, 'embeds.shopify.com' ) || false !== strpos( $shopify_site, 'embeds.myshopify.com' ) ) {
    142142        $setting_classes_to_remove['shipping'] = 'WC_Settings_Shipping';
    143143        $setting_classes_to_remove['checkout'] = 'WC_Settings_Payment_Gateways';
    … …  
    166166    // if we have a site we can use, then redirect (in shopify-connect.php) will kick in instead
    167167    $shopify_site = get_option( 'secp_shop', false );
    168     if ( $shopify_site && false === strpos( $shopify_site, 'embeds.shopify.com' ) ) {
     168    if ( $shopify_site && false === strpos( $shopify_site, 'embeds.shopify.com' ) || false !== strpos( $shopify_site, 'embeds.myshopify.com' ) ) {
    169169        return;
    170170    }
    … …  
    204204    // if we have a site we can use, then redirect (in shopify-connect.php) will kick in instead of adding these tabs
    205205    $shopify_site = get_option( 'secp_shop', false );
    206     if ( ! $shopify_site || false !== strpos( $shopify_site, 'embeds.shopify.com' ) ) {
     206    if ( ! $shopify_site || false !== strpos( $shopify_site, 'embeds.shopify.com' ) || false !== strpos( $shopify_site, 'embeds.myshopify.com' ) ) {
    207207        unset( $sections['inventory'] );
    208208    }

  • connect-shopify-and-woocommerce/trunk/readme.txt

    r1480159 r1485883  
    44Requires at least: 4.2
    55Tested up to: 4.6
    6 Stable tag: 1.1
     6Stable tag: 1.2
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    4343== Changelog ==
    4444
     45= 1.2 =
     46* Bug fix: prevent duplicate hidden price fields from creating false error on sale price
     47* Bug fix: don't redirect to embeds.myshopify.com if that's the shop URL that gets set by the Shopify plugin
     48
    4549= 1.1 =
    4650* Significant re-write and feature improvement

  • connect-shopify-and-woocommerce/trunk/scripts/shopify-wc-connect-admin.js

    r1480144 r1485883  
    4949    });
    5050
     51    // remove duplicate fields
     52    var $general_product_data_tab = $( '#general_product_data' );
     53
     54    $general_product_data_tab.find( '._regular_price_field' ).remove();
     55    $general_product_data_tab.find( '._sale_price_field' ).remove();
     56
    5157    // remove some quick edit buttons
    5258    $( '#wpbody-content' ).on( 'click', '.editinline', function(){

  • connect-shopify-and-woocommerce/trunk/shopify-connect.php

    r1480166 r1485883  
    44 * Plugin URI:  https://secretpizza.party
    55 * Description: WooCommerce and Shopify go together like peanut butter and jelly. Let us help you connect them together.
    6  * Version:     1.1
     6 * Version:     1.2
    77 * Author:      secret pizza party, jkudish
    88 * Author URI:  https://secretpizza.party
    … …  
    3030 */
    3131
    32 define( 'SHOPIFY_WC_CONNECT_VERSION', 1.1 );
     32define( 'SHOPIFY_WC_CONNECT_VERSION', 1.2 );
    3333
    3434function shopify_wc_connect_init() {
    … …  
    111111    // if we don't have a site we can use, then hide menus (in inc/wc-hooks.php) instead
    112112    $shopify_site = get_option( 'secp_shop', false );
    113     if ( ! $shopify_site || false !== strpos( $shopify_site, 'embeds.shopify.com' ) ) {
     113    if ( ! $shopify_site || false !== strpos( $shopify_site, 'embeds.shopify.com' ) || false !== strpos( $shopify_site, 'embeds.myshopify.com' ) ) {
    114114        return;
    115115    }
Note: See TracChangeset for help on using the changeset viewer.