spree_backend 3.4.6 → 3.5.0.rc1

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

@@ -12,8 +12,8 @@ module Spree
       def create
         @user = Spree.user_class.new(user_params)
         if @user.save
-          flash.now[:success] = flash_message_for(@user, :successfully_created)
-          render :edit
+          flash[:success] = flash_message_for(@user, :successfully_created)
+          redirect_to edit_admin_user_path(@user)
         else
           render :new
         end
@@ -26,10 +26,11 @@ module Spree
         end
 
         if @user.update_attributes(user_params)
-          flash.now[:success] = Spree.t(:account_updated)
+          flash[:success] = Spree.t(:account_updated)
+          redirect_to edit_admin_user_path(@user)
+        else
+          render :edit
         end
-
-        render :edit
       end
 
       def addresses
@@ -88,7 +89,8 @@ module Spree
 
       def user_params
         params.require(:user).permit(permitted_user_attributes |
-                                     [spree_role_ids: [],
+                                     [:use_billing,
+                                      spree_role_ids: [],
                                       ship_address_attributes: permitted_address_attributes,
                                       bill_address_attributes: permitted_address_attributes])
       end

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

@@ -3,6 +3,7 @@ module Spree
     class VariantsController < ResourceController
       belongs_to 'spree/product', find_by: :slug
       new_action.before :new_before
+      before_action :redirect_on_empty_option_values, only: [:new]
       before_action :load_data, only: [:new, :create, :edit, :update]
 
       # override the destroy method to set deleted_at value
@@ -12,7 +13,7 @@ module Spree
         if @variant.destroy
           flash[:success] = Spree.t('notice_messages.variant_deleted')
         else
-          flash[:error] = Spree.t('notice_messages.variant_not_deleted')
+          flash[:error] = Spree.t('notice_messages.variant_not_deleted', error: @variant.errors.full_messages.to_sentence)
         end
 
         respond_with(@variant) do |format|
@@ -54,6 +55,10 @@ module Spree
       def load_data
         @tax_categories = TaxCategory.order(:name)
       end
+
+      def redirect_on_empty_option_values
+        redirect_to admin_product_variants_url(params[:product_id]) if @product.empty_option_values?
+      end
     end
   end
 end

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

@@ -41,7 +41,7 @@ module Spree
                      request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
                    else
                      args.include?(controller.controller_name.to_sym)
-        end
+                   end
         css_classes << 'selected' if selected
 
         css_classes << options[:css_class] if options[:css_class]
@@ -117,6 +117,14 @@ module Spree
         button_link_to '', clone_object_url(resource), options
       end
 
+      def link_to_clone_promotion(promotion, options = {})
+        options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
+        options[:class] = 'btn btn-warning btn-sm with-tip'
+        options[:method] = :post
+        options[:icon] = :clone
+        button_link_to '', clone_admin_promotion_path(promotion), options
+      end
+
       def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
         options[:data] = { action: 'edit' }
@@ -151,10 +159,18 @@ module Spree
         link_to(text.html_safe, url, options)
       end
 
-      def icon(icon_name)
+      def spree_icon(icon_name)
         icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
+      def icon(icon_name)
+        ActiveSupport::Deprecation.warn(<<-EOS, caller)
+         Admin::NavigationHelper#icon was renamed to Admin::NavigationHelper#spree_icon
+         and will be removed in Spree 3.6. Please update your code to avoid problems after update
+        EOS
+        spree_icon(icon_name)
+      end
+
       # Override: Add disable_with option to prevent multiple request on consecutive clicks
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name

data/app/models/spree/backend_configuration.rb

@@ -14,7 +14,8 @@ module Spree
                             :payment_methods, :shipping_methods,
                             :shipping_categories, :stock_transfers,
                             :stock_locations, :trackers, :refund_reasons,
-                            :reimbursement_types, :return_authorization_reasons]
+                            :reimbursement_types, :return_authorization_reasons,
+                            :stores]
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
     USER_TABS          ||= [:users]
   end

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

@@ -7,56 +7,6 @@
 
     <fieldset class="general no-border-top">
 
-      <%= fields_for :store do |f| %>
-        <div class="row">
-          <div class="col-xs-12 col-md-6">
-            <div class="form-group" data-hook="admin_general_setting_input_name">
-              <%= f.label :name %>
-              <%= f.text_field :name, class: 'form-control' %>
-            </div>
-          </div>
-
-          <div class="col-xs-12 col-md-6">
-            <div class="form-group" data-hook="admin_general_setting_input_seo_title">
-              <%= f.label :seo_title %>
-              <%= f.text_field :seo_title, class: 'form-control'  %>
-            </div>
-          </div>
-        </div>
-
-        <div class="row">
-          <div class="col-xs-12 col-md-6">
-            <div class="form-group" data-hook="admin_general_setting_input_meta_keywords">
-              <%= f.label :meta_keywords %>
-              <%= f.text_field :meta_keywords, class: 'form-control'  %>
-            </div>
-          </div>
-
-          <div class="col-xs-12 col-md-6">
-            <div class="form-group" data-hook="admin_general_setting_input_meta_description">
-              <%= f.label :meta_description %>
-              <%= f.text_field :meta_description, class: 'form-control'  %>
-            </div>
-          </div>
-        </div>
-
-        <div class="row">
-          <div class="col-xs-12 col-md-6">
-            <div class="form-group" data-hook="admin_general_setting_input_url">
-              <%= f.label :url %>
-              <%= f.text_field :url, class: 'form-control'  %>
-            </div>
-          </div>
-
-          <div class="col-xs-12 col-md-6">
-            <div class="form-group" data-hook="admin_general_setting_mail_from_address">
-              <%= f.label :mail_from_address %>
-              <%= f.text_field :mail_from_address, class: 'form-control'  %>
-            </div>
-          </div>
-        </div>
-      <% end %>
-
       <div class="row">
         <div class="col-xs-12 col-md-6">
           <%#-------------------------------------------------%>

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

@@ -0,0 +1,18 @@
+<div data-hook="store-form-container">
+  <%= form_for [:admin, order], method: :put, url: set_store_admin_order_url do |f| %>
+    <fieldset>
+    <div data-hook="admin_order_store_field">
+      <%= f.field_container :store_id, class: ['form-group'] do %>
+        <%= f.label :store_id, Spree.t(:store) %>
+        <%= f.collection_select(:store_id, @stores, :id, :name, { include_blank: false }, { class: "select2" }) %>
+        <%= f.error_message_on :store_id %>
+      <% end %>
+    </div>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'refresh', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'delete' %>
+    </div>
+    <fieldset>
+  <% end %>
+</div>

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

@@ -50,21 +50,21 @@
         <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_state.#{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>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
-            <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, {include_blank: true}, class: 'select2 js-filterable' %>
+            <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
           </div>
         </div>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
-            <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, {include_blank: true}, class: 'select2 js-filterable' %>
+            <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
           </div>
         </div>
 
@@ -107,7 +107,14 @@
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {include_blank: true}, class: 'select2' %>
+            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2' %>
+          </div>
+        </div>
+
+        <div class="col-xs-12 col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_store_id_in, Spree.t(:store) %>
+            <%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2' %>
           </div>
         </div>
 

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

@@ -0,0 +1,7 @@
+<%= render 'spree/admin/shared/order_tabs', current: :store %>
+
+<div data-hook="admin_order_edit_header">
+  <%= render 'spree/admin/shared/error_messages', target: @order %>
+</div>
+
+<%= render 'store_form', order: @order if can?(:update, @order) %>

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

@@ -77,6 +77,13 @@
         <% end %>
       </div>
 
+      <div data-hook="admin_product_form_sku">
+        <%= f.field_container :master_sku, class: ['form-group'] do %>
+          <%= f.label :master_sku, Spree.t(:master_sku) %>
+          <%= f.text_field :sku, size: 16, class: 'form-control' %>
+        <% end %>
+      </div>
+
       <% if @product.has_variants? %>
         <div data-hook="admin_product_form_multiple_variants" class="well">
           <%= f.label :skus, Spree.t(:sku).pluralize %>
@@ -100,13 +107,6 @@
           </div>
         </div>
       <% else %>
-        <div data-hook="admin_product_form_sku">
-          <%= f.field_container :sku, class: ['form-group'] do %>
-            <%= f.label :sku, Spree.t(:sku) %>
-            <%= f.text_field :sku, size: 16, class: 'form-control' %>
-          <% end %>
-        </div>
-
         <div id="shipping_specs" class="row">
           <div class="col-xs-12 col-md-6">
             <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">

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

@@ -1,4 +1,7 @@
 <% content_for :page_actions do %>
+  <% if frontend_available? %>
+    <%= button_link_to Spree.t(:preview_product), product_url(@product), { class: "btn-default", icon: 'eye-open', id: 'admin_preview_product', target: :_blank } %>
+  <% end %>
   <% 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 %>

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

@@ -13,6 +13,13 @@
       <%= f.text_field :code, class: 'form-control' %>
     <% end %>
 
+    <%= f.field_container :generate_code, class: ['checkbox'] do %>
+      <%= f.label :generate_code do %>
+        <%= f.check_box :generate_code %>
+        <%= Spree.t(:generate_code) %>
+      <% end %>
+    <% end %>
+
     <%= f.field_container :path, class: ['form-group'] do %>
       <%= f.label :path %>
       <%= f.text_field :path, class: 'form-control' %>

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

@@ -8,5 +8,5 @@
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
 
   <%= render partial: "spree/admin/promotions/actions/#{type_name}",
-             locals: { promotion_action: promotion_action, param_prefix: param_prefix } rescue nil %>
+    locals: { promotion_action: promotion_action, param_prefix: param_prefix } %>
 </div>

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

@@ -7,5 +7,5 @@
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
 
-  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } rescue nil %>
+  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
 </div>

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

@@ -68,6 +68,7 @@
           <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
           <td class="actions actions-2" data-hook="admin_promotions_index_row_actions">
             <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
+            <%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
             <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
           </td>
         </tr>

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

@@ -7,3 +7,4 @@
 <% end %>
 
 <%= render partial: '/spree/admin/shared/update_order_state' if @order %>
+<%= render partial: '/spree/admin/shared/update_store_credit' if @store_credit %>

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

@@ -11,6 +11,12 @@
       </li>
     <% end %>
 
+    <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
+      <li<%== ' class="active"' if current == :store %> data-hook='admin_order_tabs_store_details'>
+        <%= link_to_with_icon 'home', Spree.t(:store), store_admin_order_url(@order) %>
+      </li>
+    <% end %>
+
     <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
       <li<%== ' class="active"' if current == :customer_details %> data-hook='admin_order_tabs_customer_details'>
         <%= link_to_with_icon 'user', Spree.t(:customer), spree.admin_order_customer_url(@order) %>

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

@@ -0,0 +1 @@
+$('#user-lifetime-stats #store_credit').html('<%= Spree::Money.new(@user.total_available_store_credit) %>');

data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb

@@ -1,5 +1,6 @@
 <ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
   <%= configurations_sidebar_menu_item(Spree.t(:general_settings), spree.edit_admin_general_settings_path) if can? :manage, Spree::Config %>
+  <%= configurations_sidebar_menu_item(Spree.t(:stores), spree.admin_stores_path) if can? :manage, Spree::Store %>
   <%= configurations_sidebar_menu_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can? :manage, Spree::TaxCategory %>
   <%= configurations_sidebar_menu_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can? :manage, Spree::TaxRate %>
   <%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
@@ -15,7 +16,6 @@
   <%= configurations_sidebar_menu_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
   <%= configurations_sidebar_menu_item(Spree.t(:stock_locations), spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
   <%= configurations_sidebar_menu_item(Spree.t(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>
-  <%= configurations_sidebar_menu_item(Spree.t(:analytics_trackers), spree.admin_trackers_path) if can? :manage, Spree::Tracker %>
   <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
   <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>
   <%= configurations_sidebar_menu_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can? :manage, Spree::ReturnAuthorizationReason %>

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

@@ -11,7 +11,7 @@
     <div data-hook="admin_shipping_method_form_display_field" class="col-xs-12 col-md-6">
       <%= f.field_container :display_on, class: ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
-        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, { class: 'select2' }) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2' }) %>
         <%= f.error_message_on :display_on %>
       <% end %>
     </div>

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

@@ -23,7 +23,7 @@
           <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
           <td><%= shipping_method.calculator.description %></td>
-          <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
+          <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:none) : Spree.t(shipping_method.display_on) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
             <%= link_to_edit(shipping_method, no_text: true) if can? :edit, shipping_method %>
             <%= link_to_delete(shipping_method, no_text: true) if can? :delete, shipping_method %>

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

@@ -0,0 +1,48 @@
+<div data-hook="admin_store_form_fields">
+  <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.label :name, Spree.t(:name) %>
+    <%= f.text_field :name, class: 'form-control', required: true %>
+    <%= f.error_message_on :name %>
+  <% end %>
+  <%= f.field_container :url, class: ['form-group'] do %>
+    <%= f.label :url, Spree.t(:url)  %>
+    <%= f.text_field :url, class: 'form-control', required: true %>
+    <%= f.error_message_on :url %>
+  <% end %>
+  <%= f.field_container :meta_description, class: ['form-group'] do %>
+    <%= f.label :meta_description, Spree.t(:meta_description)  %>
+    <%= f.text_field :meta_description, class: 'form-control' %>
+    <%= f.error_message_on :meta_description %>
+  <% end %>
+  <%= f.field_container :meta_keywords, class: ['form-group'] do %>
+    <%= f.label :meta_keywords, Spree.t(:meta_keywords)  %>
+    <%= f.text_field :meta_keywords, class: 'form-control' %>
+    <%= f.error_message_on :meta_keywords %>
+  <% end %>
+  <%= f.field_container :seo_title, class: ['form-group'] do %>
+    <%= f.label :seo_title, Spree.t(:seo_title)  %>
+    <%= f.text_field :seo_title, class: 'form-control' %>
+    <%= f.error_message_on :seo_title %>
+  <% end %>
+  <%= f.field_container :mail_from_address, class: ['form-group'] do %>
+    <%= f.label :mail_from_address, Spree.t(:mail_from_address)  %>
+    <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
+    <%= f.error_message_on :mail_from_address %>
+  <% end %>
+  <%# TODO: uncomment this and add support for default_currency in store %>
+  <%# <%= f.field_container :default_currency, class: ['form-group'] do %1> %>
+  <%#   <%= f.label :default_currency, Spree.t(:default_currency)  %1> %>
+  <%#   <%= f.text_field :default_currency, class: 'form-control' %1> %>
+  <%#   <%= f.error_message_on :default_currency %1> %>
+  <%# <% end %1> %>
+  <%= f.field_container :code, class: ['form-group'] do %>
+    <%= f.label :code, Spree.t(:code)  %>
+    <%= f.text_field :code, class: 'form-control', required: true %>
+    <%= f.error_message_on :code %>
+  <% end %>
+  <%= f.field_container :default, class: ['form-group'] do %>
+    <%= f.label :default, Spree.t(:default)  %>
+    <%= f.check_box :default %>
+    <%= f.error_message_on :default %>
+  <% end %>
+</div>

data/app/views/spree/admin/{trackers → stores}/edit.html.erb

@@ -1,13 +1,13 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:analytics_trackers), spree.admin_trackers_url %> /
-  <%= @tracker.analytics_id %>
+  <%= link_to Spree.t(:stores), spree.admin_stores_url %> /
+  <%= @store.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tracker } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %>
 
-<%= form_for [:admin, @tracker] do |f| %>
+<%= form_for [:admin, @store] do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>
-    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_stores_path(@store) } %>
   </fieldset>
 <% end %>