spree_backend 3.1.0.rc1 → 3.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f29c266e31ffa57b06e31e539805843fd76f6b
-  data.tar.gz: 783e730217fa4b781cf3943da4f3e11d4b84dc04
+  metadata.gz: 23177f6b62d7410c90a9ff8bb4cc5f603fb42440
+  data.tar.gz: f70f840a9320ec0fcd89bb6b724f4184c7bc190e
 SHA512:
-  metadata.gz: 436b9616f06b71d298ba59c69ed05b2cbdbc2c9b606d58e506dd0a5424c8eb2fea8eebf3d1ab1e2e9981974f20b9892f9d5bb2e010aa39a8cc917c741115f888
-  data.tar.gz: 48da0978b94d953e2007c97b090fd05fe8db10fa7d010d5406cb7815cc6119a52e195e827980b62d1f088f14d4f323d201fb72c909e79785a7fe10b14aaf1c81
+  metadata.gz: e2149d65382ca555ee229d0681f8056973a27b4c7f4ba6df0bb3f3bb1125011c8dc661657459e2997bb0c81946e7979401ade77673fb2436f4f49dc385c3c336
+  data.tar.gz: 20e47c99f1b509be5a356f7e108ef75dd00e4eeb50263cfd1dfc884a6b19090f795d695c62d2d87fb49044dd423df2a4e60906aa0d6f38c83fedaf40b64b66af

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

@@ -8,7 +8,7 @@
 .label-active,
 .label-success,
 .label-sold,
-.label-open
+.label-open,
 .label-authorized
 {
   background-color: $brand-success;

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -33,7 +33,8 @@ input.form-control {
       color: $brand-danger
     }
 
-    input {
+    input,
+    .select2-choice {
       border-color: $brand-danger;
     }
   }

data/app/controllers/spree/admin/resource_controller.rb

@@ -40,10 +40,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     else
       invoke_callbacks(:update, :fails)
       respond_with(@object) do |format|
-        format.html do
-          flash.now[:error] = @object.errors.full_messages.join(", ")
-          render action: 'edit'
-        end
+        format.html { render action: :edit }
         format.js { render layout: false }
       end
     end
@@ -62,10 +59,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     else
       invoke_callbacks(:create, :fails)
       respond_with(@object) do |format|
-        format.html do
-          flash.now[:error] = @object.errors.full_messages.join(", ")
-          render action: 'new'
-        end
+        format.html { render action: :new }
         format.js { render layout: false }
       end
     end

data/app/helpers/spree/admin/base_helper.rb

@@ -144,11 +144,6 @@ module Spree
         resource_class.model_name.human(count: I18N_PLURAL_MANY_COUNT)
       end
 
-      def back_to_list_button(resource, path)
-        button_text = Spree.t(:back_to_resource_list, resource: resource)
-        link_to_with_icon 'arrow-left', button_text, path, class: 'btn btn-default'
-      end
-
       def order_time(time)
         [I18n.l(time.to_date), time.strftime("%l:%M %p")].join('')
       end

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

@@ -1,13 +1,15 @@
 <div data-hook="admin_country_form_fields">
-  <div data-hook="name" class="form-group">
+  <%= f.field_container :name, class: ['form-group'], 'data-hook' => 'name' do %>
     <%= f.label :name, Spree.t(:name) %>
     <%= f.text_field :name, :class => 'form-control' %>
-  </div>
+    <%= f.error_message_on :name %>
+  <% end %>
 
-  <div data-hook="iso_name" class="form-group">
+  <%= f.field_container :iso_name, class: ['form-group'], 'data-hook' => 'iso_name' do %>
     <%= f.label :iso_name, Spree.t(:iso_name) %>
     <%= f.text_field :iso_name, :class => 'form-control' %>
-  </div>
+    <%= f.error_message_on :iso_name %>
+  <% end %>
 
   <div data-hook="states_required" class="checkbox">
     <label>

data/app/views/spree/admin/countries/edit.html.erb

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::Country.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Country.model_name.human, admin_countries_path) %>
+  <%= link_to Spree.t(:countries), spree.admin_countries_url %> /
+  <%= @country.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @country } %>

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

@@ -1,12 +1,9 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:countries), spree.admin_countries_url %> /
   <%= Spree.t(:new_country) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Country.model_name.human, admin_countries_path) %>
-<% end %>
-
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @countries } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @country } %>
 
 <%= form_for [:admin, @country] do |f| %>
   <fieldset>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -1,13 +1,12 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::OptionType.model_name.human) %> <span class="green">"<%= @option_type.name %>"</span>
+  <%= link_to Spree.t(:option_types), spree.admin_option_types_url %> /
+  <%= @option_type.name %>
 <% end %>
 
 <% content_for :page_actions do %>
   <span id="new_add_option_value" data-hook>
     <%= button_link_to Spree.t(:add_option_value), "javascript:;", { :icon => 'add', :'data-target' => "tbody#option_values", :class => 'btn-success spree_add_fields' } %>
   </span>
-
-  <%= back_to_list_button(Spree::OptionType.model_name.human, admin_option_types_path) %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @option_type } %>

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:option_types), spree.admin_option_types_url %> /
   <%= Spree.t(:new_option_type) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::OptionType.model_name.human, admin_option_types_path) %>
-<% end %>
-
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>

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

@@ -1,7 +1,4 @@
 <%= render 'order_actions', order: @order, events: @order_events %>
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Order.model_name.human, admin_orders_path) %>
-<% end %>
 
 <%= render 'spree/admin/shared/order_tabs', current: :cart %>
 

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

@@ -1,7 +1,4 @@
 <%= render 'order_actions', order: @order, events: @order_events %>
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Order.model_name.human, admin_orders_path) %>
-<% end %>
 
 <%= render 'spree/admin/shared/order_tabs', current: :shipments %>
 

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

@@ -42,14 +42,15 @@
     </div>
 
     <div class="col-md-8">
-      <div data-hook="name" class="form-group">
+      <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
         <%= label_tag :payment_method_name, Spree.t(:name) %>
         <%= text_field :payment_method, :name, :class => 'form-control' %>
-      </div>
-      <div data-hook="description" class="form-group">
+        <%= error_message_on :payment_method, :name %>
+      <% end %>
+      <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
         <%= label_tag :payment_method_description, Spree.t(:description) %>
         <%= text_area :payment_method, :description, { :cols => 60, :rows => 6, :class => 'form-control' } %>
-      </div>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/payment_methods/edit.html.erb

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::PaymentMethod.model_name.human) %> / <%= @payment_method.name %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::PaymentMethod.model_name.human, admin_payment_methods_path) %>
+  <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_url %> /
+  <%= @payment_method.name %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_url %> /
   <%= Spree.t(:new_payment_method) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::PaymentMethod.model_name.human, admin_payment_methods_path) %>
-<% end %>
-
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
 
 <%= form_for @payment_method, url: collection_url do |f| %>

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

@@ -2,7 +2,6 @@
   <% if can?(:create, Spree::Product) %>
     <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_product' } %>
   <% end %>
-  <%= back_to_list_button(Spree::Product.model_name.human, admin_products_path) %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :details} %>

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

@@ -1,13 +1,10 @@
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @product } %>
 
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:products), spree.admin_products_url %> /
   <%= Spree.t(:new_product) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Product.model_name.human, admin_products_path) %>
-<% end %>
-
 <%= form_for [:admin, @product], :html => { :multipart => true } do |f| %>
   <fieldset data-hook="new_product">
     <%= f.field_container :name, :class => ['form-group'] do %>

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

@@ -1,8 +1,9 @@
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @promotion } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @promotion_category } %>
 
 <%= f.field_container :name, class: ['form-group'] do %>
   <%= f.label :name %>
   <%= f.text_field :name, :class => 'form-control' %>
+  <%= f.error_message_on :name %>
 <% end %>
 <%= f.field_container :code, class: ['form-group'] do %>
   <%= f.label :code %>

data/app/views/spree/admin/promotion_categories/edit.html.erb

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::PromotionCategory.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::PromotionCategory.model_name.human, admin_promotion_categories_path) %>
+  <%= link_to Spree.t(:promotion_categories), spree.admin_promotion_categories_url %> /
+  <%= @promotion_category.name %>
 <% end %>
 
 <%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:promotion_categories), spree.admin_promotion_categories_url %> /
   <%= Spree.t(:new_promotion_category) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::PromotionCategory.model_name.human, admin_promotion_categories_path) %>
-<% end %>
-
 <%= form_for :promotion_category, :url => collection_url do |f| %>
   <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -5,6 +5,7 @@
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name %>
       <%= f.text_field :name, :class => 'form-control' %>
+      <%= f.error_message_on :name %>
     <% end %>
 
     <%= f.field_container :code, class: ['form-group'] do %>

data/app/views/spree/admin/promotions/edit.html.erb

@@ -1,19 +1,16 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::Promotion.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Promotion.model_name.human, admin_promotions_path) %>
+  <%= link_to Spree.t(:promotions), admin_promotions_url %> /
+  <%= @promotion.name %>
 <% end %>
 
 <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
   <div class="row">
     <div class="col-md-12">
       <%= render :partial => 'form', :locals => { :f => f } %>
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>  
-    </div>    
+      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    </div>
   </div>
-  
+
 <% end %>
 
 <div id="promotion-filters" class="row">

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

@@ -1,14 +1,11 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:promotions), admin_promotions_url %> /
   <%= Spree.t(:new_promotion) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Promotion.model_name.human, admin_promotions_path) %>
-<% end %>
-
 <%= form_for :promotion, :url => collection_url do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <div class="text-center">
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>  
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </div>
 <% end %>

data/app/views/spree/admin/properties/edit.html.erb

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::Property.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Property.model_name.human, admin_properties_path) %>
+  <%= link_to Spree.t(:properties), admin_properties_url %> /
+  <%= @property.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @property } %>

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

@@ -1,13 +1,10 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
 
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:properties), admin_properties_url %> /
   <%= Spree.t(:new_property) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Property.model_name.human, admin_properties_path) %>
-<% end %>
-
 <%= form_for [:admin, @property] do |f| %>
   <fieldset data-hook="new_property">
     <%= render partial: 'form', locals: { f: f } %>

data/app/views/spree/admin/prototypes/edit.html.erb

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::Prototype.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Prototype.model_name.human, admin_prototypes_path) %>
+  <%= link_to Spree.t(:prototypes), spree.admin_prototypes_url %> /
+  <%= @prototype.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @prototype } %>

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

@@ -1,13 +1,10 @@
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @prototype } %>
 
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:prototypes), spree.admin_prototypes_url %> /
   <%= Spree.t(:new_prototype) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Prototype.model_name.human, admin_prototypes_path) %>
-<% end %>
-
 <%= form_for [:admin, @prototype] do |f| %>
   <fieldset data-hook="new_prototype">
     <%= render :partial => 'form', :locals => { :f => f } %>

data/app/views/spree/admin/refund_reasons/edit.html.erb

@@ -1,4 +1,3 @@
 <%= render partial: 'spree/admin/shared/named_types/edit', locals: {
-  page_title: Spree.t(:editing_resource, resource: Spree::RefundReason.model_name.human),
-  back_button_text: Spree.t(:back_to_resource_list, resource: Spree::RefundReason.model_name.human)
+  collection_url_label: Spree.t(:refund_reasons)
 } %>

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

@@ -1,4 +1,4 @@
 <%= render partial: 'spree/admin/shared/named_types/new', locals: {
-  page_title: Spree.t(:new_refund_reason),
-  back_button_text: Spree.t(:back_to_resource_list, resource: Spree::RefundReason.model_name.human)
+  collection_url_label: Spree.t(:refund_reasons),
+  page_title: Spree.t(:new_refund_reason)
 } %>

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

@@ -1,8 +1,8 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %>
 
 <% content_for :page_title do %>
-  / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
-  / <%= Spree.t(:editing_resource, resource: Spree::Refund.model_name.human) %> <%= @refund.id %>
+  / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", spree.admin_order_payment_path(@refund.payment.order, @refund.payment) %>
+  / <%= Spree.t(:refund) %> <%= @refund.id %>
 <% end %>
 
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: :payments} %>
 
 <% content_for :page_title do %>
-  / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
+  / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", spree.admin_order_payment_path(@refund.payment.order, @refund.payment) %>
   / <%= Spree.t(:new_refund) %>
 <% end %>
 

data/app/views/spree/admin/reimbursements/edit.html.erb

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_returns } %>
 
 <% content_for :page_title do %>
-  / <%= Spree.t(:editing_resource, resource: Spree::Reimbursement.model_name.human) %> #<%= @reimbursement.number %>
+  / <%= Spree.t(:reimbursement) %> #<%= @reimbursement.number %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement } %>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:reports), spree.admin_reports_url %> /
   <%= Spree.t(:sales_totals) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree.t(:report), admin_reports_path) %>
-<% end %>
-
 <div class="well">
   <%= render :partial => 'spree/admin/shared/report_order_criteria' %>
 </div>