WP eCommerce - Version 3.8.8-rc1

Version Description

Download this release

Release Info

Developer garyc40
Plugin Icon 128x128 WP eCommerce
Version 3.8.8-rc1
Comparing to
See all releases

Code changes from version 3.8.8-beta2 to 3.8.8-rc1

Files changed (11) hide show
  1. readme.txt +3 -0
  2. wp-shopping-cart.php +1 -1
  3. wpsc-admin/js/admin.js +4 -3
  4. wpsc-core/wpsc-constants.php +3 -3
  5. wpsc-includes/checkout.class.php +2 -2
  6. wpsc-includes/purchaselogs.class.php +1 -1
  7. wpsc-merchants/paypal-express.merchant.php +3 -1
  8. wpsc-merchants/paypal-pro.merchant.php +1 -0
  9. wpsc-merchants/paypal-standard.merchant.php +2 -0
  10. wpsc-shipping/usps_20.php +3 -1
  11. wpsc-theme/functions/wpsc-user_log_functions.php +2 -2
readme.txt CHANGED
@@ -157,6 +157,7 @@ After upgrading from earlier versions look for link "Update Store". This will up
157
 
158
  == Changelog ==
159
  = 3.8.8 =
 
160
  * New: Actions for bulk actions on sales page: wpsc_sales_log_process_bulk_action, wpsc_sales_log_extra_tablenav
161
  * New: Allow variation checkboxes to be collapsed & expanded without having to tick the variation set checkbox itself.
162
  * New: Digital Download UI improvement.
@@ -184,6 +185,7 @@ After upgrading from earlier versions look for link "Update Store". This will up
184
  * Fix: $wpsc_query->query_vars['wpsc_product_category'] not always set on product page with hierarchical category permalinks.
185
  * Fix: Cannot add new Checkout field.
186
  * Fix: Cannot re-re-send buyer receipt.
 
187
  * Fix: 3.7 -> 3.8 Database Upgrade Routine causes some products with variations to display a $0.00 price.
188
  * Fix: Double <p> tag with wpec_taxes_display_tax_bands() on product edit page.
189
  * Fix: Fatal error when trying to include a non-existent admin file.
@@ -196,6 +198,7 @@ After upgrading from earlier versions look for link "Update Store". This will up
196
  * Fix: Summary line does not get updated when sales log status is changed.
197
  * Fix: Total Quantity check fails for coupon codes.
198
  * Fix: USPS: "FLATE RATE ENVELOPE" should be changed to "VARIABLE" to allow for shipping quotes to be based on weight.
 
199
  * Fix: Use ->add_help_tab() to support WP 3.3 admin screen API.
200
  * Fix: Using discount causes Paypal Express to calculate wrong total amount.
201
  * Fix: get_the_content() is not enough in product feed.
157
 
158
  == Changelog ==
159
  = 3.8.8 =
160
+ * New: 3 action hooks to process PayPal IPN responses: wpsc_paypal_pro_ipn, wpsc_paypal_standard_ipn and wpsc_paypal_express_ipn.
161
  * New: Actions for bulk actions on sales page: wpsc_sales_log_process_bulk_action, wpsc_sales_log_extra_tablenav
162
  * New: Allow variation checkboxes to be collapsed & expanded without having to tick the variation set checkbox itself.
163
  * New: Digital Download UI improvement.
185
  * Fix: $wpsc_query->query_vars['wpsc_product_category'] not always set on product page with hierarchical category permalinks.
186
  * Fix: Cannot add new Checkout field.
187
  * Fix: Cannot re-re-send buyer receipt.
188
+ * Fix: Custom Meta copies values when adding new.
189
  * Fix: 3.7 -> 3.8 Database Upgrade Routine causes some products with variations to display a $0.00 price.
190
  * Fix: Double <p> tag with wpec_taxes_display_tax_bands() on product edit page.
191
  * Fix: Fatal error when trying to include a non-existent admin file.
198
  * Fix: Summary line does not get updated when sales log status is changed.
199
  * Fix: Total Quantity check fails for coupon codes.
200
  * Fix: USPS: "FLATE RATE ENVELOPE" should be changed to "VARIABLE" to allow for shipping quotes to be based on weight.
201
+ * Fix: USPS settings not saving correctly.
202
  * Fix: Use ->add_help_tab() to support WP 3.3 admin screen API.
203
  * Fix: Using discount causes Paypal Express to calculate wrong total amount.
204
  * Fix: get_the_content() is not enough in product feed.
wp-shopping-cart.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: WP e-Commerce
4
  * Plugin URI: http://getshopped.org/
5
  * Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://getshopped.org" target="_blank">GetShopped.org</a> | <a href="http://getshopped.org/forums/" target="_blank">Support Forum</a> | <a href="http://docs.getshopped.org/" target="_blank">Documentation</a>
6
- * Version: 3.8.8-beta2
7
  * Author: Instinct Entertainment
8
  * Author URI: http://getshopped.org/
9
  **/
3
  * Plugin Name: WP e-Commerce
4
  * Plugin URI: http://getshopped.org/
5
  * Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://getshopped.org" target="_blank">GetShopped.org</a> | <a href="http://getshopped.org/forums/" target="_blank">Support Forum</a> | <a href="http://docs.getshopped.org/" target="_blank">Documentation</a>
6
+ * Version: 3.8.8-rc1
7
  * Author: Instinct Entertainment
8
  * Author URI: http://getshopped.org/
9
  **/
wpsc-admin/js/admin.js CHANGED
@@ -486,9 +486,10 @@ jQuery(document).ready(function(){
486
 
487
  // function for adding more custom meta
488
  function add_more_meta(e) {
489
- current_meta_forms = jQuery(e).parent().children("div.product_custom_meta:last"); // grab the form container
490
- new_meta_forms = current_meta_forms.clone(true); // clone the form container
491
- jQuery("label input", new_meta_forms).val(''); // reset all contained forms to empty
 
492
  current_meta_forms.after(new_meta_forms); // append it after the container of the clicked element
493
  return false;
494
  }
486
 
487
  // function for adding more custom meta
488
  function add_more_meta(e) {
489
+ var current_meta_forms = jQuery(e).parent().children("div.product_custom_meta:last"), // grab the form container
490
+ new_meta_forms = current_meta_forms.clone(); // clone the form container
491
+
492
+ new_meta_forms.find('input, textarea').val('');
493
  current_meta_forms.after(new_meta_forms); // append it after the container of the clicked element
494
  return false;
495
  }
wpsc-core/wpsc-constants.php CHANGED
@@ -26,9 +26,9 @@ function wpsc_core_constants() {
26
  if(!defined('WPSC_URL'))
27
  define( 'WPSC_URL', plugins_url( '', __FILE__ ) );
28
  // Define Plugin version
29
- define( 'WPSC_VERSION', '3.8.8-beta2' );
30
- define( 'WPSC_MINOR_VERSION', '498978' );
31
- define( 'WPSC_PRESENTABLE_VERSION', '3.8.8-beta2' );
32
 
33
  // Define Debug Variables for developers
34
  define( 'WPSC_DEBUG', false );
26
  if(!defined('WPSC_URL'))
27
  define( 'WPSC_URL', plugins_url( '', __FILE__ ) );
28
  // Define Plugin version
29
+ define( 'WPSC_VERSION', '3.8.8-rc1' );
30
+ define( 'WPSC_MINOR_VERSION', '516111' );
31
+ define( 'WPSC_PRESENTABLE_VERSION', '3.8.8-rc1' );
32
 
33
  // Define Debug Variables for developers
34
  define( 'WPSC_DEBUG', false );
wpsc-includes/checkout.class.php CHANGED
@@ -564,7 +564,7 @@ class wpsc_checkout {
564
  if ( ( $user_ID > 0 ) ) {
565
  if( ! isset( $_SESSION['wpsc_checkout_saved_values'] ) ) {
566
  $meta_data = get_user_meta( $user_ID, 'wpshpcrt_usr_profile', 1 );
567
- $meta_data = apply_filters( 'wpsc_checkout_user_profile_get', $user_ID, $meta_data );
568
  $_SESSION['wpsc_checkout_saved_values'] = $meta_data;
569
  }
570
 
@@ -806,7 +806,7 @@ class wpsc_checkout {
806
 
807
  if ( ( $any_bad_inputs == false ) && ( $user_ID > 0 ) ) {
808
  $meta_data = $_POST['collected_data'];
809
- $meta_data = apply_filters( 'wpsc_checkout_user_profile_update', $user_ID, $meta_data );
810
  update_user_meta( $user_ID, 'wpshpcrt_usr_profile', $meta_data );
811
  }
812
 
564
  if ( ( $user_ID > 0 ) ) {
565
  if( ! isset( $_SESSION['wpsc_checkout_saved_values'] ) ) {
566
  $meta_data = get_user_meta( $user_ID, 'wpshpcrt_usr_profile', 1 );
567
+ $meta_data = apply_filters( 'wpsc_checkout_user_profile_get', $meta_data, $user_ID );
568
  $_SESSION['wpsc_checkout_saved_values'] = $meta_data;
569
  }
570
 
806
 
807
  if ( ( $any_bad_inputs == false ) && ( $user_ID > 0 ) ) {
808
  $meta_data = $_POST['collected_data'];
809
+ $meta_data = apply_filters( 'wpsc_checkout_user_profile_update', $meta_data, $user_ID );
810
  update_user_meta( $user_ID, 'wpshpcrt_usr_profile', $meta_data );
811
  }
812
 
wpsc-includes/purchaselogs.class.php CHANGED
@@ -170,7 +170,7 @@ function wpsc_the_purch_item() {
170
 
171
  function wpsc_the_purch_item_price() {
172
  global $purchlogs;
173
- if ( $purchlogs->purchitem->processed > 1 && $purchlogs->purchitem->processed != 5 ) {
174
  $purchlogs->totalAmount += $purchlogs->purchitem->totalprice;
175
  }
176
  return $purchlogs->purchitem->totalprice;
170
 
171
  function wpsc_the_purch_item_price() {
172
  global $purchlogs;
173
+ if ( $purchlogs->purchitem->processed > 1 && $purchlogs->purchitem->processed != 6 ) {
174
  $purchlogs->totalAmount += $purchlogs->purchitem->totalprice;
175
  }
176
  return $purchlogs->purchitem->totalprice;
wpsc-merchants/paypal-express.merchant.php CHANGED
@@ -122,7 +122,9 @@ class wpsc_merchant_paypal_express extends wpsc_merchant {
122
  );
123
 
124
 
125
- $response = wp_remote_post($paypal_url, $options);
 
 
126
 
127
  if( 'VERIFIED' == $response['body'] ) {
128
  $this->paypal_ipn_values = $received_values;
122
  );
123
 
124
 
125
+ $response = wp_remote_post( $paypal_url, $options );
126
+
127
+ do_action( 'wpsc_paypal_express_ipn', $received_values, $this );
128
 
129
  if( 'VERIFIED' == $response['body'] ) {
130
  $this->paypal_ipn_values = $received_values;
wpsc-merchants/paypal-pro.merchant.php CHANGED
@@ -280,6 +280,7 @@ class wpsc_merchant_paypal_pro extends wpsc_merchant {
280
  break;
281
  }
282
 
 
283
  // Compare the received store owner email address to the set one
284
  if ( strtolower( $this->paypal_ipn_values['receiver_email'] ) == strtolower( get_option( 'paypal_multiple_business' ) ) ) {
285
  switch ( $this->paypal_ipn_values['txn_type'] ) {
280
  break;
281
  }
282
 
283
+ do_action( 'wpsc_paypal_pro_ipn', $this->paypal_ipn_values, $this );
284
  // Compare the received store owner email address to the set one
285
  if ( strtolower( $this->paypal_ipn_values['receiver_email'] ) == strtolower( get_option( 'paypal_multiple_business' ) ) ) {
286
  switch ( $this->paypal_ipn_values['txn_type'] ) {
wpsc-merchants/paypal-standard.merchant.php CHANGED
@@ -373,7 +373,9 @@ class wpsc_merchant_paypal_standard extends wpsc_merchant {
373
  break;
374
  }
375
 
 
376
  $paypal_email = strtolower( get_option( 'paypal_multiple_business' ) );
 
377
  // Compare the received store owner email address to the set one
378
  if( strtolower( $this->paypal_ipn_values['receiver_email'] ) == $paypal_email || strtolower( $this->paypal_ipn_values['business'] ) == $paypal_email ) {
379
  switch($this->paypal_ipn_values['txn_type']) {
373
  break;
374
  }
375
 
376
+ do_action( 'wpsc_paypal_standard_ipn', $this->paypal_ipn_values, $this );
377
  $paypal_email = strtolower( get_option( 'paypal_multiple_business' ) );
378
+
379
  // Compare the received store owner email address to the set one
380
  if( strtolower( $this->paypal_ipn_values['receiver_email'] ) == $paypal_email || strtolower( $this->paypal_ipn_values['business'] ) == $paypal_email ) {
381
  switch($this->paypal_ipn_values['txn_type']) {
wpsc-shipping/usps_20.php CHANGED
@@ -179,7 +179,9 @@ class ash_usps{
179
  'services' => array( 'ONLINE' ),
180
  );
181
  $settings = get_option( "wpec_usps", array() );
182
- $settings = array_merge_recursive( $defaults, $settings );
 
 
183
  $output=("
184
  <tr>
185
  <td>
179
  'services' => array( 'ONLINE' ),
180
  );
181
  $settings = get_option( "wpec_usps", array() );
182
+ $settings = array_merge( $defaults, $settings );
183
+ $settings['services'] = array_merge( $defaults['services'], $settings['services'] );
184
+
185
  $output=("
186
  <tr>
187
  <td>
wpsc-theme/functions/wpsc-user_log_functions.php CHANGED
@@ -107,7 +107,7 @@ function validate_form_data() {
107
  $meta_data[$value_id] = $value;
108
  }
109
  }
110
- $meta_data = apply_filters( 'wpsc_user_log_update', $user_ID, $meta_data );
111
  update_user_meta( $user_ID, 'wpshpcrt_usr_profile', $meta_data );
112
  }
113
  if ( $changes_saved ) {
@@ -143,7 +143,7 @@ function wpsc_display_form_fields() {
143
  $saved_data = $wpdb->get_row( $saved_data_sql, ARRAY_A );
144
 
145
  $meta_data = get_user_meta( $user_ID, 'wpshpcrt_usr_profile', 1 );
146
- $meta_data = apply_filters( 'wpsc_user_log_get', $user_ID, $meta_data );
147
 
148
  $form_sql = "SELECT * FROM `" . WPSC_TABLE_CHECKOUT_FORMS . "` WHERE `active` = '1' ORDER BY `checkout_order`;";
149
  $form_data = $wpdb->get_results( $form_sql, ARRAY_A );
107
  $meta_data[$value_id] = $value;
108
  }
109
  }
110
+ $meta_data = apply_filters( 'wpsc_user_log_update', $meta_data, $user_ID );
111
  update_user_meta( $user_ID, 'wpshpcrt_usr_profile', $meta_data );
112
  }
113
  if ( $changes_saved ) {
143
  $saved_data = $wpdb->get_row( $saved_data_sql, ARRAY_A );
144
 
145
  $meta_data = get_user_meta( $user_ID, 'wpshpcrt_usr_profile', 1 );
146
+ $meta_data = apply_filters( 'wpsc_user_log_get', $meta_data, $user_ID );
147
 
148
  $form_sql = "SELECT * FROM `" . WPSC_TABLE_CHECKOUT_FORMS . "` WHERE `active` = '1' ORDER BY `checkout_order`;";
149
  $form_data = $wpdb->get_results( $form_sql, ARRAY_A );