diff --git a/docs/upgrades/packages-7.5.3/shopping-cart-collateral-items-1.wgpkg b/docs/upgrades/packages-7.5.3/shopping-cart-collateral-items-1.wgpkg new file mode 100644 index 000000000..8a545a161 Binary files /dev/null and b/docs/upgrades/packages-7.5.3/shopping-cart-collateral-items-1.wgpkg differ diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm index bbe807220..1704d849d 100644 --- a/lib/WebGUI/Shop/Cart.pm +++ b/lib/WebGUI/Shop/Cart.pm @@ -313,10 +313,10 @@ sub www_view { onclick=>"this.form.shop.value='ship';this.form.method.value='viewAddressbook';this.form.submit;"}), shipppingAddress => "todo", shippingOptions => "todo", - changeShippingButton => WebGUI::Form::submit($session, {value=>$i18n->get("change shipping button"), + shipToButton => WebGUI::Form::submit($session, {value=>$i18n->get("ship to button"), onclick=>"this.form.shop.value='ship';this.form.method.value='viewAddressbook';this.form.submit;"}), hasShippingAddress => "todo", - couponField => WebGUI::Form::text($session, {name=>"couponCode", value=>""}), + couponField => WebGUI::Form::text($session, {name=>"couponCode", value=>"", size=>20}), couponDiscount => "todo", totalPrice => "todo", tax => "todo", @@ -324,7 +324,7 @@ sub www_view { ); my $template = WebGUI::Asset::Template->new($session, $session->setting->get("shopCartTemplateId")); $template->prepare; - return $template->process(\%var); + return $session->style->userStyle($template->process(\%var)); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/i18n/English/Shop.pm b/lib/WebGUI/i18n/English/Shop.pm index 01efe2517..cdf0657d3 100644 --- a/lib/WebGUI/i18n/English/Shop.pm +++ b/lib/WebGUI/i18n/English/Shop.pm @@ -3,16 +3,94 @@ package WebGUI::i18n::English::Shop; use strict; our $I18N = { + 'subtotal' => { + message => q|Subtotal|, + lastUpdated => 0, + context => q|a summary heading in the cart| + }, + + 'coupon' => { + message => q|Coupon|, + lastUpdated => 0, + context => q|a summary heading in the cart| + }, + + 'tax' => { + message => q|Tax|, + lastUpdated => 0, + context => q|a summary heading in the cart| + }, + + 'total' => { + message => q|Total|, + lastUpdated => 0, + context => q|a summary heading in the cart| + }, + + 'shipping' => { + message => q|Shipping|, + lastUpdated => 0, + context => q|a summary heading in the cart| + }, + + 'not applicable' => { + message => q|N/A|, + lastUpdated => 0, + context => q|shipping not possible on this item because it's not a physical good| + }, + + 'item' => { + message => q|Item|, + lastUpdated => 0, + context => q|a column heading label in the shopping cart| + }, + + 'price' => { + message => q|Price|, + lastUpdated => 0, + context => q|a column heading label in the shopping cart| + }, + + 'quantity' => { + message => q|Quantity|, + lastUpdated => 0, + context => q|a column heading label in the shopping cart| + }, + + 'extended price' => { + message => q|Extended Price|, + lastUpdated => 0, + context => q|a column heading label in the shopping cart| + }, + + 'per item shipping' => { + message => q|Per Item Shipping|, + lastUpdated => 0, + context => q|a column heading label in the shopping cart| + }, + 'remove button' => { message => q|Remove|, lastUpdated => 0, context => q|a button a user clicks on to remove an item from the cart| }, - 'update button' => { + 'checkout button' => { + message => q|Checkout|, + lastUpdated => 0, + context => q|a button the user clicks on to proceed to payment options| + }, + + 'choose shipping button' => { + message => q|Choose Shipping Address|, + lastUpdated => 0, + context => q|a button the user clicks on to choose shipping information| + }, + + 'update cart button' => { message => q|Update Cart|, lastUpdated => 0, - context => q|a button the user clicks on to apply changes to a cart| + context => q|a button the user clicks on to apply changes to the cart| }, 'continue shopping button' => {