Changeset 865739

Timestamp:

02/26/2014 10:00:04 PM (12 years ago)

Author:

jond

Message:

Added 1.3.2 release

Location:

shopp/trunk

Files:

• Shopp.php (modified) (3 diffs)
• api/collection.php (modified) (3 diffs)
• api/core.php (modified) (2 diffs)
• api/theme/cart.php (modified) (4 diffs)
• api/theme/cartitem.php (modified) (1 diff)
• api/theme/checkout.php (modified) (1 diff)
• api/theme/collection.php (modified) (3 diffs)
• api/theme/customer.php (modified) (1 diff)
• api/theme/product.php (modified) (15 diffs)
• api/theme/purchase.php (modified) (1 diff)
• api/theme/storefront.php (modified) (8 diffs)
• core/flow/Admin.php (modified) (1 diff)
• core/flow/Ajax.php (modified) (1 diff)
• core/flow/Checkout.php (modified) (3 diffs)
• core/flow/Dashboard.php (modified) (2 diffs)
• core/flow/Discounter.php (modified) (2 diffs)
• core/flow/Install.php (modified) (14 diffs)
• core/flow/Order.php (modified) (7 diffs)
• core/flow/Pages.php (modified) (5 diffs)
• core/flow/Registration.php (modified) (4 diffs)
• core/flow/Report.php (modified) (7 diffs)
• core/flow/Resources.php (modified) (2 diffs)
• core/flow/Setup.php (modified) (6 diffs)
• core/flow/Storefront.php (modified) (1 diff)
• core/flow/System.php (modified) (6 diffs)
• core/flow/Warehouse.php (modified) (6 diffs)
• core/library/Core.php (modified) (3 diffs)
• core/library/DB.php (modified) (1 diff)
• core/library/Email.php (modified) (1 diff)
• core/library/Loader.php (modified) (1 diff)
• core/library/Lookup.php (modified) (1 diff)
• core/library/Shopp.php (added)
• core/library/Support.php (modified) (5 diffs)
• core/library/Version.php (modified) (2 diffs)
• core/model/Asset.php (modified) (7 diffs)
• core/model/Cart.php (modified) (5 diffs)
• core/model/Collection.php (modified) (4 diffs)
• core/model/Customer.php (modified) (5 diffs)
• core/model/Discounts.php (modified) (13 diffs)
• core/model/Gateway.php (modified) (2 diffs)
• core/model/Item.php (modified) (7 diffs)
• core/model/Meta.php (modified) (2 diffs)
• core/model/Payments.php (modified) (1 diff)
• core/model/Product.php (modified) (12 diffs)
• core/model/Promotion.php (modified) (3 diffs)
• core/model/Purchase.php (modified) (6 diffs)
• core/model/Settings.php (modified) (17 diffs)
• core/model/Shiprates.php (modified) (3 diffs)
• core/model/Tax.php (modified) (3 diffs)
• core/schema (added)
• core/schema/schema-110.sql (added)
• core/schema/schema-120.sql (added)
• core/schema/schema.sql (added)
• core/ui/behaviors/catalog.js (modified) (1 diff)
• core/ui/behaviors/priceline.js (modified) (1 diff)
• core/ui/behaviors/priceline.min.js (modified) (1 diff)
• core/ui/categories/category.js (modified) (3 diffs)
• core/ui/categories/category.min.js (modified) (1 diff)
• core/ui/orders/order.php (modified) (4 diffs)
• core/ui/orders/orders.php (modified) (3 diffs)
• core/ui/reports/products.php (modified) (1 diff)
• core/ui/reports/reports.php (modified) (1 diff)
• core/ui/settings/setup.php (modified) (1 diff)
• core/ui/styles/admin.css (modified) (2 diffs)
• core/ui/styles/dashboard.css (modified) (1 diff)
• gateways/PayPal/PayPalStandard.php (modified) (8 diffs)
• license.txt (modified) (5 diffs)
• readme.txt (modified) (5 diffs)
• services/image.php (modified) (1 diff)
• storage/core/FSStorage.php (modified) (3 diffs)
• templates/email-order.php (modified) (1 diff)
• templates/sidecart.php (modified) (1 diff)
• templates/thanks.php (modified) (1 diff)

shopp/trunk/Shopp.php

@@ -4 +4 @@
  * Plugin URI: http://shopplugin.com
  * Description: An ecommerce framework for WordPress.
- * Version: 1.3.1
+ * Version: 1.3.2
  * Author: Ingenesis Limited
  * Author URI: http://ingenesis.net
@@ -10 +10 @@
  * Tested up to: 3.5.2
  *
- *    Portions created by Ingenesis Limited are Copyright © 2008-2013 by Ingenesis Limited
+ *    Portions created by Ingenesis Limited are Copyright © 2008-2014 by Ingenesis Limited
  *
  *    This file is part of Shopp.
@@ -29 +29 @@
  **/
 
-defined( 'WPINC' ) || header( 'HTTP/1.1 403' ) & exit; // Prevent direct access
+// Prevent direct access
+defined( 'WPINC' ) || header( 'HTTP/1.1 403' ) & exit;
 
+// Start the bootloader
 require 'core/library/Loader.php';
 
-/**
- * Shopp core plugin management class
- *
- * @author Jonathan Davis
- * @since 1.0
- * @version 1.3
- * @package shopp
- **/
-class Shopp extends ShoppCore {
-
-    private static $object = false;
-
-    private function __construct () {
-
-        $this->paths();             // Determine Shopp paths
-        $this->constants();         // Setup Shopp constants
-        $this->textdomain();        // Load the translation file
-
-        // Load the Developer API
-        ShoppDeveloperAPI::load( SHOPP_PATH );
-
-        // Initialize error system
-        ShoppErrors();
-
-        // Initialize application control processing
-        $this->Flow = new ShoppFlow();
-
-        // Init deprecated properties for legacy add-on module compatibility
-        $this->Shopping = ShoppShopping();
-        $this->Settings = ShoppSettings();
-
-        // Hooks
-        add_action('init', array($this, 'init'));
-
-        // Core WP integration
-        add_action('shopp_init', array($this, 'pages'));
-        add_action('shopp_init', array($this, 'collections'));
-        add_action('shopp_init', array($this, 'taxonomies'));
-        add_action('shopp_init', array($this, 'products'), 99);
-        add_action('shopp_init', array($this, 'rebuild'), 99);
-
-        add_filter('rewrite_rules_array', array($this, 'rewrites'));
-        add_filter('query_vars', array($this, 'queryvars'));
-
-        // Theme integration
-        add_action('widgets_init', array($this, 'widgets'));
-
-    }
-
-    /**
-     * Singleton accessor method
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return Shopp Provides the running Shopp object
-     **/
-    public static function object () {
-        if ( ! self::$object instanceof self )
-            self::$object = new self;
-        return self::$object;
-    }
-
-    /**
-     * Boot up the core plugin
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return void
-     **/
-    public static function plugin () {
-        global $Shopp; // Provide global for backwards compatibility
-        $Shopp = Shopp::object();
-        do_action('shopp_loaded');
-    }
-
-    /**
-     * Initializes the Shopp runtime environment
-     *
-     * @author Jonathan Davis
-     * @since 1.0
-     *
-     * @return void
-     **/
-    public function init () {
-
-        $this->Collections = array();
-        $this->Order = new ShoppOrder();
-        $this->Gateways = new GatewayModules();
-        $this->Shipping = new ShippingModules();
-        $this->Storage = new StorageEngines();
-        $this->APIs = new ShoppAPIModules();
-
-        new ShoppLogin();
-        do_action('shopp_init');
-    }
-
-    /**
-     * Setup configurable constants
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return void
-     **/
-    public function constants () {
-        if ( ! defined('SHOPP_VERSION') )               define( 'SHOPP_VERSION', ShoppVersion::release() );
-        if ( ! defined('SHOPP_GATEWAY_USERAGENT') )     define( 'SHOPP_GATEWAY_USERAGENT', ShoppVersion::agent() );
-
-        // @deprecated
-        if ( ! defined('SHOPP_HOME') )                  define( 'SHOPP_HOME', ShoppSupport::HOMEPAGE );
-        if ( ! defined('SHOPP_CUSTOMERS') )             define( 'SHOPP_CUSTOMERS', ShoppSupport::FORUMS);
-        if ( ! defined('SHOPP_DOCS') )                  define( 'SHOPP_DOCS', ShoppSupport::DOCS );
-
-        // Helper for line break output
-        if ( ! defined('BR') )                          define('BR', '<br />');
-
-        // Overrideable config macros
-        if ( ! defined('SHOPP_NOSSL') )                 define('SHOPP_NOSSL', false);                   // Require SSL to protect transactions, overrideable for development
-        if ( ! defined('SHOPP_PREPAYMENT_DOWNLOADS') )  define('SHOPP_PREPAYMENT_DOWNLOADS', false);    // Require payment capture granting access to downloads
-        if ( ! defined('SHOPP_SESSION_TIMEOUT') )       define('SHOPP_SESSION_TIMEOUT', 172800);        // Sessions live for 2 days
-        if ( ! defined('SHOPP_CART_EXPIRES') )          define('SHOPP_CART_EXPIRES', 1209600);          // Carts are stashed for up to 2 weeks
-        if ( ! defined('SHOPP_QUERY_DEBUG') )           define('SHOPP_QUERY_DEBUG', false);             // Debugging queries is disabled by default
-        if ( ! defined('SHOPP_GATEWAY_TIMEOUT') )       define('SHOPP_GATEWAY_TIMEOUT', 10);            // Gateway connections timeout after 10 seconds
-        if ( ! defined('SHOPP_SHIPPING_TIMEOUT') )      define('SHOPP_SHIPPING_TIMEOUT', 10);           // Shipping provider connections timeout after 10 seconds
-        if ( ! defined('SHOPP_TEMP_PATH') )             define('SHOPP_TEMP_PATH', sys_get_temp_dir());  // Use the system defined temporary directory
-        if ( ! defined('SHOPP_ADDONS') )                define('SHOPP_ADDONS', WP_CONTENT_DIR . '/shopp-addons');   // A configurable directory to keep Shopp addons
-        if ( ! defined('SHOPP_NAMESPACE_TAXONOMIES') )  define('SHOPP_NAMESPACE_TAXONOMIES', true);     // Add taxonomy namespacing for permalinks /shop/category/category-name, /shopp/tag/tag-name
-
-    }
-
-    /**
-     * Setup path related constants
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return void
-     **/
-    public function paths () {
-
-        $path = sanitize_path(dirname(__FILE__));
-        $file = basename(__FILE__);
-        $directory = basename($path);
-
-        // Paths
-        define('SHOPP_PATH', $path );
-        define('SHOPP_DIR', $directory );
-        define('SHOPP_PLUGINFILE', "$directory/$file" );
-        define('SHOPP_PLUGINURI', set_url_scheme(WP_PLUGIN_URL . "/$directory") );
-
-        define('SHOPP_ADMIN_DIR', '/core/ui');
-        define('SHOPP_ADMIN_PATH', SHOPP_PATH . SHOPP_ADMIN_DIR);
-        define('SHOPP_ADMIN_URI',  SHOPP_PLUGINURI . SHOPP_ADMIN_DIR);
-        define('SHOPP_ICONS_URI',  SHOPP_ADMIN_URI . '/icons');
-        define('SHOPP_FLOW_PATH',  SHOPP_PATH . '/core/flow');
-        define('SHOPP_MODEL_PATH', SHOPP_PATH . '/core/model');
-        define('SHOPP_GATEWAYS',   SHOPP_PATH . '/gateways');
-        define('SHOPP_SHIPPING',   SHOPP_PATH . '/shipping');
-        define('SHOPP_STORAGE',    SHOPP_PATH . '/storage');
-        define('SHOPP_THEME_APIS', SHOPP_PATH . '/api/theme');
-        define('SHOPP_DBSCHEMA',   SHOPP_MODEL_PATH . '/schema.sql');
-
-    }
-
-    /**
-     * Load the text domain translation file
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     * @uses SHOPP_LANG_DIR
-     * @uses SHOPP_ADDONS
-     * @uses SHOPP_DIR
-     *
-     * @return void
-     **/
-    public function textdomain () {
-
-        if ( ! defined('SHOPP_LANG_DIR') )  // Add configurable path for language files
-            define('SHOPP_LANG_DIR', ( is_dir(SHOPP_ADDONS . '/languages') ? SHOPP_ADDONS . '/languages' : SHOPP_DIR . '/lang' ) );
-
-        load_textdomain(__CLASS__, SHOPP_LANG_DIR . '/' . __CLASS__ . '-' . get_locale() . '.mo');
-
-    }
-
-    /**
-     * Sets up permalink handling for ShoppStorefront pages
-     *
-     * @author Jonathan Davis
-     * @since 1.2
-     *
-     * @return void
-     **/
-    public function pages () {
-
-        shopp_register_page( 'ShoppCatalogPage' );
-        shopp_register_page( 'ShoppAccountPage' );
-        shopp_register_page( 'ShoppCartPage' );
-        shopp_register_page( 'ShoppCheckoutPage' );
-        shopp_register_page( 'ShoppConfirmPage' );
-        shopp_register_page( 'ShoppThanksPage' );
-
-        do_action( 'shopp_init_storefront_pages' );
-
-    }
-
-    /**
-     * Register smart collections
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return void
-     **/
-    public function collections () {
-
-        shopp_register_collection( 'CatalogProducts' );
-        shopp_register_collection( 'NewProducts' );
-        shopp_register_collection( 'FeaturedProducts' );
-        shopp_register_collection( 'OnSaleProducts' );
-        shopp_register_collection( 'BestsellerProducts' );
-        shopp_register_collection( 'SearchResults' );
-        shopp_register_collection( 'MixProducts' );
-        shopp_register_collection( 'TagProducts' );
-        shopp_register_collection( 'RelatedProducts' );
-        shopp_register_collection( 'AlsoBoughtProducts' );
-        shopp_register_collection( 'ViewedProducts' );
-        shopp_register_collection( 'RandomProducts' );
-        shopp_register_collection( 'PromoProducts' );
-
-    }
-
-    /**
-     * Register custom taxonomies
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return void
-     **/
-    public function taxonomies () {
-        ProductTaxonomy::register( 'ProductCategory' );
-        ProductTaxonomy::register( 'ProductTag' );
-    }
-
-    /**
-     * Register the product custom post type
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return void
-     **/
-    public function products () {
-        WPShoppObject::register( 'ShoppProduct', ShoppPages()->baseslug() );
-    }
-
-    /**
-     * Registers theme widgets
-     *
-     * @author Jonathan Davis
-     * @since 1.0
-     * @version 1.3
-     *
-     * @return void
-     **/
-    public function widgets () {
-
-        register_widget( 'ShoppAccountWidget' );
-        register_widget( 'ShoppCartWidget' );
-        register_widget( 'ShoppCategoriesWidget' );
-        register_widget( 'ShoppFacetedMenuWidget' );
-        register_widget( 'ShoppProductWidget' );
-        register_widget( 'ShoppSearchWidget' );
-        register_widget( 'ShoppCategorySectionWidget' );
-        register_widget( 'ShoppShoppersWidget' );
-        register_widget( 'ShoppTagCloudWidget' );
-
-    }
-
-    /**
-     * Adds Shopp-specific mod_rewrite rule for low-resource, speedy image server and downloads request handler
-     *
-     * @author Jonathan Davis
-     * @since 1.0
-     *
-     * @param array $wp_rewrite_rules An array of existing WordPress rewrite rules
-     * @return array Rewrite rules
-     **/
-    public function rewrites ($wp_rewrite_rules) {
-        global $is_IIS;
-        $structure = get_option('permalink_structure');
-        if ( '' == $structure ) return $wp_rewrite_rules;
-
-        $path = str_replace('%2F', '/', urlencode(join('/', array(PLUGINDIR, SHOPP_DIR, 'services'))));
-
-        // Download URL rewrites
-        $AccountPage = ShoppPages()->get('account');
-        $downloads = array( ShoppPages()->baseslug(), $AccountPage->slug(), 'download', '([a-f0-9]{40})', '?$' );
-        if ( $is_IIS && 0 === strpos($structure, '/index.php/') ) array_unshift($downloads, 'index.php');
-        $rules = array( join('/', $downloads)
-                => 'index.php?src=download&shopp_download=$matches[1]',
-        );
-
-        // Image URL rewrite
-        $images = array( ShoppPages()->baseslug(), 'images', '(\d+)', "?\??(.*)$" );
-        add_rewrite_rule(join('/', $images), $path . '/image.php?siid=$1&$2');
-
-        return $rules + (array) $wp_rewrite_rules;
-    }
-
-    /**
-     * Force rebuilding rewrite rules when necessary
-     *
-     * @author Jonathan Davis
-     * @since 1.2
-     *
-     * @return void
-     **/
-    public function rebuild () {
-        if ( ! shopp_setting_enabled('rebuild_rewrites') ) return;
-
-        flush_rewrite_rules();
-        shopp_set_setting('rebuild_rewrites', 'off');
-    }
-
-    /**
-     * Registers the query variables used by Shopp
-     *
-     * @author Jonathan Davis
-     * @since 1.0
-     * @version 1.2
-     *
-     * @param array $vars The current list of handled WordPress query vars
-     * @return array Augmented list of query vars including Shopp vars
-     **/
-    public function queryvars ($vars) {
-
-        $vars[] = 's_iid';          // Shopp image id
-        $vars[] = 's_cs';           // Catalog (search) flag
-        $vars[] = 's_ff';           // Category filters
-        $vars[] = 'src';            // Shopp resource
-        $vars[] = 'shopp_page';
-        $vars[] = 'shopp_download';
-
-        return $vars;
-    }
-
-    /**
-     * Handles request services like the image server and script server
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return boolean The service load status
-     **/
-    public static function services () {
-        if ( WP_DEBUG ) define('SHOPP_MEMORY_PROFILE_BEFORE', memory_get_peak_usage(true) );
-
-        // Image Server request handling
-        if ( isset($_GET['siid']) || 1 == preg_match('{^/.+?/images/\d+/.*$}', $_SERVER['REQUEST_URI']) )
-            return require 'services/image.php';
-
-        // Script Server request handling
-        if ( isset($_GET['sjsl']) )
-            return require 'services/scripts.php';
-    }
-
-    // Deprecated properties
-
-    public $Settings;       // @deprecated Shopp settings registry
-    public $Flow;           // @deprecated Controller routing
-    public $Catalog;        // @deprecated The main catalog
-    public $Category;       // @deprecated Current category
-    public $Product;        // @deprecated Current product
-    public $Purchase;       // @deprecated Currently requested order receipt
-    public $Shopping;       // @deprecated The shopping session
-    public $Errors;         // @deprecated Error system
-    public $Order;          // @deprecated The current session Order
-    public $Promotions;     // @deprecated Active promotions registry
-    public $Collections;    // @deprecated Collections registry
-    public $Gateways;       // @deprecated Gateway modules
-    public $Shipping;       // @deprecated Shipping modules
-    public $APIs;           // @deprecated Loaded API modules
-    public $Storage;        // @deprecated Storage engine modules
-
-} // END class Shopp
-
-if ( Shopp::services() || Shopp::unsupported() ) return; // Prevent loading the plugin
+// Prevent loading the plugin in special circumstances
+if ( Shopp::services() || Shopp::unsupported() ) return;
 
 /* Start the core */

shopp/trunk/api/collection.php

@@ -41 +41 @@
     $slugs = SmartCollection::slugs($name);
 
-    add_rewrite_tag( "%$permastruct%", "$namespace/([^/]+)" );
-    add_permastruct( $permastruct, ShoppPages()->baseslug() . '/%shopp_collection%', false );
+    add_rewrite_tag( "%$permastruct%", "([^/]+)" );
+    add_permastruct( $permastruct, ShoppPages()->baseslug() . "/$namespace/%shopp_collection%", false );
 
     add_filter( $permastruct . '_rewrite_rules', array('ProductCollection', 'pagerewrites') );
@@ -56 +56 @@
         add_filter( 'shopp_themeapi_storefront_' . $collection . 'collection', $apicall, 10, 3 );
     }
+
+    // Add special default permalink handling for collection URLs (only add it once)
+    global $wp_rewrite;
+    if ( ! $wp_rewrite->using_permalinks() && false === has_filter('term_link', array('SmartCollection', 'defaultlinks')) )
+        add_filter('term_link', array('SmartCollection', 'defaultlinks'), 10, 3);
 
 }
@@ -77 +82 @@
 
     $args['rewrite']['slug'] = SHOPP_NAMESPACE_TAXONOMIES ? ShoppPages()->baseslug().'/'.$rewrite_slug : $rewrite_slug;
-    register_taxonomy($taxonomy,ShoppProduct::$posttype,$args);
+    register_taxonomy($taxonomy, ShoppProduct::$posttype,$args);
 }
 

shopp/trunk/api/core.php

@@ -193 +193 @@
 
 /**
- * Determines if the requested page is the catalog front page.
+ * Determines if the requested page is the storefront catalog page
  *
  * @author Jonathan Davis
@@ -393 +393 @@
     if ( false === $wp_query ) { global $wp_the_query; $wp_query = $wp_the_query; }
 
+    if ( empty($wp_query->tax_query) ) return false; // No taxonomy request {@see #2748}
+
     $object = $wp_query->get_queried_object();
+
     $taxonomies = get_object_taxonomies(ShoppProduct::$posttype, 'names');
 

shopp/trunk/api/theme/cart.php

@@ -119 +119 @@
     public static function applycode ( $result, $options, $O ) {
 
-        $submit_attrs = array('title', 'value', 'disabled', 'tabindex', 'accesskey', 'class');
+        $submit_attrs = array( 'title', 'value', 'disabled', 'tabindex', 'accesskey', 'class', 'autocomplete', 'placeholder', 'required' );
 
         // Skip if discounts are not available
@@ -149 +149 @@
     public static function applygiftcard ( $result, $options, $O ) {
 
-        $submit_attrs = array('title', 'value', 'disabled', 'tabindex', 'accesskey', 'class');
+        $submit_attrs = array( 'title', 'value', 'disabled', 'tabindex', 'accesskey', 'class', 'autocomplete', 'placeholder', 'required' );
 
         if ( ! isset($options['value']) ) $options['value'] = Shopp::__('Add Gift Card');
@@ -267 +267 @@
 
     public static function empty_button ( $result, $options, $O ) {
-        $submit_attrs = array('title', 'value', 'disabled', 'tabindex', 'accesskey', 'class');
+        $submit_attrs = array( 'title', 'value', 'disabled', 'tabindex', 'accesskey', 'class', 'autocomplete', 'placeholder', 'required' );
         if ( ! isset($options['value']) ) $options['value'] = __('Empty Cart', 'Shopp');
         return '<input type="submit" name="empty" id="empty-button" ' . inputattrs($options,$submit_attrs) . ' />';
@@ -467 +467 @@
 
     public static function update_button ( $result, $options, $O ) {
-        $submit_attrs = array('title', 'value', 'disabled', 'tabindex', 'accesskey', 'class');
+        $submit_attrs = array( 'title', 'value', 'disabled', 'tabindex', 'accesskey', 'class', 'autocomplete', 'placeholder', 'required' );
         if ( ! isset($options['value']) ) $options['value'] = __('Update Subtotal', 'Shopp');
         if ( isset($options['class']) ) $options['class'] .= ' update-button';

shopp/trunk/api/theme/cartitem.php

@@ -121 +121 @@
     public static function product ( $result, $options, $O ) {
         if ( isset($options['priceline']) && Shopp::str_true($options['priceline']) )
-            return $O->$priceline;
+            return $O->priceline;
         return $O->product;
     }

shopp/trunk/api/theme/checkout.php

@@ -486 +486 @@
         /// Allowable attributes for textarea inputs
         $textarea_attrs = array('accesskey', 'title', 'tabindex', 'class', 'disabled', 'required');
-        $select_attrs = array('title', 'required', 'class', 'disabled', 'required', 'size', 'tabindex', 'accesskey');
+        $select_attrs = array( 'title', 'required', 'class', 'disabled', 'required', 'size', 'tabindex', 'accesskey', 'placeholder' );
 
         if ( ! $name ) {// Iterator for customer info fields

shopp/trunk/api/theme/collection.php

@@ -390 +390 @@
 
     public static function has_images ( $result, $options, $O ) {
+
         if ( ! is_a($O, 'ProductCategory') ) return false;
-        if ( empty($O->images) ) $O->load_images();
-        reset($O->images);
-        if ( empty($O->images) ) return false;
-        return true;
+
+        if ( empty($O->images) ) {
+            $O->load_images();
+            reset($O->images);
+        }
+
+        return ( ! empty($O->images) );
+
     }
 
@@ -412 +417 @@
      **/
     public static function image ( $result, $options, $O ) {
-        if (!self::has_images( $result, $options, $O )) return '';
+        if ( ! self::has_images( $result, $options, $O )) return '';
         return ShoppStorefrontThemeAPI::image( $result, $options, $O );
     }
 
     public static function images ( $result, $options, $O ) {
-        if (!isset($O->_images_loop)) {
+        if ( ! isset($O->_images_loop) ) {
             reset($O->images);
             $O->_images_loop = true;
         } else next($O->images);
 
-        if (current($O->images) !== false) return true;
+        if ( current($O->images) !== false ) return true;
         else {
             unset($O->_images_loop);
@@ -669 +674 @@
 
     public static function url ( $result, $options, $O ) {
-        global $wp_rewrite;
-
-        $namespace = get_class_property( get_class($O) ,'namespace');
-        $prettyurls = $wp_rewrite->using_permalinks();
-
-        $url = Shopp::url( $prettyurls ? "$namespace/$O->slug" : array($O->taxonomy => $O->slug), false );
+        $url = get_term_link($O);
         if ( isset($options['page']) ) $url = $O->pagelink((int)$options['page']);
         return $url;

shopp/trunk/api/theme/customer.php

@@ -220 +220 @@
         if ( array_key_exists('filetype', $options) ) $string .= $download->mime;
         if ( array_key_exists('size', $options) ) $string .= readableFileSize($download->size);
-        if ( array_key_exists('date', $options) ) $string .= _d($df, mktimestamp($download->created));
+        if ( array_key_exists('date', $options) ) $string .= _d($df, $download->created);
         if ( array_key_exists('url', $options) )
             $string .= Shopp::url( ('' == get_option('permalink_structure') ?

shopp/trunk/api/theme/product.php

@@ -140 +140 @@
             'discounts' => 'on',
             'taxes' => null,
-            'input' => null
+            'input' => null,
+            'money' => 'on',
+            'number' => 'off'
         );
         $options = array_merge($defaults, $options);
@@ -160 +162 @@
         if ( array_key_exists('sku', $options) )        $_[] = $addon->sku;
 
-        if ( array_key_exists('price', $options) )
-            $_[] = money(self::_taxed((float)$addon->price, $O, $addon->tax, $taxes));
+        if ( array_key_exists('price', $options) ) {
+            $price = Shopp::roundprice(self::_taxed((float)$addon->price, $O, $addon->tax, $taxes));
+            if ( Shopp::str_true($money) ) $_[] = Shopp::money($price);
+            else $_[] = $price;
+        }
 
         if ( array_key_exists('saleprice', $options) ) {
-            if ( Shopp::str_true($discounts) )
-                $_[] = money(self::_taxed((float)$addon->promoprice, $O, $addon->tax, $taxes));
-            else $_[] = money(self::_taxed((float)$addon->saleprice, $O, $addon->tax, $taxes));
+            $saleprice = Shopp::str_true($discounts) ? $addon->promoprice : $addon->saleprice;
+            $saleprice = Shopp::roundprice( self::_taxed((float)$addon->promoprice, $O, $addon->tax, $taxes) );
+            if ( Shopp::str_true($money) ) $_[] = Shopp::money($saleprice);
+            else $_[] = $saleprice;
         }
 
@@ -172 +178 @@
         if ( array_key_exists('weight', $options) )
             $_[] = round($addon->weight, 3) . (false !== $weightunit ? " $weightunit" : false);
-        if ( array_key_exists('shipfee', $options) )
-            $_[] = money(Shopp::floatval($addon->shipfee));
+
+        if ( array_key_exists('shipfee', $options) ) {
+            $shipfee = Shopp::roundprice($addon->shipfee);
+            if ( Shopp::str_true($money) ) $_[] = Shopp::money($shipfee);
+            else $_[] = $shipfee;
+        }
+
         if ( array_key_exists('sale', $options) )
             return Shopp::str_true($addon->sale);
@@ -425 +436 @@
         unset($options['id']);
         $options['index'] = 0;
+        $options['load'] = 'coverimages';
         return self::image( $result, $options, $O );
     }
@@ -503 +515 @@
 
         // Populate defaults from named settings, if provided
-        $ImageSettings = ImageSettings::__instance();
+        $ImageSettings = ImageSettings::object();
 
         if ( ! empty($options['p_setting']) ) {
@@ -551 +563 @@
         // Setup preview images
         $previews = '';
+
+        if ( 'transparent' == strtolower($p_bg) ) $fill = -1;
+        else $fill = $p_bg ? hexdec(ltrim($p_bg, '#')) : false;
+
+        $lowest_quality = min(ImageSetting::$qualities);
+
+        $scale = $p_fit ? array_search($p_fit, ImageAsset::$defaults['scaling']) : false;
+        $sharpen = $p_sharpen ? max($p_sharpen, ImageAsset::$defaults['sharpen']) : false;
+        $quality = $p_quality ? max($p_quality, $lowest_quality) : false;
+
         foreach ( $O->images as $Image ) {
             $firstPreview = false;
@@ -556 +578 @@
                 $firstPreview = $previews .=
                     '<li class="fill">' .
-                    '<img src="' .  Shopp::clearpng() . '" alt="" style="width: ' . (int) $maxwidth . 'px; height: auto;" />' .
+                    '<img src="' .  Shopp::clearpng() . '" alt="" style="width: ' . (int) $maxwidth . 'px; height: ' . (int) $maxheight . 'px;" />' .
                     '</li>';
             }
-
-            $scale = $p_fit ? array_search($p_fit, ImageAsset::$defaults['scaling']) : false;
-            $sharpen = $p_sharpen ? min($p_sharpen, ImageAsset::$defaults['sharpen']) : false;
-            $quality = $p_quality ? min($p_quality, ImageAsset::$defaults['quality']) : false;
-
-            if ( 'transparent' == strtolower($p_bg) ) $fill = -1;
-            else $fill = $p_bg ? hexdec(ltrim($p_bg, '#')) : false;
 
             $scaled = $Image->scaled($width, $height, $scale);
@@ -575 +590 @@
             $img = '<img src="' . $src . '"' . $titleattr . ' alt="' . $alt . '" width="' . (int) $scaled['width'] . '" height="' . (int) $scaled['height'] . '" />';
 
-
             if ( $p_link ) {
-
                 $hrefattr = $Image->url();
                 $relattr = empty($rel) ? '' : ' rel="' . esc_attr($rel) . '"';
@@ -583 +596 @@
 
                 $img = '<a href="' . $hrefattr . '" class="' . join(' ', $linkclasses) . '"' . $relattr . $titleattr . '>' . $img . '</a>';
-
             }
 
@@ -728 +740 @@
      **/
     public static function image ( $result, $options, $O ) {
-        if ( empty($O->images) ) $O->load_data( array('images') );
+        $loadset = array('images', 'coverimages');
+        if ( empty($options['load']) || ! in_array($options['load'], $loadset) )
+            $options['load'] = $loading[0];
+
+        // Load images if no images are loaded or we're loading all images after the coverimage was loaded
+        if ( empty($O->images) || 'images' == $options['load'] )
+            $O->load_data( array($options['load']) );
+
         return ShoppStorefrontThemeAPI::image( $result, $options, $O );
     }
@@ -807 +826 @@
             if ( isset($options['rows']) ) $rows = ' rows="' . (int)$options['rows'] . '"';
 
-            $result .= '<textarea name="products[' . (int)$O->id . '][data][' . esc_attr($name) . ']" id="'.$id.'"'.$cols.$rows.inputattrs($options).'>'.esc_html($value).'</textarea>';
+            $result = '<textarea name="products[' . (int)$O->id . '][data][' . esc_attr($name) . ']" id="'.$id.'"'.$cols.$rows.inputattrs($options).'>'.esc_html($value).'</textarea>';
 
         } else {
@@ -1136 +1155 @@
 
     public static function summary ( $result, $options, $O ) {
-        return apply_filters('shopp_product_summary',$O->summary);
+        $summary = $O->summary;
+
+        $overflow = isset($options['overflow']) ? esc_html($options['overflow']) : '&hellip;';
+
+        if ( ! empty($options['clip']) && strlen($O->summary) > (int)$options['clip'] )
+            $summary = substr($summary, 0, strpos(wordwrap($summary, (int)$options['clip'], "\b"), "\b")) . $overflow;
+
+        return apply_filters('shopp_product_summary', $summary);
     }
 
@@ -1198 +1224 @@
             'promos' => 'on',
             'discounts' => 'on',
-            'taxes' => null
+            'taxes' => null,
+            'money' => 'on',
+            'number' => 'off'
         );
         $options = array_merge($defaults, $options);
@@ -1214 +1242 @@
         if ( array_key_exists('stock', $options) )  $_[] = $variation->stock;
 
-        if ( array_key_exists('price', $options) )
-            $_[] = money(self::_taxed((float)$variation->price, $O, $variation->tax, $taxes));
+        if ( array_key_exists('price', $options) ) {
+            $price = Shopp::roundprice(self::_taxed((float)$variation->price, $O, $variation->tax, $taxes));
+            if ( Shopp::str_true($money) ) $_[] = money($price);
+            else $_[] = $price;
+        }
 
         if ( array_key_exists('saleprice', $options) ) {
-            if (Shopp::str_true($discounts) ) $_[] = money(self::_taxed((float)$variation->promoprice, $O, $variation->tax, $taxes));
-            else $_[] = money(self::_taxed((float)$variation->saleprice, $O, $variation->tax, $taxes));
+            $saleprice = Shopp::str_true($discounts) ? $variation->promoprice : $variation->saleprice;
+            $saleprice = Shopp::roundprice( self::_taxed((float)$saleprice, $O, $variation->tax, $taxes) );
+            if ( Shopp::str_true($money) ) $_[] = money($saleprice);
+            else $_[] = $saleprice;
         }
 
@@ -1225 +1258 @@
             $_[] = round($variation->weight, 3) . ($weightunit ? " $weightunit" : false);
 
-        if ( array_key_exists('shipfee', $options) )
-            $_[] = money(Shopp::floatval($variation->shipfee));
+        if ( array_key_exists('shipfee', $options) ) {
+            $shipfee = Shopp::roundprice($variation->shipfee);
+            if ( Shopp::str_true($money) ) $_[] = money($shipfee);
+            else $_[] = $shipfee;
+        }
 
         if ( array_key_exists('sale', $options) )

shopp/trunk/api/theme/purchase.php

@@ -201 +201 @@
     public static function data ( $result, $options, $O ) {
         if ( ! is_array($O->data) ) return false;
+
         $data = current($O->data);
         $name = key($O->data);
-        if ( isset($options['name']) ) return esc_html($name);
+
+        if ( ! empty($options['name']) ) {
+            if ( isset($O->data[ $options['name'] ]) )
+                $data = $O->data[ $options['name'] ];
+            else $data = false;
+        } elseif ( isset($options['name']) ) return esc_html($name);
+
         return apply_filters('shopp_purchase_order_data', $data);
     }

shopp/trunk/api/theme/storefront.php

@@ -126 +126 @@
         if ( ! empty($options['setting']) ) {
             $setting = $options['setting'];
-            $ImageSettings = ImageSettings::__instance();
+            $ImageSettings = ImageSettings::object();
             $settings = $ImageSettings->get($setting);
             if ( $settings ) $defaults = array_merge($defaults, $settings->options());
@@ -138 +138 @@
             if ( isset($O->images[ $id ]) ) $Image = $O->images[ $id ];
             else {
-                shopp_debug( sprintf('No %s image exists at with the specified database ID of %d.', get_class($O), $id) );
+                shopp_debug( sprintf('No %s image exists with the specified database ID of %d.', get_class($O), $id) );
                 return '';
             }
@@ -401 +401 @@
         $options = array_merge($defaults, $options);
 
-        $options['style'] = 'list';
+        $options['style'] = '';
         if ( Shopp::str_true($options['dropdown']) )
             $options['style'] = 'dropdown';
-        elseif ( ! Shopp::str_true($options['hierarchy']) || ! Shopp::str_true($options['wraplist']) )
-            $options['style'] = '';
+        elseif ( Shopp::str_true($options['hierarchy']) || Shopp::str_true($options['wraplist']) )
+            $options['style'] = 'list';
 
         if ( ! empty($options['showsmart']) && empty($options['smart']) )
@@ -485 +485 @@
             $Collection->slug = $slug;
             $Collection->term_group = 0;
-            $Collection->taxonomy = 'shopp_collection';
+            $Collection->taxonomy = get_class_property('SmartCollection','taxon');
             $Collection->description = '';
             $Collection->parent = 0;
@@ -1177 +1177 @@
         $smartcollection = $category->taxonomy == get_class_property( 'SmartCollection', 'taxon');
 
-        if ( $smartcollection ) {
-            global $wp_rewrite;
-            $termlink = $wp_rewrite->get_extra_permastruct($category->taxonomy);
-            if ( ! empty($termlink) ) $category->slug = get_class_property( 'SmartCollection', 'namespace') . '/' . $category->slug;
-        }
-
         $categoryname = $category->name;
+
         $link = get_term_link($category);
+
         $classes = '';
         if ( 'list' == $args['style'] ) {
             $classes = 'cat-item cat-item-' . $category->term_id;
-            if ( ! empty($current_category) ) {
-                $_current_category = get_term( $current_category, $category->taxonomy );
-                if ( $category->term_id == $current_category )
-                    $classes .=  ' current-cat current';
-                elseif ( $category->term_id == $_current_category->parent )
-                    $classes .=  ' current-cat-parent current-parent';
-            }
-        }
+
+            $Collection = ShoppCollection();
+            if ( isset($Collection->slug) && $Collection->slug == $category->slug)
+                $classes .= ' current-cat current';
+
+            if ( ! empty($Collection->parent) && $Collection->parent == $category->term_id)
+                $classes .= ' current-cat-parent current-parent';
+        }
+
         $total = isset($category->count) ? $category->count : false;
 
@@ -1203 +1200 @@
         extract($filtered, EXTR_OVERWRITE);
 
-        $link = '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $title ) . '"';
+        $link = '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $title ) . '" class="' . $classes . '"';
         $link .= '>';
         $link .= $categoryname . '</a>';
@@ -1215 +1212 @@
         if ( 'list' == $args['style'] ) {
             $output .= "\t<li";
-            if ( ! empty($class) ) $output .=  ' class="' . $class . '"';
+            if ( ! empty($classes) ) $output .=  ' class="' . $classes . '"';
             $output .= ">$link\n";
         } else {
@@ -1268 +1265 @@
         $pad = str_repeat('&nbsp;', $depth * 3);
 
+        $link = get_term_link($category);
+
         $cat_name = apply_filters('shopp_storefront_categorylist_option', $category->name, $category);
-        $output .= "\t<option class=\"level-$depth\" value=\"".$category->slug."\"";
+        $output .= "\t<option class=\"level-$depth\" value=\"" . $link . "\"";
         if ( $category->term_id == $args['selected'] )
             $output .= ' selected="selected"';
         $output .= '>';
         $output .= $pad.$cat_name;
-        if ( $args['products'] )
+        if ( $args['products'] && isset($category->count) )
             $output .= '&nbsp;&nbsp;('. $category->count .')';
         $output .= "</option>\n";

shopp/trunk/core/flow/Admin.php

@@ -492 +492 @@
         add_action('after_plugin_row_' . SHOPP_PLUGINFILE, array('ShoppSupport', 'pluginsnag'), 10, 2);
 
-        $updates = array('load-plugins', 'load-update.php', 'load-update-core.php', 'wp_update_plugins', 'shopp_check_updates');
-        foreach ( $updates as $action )
-            add_action($action, array('ShoppSupport', 'updates'));
-
     }
 

shopp/trunk/core/flow/Ajax.php

@@ -747 +747 @@
     }
 
-    // @todo Investigate if it is possible to inject a formatted error log message as an XSS vector
+    /**
+     * Automatic refresh of the log is possible when $_REQUEST['refresh'] is set to something other than 'off'.
+     *
+     * @todo Investigate if it is possible to inject a formatted error log message as an XSS vector
+     */
     public function logviewer () {
         check_admin_referer('wp_ajax_shopp_debuglog'); ?>
         <html>
         <head>
-        <?php if ( ! isset( $_REQUEST['refresh'] ) && 'off' === $_REQUEST['refresh'] ): ?>
+        <?php if ( isset( $_REQUEST['refresh'] ) && 'off' !== $_REQUEST['refresh'] ): ?>
         <meta http-equiv="refresh" content="10">
         <?php endif; ?>

shopp/trunk/core/flow/Checkout.php

@@ -107 +107 @@
         $this->Register->shipaddress();
 
-        if ( $Cart->shipped() ) do_action('shopp_update_destination');
+        if ( $Cart->shipped() )
+            do_action('shopp_update_destination');
 
     }
@@ -132 +133 @@
 
         $selection = $this->form('shipmethod');
-        if ( $selection == $Shiprates->selected()->slug ) return;
+        $selected = isset($Shiprates->selected()->slug) ? $Shiprates->selected()->slug : '';
+        if ( $selection == $selected ) return;
 
         // Verify shipping method exists first
@@ -151 +153 @@
 
         // Special case for updating/tracking billing locale
+        $form = $this->form('billing');
         if ( ! empty($form['locale']) )
             $BillingAddress->locale = $form['locale'];
 
-        if ( ! $Cart->shipped() || ! empty($form['locale']) )
+        if ( ! $Cart->shipped() || ! empty($form['locale']) || 'shipping' == ShoppOrder()->sameaddress )
             do_action('shopp_update_destination');
 

shopp/trunk/core/flow/Dashboard.php

@@ -266 +266 @@
         $purchasetable = ShoppDatabaseObject::tablename(ShoppPurchase::$table);
         $purchasedtable = ShoppDatabaseObject::tablename(Purchased::$table);
+        $txnstatus_labels = Lookup::txnstatus_labels();
 
         if ( ! ( $Orders = get_transient('shopp_dashboard_orders') ) ) {
@@ -277 +278 @@
             echo '<tbody id="orders" class="list orders">';
             $even = false;
-            foreach ($Orders as $Order) {
-                echo '<tr'.((!$even)?' class="alternate"':'').'>';
-                $even = !$even;
+            foreach ( $Orders as $Order ) {
+                $classes = array();
+                if ( $even = !$even ) $classes[] = 'alternate';
+                $txnstatus = isset($txnstatus_labels[ $Order->txnstatus ]) ? $txnstatus_labels[$Order->txnstatus] : $Order->txnstatus;
+                $classes[] = strtolower(preg_replace('/[^\w]/', '_', $Order->txnstatus));
+
+                echo '<tr class="' . join(' ',$classes) . '">';
                 echo '<td><a class="row-title" href="'.add_query_arg(array('page'=>ShoppAdmin()->pagename('orders'),'id'=>$Order->id),admin_url('admin.php')).'" title="View &quot;Order '.$Order->id.'&quot;">'.((empty($Order->firstname) && empty($Order->lastname))?'(no contact name)':$Order->firstname.' '.$Order->lastname).'</a></td>';
                 echo '<td>'.date("Y/m/d",mktimestamp($Order->created)).'</td>';
-                echo '<td class="num">'.$Order->items.'</td>';
-                echo '<td class="num">'.money($Order->total).'</td>';
-                echo '<td class="num">'.$statusLabels[ $Order->status ].'</td>';
+                echo '<td class="num items">'.$Order->items.'</td>';
+                echo '<td class="num total">'.money($Order->total).'</td>';
+                echo '<td class="num status">'.$statusLabels[ $Order->status ].'</td>';
                 echo '</tr>';
             }

shopp/trunk/core/flow/Discounter.php

@@ -179 +179 @@
         if ( 'new' !== $_POST['id'] ) {
             $Promotion = new ShoppPromo($_POST['id']);
+            $wascatalog = ( 'Catalog' == $Promotion->target );
         } else $Promotion = new ShoppPromo();
 
@@ -195 +196 @@
         do_action_ref_array('shopp_promo_saved', array(&$Promotion));
 
-        // $Promotion->reset_discounts();
-        if ( 'Catalog' == $Promotion->target )
+        // Apply catalog promotion discounts to catalog product price lines
+        if ( 'Catalog' == $Promotion->target ) {
             $Promotion->catalog();
+        } elseif ( $wascatalog ) {
+            // Unapply catalog discounts for discounts that no longer target catalog products
+            $priceids = ShoppPromo::discounted_prices(array($Promotion->id));
+            $Promotion->uncatalog($priceids);
+        }
 
         // Set confirmation notice

shopp/trunk/core/flow/Install.php

@@ -5 +5 @@
  * Flow controller for installation and upgrades
  *
- * @author Jonathan Davis
  * @version 1.0
- * @copyright Ingenesis Limited, January  6, 2010
+ * @copyright Ingenesis Limited, January 2010-2014
  * @package shopp
- * @subpackage shopp
  **/
 
 defined( 'WPINC' ) || header( 'HTTP/1.1 403' ) & exit; // Prevent direct access
 
-/**
- * ShoppInstallation
- *
- * @package shopp
- * @author Jonathan Davis
- **/
 class ShoppInstallation extends ShoppFlowController {
 
@@ -29 +21 @@
      *
      * @return void
-     * @author Jonathan Davis
      **/
     function __construct () {
-        add_action('shopp_activate',array($this,'activate'));
-        add_action('shopp_deactivate',array($this,'deactivate'));
-        add_action('shopp_reinstall',array($this,'install'));
-
-        add_action('shopp_setup',array($this,'setup'));
-        add_action('shopp_setup',array($this,'images'));
-        add_action('shopp_setup',array($this,'roles'));
-        add_action('shopp_setup',array($this,'maintenance'));
+
+        add_action('shopp_activate',   array($this, 'activate'));
+        add_action('shopp_deactivate', array($this, 'deactivate'));
+        add_action('shopp_reinstall',  array($this, 'install'));
+
+        add_action('shopp_setup', array($this, 'setup'));
+        add_action('shopp_setup', array($this, 'images'));
+        add_action('shopp_setup', array($this, 'roles'));
+        add_action('shopp_setup', array($this, 'maintenance'));
 
         $this->errors = array(
@@ -89 +81 @@
 
         shopp_set_setting('updates', false);
-        shopp_set_setting('rebuild_rewrites', 'on');
-
+
+        add_action('init', 'flush_rewrite_rules', 99);
         return true;
     }
@@ -166 +158 @@
         shopp_set_setting('maintenance', 'on');
 
-        // Process any database schema changes
-        $this->upschema();
-
-        // @todo Remove before release
-        if ( in_array($installed, array(1300,1301)) ) $installed = 1148;
-
         if ( $installed < 1100 ) $this->upgrade_110();
         if ( $installed < 1200 ) $this->upgrade_120();
         if ( $installed < 1300 ) $this->upgrade_130();
+
+        $db = sDB::object();
+        file_put_contents(SHOPP_PATH . '/shopp_queries.txt', json_encode($db->queries));
 
         ShoppSettings()->save('db_version', ShoppVersion::db());
@@ -195 +184 @@
      * @return void
      **/
-    public function upschema () {
+    public function upschema ( $filename = 'schema.sql' ) {
+
+        $path = SHOPP_PATH . '/core/schema';
+        $schema = "$path/$filename";
+
+        // Check for the schema definition file
+        if ( ! file_exists($schema) ) $this->error('nodbschema-upgrade');
+
         // Test to ensure Shopp can create/drop tables
         $testtable = 'shopp_db_permissions_test_'.time();
@@ -210 +206 @@
             require(ABSPATH.'wp-admin/includes/upgrade.php');
 
-        // Check for the schema definition file
-        if (!file_exists(SHOPP_DBSCHEMA)) $this->error('nodbschema-upgrade');
 
         ob_start();
-        include(SHOPP_DBSCHEMA);
-        $schema = ob_get_contents();
-        ob_end_clean();
+        include($schema);
+        $schema = ob_get_clean();
 
         // Update the table schema
@@ -248 +241 @@
      * shopp_products
      * shopp_categories
+     * shopp_export_orders
+     * shopp_export_customers
+     * shopp_delete_orders
+     * shopp_delete_customers
+     * shopp_void
+     * shopp_refund
      * shopp_orders                     shopp-csr
      * shopp_customers
+     * shopp_capture
      * shopp_menu
      *
@@ -255 +255 @@
      * @since 1.1
      *
+     * @return void
      **/
     public function roles () {
@@ -268 +269 @@
 
         $caps['shopp-csr'] = array(
+                'shopp_capture',
                 'shopp_customers',
                 'shopp_orders',
@@ -283 +285 @@
                 'shopp_delete_orders',
                 'shopp_delete_customers',
-                'shopp_capture',
                 'shopp_void',
                 'shopp_refund'
@@ -299 +300 @@
 
         $caps = apply_filters('shopp_role_caps', $caps, $shopp_roles);
+
         foreach ( $shopp_roles as $role => $display ) {
             if ( $wp_roles->is_role($role) ) {
@@ -449 +451 @@
      **/
     public function upgrade_110 () {
-
         $meta_table = ShoppDatabaseObject::tablename('meta');
         $setting_table = ShoppDatabaseObject::tablename('setting');
+        $product_table = ShoppDatabaseObject::tablename('product');
+
+        // 1.1 schema changes
+        $this->upschema('schema-110.sql');
 
         // Update product status from the 'published' column
-        $product_table = ShoppDatabaseObject::tablename('product');
         sDB::query("UPDATE $product_table SET status=CAST(published AS unsigned)");
 
@@ -622 +626 @@
 
     public function upgrade_120 () {
+        // 1.2 schema changes
+        $this->upschema('schema-120.sql');
         global $wpdb;
 
@@ -1026 +1032 @@
 
     public function upgrade_130 () {
+        // 1.3 schema changes
+        $this->upschema();
         global $wpdb;
 

shopp/trunk/core/flow/Order.php

@@ -61 +61 @@
         if ( ! defined('SHOPP_TXNLOCK_TIMEOUT')) define('SHOPP_TXNLOCK_TIMEOUT',10);
 
-        add_action('parse_request', array($this, 'locate')); // location updates must come before other requests
+        // Request handling
         add_action('parse_request', array($this, 'request'));
         add_action('parse_request', array($this->Discounts, 'requests'));
+
+
+        // Address handling
+        add_action('shopp_update_destination', array($this->Billing, 'fromshipping'));
+        add_action('shopp_update_destination', array($this, 'taxlocale'));
+
 
         // Order processing
@@ -102 +108 @@
         // but before gateway-order specific handlers are established
         add_action('shopp_init', array($this, 'txnupdates'), 20);
+
+        // Initialize/reinitalize the current location
+        add_action('shopp_init', array($this, 'locate'), 20);
+
 
     }
@@ -179 +189 @@
     }
 
-    /**It
+    /**
      * Update addresses throughout the system
      *
@@ -189 +199 @@
     public function locate () {
 
-        add_action('shopp_update_destination', array($this->Billing, 'fromshipping'));
-        add_action('shopp_update_destination', create_function('','
-            $Order = ShoppOrder();
-            $Order->Tax->address($Order->Billing, $Order->Shipping, $Order->Cart->shipped());
-        '));
-        add_filter('shopp_tax_country', array('ShoppTax', 'euvat'), 10, 3);
-
-        if ( isset($_REQUEST['shipping']) ) {
-            $request = $_REQUEST['shipping'];
-
-            $this->Billing->locate($request);
-            $this->Shipping->locate($request);
-
-            do_action_ref_array( 'shopp_update_destination', array($request) );
-
-        } else {
-            $this->Billing->locate();
-            $this->Shipping->locate();
-        }
-
-        $this->Tax->address($this->Billing, $this->Shipping, $this->Cart->shipped());
+        $request = isset($_REQUEST['shipping']) ? $_REQUEST['shipping'] : false;
+
+        $this->Billing->locate($request);
+        $this->Shipping->locate($request);
+
+        do_action_ref_array( 'shopp_update_destination', array($request) );
+
+    }
+
+    /**
+     * Send the current taxable address to the Tax system
+     *
+     * @author Jonathan Davis
+     * @since 1.3.2
+     *
+     * @return void
+     **/
+    public function taxlocale ( ) {
+
+        $Address = $this->Billing;
+        if ( $this->Cart->shipped() || shopp_setting_enabled('tax_destination') ) // @todo add setting for "Apply tax to the shipping address"
+            $Address = $this->Shipping;
+
+        // Locale is always tracked with the billing address even though it is may be a shipping locale
+        $locale = empty($this->Billing->locale) ? null : $this->Billing->locale;
+
+        $this->Tax->location($Address->country, $Address->state, $locale); // Update the ShoppTax working location
+
     }
 
@@ -236 +253 @@
      * @return void
      **/
-    public function invoice ($Purchase) {
+    public function invoice ( ShoppPurchase $Purchase ) {
         shopp_add_order_event($Purchase->id, 'invoiced', array(
             'gateway' => $Purchase->gateway,            // Gateway handler name (module name from @subpackage)
@@ -455 +472 @@
         // Catch Purchase record save errors
         if ( empty($Purchase->id) ) {
-            shopp_add_error( Shopp::__('The order could not be created because of a technical problem on the server. Please try again, or contact the website adminstrator.') );
+            shopp_add_error( Shopp::__('The order could not be created because of a technical problem on the server. Please try again, or contact the website administrator.') );
             return;
         }
@@ -566 +583 @@
         }
 
-        $registration = $Purchase->registration();
-        if ( empty($registration) ) {
-            shopp_debug('No purchase registration data available for account registration processing.');
-            return;
-        }
-
-        $this->Customer->copydata($registration['Customer']);
-        $this->Billing->copydata($registration['Billing']);
-        $this->Shipping->copydata($registration['Shipping']);
-
-
-        add_filter('shopp_validate_registration', create_function('', 'return true;') ); // Validation already conducted during the checkout process
-        add_filter('shopp_registration_redirect', create_function('', 'return false;') ); // Prevent redirection to account page after registration
+        if ( ! $this->Customer->exists() ) {
+
+            $registration = $Purchase->registration();
+            if ( empty($registration) ) {
+                shopp_debug('No purchase registration data available for account registration processing.');
+                return;
+            }
+
+            $this->Customer->copydata($registration['Customer']);
+            $this->Billing->copydata($registration['Billing']);
+            $this->Shipping->copydata($registration['Shipping']);
+
+            add_filter('shopp_validate_registration', create_function('', 'return true;') ); // Validation already conducted during the checkout process
+            add_filter('shopp_registration_redirect', create_function('', 'return false;') ); // Prevent redirection to account page after registration
+
+        }
 
         ShoppRegistration::process();

shopp/trunk/core/flow/Pages.php

@@ -296 +296 @@
     public function templates () {
         $templates = parent::templates();
-        if ( is_catalog_frontpage() )
+        if ( $this->is_frontpage() )
             array_unshift($templates, 'front-page.php');
         return $templates;
@@ -321 +321 @@
 
     public function styleclass ( $classes ) {
-        if ( is_catalog_frontpage() )
+        if ( $this->is_frontpage() )
             $classes[] = 'home';
         $classes[] = $this->name();
@@ -333 +333 @@
         $stub = parent::poststub();
         $wp_query->is_post_type_archive = false;
-        // if ( is_catalog_frontpage() )
-        //  $wp_query->is_home = true;
+        if ( $this->is_frontpage() )
+            $wp_query->is_home = true;
 
         return $stub;
     }
 
+    public function is_frontpage () {
+        return self::frontid() == get_option('page_on_front');
+    }
 }
 
@@ -392 +395 @@
         if ( ! $request) $request = ShoppStorefront()->account['request'];
         $templates = array( 'account-'.$request.'.php', 'account.php' );
-
         if ( 'login' == $request || ! ShoppCustomer()->loggedin() ) $templates = array( 'login-' . $request . '.php', 'login.php' );
-
+        $context = ShoppStorefront::intemplate(); // Set account page context
+
+        $Errors = ShoppErrorStorefrontNotices();
         ob_start();
-        if ( apply_filters( 'shopp_show_account_errors', true ) && ShoppErrors()->exist( SHOPP_AUTH_ERR ) )
+        if ( apply_filters( 'shopp_show_account_errors', true ) && $Errors->exist() )
             echo ShoppStorefront::errors( array( "errors-$context", 'account-errors.php', 'errors.php' ) );
         Shopp::locate_template( $templates, true );
@@ -404 +408 @@
         if ($widget) $content = '<!-- id="shopp" -->' . $content;
 
-        return apply_filters( 'shopp_account_template', $content );
+        return apply_filters( 'shopp_account_template', $content, $request );
 
     }

shopp/trunk/core/flow/Registration.php

@@ -36 +36 @@
         'shipping' => array(),
         'info' => array(),
+        'marketing' => '',
         'loginname' => '',
         'password' => '',
@@ -88 +89 @@
             'phone' => $this->form('phone'),
             'info' => $this->form('info'),
-            'password' => $this->form('password', true),
+            'marketing' => $this->form('marketing'),
+            'password' => $this->form('password', true),
             'loginname' => $this->form('loginname', true)
         );
@@ -108 +110 @@
 
     public function shipaddress () {
+
         $ShippingAddress = ShoppOrder()->Shipping;
         $BillingAddress = ShoppOrder()->Billing;
@@ -138 +141 @@
         // Prevent overwriting the card data when updating the BillingAddress
         $ignore = array();
-        if ( ! empty($form['card']) && preg_replace('/[^\d]/','',$form['card']) == substr($BillingAddress->card,-4) )
+        if ( ! empty($form['card']) && preg_replace('/[^\d]/', '', $form['card']) == substr($BillingAddress->card, -4) )
             $ignore[] = 'card';
 
-        $BillingAddress->updates($form,$ignore);
+        $BillingAddress->updates($form, $ignore);
 
         // Handle same address copying

shopp/trunk/core/flow/Report.php

@@ -27 +27 @@
 
     private $view = 'dashboard';
+    protected $ui = 'reports';
 
     private $defaults = array();    // Default request options
@@ -45 +46 @@
         shopp_enqueue_script('reports');
 
-        add_filter('shopp_reports',array($this,'xreports'));
-        add_action('load-'.$this->screen,array($this,'loader'));
+        add_filter('shopp_reports', array(__CLASS__, 'xreports'));
+        add_action('load-'.$this->screen, array($this, 'loader'));
     }
 
@@ -144 +145 @@
     static function load () {
         $options = self::request();
-        extract($options,EXTR_SKIP);
+        extract($options, EXTR_SKIP);
 
         $reports = self::reports();
@@ -151 +152 @@
         $report = isset($_GET['report']) ? $_GET['report'] : 'sales';
 
-        $ReportClass = $reports[$report]['class'];
+        if ( empty($reports[ $report ]['class']) )
+            return wp_die(Shopp::__('The requested report does not exist.'));
+
+        $ReportClass = $reports[ $report ]['class'];
         $Report = new $ReportClass($options);
         $Report->load();
@@ -188 +192 @@
 
         $Report = $this->Report;
+        $Report->pagination();
         $ListTable = ShoppUI::table_set_pagination ($this->screen, $Report->total, $Report->pages, $per_page );
 
@@ -223 +228 @@
 
         $report_title = isset($reports[ $report ])? $reports[ $report ]['name'] : __('Report','Shopp');
-        include(SHOPP_ADMIN_PATH."/reports/reports.php");
+
+        include $this->ui('reports.php');
+
     }
 
@@ -708 +715 @@
 
     ?>
+
+
             <table class="widefat" cellspacing="0">
                 <thead>

shopp/trunk/core/flow/Resources.php

@@ -95 +95 @@
         if ( ! current_user_can('shopp_financials') || ! current_user_can('shopp_export_orders') ) exit();
 
+        add_filter('shopp_reports', array('ShoppAdminReport', 'xreports'));
         $reports = ShoppAdminReport::reports();
         $Report = ShoppAdminReport::load();
@@ -233 +234 @@
         }
 
-        if ( apply_filters('shopp_download_forbidden', $forbidden) ) {
+        if ( apply_filters('shopp_download_forbidden', $forbidden, $Purchased) ) {
             Shopp::redirect( add_query_arg('downloads', '', Shopp::url(false, 'account') ), true, 303 );
         }

shopp/trunk/core/flow/Setup.php

@@ -97 +97 @@
         if ( ! empty($_POST['setup']) ) {
             $_POST['settings']['display_welcome'] = 'off';
-            $this->settings_save();
+            shopp_set_formsettings();
         }
 
@@ -135 +135 @@
                 asort($_POST['settings']['target_markets']);
 
-            $this->settings_save();
+            shopp_set_formsettings();
             $updated = __('Shopp settings saved.', 'Shopp');
         }
@@ -179 +179 @@
             }
 
-            $this->settings_save();
+            shopp_set_formsettings();
         }
 
@@ -245 +245 @@
 
 
-            $this->settings_save();
+            shopp_set_formsettings();
             $updated = __('Shopp checkout settings saved.','Shopp');
         }
@@ -338 +338 @@
             $defaults = ShoppPages()->settings();
             $_POST['settings']['storefront_pages'] = array_merge($defaults,$_POST['settings']['storefront_pages']);
-            $this->settings_save();
+            shopp_set_formsettings();
 
             // Re-register page, collection, taxonomies and product rewrites
@@ -454 +454 @@
     }
 
-    public function settings_save () {
-        if (empty($_POST['settings']) || !is_array($_POST['settings'])) return false;
-        foreach ($_POST['settings'] as $setting => $value)
-            shopp_set_setting($setting,stripslashes_deep($value));
-    }
-
 }

shopp/trunk/core/flow/Storefront.php

@@ -1060 +1060 @@
         if ( in_array($view, $views) ) $classes[] = $view;
 
-        if ( 'grid' == $view ) {
-            $boxes = shopp_setting('row_products');
-            if ( empty($boxes) ) $boxes = 3;
-            $classes[] = 'shopp_grid-' . abs($boxes);
-        }
+        $boxes = shopp_setting('row_products');
+        if ( empty($boxes) ) $boxes = 3;
+        $classes[] = 'shopp_grid-' . abs($boxes);
 
         // Add collection slug

shopp/trunk/core/flow/System.php

@@ -152 +152 @@
             }
 
-            $this->settings_save();
+            shopp_set_formsettings();
             $updated = __('Shipping settings saved.','Shopp');
         }
@@ -242 +242 @@
 
             if ($id == $module) {
-                if (isset($_POST['settings'])) $this->settings_save();
+                if (isset($_POST['settings'])) shopp_set_formsettings();
                 /** Save shipping service settings **/
                 $active[$module] = true;
@@ -440 +440 @@
         if (!empty($_POST['save'])) {
             check_admin_referer('shopp-settings-taxes');
-            $this->settings_save();
+            shopp_set_formsettings();
             $updated = __('Tax settings saved.','Shopp');
         }
@@ -686 +686 @@
                     $gateway = str_replace($matched[0], '', $gateway);
 
+                    // Merge the existing gateway settings with the newly updated settings
                     if ( isset($Gateways->active[ $gateway ]) ) {
                         $Gateway = $Gateways->active[ $gateway ];
-                        $_POST['settings'][$gateway] = array_merge($Gateway->settings,$_POST['settings'][ $gateway ]);
+                        // Cannot use array_merge() because it adds numeric index values instead of overwriting them
+                        $_POST['settings'][ $gateway ] = (array) $_POST['settings'][ $gateway ] + (array) $Gateway->settings;
                     }
+
                 }
 
@@ -700 +703 @@
             } // END isset($_POST['gateway])
 
-            $this->settings_save();
+            shopp_set_formsettings();
             $updated = __('Shopp payments settings saved.','Shopp');
         }
@@ -880 +883 @@
     }
 
-
-    public function settings_save () {
-        if (empty($_POST['settings']) || !is_array($_POST['settings'])) return false;
-        foreach ($_POST['settings'] as $setting => $value)
-            shopp_set_setting($setting,stripslashes_deep($value));
-    }
-
     public static function reindex () {
 

shopp/trunk/core/flow/Warehouse.php

@@ -21 +21 @@
     public $products = array();
     public $subs = array();
+
+    protected $ui = 'products';
 
     /**
@@ -383 +385 @@
         );
 
-        if ( isset($ordercols) ) {
+        if ( ! empty($ordercols) ) {
             unset($loading['order']);
             $loading['orderby'] = $ordercols;
@@ -641 +643 @@
             wp_die(__('You do not have sufficient permissions to access this page.'));
 
-        if (empty($Shopp->Product)) {
+        if ( empty($Shopp->Product) ) {
             $Product = new ShoppProduct();
             $Product->status = "publish";
         } else $Product = $Shopp->Product;
 
-        $Product->slug = apply_filters('editable_slug',$Product->slug);
+        $Product->slug = apply_filters('editable_slug', $Product->slug);
         $permalink = trailingslashit(Shopp::url());
 
@@ -655 +657 @@
 
         $workflows = array(
-            "continue" => __('Continue Editing','Shopp'),
-            "close" => __('Products Manager','Shopp'),
-            "new" => __('New Product','Shopp'),
-            "next" => __('Edit Next','Shopp'),
-            "previous" => __('Edit Previous','Shopp')
+            'continue' => Shopp::__('Continue Editing'),
+            'close' =>    Shopp::__('Products Manager'),
+            'new' =>      Shopp::__('New Product'),
+            'next' =>     Shopp::__('Edit Next'),
+            'previous' => Shopp::__('Edit Previous')
         );
 
         $taglist = array();
-        foreach ($Product->tags as $tag) $taglist[] = $tag->name;
-
-        if ($Product->id && !empty($Product->images)) {
-            $ids = join(',',array_keys($Product->images));
+        foreach ( $Product->tags as $tag )
+            $taglist[] = $tag->name;
+
+        if ( $Product->id && ! empty($Product->images) ) {
+            $ids = join(',', array_keys($Product->images));
             $CoverImage = reset($Product->images);
             $image_table = $CoverImage->_table;
@@ -673 +676 @@
 
         $shiprates = shopp_setting('shipping_rates');
-        if (!empty($shiprates)) ksort($shiprates);
+        if ( ! empty($shiprates) )
+            ksort($shiprates);
 
         $uploader = shopp_setting('uploader_pref');
-        if (!$uploader) $uploader = 'flash';
-
-        $process = (!empty($Product->id)?$Product->id:'new');
-        $_POST['action'] = add_query_arg(array_merge($_GET,array('page'=>$this->Admin->pagename('products'))),admin_url('admin.php'));
+        if ( ! $uploader ) $uploader = 'flash';
+
+        $process = empty($Product->id) ? 'new' : $Product->id;
+        $_POST['action'] = add_query_arg(array_merge($_GET, array('page' => $this->Admin->pagename('products'))), admin_url('admin.php'));
         $post_type = ShoppProduct::posttype();
 
-        // For inclusive taxes, add tax to base product price (so tax is part of the price)
-        // This has to take place outside of ShoppProduct::pricing() so that the summary system
-        // doesn't cache the results causing strange/unexpected price jumps
-        // if ( shopp_setting_enabled('tax_inclusive') && ! Shopp::str_true($Product->excludetax) ) {
-        //  foreach ($Product->prices as &$price) {
-        //      if ( ! Shopp::str_true($price->tax) ) continue;
-        //
-        //      $taxes = array();
-        //      $Tax = new ShoppTax();
-        //      $Tax->address(ShoppOrder()->Billing);
-        //      $Tax->rates($taxes, $Tax->item($Product));
-        //
-        //      $price->price += ShoppTax::calculate($taxes, $price->price);
-        //      $price->saleprice += ShoppTax::calculate($taxes, $price->saleprice);
-        //  }
-        // }
-
         do_action('add_meta_boxes', ShoppProduct::$posttype, $Product);
-        do_action('add_meta_boxes_'.ShoppProduct::$posttype, $Product);
+        do_action('add_meta_boxes_' . ShoppProduct::$posttype, $Product);
 
         do_action('do_meta_boxes', ShoppProduct::$posttype, 'normal', $Product);
@@ -706 +693 @@
         do_action('do_meta_boxes', ShoppProduct::$posttype, 'side', $Product);
 
-        include(SHOPP_ADMIN_PATH."/products/editor.php");
+        include $this->ui('editor.php');
     }
 

shopp/trunk/core/library/Core.php

@@ -1079 +1079 @@
                 'title','value');
         }
+        $allowed = apply_filters( 'shopp_allowed_inputattrs', $allowed, $options );
         $string = "";
         $classes = "";
@@ -2250 +2251 @@
      * @return boolean True if Suhosin is dectected and has configuration issues
      **/
-    function suhosin_warning () {
+    public static function suhosin_warning () {
 
         return ( // Is Suhosin loaded or available?
@@ -2267 +2268 @@
     }
 
+    /**
+     * Trim whitespace from the beggingin
+     *
+     * @author Jonathan Davis
+     * @since 1.3
+     *
+     * @return void Description...
+     **/
+    public function trim_deep ( $value ) {
+
+        if ( is_object($value) ) {
+            $vars = get_object_vars( $value );
+            foreach ( $vars as $key => $data )
+                $value->{$key} = self::trim_deep( $data );
+        } elseif ( is_array($value) ) {
+            $value = array_map(array(__CLASS__, 'trim_deep'), $value);
+        } elseif ( is_string( $value ) ) {
+            $value = trim($value);
+        }
+
+        return $value;
+
+    }
+
 } // End abstract class ShoppCore
 

shopp/trunk/core/library/DB.php

@@ -655 +655 @@
             return sDB::object();
         }
+        
+        public static function instance () {
+            return sDB::object();
+        }
 
     }

shopp/trunk/core/library/Email.php

@@ -83 +83 @@
 
     static function FixSymbols ( $message ) {
-        $entities = htmlentities( $message, ENT_NOQUOTES  | ENT_DISALLOWED, 'UTF-8', false ); // Translate HTML entities (special symbols)
+        if ( ! defined( 'ENT_DISALLOWED' ) ) define( 'ENT_DISALLOWED', 128 ); // ENT_DISALLOWED added in PHP 5.4
+        $entities = htmlentities( $message, ENT_NOQUOTES | ENT_DISALLOWED, 'UTF-8', false ); // Translate HTML entities (special symbols)
         return htmlspecialchars_decode( $entities, ENT_NOQUOTES ); // Translate HTML tags back
     }

shopp/trunk/core/library/Loader.php

@@ -502 +502 @@
     'shippingreport' => '/ui/reports/shipping.php',
     'shippingsettingsui' => '/model/Shipping.php',
+    'shopp' => '/library/Shopp.php',
     'shoppaccountdashboardpage' => '/flow/Pages.php',
     'shoppaccountpage' => '/flow/Pages.php',

shopp/trunk/core/library/Lookup.php

@@ -777 +777 @@
     public static function payment_status_labels () {
         $_ = array(
-            'PENDING' => __('Pending','Shopp'),
-            'CHARGED' => __('Charged','Shopp'),
-            'REFUNDED' => __('Refunded','Shopp'),
-            'VOID' => __('Void','Shopp')
-        );
-        return apply_filters('shopp_payment_status_labels',$_);
+            'PENDING'  => Shopp::__('Pending'),
+            'CHARGED'  => Shopp::__('Charged'),
+            'REFUNDED' => Shopp::__('Refunded'),
+            'VOID'     => Shopp::__('Void')
+        );
+        return apply_filters('shopp_payment_status_labels', $_);
     }
 
     public static function txnstatus_labels () {
         $_ = array(
-            'review' => __('Review','Shopp'),
-            'purchase' => __('Purchase Order','Shopp'),
-            'invoiced' => __('Invoiced','Shopp'),
-            'authed' => __('Authorized','Shopp'),
-            'captured' => __('Paid','Shopp'),
-            'shipped' => __('Shipped','Shopp'),
-            'refunded' => __('Refunded','Shopp'),
-            'voided' => __('Void','Shopp'),
-            'closed' => __('Closed','Shopp')
-        );
-        return apply_filters('shopp_txnstatus_labels',$_);
+            'review'      => Shopp::__('Review'),
+            'purchase'    => Shopp::__('Purchase Order'),
+            'invoiced'    => Shopp::__('Invoiced'),
+            'authed'      => Shopp::__('Authorized'),
+            'auth-failed' => Shopp::__('Declined'),
+            'captured'    => Shopp::__('Paid'),
+            'shipped'     => Shopp::__('Shipped'),
+            'refunded'    => Shopp::__('Refunded'),
+            'voided'      => Shopp::__('Void'),
+            'closed'      => Shopp::__('Closed')
+        );
+        return apply_filters('shopp_txnstatus_labels', $_);
     }
 

shopp/trunk/core/library/Support.php

@@ -27 +27 @@
 
     /**
-     * Checks for available updates
-     *
-     * @author Jonathan Davis
-     * @since 1.1
-     *
-     * @return array List of available updates
-     **/
-    public static function updates () {
-
-        if ( ! wp_next_scheduled('shopp_check_updates') )
-            wp_schedule_event(time(), 'twicedaily', 'shopp_check_updates');
-
-        global $pagenow;
-        if ( is_admin()
-            && 'plugins.php' == $pagenow
-            && isset($_GET['action'])
-            && 'deactivate' == $_GET['action']) return array();
-
-        $updates = new StdClass();
-        if (function_exists('get_site_transient')) $plugin_updates = get_site_transient('update_plugins');
-        else $plugin_updates = get_transient('update_plugins');
-
-        switch ( current_filter() ) {
-            case 'load-update-core.php': $timeout = 60; break; // 1 minute
-            case 'load-plugins.php': // 1 hour
-            case 'load-update.php': $timeout = 3600; break;
-            default: $timeout = 43200; // 12 hours
-        }
-
-        $justchecked = isset( $plugin_updates->last_checked_shopp ) && $timeout > ( time() - $plugin_updates->last_checked_shopp );
-        $changed = isset($plugin_updates->response[ SHOPP_PLUGINFILE ]);
-        if ( $justchecked && ! $changed ) return;
-
-        $Shopp = Shopp::object();
-        $addons = array_merge(
-            $Shopp->Gateways->checksums(),
-            $Shopp->Shipping->checksums(),
-            $Shopp->Storage->checksums()
-        );
-
-        $request = array('ShoppServerRequest' => 'update-check');
-        /**
-         * Update checks collect environment details for faster support service only,
-         * none of it is linked to personally identifiable information.
-         **/
-        $data = array(
-            'core' => ShoppVersion::release(),
-            'addons' => join("-", $addons),
-            'site' => get_bloginfo('url'),
-        );
-
-        if ( shopp_setting_enabled('support_data') ) {
-            $optional = array(
-                'wp' => get_bloginfo('version').(is_multisite()?' (multisite)':''),
-                'mysql' => mysql_get_server_info(),
-                'php' => phpversion(),
-                'uploadmax' => ini_get('upload_max_filesize'),
-                'postmax' => ini_get('post_max_size'),
-                'memlimit' => ini_get('memory_limit'),
-                'server' => $_SERVER['SERVER_SOFTWARE'],
-                'agent' => $_SERVER['HTTP_USER_AGENT']
-            );
-            $data = array_merge($data, $optional);
-        }
-
-        $response = ShoppSupport::callhome($request, $data);
-
-        if ($response == '-1') return; // Bad response, bail
-        $response = unserialize($response);
-        unset($updates->response);
-
-        if ( isset($response->key) && ! Shopp::str_true($response->key) )
-            delete_transient('shopp_activation');
-
-        if ( isset($response->addons) ) {
-            $updates->response[ SHOPP_PLUGINFILE . '/addons' ] = $response->addons;
-            unset($response->addons);
-        }
-
-        if ( isset($response->id) )
-            $updates->response[ SHOPP_PLUGINFILE ] = $response;
-
-        if (isset($updates->response)) {
-            shopp_set_setting('updates', $updates);
-
-            // Add Shopp to the WP plugin update notification count
-            if ( isset($updates->response[ SHOPP_PLUGINFILE ]) )
-                $plugin_updates->response[ SHOPP_PLUGINFILE ] = $updates->response[ SHOPP_PLUGINFILE ];
-
-        } else unset($plugin_updates->response[ SHOPP_PLUGINFILE ]); // No updates, remove Shopp from the plugin update count
-
-        $plugin_updates->last_checked_shopp = time();
-        if ( function_exists('set_site_transient') ) set_site_transient('update_plugins', $plugin_updates);
-        else set_transient('update_plugins', $plugin_updates);
-
-        return $updates;
-    }
-
-    /**
      * Loads the change log for an available update
      *
@@ -161 +62 @@
         if ( is_network_admin() || ! is_multisite() ) {
         $wp_list_table = _get_list_table('WP_Plugins_List_Table');
-            echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+            echo '<tr class="plugin-update-tr active"><th colspan="' . $wp_list_table->get_column_count() . '" class="check-column plugin-update colspanchange"><div class="update-message">';
             echo self::buykey();
-            echo '<style type="text/css">#shopp th,#shopp td{border-bottom:0;}</style>';
+            echo '<br class="clear" /><br /><style type="text/css">#shopp th,#shopp td{border-bottom:0;-webkit-box-shadow:none;box-shadow:none;}
+                #shopp+.plugin-update-tr .update-message {box-sizing:border-box;} #shopp+.plugin-update-tr .button {float:left; margin:20px 20px 0 0;} #shopp+.plugin-update-tr big { display:block; } #shopp+.plugin-update-tr .update-message::before {content:"";}</style>';
             echo '</div></td></tr>';
         }
@@ -238 +140 @@
 
             $wp_list_table = _get_list_table('WP_Plugins_List_Table');
-            echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+            echo '<tr class="plugin-update-tr"><th colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
             Shopp::_emi(
                 'You&apos;re missing out on important updates! %1$s &nbsp; %2$s Buy a Shopp Support Key! %3$s', empty($updates) ? '' : join(' ', $updates), '<a href="' . ShoppSupport::STORE . '" class="button button-primary">', '</a>'
@@ -262 +164 @@
         $url = add_query_arg('action', 'shopp_nonag', wp_nonce_url(admin_url('admin-ajax.php'), 'wp_ajax_shopp_nonag'));
         $_ = array();
-        $_[] = '<div id="shopp-activation-nag" class="notice wp-core-ui">';
+        $_[] = '<div id="shopp-activation-nag" class="update-nag">';
 
         $_[] = '<p class="dismiss shoppui-remove-sign alignright"></p>';
@@ -276 +178 @@
 
     public static function buykey () {
-        return Shopp::_mi('You&apos;re missing out on **expert support**, **early access** to Shopp updates, and **one-click add-on updates**! Don&apos;t have a Shopp Support Key? %sBuy a Shopp Support Key!%s', '<a href="' . ShoppSupport::STORE . '" class="button button-primary" target="_blank">', '</a>');
+        return Shopp::_mi('%s<big>Upgrade for Support</big>%s<big>You&apos;re missing out on **expert support**, **early access** to Shopp updates, and **one-click add-on updates**!</big>Don&apos;t have a Shopp Support Key? Support the project and get expert support, buy one today!', '<a href="' . ShoppSupport::STORE . '?utm_source=wpadmin-' . $_REQUEST['page'] . '&utm_medium=Shopp&utm_campaign=Plugin" class="button button-primary" target="_blank">', '</a>');
     }
 

shopp/trunk/core/library/Version.php

@@ -22 +22 @@
 
     /** @type int PATCH The maintenance patch version number */
-    const PATCH = 1;
+    const PATCH = 2;
 
     /** @type string PRERELEASE The prerelease designation (dev, beta, RC1) */
@@ -28 +28 @@
 
     /** @type string CODENAME The release project code name */
-    const CODENAME = 'Deimos';
+    const CODENAME = 'Phobos';
 
     /** @type int DB The database schema version */

shopp/trunk/core/model/Asset.php

@@ -261 +261 @@
         $url = Shopp::url( '' != get_option('permalink_structure') ? trailingslashit($this->id) . $this->filename : $this->id, 'images' );
 
+        // Get the current URI
+        $uri = $this->uri;
+
         // Handle resize requests
         $params = func_get_args();
@@ -269 +272 @@
             // Build the path to the cached copy of the file (if it exists)
             $size = $this->cachefile( $request );
-            $this->uri = "cache_{$size}_{$this->filename}";
-
+            $uri = "cache_{$size}_{$this->filename}"; // Override the URI for the request
         }
 
         // Ask the engine if we have a direct URL
-        $direct_url = $this->engine()->direct($this->uri);
+        $direct_url = $this->engine()->direct($uri);
         if ( false !== $direct_url ) return $direct_url;
 
         if ( empty($request) ) return $url;
         else return Shopp::add_query_string( $request, $url);
-
     }
 
@@ -633 +634 @@
 if ( !class_exists('ListFramework') ) return;
 
+/**
+ * ImageSetting
+ *
+ * Data model for handling image setting data
+ *
+ * @since 1.2
+ * @package shopp
+ **/
 class ImageSetting extends ShoppMetaObject {
 
-    static $qualities = array(100,92,80,70,60);
-    static $fittings = array('all','matte','crop','width','height');
+    static $qualities = array(100, 92, 80, 70, 60);
+    static $fittings = array('all', 'matte', 'crop', 'width', 'height');
 
     public $width;
@@ -646 +655 @@
     public $context = 'setting';
     public $type = 'image_setting';
-    public $_xcols = array('width','height','fit','quality','sharpen','bg');
-
-    public function __construct ($id=false,$key='id') {
+    public $_xcols = array('width', 'height', 'fit', 'quality', 'sharpen', 'bg');
+
+    public function __construct ( $id = false, $key = 'id' ) {
         $this->init(self::$table);
         $this->load($id,$key);
     }
 
+    /**
+     * Provides a translated list of image "fit" setting labels
+     *
+     * @since 1.2
+     *
+     * @return array List of translated settings labels
+     **/
     public function fit_menu () {
-        return array(   __('All','Shopp'),
-            __('Fill','Shopp'),
-            __('Crop','Shopp'),
-            __('Width','Shopp'),
-            __('Height','Shopp')
+        return array(
+            Shopp::__('All'),
+            Shopp::__('Fill'),
+            Shopp::__('Crop'),
+            Shopp::__('Width'),
+            Shopp::__('Height')
         );
     }
 
+    /**
+     * Provides a menu of readable image quality labels
+     *
+     * @since 1.3
+     *
+     * @return array List of quality labels
+     **/
     public function quality_menu () {
-        return array(   __('Highest quality, largest file size','Shopp'),
-            __('Higher quality, larger file size','Shopp'),
-            __('Balanced quality & file size','Shopp'),
-            __('Lower quality, smaller file size','Shopp'),
-            __('Lowest quality, smallest file size','Shopp')
+        return array(
+            Shopp::__('Highest quality, largest file size'),
+            Shopp::__('Higher quality, larger file size'),
+            Shopp::__('Balanced quality & file size'),
+            Shopp::__('Lower quality, smaller file size'),
+            Shopp::__('Lowest quality, smallest file size')
         );
     }
 
-    public function fit_value ($value) {
-        if (isset(self::$fittings[$value])) return self::$fittings[$value];
+    /**
+     * Converts a numeric ImageSetting fit setting to a Theme API compatible option name
+     *
+     * @since 1.3
+     *
+     * @param integer $setting The numeric ImageSetting value
+     * @return string The option name
+     **/
+    public function fit ( integer $setting ) {
+        if ( isset(self::$fittings[ $setting ]) )
+            return self::$fittings[ $setting ];
         return self::$fittings[0];
     }
 
-    public function quality_value ($value) {
-        if (isset(self::$qualities[$value])) return self::$qualities[$value];
+    /**
+     * Converts a numeric ImageSetting quality setting to a Theme API compatible option value
+     *
+     * @since 1.3
+     *
+     * @param integer $setting The numeric ImageSetting value
+     * @return integer The option value
+     **/
+    public function quality ( integer $setting ) {
+        if ( isset(self::$qualities[ $setting ])  )
+            return self::$qualities[ $setting ];
         return self::$qualities[2];
     }
 
-    public function options ($prefix='') {
+    /**
+     * Convert the ImageSetting values to a Theme API compatible array of image options
+     *
+     * @since 1.3
+     *
+     * @param string $prefix (optional) Prefix for the option keys
+     * @return array The image options
+     **/
+    public function options ( $prefix = '' ) {
         $settings = array();
-        $properties = array('width','height','fit','quality','sharpen','bg');
-        foreach ($properties as $property) {
+        $properties = array('width', 'height', 'fit', 'quality', 'sharpen', 'bg');
+        foreach ( $properties as $property ) {
             $value = $this->{$property};
-            if ('quality' == $property) $value = $this->quality_value($this->{$property});
-            if ('fit' == $property) $value = $this->fit_value($this->{$property});
-            $settings[$prefix.$property] = $value;
+            if ( 'quality' == $property ) $value = $this->quality((int)$this->{$property});
+            if ( 'fit' == $property ) $value = $this->fit((int)$this->{$property});
+            $settings[ $prefix . $property ] = $value;
         }
         return $settings;
@@ -695 +746 @@
 } // END class ImageSetting
 
+/**
+ * Loads the collection of image settings
+ *
+ * @since 1.2
+ * @package shopp
+ **/
 class ImageSettings extends ListFramework {
 
-    private static $instance;
-
-    public function __construct () {
+    private static $object;
+
+    private function __construct () {
         $ImageSetting = new ImageSetting();
         $table = $ImageSetting->_table;
@@ -706 +763 @@
             "context='$ImageSetting->context'"
         );
-        $options = compact('table','where');
+        $options = compact('table', 'where');
         $query = sDB::select($options);
-        $this->populate(sDB::query($query,'array',array($ImageSetting,'loader'),false,'name'));
+        $this->populate(sDB::query($query, 'array', array($ImageSetting, 'loader'), false, 'name'));
         $this->found = sDB::found();
     }
@@ -735 +792 @@
      * @return DB Returns a reference to the DB object
      **/
-    public static function &__instance () {
-        if (!self::$instance instanceof self)
-            self::$instance = new self;
-        return self::$instance;
-    }
-
+    public static function &object () {
+        if ( ! self::$object instanceof self )
+            self::$object = new self;
+        return self::$object;
+    }
 
 } // END class ImageSettings

shopp/trunk/core/model/Cart.php

@@ -114 +114 @@
         $commands = array('add', 'empty', 'update', 'remove');
 
+        if ( isset($_REQUEST['empty']) )
+            $_REQUEST['cart'] = 'empty';
+
         $request = isset($_REQUEST['cart']) ? strtolower($_REQUEST['cart']) : false;
 
@@ -125 +128 @@
             'item' => false,
             'items' => array(),
-            'remove' => array()
+            'remove' => array(),
         );
         $request = array_intersect_key($_REQUEST,$allowed); // Filter for allowed arguments
@@ -287 +290 @@
      *
      * @param int $quantity The quantity of the item to add to the cart
-     * @param ShoppProduct $Product Product object to add to the cart
-     * @param ShoppPrice $Price Price object to add to the cart
+     * @param ShoppProduct|ShoppCartItem $Product Product object or cart item object to add to the cart
+     * @param mixed $Price Price object to add to the cart
      * @param int $category The id of the category navigated to find the product
      * @param array $data Any custom item data to carry through
@@ -294 +297 @@
      **/
     public function additem ( $quantity = 1, &$Product, &$Price, $category = false, $data = array(), $addons = array() ) {
-        $NewItem = new ShoppCartItem($Product, $Price, $category, $data, $addons);
-
-        if ( ! $NewItem->valid() || ! $this->addable($NewItem) ) return false;
+
+        if ( 'ShoppCartItem' == get_class($Product) ) $NewItem = $Product;
+        else {
+            $NewItem = new ShoppCartItem($Product, $Price, $category, $data, $addons);
+            if ( ! $NewItem->valid() || ! $this->addable($NewItem) ) return false;
+        }
 
         $id = $NewItem->fingerprint();
@@ -625 +631 @@
         $Discounts->credits();
 
-        if ( $Shipping->free() && $Totals->total('shipping') > 0 ) {
+        if ( $Discounts->shipping() ) // If shipping discounts changed, recalculate shipping amount
             $Totals->register( new OrderAmountShipping( array('id' => 'cart', 'amount' => $Shipping->calculate() ) ) );
-        }
 
         do_action_ref_array('shopp_cart_retotal', array(&$Totals) );

shopp/trunk/core/model/Collection.php

@@ -70 +70 @@
             'adjacent' => false,    //
             'product' => false,     //
-            'load' => array(),      // Product data to load
+            'load' => array('coverimages'),     // Product data to load
             'inventory' => false,   // Flag for detecting inventory-based queries
             'taxquery' => false,    // Cross taxonomy queries
@@ -1467 +1467 @@
     public $name = false;
     public $loading = array();
+    protected $_options = array();
 
     public function __construct ( array $options = array() ) {
+
+        $this->taxonomy = self::$taxon;
+
+        $thisclass = get_class($this);
+        $slugs = SmartCollection::slugs($thisclass);
+
+        $this->slug = $this->uri = $slugs[0];
+
+        $this->name = call_user_func(array($thisclass, 'name'));
+        $this->_options = $options;
+    }
+
+    public static function name () {
+        return Shopp::__('Collection');
+    }
+
+    public static function slugs ( string $class ) {
+        return apply_filters( 'shopp_' . strtolower($class) . '_collection_slugs', get_class_property($class, 'slugs') );
+    }
+
+    public function load ( array $options = array() ) {
+        $options = array_merge( $this->_options, $options );
+        $this->smart($options);
 
         if ( isset($options['show']) )
@@ -1476 +1500 @@
             $this->loading['pagination'] = $options['pagination'];
 
-        $this->taxonomy = self::$taxon;
-
-        $thisclass = get_class($this);
-        $slugs = SmartCollection::slugs($thisclass);
-
-        $this->slug = $this->uri = $slugs[0];
-
-        $this->name = call_user_func(array($thisclass, 'name'));
-    }
-
-    public static function name () {
-        return Shopp::__('Collection');
-    }
-
-    public static function slugs ( string $class ) {
-        return apply_filters( 'shopp_' . strtolower($class) . '_collection_slugs', get_class_property($class, 'slugs') );
-    }
-
-    public function load ( array $options = array() ) {
-        $this->smart($options);
         parent::load($this->loading);
+    }
+
+    public static function defaultlinks ( $termlink, $term, $taxonomy ) {
+        if ( false !== strpos($termlink, "taxonomy=" . self::$taxon) )
+            return home_url("?" . self::$taxon . "=$term->slug");
+        return $termlink;
     }
 
@@ -1755 +1765 @@
             'groupby' => 'p.ID',
             'orderby' => 'score DESC');
-        if ( ! empty($pricematch) ) $this->loading['having'] = array($pricematch);
+        if ( ! empty($pricematch) ) $this->loading[ empty( $search )? 'where':'having' ] = array($pricematch);
         if ( isset($options['show']) ) $this->loading['limit'] = $options['show'];
         if ( isset($options['published']) ) $this->loading['published'] = $options['published'];

shopp/trunk/core/model/Customer.php

@@ -287 +287 @@
             extract((array)$Storefront->account);
 
-        if ( isset($id) )
+        if ( ! empty($id) )
             $this->order($id);
 
@@ -493 +493 @@
     public function load_downloads () {
         // Bail out if the downloads property is already populated or we can't load customer order data
-        if ( /*! empty($this->downloads) ||*/ ! ($purchases = shopp_customer_orders($this->id)) ) return; # Decomment before commit!
+        if ( /*! empty($this->downloads) ||*/ ! ($purchases = shopp_customer_orders($this->id)) ) return; // Decomment before commit!
         $this->downloads = array();
 
         foreach ( $purchases as $Purchase ) {
+            if ( ! in_array($Purchase->txnstatus, array('captured')) ) continue;
             reset($Purchase->purchased);
             $this->extract_downloads($Purchase->purchased);
@@ -502 +503 @@
     }
 
-    protected function extract_downloads ($items) {
+    protected function extract_downloads ( $items ) {
+
+        $this->_filemap = array(); // Temporary property to hold the file mapping index
+
         while ( list($index, $Purchased) = each($items) ) {
             // Check for downloadable addons
@@ -514 +518 @@
             // Is it a downloadable item? Do not add the same dkey twice
             if ( empty($Purchased->download) ) continue;
+
+            // Load download file data
             $this->downloads[ $Purchased->dkey ] = $Purchased;
-        }
+            $this->_filemap[ $Purchased->download ] = $Purchased->dkey;
+        }
+
+        $this->load_downloadfiles( array_keys($this->_filemap) );
+
+    }
+
+    /**
+     * Loads the extra download file data for the loaded customer downloads
+     *
+     * @author Jonathan Davis
+     * @since 1.3.2
+     *
+     * @param array $downloads a list of download meta record ids to load
+     * @return void
+     **/
+    public function load_downloadfiles ( array $downloads = array() ) {
+
+        if ( empty($downloads) ) return false;
+
+        $meta_table = ShoppDatabaseObject::tablename(ShoppMetaObject::$table);
+        sDB::query("SELECT * FROM $meta_table WHERE id IN (" . join(',', $downloads) . ")", 'array', array($this, 'download_loader'));
+
+        unset($this->_filemap);
+    }
+
+    /**
+     * Download record loader to map download file data to the loaded downloads for the customer
+     *
+     * @author Jonathan Davis
+     * @since 1.3.2
+     *
+     * @param array $records The records to map to (unused becase they are mapped to the Customer->downloads records)
+     * @param array $record The record data loaded from the query
+     * @return void
+     **/
+    public function download_loader ( &$records, &$record ) {
+
+        // Lookup the download key
+        if ( empty($this->_filemap[ $record->id ]) ) return;
+        $dkey = $this->_filemap[ $record->id ];
+
+        // Find the purchased download
+        if ( empty($this->downloads[ $dkey ]) ) return;
+        $Purchased = &$this->downloads[ $dkey ];
+
+        // Unserialize the file data
+        $data = maybe_unserialize($record->value);
+        if ( is_object($data) ) $properties = get_object_vars($data);
+        else return;
+
+        // Map the file data to the purchased download record
+        foreach ( (array)$properties as $property => $value )
+            $Purchased->$property = sDB::clean($value);
+
     }
 
@@ -743 +803 @@
     }
 } // END class CustomerXLSExport
-
-/**
- * CustomerAccountPage class
- *
- * A property container for Shopp's customer account page meta
- *
- * @author Jonathan Davis
- * @since 1.1
- * @package customer
- **/
-class CustomerAccountPage {
-
-    public $request = '';
-    public $label = '';
-    public $handler = false;
-
-    public function __construct ( $request, $label, $handler ) {
-        $this->request = $request;
-        $this->label = $label;
-        $this->handler = $handler;
-    }
-
-} // END class CustomerAccountPage

shopp/trunk/core/model/Discounts.php

@@ -29 +29 @@
     private $request = false;   // Current code request
     private $credit = false;    // Credit request types
-
-    /**
-     * Get or set the current request
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @param string $request The request string to set
-     * @return string The current request
-     **/
-    public function request ( string $request = null ) {
-
-        if ( isset($request) ) $this->request = $request;
-        return $this->request;
-
-    }
-
-    public function credit ( string $request = null ) {
-
-        if ( isset($request) ) $this->credit = $request;
-        return $this->credit;
-
-    }
-
-    /**
-     * Handle parsing and routing discount code related requests
-     *
-     * @author Jonathan Davis
-     * @since 1.3
-     *
-     * @return void
-     **/
-    public function requests () {
-
-        if ( isset($_REQUEST['discount']) && ! empty($_REQUEST['discount']) )
-            $this->request( trim($_REQUEST['discount']) );
-        elseif ( isset($_REQUEST['credit']) && ! empty($_REQUEST['credit']) )
-            $this->credit( trim($_REQUEST['credit']) );
-
-        if ( isset($_REQUEST['removecode']) && ! empty($_REQUEST['removecode']) )
-            $this->undiscount(trim($_REQUEST['removecode']));
-
-    }
+    private $shipping = false;  // Track shipping discount changes
 
     /**
@@ -116 +74 @@
     }
 
-    public function credits () {
-        $credits = array();
-
-        $CartTotals = ShoppOrder()->Cart->Totals;
-
-        // Wipe out any existing credit calculations
-        $CartTotals->takeoff('discount', 'credit');
-        $discounts = $CartTotals->total('discount'); // Resum the applied discounts (without credits)
-
-        foreach ( $this as $Discount ) {
-            if ( $Discount->type() != ShoppOrderDiscount::CREDIT ) continue;
-            $Discount->calculate(); // Recalculate based on current total to apply an appropriate amount
-            $credits[] = $Discount->amount();
-            $CartTotals->register( new OrderAmountDiscount( array('id' => 'credit', 'amount' => array_sum($credits) ) ) );
-        }
-
-        $amount = array_sum($credits);
-
-        return (float) $amount;
-    }
-
     /**
      * Match the promotions that apply to the order
@@ -154 +91 @@
         // Match applied first
         $Promotions->sort( array($this, 'sortapplied'), 'keys' );
+
+        // Reset shipping flag to track changes
+        $this->shipping = false;
 
         // Iterate over each promo to determine whether it applies
@@ -239 +179 @@
 
         $this->add($Promo->id, $Discount);
+        $this->shipping($Discount); // Flag shipping changes
 
     }
@@ -349 +290 @@
 
         $Discount = $this->get($id);
+        $Discount->unapply();
 
         $_REQUEST['cart'] = true;
 
-        $this->remove($id);
+        $this->remove($Discount->id()); // Remove it from the discount stack if it is there
+        $this->shipping($Discount);     // Flag shipping changes
 
         if ( isset($this->codes[ $Discount->code() ]) ) {
@@ -371 +314 @@
      **/
     private function reset ( ShoppOrderPromo $Promo ) {
-
-        $this->remove($Promo->id);      // Remove it from the discount stack if it is there
-
+        $this->undiscount((int)$Promo->id);
     }
 
@@ -398 +339 @@
 
         return false;
+    }
+
+    /**
+     * Get or set the current request
+     *
+     * @author Jonathan Davis
+     * @since 1.3
+     *
+     * @param string $request The request string to set
+     * @return string The current request
+     **/
+    public function request ( string $request = null ) {
+
+        if ( isset($request) ) $this->request = $request;
+        return $this->request;
+
+    }
+
+    public function credit ( string $request = null ) {
+
+        if ( isset($request) ) $this->credit = $request;
+        return $this->credit;
+
+    }
+
+    /**
+     * Handle parsing and routing discount code related requests
+     *
+     * @author Jonathan Davis
+     * @since 1.3
+     *
+     * @return void
+     **/
+    public function requests () {
+
+        if ( isset($_REQUEST['discount']) && ! empty($_REQUEST['discount']) )
+            $this->request( trim($_REQUEST['discount']) );
+        elseif ( isset($_REQUEST['credit']) && ! empty($_REQUEST['credit']) )
+            $this->credit( trim($_REQUEST['credit']) );
+
+        if ( isset($_REQUEST['removecode']) && ! empty($_REQUEST['removecode']) )
+            $this->undiscount(trim($_REQUEST['removecode']));
+
+    }
+
+    /**
+     * Applies credits to the order discounts register
+     *
+     * @author Jonathan Davis
+     * @since 1.3
+     *
+     * @return float The total amount credited
+     **/
+    public function credits () {
+        $credits = array();
+
+        $CartTotals = ShoppOrder()->Cart->Totals;
+
+        // Wipe out any existing credit calculations
+        $CartTotals->takeoff('discount', 'credit');
+        $discounts = $CartTotals->total('discount'); // Resum the applied discounts (without credits)
+
+        foreach ( $this as $Discount ) {
+            if ( $Discount->type() != ShoppOrderDiscount::CREDIT ) continue;
+            $Discount->calculate(); // Recalculate based on current total to apply an appropriate amount
+            $credits[] = $Discount->amount();
+        }
+
+        $amount = array_sum($credits);
+        if ( $amount > 0 )
+            $CartTotals->register( new OrderAmountDiscount( array('id' => 'credit', 'amount' => $amount ) ) );
+
+        return (float) $amount;
+    }
+
+
+    /**
+     * Report shipping discount changes
+     *
+     * @author Jonathan Davis
+     * @since 1.3.2
+     *
+     * @param ShoppOrderDiscount $Discount (optional) The applied or unapplied discount to check for shipping changes
+     * @return boolean True if shipping discounts changed, false otherwise
+     **/
+    public function shipping ( ShoppOrderDiscount $Discount = null ) {
+
+        if ( isset($Discount) && ShoppOrderDiscount::SHIP_FREE == $Discount->type() )
+            $this->shipping = true;
+
+        return $this->shipping;
     }
 
@@ -568 +600 @@
 
             case 'discounts applied':   return ShoppOrder()->Discounts->count();
-            case 'total quantity':      return $Cart->Totals->total('quantity');
-            case 'shipping amount':     return $Cart->Totals->total('shipping');
-            case 'subtotal amount':     return $Cart->Totals->total('order');
+            case 'total quantity':      return $Cart->total('quantity');
+            case 'shipping amount':     return $Cart->total('shipping');
+            case 'subtotal amount':     return $Cart->total('order');
             case 'customer type':       return ShoppOrder()->Customer->type;
             case 'ship-to country':     return ShoppOrder()->Shipping->country;
@@ -697 +729 @@
 
             // Numeric operations
-            case 'is greater than':             return (Shopp::floatval($subject,false) > Shopp::floatval($value,false));
-            case 'is greater than or equal to': return (Shopp::floatval($subject,false) >= Shopp::floatval($value,false));
-            case 'is less than':                return (Shopp::floatval($subject,false) < Shopp::floatval($value,false));
-            case 'Is less than or equal to':    return (Shopp::floatval($subject,false) <= Shopp::floatval($value,false));
+            case 'is greater than':             return (Shopp::floatval($subject, false) >  Shopp::floatval($value, false));
+            case 'is greater than or equal to': return (Shopp::floatval($subject, false) >= Shopp::floatval($value, false));
+            case 'is less than':                return (Shopp::floatval($subject, false) <  Shopp::floatval($value, false));
+            case 'is less than or equal to':    return (Shopp::floatval($subject, false) <= Shopp::floatval($value, false));
         }
 
@@ -860 +892 @@
      **/
     public function applies () {
-        $applies = ( $this->amount() > 0 || ( $this->amount() == 0 && $this->shipfree() ) );
+        $applies = ( $this->amount() > 0 || ( $this->amount() == 0 && $this->shipfree() ) || count($this->items) > 0 );
         return apply_filters('shopp_discount_applies', $applies, $this );
     }
@@ -1087 +1119 @@
             case self::PERCENT_OFF: $amount = $Item->unitprice * ($this->discount() / 100); break;
             case self::AMOUNT_OFF:  $amount = $this->discount(); break;
-            case self::SHIP_FREE:   $Item->freeshipping = true; $amount = 0; break;
+            case self::SHIP_FREE:   $Item->freeshipping = true; $this->shipping = true; $amount = 0; break;
             case self::BOGOF:
                 list($buy, $get) = $this->discount();
@@ -1120 +1152 @@
     public function hasitem ( string $key ) {
         return isset($this->items[ $key ]);
+    }
+
+    /**
+     * Unapply the discount
+     *
+     * This primarily involves resetting the Cart Item->freeshipping property.
+     *
+     * @author Jonathan Davis
+     * @since 1.3
+     *
+     * @return void Description...
+     **/
+    public function unapply () {
+        $Cart = ShoppOrder()->Cart;
+
+        if ( self::SHIP_FREE == $this->type ) {
+            $Shiprates = ShoppOrder()->Shiprates;
+            foreach ( $this->items as $id => $item ) {
+                $CartItem = $Cart->get($id);
+                $CartItem->freeshipping = false;
+            }
+        }
+
     }
 
@@ -1133 +1188 @@
 class ShoppPurchaseDiscount {
 
-    public $id = false;                     // The originating promotion object id
-    public $name = '';                      // The name of the promotion
-    public $amount = 0.00;                  // The total amount of the discount
-    public $type = ShoppOrderDiscount::AMOUNT_OFF;      // The discount type
-    public $target = ShoppOrderDiscount::ORDER;         // The discount target
-    public $discount = false;               // The calculated discount amount (float or array for BOGOFs)
-    public $code = false;                   // The code associated with the discount
-    public $shipfree = false;               // A flag for free shipping
+    public $id = false;                             // The originating promotion object id
+    public $name = '';                              // The name of the promotion
+    public $amount = 0.00;                          // The total amount of the discount
+    public $type = ShoppOrderDiscount::AMOUNT_OFF;  // The discount type
+    public $target = ShoppOrderDiscount::ORDER;     // The discount target
+    public $discount = false;                       // The calculated discount amount (float or array for BOGOFs)
+    public $code = false;                           // The code associated with the discount
+    public $shipfree = false;                       // A flag for free shipping
 
     public function __construct ( ShoppOrderDiscount $Discount ) {

shopp/trunk/core/model/Gateway.php

@@ -345 +345 @@
     public function amount ( $amount, array $format = array() ) {
 
+        $register = false;
+
         if ( is_string($amount) ) {
+            $register = $amount;
             $Cart = ShoppOrder()->Cart;
             $amount = $Cart->total($amount);
+            if ( false === $amount ) $register = false;
         } elseif ( ! ( is_int($amount) || is_float($amount) ) ) return $amount;
 
@@ -358 +362 @@
         extract($format);
 
+        if ( ! empty($register) ) // Allow targeting specific amounts for filtering
+            $amount = apply_filters("shopp_gateway_{$register}_amount", $amount);
+
         $amount = apply_filters('shopp_gateway_amount', abs($amount));
+
         return number_format($amount, $precision, $decimals, $thousands);
+    }
+
+    /**
+     * Zeros out tax amounts when tax inclusive is enabled
+     *
+     * Prevents inclusive-tax unaware payment systems (such as PayPal Standard)
+     * from adding extra taxes to the order
+     *
+     * @author Jonathan Davis
+     * @since 1.3.2
+     *
+     * @param float $amount The tax amount to filter
+     * @return float The correct amount
+     **/
+    public function notaxinclusive ( $amount ) {
+        if ( shopp_setting_enabled('tax_inclusive') ) return 0.0;
+        else return $amount;
     }
 

shopp/trunk/core/model/Item.php

@@ -79 +79 @@
      * @return void
      **/
-    public function __construct ( $Product, $pricing, $category = false, $data = array(), $addons = array() ) {
+    public function __construct ( ShoppProduct $Product = null, $pricing = null, $category = false, array $data = array(), array $addons = array() ) {
+
         $args = func_get_args();
         if ( empty($args) ) return;
@@ -86 +87 @@
         else $this->load($Product, $pricing, $category, $data, $addons);
 
-        // $this->__wakeup();
-        // $this->rediscount();
-        // $this->totals();
-
-    }
-
-    // public function __wakeup () {
-    //  add_action('shopp_cart_item_totals', array($this, 'rediscount'));
-    //  add_action('shopp_cart_item_totals', array($this, 'totals'));
-    // }
-
-    /**
-     * load
-     *
-     * loads/constructs the Item object from parameters
-     *
-     * @author John Dillick
+    }
+
+    /**
+     * Loads or constructs the Item object from product and product pricing parameters
+     *
+     * @author John Dillick, Jonathan Davis
      * @since 1.2
      *
@@ -120 +110 @@
             if ( ! isset($Product->pricekey[ $optionkey ]) ) $optionkey = $Product->optionkey($pricing, true); // deprecated prime
             if ( isset($Product->pricekey[ $optionkey ]) ) $Price = $Product->pricekey[ $optionkey ];
-        } elseif ( $pricing ) {
+        } elseif ( is_numeric($pricing) ) {
             $Price = $Product->priceid[ $pricing ];
+        } elseif ( is_a($pricing, 'ShoppPrice') ) {
+            $Price = $pricing;
         }
 
@@ -254 +246 @@
     }
 
+    /**
+     * Loads or constructs item properties from a purchased product
+     *
+     * @author Jonathan Davis
+     * @since 1.3
+     *
+     * @return void
+     **/
     public function load_purchased ( $Purchased ) {
 
@@ -281 +281 @@
         // no product or no price specified
         if ( ! $this->product || ! $this->priceline ) {
-            new ShoppError(__('The product could not be added to the cart because it could not be found.','Shopp'),'cart_item_invalid',SHOPP_ERR);
+            new ShoppError(__('The product could not be added to the cart because it could not be found.','Shopp'), 'cart_item_invalid', SHOPP_ERR);
             return false;
         }
@@ -287 +287 @@
         // the item is not in stock
         if ( ! $this->instock() ) {
-            new ShoppError(__('The product could not be added to the cart because it is not in stock.','Shopp'),'cart_item_invalid',SHOPP_ERR);
+            new ShoppError(__('The product could not be added to the cart because it is not in stock.','Shopp'), 'cart_item_invalid', SHOPP_ERR);
             return false;
         }
@@ -303 +303 @@
     public function fingerprint () {
         $_  = $this->product.$this->priceline;
+        if ( empty($_) ) $_ = $this->name;
+        if ( empty($_) ) $_ = mktime();
         if ( ! empty($this->addons) )   $_ .= serialize($this->addons);
         if ( ! empty($this->data) )     $_ .= serialize($this->data);
-        return __CLASS__ . '_' . hash('crc32',$_);
+        return __CLASS__ . '_' . hash('crc32', $_);
     }
 

shopp/trunk/core/model/Meta.php

@@ -36 +36 @@
      * @return void
      **/
-    function __construct ($id=false,$key='id') {
+    function __construct ( $id = false, $key = 'id' ) {
         $this->init(self::$table);
-        if (!$id) return;
-        if (is_array($id)) $this->load($id);
-        else $this->load(array($key=>$id,'type'=>$this->type));
-
-        if (!empty($this->id) && !empty($this->_xcols))
+        if ( ! $id ) return;
+
+        if ( is_array($id) )
+            $this->load($id);
+        else $this->load(array($key => $id, 'type' => $this->type));
+
+        if ( ! empty($this->id) && ! empty($this->_xcols) )
             $this->expopulate();
     }
@@ -55 +57 @@
      **/
     function expopulate () {
-        if (!is_object($this->value)) return;
+        if ( ! is_object($this->value) ) return;
         $properties = $this->value;
         $this->copydata($properties);

shopp/trunk/core/model/Payments.php

@@ -134 +134 @@
         $this->rewind();
         $selected = $this->key();
+
+        if ( empty($selected) ) return false;
 
         return $this->selected($selected);

shopp/trunk/core/model/Product.php

@@ -16 +16 @@
 
 class ShoppProduct extends WPShoppObject {
+
     static $table = 'posts';
     static $_taxonomies = array(
@@ -64 +65 @@
     );
 
+    // Keep track of data load efforts
+    protected $_loaded = array();
+
     /**
      * Product constructor
@@ -72 +76 @@
      * @return void
      **/
-    public function __construct ($id=false,$key='ID') {
-        if (isset($this->_map[$key])) $key = $this->_map[$key];
-        $this->init(self::$table,$key);
+    public function __construct ( $id = false, $key = 'ID' ) {
+        if ( isset($this->_map[ $key ]) ) $key = $this->_map[ $key ];
+        $this->init(self::$table, $key);
         $this->type = self::$posttype;
-        $this->load($id,$key);
+        $this->load($id, $key);
     }
 
@@ -111 +115 @@
     public static function labels () {
         return apply_filters( 'shopp_product_labels', array(
-            'name' => __('Products','Shopp'),
-            'singular_name' => __('Product','Shopp'),
-            'edit_item' => __('Edit Product','Shopp'),
-            'new_item' => __('New Product','Shopp')
+            'name' => __('Products', 'Shopp'),
+            'singular_name' => __('Product', 'Shopp'),
+            'edit_item' => __('Edit Product', 'Shopp'),
+            'new_item' => __('New Product', 'Shopp')
         ));
     }
@@ -141 +145 @@
      * @return void
      **/
-    public function load_data ($options=array('prices','specs','images','categories','tags','meta','summary'),&$products=array()) {
+    public function load_data ( array $options = array('prices', 'specs', 'images', 'categories', 'tags', 'meta', 'summary'), array &$products = array() ) {
         // Load summary before prices to ensure summary can be overridden by fresh pricing aggregation
         $loaders = array(
-        //  'name'      'callback_method'
-            'summary'    => 'load_summary',
-            'meta'       => 'load_meta',
-            'prices'     => 'load_prices',
-            'specs'      => 'load_meta',
-            'images'     => 'load_meta',
-            'coverimages'=> 'load_coverimages',
-            'categories' => 'load_taxonomies',
-            'tags'       => 'load_taxonomies'
+        //  'name'           'callback_method'
+            'summary'     => 'load_summary',
+            'meta'        => 'load_meta',
+            'prices'      => 'load_prices',
+            'specs'       => 'load_meta',
+            'images'      => 'load_meta',
+            'coverimages' => 'load_coverimages',
+            'categories'  => 'load_taxonomies',
+            'tags'        => 'load_taxonomies'
 
         );
-
-        $options = array_map('strtolower',$options);
-        $load = array_flip(array_intersect($options,array_keys($loaders)));
-        $loadcalls = array_unique(array_values(array_intersect_key($loaders,$load)));
-
-        if (!empty($products) ) {
-            $ids = join(',',array_keys($products));
+        // allow case-insensitive options
+        $options = array_map('strtolower', $options);
+
+        // prevent loading data sets already requested and processed
+        $options = array_diff($options, $this->_loaded);
+
+        // Only allow white-listed load operations
+        $load = array_flip(array_intersect($options, array_keys($loaders)));
+
+        // Convert load requests to loading callbacks while preventing duplicate calls
+        $loadcalls = array_unique(array_values(array_intersect_key($loaders, $load)));
+
+        if ( ! empty($products) ) { // Handle loading data across a collection of products
+            $ids = join(',', array_keys($products));
             $this->products = &$products;
-        } else $ids = $this->id;
+            foreach ( $products as $product )
+                $product->_loaded = array_merge($product->_loaded, $options);
+        } else { // Handle loading data for a single product
+            $ids = $this->id;
+            $this->_loaded = array_unique(array_merge($this->_loaded, $options));
+        }
 
         if ( empty($ids) ) return;
-        foreach ($loadcalls as $loadmethod) {
+
+        foreach ( $loadcalls as $loadmethod )
             if ( method_exists($this, $loadmethod) )
-                call_user_func_array(array($this,$loadmethod),array($ids));
-        }
+                call_user_func_array(array($this, $loadmethod), array($ids));
 
     }
@@ -202 +218 @@
 
         // Reset summary properties for correct price range and stock sums in single product (product page) loading contexts
-        if ( ! empty($this->id) && $this->id == $ids && empty($this->checksum) ) {
+        if (!empty($this->id) && $this->id == $ids) {
             $this->load_summary($ids);
             $this->resum();
@@ -398 +414 @@
     public function metasetloader ( &$records, &$record, $id = 'id', $property = false, $collate = true, $merge = false ) {
 
-        if (isset($this->products) && !empty($this->products)) $products = &$this->products;
+        if ( isset($this->products) && ! empty($this->products) ) $products = &$this->products;
         else $products = array();
 
@@ -436 +452 @@
         }
 
-        if ('images' == $property) {
+        if ( 'images' == $property ) {
             // Prevent double-loading images (can occur when images are specifically loaded, then all meta is generically loaded)
-            if (isset($target->$property) && isset($target->{$property}[$record->id])) return;
+            if ( isset($target->$property) && isset($target->{$property}[ $record->id ]) ) return;
             $collate = 'id';
-        }
-
-        if ('specs' == $property) {
+            // Prevent extra image queries since we already tried
+        }
+
+        if ( 'specs' == $property ) {
             $property = 'specnames';
             parent::metaloader($records, $record, $products, $id, $property, $collate, $merge);
@@ -577 +594 @@
         }
 
+        $price->_sale = $price->sale; // Keep a copy of the price record "sale" setting {@see issue #2797}
         if ($price->promoprice < $price->price) $target->sale = $price->sale = 'on';
 
@@ -1110 +1128 @@
             if ( ! isset($term->taxonomy) || empty($term->taxonomy) ) continue;     // Skip invalid entries
 
-            if (!isset($terms[$term->taxonomy])) $terms[$term->taxonomy] = array();
-            $terms[$term->taxonomy][] = (int)$term->term_id;
+            if ( ! isset($terms[ $term->taxonomy ]) )
+                $terms[ $term->taxonomy ] = array();
+            $terms[ $term->taxonomy ][] = (int)$term->term_id;
         }
         foreach ($terms as $taxonomy => $termlist)
@@ -1117 +1136 @@
 
         $metadata = array('specs','images','settings','meta');
-        foreach ($metadata as $metaset) {
+        foreach ( $metadata as $metaset ) {
             if ( ! is_array($this->$metaset) ) continue;
-            foreach ($this->$metaset as $metaobjects) {
+            foreach ( $this->$metaset as $metaobjects ) {
                 if ( ! is_array($metaobjects) ) $metaobjects = array($metaobjects);
                 foreach ( $metaobjects as $meta ) {
@@ -1130 +1149 @@
             }
         }
+
+        // Duplicate summary (primarily for summary settings data)
+        $Summary = new ProductSummary($original);
+        $Summary->product = $this->id;
+        $Summary->save();
 
         // Re-summarize product pricing

shopp/trunk/core/model/Promotion.php

@@ -132 +132 @@
 
         $table = ShoppDatabaseObject::tablename(ShoppPrice::$table);
+        echo "SELECT id,product,discounts,FIND_IN_SET($this->id,discounts) AS offset FROM $table WHERE id IN ('" . join(',', $pricetags) . "')";
         $discounted = sDB::query("SELECT id,product,discounts,FIND_IN_SET($this->id,discounts) AS offset FROM $table WHERE id IN ('" . join(',', $pricetags) . "')", 'array');
 
@@ -139 +140 @@
             $promos = explode(',', $pricetag->discounts);
             array_splice($promos, ($pricetag->offset - 1), 1); // Remove the located promotion ID from the discounts list
+            echo "UPDATE $table SET discounts='" . join(',', $promos) . "' WHERE id=$pricetag->id";
             sDB::query("UPDATE $table SET discounts='" . join(',', $promos) . "' WHERE id=$pricetag->id");
         }
@@ -144 +146 @@
         // Force resum on products next load
         $summary = ShoppDatabaseObject::tablename('summary');
-        sDB::query("UPDATE $summary SET modified='" . ProductSummary::$_updates . "' WHERE product IN (" . join(',', $products). ")");
+        echo "UPDATE $summary SET modified='" . ProductSummary::RECALCULATE . "' WHERE product IN (" . join(',', $products). ")";
+        sDB::query("UPDATE $summary SET modified='" . ProductSummary::RECALCULATE . "' WHERE product IN (" . join(',', $products). ")");
     }
 

shopp/trunk/core/model/Purchase.php

@@ -253 +253 @@
      **/
     public function isrefunded () {
-        if (empty($this->events)) $this->load_events();
-        return ($this->refunded == $this->captured);
+        if ( empty($this->events) ) $this->load_events();
+        return ( $this->refunded == $this->captured );
     }
 
@@ -266 +266 @@
      **/
     public function isvoid () {
-        if (empty($this->events)) $this->load_events();
+        if ( empty($this->events) ) $this->load_events();
         return ($this->voided > 0 && $this->voided >= $this->invoiced);
     }
@@ -285 +285 @@
 
     public function capturable () {
-        if (!$this->authorized) return 0.0;
+        if ( ! $this->authorized ) return 0.0;
         return ($this->authorized - (float)$this->captured);
     }
@@ -471 +471 @@
                 sprintf(__('Order #%s: %s', 'Shopp'), $Purchase->id, $Event->label()), // Subject
                 "email-merchant-$Event->name.php")      // Template
-        ));
+        ), $Event);
 
         // Event-specific hook for event specific email messages
-        $messages = apply_filters('shopp_' . $Event->name . '_order_event_emails', $messages);
+        $messages = apply_filters('shopp_' . $Event->name . '_order_event_emails', $messages, $Event);
 
         foreach ( $messages as $name => $message ) {
@@ -820 +820 @@
                         case "discount":
                                             $meta_table = ShoppDatabaseObject::tablename(ShoppMetaObject::$table);
-                                            $joins[ $meta_table ] = "INNER JOIN $meta_table AS discounts ON discounts.parent = o.id";
-                                            $search[] = "discounts.value LIKE '%$keyword%' AND discounts.context='purchase' AND discounts.name='discounts'"; break;
+                                            $joins[ $meta_table ] = "INNER JOIN $meta_table AS discounts ON discounts.parent = o.id AND discounts.name='discounts' AND discounts.context='purchase'";
+                                            $search[] = "discounts.value LIKE '%$keyword%'"; break;
                     }
                 }
@@ -838 +838 @@
         $offset = ($this->set * $this->limit);
 
-        $c = 0; $columns = array(); $purchasedcols = false;
+        $c = 0; $columns = array(); $purchasedcols = false; $discountcols = false;
         foreach ( $this->selected as $column ) {
             $columns[] = "$column AS col".$c++;
             if ( false !== strpos($column, 'p.') ) $purchasedcols = true;
+            if ( false !== strpos($column, 'discounts') ) $discountcols = true;
         }
         if ( $purchasedcols ) $FROM = "FROM $purchasedtable AS p INNER JOIN $purchasetable AS o ON o.id=p.purchase";
         else $FROM = "FROM $purchasetable AS o";
+
+        if ( $discountcols ) {
+            $meta_table = ShoppDatabaseObject::tablename(ShoppMetaObject::$table);
+            $joins[ $meta_table ] = "INNER JOIN $meta_table AS discounts ON discounts.parent = o.id AND discounts.name='discounts' AND discounts.context='purchase'";
+        }
 
         $joins = join(' ', $joins);

shopp/trunk/core/model/Settings.php

@@ -35 +35 @@
      * the unavailable flag is set.
      *
-     * @author Jonathan Davis
      * @since 1.0
      * @version 1.1
@@ -63 +62 @@
      * Update the availability status of the settings database table
      *
-     * @author Jonathan Davis
      * @since 1.1
      *
@@ -75 +73 @@
      * Load settings from the database
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -108 +105 @@
      * Add a new setting to the registry and store it in the database
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -131 +127 @@
      * Updates the setting in the registry and the database
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -161 +156 @@
      * Save a setting to the database
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -181 +175 @@
      * Save a setting to the database if it does not already exist
      *
-     * @author Jonathan Davis
      * @since 1.1
      *
@@ -195 +188 @@
      * Remove a setting from the registry and the database
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -221 +213 @@
      * loading it directly from the database.
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -252 +243 @@
      * Restores a serialized value to a runtime object/structure
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -261 +251 @@
         if ( ! is_string($value) ) return $value;
         // Return unserialized, if serialized value
-        if ( is_serialized($value) ) {
-            $restored = unserialize($value);
-            if ( empty($restored) ) $restored = unserialize( stripslashes($value) );
+        if ( sDB::serialized($value) ) {
+            $restored = @unserialize($value);
+            if ( empty($restored) ) $restored = @unserialize( stripslashes($value) );
             if ( false !== $restored ) return $restored;
         }
@@ -272 +262 @@
      * Provides a blank setting object template
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -294 +283 @@
      * Automatically collect and save settings from a POST form
      *
-     * @author Jonathan Davis
      * @since 1.0
      *
@@ -301 +289 @@
     public function saveform () {
         if ( empty($_POST['settings']) || ! is_array($_POST['settings']) ) return false;
-        foreach ( $_POST['settings'] as $setting => $value )
-            $this->save($setting, stripslashes_deep($value));
+
+        $settings = stripslashes_deep($_POST['settings']);
+        $settings = Shopp::trim_deep($settings);
+
+        foreach ( $settings as $setting => $value )
+            $this->save($setting, $value);
+
     }
 
@@ -311 +304 @@
      * also checks the legacy
      *
-     * @author Jonathan Davis
      * @since 1.3
      *
@@ -328 +320 @@
         // Try again using the legacy table
         if ( false === $version && false === $legacy ) $version = self::dbversion('legacy');
+        elseif ( false !== $legacy ) { // No version in the legacy settings table, possible 1.0 install?
+            // Look in the old settings table for the old Shopp version setting
+            $shopp_version = sDB::query("SELECT value FROM $table WHERE name='version' ORDER BY id DESC LIMIT 1", 'object', 'col');
+            // Use (int) 1 to indicate Shopp 1.0 installed and avoid the install process
+            if ( version_compare($shopp_version, '1.1', '<') ) $version = 1;
+        }
 
         if ( false === $version ) ShoppSettings()->registry['db_version'] = null;
@@ -335 +333 @@
     }
 
+
 } // END class Settings

shopp/trunk/core/model/Shiprates.php

@@ -257 +257 @@
 
         foreach ( $this->shippable as $id => $free ) {
-            if ( $free ) continue;
 
             $CartItem = shopp_cart_item($id);
@@ -263 +262 @@
 
             $Item = new ShoppShippableItem( $CartItem );
+            $this->item($Item);
             do_action_ref_array('shopp_calculate_item_shipping', array($id, &$Item));
         }
@@ -472 +472 @@
         if ( ! $this->shippable ) return false;
 
-        $this->id = $Item->fingerprint();
-        $this->quantity = $Item->quantity;
-        $this->fees = $Item->shipfee;
-        $this->weight = $Item->weight;
-        $this->length = $Item->length;
-        $this->width = $Item->width;
-        $this->height = $Item->height;
-        $this->shipsfree = $Item->freeshipping;
+        $this->id        = $Item->fingerprint();
+        $this->quantity  =& $Item->quantity;
+        $this->fees      =& $Item->shipfee;
+        $this->weight    =& $Item->weight;
+        $this->length    =& $Item->length;
+        $this->width     =& $Item->width;
+        $this->height    =& $Item->height;
+        $this->shipsfree =& $Item->freeshipping;
     }
 

shopp/trunk/core/model/Tax.php

@@ -218 +218 @@
      * @author Jonathan Davis
      * @since 1.3
+     * @deprecated Use ShoppTax->location()
      *
      * @param BillingAddress $Billing The billing address
@@ -225 +226 @@
      **/
     public function address ( BillingAddress $Billing, ShippingAddress $Shipping = null, $shipped = false ) {
-
         $Address = $Billing;
         if ( $shipped && null !== $Shipping || shopp_setting_enabled('tax_destination') ) // @todo add setting for "Apply tax to the shipping address"
@@ -238 +238 @@
 
         $this->address = array_merge(apply_filters('shopp_taxable_address', compact('country','zone','locale')));
+
+        return $this->address;
+    }
+
+
+
+    /**
+     * Sets the taxable location (address) for matching tax rates
+     *
+     * @author Jonathan Davis
+     * @since 1.3.2
+     *
+     * @param string $country The country code
+     * @param string $state The state name or code
+     * @param string $locale (optional) The locale name
+     * @return array An associative array containing the country, zone and locale
+     **/
+    public function location ( string $country = null, string $state = null, string $locale = null ) {
+
+        $address = apply_filters('shopp_taxable_address', array(
+            'country' => $country,
+            'zone' => $state,
+            'locale' => $locale
+        ));
+
+        $this->address = array_merge($this->address, array_filter($address));
 
         return $this->address;

shopp/trunk/core/ui/behaviors/catalog.js

@@ -395 +395 @@
 
         if (input.hasClass('email') && !input.val().match( // RFC822 & RFC5322 Email validation
-             new RegExp(/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i)))
+             new RegExp(/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.([a-z][a-z0-9]+)|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i)))
              error = new Array($cv.email,field);
 

shopp/trunk/core/ui/behaviors/priceline.js

@@ -501 +501 @@
     _.Shipped = function (data) {
         _.price(data.price,data.tax);
-        _.saleprice(data.sale,data.saleprice);
+        _.saleprice(data._sale,data.saleprice);
         _.shipping(data.shipping,data.dimensions,data.shipfee);
         if (!tmp) _.inventory(data.inventory,data.stock,data.sku);

shopp/trunk/core/ui/behaviors/priceline.min.js

@@ -4 +4 @@
  * Licensed under the GPLv3 {@see license.txt}
  */
-function Pricelines(){var $=jqnc(),_=this;_.idx=0;_.row=new Object();_.variations=new Array();_.addons=new Array();_.linked=new Array();_.add=function(options,data,target,attachment){if(!data){data={context:"product"}}var key,p,targetkey,index;if(data.context=="variation"){key=xorkey(options);p=new Priceline(_.idx,options,data,target,attachment);_.row[key]=p;if(attachment){targetkey=parseInt(target.optionkey.val(),10);index=$.inArray(targetkey,_.variations);if(index!=-1){if(attachment=="before"){_.variations.splice(index,0,xorkey(p.options))}else{_.variations.splice(index+1,0,xorkey(p.options))}}}else{_.variations.push(xorkey(p.options))}}if(data.context=="addon"){p=new Priceline(_.idx,options,data,target,attachment);_.row[options]=p}if(data.context=="product"){p=new Priceline(0,options,data,target,attachment);_.row[0]=p}$("#prices").val(_.idx++)};_.exists=function(key){if(_.row[key]){return true}return false};_.remove=function(row){var index=$.inArray(row,_.variations);if(index!=-1){_.variations.splice(index,1)}_.row[row].row.remove();delete _.row[row]};_.reorderVariation=function(key,options){var variation=_.row[key],index=$.inArray(key,_.variations);variation.row.appendTo("#variations-pricing");variation.setOptions(options);if(index==-1){return}_.variations.splice(index,1);_.variations.push(xorkey(variation.options))};_.reorderAddon=function(id,pricegroup){var addon=_.row[id];addon.row.appendTo(pricegroup)};_.updateVariationsUI=function(type){var i,key,row,option;for(i in _.variations){key=_.variations[i];if(!Pricelines.row[key]){delete _.variations[i];continue}row=Pricelines.row[key];row.updateTabIndex(i);if(type&&type=="tabs"){continue}row.unlinkInputs();for(option in _.linked){if($.inArray(option,_.row[key].options)!=-1){if(!_.linked[option][key]){_.linked[option].push(key)}_.row[key].linkInputs(option)}}}};_.linkVariations=function(option){if(!option){return}for(var key in _.row){if($.inArray(option.toString(),_.row[key].options)!=-1){if(!_.linked[option]){_.linked[option]=new Array()}_.linked[option].push(key);_.row[key].linkInputs(option)}}};_.unlinkVariations=function(option){if(!option){return}if(!_.linked[option]){return}for(var row in _.linked[option]){if(_.row[_.linked[option][row]]){_.row[_.linked[option][row]].unlinkInputs(option)}}_.linked.splice(option,1)};_.unlinkAll=function(){for(var key in _.row){_.row[key].unlinkInputs()}_.linked.splice(0,1)};_.updateVariationLinks=function(){if(!_.linked){return}var key,option;for(key in _.row){_.row[key].unlinkInputs()}for(option in _.linked){_.linked[option]=false;_.linkVariations(option)}};_.allLinked=function(){if(_.linked[0]){return true}return false};_.linkAll=function(){_.unlinkAll();_.linked=new Array();_.linked[0]=new Array();for(var key in _.row){if(key==0){continue}_.linked[0].push(key);_.row[key].linkInputs(0)}}}function Priceline(id,options,data,target,attachment){var $=jqnc(),_=this,tmp=template,controller=Pricelines,typeOptions="",i,fn,heading,labelText,myid,context,optionids,sortorder,optionkey,type,dataCell,pricingTable,headingsRow,inputsRow;_.id=id;_.options=options;_.data=data;_.label=false;_.links=new Array();_.inputs=new Array();_.lasttype=false;i=_.id;fn="price["+i+"]";_.row=$('<div id="row-'+i+'" class="priceline" />');if(attachment=="after"){_.row.insertAfter(target)}else{if(attachment=="before"){_.row.insertBefore(target)}else{_.row.appendTo(target)}}heading=$('<div class="pricing-label" />').appendTo(_.row);labelText=$('<label for="label-'+i+'" />').appendTo(heading);_.label=$('<input type="hidden" name="price['+i+'][label]" id="label-'+i+'" />').appendTo(heading);_.label.change(function(){labelText.text($(this).val())});if(!data.id){data.id=""}if(!data.product){data.product=product}if(!data.donation){data.donation={"var":false,min:false}}if(!data.dimensions){data.dimensions={weight:0,height:0,width:0,length:0}}$('<input type="hidden" name="'+fn+'[id]" id="priceid-'+i+'" value="'+data.id+'" /><input type="hidden" name="'+fn+'[product]" id="product-'+i+'" value="'+data.product+'" /><input type="hidden" name="'+fn+'[context]" id="context-'+i+'"/><input type="hidden" name="'+fn+'[optionkey]" id="optionkey-'+i+'" class="optionkey" /><input type="hidden" name="'+fn+'[options]" id="options-'+i+'" value="" /><input type="hidden" name="sortorder[]" id="sortorder-'+i+'" value="'+i+'" />').appendTo(heading);myid=$("#priceid-"+i);context=$("#context-"+i);optionids=$("#options-"+i);sortorder=$("#sortorder-"+i);optionkey=$("#optionkey-"+i);_.row.optionkey=optionkey;$(priceTypes).each(function(t,option){if("addon"==data.context&&"Subscription"==option.label){return}typeOptions+='<option value="'+option.value+'">'+option.label+"</option>"});type=$('<select name="price['+i+'][type]" id="type-'+i+'"></select>').html(typeOptions).appendTo(heading);if(data&&data.label){_.label.val(htmlentities(data.label)).change();type.val(data.type)}dataCell=$('<div class="pricing-ui clear" />').appendTo(_.row);pricingTable=$("<table/>").addClass("pricing-table").appendTo(dataCell);headingsRow=$("<tr/>").appendTo(pricingTable);inputsRow=$("<tr/>").appendTo(pricingTable);_.price=function(price,tax){var hd,ui;hd=$('<th><label for="price-'+i+'">'+PRICE_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><input type="text" name="'+fn+'[price]" id="price-'+i+'" value="0" size="10" class="selectall money right" /><br /><input type="hidden" name="'+fn+'[tax]" value="on" /><input type="checkbox" name="'+fn+'[tax]" id="tax-'+i+'" value="off" /><label for="tax-'+i+'"> '+NOTAX_LABEL+"</label><br /></td>").appendTo(inputsRow);_.p=$("#price-"+i).val(asMoney(new Number(price)));_.t=$("#tax-"+i).attr("checked",tax=="off"?true:false)};_.saleprice=function(toggle,saleprice){var hd,ui,dis;hd=$('<th><input type="hidden" name="'+fn+'[sale]" value="off" /><input type="checkbox" name="'+fn+'[sale]" id="sale-'+i+'" value="on" /><label for="sale-'+i+'"> '+SALE_PRICE_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><span class="status">'+NOT_ON_SALE_TEXT+'</span><span class="ui"><input type="text" name="'+fn+'[saleprice]" id="saleprice-'+i+'" size="10" class="selectall money right" /></span></td>').appendTo(inputsRow);dis=ui.find("span.status");ui=ui.find("span.ui").hide();_.sp=$("#saleprice-"+i).val(asMoney(new Number(saleprice)));_.spt=$("#sale-"+i).attr("checked",(toggle=="on"?true:false)).toggler(dis,ui,_.sp)};_.donation=function(price,tax,variable,minimum){var hd,ui,hd2,ui2;hd=$('<th><label for="price-'+i+'"> '+AMOUNT_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><input type="text" name="'+fn+'[price]" id="price-'+i+'" value="0" size="10" class="selectall money right" /><br /><input type="hidden" name="'+fn+'[tax]" value="on" /><input type="checkbox" name="'+fn+'[tax]" id="tax-'+i+'" value="off" /><label for="tax-'+i+'"> '+NOTAX_LABEL+"</label><br /></td>").appendTo(inputsRow);_.p=$("#price-"+i).val(asMoney(new Number(price)));_.t=$("#tax-"+i).attr("checked",tax=="on"?false:true);hd2=$("<th />").appendTo(headingsRow);ui2=$('<td width="80%"><input type="hidden" name="'+fn+'[donation][var]" value="off" /><input type="checkbox" name="'+fn+'[donation][var]" id="donation-var-'+i+'" value="on" /><label for="donation-var-'+i+'"> '+DONATIONS_VAR_LABEL+'</label><br /><input type="hidden" name="'+fn+'[donation][min]" value="off" /><input type="checkbox" name="'+fn+'[donation][min]" id="donation-min-'+i+'" value="on" /><label for="donation-min-'+i+'"> '+DONATIONS_MIN_LABEL+"</label><br /></td>").appendTo(inputsRow);_.dv=$("#donation-var-"+i).attr("checked",variable=="on"?true:false);_.dm=$("#donation-min-"+i).attr("checked",minimum=="on"?true:false)};_.shipping=function(toggle,dimensions,fee){var hd,ui,dis,inf,dc,dw,dl,dwd,dh,dv,nf=getCurrencyFormat();nf.precision="2";hd=$('<th><input type="hidden" name="'+fn+'[shipping]" value="off" /><input type="checkbox" name="'+fn+'[shipping]" id="shipping-'+i+'" value="on" /><label for="shipping-'+i+'"> '+SHIPPING_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><span class="status">'+FREE_SHIPPING_TEXT+'</span><span class="ui"><input type="text" name="'+fn+'[dimensions][weight]" id="weight-'+i+'" size="8" class="selectall right" /><label for="weight-'+i+'" id="weight-label-'+i+'" title="'+WEIGHT_LABEL+'"> '+WEIGHT_LABEL+((weightUnit)?" ("+weightUnit+")":"")+'</label><br /><span class="dimui"></span><input type="text" name="'+fn+'[shipfee]" id="shipfee-'+i+'" size="8" class="selectall money right" /><label for="shipfee-'+i+'" title="'+SHIPFEE_XTRA+'"> '+SHIPFEE_LABEL+"</label><br /></span></td>").appendTo(inputsRow);dis=ui.find("span.status");inf=ui.find("span.ui").hide();dui=ui.find(".dimui");if(!dimensions.weight){dimensions.weight=0}_.w=$("#weight-"+i).val(formatNumber(new Number(dimensions.weight),nf,true)).bind("change.value",function(){this.value=formatNumber(isNaN(this.value)?0:this.value,nf,true)});_.fee=$("#shipfee-"+i);_.fee.val(asMoney(new Number(fee)));_.st=hd.find("#shipping-"+i).attr("checked",(toggle=="off"?false:true)).toggler(dis,inf,_.w);if(dimensionsRequired){dv=function(e,init){var value=this.value;if(init){value=new Number(value)}this.value=formatNumber(value,nf,true)};$("#weight-label-"+i).html(" "+dimensionUnit+"<sup>3</sup>/"+weightUnit);dc=$('<div class="dimensions"><div class="inline"><input type="text" name="'+fn+'[dimensions][weight]" id="dimensions-weight-'+i+'" size="4" class="selectall right weight" />'+(weightUnit?"<label>"+weightUnit+"&nbsp;</label>":"")+'<br /><label for="dimensions-weight-'+i+'" title="'+WEIGHT_LABEL+'"> '+WEIGHT_LABEL+'</label></div><div class="inline"><input type="text" name="'+fn+'[dimensions][length]" id="dimensions-length-'+i+'" size="4" class="selectall right" /><label> x </label><br /><label for="dimensions-length-'+i+'" title="'+LENGTH_LABEL+'"> '+LENGTH_LABEL+'</label></div><div class="inline"><input type="text" name="'+fn+'[dimensions][width]" id="dimensions-width-'+i+'" size="4" class="selectall right" /><label> x </label><br /><label for="dimensions-width-'+i+'" title="'+WIDTH_LABEL+'"> '+WIDTH_LABEL+'</label></div><div class="inline"><input type="text" name="'+fn+'[dimensions][height]" id="dimensions-height-'+i+'" size="4" class="selectall right" /><label>'+dimensionUnit+'</label><br /><label for="dimensions-height-'+i+'" title="'+HEIGHT_LABEL+'"> '+HEIGHT_LABEL+"</label></div></div>").hide().appendTo(dui);if(!(dimensions instanceof Object)){dimensions={weight:0,length:0,width:0,height:0}}_.dw=$("#dimensions-weight-"+i).val(dimensions.weight).bind("change.value",dv).trigger("change.value",true);_.dl=$("#dimensions-length-"+i).val(dimensions.length).bind("change.value",dv).trigger("change.value",true);_.dwd=$("#dimensions-width-"+i).val(dimensions.width).bind("change.value",dv).trigger("change.value",true);_.dh=$("#dimensions-height-"+i).val(dimensions.height).bind("change.value",dv).trigger("change.value",true);function volumeWeight(){var d=0,w=0;dc.find("input").each(function(id,dims){if($(dims).hasClass("weight")){w=asNumber(dims.value)}else{if(d==0){d=asNumber(dims.value)}else{d*=asNumber(dims.value)}}});if(!isNaN(d/w)){_.w.val((d/w)).trigger("change.value")}}function toggleDimensions(){_.w.toggleClass("extoggle");dc.toggle();_.dw.focus();volumeWeight()}_.st.change(function(){if(!$(this).attr("checked")){dc.hide()}});_.dh.blur(toggleDimensions);_.w.click(toggleDimensions).attr("readonly",true);volumeWeight()}};_.inventory=function(toggle,stock,sku){var hd,ui,dis;hd=$('<th><input type="hidden" name="'+fn+'[inventory]" value="off" /><input type="checkbox" name="'+fn+'[inventory]" id="inventory-'+i+'" value="on" /><label for="inventory-'+i+'"> '+INVENTORY_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><span class="status">'+NOT_TRACKED_TEXT+'</span><span class="ui"><input type="text" name="'+fn+'[stocked]" id="stock-'+i+'" size="8" class="selectall right" /><label for="stock-'+i+'"> '+IN_STOCK_LABEL+'</label><br /><input type="text" name="'+fn+'[sku]" id="sku-'+i+'" size="8" title="'+SKU_XTRA+'" class="selectall" /><label for="sku-'+i+'" title="'+SKU_LABEL_HELP+'"> '+SKU_LABEL+"</label></span></td>").appendTo(inputsRow);dis=ui.find("span.status");ui=ui.find("span.ui").hide();if(!stock){stock=0}_.stock=$("#stock-"+i).val(stock).trigger("change.value",function(){this.value=new Number(this.value)});_.sku=$("#sku-"+i).val(sku);_.it=hd.find("#inventory-"+i).attr("checked",(toggle=="on"?true:false)).toggler(dis,ui,_.stock)};_.download=function(d){var hd,ui,hd2,fc;hd=$('<th><label for="download-'+i+'">'+PRODUCT_DOWNLOAD_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td width="31%"><input type="hidden" name="'+fn+'[downloadpath]" id="download_path-'+i+'"/><input type="hidden" name="'+fn+'[downloadfile]" id="download_file-'+i+'"/><div id="file-'+i+'" class="status">'+NO_DOWNLOAD+"</div></td>").appendTo(inputsRow);hd2=$('<td rowspan="2" class="controls" width="75"><button type="button" class="button-secondary" style="white-space: nowrap;" id="file-selector-'+i+'"><small>'+SELECT_FILE_BUTTON_TEXT+"&hellip;</small></button></td>").appendTo(headingsRow);_.file=$("#file-"+i);_.selector=$("#file-selector-"+i).FileChooser(i,_.file);if(d&&d.id){fc=d.mime.replace("/"," ");_.file.attr("class","file").html('<div class="icon shoppui-file '+fc+'"></div>'+d.name+"<br /><small>"+readableFileSize(d.size)+"</small>").click(function(){window.location.href=adminurl+"admin.php?src=download&shopp_download="+d.id})}};_.recurring=function(r){var hd,ui,hd2,ui2,ints,n,cycs='<option value="0">&infin;</option>',pp,ps;for(n=1;n<31;n++){ints+='<option value="'+n+'">'+n+"</option>";if(n>1){cycs+='<option value="'+n+'">'+n+"</option>"}}$(billPeriods[0]).each(function(n,option){pp+='<option value="'+option.value+'">'+option.label+"</option>"});$(billPeriods[1]).each(function(n,option){ps+='<option value="'+option.value+'">'+option.label+"</option>"});hd2=$('<th><input type="hidden" name="'+fn+'[recurring][trial]" value="off" /><input type="checkbox" name="'+fn+'[recurring][trial]" id="trial-'+i+'" /><label for="trial-'+i+'"> '+TRIAL_LABEL+"</label></th>").appendTo(headingsRow);ui2=$('<td><span class="status">'+NOTRIAL_TEXT+'</span><span class="ui"><select name="'+fn+'[recurring][trialint]" id="trialint-'+i+'">'+ints+'</select><select name="'+fn+'[recurring][trialperiod]" id="trialperiod-'+i+'" class="period">'+pp+'</select><br /><input type="text" name="'+fn+'[recurring][trialprice]" id="trialprice-'+i+'" value="0" size="10" class="selectall money right" /><label for="trialprice-'+i+'">&nbsp;'+PRICE_LABEL+"</label></span></td>").appendTo(inputsRow);hd=$('<th><label for="billcycle-'+i+'"> '+BILLCYCLE_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><select name="'+fn+'[recurring][interval]" id="interval-'+i+'">'+ints+'</select><select name="'+fn+'[recurring][period]" id="period-'+i+'" class="period">'+pp+'</select><br /><select name="'+fn+'[recurring][cycles]" id="cycles-'+i+'">'+cycs+'</select><label for="cycles'+i+'">&nbsp;'+TIMES_LABEL+"</label></td>").appendTo(inputsRow);dis=ui2.find("span.status");ui=ui2.find("span.ui").hide();if(!r){r={period:1,interval:"d",cycles:0,trialperiod:1,trialint:1,trialprice:0}}_.period=$("#period-"+i).val(r.period);_.interval=$("#interval-"+i).val(r.interval).change(function(){var $this=$(this),s=_.period.val();if($this.val()==1){_.period.html(ps)}else{_.period.html(pp)}_.period.val(s)}).change();_.cycles=$("#cycles-"+i).val(r.cycles);_.trialperiod=$("#trialperiod-"+i).val(r.trialperiod);_.trialint=$("#trialint-"+i).val(r.trialint).change(function(){var $this=$(this),s=_.trialperiod.val();if($this.val()==1){_.trialperiod.html(ps)}else{_.trialperiod.html(pp)}_.trialperiod.val(s)}).change();_.trialprice=$("#trialprice-"+i).val(asMoney(new Number(r.trialprice)));_.trial=hd2.find("#trial-"+i).attr("checked",(r.trial=="on"?true:false)).toggler(dis,ui,_.trialint)};_.memberlevel=function(){var hd,ui,memberships,mo;memberships=["Basic","Silver","Gold","Platinum"];$(memberships).each(function(n,option){mo+='<option value="'+option+'">'+option+"</option>"});hd=$('<th><label for="membership-'+i+'"> '+MEMBERSHIP_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><select name="'+fn+'[membership]" id="membership-'+i+'" class="membership">'+mo+"</select></td>").appendTo(inputsRow)};$.fn.toggler=function(s,ui,f){this.bind("change.value",function(){if(this.checked){s.hide();ui.show()}else{s.show();ui.hide()}if($.ua.msie){$(this).blur()}}).click(function(){if($.ua.msie){$(this).trigger("change.value")}if(this.checked){f.focus().select()}}).trigger("change.value");return $(this)};_.Shipped=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);_.shipping(data.shipping,data.dimensions,data.shipfee);if(!tmp){_.inventory(data.inventory,data.stock,data.sku)}};_.Virtual=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);if(!tmp){_.inventory(data.inventory,data.stock,data.sku)}};_.Download=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);if(!tmp){_.download(data.download)}};_.Donation=function(data){_.donation(data.price,data.tax,data.donation["var"],data.donation.min)};_.Subscription=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);_.recurring(data.recurring)};_.Membership=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);_.recurring();if(!tmp){_.memberlevel()}};type.bind("change.value",function(){headingsRow.empty();inputsRow.empty();var ui=type.val();if(ui=="Shipped"){_.Shipped(data)}if(ui=="Virtual"){_.Virtual(data)}if(ui=="Download"){_.Download(data)}if(ui=="Donation"){_.Donation(data)}if(ui=="Subscription"){_.Subscription(data)}if(ui=="Membership"){_.Membership(data)}inputsRow.find("input.money").bind("change.value",function(){this.value=asMoney(this.value)}).trigger("change.value");quickSelects(inputsRow)}).trigger("change.value");_.disable=function(){_.lasttype=(type.val())?type.val():false;type.val("N/A").trigger("change.value")};_.enable=function(){if(_.lasttype){type.val(_.lasttype).trigger("change.value")}};if(data&&data.context){context.val(data.context)}else{context.val("product")}_.setOptions=function(options){var update=false;if(options){if(options!=_.options){update=true}_.options=options}if(context.val()=="variation"){optionkey.val(xorkey(_.options))}if(update){_.updateLabel()}};_.updateKey=function(){optionkey.val(xorkey(_.options))};_.updateLabel=function(){var type=context.val(),string="",ids="";if(_.options){if(type=="variation"){$(_.options).each(function(index,id){if(string==""){string=$(productOptions[id]).val()}else{string+=", "+$(productOptions[id]).val()}if(ids==""){ids=id}else{ids+=","+id}})}if(type=="addon"){string=$(productAddons[_.options]).val();ids=_.options}}if(string==""){string=DEFAULT_PRICELINE_LABEL}_.label.val(htmlentities(string)).change();optionids.val(ids)};_.updateTabIndex=function(row){row=new Number(row);$.each(_.inputs,function(i,input){$(input).attr("tabindex",((row+1)*100)+i)})};_.linkInputs=function(option){_.links.push(option);$.each(_.inputs,function(i,input){if(!input){return}var type="change.linkedinputs",elem=$(input);if(elem.attr("type")=="checkbox"){type="click.linkedinputs"}$(input).bind(type,function(){var value=$(this).val(),checked=$(this).attr("checked");$.each(_.links,function(l,option){$.each(controller.linked[option],function(id,key){if(key==xorkey(_.options)){return}if(!controller.row[key]){return}if(elem.attr("type")=="checkbox"){$(controller.row[key].inputs[i]).attr("checked",checked)}else{$(controller.row[key].inputs[i]).val(value)}$(controller.row[key].inputs[i]).trigger("change.value")})})})})};_.unlinkInputs=function(option){if(option!==false){index=$.inArray(option,_.links);_.links.splice(index,1)}$.each(_.inputs,function(i,input){if(!input){return}var type="blur.linkedinputs";if($(input).attr("type")=="checkbox"){type="click.linkedinputs"}$(input).unbind(type)})};if(type.val()!="N/A"){_.inputs=new Array(type,_.p,_.t,_.spt,_.sp,_.dv,_.dm,_.st,_.w,_.dw,_.dl,_.dwd,_.dh,_.fee,_.it,_.stock,_.sku,_.period,_.interval,_.cycles,_.trialperiod,_.trialint,_.trialprice,_.trial)}_.updateKey();_.updateLabel()};
+function Pricelines(){var $=jqnc(),_=this;_.idx=0;_.row=new Object();_.variations=new Array();_.addons=new Array();_.linked=new Array();_.add=function(options,data,target,attachment){if(!data){data={context:"product"}}var key,p,targetkey,index;if(data.context=="variation"){key=xorkey(options);p=new Priceline(_.idx,options,data,target,attachment);_.row[key]=p;if(attachment){targetkey=parseInt(target.optionkey.val(),10);index=$.inArray(targetkey,_.variations);if(index!=-1){if(attachment=="before"){_.variations.splice(index,0,xorkey(p.options))}else{_.variations.splice(index+1,0,xorkey(p.options))}}}else{_.variations.push(xorkey(p.options))}}if(data.context=="addon"){p=new Priceline(_.idx,options,data,target,attachment);_.row[options]=p}if(data.context=="product"){p=new Priceline(0,options,data,target,attachment);_.row[0]=p}$("#prices").val(_.idx++)};_.exists=function(key){if(_.row[key]){return true}return false};_.remove=function(row){var index=$.inArray(row,_.variations);if(index!=-1){_.variations.splice(index,1)}_.row[row].row.remove();delete _.row[row]};_.reorderVariation=function(key,options){var variation=_.row[key],index=$.inArray(key,_.variations);variation.row.appendTo("#variations-pricing");variation.setOptions(options);if(index==-1){return}_.variations.splice(index,1);_.variations.push(xorkey(variation.options))};_.reorderAddon=function(id,pricegroup){var addon=_.row[id];addon.row.appendTo(pricegroup)};_.updateVariationsUI=function(type){var i,key,row,option;for(i in _.variations){key=_.variations[i];if(!Pricelines.row[key]){delete _.variations[i];continue}row=Pricelines.row[key];row.updateTabIndex(i);if(type&&type=="tabs"){continue}row.unlinkInputs();for(option in _.linked){if($.inArray(option,_.row[key].options)!=-1){if(!_.linked[option][key]){_.linked[option].push(key)}_.row[key].linkInputs(option)}}}};_.linkVariations=function(option){if(!option){return}for(var key in _.row){if($.inArray(option.toString(),_.row[key].options)!=-1){if(!_.linked[option]){_.linked[option]=new Array()}_.linked[option].push(key);_.row[key].linkInputs(option)}}};_.unlinkVariations=function(option){if(!option){return}if(!_.linked[option]){return}for(var row in _.linked[option]){if(_.row[_.linked[option][row]]){_.row[_.linked[option][row]].unlinkInputs(option)}}_.linked.splice(option,1)};_.unlinkAll=function(){for(var key in _.row){_.row[key].unlinkInputs()}_.linked.splice(0,1)};_.updateVariationLinks=function(){if(!_.linked){return}var key,option;for(key in _.row){_.row[key].unlinkInputs()}for(option in _.linked){_.linked[option]=false;_.linkVariations(option)}};_.allLinked=function(){if(_.linked[0]){return true}return false};_.linkAll=function(){_.unlinkAll();_.linked=new Array();_.linked[0]=new Array();for(var key in _.row){if(key==0){continue}_.linked[0].push(key);_.row[key].linkInputs(0)}}}function Priceline(id,options,data,target,attachment){var $=jqnc(),_=this,tmp=template,controller=Pricelines,typeOptions="",i,fn,heading,labelText,myid,context,optionids,sortorder,optionkey,type,dataCell,pricingTable,headingsRow,inputsRow;_.id=id;_.options=options;_.data=data;_.label=false;_.links=new Array();_.inputs=new Array();_.lasttype=false;i=_.id;fn="price["+i+"]";_.row=$('<div id="row-'+i+'" class="priceline" />');if(attachment=="after"){_.row.insertAfter(target)}else{if(attachment=="before"){_.row.insertBefore(target)}else{_.row.appendTo(target)}}heading=$('<div class="pricing-label" />').appendTo(_.row);labelText=$('<label for="label-'+i+'" />').appendTo(heading);_.label=$('<input type="hidden" name="price['+i+'][label]" id="label-'+i+'" />').appendTo(heading);_.label.change(function(){labelText.text($(this).val())});if(!data.id){data.id=""}if(!data.product){data.product=product}if(!data.donation){data.donation={"var":false,min:false}}if(!data.dimensions){data.dimensions={weight:0,height:0,width:0,length:0}}$('<input type="hidden" name="'+fn+'[id]" id="priceid-'+i+'" value="'+data.id+'" /><input type="hidden" name="'+fn+'[product]" id="product-'+i+'" value="'+data.product+'" /><input type="hidden" name="'+fn+'[context]" id="context-'+i+'"/><input type="hidden" name="'+fn+'[optionkey]" id="optionkey-'+i+'" class="optionkey" /><input type="hidden" name="'+fn+'[options]" id="options-'+i+'" value="" /><input type="hidden" name="sortorder[]" id="sortorder-'+i+'" value="'+i+'" />').appendTo(heading);myid=$("#priceid-"+i);context=$("#context-"+i);optionids=$("#options-"+i);sortorder=$("#sortorder-"+i);optionkey=$("#optionkey-"+i);_.row.optionkey=optionkey;$(priceTypes).each(function(t,option){if("addon"==data.context&&"Subscription"==option.label){return}typeOptions+='<option value="'+option.value+'">'+option.label+"</option>"});type=$('<select name="price['+i+'][type]" id="type-'+i+'"></select>').html(typeOptions).appendTo(heading);if(data&&data.label){_.label.val(htmlentities(data.label)).change();type.val(data.type)}dataCell=$('<div class="pricing-ui clear" />').appendTo(_.row);pricingTable=$("<table/>").addClass("pricing-table").appendTo(dataCell);headingsRow=$("<tr/>").appendTo(pricingTable);inputsRow=$("<tr/>").appendTo(pricingTable);_.price=function(price,tax){var hd,ui;hd=$('<th><label for="price-'+i+'">'+PRICE_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><input type="text" name="'+fn+'[price]" id="price-'+i+'" value="0" size="10" class="selectall money right" /><br /><input type="hidden" name="'+fn+'[tax]" value="on" /><input type="checkbox" name="'+fn+'[tax]" id="tax-'+i+'" value="off" /><label for="tax-'+i+'"> '+NOTAX_LABEL+"</label><br /></td>").appendTo(inputsRow);_.p=$("#price-"+i).val(asMoney(new Number(price)));_.t=$("#tax-"+i).attr("checked",tax=="off"?true:false)};_.saleprice=function(toggle,saleprice){var hd,ui,dis;hd=$('<th><input type="hidden" name="'+fn+'[sale]" value="off" /><input type="checkbox" name="'+fn+'[sale]" id="sale-'+i+'" value="on" /><label for="sale-'+i+'"> '+SALE_PRICE_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><span class="status">'+NOT_ON_SALE_TEXT+'</span><span class="ui"><input type="text" name="'+fn+'[saleprice]" id="saleprice-'+i+'" size="10" class="selectall money right" /></span></td>').appendTo(inputsRow);dis=ui.find("span.status");ui=ui.find("span.ui").hide();_.sp=$("#saleprice-"+i).val(asMoney(new Number(saleprice)));_.spt=$("#sale-"+i).attr("checked",(toggle=="on"?true:false)).toggler(dis,ui,_.sp)};_.donation=function(price,tax,variable,minimum){var hd,ui,hd2,ui2;hd=$('<th><label for="price-'+i+'"> '+AMOUNT_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><input type="text" name="'+fn+'[price]" id="price-'+i+'" value="0" size="10" class="selectall money right" /><br /><input type="hidden" name="'+fn+'[tax]" value="on" /><input type="checkbox" name="'+fn+'[tax]" id="tax-'+i+'" value="off" /><label for="tax-'+i+'"> '+NOTAX_LABEL+"</label><br /></td>").appendTo(inputsRow);_.p=$("#price-"+i).val(asMoney(new Number(price)));_.t=$("#tax-"+i).attr("checked",tax=="on"?false:true);hd2=$("<th />").appendTo(headingsRow);ui2=$('<td width="80%"><input type="hidden" name="'+fn+'[donation][var]" value="off" /><input type="checkbox" name="'+fn+'[donation][var]" id="donation-var-'+i+'" value="on" /><label for="donation-var-'+i+'"> '+DONATIONS_VAR_LABEL+'</label><br /><input type="hidden" name="'+fn+'[donation][min]" value="off" /><input type="checkbox" name="'+fn+'[donation][min]" id="donation-min-'+i+'" value="on" /><label for="donation-min-'+i+'"> '+DONATIONS_MIN_LABEL+"</label><br /></td>").appendTo(inputsRow);_.dv=$("#donation-var-"+i).attr("checked",variable=="on"?true:false);_.dm=$("#donation-min-"+i).attr("checked",minimum=="on"?true:false)};_.shipping=function(toggle,dimensions,fee){var hd,ui,dis,inf,dc,dw,dl,dwd,dh,dv,nf=getCurrencyFormat();nf.precision="2";hd=$('<th><input type="hidden" name="'+fn+'[shipping]" value="off" /><input type="checkbox" name="'+fn+'[shipping]" id="shipping-'+i+'" value="on" /><label for="shipping-'+i+'"> '+SHIPPING_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><span class="status">'+FREE_SHIPPING_TEXT+'</span><span class="ui"><input type="text" name="'+fn+'[dimensions][weight]" id="weight-'+i+'" size="8" class="selectall right" /><label for="weight-'+i+'" id="weight-label-'+i+'" title="'+WEIGHT_LABEL+'"> '+WEIGHT_LABEL+((weightUnit)?" ("+weightUnit+")":"")+'</label><br /><span class="dimui"></span><input type="text" name="'+fn+'[shipfee]" id="shipfee-'+i+'" size="8" class="selectall money right" /><label for="shipfee-'+i+'" title="'+SHIPFEE_XTRA+'"> '+SHIPFEE_LABEL+"</label><br /></span></td>").appendTo(inputsRow);dis=ui.find("span.status");inf=ui.find("span.ui").hide();dui=ui.find(".dimui");if(!dimensions.weight){dimensions.weight=0}_.w=$("#weight-"+i).val(formatNumber(new Number(dimensions.weight),nf,true)).bind("change.value",function(){this.value=formatNumber(isNaN(this.value)?0:this.value,nf,true)});_.fee=$("#shipfee-"+i);_.fee.val(asMoney(new Number(fee)));_.st=hd.find("#shipping-"+i).attr("checked",(toggle=="off"?false:true)).toggler(dis,inf,_.w);if(dimensionsRequired){dv=function(e,init){var value=this.value;if(init){value=new Number(value)}this.value=formatNumber(value,nf,true)};$("#weight-label-"+i).html(" "+dimensionUnit+"<sup>3</sup>/"+weightUnit);dc=$('<div class="dimensions"><div class="inline"><input type="text" name="'+fn+'[dimensions][weight]" id="dimensions-weight-'+i+'" size="4" class="selectall right weight" />'+(weightUnit?"<label>"+weightUnit+"&nbsp;</label>":"")+'<br /><label for="dimensions-weight-'+i+'" title="'+WEIGHT_LABEL+'"> '+WEIGHT_LABEL+'</label></div><div class="inline"><input type="text" name="'+fn+'[dimensions][length]" id="dimensions-length-'+i+'" size="4" class="selectall right" /><label> x </label><br /><label for="dimensions-length-'+i+'" title="'+LENGTH_LABEL+'"> '+LENGTH_LABEL+'</label></div><div class="inline"><input type="text" name="'+fn+'[dimensions][width]" id="dimensions-width-'+i+'" size="4" class="selectall right" /><label> x </label><br /><label for="dimensions-width-'+i+'" title="'+WIDTH_LABEL+'"> '+WIDTH_LABEL+'</label></div><div class="inline"><input type="text" name="'+fn+'[dimensions][height]" id="dimensions-height-'+i+'" size="4" class="selectall right" /><label>'+dimensionUnit+'</label><br /><label for="dimensions-height-'+i+'" title="'+HEIGHT_LABEL+'"> '+HEIGHT_LABEL+"</label></div></div>").hide().appendTo(dui);if(!(dimensions instanceof Object)){dimensions={weight:0,length:0,width:0,height:0}}_.dw=$("#dimensions-weight-"+i).val(dimensions.weight).bind("change.value",dv).trigger("change.value",true);_.dl=$("#dimensions-length-"+i).val(dimensions.length).bind("change.value",dv).trigger("change.value",true);_.dwd=$("#dimensions-width-"+i).val(dimensions.width).bind("change.value",dv).trigger("change.value",true);_.dh=$("#dimensions-height-"+i).val(dimensions.height).bind("change.value",dv).trigger("change.value",true);function volumeWeight(){var d=0,w=0;dc.find("input").each(function(id,dims){if($(dims).hasClass("weight")){w=asNumber(dims.value)}else{if(d==0){d=asNumber(dims.value)}else{d*=asNumber(dims.value)}}});if(!isNaN(d/w)){_.w.val((d/w)).trigger("change.value")}}function toggleDimensions(){_.w.toggleClass("extoggle");dc.toggle();_.dw.focus();volumeWeight()}_.st.change(function(){if(!$(this).attr("checked")){dc.hide()}});_.dh.blur(toggleDimensions);_.w.click(toggleDimensions).attr("readonly",true);volumeWeight()}};_.inventory=function(toggle,stock,sku){var hd,ui,dis;hd=$('<th><input type="hidden" name="'+fn+'[inventory]" value="off" /><input type="checkbox" name="'+fn+'[inventory]" id="inventory-'+i+'" value="on" /><label for="inventory-'+i+'"> '+INVENTORY_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><span class="status">'+NOT_TRACKED_TEXT+'</span><span class="ui"><input type="text" name="'+fn+'[stocked]" id="stock-'+i+'" size="8" class="selectall right" /><label for="stock-'+i+'"> '+IN_STOCK_LABEL+'</label><br /><input type="text" name="'+fn+'[sku]" id="sku-'+i+'" size="8" title="'+SKU_XTRA+'" class="selectall" /><label for="sku-'+i+'" title="'+SKU_LABEL_HELP+'"> '+SKU_LABEL+"</label></span></td>").appendTo(inputsRow);dis=ui.find("span.status");ui=ui.find("span.ui").hide();if(!stock){stock=0}_.stock=$("#stock-"+i).val(stock).trigger("change.value",function(){this.value=new Number(this.value)});_.sku=$("#sku-"+i).val(sku);_.it=hd.find("#inventory-"+i).attr("checked",(toggle=="on"?true:false)).toggler(dis,ui,_.stock)};_.download=function(d){var hd,ui,hd2,fc;hd=$('<th><label for="download-'+i+'">'+PRODUCT_DOWNLOAD_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td width="31%"><input type="hidden" name="'+fn+'[downloadpath]" id="download_path-'+i+'"/><input type="hidden" name="'+fn+'[downloadfile]" id="download_file-'+i+'"/><div id="file-'+i+'" class="status">'+NO_DOWNLOAD+"</div></td>").appendTo(inputsRow);hd2=$('<td rowspan="2" class="controls" width="75"><button type="button" class="button-secondary" style="white-space: nowrap;" id="file-selector-'+i+'"><small>'+SELECT_FILE_BUTTON_TEXT+"&hellip;</small></button></td>").appendTo(headingsRow);_.file=$("#file-"+i);_.selector=$("#file-selector-"+i).FileChooser(i,_.file);if(d&&d.id){fc=d.mime.replace("/"," ");_.file.attr("class","file").html('<div class="icon shoppui-file '+fc+'"></div>'+d.name+"<br /><small>"+readableFileSize(d.size)+"</small>").click(function(){window.location.href=adminurl+"admin.php?src=download&shopp_download="+d.id})}};_.recurring=function(r){var hd,ui,hd2,ui2,ints,n,cycs='<option value="0">&infin;</option>',pp,ps;for(n=1;n<31;n++){ints+='<option value="'+n+'">'+n+"</option>";if(n>1){cycs+='<option value="'+n+'">'+n+"</option>"}}$(billPeriods[0]).each(function(n,option){pp+='<option value="'+option.value+'">'+option.label+"</option>"});$(billPeriods[1]).each(function(n,option){ps+='<option value="'+option.value+'">'+option.label+"</option>"});hd2=$('<th><input type="hidden" name="'+fn+'[recurring][trial]" value="off" /><input type="checkbox" name="'+fn+'[recurring][trial]" id="trial-'+i+'" /><label for="trial-'+i+'"> '+TRIAL_LABEL+"</label></th>").appendTo(headingsRow);ui2=$('<td><span class="status">'+NOTRIAL_TEXT+'</span><span class="ui"><select name="'+fn+'[recurring][trialint]" id="trialint-'+i+'">'+ints+'</select><select name="'+fn+'[recurring][trialperiod]" id="trialperiod-'+i+'" class="period">'+pp+'</select><br /><input type="text" name="'+fn+'[recurring][trialprice]" id="trialprice-'+i+'" value="0" size="10" class="selectall money right" /><label for="trialprice-'+i+'">&nbsp;'+PRICE_LABEL+"</label></span></td>").appendTo(inputsRow);hd=$('<th><label for="billcycle-'+i+'"> '+BILLCYCLE_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><select name="'+fn+'[recurring][interval]" id="interval-'+i+'">'+ints+'</select><select name="'+fn+'[recurring][period]" id="period-'+i+'" class="period">'+pp+'</select><br /><select name="'+fn+'[recurring][cycles]" id="cycles-'+i+'">'+cycs+'</select><label for="cycles'+i+'">&nbsp;'+TIMES_LABEL+"</label></td>").appendTo(inputsRow);dis=ui2.find("span.status");ui=ui2.find("span.ui").hide();if(!r){r={period:1,interval:"d",cycles:0,trialperiod:1,trialint:1,trialprice:0}}_.period=$("#period-"+i).val(r.period);_.interval=$("#interval-"+i).val(r.interval).change(function(){var $this=$(this),s=_.period.val();if($this.val()==1){_.period.html(ps)}else{_.period.html(pp)}_.period.val(s)}).change();_.cycles=$("#cycles-"+i).val(r.cycles);_.trialperiod=$("#trialperiod-"+i).val(r.trialperiod);_.trialint=$("#trialint-"+i).val(r.trialint).change(function(){var $this=$(this),s=_.trialperiod.val();if($this.val()==1){_.trialperiod.html(ps)}else{_.trialperiod.html(pp)}_.trialperiod.val(s)}).change();_.trialprice=$("#trialprice-"+i).val(asMoney(new Number(r.trialprice)));_.trial=hd2.find("#trial-"+i).attr("checked",(r.trial=="on"?true:false)).toggler(dis,ui,_.trialint)};_.memberlevel=function(){var hd,ui,memberships,mo;memberships=["Basic","Silver","Gold","Platinum"];$(memberships).each(function(n,option){mo+='<option value="'+option+'">'+option+"</option>"});hd=$('<th><label for="membership-'+i+'"> '+MEMBERSHIP_LABEL+"</label></th>").appendTo(headingsRow);ui=$('<td><select name="'+fn+'[membership]" id="membership-'+i+'" class="membership">'+mo+"</select></td>").appendTo(inputsRow)};$.fn.toggler=function(s,ui,f){this.bind("change.value",function(){if(this.checked){s.hide();ui.show()}else{s.show();ui.hide()}if($.ua.msie){$(this).blur()}}).click(function(){if($.ua.msie){$(this).trigger("change.value")}if(this.checked){f.focus().select()}}).trigger("change.value");return $(this)};_.Shipped=function(data){_.price(data.price,data.tax);_.saleprice(data._sale,data.saleprice);_.shipping(data.shipping,data.dimensions,data.shipfee);if(!tmp){_.inventory(data.inventory,data.stock,data.sku)}};_.Virtual=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);if(!tmp){_.inventory(data.inventory,data.stock,data.sku)}};_.Download=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);if(!tmp){_.download(data.download)}};_.Donation=function(data){_.donation(data.price,data.tax,data.donation["var"],data.donation.min)};_.Subscription=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);_.recurring(data.recurring)};_.Membership=function(data){_.price(data.price,data.tax);_.saleprice(data.sale,data.saleprice);_.recurring();if(!tmp){_.memberlevel()}};type.bind("change.value",function(){headingsRow.empty();inputsRow.empty();var ui=type.val();if(ui=="Shipped"){_.Shipped(data)}if(ui=="Virtual"){_.Virtual(data)}if(ui=="Download"){_.Download(data)}if(ui=="Donation"){_.Donation(data)}if(ui=="Subscription"){_.Subscription(data)}if(ui=="Membership"){_.Membership(data)}inputsRow.find("input.money").bind("change.value",function(){this.value=asMoney(this.value)}).trigger("change.value");quickSelects(inputsRow)}).trigger("change.value");_.disable=function(){_.lasttype=(type.val())?type.val():false;type.val("N/A").trigger("change.value")};_.enable=function(){if(_.lasttype){type.val(_.lasttype).trigger("change.value")}};if(data&&data.context){context.val(data.context)}else{context.val("product")}_.setOptions=function(options){var update=false;if(options){if(options!=_.options){update=true}_.options=options}if(context.val()=="variation"){optionkey.val(xorkey(_.options))}if(update){_.updateLabel()}};_.updateKey=function(){optionkey.val(xorkey(_.options))};_.updateLabel=function(){var type=context.val(),string="",ids="";if(_.options){if(type=="variation"){$(_.options).each(function(index,id){if(string==""){string=$(productOptions[id]).val()}else{string+=", "+$(productOptions[id]).val()}if(ids==""){ids=id}else{ids+=","+id}})}if(type=="addon"){string=$(productAddons[_.options]).val();ids=_.options}}if(string==""){string=DEFAULT_PRICELINE_LABEL}_.label.val(htmlentities(string)).change();optionids.val(ids)};_.updateTabIndex=function(row){row=new Number(row);$.each(_.inputs,function(i,input){$(input).attr("tabindex",((row+1)*100)+i)})};_.linkInputs=function(option){_.links.push(option);$.each(_.inputs,function(i,input){if(!input){return}var type="change.linkedinputs",elem=$(input);if(elem.attr("type")=="checkbox"){type="click.linkedinputs"}$(input).bind(type,function(){var value=$(this).val(),checked=$(this).attr("checked");$.each(_.links,function(l,option){$.each(controller.linked[option],function(id,key){if(key==xorkey(_.options)){return}if(!controller.row[key]){return}if(elem.attr("type")=="checkbox"){$(controller.row[key].inputs[i]).attr("checked",checked)}else{$(controller.row[key].inputs[i]).val(value)}$(controller.row[key].inputs[i]).trigger("change.value")})})})})};_.unlinkInputs=function(option){if(option!==false){index=$.inArray(option,_.links);_.links.splice(index,1)}$.each(_.inputs,function(i,input){if(!input){return}var type="blur.linkedinputs";if($(input).attr("type")=="checkbox"){type="click.linkedinputs"}$(input).unbind(type)})};if(type.val()!="N/A"){_.inputs=new Array(type,_.p,_.t,_.spt,_.sp,_.dv,_.dm,_.st,_.w,_.dw,_.dl,_.dwd,_.dh,_.fee,_.it,_.stock,_.sku,_.period,_.interval,_.cycles,_.trialperiod,_.trialint,_.trialprice,_.trial)}_.updateKey();_.updateLabel()};

shopp/trunk/core/ui/categories/category.js

@@ -52 +52 @@
     }).change();
 
-    if (details) for (s in details) addDetail(details[s]);
+    if (details) $.each(details, function(i, r) { addDetail(r); });
     $('#addPriceLevel').click(function() { addPriceLevel(); });
     $('#addDetail').click(function() { addDetail(); });
@@ -72 +72 @@
     }).change();
 
-    if (priceranges) for (key in priceranges) addPriceLevel(priceranges[key]);
+    if (priceranges) $.each(priceranges, function(i, r) { addPriceLevel(r); });
 
     if (!category) $('#title').focus();
@@ -124 +124 @@
 
         // Load up existing options
-        if (data && data.options) {
-            for (var i in data.options) menu.addOption(data.options[i]);
-        }
-
-
+        if (data && data.options) $.each(data.options, function (i,r) { menu.addOption(r); });
         $(menu.itemsElement).sortable({'axis':'y','items':'li.option','scroll':false});
 

shopp/trunk/core/ui/categories/category.min.js

@@ -1 @@
-var Pricelines=new Pricelines(),productOptions=new Array(),optionMenus=new Array(),detailsidx=1,variationsidx=1,optionsidx=1,pricingidx=1,pricelevelsidx=1,fileUploader=false,changes=false,saving=false,flashUploader=false,template=true;jQuery(document).ready(function(){var $=jqnc(),editslug=new SlugEditor(category,"category"),imageUploads=new ImageUploads($("#image-category-id").val(),"category");postboxes.add_postbox_toggles("shopp_page_shopp-categories");$(".if-js-closed").removeClass("if-js-closed").addClass("closed");$(".postbox a.help").click(function(){$(this).colorbox({iframe:true,open:true,innerWidth:768,innerHeight:480,scrolling:false});return false});updateWorkflow();$("#category").submit(function(){this.action=this.action.substr(0,this.action.indexOf("?"))+"?"+$.param(request);return true});$("#templates, #details-template, #details-facetedmenu, #variations-template, #variations-pricing, #price-ranges").hide();$("#spectemplates-setting").change(function(){if(this.checked){$("#templates, #details-template").show()}else{$("#details-template").hide()}if(!$("#spectemplates-setting").attr("checked")&&!$("#variations-setting").attr("checked")){$("#templates").hide()}}).change();$("#faceted-setting").change(function(){if(this.checked){$("#details-menu").removeClass("options").addClass("menu");$("#details-facetedmenu, #price-ranges").show()}else{$("#details-menu").removeClass("menu").addClass("options");$("#details-facetedmenu, #price-ranges").hide()}}).change();if(details){for(s in details){addDetail(details[s])}}$("#addPriceLevel").click(function(){addPriceLevel()});$("#addDetail").click(function(){addDetail()});$("#variations-setting").bind("toggleui",function(){if(this.checked){$("#templates, #variations-template, #variations-pricing").show()}else{$("#variations-template, #variations-pricing").hide()}if(!$("#spectemplates-setting").attr("checked")&&!$("#variations-setting").attr("checked")){$("#templates").hide()}}).click(function(){$(this).trigger("toggleui")}).trigger("toggleui");if(options){loadVariations(!(options.v)?options:options.v,prices)}$("#addVariationMenu").click(function(){addVariationOptionsMenu()});$("#pricerange-facetedmenu").change(function(){if($(this).val()=="custom"){$("#pricerange-menu, #addPriceLevel").show()}else{$("#pricerange-menu, #addPriceLevel").hide()}}).change();if(priceranges){for(key in priceranges){addPriceLevel(priceranges[key])}}if(!category){$("#title").focus()}function addPriceLevel(data){var menus=$("#pricerange-menu");var id=pricelevelsidx++;var menu=new NestedMenu(id,menus,"priceranges","",data,false,{axis:"y",scroll:false});$(menu.label).change(function(){this.value=asMoney(this.value)}).change()}function addDetail(data){var menus=$("#details-menu"),entries=$("#details-list"),addOptionButton=$("#addDetailOption"),id=detailsidx,menu=new NestedMenu(id,menus,"specs",NEW_DETAIL_DEFAULT,data,{target:entries,type:"list"});menu.items=new Array();menu.addOption=function(data){var option=new NestedMenuOption(menu.index,menu.itemsElement,menu.dataname,NEW_OPTION_DEFAULT,data,true);menu.items.push(option)};var facetedSetting=$('<li class="setting"></li>').appendTo(menu.itemsElement);var facetedMenu=$('<select name="specs['+menu.index+'][facetedmenu]"></select>').appendTo(facetedSetting);$('<option value="disabled">'+FACETED_DISABLED+"</option>").appendTo(facetedMenu);$('<option value="auto">'+FACETED_AUTO+"</option>").appendTo(facetedMenu);$('<option value="ranges">'+FACETED_RANGES+"</option>").appendTo(facetedMenu);$('<option value="custom">'+FACETED_CUSTOM+"</option>").appendTo(facetedMenu);if(data&&data.facetedmenu){facetedMenu.val(data.facetedmenu)}facetedMenu.change(function(){if($(this).val()=="disabled"||$(this).val()=="auto"){$(addOptionButton).hide();$(menu.itemsElement).find("li.option").hide()}else{$(addOptionButton).show();$(menu.itemsElement).find("li.option").show()}}).change();if(data&&data.options){for(var i in data.options){menu.addOption(data.options[i])}}$(menu.itemsElement).sortable({axis:"y",items:"li.option",scroll:false});menu.element.unbind("click",menu.click);menu.element.click(function(){menu.selected();$(addOptionButton).unbind("click").click(menu.addOption);$(facetedMenu).change()});detailsidx++}function updateWorkflow(){$("#workflow").change(function(){setting=$(this).val();request.page=adminpage;request.id=category;if(!request.id){request.id="new"}if(setting=="new"){request.id="new";request.next=setting}if(setting=="close"){delete request.id}if(setting=="previous"){$.each(worklist,function(i,entry){if(entry.id!=category){return}if(worklist[i-1]){request.next=worklist[i-1].id}else{delete request.id}})}if(setting=="next"){$.each(worklist,function(i,entry){if(entry.id!=category){return}if(worklist[i+1]){request.next=worklist[i+1].id}else{delete request.id}})}}).change()}});
+var Pricelines=new Pricelines(),productOptions=new Array(),optionMenus=new Array(),detailsidx=1,variationsidx=1,optionsidx=1,pricingidx=1,pricelevelsidx=1,fileUploader=false,changes=false,saving=false,flashUploader=false,template=true;jQuery(document).ready(function(){var $=jqnc(),editslug=new SlugEditor(category,"category"),imageUploads=new ImageUploads($("#image-category-id").val(),"category");postboxes.add_postbox_toggles("shopp_page_shopp-categories");$(".if-js-closed").removeClass("if-js-closed").addClass("closed");$(".postbox a.help").click(function(){$(this).colorbox({iframe:true,open:true,innerWidth:768,innerHeight:480,scrolling:false});return false});updateWorkflow();$("#category").submit(function(){this.action=this.action.substr(0,this.action.indexOf("?"))+"?"+$.param(request);return true});$("#templates, #details-template, #details-facetedmenu, #variations-template, #variations-pricing, #price-ranges").hide();$("#spectemplates-setting").change(function(){if(this.checked){$("#templates, #details-template").show()}else{$("#details-template").hide()}if(!$("#spectemplates-setting").attr("checked")&&!$("#variations-setting").attr("checked")){$("#templates").hide()}}).change();$("#faceted-setting").change(function(){if(this.checked){$("#details-menu").removeClass("options").addClass("menu");$("#details-facetedmenu, #price-ranges").show()}else{$("#details-menu").removeClass("menu").addClass("options");$("#details-facetedmenu, #price-ranges").hide()}}).change();if(details){$.each(details,function(i,r){addDetail(r)})}$("#addPriceLevel").click(function(){addPriceLevel()});$("#addDetail").click(function(){addDetail()});$("#variations-setting").bind("toggleui",function(){if(this.checked){$("#templates, #variations-template, #variations-pricing").show()}else{$("#variations-template, #variations-pricing").hide()}if(!$("#spectemplates-setting").attr("checked")&&!$("#variations-setting").attr("checked")){$("#templates").hide()}}).click(function(){$(this).trigger("toggleui")}).trigger("toggleui");if(options){loadVariations(!(options.v)?options:options.v,prices)}$("#addVariationMenu").click(function(){addVariationOptionsMenu()});$("#pricerange-facetedmenu").change(function(){if($(this).val()=="custom"){$("#pricerange-menu, #addPriceLevel").show()}else{$("#pricerange-menu, #addPriceLevel").hide()}}).change();if(priceranges){$.each(priceranges,function(i,r){addPriceLevel(r)})}if(!category){$("#title").focus()}function addPriceLevel(data){var menus=$("#pricerange-menu");var id=pricelevelsidx++;var menu=new NestedMenu(id,menus,"priceranges","",data,false,{axis:"y",scroll:false});$(menu.label).change(function(){this.value=asMoney(this.value)}).change()}function addDetail(data){var menus=$("#details-menu"),entries=$("#details-list"),addOptionButton=$("#addDetailOption"),id=detailsidx,menu=new NestedMenu(id,menus,"specs",NEW_DETAIL_DEFAULT,data,{target:entries,type:"list"});menu.items=new Array();menu.addOption=function(data){var option=new NestedMenuOption(menu.index,menu.itemsElement,menu.dataname,NEW_OPTION_DEFAULT,data,true);menu.items.push(option)};var facetedSetting=$('<li class="setting"></li>').appendTo(menu.itemsElement);var facetedMenu=$('<select name="specs['+menu.index+'][facetedmenu]"></select>').appendTo(facetedSetting);$('<option value="disabled">'+FACETED_DISABLED+"</option>").appendTo(facetedMenu);$('<option value="auto">'+FACETED_AUTO+"</option>").appendTo(facetedMenu);$('<option value="ranges">'+FACETED_RANGES+"</option>").appendTo(facetedMenu);$('<option value="custom">'+FACETED_CUSTOM+"</option>").appendTo(facetedMenu);if(data&&data.facetedmenu){facetedMenu.val(data.facetedmenu)}facetedMenu.change(function(){if($(this).val()=="disabled"||$(this).val()=="auto"){$(addOptionButton).hide();$(menu.itemsElement).find("li.option").hide()}else{$(addOptionButton).show();$(menu.itemsElement).find("li.option").show()}}).change();if(data&&data.options){$.each(data.options,function(i,r){menu.addOption(r)})}$(menu.itemsElement).sortable({axis:"y",items:"li.option",scroll:false});menu.element.unbind("click",menu.click);menu.element.click(function(){menu.selected();$(addOptionButton).unbind("click").click(menu.addOption);$(facetedMenu).change()});detailsidx++}function updateWorkflow(){$("#workflow").change(function(){setting=$(this).val();request.page=adminpage;request.id=category;if(!request.id){request.id="new"}if(setting=="new"){request.id="new";request.next=setting}if(setting=="close"){delete request.id}if(setting=="previous"){$.each(worklist,function(i,entry){if(entry.id!=category){return}if(worklist[i-1]){request.next=worklist[i-1].id}else{delete request.id}})}if(setting=="next"){$.each(worklist,function(i,entry){if(entry.id!=category){return}if(worklist[i+1]){request.next=worklist[i+1].id}else{delete request.id}})}}).change()}});

shopp/trunk/core/ui/orders/order.php

@@ -21 +21 @@
                         <?php endif; ?>
 
-                        <?php if ($Purchase->ispaid()): ?>
+                        <?php if ( $Purchase->ispaid() && ! $Purchase->isvoid() ): ?>
                         <div class="stamp paid"><div class="type"><?php _e('Paid','Shopp'); ?></div><div class="ing">&nbsp;</div></div>
                         <?php elseif ($Purchase->isvoid()): ?>
@@ -114 +114 @@
                         <ul class="promos">
                         <?php foreach ( $Purchase->discounts as $id => $Discount ): ?>
-                            <li><small><a href="<?php echo esc_url( add_query_arg(array('page' => $this->Admin->pagename('discounts'), 'id' => $id), admin_url('admin.php'))); ?>"><?php echo esc_html($Discount->name); ?></a></small></li>
+                            <li><small><a href="<?php echo esc_url( add_query_arg(array('page' => $this->Admin->pagename('discounts'), 'id' => $id), admin_url('admin.php'))); ?>"><?php echo esc_html($Discount->name); ?></a><?php if ( isset($Discount->code) ) echo " - " . esc_html($Discount->code); ?></small></li>
                         <?php endforeach; ?>
                         </ul>
@@ -187 +187 @@
                                                     $Product->load_data( array('images') );
                                                     $Image = reset($Product->images);
+                                                    $image_id = apply_filters('shopp_order_item_image_id', $Image->id, $Item, $Product);
 
                                                     if ( ! empty($Image) ) { ?>
-                                                        <img src="?siid=<?php echo $Image->id ?>&amp;<?php echo $Image->resizing(38, 0, 1) ?>" width="38" height="38" class="alignleft" />
+                                                        <img src="?siid=<?php echo $image_id ?>&amp;<?php echo $Image->resizing(38, 0, 1) ?>" width="38" height="38" class="alignleft" />
                                                     <?php
                                                     }
@@ -251 +252 @@
                                         ?>
                                             <td class="<?php echo esc_attr(join(' ',$classes)); ?>">
-                                            <?php do_action( 'shopp_manage_order_'.$column.'_column_data', $column, $Product ); ?>
+                                            <?php do_action( 'shopp_manage_order_' . sanitize_key($column) .'_column_data', $column, $Product, $Item, $Purchase ); ?>
                                             </td>
                                         <?php

shopp/trunk/core/ui/orders/orders.php

@@ -36 +36 @@
             <button type="submit" id="update-button" name="update" value="order" class="button-secondary"><?php _e('Update','Shopp'); ?></button>
         </div>
-        
+
         <div class="alignleft actions filtering">
                 <select name="range" id="range">
@@ -63 +63 @@
         <tbody id="orders-table" class="list orders">
         <?php
+            $columns = get_column_headers(ShoppAdmin()->screen());
             $hidden = get_hidden_columns(ShoppAdmin()->screen());
 
@@ -94 +95 @@
             do_action_ref_array('shopp_order_row_css',array(&$classes,&$Order));
             $even = !$even;
-            ?>
+        ?>
         <tr class="<?php echo join(' ',$classes); ?>">
-            <th scope='row' class='check-column'><input type='checkbox' name='selected[]' value='<?php echo $Order->id; ?>' /></th>
-            <td class="order column-order<?php echo in_array('order',$hidden)?' hidden':''; ?>"><a class='row-title' href='<?php echo esc_url($viewurl); ?>' title='<?php printf(__('View Order #%d','Shopp'),$Order->id); ?>'><?php printf(__('Order #%d','Shopp'),$Order->id); ?></a></td>
-            <td class="name column-name"><a href="<?php echo esc_url($customerurl); ?>"><?php echo esc_html($customer); ?></a><?php echo !empty($Order->company)?"<br />".esc_html($Order->company):""; ?></td>
-            <td class="destination column-destination<?php echo in_array('destination',$hidden)?' hidden':''; ?>"><?php echo esc_html($location); ?></td>
-            <td class="txn column-txn<?php echo in_array('txn',$hidden)?' hidden':''; ?>"><?php echo $Order->txnid; ?><br /><?php echo esc_html($gateway); ?></td>
-            <td class="date column-date<?php echo in_array('date',$hidden)?' hidden':''; ?>"><?php echo date("Y/m/d",mktimestamp($Order->created)); ?><br />
-                <strong><?php echo $statusLabels[$Order->status]; ?></strong></td>
-            <td class="total column-total<?php echo in_array('total',$hidden)?' hidden':''; ?>"><?php echo money($Order->total); ?><br /><span class="status"><?php echo $txnstatus; ?></span></td>
+        <?php
+            foreach ( $columns as $column => $column_title ) {
+                $classes = array($column,"column-$column");
+                if ( in_array($column, $hidden) ) $classes[] = 'hidden';
+
+                switch ( $column ) {
+                    case 'cb':
+                    ?>
+                        <th scope='row' class='check-column'><input type='checkbox' name='selected[]' value='<?php echo esc_attr($Order->id); ?>' /></th>
+                    <?php
+                    break;
+
+                    case 'order':
+                    ?>
+                        <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
+                            <a class='row-title' href='<?php echo esc_url($viewurl); ?>' title='<?php printf(__('View Order #%d','Shopp'),$Order->id); ?>'><?php printf(__('Order #%d','Shopp'),$Order->id); ?></a>
+                        </td>
+                    <?php
+                    break;
+
+                    case 'name':
+                    ?>
+                        <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
+                            <a href="<?php echo esc_url($customerurl); ?>"><?php echo esc_html($customer); ?></a><?php echo !empty($Order->company)?"<br />".esc_html($Order->company):""; ?>
+                        </td>
+                    <?php
+                    break;
+
+                    case 'destination':
+                    ?>
+                        <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
+                            <?php echo esc_html($location); ?>
+                        </td>
+                    <?php
+                    break;
+
+                    case 'txn':
+                    ?>
+                        <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
+                            <?php echo $Order->txnid; ?><br /><?php echo esc_html($gateway); ?>
+                        </td>
+                    <?php
+                    break;
+
+                    case 'date':
+                    ?>
+                        <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
+                            <?php echo date("Y/m/d", mktimestamp($Order->created)); ?><br />
+                            <strong><?php echo $statusLabels[$Order->status]; ?></strong>
+                        </td>
+                    <?php
+                    break;
+
+                    case 'total':
+                    ?>
+                        <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
+                            <?php echo money($Order->total); ?><br /><span class="status"><?php echo $txnstatus; ?></span>
+                        </td>
+                    <?php
+                    break;
+
+                    default:
+                    ?>
+                        <td class="<?php echo esc_attr(join(' ', $classes)); ?>">
+                            <?php do_action( 'shopp_manage_orders_custom_column', $column, $Order ); ?>
+                            <?php do_action( 'shopp_manage_orders_' . santitize_key($column) . '_column', $column, $Order ); ?>
+                        </td>
+                    <?php
+                    break;
+
+
+                } // end switch ( $column )
+
+            } // end foreach ( $columns…)
+        ?>
         </tr>
         <?php endforeach; ?>

shopp/trunk/core/ui/reports/products.php

@@ -42 +42 @@
         $query = "SELECT CONCAT($id) AS id,
                             CONCAT(p.post_title,' ',pr.label) AS product,
-                            COUNT(DISTINCT o.id) AS sold,
+                            SUM(o.quantity) AS sold,
                             COUNT(DISTINCT o.purchase) AS orders,
                             SUM(o.total) AS grossed

shopp/trunk/core/ui/reports/reports.php

@@ -21 +21 @@
         </div>
 
-        <?php $ListTable->pagination('top'); ?>
+        <?php $ListTable->pagination( 'top' ); ?>
 
         <div class="clear"></div>

shopp/trunk/core/ui/settings/setup.php

@@ -76 +76 @@
             <tr>
                 <th scope="row" valign="top"><label for="maintenance-toggle"><?php _e('Maintenance Mode','Shopp'); ?></label></th>
-                <td><input type="hidden" name="settings[maintenance]" value="off" /><input type="checkbox" name="settings[maintenance]" value="on" id="maintenance-toggle"<?php if ( shopp_setting_enabled('maintenance') ) echo ' checked="checked"'?> /><label for="maintenance-toggle"> <?php _e('Enable mainteance mode','Shopp'); ?></label><br />
+                <td><input type="hidden" name="settings[maintenance]" value="off" /><input type="checkbox" name="settings[maintenance]" value="on" id="maintenance-toggle"<?php if ( shopp_setting_enabled('maintenance') ) echo ' checked="checked"'?> /><label for="maintenance-toggle"> <?php _e('Enable maintenance mode','Shopp'); ?></label><br />
                 <?php _e('All storefront pages will display a maintenance mode message.','Shopp'); ?></td>
             </tr>

shopp/trunk/core/ui/styles/admin.css

@@ -312 +312 @@
 #lightbox div.progress { margin:40px 0 0 10px; }
 
-.shopp .notice {-webkit-border-radius:3px;border-radius:3px;border:1px solid #e6db55;background-color:#ffffe0;margin: 5px 0 15px;padding: 0 0.6em; }
-.shopp .notice p { margin:1em 0; }
+#shopp-activation-nag { width:100%; box-sizing:border-box;}
+#shopp-activation-nag .dismiss { color:#ccc; margin-right:8px; }
+#shopp-activation-nag .dismiss:hover { color:#aaa; }
+#shopp-activation-nag .button { float: left; margin: 8px 20px 0 0; button }
+#shopp-activation-nag big { display:block; }
 
 #wpcontent .form-table select.scrolling { height:auto; }
@@ -507 +510 @@
 
 .orders.list .status { font-weight: bold; }
+.orders.list .refunded .order,
+.orders.list .refunded .total,
 .orders.list .voided .order,
 .orders.list .voided .total { text-decoration: line-through; }

shopp/trunk/core/ui/styles/dashboard.css

@@ -29 +29 @@
 #dashboard_shopp_inventory span.lowstock.warning { background: #C60; }
 #dashboard_shopp_inventory span.lowstock.backorder { background: #C00; }
+
+.orders.list .refunded td { text-decoration: line-through; }

shopp/trunk/gateways/PayPal/PayPalStandard.php

@@ -6 +6 @@
  * @copyright Ingenesis Limited, May 2009
  * @package shopp
- * @version 1.3
+ * @version 1.3.2
  * @since 1.2
  **/
@@ -53 +53 @@
         // add_filter('shopp_themeapi_cart_paypal', array($this, 'sendcart'), 10, 2); // provides shopp('cart.paypal') checkout button
         add_filter( 'shopp_checkout_submit_button', array($this, 'submit'), 10, 3 ); // replace submit button with paypal image
+
+        // Prevent inclusive taxes from adding extra taxes to the order
+        add_filter( 'shopp_gateway_tax_amount', array($this, 'notaxinclusive' ) );
 
         // request handlers
@@ -347 +350 @@
         $title = Shopp::__( 'Sending order to PayPal…' );
         $message = '<form id="' . $id . '" action="' . $this->url() . '" method="POST">' .
-            $this->form( $Purchase ) .
-            '<h1>' . $title . '</h1>' .
-            '<noscript>' .
-            '<p>' . Shopp::__( 'Click the &quot;Checkout with PayPal&quot; button below to submit your order to PayPal for payment processing:' ) . '</p>' .
-            '<p>' . join( '', $this->submit() ) . '</p>' .
-            '</noscript>' .
-            '</form>' .
-            '<script type="text/javascript">document.getElementById("' . $id . '").submit();</script></body></html>';
+                    $this->form( $Purchase ) .
+                    '<h1>' . $title . '</h1>' .
+                    '<noscript>' .
+                    '<p>' . Shopp::__( 'Click the &quot;Checkout with PayPal&quot; button below to submit your order to PayPal for payment processing:' ) . '</p>' .
+                    '<p>' . join( '', $this->submit() ) . '</p>' .
+                    '</noscript>' .
+                    '</form>' .
+                    '<script type="text/javascript">document.getElementById("' . $id . '").submit();</script></body></html>';
 
         wp_die( $message, $title, array( 'response' => 200 ) );
@@ -502 +505 @@
                 $_['item_number_'.$id]      = $id;
                 $_['item_name_'.$id]        = apply_filters('paypal_freeorder_handling_label',
-                    __('Shipping & Handling','Shopp'));
+                                                            __('Shipping & Handling','Shopp'));
                 $_['amount_'.$id]           = $this->amount( max((float)$this->amount('shipping'), 0.01) );
                 $_['quantity_'.$id]         = 1;
@@ -534 +537 @@
                 $this->sale($Purchase);
             elseif ( 'capture' === $event ) {
-                if ( ! $Purchase->capturable() ) return false; // Already captured
+
+                if ( ! $Purchase->capturable() )
+                    return ShoppOrder()->success(); // Already captured
+
                 if ( 'voided' === $Purchase->txnstatus )
                     ShoppOrder()->invoice($Purchase); // Reinvoice for cancel-reversals
@@ -695 +701 @@
      **/
     public function pdt () {
-
-        if ( empty(ShoppOrder()->inprogress) ) {
-            shopp_debug('PDT processing could not load in-progress order from session.');
-            return Shopp::redirect( Shopp::url( false, 'thanks', false ) ); // Send back customer to thanks page and hope IPN takes care of it properly
-        }
+        $Order = ShoppOrder();
 
         if ( ! $this->pdtvalid() ) return;
@@ -708 +710 @@
         $event = $Message->event();
 
-        if ( ShoppOrder()->inprogress != $id ) {
-            shopp_debug('PDT processing order did not match the inprogress order.');
-            return Shopp::redirect( Shopp::url( false, 'thanks', false ) );
-        }
-
         $Purchase = new ShoppPurchase($id);
 
-        if ( ! isset($Purchase->id) || empty($Purchase->id) ) {
+        if ( empty($Purchase->id) ) {
             shopp_debug('PDT processing could not load the in progress order from the database.');
             return Shopp::redirect( Shopp::url(false, 'thanks', false ) );
         }
 
+        $Order->inprogress = $Purchase->id;
         $this->process($event, $Purchase);
         Shopp::redirect( Shopp::url( false, 'thanks', false ) );
@@ -933 +931 @@
 
         $this->labels(); // Initialize labels
-
     }
 

shopp/trunk/license.txt

@@ -1 @@
-Table of Contents
+# Table of Contents
 =====================================================================
 Section I   : Credits and Copyrights
 Section II  : GNU General Public License
 Section III : BSD License (see Credits)
-Section IV  : THE EMOGRIFIER LICENSE
-
-Section I   : Credits
-=====================================================================
+Section IV : THE EMOGRIFIER LICENSE
+=====================================================================
+## Section I: Credits
+
 Code contributors include (but not limited to):
 Jonathan Davis - Ingenesis Limited
@@ -13 +13 @@
 Marc Neuhaus
 Timothy Hatcher
-Tom Wu (see BSD License in Section III for license to this author's work)
-Pelago, pelagodesign.com (see THE EMOGRIFIER LICENSE, Section IV)
+Barry Hughes
+Clifton Griffin
+Ben Andersen
+Lorenzo Caum
+Tom Wu (see Section III: BSD License)
+Pelago, pelagodesign.com (see Section IV: THE EMOGRIFIER LICENSE)
 
 Copyrights:
@@ -22 +26 @@
 source code files.
 
-Section II  : GNU General Public License
-=====================================================================
+=====================================================================
+
+## Section II: GNU General Public License
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
@@ -702 +708 @@
 =====================================================================
 
-Section III : BSD License (see Credits)
-=====================================================================
-* Permission is hereby granted, free of charge, to any person obtaining
-* a copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to
-* permit persons to whom the Software is furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice shall be
-* included in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-* EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-* WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-*
-* IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
-* INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
-* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
-* THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
-* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*
-* In addition, the following condition applies:
-*
-* All redistributions must retain an intact copy of this copyright notice
-* and disclaimer.
-*
+## Section III: BSD License
+
+(see Section I: Credits)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+In addition, the following condition applies:
+
+All redistributions must retain an intact copy of this copyright notice
+and disclaimer.
+
 Address all questions regarding this license to:
 
@@ -739 +747 @@
 =====================================================================
 
-Section IV : THE EMOGRIFIER LICENSE (see Credits)
-=====================================================================
+## Section IV: THE EMOGRIFIER LICENSE
+
+(see Section I: Credits)
 
 Emogrifier is provided under the terms of the MIT license:

shopp/trunk/readme.txt

@@ -21 +21 @@
 Run sales, add new products, update inventory, ship orders. It’s all there, and it’s easy. Shopp consistently wins accolades for it’s WordPress-native administration tools giving it the most natural management experience you’ll find in a WordPress e-commerce solution. Get in, do your thing and get on with your real life.
 
-E-commerce software shouldn’t tell you how to manage your business. You should be able tell your e-commerce software how you manage your business. Shopp lets you do just that. Create your own order processing labels and easily move orders through each step of the order fullfillment workflow either automatically or take control of it yourself.
+E-commerce software shouldn’t tell you how to manage your business. You should be able tell your e-commerce software how you manage your business. Shopp lets you do just that. Create your own order processing labels and easily move orders through each step of the order fulfillment workflow either automatically or take control of it yourself.
 
 Export orders to accounting systems like Intuit® QuickBooks®, or to spreadsheets like Microsoft® Excel®. Shopp remembers your last export date so its easy to do ongoing exports on a regular basis.
@@ -27 +27 @@
 = Safe & Sound =
 
-Your website will be in good -hands- bytes running on Shopp. Our comprehensive security builds on the solid toolkit of WordPress to let the good guys in and keep bad guys out. We use all the tricks of the trade plus a few ideas of our own to protect your store and your customers.
+Your website will be in good hands (or bytes) running on Shopp. Our comprehensive security builds on the solid toolkit of WordPress to let the good guys in and keep bad guys out. We use all the tricks of the trade plus a few ideas of our own to protect your store and your customers.
 
 Shopp is so secure it passes PCI vulnerability scans every day and we can prove it! [See the McAfee SECURE seal on our website](https://www.mcafeesecure.com/RatingVerify?ref=shopplugin.net). 
@@ -86 +86 @@
 6. Click on any of the Shopp menus to start setting up your new Shopp store!
 
-At a minimum you should setup a **Base of Operations** location to setup Shopp to work for your location. For details see our [Getting Started Guide](https://shopplugin.comt/docs/getting-started/)
+At a minimum you should setup a **Base of Operations** location to setup Shopp to work for your location. For details see our [Getting Started Guide](https://shopplugin.com/docs/getting-started/)
 
 == Changelog ==
 
-= 1.0 =
+= 1.3 =
 
-* Initial release
-* Content templates
-* Shortcodes
-* Widgets
-* Product Variants editor
-* PayPal Standard
-
-= 1.1 =
-
-* Product addons
-* Storefront Search Engine
-* Tax system improvements
-* Image & Script Servers
-* Scriptabe email templates
-* Cart Item discounts
-* Passes PCI scans
-* Offline Payments
-* 2Checkout and Google Checkout included
-* New Theme API tags
+* Added reports with charting and exports
+* Relabeled Promotions to Discounts
+* Added icon font and other vector art
+* Implemented PHP smart loading
+* Improved checkout experience and templates
+* Added schema.org support
+* Refactored classes for better encapsulation and tidier interfaces
+* Added direct URL support to storage engines
+* Introduced support for `wp-content/shopp-addons/` directory
+* Improved tax and discount calculations
+* Added compound tax support
+* Implemented totals register system
+* Improved session handling
+* Fixed slow queries
+* Improved order management
+* Redesigned unit tests 
+* implemented continuous integration developement
 
 = 1.2 =
@@ -132 +130 @@
 * Implemented unit tests
 
-= 1.3 =
+= 1.1 =
 
-* Added reports with charting and exports
-* Relabeled Promotions to Discounts
-* Added icon font and other vector art
-* Implemented PHP smart loading
-* Improved checkout experience and templates
-* Added schema.org support
-* Refactored classes for better encapsulation and tidier interfaces
-* Added direct URL support to storage engines
-* Introduced support for `wp-content/shopp-addons/` directory
-* Improved tax and discount calculations
-* Added compound tax support
-* Implemented totals register system
-* Improved session handling
-* Fixed slow queries
-* Improved order management
-* Redesigned unit tests 
-* implemented continuous integration developement
+* Product addons
+* Storefront Search Engine
+* Tax system improvements
+* Image & Script Servers
+* Scriptabe email templates
+* Cart Item discounts
+* Passes PCI scans
+* Offline Payments
+* 2Checkout and Google Checkout included
+* New Theme API tags
+
+= 1.0 =
+
+* Initial release
+* Content templates
+* Shortcodes
+* Widgets
+* Product Variants editor
+* PayPal Standard
+
 
 == Frequently Asked Questions ==
@@ -160 +161 @@
 = Where can I see examples of Shopp in action? =
 
-The [Showcase](https://shopplugin.com/showcase) has lots of live storefronts running Shopp.
+The [Showcase](https://shopplugin.net/blog/category/showcase/) has lots of live storefronts running Shopp.
 
 = Do you have a product importer? =

shopp/trunk/services/image.php

@@ -246 +246 @@
 
         // Output the image
-        ob_clean(); // try to catch errant data in buffer
+        @ob_clean(); // try to catch errant data in buffer
         $this->Image->output($headers);
     }

shopp/trunk/storage/core/FSStorage.php

@@ -42 +42 @@
         parent::__construct();
         $this->name = __('File system','Shopp');
-        $this->webroot = apply_filters('shopp_fsstorage_webroot', trim(ABSPATH, '/'));
+        $this->webroot = apply_filters('shopp_fsstorage_webroot', $_SERVER['DOCUMENT_ROOT']);
     }
 
@@ -281 +281 @@
      * @return mixed bool | string
      */
-    public function direct( $uri ) {
+    public function direct ( $uri ) {
         if ( defined('SHOPP_DIRECT_ASSET_URLS') && ! SHOPP_DIRECT_ASSET_URLS ) return false;
         $path = $this->finddirect($uri);
@@ -298 +298 @@
      * @return string | bool
      */
-    protected function finddirect($uri) {
-        $wpurl = get_option('siteurl');
-        $webroot = explode('/', $this->webroot);
+    protected function finddirect ( $uri ) {
+        // The web server's document root
+        $webroot = $this->webroot;
+
+        // The base directory of WordPress
+        $wpdir = apply_filters( 'shopp_fsstorage_homedir', ABSPATH );
+
+        // The base URL (home URL) of the site
+        $baseurl = untrailingslashit( apply_filters( 'shopp_fsstorage_homeurl', get_option( 'home' ) ) );
 
         // Obtain the storage path or bail out early if it is not accessible/is invalid
         if ( ! ( $storagepath = $this->storagepath() ) ) return false;
-        else $storagedir = explode('/', trim($storagepath, '/') );
 
         // Ensure the file exists
-        if ( ! file_exists($storagepath . "/$uri" )) return false;
+        if ( ! file_exists( $storagepath . "/$uri" ) ) return false;
 
         // Determine if the storage path is inside the webroot (they should have the same initial set of "segments")
-        for ($segment = 0; $segment < count($webroot); $segment++)
-            if ($webroot[$segment] !== $storagedir[$segment]) return false;
+        if ( 0 != strpos( $storagepath, $webroot ) ) return false;
+
+        // Is WordPress installed and accessed from within a subdirectory of webroot? Adjust $baseurl to remove the subdir if so
+        if ( $webroot !== $wpdir && false !== strpos($wpdir, $webroot) ) {
+            $path = untrailingslashit( str_replace( $webroot, '', $wpdir ) );
+            $inpath = strrpos( $baseurl, $path );
+            if ( $inpath ) $baseurl = substr( $baseurl, 0, $inpath );
+        }
+
+        // Determine if the storage path is under the WordPress directory and if so use it as the canonical webroot
+        if ( false !== strpos($storagepath, $wpdir) && false === strpos($storagepath, $webroot) )
+            $webroot = $wpdir;
 
         // Supposing the image directory isn't the WP root, append the trailing component
-        if (count($storagedir) > count($this->webroot)) {
-            $trailing_component = join('/', array_slice($storagedir, count($webroot)));
-            $public_url = trailingslashit($wpurl) . $trailing_component;
-        }
-        else $public_url = $wpurl;
-
-        return trailingslashit($public_url) . $uri;
+        if ( $storagepath !== $webroot ) {
+            $path = str_replace( trailingslashit( $webroot ), '', $storagepath );
+            $url = trailingslashit( $baseurl ) . $path;
+        } else $url = $baseurl;
+
+        return trailingslashit( $url ) . $uri;
     }
 

shopp/trunk/templates/email-order.php

@@ -12 +12 @@
         <?php shopp( 'purchase.receipt' ); ?>
         <?php if ( shopp( 'purchase.notpaid' ) && shopp( 'checkout.get-offline-instructions' ) ) : ?>
-            <p><?php shopp( 'checkout.offline-instructions' ); ?></p>
+            <?php shopp( 'checkout.offline-instructions' ); ?>
         <?php endif; ?>
     </div>

shopp/trunk/templates/sidecart.php

@@ -23 +23 @@
         </ul>
     <?php else : ?>
-        <p class="notice"><?php _e( 'Your cart is empty.', 'Shopp' ); ?></p>
+        <p class="status notice"><?php _e( 'Your cart is empty.', 'Shopp' ); ?></p>
     <?php endif; ?>
 </div>

shopp/trunk/templates/thanks.php

@@ -20 +20 @@
 
         <?php if ( shopp( 'checkout.get-offline-instructions' ) ) : ?>
-            <p><?php shopp( 'checkout.offline-instructions' ); ?></p>
+            <?php shopp( 'checkout.offline-instructions' ); ?>
         <?php endif; ?>