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

@@ -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

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};

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' },

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;