From 59424e1fe38a3a84544cf436176b452b35cdaf16 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 27 Jun 2008 18:58:23 +0000
Subject: [PATCH] fix display bugs in the Subscription template (no price, and
 bare parens showing when no code batches are available)

---
 docs/changelog/7.x.x.txt                         |   1 +
 .../root_import_subscription-default.wgpkg       | Bin 0 -> 1237 bytes
 lib/WebGUI/Asset/Sku/Subscription.pm             |   1 +
 lib/WebGUI/Help/Asset_Subscription.pm            |   1 +
 lib/WebGUI/i18n/English/Asset_Subscription.pm    |   6 ++++++
 5 files changed, 9 insertions(+)
 create mode 100644 docs/upgrades/packages-7.5.15/root_import_subscription-default.wgpkg

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 0000000000000000000000000000000000000000..c473deb22ac1c69731ec05dd78201a4d20692449
GIT binary patch
literal 1237
zcmV;`1S<O<iwFP!000001MOFBZ`(Ey_UHZzL7&>8u_ZfBYRxl{q<I69Hb9&N!@Lc&
zNLy?uQYEQ4Zjt}KBPC0sYp(;=3>Xjvh!EW?pSyc_X}6yL34&n1-*2_x9qa}5+pC_S
z6^21C?Dlqpz5SL4e}wP?ljnbOrICcxP=?}!Y>)Rnxj9@=9?rb~Cy&iKtbT{Vp#4b+
z{zJ0|?|Zwub=^%g(+6ew`+X3)_3!QV`YrE2LGiij-~OQxKAW?zub>LP(n6v+@x93V
z&3u5zyncUcrI{2Nk(v@^6s(0+@qC7qK7P!E)C3<`DbE?RR;5NP2?F8a(wO=^zbS*s
z(>A7`<x@sgLa-y}WN}A177J?|I5M^5B2#o@OtIiZ-Y6o^@rJ16QA>125FVrXMsuVT
z(WNQ*JRPXJPbbH>pM&LD&QEXOou4k8OmfL=6e)!6(A0p@QTbHGl4hC;zJtjO<xD$9
zR9#7-g<fU_0Pf+aI-?j9ZvBRi;arM5JIBYE>O$Ie#G0fTTcJ9{^uddvM(US|znEV)
zlA8FViJb6>9wLvUlz;-oLk-4%J|O9p5R4|iNAXtKXxKr8o5Gbfr!!9xrQqOg@YF^)
zrTil=qd`2#X;cS_1=mtA1+I*s$f?k(GGFOH&P_v1jy4$&J7pT1GQ(5>Jj*fFjMTxB
zUKL9li4(|vf%KAIY4EoJ5~L2Ga(FC`kkoaEW+gDGdZQ}CM8lyg_;rH#{jVaw1R!B7
zD>oDU$1Nob<ND_css?a{2f|cs;`G2;WQYkrwsv)Vs9!^^5&E0jHPzhmS#NHkGf88z
zs<I8dhU2zmB*BEFM*@=zG$m~097v^zF(LuR*U-p`Br|B%8pqo9MlxvTM*q~J(k-;|
zo8lCk603dAgiH;45ZS<{7H7GPp$W)guC=J!zFA%4;RMLScyLbL1kp{RkT{c0c|s)B
zaIh08(kmnhFBrk463eki&`<L%B+Mu$CH4E&8W03#C4gnX32CY11F(f<o;xx<y*ZDf
z14EZlG+r@Jli^FYGEHl3_8otAwCwjLHF>Y!7lir7QKrgp9-6Wuy32~{o@O6}rZXBN
z!@1U}3q(qIZs-1=1~ka!_JZ(H23O$2+U;aH@|u1r^MNhK$u~n1ZXg?M3sO;ZHom;r
zh+6^;cF070Z|#RlFB$R7WdZH2;R5T#N>$v^cB$R_YDe0R^;0q3>l*D9rIxzTg;NyY
zn`&{q6ALC}G-dFmVwntKO!++OWshDMWRI1gP+lZdlj>WF<ec)T54yGLmQ<2n+qOZS
zNnyP+6)-@l30V5w;-KB2A@8Se+-Q+S-%X;%1Jw?`J=wMlN*1b3XK*p?C}@qy!OA^Z
zLu4HfJGRUtr;Dh%fG${#?)q}o9B$hwgTek_(BJR6tuM&~H5c;x)nX8K!`=R%7wo#r
z11u#_^A#DaO;{op=lleys~8DaYE}pZ|3DS9(41!HG=#@;ndz%l2scfQ=H=Fv%)Z<n
zKinNLam(^xI=;;IKAs*puBf_RD%f`Hv0XpF6m})u!W9;c6{2e!sohrBkm`l+y8S`l
zi4MaJbX#V7b!e%;l4td+>z8}<)2pXvTi#zBzaa2}zzYKZ0)f8(s-8*#02BZKQ`}@M

literal 0
HcmV?d00001

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 {
             '<a href="'.$self->getUrl('func=listSubscriptionCodes')       .'">'.$i18n->get('manage codes').'</a>',
             '<a href="'.$self->getUrl('func=listSubscriptionCodeBatches') .'">'.$i18n->get('manage batches').'</a>',
             )),
+        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.<br />|,
 		context => q|template variable|
 	},
 
+	'price' => {
+		message => q|The price for the subscription, formatted to two decimal places|,
+		lastUpdated => 1214592963,
+		context => q|template variable|
+	},
+
 };
 
 1;