Changeset 734585

Timestamp:

07/01/2013 11:10:27 AM (13 years ago)

Author:

garyc40

Message:

Merge with github

Location:

wp-e-commerce/branches/branch-3.8.12

Files:

• readme.txt (modified) (2 diffs)
• wpsc-admin/includes/coupon-list-table-class.php (modified) (1 diff)
• wpsc-admin/includes/product-functions.php (modified) (1 diff)
• wpsc-admin/includes/settings-tabs/shipping.php (modified) (7 diffs)
• wpsc-admin/init.php (modified) (2 diffs)
• wpsc-admin/js/settings-page.js (modified) (3 diffs)

wp-e-commerce/branches/branch-3.8.12/readme.txt

@@ -5 +5 @@
 Requires at least: 3.4
 Tested up to: 3.6
-Stable tag: 3.8.11
+Stable tag: 3.8.2
 
 WP e-Commerce is a free WordPress Shopping Cart Plugin that lets customers buy your products, services and digital downloads online.
@@ -162 +162 @@
 * Fix: Add to Cart button doesn't work
 * Fix: Can no longer upload customer attachments
+* Fix: Deprecated warning for wp_convert_bytes_to_hr() function in WordPress 3.6
 
 

wp-e-commerce/branches/branch-3.8.12/wpsc-admin/includes/coupon-list-table-class.php

@@ -406 +406 @@
         $where    = $status !== false ? "WHERE active = $status" : '';
 
-        $order    = strtoupper( $_GET['order'] ) === 'ASC' ? 'ASC' : 'DESC';
+        $order    = isset( $_GET['order'] ) && strtoupper( $_GET['order'] ) === 'ASC' ? 'ASC' : 'DESC';
         $limit    = " LIMIT $offset,$per_page;";
         $coupons  = $wpdb->get_results( "SELECT * FROM `" . WPSC_TABLE_COUPON_CODES . "` {$where} ORDER BY id {$order} {$limit} ", ARRAY_A );

wp-e-commerce/branches/branch-3.8.12/wpsc-admin/includes/product-functions.php

@@ -8 +8 @@
 
 function wpsc_get_max_upload_size(){
-    return wp_convert_bytes_to_hr( wp_max_upload_size() );
+    return size_format( wp_max_upload_size() );
 }
 

wp-e-commerce/branches/branch-3.8.12/wpsc-admin/includes/settings-tabs/shipping.php

@@ -48 +48 @@
         foreach ( $wpsc_shipping_modules as $shipping ) {
             foreach ( (array) $_POST['custom_shipping_options'] as $shippingoption ) {
-                if ( $shipping->internal_name == $shippingoption ) {
+                if ( $shipping->getInternalName() == $shippingoption ) {
                     $shipadd++;
                 }
@@ -72 +72 @@
         if ( $found_selected_module ) {
             $selected_module = $wpsc_shipping_modules[$selected_module_id];
-            $title = $selected_module->name;
+            $title = $selected_module->getName();
             $content = apply_filters( 'wpsc_shipping_module_settings_form', $selected_module->getForm(), $selected_module );
         } else {
@@ -101 +101 @@
             'tab'                => 'shipping',
             'page'               => 'wpsc-settings',
-            'shipping_module_id' => $shipping->internal_name,
+            'shipping_module_id' => $shipping->getInternalName(),
         ), $location );
         $location .= '#wpsc-shipping-module-options';
@@ -270 +270 @@
                 <?php
                     foreach ( $internal_shipping_modules as $shipping ) {
-                        $force = ( $shipping->internal_name === (string) get_user_option( 'wpsc_settings_selected_shipping_module', get_current_user_id() ) );
+                        $force = ( $shipping->getInternalName() === (string) get_user_option( 'wpsc_settings_selected_shipping_module', get_current_user_id() ) );
                         $this->shipping_list_item( $shipping, $force );
                     }
@@ -300 +300 @@
                 <?php
                     foreach ( $external_shipping_modules as $shipping ) {
-                        $force = ( $shipping->internal_name === (string) get_user_option( 'wpsc_settings_selected_shipping_module', get_current_user_id() ) );
+                        $force = ( $shipping->getInternalName() === (string) get_user_option( 'wpsc_settings_selected_shipping_module', get_current_user_id() ) );
                         $this->shipping_list_item( $shipping, $force );
                     }
@@ -319 +319 @@
 
         ?>
-            <tr class="wpsc-select-shipping <?php echo $shipping->active; ?>" data-shipping-id="<?php echo esc_attr( $shipping->internal_name ); ?>" id="shipping_list_item_<?php echo $shipping->internal_name;?>">
+            <tr class="wpsc-select-shipping <?php echo $shipping->active; ?>" data-shipping-id="<?php echo esc_attr( $shipping->getInternalName() ); ?>" id="shipping_list_item_<?php echo $shipping->getInternalName();?>">
                 <th scope="row" class="check-column">
-                    <input name='custom_shipping_options[]' <?php disabled( $shipping->disabled ); ?> <?php checked( $shipping->checked ); ?> type='checkbox' value='<?php echo $shipping->internal_name; ?>' id='<?php echo $shipping->internal_name; ?>_id' />
+                    <input name='custom_shipping_options[]' <?php disabled( $shipping->disabled ); ?> <?php checked( $shipping->checked ); ?> type='checkbox' value='<?php echo $shipping->getInternalName(); ?>' id='<?php echo $shipping->getInternalName(); ?>_id' />
                 </th>
                 <td class="plugin-title">
-                    <label for='<?php echo $shipping->internal_name; ?>_id'><strong><?php echo $shipping->name; ?></strong></label>
+                    <label for='<?php echo $shipping->getInternalName(); ?>_id'><strong><?php echo $shipping->getName(); ?></strong></label>
                     <div class="row-actions-visible">
                         <span class="edit">
-                            <a class='edit-shipping-module' data-module-id="<?php echo $shipping->internal_name; ?>" title="<?php esc_attr_e( 'Edit this Shipping Module', 'wpsc' ); ?>" href='<?php echo esc_url( $this->get_shipping_module_url( $shipping ) ); ?>'><?php _ex( 'Settings', 'Shipping modules link to individual settings', 'wpsc' ); ?>
+                            <a class='edit-shipping-module' data-module-id="<?php echo $shipping->getInternalName(); ?>" title="<?php esc_attr_e( 'Edit this Shipping Module', 'wpsc' ); ?>" href='<?php echo esc_url( $this->get_shipping_module_url( $shipping ) ); ?>'><?php _ex( 'Settings', 'Shipping modules link to individual settings', 'wpsc' ); ?>
                             <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" />
                         </span>
@@ -333 +333 @@
                 </td>
             </tr>
-            <tr id="wpsc_shipping_settings_<?php echo esc_attr( $shipping->internal_name ); ?>" data-shipping-id="<?php echo esc_attr( $shipping->internal_name ); ?>" class='wpsc-select-shipping <?php echo $shipping->active; ?>' <?php echo $shipping->hidden; ?> >
-                <td colspan="3" id="wpsc_shipping_settings_<?php echo esc_attr( $shipping->internal_name ); ?>_container">
-                    <?php $this->display_shipping_module_settings_form( $shipping->internal_name ); ?>
+            <tr id="wpsc_shipping_settings_<?php echo esc_attr( $shipping->getInternalName() ); ?>" data-shipping-id="<?php echo esc_attr( $shipping->getInternalName() ); ?>" class='wpsc-select-shipping <?php echo $shipping->active; ?>' <?php echo $shipping->hidden; ?> >
+                <td colspan="3" id="wpsc_shipping_settings_<?php echo esc_attr( $shipping->getInternalName() ); ?>_container">
+                    <?php $this->display_shipping_module_settings_form( $shipping->getInternalName() ); ?>
                 </td>
             </tr>

wp-e-commerce/branches/branch-3.8.12/wpsc-admin/init.php

@@ -188 +188 @@
         }
         // Get the most number of products and create a header for them
-        $headers3 = "";
+        $headers3 = array();
         for( $i = 0; $i < $count; $i++ ){
             $headers3[] = _x( 'Quantity', 'purchase log csv headers', 'wpsc' );
@@ -202 +202 @@
         $headers      = apply_filters( 'wpsc_purchase_log_csv_headers', $headers . $form_headers . $headers2 . $headers3, $data, $form_data );
         $output       = apply_filters( 'wpsc_purchase_log_csv_output', $output, $data, $form_data );
+        do_action( 'wpsc_purchase_log_csv' );
         header( 'Content-Type: text/csv' );
         header( 'Content-Disposition: inline; filename="' . $csv_name . '"' );

wp-e-commerce/branches/branch-3.8.12/wpsc-admin/js/settings-page.js

@@ -310 +310 @@
             wrapper.on( 'click', '#wpsc-delete-checkout-set', WPSC_Settings_Page.Checkout.event_delete_checkout_set);
             wrapper.on( 'change', '#wpsc_form_set', WPSC_Settings_Page.Checkout.event_select_form_set);
-            wrapper.on( 'click', '.mandatorycol input[type="checkbox"]', WPSC_Settings_Page.Checkout.event_disabled_toggeled);
+            wrapper.on( 'click', '.mandatorycol input[type="checkbox"]', WPSC_Settings_Page.Checkout.event_disabled_toggled);
             $('#wpsc-settings-form').on( 'submit', WPSC_Settings_Page.Checkout.event_form_submit);
 
@@ -334 +334 @@
              */
             wrapper.find( '.mandatorycol input[type="checkbox"]').each( function(){
-                var displaycol = $(this).parents('.mandatorycol').siblings('.displaycol');
-
-                if ( $(this).is(':checked') ){
-                    $(displaycol).find('input[type="checkbox"]').prop('checked', true ).attr( 'disabled', 'disabled' );
+                var displaycol = $( this ).parents( '.mandatorycol' ).siblings( '.displaycol' );
+
+                if ( $( this ).is( ':checked' ) ) {
+                    $( displaycol ).find( 'input[type="checkbox"]' ).prop( 'checked', true ).prop( 'readonly', true );
                 } else {
-                    $(displaycol).find('input[type="checkbox"]').attr( 'disabled', this.checked );
+                    $( displaycol ).find( 'input[type="checkbox"]' ).prop( 'readonly', this.checked );
                 }
             });
@@ -577 +577 @@
          * mandatory then it just enables you to uncheck the display box.
          */
-        event_disabled_toggeled : function() {
-
-            var displaycol = $(this).parents('.mandatorycol').siblings('.displaycol');
-
-            if ( $(this).is(':checked') ){
-                $(displaycol).find('input[type="checkbox"]').prop('checked', true ).attr( 'disabled', 'disabled' );
+        event_disabled_toggled : function() {
+
+            var displaycol = $( this ).parents( '.mandatorycol' ).siblings( '.displaycol' );
+
+            if ( $( this ).is( ':checked' ) ) {
+                $( displaycol ).find( 'input[type="checkbox"]' ).prop( 'checked', true ).prop( 'readonly', true );
             } else {
-                 $(displaycol).find('input[type="checkbox"]').attr( 'disabled', this.checked );
+                 $( displaycol ).find( 'input[type="checkbox"]' ).prop( 'readonly', this.checked );
             }
         },