Merging master branch into require_standard_variant

app/views/home/_filters.html.haml

@@ -1,21 +1,22 @@
 .row
-  = render partial: 'shared/components/filter_controls'
+  -# = render partial: 'shared/components/filter_controls'
+  .small-12.medium-6.columns  
   = render partial: 'shared/components/show_profiles'
 
-.row.animate-show{"ng-show" => "filtersActive"}
-  .small-12.columns
-    .row.filter-box
-      .small-12.large-9.columns
-        %h5.tdhead
-          .light Filter by
-          Type
-        %ul.small-block-grid-2.medium-block-grid-4.large-block-grid-5
-          %filter-selector{objects: "Enterprises.hubs | searchEnterprises:query | taxonsOf", "active-selectors" => "activeTaxons"}
-      .small-12.large-3.columns
-        %h5.tdhead
-          .light Filter by
-          Delivery
-        %ul.small-block-grid-2.medium-block-grid-4.large-block-grid-2
-          %shipping-type-selector{results: "shippingTypes"}
-
-= render partial: 'shared/components/filter_box'
+-# .row.animate-show{"ng-show" => "filtersActive"}
+-#   .small-12.columns
+-#     .row.filter-box
+-#       .small-12.large-9.columns
+-#         %h5.tdhead
+-#           .light Filter by
+-#           Type
+-#         %ul.small-block-grid-2.medium-block-grid-4.large-block-grid-5
+-#           %filter-selector{objects: "Enterprises.hubs | searchEnterprises:query | taxonsOf", "active-selectors" => "activeTaxons"}
+-#       .small-12.large-3.columns
+-#         %h5.tdhead
+-#           .light Filter by
+-#           Delivery
+-#         %ul.small-block-grid-2.medium-block-grid-4.large-block-grid-2
+-#           %shipping-type-selector{results: "shippingTypes"}
+-#
+-# = render partial: 'shared/components/filter_box'

app/views/producers/_filters.html.haml

@@ -1,15 +1,15 @@
-.row
-  = render partial: 'shared/components/filter_controls'
-  .small-12.medium-6.columns.text-right
-     
-
-.row.animate-show{"ng-show" => "filtersActive"}
-  .small-12.columns
-    .row.filter-box
-      .small-12.columns
-        %h5.tdhead
-          .light Filter by
-          Type
-        %ul.small-block-grid-2.medium-block-grid-4.large-block-grid-6
-          %filter-selector{objects: "Enterprises.producers | searchEnterprises:query | taxonsOf", "active-selectors" => "activeTaxons"}
-    = render partial: 'shared/components/filter_box'
+-# .row
+-#   = render partial: 'shared/components/filter_controls'
+-#   .small-12.medium-6.columns.text-right
+-#      
+-#
+-# .row.animate-show{"ng-show" => "filtersActive"}
+-#   .small-12.columns
+-#     .row.filter-box
+-#       .small-12.columns
+-#         %h5.tdhead
+-#           .light Filter by
+-#           Type
+-#         %ul.small-block-grid-2.medium-block-grid-4.large-block-grid-6
+-#           %filter-selector{objects: "Enterprises.producers | searchEnterprises:query | taxonsOf", "active-selectors" => "activeTaxons"}
+-#     = render partial: 'shared/components/filter_box'

app/views/spree/admin/products/bulk_edit/_products_head.html.haml

@@ -1,12 +1,14 @@
 %colgroup
   %col.actions
   %col.producer{ ng: { show: 'columns.producer.visible' } }
+  %col.sku{ ng: { show: 'columns.sku.visible' } }
   %col.name{ ng: { show: 'columns.name.visible' } }
   %col.unit{ ng: { show: 'columns.unit.visible' } }
   %col.display_as{ ng: { show: 'columns.unit.visible' } }
   %col.price{ ng: { show: 'columns.price.visible'} }
   %col.on_hand{ ng: { show: 'columns.on_hand.visible' } }
   %col.category{ ng: { show: 'columns.category.visible' } }
+  %col.inherits_properties{ ng: { show: 'columns.inherits_properties.visible' } }
   %col.available_on{ ng: { show: 'columns.available_on.visible' } }
   %col.actions
   %col.actions
@@ -16,12 +18,14 @@
   %tr
     %th.left-actions
     %th.producer{ 'ng-show' => 'columns.producer.visible' } Producer
+    %th.sku{ 'ng-show' => 'columns.sku.visible' } SKU
     %th.name{ 'ng-show' => 'columns.name.visible' } Name
     %th.unit{ 'ng-show' => 'columns.unit.visible' } Unit / Value
     %th.display_as{ 'ng-show' => 'columns.unit.visible' } Display As
     %th.price{ 'ng-show' => 'columns.price.visible' } Price
     %th.on_hand{ 'ng-show' => 'columns.on_hand.visible' } On Hand
     %th.category{ 'ng-show' => 'columns.category.visible' } Category
+    %th.inherits_properties{ 'ng-show' => 'columns.inherits_properties.visible' } Inherits Properties?
     %th.available_on{ 'ng-show' => 'columns.available_on.visible' } Av. On
     %th.actions
     %th.actions

app/views/spree/admin/products/bulk_edit/_products_product.html.haml

@@ -4,6 +4,8 @@
     %a{ :class => "add-variant icon-plus-sign", 'ng-click' => "addVariant(product)", 'ng-show' => "!hasVariants(product) && hasUnit(product)" }
   %td.producer{ 'ng-show' => 'columns.producer.visible' }
     %select.select2.fullwidth{ 'ng-model' => 'product.producer_id', :name => 'producer_id', 'ofn-track-product' => 'producer_id', 'ng-options' => 'producer.id as producer.name for producer in producers' }
+  %td.sku{ 'ng-show' => 'columns.sku.visible' }
+    %input{ 'ng-model' => "product.sku", :name => 'product_sku', 'ofn-track-product' => 'sku', :type => 'text' }
   %td.name{ 'ng-show' => 'columns.name.visible' }
     %input{ 'ng-model' => "product.name", :name => 'product_name', 'ofn-track-product' => 'name', :type => 'text' }
   %td.unit{ 'ng-show' => 'columns.unit.visible' }
@@ -20,6 +22,8 @@
     %input.field{ 'ng-model' => 'product.on_hand', :name => 'on_hand', 'ofn-track-product' => 'on_hand', 'ng-hide' => 'hasVariants(product) || product.on_demand', :type => 'number' }
   %td.category{ 'ng-if' => 'columns.category.visible' }
     %input.fullwidth{ :type => 'text', id: "p{{product.id}}_category_id", 'ng-model' => 'product.category_id', 'ofn-taxon-autocomplete' => '', 'ofn-track-product' => 'category_id', 'multiple-selection' => 'false', placeholder: 'Category' }
+  %td.inherits_properties{ 'ng-show' => 'columns.inherits_properties.visible' }
+    %input{ 'ng-model' => 'product.inherits_properties', :name => 'inherits_properties', 'ofn-track-product' => 'inherits_properties', type: "checkbox" }
   %td.available_on{ 'ng-show' => 'columns.available_on.visible' }
     %input{ 'ng-model' => 'product.available_on', :name => 'available_on', 'ofn-track-product' => 'available_on', 'datetimepicker' => 'product.available_on', type: "text" }
   %td.actions

app/views/spree/admin/products/bulk_edit/_products_variant.html.haml

@@ -3,6 +3,7 @@
     %a{ :class => "variant-item icon-caret-right", 'ng-hide' => "$last" }
     %a{ :class => "add-variant icon-plus-sign", 'ng-click' => "addVariant(product)", 'ng-show' => "$last" }
   %td{ 'ng-show' => 'columns.producer.visible' }
+  %td{ 'ng-show' => 'columns.sku.visible' }
   %td{ 'ng-show' => 'columns.name.visible' }
     %input{ 'ng-model' => 'variant.display_name', :name => 'variant_display_name', 'ofn-track-variant' => 'display_name', :type => 'text', placeholder: "{{ product.name }}" }
   %td.unit_value{ 'ng-show' => 'columns.unit.visible' }
@@ -15,6 +16,7 @@
     %input.field{ 'ng-model' => 'variant.on_hand', 'ng-change' => 'updateOnHand(product)', :name => 'variant_on_hand', 'ng-hide' => 'variant.on_demand', 'ofn-track-variant' => 'on_hand', :type => 'number' }
     %span{ 'ng-bind' => 'variant.on_hand', :name => 'variant_on_hand', 'ng-show' => 'variant.on_demand' }
   %td{ 'ng-show' => 'columns.category.visible' }
+  %td{ 'ng-show' => 'columns.inherits_properties.visible' }
   %td{ 'ng-show' => 'columns.available_on.visible' }
   %td.actions
     %a{ 'ng-click' => 'editWarn(product,variant)', :class => "edit-variant icon-edit no-text", 'ng-show' => "variantSaved(variant)" }