From 085f5212254feb2391a6be97fd70442299c53abe Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 19 Jun 2008 19:59:33 +0000
Subject: [PATCH] Fix a typo with inStock vs in_stock template variables for
 the Product.  It should be in_stock. Add a new template variable, canEdit.
 Change the default template to use canEdit to display the list of variants,
 so they aren't showed twice.

---
 docs/changelog/7.x.x.txt                         |   1 +
 .../packages-7.5.13/default_product.wgpkg        | Bin 0 -> 2155 bytes
 lib/WebGUI/Asset/Sku/Product.pm                  |   5 +++--
 lib/WebGUI/Help/Asset_Product.pm                 |   1 +
 lib/WebGUI/i18n/English/Asset_Product.pm         |   6 ++++++
 5 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 docs/upgrades/packages-7.5.13/default_product.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f886f4bbc..0e00eb728 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -22,6 +22,7 @@
  - fixed: Cannot embed YouTube videos in IE6/7. Fixed by adding an "Allow Media"
    switch to the RichEdit asset.
  - added: Next and Previous GalleryAlbum links in the GalleryAlbum views
+ - fixed: Shop: Variants in dropdown and on page
 
 7.5.12
  - skipping this release
diff --git a/docs/upgrades/packages-7.5.13/default_product.wgpkg b/docs/upgrades/packages-7.5.13/default_product.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..4ee92255ffced504549356c6131355a5c8514531
GIT binary patch
literal 2155
zcmV-x2$c69iwFP!000001MOLDbKAHP_UHQ*9Nl!%&P1|a?U?6kCcaB9zDuvZ+PU;a
ztp_3@2^R=pK`^o}lmFhu8$nQ{V%c$LI*mLd%3NTd-3N=sa@jk0{7=8%Kb}ku4&d59
z>icU{e)<Q4L4SBO8BO}5<AX^3Gd_r5%Hw~ETp|Icp$sJ}+>ZAtxpJ;=om1EUk&m`|
z;J=S1=6CPcoU_m5186)NkNvtU1QiEn`3J|t@uar?<I!+(5dBwJe602FeJ1iAS<Q#9
zU==#K<N_^mCyJwgs2lK6mw!Ih(oFCS3rTRU2Iv`jNYtSymoIKIE+kH$Ybh%z)wAq~
zL|_EMvs*Q_GwM`ju=AwG>}189l6-~JK+f>yEnz9&=(+tsmftd-<)jglZx|MDaxBi%
z22^|_1$u>1dWDva(@~ydX{TPC$#q8cmMFg_M}Z}Upc*B`3sg{f4Q!=FB7-p`zYtt<
zd7Bx3LtjY#ilixKTFoGsxD>p|&eInukw!WU#1eybj>OZHypIxClKhXe&SnXS%8prQ
zIukQClcy+RXpKQe(o^Nt^?M{D>+E#aiAdTio1PvbqsFMx)5#*rah?;-dZ4L?(lud!
zW)=<bz?`WEN;s2((;QSOfwk$-YHCuRk{q17y&{rguXQyleUwT9{&^662M|`nT>w>{
z$Qt54FG&Kkoo{kgtmh07I+y}=D}fh4kB8C|2Z}d1KbBa6@On-Wd#4N{>t&RSB$!aq
z2a^z0GrYP`>Q=G53o{P&BAkYd$tHt`?FIuc`x~q$wHmCY4>NewZt&<n2J1<!25ae^
z43;KJO)QsTH!q~*tQs?wMVJeotO|jzAuTj|6%2sIXbPWlcb0=Gnq$xhyKp-ID(Gv(
z3PfA6E8^xbD1q(BJHl>|5Qxd!R^VX3C!ou*jo^MsOd5d=0Dn3wRe0Eymujo&@=_%Q
zD3w7nb&2L%o5QLpOykSbf|e;tPuENqj6#BpAUhJE=bCb!1)~6llEx@OY3gRFKmy|~
zv5ag=k1|0L93hrQmp{HSK>>Ok3mzZS+-FW}=$!$dr)h+uUySV@q$FFzm~3SHoEn76
zw_O%JvK@B;6@uF_DtVSc2qZXJH5Tfwwrf7a3@?b(VOiJgWcSm2nc;*iNP;9Be~tRX
z5%)tuNdoc1h1pnj54`k#+W&%8>5$r>YILGDWEak1umi#!QqNg|)KnDJGdc5>OVj2~
zah?d0DdwlaHmwK(t}6E-ed@BL<rIZI7tM>?>jf9<>lM_9Sd`n!$E6y<HGbYAHAh5?
zP%B?>E|qe>o!n-rT@5VMS_xvR47B?LZny*yq?Irco#s$;vE}q%=M2!8j#fl}|HMws
zpFDl?TvfZ*HVB^l;hWP#JIALJV}gQd#w_=@-nlJhp{LK;?J{rWNZTG{D!OP}pmQKh
z4YGj^G{Z<WcB;|oqtXBJ&bnU)5u7PgP&Iqsjpk8*Z-N`q_9WQp*h#P(WUmioQd#Jj
zbJvo=xlP0O2-L}VZw4FD_GHlM*vX(9WUmirQ0;uX`%CWf;Gnq&gQLOT4DP_(lgCig
zPBz1#=A?-$`#zKh|4mzm6^uyr#QBgUu`{$QXYf7J!*K7VX~ElbS-h5}C24rr^%HD0
z>hrM|xrcA{jPgLj+s;5?N)}rnga!2-Q}SqU&Ub;9#5a&uo43VWP5v3_E0eJ;v|MV|
zwCa*6m$y{4f)a|6i053cRK-+wX8bRekb;&IVJj?%d?V;f!Pgf^U}joVVNXl<_P$*q
zwrpwsQNploId*hwt)U4W0P83ApP+-K8)0wp{QEcOajeUiIKFa?uxfwNHqU+`*mMw&
z1AUrrt?N6}xpR+K!6=feq6^KbfepKJ`8$&R#AW#)ptXfOtT8LDRG;dTNQ$vSHzYeK
zg9v|L>xSx1-6i?WXqr45g{{C03Fvt4;wFw?UH$2GBU7r>J)=B%r{_b}2+<L#ZY6|>
zgof#1lKXx~uk0;GAM|;p!|J0sx+=oesHZu$qaY~P&?zIV3*jdDIv!>>-?;NGgJ(U$
zmQK_!McZn7re)`~E+|Jbrg$Msb<m0IZb&Lu@!)s<rbdqkcTrx@r_q)}4w(`UZVivU
zQs-vFt*$aM9!yH_W-{TFi}>r~XX?+I`Vq2<=Cnel!|u6^9o5O5qvV~6c$Rjp(ieU8
zSNiWvt@6Hrjz)Kb$#Nwj3(&M294?i&_-?j+aO-N-NS;-BpGn)>jpr)pO3-Z=UJle>
zIiMCM-mICNa{*6l@gTd21WA`T`r5f)X2bSa@~k4iw3?e7He6^r#S)&Sx;eZrgoq7R
zx!EhnJA_CyddSk-#-q2;u&d3Bd;son(`l%9c~{QWc8#ipH%0CYsJW5d6esXLNj;#)
zj5Ay=U;7&AaG%K*%A0w0-h*9R&fEAiYAfH>9c8NsPiIpiF&Rtm+p$NP$?Br2j1uWD
zKcZm~9A2-|kMQ7jr)Z?^@J@<UBcZM!R#O8$8ghxV1hU+AqH)4%ma|lQs{#V-`tESK
zpmjT4rmrN!9rL$s*-E80F{$<i9A4AfA^sZDj4MRyuPCdfia!5NPL5AbCdb3@Bp3KS
zQ7^l`bMM;*!@=mJKN&q6*T60y6T8x;Rxqsi=A6BRbu$NjC{?fLR9Z17{6)iiM9dO#
zo5>5OJ+x4wrG0Jr_p6)N*Zki<e1Cp1KRJIp|Lf~jviZ4Y=H+b;?+>-dp&qDt^gG>_
zsz(#y$gI86)vtR4k_N-^=wxzq623HrY6a>>YwgwF`0#8)j}cn@b|uqS^s<Y@&mH?B
h`r}t0ANd{l7xiBl_`<*!2L2xz_zy0Jt)l=a003dlF311?

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Sku/Product.pm b/lib/WebGUI/Asset/Sku/Product.pm
index bec0938e8..a03f93d54 100644
--- a/lib/WebGUI/Asset/Sku/Product.pm
+++ b/lib/WebGUI/Asset/Sku/Product.pm
@@ -1547,8 +1547,8 @@ sub view {
                 value   => [0],
             },
         );
-        $var{buy_button}      = WebGUI::Form::submit($session, { value => $i18n->get('add to cart') } );
-        $var{inStock} = 1;
+        $var{buy_button} = WebGUI::Form::submit($session, { value => $i18n->get('add to cart') } );
+        $var{in_stock} = 1;
     }
     else {
         $var{in_stock} = 0;
@@ -1558,6 +1558,7 @@ sub view {
     if ($self->canEdit) {
         $var{'addvariant_url'}   = $self->getUrl('func=editVariant');
         $var{'addvariant_label'} = $i18n->get('add a variant');
+        $var{'canEdit'}          = 1;
     }
     $var{variant_loop} = \@variantLoop;
     $var{hasAddedToCart} = $self->{_hasAddedToCart};
diff --git a/lib/WebGUI/Help/Asset_Product.pm b/lib/WebGUI/Help/Asset_Product.pm
index 77e17271e..4c58556ad 100644
--- a/lib/WebGUI/Help/Asset_Product.pm
+++ b/lib/WebGUI/Help/Asset_Product.pm
@@ -18,6 +18,7 @@ our $HELP = {
         ],
         fields    => [],
         variables => [
+            { 'name' => 'canEdit' },
             { 'name' => 'brochure_icon' },
             { 'name' => 'brochure_url' },
             { 'name' => 'brochure_label' },
diff --git a/lib/WebGUI/i18n/English/Asset_Product.pm b/lib/WebGUI/i18n/English/Asset_Product.pm
index 5406cd017..176a149ef 100644
--- a/lib/WebGUI/i18n/English/Asset_Product.pm
+++ b/lib/WebGUI/i18n/English/Asset_Product.pm
@@ -829,6 +829,12 @@ be useful, others may not.|,
 		context => q|template variable|
 	},
 
+	'canEdit' => {
+		message => q|A boolean that is true if the user can edit this Product.|,
+		lastUpdated => 0,
+		context => q|template variable|
+	},
+
 };
 
 1;