Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2968 from piffpaffpuff/master 

use base_country for tax calculations in manually created orders
This commit is contained in:
Mike Jolley 2013-04-16 05:48:59 -07:00
parent d64b83a9f9 53c13f721b
commit b40cf953f3
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/woocommerce-admin-init.php
View File

@ -458,6 +458,7 @@ function woocommerce_admin_scripts() {
'search_products_nonce' => wp_create_nonce("search-products"),
'calendar_image' => $woocommerce->plugin_url().'/assets/images/calendar.png',
'post_id' => $post->ID,
'base_country' => $woocommerce->countries->get_base_country(),
'currency_format_num_decimals' => absint( get_option( 'woocommerce_price_num_decimals' ) ),
'currency_format_symbol' => get_woocommerce_currency_symbol(),
'currency_format_decimal_sep' => esc_attr( stripslashes( get_option( 'woocommerce_price_decimal_sep' ) ) ),

16
assets/js/admin/write-panels.js
View File

@ -306,16 +306,24 @@ jQuery( function($){
var $items = $('#order_items_list').find('tr.item, tr.fee');
var country = $('#_shipping_country').val();
if (country) {
var shipping_country = $('#_shipping_country').val();
var billing_country = $('#_billing_country').val();
if (shipping_country) {
var country = shipping_country;
var state = $('#_shipping_state').val();
var postcode = $('#_shipping_postcode').val();
var city = $('#_shipping_city').val();
} else {
country = $('#_billing_country').val();
} else if(billing_country) {
var country = billing_country;
var state = $('#_billing_state').val();
var postcode = $('#_billing_postcode').val();
var city = $('#_billing_city').val();
} else {
var country = woocommerce_writepanel_params.base_country;
var state = '';
var postcode = '';
var city = '';
}
// Get items and values