spree_backend 3.3.0.rc3 → 3.3.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c66cca5bda36fa73f859fd3d8fdafc0c6e06b95d
-  data.tar.gz: f3f65f7e81fea0575ee31b196cf40dc57bd22efb
+  metadata.gz: dcbed9a59ff4d3255bc7ac771d5f963acb1a417d
+  data.tar.gz: e4b9775933f2d19b397769f794771f4e8542b3bd
 SHA512:
-  metadata.gz: bf2227704d8bfbe822faa9b0fa6dad95c0501ba90eaac53b088b66ed167a724369bc3f5b707484dfaafe9385fa4f059e20af71f9a02c762adee5ada80f356485
-  data.tar.gz: d1aa7ef46bf241efce65841a51d67ba3e6d9781e9cf942d5f29c11550d6822d1f0de21c0faab250dfd432e84b16fbd15c844a3e95d07b25b271aa61d6f8e1e13
+  metadata.gz: 72c24116400af9d9f34048037f636af28b93b9f25f5e0c81fae6b49867796d38774496d05174cdcf08fba27543804e80efc11fb952431e677502a38c3204591a
+  data.tar.gz: e87afe394986f218222f35b2629a42ee62abffa84a38ddeec6a07ca8121cba3d98353430c07bf507135c4c4ea2dd0bd02c9012deb02e786fde7c9e4111c75f3f

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

@@ -29,6 +29,7 @@
 }
 
 // Orange
+.label-processing,
 .label-pending,
 .label-awaiting_return,
 .label-returned,

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

@@ -50,7 +50,7 @@
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
@@ -181,7 +181,7 @@
           </span>
         </td>
         <td>
-          <span class="label label-<%= order.state.downcase %>"><%= Spree.t("order_states.#{order.state.downcase}") %></span>
+          <span class="label label-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
           <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>"></span>
         </td>
         <td>

data/app/views/spree/admin/refunds/new.html.erb

@@ -18,14 +18,16 @@
         <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br/>
         <%= @refund.payment.credit_allowed %>
       </div>
-      <div class="form-group">
+      <%= f.field_container :amount, class: ['form-group'] do %>
         <%= f.label :amount, Spree.t(:amount) %>
         <%= f.text_field :amount, class: 'form-control' %>
-      </div>
-      <div class="form-group">
+        <%= f.error_message_on :amount %>
+      <% end %>
+      <%= f.field_container :reason, class: ['form-group'] do %>
         <%= f.label :refund_reason_id, Spree.t(:reason) %>
         <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2'}) %>
-      </div>
+        <%= f.error_message_on :reason %>
+      <% end %>
     </div>
 
     <div class="form-actions" data-hook="buttons">

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

@@ -40,7 +40,7 @@
   </ul>
 <% end %>
 
-<% if can? :admin, current_store && Spree::Config[:admin_show_version] %>
+<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
   <div class="spree-version hidden-xs hidden-sm">
     <%= Spree.version %>
   </div>

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

@@ -11,7 +11,7 @@
         </td>
         <td>
           <span class="state label label-<%= @order.state %>">
-            <%= Spree.t(@order.state, scope: :order_states) %>
+            <%= Spree.t(@order.state, scope: :order_state) %>
           </span>
         </td>
       </tr>

data/app/views/spree/admin/shared/_update_order_state.js.erb

@@ -1,4 +1,4 @@
-$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_states) %>');
+$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_state) %>');
 $('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>

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

@@ -21,8 +21,8 @@
       <% @state_changes.each do |state_change| %>
         <tr>
           <td><%= Spree.t("state_machine_states.#{state_change.name}") %></td>
-          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: "#{ state_change.name }_states") : Spree.t(:previous_state_missing) %></td>
-          <td><%= Spree.t(state_change.next_state, scope: "#{ state_change.name}_states") %></td>
+          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: "#{ state_change.name }_state") : Spree.t(:previous_state_missing) %></td>
+          <td><%= Spree.t(state_change.next_state, scope: "#{ state_change.name }_state") %></td>
           <td>
             <% if state_change.user %>
               <% user_login = state_change.user.try(:login) || state_change.user.try(:email) %>

data/app/views/spree/admin/users/items.html.erb

@@ -39,7 +39,7 @@
               <td class="item-quantity"><%= item.quantity %></td>
               <td class="item-total"><%= item.money.to_html %></td>
               <td class="order-state">
-                <div class="state <%= order.state.downcase %>"><%= Spree.t("order_states.#{order.state.downcase}") %></div>
+                <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
                 <% if order.payment_state %>
                   <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
                 <% end %>

data/app/views/spree/admin/users/orders.html.erb

@@ -26,7 +26,7 @@
           <td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
           <td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
           <td class="order-state">
-            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_states.#{order.state.downcase}") %></div>
+            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
             <% if order.payment_state %>
               <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
             <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc3
+  version: 3.3.0.rc4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-18 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.3.0.rc3
+        version: 3.3.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc3
+        version: 3.3.0.rc4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc3
+        version: 3.3.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc3
+        version: 3.3.0.rc4
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -304,7 +304,6 @@ files:
 - app/views/spree/admin/products/_add_stock_form.html.erb
 - app/views/spree/admin/products/_autocomplete.js.erb
 - app/views/spree/admin/products/_form.html.erb
-- app/views/spree/admin/products/_properties_form.erb
 - app/views/spree/admin/products/edit.html.erb
 - app/views/spree/admin/products/index.html.erb
 - app/views/spree/admin/products/new.html.erb
@@ -536,7 +535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.

data/app/views/spree/admin/products/_properties_form.erb

@@ -1,10 +0,0 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:properties) %>
-<% end %>
-
-<% f.fields_for :product_properties do |properties_form| %>
-    <div data-hook="value">
-      <%= properties_form.label :value, properties_form.object.property.presentation %>
-      <%= properties_form.text_field :value, class: "form-control" %>
-    </div>
-<% end %>