spree_backend 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2576b7e7409bd237d0a969011b99430430bd2fe4
-  data.tar.gz: 080fb92f9d02a049ad453e76d017970d5eb1ecb4
+  metadata.gz: 462c24c0ea7bcd330a6eeaf3e8f27dae6d0cc954
+  data.tar.gz: 1a9790046c08cfcf4b89c48011da4fbbf53dc055
 SHA512:
-  metadata.gz: e5fc4c72e6f3b9aac105215c86fdca50160d1046e50aea638095eaef9da9448eb200a6e829b38ec6add206fe4deccfba66b8a0f333f1f28de8d9e14c241501db
-  data.tar.gz: dc838a7b4114c56e63ed83c29e1a6049e0f2fae92fa15d29d08a338011cc8b0a0c5847900bc5c0a3fc8435f678e229a33bb963c065c78f5cca9de45ddd8ee114
+  metadata.gz: 491105783d07bc80c285e9651071ead3444b1972997b1c9cc5d4271c5260e7a70f4ae96181375956497b1d8eb7d27f4ffa12ed0468573c08266b17361b6228a6
+  data.tar.gz: 1ef421f821223485b55ea00d3d5a2d7e973942b2a8de53f83838aa4227853ed34d1e051be28fda8c15a3f3707d6f41c86e8ba27ecd0a3e4e4b1e040b1f04e9ee

data/app/assets/stylesheets/spree/backend/components/_buttons.scss

@@ -30,8 +30,8 @@
   }
 }
 
-.btn-sm .glyphicon { padding: 0 }
+.btn-sm .glyphicon { padding: 0; }
 
 .btn.action-void { @extend .btn-danger; }
 .btn.action-capture { @extend .btn-success; }
-.btn.payment-action-edit { @extend .btn-primary; }
+.btn.payment-action-edit { @extend .btn-primary; }

data/app/views/spree/admin/products/_form.html.erb

@@ -33,7 +33,7 @@
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price, class: ['form-group'] do %>
           <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', class: "required")) %>
-          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', disabled: (cannot? :update, Spree::Price) %>
+          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', disabled: (cannot? :update, @product.price) %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
@@ -141,7 +141,7 @@
       <div data-hook="admin_product_form_shipping_categories">
         <%= f.field_container :shipping_categories, class: ['form-group'] do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', disabled: (cannot? :edit, Spree::ShippingCategory) }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
           <%= f.error_message_on :shipping_category %>
         <% end %>
       </div>
@@ -149,7 +149,7 @@
       <div data-hook="admin_product_form_tax_category">
         <%= f.field_container :tax_category, class: ['form-group'] do %>
           <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', disabled: (cannot? :edit, Spree::TaxCategory) }) %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>
@@ -180,7 +180,7 @@
     <%= f.field_container :option_types, class: ['form-group'] do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
 
-      <% if can? :modify, Spree::OptionType %>
+      <% if can? :modify, Spree::ProductOptionType %>
         <%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
       <% elsif @product.option_types.any? %>
         <ul class="text_list">

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -19,6 +19,6 @@
     <% end if can?(:admin, Spree::ProductProperty) %>
     <%= content_tag :li, class: ('active' if current == :stock) do %>
       <%= link_to_with_icon 'home', Spree.t(:stock), stock_admin_product_url(@product) %>
-    <% end if can?(:stock, Spree::Product) %>
+    <% end if can?(:admin, Spree::Stock) %>
   </ul>
 <% end %>

data/app/views/spree/admin/variants/index.html.erb

@@ -47,12 +47,14 @@
 <% end %>
 
 <% if @product.empty_option_values? %>
-  <% if can?(:create, Spree::OptionType) && can?(:create, Spree::OptionValue) %>
+  <% if can?(:modify, Spree::ProductOptionType) %>
     <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
       <%= Spree.t(:to_add_variants_you_must_first_define) %>
       <%= link_to(Spree.t(:option_types), spree.admin_product_url(@product)) %>
-      <%= Spree.t(:and) %>
-      <%= link_to Spree.t(:option_values), spree.admin_option_types_url %>
+      <% if can?(:display, Spree::OptionType) && can?([:create, :display], Spree::OptionValue) %>
+        <%= Spree.t(:and) %>
+        <%= link_to Spree.t(:option_values), spree.admin_option_types_url %>
+      <% end %>
     </p>
   <% end %>
 <% else %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement