spree_backend 4.2.0.rc2 → 4.2.0.rc3

data/app/assets/stylesheets/spree/backend/spree_admin.css.scss

@@ -18,9 +18,10 @@
 @import 'components/progress';
 @import 'components/spinner';
 
-@import 'plugins/select2';
 @import 'plugins/jquery_ui';
 @import 'plugins/flatpickr';
+@import 'plugins/select2_bootstrap4';
+@import 'plugins/select2_custom';
 
 @import 'shared/base';
 @import 'shared/forms';

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

@@ -2,7 +2,10 @@ module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
-      before_action :load_order, only: [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart, :store, :set_store]
+      before_action :load_order, only: %i[
+        edit update cancel resume approve resend open_adjustments
+        close_adjustments cart store set_store channel set_channel
+      ]
 
       respond_to :html
 
@@ -144,11 +147,21 @@ module Spree
         redirect_to store_admin_order_url(@order)
       end
 
+      def set_channel
+        if @order.update(order_params)
+          flash[:success] = flash_message_for(@order, :successfully_updated)
+        else
+          flash[:error] = @order.errors.full_messages.join(', ')
+        end
+
+        redirect_to channel_admin_order_url(@order)
+      end
+
       private
 
       def order_params
         params[:created_by_id] = try_spree_current_user.try(:id)
-        params.permit(:created_by_id, :user_id, :store_id)
+        params.permit(:created_by_id, :user_id, :store_id, :channel)
       end
 
       def load_order

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

@@ -20,10 +20,10 @@ module Spree
 
       def update
         if params[:product][:taxon_ids].present?
-          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].reject(&:empty?)
         end
         if params[:product][:option_type_ids].present?
-          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].reject(&:empty?)
         end
         invoke_callbacks(:update, :before)
         if @object.update(permitted_resource_params)

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

@@ -22,7 +22,7 @@ module Spree
       end
 
       def load_data
-        @countries = Country.order(:name)
+        @countries = Spree::Country.where(states_required: true).order(:name)
       end
     end
   end

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

@@ -1,8 +1,8 @@
 module Spree
   module Admin
     class TaxonsController < Spree::Admin::BaseController
-      before_action :load_taxonomy, only: [:create, :edit, :update]
-      before_action :load_taxon, only: [:edit, :update]
+      before_action :load_taxonomy, only: [:create, :edit, :update, :remove_icon]
+      before_action :load_taxon, only: [:edit, :update, :remove_icon]
       before_action :set_permalink_part, only: [:edit, :update]
       respond_to :html, :js
 
@@ -62,10 +62,22 @@ module Spree
         end
       end
 
+      def remove_icon
+        if @taxon.icon.destroy
+          flash[:success] = Spree.t('notice_messages.icon_removed')
+          redirect_to edit_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id)
+        else
+          flash[:error] = Spree.t('errors.messages.cannot_remove_icon')
+          render :edit
+        end
+      end
+
       private
 
       def set_permalink_part
         @permalink_part = @taxon.permalink.split('/').last
+        @parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
+        @parent_permalink += '/' unless @parent_permalink.blank?
       end
 
       def taxon_params
@@ -95,9 +107,7 @@ module Spree
 
       def set_permalink_params
         if params.key? 'permalink_part'
-          parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
-          parent_permalink += '/' unless parent_permalink.blank?
-          params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
+          params[:taxon][:permalink] = @parent_permalink + params[:permalink_part]
         end
       end
 

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

@@ -93,7 +93,9 @@ module Spree
                             class: 'input_integer form-control'
                           }
                         when :boolean
-                          {}
+                          {
+                            class: 'form-check-input'
+                          }
                         when :string
                           {
                             size: 10,
@@ -127,11 +129,25 @@ module Spree
 
         fields = object.preferences.keys.map do |key|
           if object.has_preference?(key)
-            form.label("preferred_#{key}", Spree.t(key) + ': ') +
-              preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
+            case key
+            when :currency
+              content_tag(:div, form.label("preferred_#{key}", Spree.t(key)) +
+                (form.select "preferred_#{key}", currency_options(object.preferences[key]), {}, { class: 'form-control select2' }),
+                          class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+            else
+              if object.preference_type(key) == :boolean
+                content_tag(:div, preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +
+                  form.label("preferred_#{key}", Spree.t(key), class: 'form-check-label'),
+                            class: 'form-group form-check', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+              else
+                content_tag(:div, form.label("preferred_#{key}", Spree.t(key)) +
+                  preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)),
+                            class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+              end
+            end
           end
         end
-        safe_join(fields, '<br />'.html_safe)
+        safe_join(fields)
       end
 
       # renders hidden field and link to remove record using nested_attributes
@@ -163,7 +179,7 @@ module Spree
       end
 
       def required_span_tag
-        content_tag(:span, ' *', class: 'required')
+        content_tag(:span, ' *', class: 'required font-weight-bold text-danger')
       end
 
       def product_preview_link(product)

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

@@ -130,7 +130,7 @@ module Spree
 
       def link_to_clone(resource, options = {})
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
-        options[:class] = 'btn btn-primary btn-sm with-tip'
+        options[:class] = 'btn btn-warning btn-sm with-tip'
         options[:method] = :post
         options[:icon] = 'clone.svg'
         button_link_to '', clone_object_url(resource), options
@@ -251,6 +251,16 @@ module Spree
         end
       end
 
+      def active_badge(condition, options = {})
+        label = options[:label]
+        label ||= condition ? Spree.t(:say_yes) : Spree.t(:say_no)
+        css_class = condition ? 'badge-active' : 'badge-inactive'
+
+        content_tag(:strong, class: "badge #{css_class} text-uppercase") do
+          label
+        end
+      end
+
       def main_part_classes
         if cookies['sidebar-minimized'] == 'true'
           'col-12 sidebar-collapsed'

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

@@ -2,9 +2,9 @@ module Spree
   module Admin
     module PaymentsHelper
       def payment_method_name(payment)
-        # HACK: to allow us to retrieve the name of a "deleted" payment method
-        id = payment.payment_method_id
-        Spree::PaymentMethod.find_with_destroyed(id).name
+        payment_method = payment.payment_method
+
+        link_to payment_method.name, spree.edit_admin_payment_method_path(payment_method)
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Spree
         if stock_movement.originator.respond_to?(:number)
           if stock_movement.originator.respond_to?(:order)
             link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
+          elsif stock_movement.originator.is_a?(Spree::StockTransfer)
+            link_to stock_movement.originator.number, spree.admin_stock_transfer_url(stock_movement.originator)
           else
             stock_movement.originator.number
           end

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

@@ -10,9 +10,9 @@
     <thead>
       <tr data-hook="tax_header">
         <th><%= Spree.t(:country_name) %></th>
-        <th><%= Spree.t(:iso3) %></th>
-        <th><%= Spree.t(:states_required) %></th>
-        <th><%= Spree.t(:zipcode_required) %></th>
+        <th class="text-center"><%= Spree.t(:iso3) %></th>
+        <th class="text-center"><%= Spree.t(:states_required) %></th>
+        <th class="text-center"><%= Spree.t(:zipcode_required) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -20,9 +20,9 @@
       <% @countries.each do |country| %>
         <tr id="<%= spree_dom_id country %>" data-hook="country_row">
           <td><%= country.name %></td>
-          <td><%= country.iso3 %></td>
-          <td class="text-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-          <td class="text-center"><%= country.zipcode_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="text-center"><%= country.iso3 %></td>
+          <td class="text-center"><%= active_badge(country.states_required?) %></td>
+          <td class="text-center"><%= active_badge(country.zipcode_required?) %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(country, no_text: true) if can? :edit, country %>
             <%= link_to_delete(country, no_text: true) if can? :delete, country %>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -17,7 +17,9 @@
     <% return_items.each do |return_item| %>
       <tr>
         <td>
-          <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+          <div class="variant-name">
+            <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+          </div>
           <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
         </td>
         <td>

data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb

@@ -25,7 +25,9 @@
             <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
           </td>
           <td>
-            <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+            <div class="variant-name">
+              <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+            </div>
             <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
           </td>
           <td>

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

@@ -32,9 +32,9 @@
             <td><%= pretty_time(customer_return.created_at) %></td>
             <td>
               <% if customer_return.fully_reimbursed? %>
-                <span class="badge badge-success"><%= Spree.t(:reimbursed) %></span>
+                <strong class="badge badge-success text-uppercase"><%= Spree.t(:reimbursed) %></strong>
               <% else %>
-                <span class="badge badge-info"><%= Spree.t(:incomplete) %></span>
+                <strong class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></strong>
               <% end %>
             </td>
             <td class='actions actions-1' data-hook="admin_orders_customer_returns_index_row_actions">

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

@@ -24,7 +24,7 @@
 
         <%= f.field_container :stock_location, class: ['form-group'] do %>
           <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
-          <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+          <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location %>
         <% end %>
       </div>

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

@@ -66,11 +66,34 @@
             </div>
 
             <div class="card-body">
+              <div class="alert alert-warning col-12">
+                This can be overriden by individual Store settings
+              </div>
               <div class="form-group">
-                <%= label_tag :currency, Spree.t(:choose_currency) %>
+                <%= label_tag :currency, Spree.t(:default_currency) %>
                 <%= select_tag :currency, currency_options %>
               </div>
-              <%= render partial: 'form' %>
+            </div>
+          </div>
+
+          <div class="card mb-3" id="general-settings-stores" data-hook="general_settings_stores">
+            <div class="card-header">
+              <h1 class="card-title mb-0 h5">
+                <%= Spree.t(:multiple_stores)%>
+              </h1>
+            </div>
+            <div class="card-body">
+              <div class="alert alert-warning col-12">
+                <%= Spree.t('show_store_currency_selector.long') %>
+              </div>
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <%= check_box('', :show_store_currency_selector, { checked: Spree::Config.show_store_currency_selector }) %>
+                    <%= Spree.t('show_store_currency_selector.short') %>
+                  </label>
+                </div>
+              </div>
             </div>
           </div>
         </div>

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

@@ -30,7 +30,7 @@
           </td>
           <td><%= option_type.name %></td>
           <td class="presentation"><%= option_type.presentation %></td>
-          <td><%= option_type.filterable %></td>
+          <td><%= active_badge(option_type.filterable) %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) if can?(:edit, option_type) %>
             <%= link_to_delete(option_type, no_text: true) if can?(:delete, option_type) %>

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

@@ -9,7 +9,7 @@
   <div class="card-body">
     <div data-hook="add_product_name" class="form-group">
       <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_line_item_variant_id, "", class: "variant_autocomplete d-block w-100" %>
+      <%= select_tag 'add_line_item_variant_id', nil , class: 'variant_autocomplete d-block w-100' %>
     </div>
 
     <div id="stock_details"></div>

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

@@ -10,7 +10,7 @@
   <div class="card-body">
     <div data-hook="add_product_name">
       <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_variant_id, "", class: "variant_autocomplete d-block w-100" %>
+      <%= select_tag 'variants', nil, id: :add_variant_id, class: 'variant_autocomplete d-block w-100' %>
     </div>
 
     <div id="stock_details"></div>

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

@@ -0,0 +1,18 @@
+<div data-hook="channel-form-container">
+  <%= form_for [:admin, order], method: :put, url: set_channel_admin_order_url do |f| %>
+    <fieldset>
+    <div data-hook="admin_order_channel_field">
+      <%= f.field_container :channel, class: %w[form-group] do %>
+        <%= f.label :channel, Spree.t(:channel) %>
+        <%= f.text_field :channel, name: 'channel', class: 'form-control' %>
+        <%= f.error_message_on :channel %>
+      <% 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/_shipment.html.erb

@@ -8,7 +8,9 @@
       -
       <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
       <%= Spree.t(:package_from) %>
-      <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
+      <strong class="stock-location-name" data-hook="stock-location-name">
+        <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
+      </strong>
       <% if shipment.ready? and can? :update, shipment %>
         <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-success', data: { 'shipment-number' => shipment.number } %>
         <div class='clearfix'></div>

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

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

data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb

@@ -1,19 +1,42 @@
 <script type='text/template' id='customer_autocomplete_template'>
-  <div class='customer-autocomplete-item'>
-    <div class='customer-details'>
-      <h5>{{customer.email}}</h5>
-      {{#if bill_address.firstname }}
-        <strong>{{t 'bill_address' }}</strong>
-        {{bill_address.firstname}} {{bill_address.lastname}}<br>
-        {{bill_address.address1}}, {{bill_address.address2}}<br>
-        {{bill_address.city}}<br>
-        {{#if bill_address.state_id }}
-          {{bill_address.state.name}}
+  <div class='customer-autocomplete-item container'>
+    <div class="row">
+      <div class="col">
+        <h5><strong>Email:</strong> {{customer.email}}</h5>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class='customer-details col-6'>
+        {{#if bill_address.firstname }}
+          <strong>{{t 'bill_address' }}</strong><br>
+          {{bill_address.firstname}} {{bill_address.lastname}}<br>
+          {{bill_address.address1}}, {{bill_address.address2}}<br>
+          {{bill_address.city}}<br>
+          {{#if bill_address.state_id }}
+            {{bill_address.state.name}}
+          {{else}}
+            {{bill_address.state_name}}
+          {{/if}}
+          {{bill_address.country.name}}
+        {{/if}}
+    </div>
+
+    <div class='customer-details col-6'>
+      {{#if ship_address.firstname }}
+        <strong>Shipping Address</strong><br>
+        {{ship_address.firstname}} {{ship_address.lastname}}<br>
+        {{ship_address.address1}}, {{ship_address.address2}}<br>
+        {{ship_address.city}}<br>
+        {{#if ship_address.state_id }}
+          {{ship_address.state.name}}
         {{else}}
-          {{bill_address.state_name}}
+          {{ship_address.state_name}}
         {{/if}}
-        {{bill_address.country.name}}
+        {{ship_address.country.name}}
       {{/if}}
     </div>
+
   </div>
+</div>
 </script>