From 064685064ea48758d80c8dfae1bbf35f1ed46beb Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Wed, 29 Feb 2012 21:05:55 +0000 Subject: [PATCH] Fixed order tax saving and dupe key generation --- admin/post-types/writepanels/writepanel-order_data.php | 4 ++-- admin/post-types/writepanels/writepanel-order_downloads.php | 1 - assets/js/admin/write-panels.js | 2 +- woocommerce-ajax.php | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/post-types/writepanels/writepanel-order_data.php b/admin/post-types/writepanels/writepanel-order_data.php index c8f3e37b7dd..073ad2c7b82 100644 --- a/admin/post-types/writepanels/writepanel-order_data.php +++ b/admin/post-types/writepanels/writepanel-order_data.php @@ -621,7 +621,7 @@ function woocommerce_process_shop_order_meta( $post_id, $post ) { $woocommerce_errors = array(); // Add key - add_post_meta( $post_id, '_order_key', uniqid('order_') ); + add_post_meta( $post_id, '_order_key', uniqid('order_'), true ); // Update post data update_post_meta( $post_id, '_billing_first_name', stripslashes( $_POST['_billing_first_name'] )); @@ -685,7 +685,7 @@ function woocommerce_process_shop_order_meta( $post_id, $post ) { endif; update_post_meta( $post_id, '_order_taxes', $order_taxes ); - + // Order items $order_items = array(); diff --git a/admin/post-types/writepanels/writepanel-order_downloads.php b/admin/post-types/writepanels/writepanel-order_downloads.php index bc25a1bb6ce..b52ee52bf49 100644 --- a/admin/post-types/writepanels/writepanel-order_downloads.php +++ b/admin/post-types/writepanels/writepanel-order_downloads.php @@ -274,5 +274,4 @@ function woocommerce_order_downloads_save( $post_id, $post ) { endif; - update_post_meta( $post_id, '_order_taxes', $order_taxes ); } \ No newline at end of file diff --git a/assets/js/admin/write-panels.js b/assets/js/admin/write-panels.js index 5f21817e50f..f62a7b497ca 100644 --- a/assets/js/admin/write-panels.js +++ b/assets/js/admin/write-panels.js @@ -86,7 +86,7 @@ jQuery( function($){ }; $.post( woocommerce_writepanel_params.ajax_url, data, function(response) { - + result = jQuery.parseJSON( response ); $row.find('input.line_subtotal_tax').val( result.line_subtotal_tax ); $row.find('input.line_tax').val( result.line_tax ); diff --git a/woocommerce-ajax.php b/woocommerce-ajax.php index 68a41cc860a..f247d85694b 100644 --- a/woocommerce-ajax.php +++ b/woocommerce-ajax.php @@ -733,6 +733,8 @@ function woocommerce_calc_line_taxes() { $item_id = esc_attr($_POST['item_id']); $tax_class = esc_attr($_POST['tax_class']); + if (!$item_id) return; + // Get product details $_product = new WC_Product($item_id); $item_tax_status = $_product->get_tax_status();