diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 6b9f6bba6..f03886293 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,7 @@ 7.5.15 - fixed: Colorpicker window would not open (Martin Kamerbeek / Oqapi) - fixed: Reverted change to RichEdit that caused IE6 to stop working + - fixed: Subscription: Price not displaying 7.5.14 - fixed: RSS feeds report modified date instead of create date diff --git a/docs/upgrades/packages-7.5.15/root_import_subscription-default.wgpkg b/docs/upgrades/packages-7.5.15/root_import_subscription-default.wgpkg new file mode 100644 index 000000000..c473deb22 Binary files /dev/null and b/docs/upgrades/packages-7.5.15/root_import_subscription-default.wgpkg differ diff --git a/lib/WebGUI/Asset/Sku/Subscription.pm b/lib/WebGUI/Asset/Sku/Subscription.pm index a8fdaddbe..950111493 100644 --- a/lib/WebGUI/Asset/Sku/Subscription.pm +++ b/lib/WebGUI/Asset/Sku/Subscription.pm @@ -509,6 +509,7 @@ sub view { ''.$i18n->get('manage codes').'', ''.$i18n->get('manage batches').'', )), + price => sprintf("%.2f", $self->getPrice), ); my $hasCodes = $self->session->db->quickScalar('select count(*) from Subscription_code as t1, Subscription_codeBatch as t2 where t1.batchId = t2.batchId and t2.subscriptionId=?', [$self->getId]); if ($hasCodes) { diff --git a/lib/WebGUI/Help/Asset_Subscription.pm b/lib/WebGUI/Help/Asset_Subscription.pm index 8ec932110..213ebc7a0 100644 --- a/lib/WebGUI/Help/Asset_Subscription.pm +++ b/lib/WebGUI/Help/Asset_Subscription.pm @@ -25,6 +25,7 @@ our $HELP = { { name => 'thankYouMessage', description=>'thank you message help' }, { name => 'redeemCodeLabel' , required=>1 }, { name => 'redeemCodeUrl' , required=>1 }, + { name => 'price' , required=>1 }, ], related => [ ], diff --git a/lib/WebGUI/i18n/English/Asset_Subscription.pm b/lib/WebGUI/i18n/English/Asset_Subscription.pm index 9051b5837..5d1b1d638 100755 --- a/lib/WebGUI/i18n/English/Asset_Subscription.pm +++ b/lib/WebGUI/i18n/English/Asset_Subscription.pm @@ -484,6 +484,12 @@ The form in which the user can enter his subscription code.
|, context => q|template variable| }, + 'price' => { + message => q|The price for the subscription, formatted to two decimal places|, + lastUpdated => 1214592963, + context => q|template variable| + }, + }; 1;