WordPress.org
Get WordPress

Plugin Directory

Changeset 1293858


Ignore:
Timestamp:
11/24/2015 11:56:53 PM (10 years ago)
Author:
sparkweb
Message:

4.7.1 Update

Location:
foxyshop
Files:
145 added
5 edited

Legend:

Unmodified
Added
Removed

  • foxyshop/trunk/foxyshop.php

    r1266209 r1293858  
    66Description: FoxyShop is a full integration for FoxyCart and WordPress, providing a robust shopping cart and inventory management tool.
    77Author: SparkWeb Interactive, Inc.
    8 Version: 4.7
     8Version: 4.7.1
    99Author URI: http://www.foxy-shop.com/
    1010
    … …  
    3939
    4040//Setup Plugin Variables
    41 define('FOXYSHOP_VERSION', "4.7");
     41define('FOXYSHOP_VERSION', "4.7.1");
    4242define('FOXYSHOP_DIR', (is_ssl() ? str_replace("http://", "https://", WP_PLUGIN_URL) : WP_PLUGIN_URL) . "/foxyshop");
    4343define('FOXYSHOP_PATH', dirname(__FILE__));

  • foxyshop/trunk/js/dropzone.js

    r1266213 r1293858  
    17481748  };
    17491749
    1750   contentLoaded(window, Dropzone._autoDiscoverFunction);
     1750  //FoxyShop Disabled
     1751  //contentLoaded(window, Dropzone._autoDiscoverFunction);
    17511752
    17521753}).call(this);

  • foxyshop/trunk/js/products-admin.js

    r1266213 r1293858  
    516516    });
    517517
    518     Dropzone.autoDiscover = false;
    519     $("#foxyshop_new_product_image_container").dropzone({
    520         url: bloginfo_url + FOXYSHOP_URL_BASE + '/upload-' + datafeed_url_key + '/?foxyshop_product_id=' + post_id,
    521         createImageThumbnails: false,
    522         acceptedFiles: "image/*,*.pdf,*.doc,*.docx,*.odt,*.xmls,*.xlsx,*.txt,*.tif,*.psd,*.mp3",
    523         dictDefaultMessage: 'Drop Images Here To Upload',
    524         init: function() {
    525             this.on("success", function(file) {
    526                 var data = {
    527                     'action': 'foxyshop_product_ajax_action',
    528                     'security': nonce_images,
    529                     'foxyshop_product_id': post_id,
    530                     'foxyshop_action': 'add_new_image'
    531                 };
    532 
    533                 $("#foxyshop_image_waiter").show();
    534                 $.post(ajaxurl, data, function(response) {
    535                     $("#foxyshop_product_image_list").html(response)
    536                     $("#foxyshop_image_waiter").hide();
    537                     $(".dz-complete").delay(3000).fadeOut(400, function() {
    538                         $(".dropzone.dz-started").removeClass("dz-started");
     518    if (jQuery().dropzone) {
     519        $("#foxyshop_new_product_image_container").dropzone({
     520            url: bloginfo_url + FOXYSHOP_URL_BASE + '/upload-' + datafeed_url_key + '/?foxyshop_product_id=' + post_id,
     521            createImageThumbnails: false,
     522            acceptedFiles: "image/*,*.pdf,*.doc,*.docx,*.odt,*.xmls,*.xlsx,*.txt,*.tif,*.psd,*.mp3",
     523            dictDefaultMessage: 'Drop Images Here To Upload',
     524            init: function() {
     525                this.on("success", function(file) {
     526                    var data = {
     527                        'action': 'foxyshop_product_ajax_action',
     528                        'security': nonce_images,
     529                        'foxyshop_product_id': post_id,
     530                        'foxyshop_action': 'add_new_image'
     531                    };
     532
     533                    $("#foxyshop_image_waiter").show();
     534                    $.post(ajaxurl, data, function(response) {
     535                        $("#foxyshop_product_image_list").html(response)
     536                        $("#foxyshop_image_waiter").hide();
     537                        $(".dz-complete").delay(3000).fadeOut(400, function() {
     538                            $(".dropzone.dz-started").removeClass("dz-started");
     539                        });
    539540                    });
    540541                });
    541             });
    542         }
    543     });
     542            }
     543        });
     544    }
    544545
    545546    $("#foxyshop_product_image_list").sortable({

  • foxyshop/trunk/readme.txt

    r1266685 r1293858  
    44Tags: foxycart, shopping, cart, inventory, management, ecommerce, selling, subscription, foxy
    55Requires at least: 3.1
    6 Tested up to: 4.3.1
    7 Stable tag: 4.7
     6Tested up to: 4.4
     7Stable tag: 4.7.1
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    1212== Description ==
    1313
    14 FoxyShop is a complete shopping cart solution for WordPress. This plugin connects to [FoxyCart's]((http://affiliate.foxycart.com/idevaffiliate.php?id=211)) hosted shopping cart service and will allow you to manage your inventory from a WordPress backend. FoxyShop was built to make the integration of FoxyCart and WordPress a breeze. Products are easy to manage and the flexible templates make it easy for developers to quickly build their storefront. The FoxyShop plugin is exhaustively documented, actively maintained, and completely free. And it's foxy, too.
     14FoxyShop is a complete shopping cart solution for WordPress. This plugin connects to [FoxyCart's]((https://affiliate.foxycart.com/idevaffiliate.php?id=211)) hosted shopping cart service and will allow you to manage your inventory from a WordPress backend. FoxyShop was built to make the integration of FoxyCart and WordPress a breeze. Products are easy to manage and the flexible templates make it easy for developers to quickly build their storefront. The FoxyShop plugin is exhaustively documented, actively maintained, and completely free. And it's foxy, too.
    1515
    1616Visit [foxy-shop.com](http://www.foxy-shop.com/) for full documentation and instructions.
    … …  
    3535* Internationalization support
    3636* Field validation to prevent form tampering
    37 * Lots more... [See Complete Feature List!](http://www.foxy-shop.com/foxyshop-features/)
     37* Much more... [See Complete Feature List!](http://www.foxy-shop.com/foxyshop-features/)
    3838
    3939= Translations Available =
    4040* Norwegian (Kenneth from [KKTrends](http://kktrend.no/))
    41 * German (Andrei from [PixelDarkroom](http://www.pixeldarkroom.com/))
     41* German (Andrei from PixelDarkroom)
    4242
    4343
    … …  
    6868
    6969== Changelog ==
     70
     71= 4.7.1 =
     72* Remove Dropzone autodiscover to avoid potentials JavaScript errors
     73* Exported order lists now subtract future line items from the total
     74* WordPress 4.4 support
    7075
    7176= 4.7 =
    … …  
    220225== Upgrade Notice ==
    221226
    222 = 4.7 =
    223 FoxyShop Image Upload Updates. NOTE: If you are currently using the product variation image upload feature for your cart (or a front-end datepicker), please read our upgrade notes before updating.
     227= 4.7.1 =
     228Permanently Disabling Dropzone Autodiscover

  • foxyshop/trunk/shippingintegration.php

    r622250 r1293858  
    332332
    333333        $product_total = 0;
     334        $future_product_total = 0;
    334335        foreach($transaction->transaction_details->transaction_detail as $transaction_detail) {
    335336            $product_price = (double)$transaction_detail->product_price;
    … …  
    338339            }
    339340            $product_total += $product_price * (int)$transaction_detail->product_quantity;
     341            if ($transaction_detail->is_future_line_item) {
     342                $future_product_total += $product_price * (int)$transaction_detail->product_quantity;
     343            }
    340344        }
    341345
    342346        $shipping_total = (double)$transaction->shipping_total;
    343         $order_total = $product_total + $shipping_total + $discount_total + $tax_total;
     347        $order_total = $product_total + $shipping_total + $discount_total + $tax_total - $future_product_total;
    344348
    345349
Note: See TracChangeset for help on using the changeset viewer.