oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '63865eb39f' into WebGUI8. up to 7.9.11

Browse source
This commit is contained in:
Colin Kuskie 2010-08-13 11:52:08 -07:00
commit 7b218942b3
72 changed files with 3085 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Shop/Cart.pm
View file

@ -1314,9 +1314,8 @@ sub www_view {
my $style = $session->style;
my $yui = $url->extras('/yui/build');
$style->setScript("$yui/yahoo/yahoo-min.js");
$style->setScript("$yui/yahoo-dom-event/yahoo-dom-event.js");
$style->setScript("$yui/json/json-min.js");
$style->setScript("$yui/event/event-min.js");
$style->setScript("$yui/connection/connection-min.js");
$style->setScript($url->extras('underscore/underscore-min.js'));
$style->setScript($url->extras('shop/cart.js'), undef, 1);

2
lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
View file

@ -229,7 +229,7 @@ sub paymentVariables {
return => $return->as_string,
cancel_return => $cancel->as_string,
shipping => $cart->calculateShipping,
handling_cart => $cart->calculateShipping, ##According to https://www.x.com/message/180018#180018
tax_cart => $cart->calculateTaxes,
discount_amount_cart => -($cart->calculateShopCreditDeduction),

8
lib/WebGUI/Shop/ShipDriver/USPSInternational.pm
View file

@ -238,20 +238,24 @@ sub correctCountry {
my $self = shift;
my $country = shift;
return $country eq q{United Kingdom} ? q{United Kingdom (Great Britain)}
: $country eq q{Bosnia and Herzegovina} ? q{Bosnia-Herzegovina}
: $country eq q{Christmas Island} ? q{Christmas Island (Australia)}
: $country eq q{Congo, the Democratic Republic of the} ? q{Congo, Democratic Republic of the}
: $country eq q{Cocos (Keeling) Islands} ? q{Cocos Island (Australia)}
: $country eq q{Congo} ? q{Congo, Republic of the}
: $country eq q{Christmas Island} ? q{Christmas Island (Australia)}
: $country eq q{Cote d'Ivoire} ? q{Ivory Coast (Cote d’Ivoire)}
: $country eq q{Georgia} ? q{Georgia, Republic of}
: $country eq q{Heard and Mc Donald Islands} ? q{Australia}
: $country eq q{Korea (South)} ? q{South Korea}
: $country eq q{Korea, Republic of} ? q{Democratic People's Republic of Korea}
: $country eq q{Korea, Republic of} ? q{Korea, Democratic People’s Republic of (North Korea)}
: $country eq q{Lao People's Democratic Republic} ? q{Laos}
: $country eq q{Macedonia} ? q{Macedonia, Republic of}
: $country eq q{Moldova, Republic of} ? q{Moldova}
: $country eq q{Pitcairn} ? q{Pitcairn Island}
: $country eq q{Russian Federation} ? q{Russia}
: $country eq q{Saint Kitts and Nevis} ? q{Saint Christopher and Nevis}
: $country eq q{Slovakia} ? q{Slovak Republic}
: $country eq q{South Georgia and the South Sandwich Islands} ? q{South Georgia (Falkland Islands)}
: $country eq q{Tokelau} ? q{Tokelau (Union) Group (Western Samoa)}
: $country eq q{Trinidad} ? q{Trinidad and Tobago}
: $country eq q{Vatican City State (Holy See)} ? q{Vatican City}