diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 240841e29..a4f5fcd9f 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -12,6 +12,9 @@ - fixed: edit branch only changes meta data fields if another value is changed - fixed: Gallery reverts to undeletable bare asset if created with default view "Single Album" + - fixed: The Sku's, Donation, Product, Subscription and FlatDiscount have a + continue shopping url that will take the user back the Sku in its normal + mode. 7.5.16 - Created a migration from 7.4.40 directly to 7.5.16. diff --git a/docs/upgrades/packages-7.5.17/default_product.wgpkg b/docs/upgrades/packages-7.5.17/default_product.wgpkg index 6a344db89..28b5ebc51 100644 Binary files a/docs/upgrades/packages-7.5.17/default_product.wgpkg and b/docs/upgrades/packages-7.5.17/default_product.wgpkg differ diff --git a/docs/upgrades/packages-7.5.17/root_import_default-donation-template.wgpkg b/docs/upgrades/packages-7.5.17/root_import_default-donation-template.wgpkg new file mode 100644 index 000000000..c0f149540 Binary files /dev/null and b/docs/upgrades/packages-7.5.17/root_import_default-donation-template.wgpkg differ diff --git a/docs/upgrades/packages-7.5.17/root_import_flat-discount-default.wgpkg b/docs/upgrades/packages-7.5.17/root_import_flat-discount-default.wgpkg new file mode 100644 index 000000000..de6817e3c Binary files /dev/null and b/docs/upgrades/packages-7.5.17/root_import_flat-discount-default.wgpkg differ diff --git a/docs/upgrades/packages-7.5.17/root_import_subscription-default.wgpkg b/docs/upgrades/packages-7.5.17/root_import_subscription-default.wgpkg new file mode 100644 index 000000000..849a44723 Binary files /dev/null and b/docs/upgrades/packages-7.5.17/root_import_subscription-default.wgpkg differ diff --git a/lib/WebGUI/Asset/Sku/Donation.pm b/lib/WebGUI/Asset/Sku/Donation.pm index 52b83a52c..03fb5c3c9 100644 --- a/lib/WebGUI/Asset/Sku/Donation.pm +++ b/lib/WebGUI/Asset/Sku/Donation.pm @@ -155,6 +155,7 @@ sub view { donateButton => WebGUI::Form::submit( $session, { value => $i18n->get("donate button") }), priceField => WebGUI::Form::float($session, { name => "price", defaultValue => $self->getPrice }), hasAddedToCart => $self->{_hasAddedToCart}, + continueShoppingUrl => $self->getUrl, ); return $self->processTemplate(\%var,undef,$self->{_viewTemplate}); } diff --git a/lib/WebGUI/Asset/Sku/FlatDiscount.pm b/lib/WebGUI/Asset/Sku/FlatDiscount.pm index 1c6c9087b..694eccbfd 100644 --- a/lib/WebGUI/Asset/Sku/FlatDiscount.pm +++ b/lib/WebGUI/Asset/Sku/FlatDiscount.pm @@ -233,6 +233,7 @@ sub view { formFooter => WebGUI::Form::formFooter($session), addToCartButton => WebGUI::Form::submit( $session, { value => $i18n->get("add to cart") }), hasAddedToCart => $self->{_hasAddedToCart}, + continueShoppingUrl => $self->getUrl, ); $var{alreadyHasCoupon} = $self->hasCoupon(); diff --git a/lib/WebGUI/Asset/Sku/Product.pm b/lib/WebGUI/Asset/Sku/Product.pm index 67f4ea79f..40570d854 100644 --- a/lib/WebGUI/Asset/Sku/Product.pm +++ b/lib/WebGUI/Asset/Sku/Product.pm @@ -1583,8 +1583,9 @@ sub view { $var{'addvariant_label'} = $i18n->get('add a variant'); $var{'canEdit'} = 1; } - $var{variant_loop} = \@variantLoop; - $var{hasAddedToCart} = $self->{_hasAddedToCart}; + $var{variant_loop} = \@variantLoop; + $var{hasAddedToCart} = $self->{_hasAddedToCart}; + $var{continueShoppingUrl} = $self->getUrl; my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) { diff --git a/lib/WebGUI/Asset/Sku/Subscription.pm b/lib/WebGUI/Asset/Sku/Subscription.pm index 497d0624f..c2ea4e1ac 100644 --- a/lib/WebGUI/Asset/Sku/Subscription.pm +++ b/lib/WebGUI/Asset/Sku/Subscription.pm @@ -504,6 +504,7 @@ sub view { formFooter => WebGUI::Form::formFooter($session), purchaseButton => WebGUI::Form::submit( $session, { value => $i18n->get("purchase button") }), hasAddedToCart => $self->{_hasAddedToCart}, + continueShoppingUrl => $self->getUrl, codeControls => join (' · ', ( ''.$i18n->get('generate batch').'', ''.$i18n->get('manage codes').'', diff --git a/lib/WebGUI/Help/Asset_Donation.pm b/lib/WebGUI/Help/Asset_Donation.pm index b382ebc07..bb758acfb 100644 --- a/lib/WebGUI/Help/Asset_Donation.pm +++ b/lib/WebGUI/Help/Asset_Donation.pm @@ -24,6 +24,7 @@ our $HELP = { { name => "hasAddedToCart" , required=>1 }, { name => "thankYouMessage", description=>"thank you message help" }, { name => "defaultPrice", description=>"default price help" }, + { name => "continueShoppingUrl" }, { name => "templateId", description=>"donation template help" }, ], related => [ diff --git a/lib/WebGUI/Help/Asset_FlatDiscount.pm b/lib/WebGUI/Help/Asset_FlatDiscount.pm index 3d613bad1..b226c2fa2 100644 --- a/lib/WebGUI/Help/Asset_FlatDiscount.pm +++ b/lib/WebGUI/Help/Asset_FlatDiscount.pm @@ -27,6 +27,7 @@ our $HELP = { { name => "hasAddedToCart" , required=>1 }, { name => "thankYouMessage", description=>"thank you message help" }, { name => "alreadyHasCoupon" }, + { name => "continueShoppingUrl" }, ], related => [ ], diff --git a/lib/WebGUI/Help/Asset_Product.pm b/lib/WebGUI/Help/Asset_Product.pm index 4c58556ad..8c79087d9 100644 --- a/lib/WebGUI/Help/Asset_Product.pm +++ b/lib/WebGUI/Help/Asset_Product.pm @@ -64,6 +64,7 @@ our $HELP = { { 'name' => 'buy_form_footer' }, { 'name' => "hasAddedToCart" , required=>1 }, { 'name' => "thankYouMessage", description=>"thank you message help" }, + { 'name' => "continueShoppingUrl" }, { 'name' => 'addspecification_url' }, { 'name' => 'addspecification_label' }, { 'name' => 'specification_loop', diff --git a/lib/WebGUI/Help/Asset_Subscription.pm b/lib/WebGUI/Help/Asset_Subscription.pm index 213ebc7a0..b20213e3c 100644 --- a/lib/WebGUI/Help/Asset_Subscription.pm +++ b/lib/WebGUI/Help/Asset_Subscription.pm @@ -21,6 +21,7 @@ our $HELP = { { name => 'formFooter' , required=>1 }, { name => 'purchaseButton' , required=>1 }, { name => 'hasAddedToCart' , required=>1 }, + { name => 'continueShoppingUrl' }, { name => 'codeControls' , required=>1 }, { name => 'thankYouMessage', description=>'thank you message help' }, { name => 'redeemCodeLabel' , required=>1 }, diff --git a/lib/WebGUI/i18n/English/Asset_Donation.pm b/lib/WebGUI/i18n/English/Asset_Donation.pm index 95fd04a4b..8e4d93620 100644 --- a/lib/WebGUI/i18n/English/Asset_Donation.pm +++ b/lib/WebGUI/i18n/English/Asset_Donation.pm @@ -87,6 +87,12 @@ our $I18N = { context => q|help for default price field| }, + 'continueShoppingUrl' => { + message => q|A URL to reset the Product so that the user can continue shopping.|, + lastUpdated => 0, + context => q|template variable| + }, + 'assetName' => { message => q|Donation|, lastUpdated => 0, diff --git a/lib/WebGUI/i18n/English/Asset_FlatDiscount.pm b/lib/WebGUI/i18n/English/Asset_FlatDiscount.pm index dfb2f58d0..2165614e1 100644 --- a/lib/WebGUI/i18n/English/Asset_FlatDiscount.pm +++ b/lib/WebGUI/i18n/English/Asset_FlatDiscount.pm @@ -123,6 +123,12 @@ our $I18N = { context => q|template variable| }, + 'continueShoppingUrl' => { + message => q|A URL to reset the Product so that the user can continue shopping.|, + lastUpdated => 0, + context => q|template variable| + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/Asset_Product.pm b/lib/WebGUI/i18n/English/Asset_Product.pm index 018092348..cc4660e85 100644 --- a/lib/WebGUI/i18n/English/Asset_Product.pm +++ b/lib/WebGUI/i18n/English/Asset_Product.pm @@ -835,6 +835,12 @@ be useful, others may not.|, context => q|template variable| }, + 'continueShoppingUrl' => { + message => q|A URL to reset the Product so that the user can continue shopping.|, + lastUpdated => 0, + context => q|template variable| + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/Asset_Subscription.pm b/lib/WebGUI/i18n/English/Asset_Subscription.pm index 6482803d8..e0249e9cd 100755 --- a/lib/WebGUI/i18n/English/Asset_Subscription.pm +++ b/lib/WebGUI/i18n/English/Asset_Subscription.pm @@ -490,6 +490,12 @@ The form in which the user can enter his subscription code.
|, context => q|template variable| }, + 'continueShoppingUrl' => { + message => q|A URL to reset the Product so that the user can continue shopping.|, + lastUpdated => 0, + context => q|template variable| + }, + }; 1;