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

Send shipping

This commit is contained in:
Mike Jolley 2012-03-14 13:25:05 +00:00
parent 115229aeee
commit aae276e14b
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/woocommerce.js
View File

@ -674,6 +674,8 @@ jQuery(document).ready(function($) {
scrollTop: ($('form.checkout').offset().top - 100) scrollTop: ($('form.checkout').offset().top - 100)
}, 1000); }, 1000);
} else {
throw "Invalid response";
} }
} }
catch(err) { catch(err) {

2
assets/js/woocommerce.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
classes/gateways/class-wc-paypal.php
View File

@ -216,15 +216,13 @@ class WC_Paypal extends WC_Payment_Gateway {
$paypal_args['address_override'] = 1; $paypal_args['address_override'] = 1;
// If we are sending shipping, send shipping address instead of billing // If we are sending shipping, send shipping address instead of billing
$paypal_args['first_name'] = $order->shipping_first_name; $paypal_args['SHIPTONAME'] = $order->shipping_first_name . ' ' . $order->shipping_last_name;
$paypal_args['last_name'] = $order->shipping_last_name; $paypal_args['SHIPTOSTREET'] = $order->shipping_address_1;
$paypal_args['company'] = $order->shipping_company; $paypal_args['SHIPTOSTREET2'] = $order->shipping_address_2;
$paypal_args['address1'] = $order->shipping_address_1; $paypal_args['SHIPTOCITY'] = $order->shipping_city;
$paypal_args['address2'] = $order->shipping_address_2; $paypal_args['SHIPTOSTATE'] = $order->shipping_state;
$paypal_args['city'] = $order->shipping_city; $paypal_args['SHIPTOCOUNTRYCODE'] = $order->shipping_country;
$paypal_args['state'] = $order->shipping_state; $paypal_args['SHIPTOZIP'] = $order->shipping_postcode;
$paypal_args['zip'] = $order->shipping_postcode;
$paypal_args['country'] = $order->shipping_country;
else : else :
$paypal_args['no_shipping'] = 1; $paypal_args['no_shipping'] = 1;
endif; endif;
@ -356,6 +354,8 @@ class WC_Paypal extends WC_Payment_Gateway {
$paypal_args = $this->get_paypal_args( $order ); $paypal_args = $this->get_paypal_args( $order );
$paypal_args = http_build_query( $paypal_args );
if ( $this->testmode == 'yes' ): if ( $this->testmode == 'yes' ):
$paypal_adr = $this->testurl . '?test_ipn=1&'; $paypal_adr = $this->testurl . '?test_ipn=1&';
else : else :
@ -364,7 +364,7 @@ class WC_Paypal extends WC_Payment_Gateway {
return array( return array(
'result' => 'success', 'result' => 'success',
'redirect' => $paypal_adr . http_build_query( $paypal_args ) 'redirect' => $paypal_adr . $paypal_args
//'redirect' => add_query_arg('order', $order->id, add_query_arg('key', $order->order_key, get_permalink(woocommerce_get_page_id('pay')))) //'redirect' => add_query_arg('order', $order->id, add_query_arg('key', $order->order_key, get_permalink(woocommerce_get_page_id('pay'))))
); );