@@ -239,7 +237,7 @@ function wpsc_price_control_forms() { 0 ) { + if ( count( (array) $product_meta['table_rate_price']['quantity'] ) > 0 ) { foreach ( (array) $product_meta['table_rate_price']['quantity'] as $key => $quantity ) { if ( $quantity != '' ) { $table_price = number_format( $product_meta['table_rate_price']['table_price'][ $key ], 2, '.', '' ); @@ -299,7 +297,7 @@ function wpsc_stock_control_forms() { if ( ! isset( $product_meta['unpublish_when_none_left'] ) ) { $product_meta['unpublish_when_none_left'] = ''; } - + if ( ! isset( $product_meta['stock_limit_notify'] ) ) { $product_meta['stock_limit_notify'] = ''; } @@ -348,7 +346,7 @@ class='stock_limit_quantity' /> ID ); - $reserved_quantity = $product_data['meta']['_wpsc_stock'] - $remaining_quantity; + $reserved_quantity = intval( $product_data['meta']['_wpsc_stock'] ) - $remaining_quantity; if ( $reserved_quantity ) { echo '
';
printf( _n('%s of them is reserved for pending or recently completed orders.',
diff --git a/wpsc-admin/includes/product-functions.php b/wpsc-admin/includes/product-functions.php
index 391d6b88cb..8abf1f7812 100644
--- a/wpsc-admin/includes/product-functions.php
+++ b/wpsc-admin/includes/product-functions.php
@@ -19,7 +19,7 @@ function wpsc_get_max_upload_size(){
*/
function wpsc_admin_submit_product( $post_ID, $post ) {
- if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || $post->post_type != 'wpsc-product' ) {
+ if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || $post->post_type !== 'wpsc-product' ) {
return;
}
@@ -53,7 +53,7 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
} else {
$post_data['meta']['_wpsc_stock'] = isset( $post_data['meta']['_wpsc_stock'] ) ? (int) $post_data['meta']['_wpsc_stock'] : 0;
}
-
+
// Update low stock notifications
if ( isset( $post_data['meta']['_wpsc_stock'] ) && isset( $post_data['meta']['_wpsc_product_metadata'] ) && ( $post_data['meta']['_wpsc_stock'] > $post_data['meta']['_wpsc_product_metadata']['stock_limit_notify'] ) ) {
// Check if notification has been sent
@@ -62,7 +62,7 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
delete_product_meta( $product_id, 'stock_limit_notify_sent' );
}
}
-
+
unset($post_data['meta']['_wpsc_limited_stock']);
if(!isset($post_data['quantity_limited'])) $post_data['quantity_limited'] = '';
if(!isset($post_data['special'])) $post_data['special'] = '';
@@ -203,8 +203,6 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
$post_data['files'] = $_FILES;
- if(isset($post_data['post_title']) && $post_data['post_title'] != '') {
-
$product_columns = array(
'name' => '',
'description' => '',
@@ -272,8 +270,9 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
if(isset($post_data['files']['preview_file']['tmp_name']) && ($post_data['files']['preview_file']['tmp_name'] != '')) {
wpsc_item_add_preview_file($product_id, $post_data['files']['preview_file']);
}
+
do_action('wpsc_edit_product', $product_id);
- }
+
return $product_id;
}
diff --git a/wpsc-admin/js/admin-legacy.js b/wpsc-admin/js/admin-legacy.js
index aa4e1c2267..855f6cd5ea 100755
--- a/wpsc-admin/js/admin-legacy.js
+++ b/wpsc-admin/js/admin-legacy.js
@@ -245,9 +245,7 @@ var getresults=function(results) {
boxes = ["price_and_stock", "shipping", "variation", "advanced", "product_image", "product_download"];
for (i=0;i" . esc_html( $form_field['name'] ) . ":