solidus_backend 2.0.3 → 2.1.0.beta1

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

@@ -7,8 +7,14 @@ module Spree
         params[:q] ||= {}
 
         @search = @product.prices.accessible_by(current_ability, :index).ransack(params[:q])
-        @prices = @search.result
+        @master_prices = @search.result
           .currently_valid
+          .for_master
+          .order(:variant_id, :country_iso, :currency)
+          .page(params[:page]).per(Spree::Config.admin_variants_per_page)
+        @variant_prices = @search.result
+          .currently_valid
+          .for_variant
           .order(:variant_id, :country_iso, :currency)
           .page(params[:page]).per(Spree::Config.admin_variants_per_page)
       end

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

@@ -4,7 +4,6 @@ module Spree
       helper 'spree/products'
 
       before_action :load_data, except: [:index]
-      create.before :create_before
       update.before :update_before
       helper_method :clone_object_url
 
@@ -115,11 +114,6 @@ module Spree
         @collection
       end
 
-      def create_before
-        return if params[:product][:prototype_id].blank?
-        @prototype = Spree::Prototype.find(params[:product][:prototype_id])
-      end
-
       def update_before
         # note: we only reset the product properties if we're receiving a post
         #       from the form on that tab

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

@@ -4,8 +4,6 @@ module Spree
       before_action :load_data
       before_action :load_bulk_code_information, only: [:edit]
 
-      create.before :build_promotion_codes
-
       helper 'spree/promotion_rules'
 
       def create

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

@@ -29,6 +29,7 @@ module Spree
           load_roles
           load_stock_locations
 
+          flash.now[:error] = @user.errors.full_messages.join(", ")
           render :new, status: :unprocessable_entity
         end
       end
@@ -37,12 +38,14 @@ module Spree
         if @user.update_attributes(user_params)
           set_roles
           set_stock_locations
+
           flash[:success] = Spree.t(:account_updated)
           redirect_to edit_admin_user_url(@user)
         else
           load_roles
           load_stock_locations
 
+          flash.now[:error] = @user.errors.full_messages.join(", ")
           render :edit, status: :unprocessable_entity
         end
       end

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

@@ -24,7 +24,7 @@ module Spree
         parts = []
         parts << variant.product.name
         parts << "(#{variant.options_text})" if variant.options_text.present?
-        parts << line_item.display_total
+        parts << line_item.display_amount
         safe_join(parts, "<br />".html_safe)
       end
 

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

@@ -34,41 +34,6 @@ module Spree
         end
       end
 
-      # This method demonstrates the use of the :child_index option to render a
-      # form partial for, for instance, client side addition of new nested
-      # records.
-      #
-      # This specific example creates a link which uses javascript to add a new
-      # form partial to the DOM.
-      #
-      #   <%= form_for @project do |project_form| %>
-      #     <div id="tasks">
-      #       <%= project_form.fields_for :tasks do |task_form| %>
-      #         <%= render :partial => 'task', :locals => { :f => task_form } %>
-      #       <% end %>
-      #     </div>
-      #   <% end %>
-      def generate_html(form_builder, method, options = {})
-        options[:object] ||= form_builder.object.class.reflect_on_association(method).klass.new
-        options[:partial] ||= method.to_s.singularize
-        options[:form_builder_local] ||= :f
-
-        form_builder.fields_for(method, options[:object], child_index: 'NEW_RECORD') do |f|
-          render(partial: options[:partial], locals: { options[:form_builder_local] => f })
-        end
-      end
-
-      def generate_template(form_builder, method, options = {})
-        escape_javascript generate_html(form_builder, method, options)
-      end
-
-      def remove_nested(fields)
-        out = ''
-        out << fields.hidden_field(:_destroy) unless fields.object.new_record?
-        out << (link_to icon('remove'), "#", class: 'remove')
-        out.html_safe
-      end
-
       def preference_field_tag(name, value, options)
         case options[:type]
         when :integer

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

@@ -20,6 +20,20 @@ module Spree
       def stock_transfer_status(stock_transfer)
         stock_transfer.closed? ? Spree.t(:closed) : Spree.t(:open)
       end
+
+      def deleted_variant_admin_hint(variant)
+        newer_variant_with_same_sku = Spree::Variant.find_by(sku: variant.sku)
+        hint_type = newer_variant_with_same_sku ? :deleted_explanation_with_replacement : :deleted_explanation
+        hint_text = I18n.t(
+          hint_type,
+          scope: [:spree, :hints, "spree/variant"],
+          date: variant.deleted_at
+        )
+        admin_hint(
+          I18n.t(:deleted, scope: [:spree, :hints, "spree/variant"]),
+          hint_text
+        )
+      end
     end
   end
 end

data/app/models/spree/backend_configuration.rb

@@ -5,14 +5,14 @@ module Spree
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,
                             :customer_returns, :adjustments, :customer_details]
-    PRODUCT_TABS       ||= [:products, :option_types, :properties, :prototypes,
+    PRODUCT_TABS       ||= [:products, :option_types, :properties,
                             :variants, :product_properties, :taxonomies,
                             :taxons]
     REPORT_TABS        ||= [:reports]
     CONFIGURATION_TABS ||= [:configurations, :general_settings, :tax_categories,
                             :tax_rates, :zones, :countries, :states,
                             :payment_methods, :shipping_methods,
-                            :shipping_categories, :stock_locations, :trackers,
+                            :shipping_categories, :stock_locations,
                             :refund_reasons, :reimbursement_types, :return_authorization_reasons]
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
     STOCK_TABS         ||= [:stock_items, :stock_transfers]

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

@@ -43,7 +43,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::AdjustmentReason,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb

@@ -1,22 +1,20 @@
 <div data-hook="admin_adjustment_reason_form_fields" class="row">
-  <div class="row">
-    <div class="alpha four columns">
-      <%= f.field_container :name do %>
-        <%= f.label :name, class: 'required' %><br />
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      <% end %>
+  <div class="col-xs-3">
+    <%= f.field_container :name do %>
+      <%= f.label :name, class: 'required' %><br />
+      <%= f.text_field :name, :class => 'fullwidth' %>
+    <% end %>
 
-      <%= f.field_container :code do %>
-        <%= f.label :code, class: 'required' %><br />
-        <%= f.text_field :code, :class => 'fullwidth' %>
-      <% end %>
+    <%= f.field_container :code do %>
+      <%= f.label :code, class: 'required' %><br />
+      <%= f.text_field :code, :class => 'fullwidth' %>
+    <% end %>
 
-      <div class="checkbox">
-        <label>
-          <%= f.check_box :active %>
-          <%= Spree::AdjustmentReason.human_attribute_name(:active) %>
-        </label>
-      </div>
+    <div class="checkbox">
+      <label>
+        <%= f.check_box :active %>
+        <%= Spree::AdjustmentReason.human_attribute_name(:active) %>
+      </label>
     </div>
   </div>
 </div>

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -2,7 +2,10 @@
   @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
   @delete_url = admin_order_adjustment_path(@order, adjustment)
 %>
-<tr id="<%= spree_dom_id(adjustment) %>" data-hook="adjustment_row" class="<%= cycle('odd', 'even')%>">
+<tr id="<%= spree_dom_id(adjustment) %>"
+    data-hook="adjustment_row"
+    class="<%= cycle('odd', 'even')%> <%= "adjustment-ineligible" if !adjustment.eligible? %>"
+    >
   <td class="align-center"><%= display_adjustable(adjustment.adjustable) %></td>
   <td class="align-center"><%= adjustment.label %></td>
   <td class="align-center"><%= adjustment.display_amount.to_html %></td>

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

@@ -1,24 +1,28 @@
-<div data-hook="admin_adjustment_form_fields" class="row">
-  <div class="alpha three columns">
-    <%= f.field_container :amount do %>
-      <%= f.label :amount, class: 'required' %>
-      <%= text_field :adjustment, :amount, class: 'fullwidth' %>
-      <%= f.error_message_on :amount %>
-    <% end %>
-  </div>
+<div data-hook="admin_adjustment_form_fields">
+  <div class="row">
 
-  <div class="six columns">
-    <%= f.field_container :label do %>
-      <%= f.label :label, class: 'required' %>
-      <%= text_field :adjustment, :label, class: 'fullwidth' %>
-      <%= f.error_message_on :label %>
-    <% end %>
-  </div>
+    <div class="col-xs-3">
+      <%= f.field_container :amount do %>
+        <%= f.label :amount, class: 'required' %>
+        <%= text_field :adjustment, :amount, class: 'fullwidth' %>
+        <%= f.error_message_on :amount %>
+      <% end %>
+    </div>
+
+    <div class="col-xs-6">
+      <%= f.field_container :label do %>
+        <%= f.label :label, class: 'required' %>
+        <%= text_field :adjustment, :label, class: 'fullwidth' %>
+        <%= f.error_message_on :label %>
+      <% end %>
+    </div>
+
+    <div class="col-xs-3">
+      <%= f.field_container :label do %>
+        <%= f.label :adjustment_reason_id %><br/>
+        <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => Spree.t(:select_a_reason), class: 'select2 fullwidth'}) %>
+      <% end %>
+    </div>
 
-  <div class="omega three columns">
-    <%= f.field_container :label do %>
-      <%= f.label :adjustment_reason_id %><br/>
-      <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => Spree.t(:select_a_reason), class: 'select2 fullwidth'}) %>
-    <% end %>
   </div>
 </div>

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

@@ -1,7 +1,6 @@
-<% admin_breadcrumb(link_to plural_resource_name(Spree::Order), spree.admin_orders_path) %>
-<% admin_breadcrumb(link_to "##{@order.number}", spree.edit_admin_order_path(@order)) %>
-<% admin_breadcrumb(Spree.t(:cancel_inventory)) %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Cancel Inventory'} %>
 
+<% admin_breadcrumb(Spree.t(:cancel_inventory)) %>
 
 <table class="stock-contents index">
   <colgroup>

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

@@ -1,17 +1,17 @@
 <div data-hook="admin_country_form_fields" class="row">
-  <div class="alpha four columns">
+  <div class="col-xs-5">
     <div data-hook="name" class="field">
       <%= f.label :name %>
       <%= f.text_field :name, :class => 'fullwidth' %>
     </div>
   </div>
-  <div class="four columns">
+  <div class="col-xs-5">
     <div data-hook="iso_name" class="field">
       <%= f.label :iso_name %>
       <%= f.text_field :iso_name, :class => 'fullwidth' %>
     </div>
   </div>
-  <div class="omega four columns">
+  <div class="col-xs-2">
     <div data-hook="states_required" class="field checkbox">
       <label>
         <%= f.check_box :states_required %>
@@ -19,4 +19,4 @@
       </label>
     </div>
   </div>
-</div>
+</div>

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

@@ -44,7 +44,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::CustomerReturn,
                  new_resource_url: new_object_url %>

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

@@ -18,7 +18,7 @@
           <% if @rma_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @rma_return_items} %>
           <% else %>
-            <div class="alpha twelve columns no-objects-found"><%= Spree.t(:none) %></div>
+            <div class="col-xs-9 no-objects-found"><%= Spree.t(:none) %></div>
           <% end %>
         </fieldset>
 
@@ -27,7 +27,7 @@
           <% if @new_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
           <% else %>
-            <div class="alpha twelve columns no-objects-found"><%= Spree.t(:none) %></div>
+            <div class="col-xs-9 no-objects-found"><%= Spree.t(:none) %></div>
           <% end %>
         </fieldset>
 
@@ -48,11 +48,9 @@
 
 <% else %>
 
-  <div class="twelve columns">
-    <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:all_items_have_been_returned) %>,
-      <%= link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_path(@order) %>.
-    </div>
+  <div class="col-xs-9 no-objects-found">
+    <%= Spree.t(:all_items_have_been_returned) %>,
+    <%= link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_path(@order) %>.
   </div>
 
 <% end %>

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

@@ -2,61 +2,70 @@
 
 <% admin_breadcrumb(Spree.t(:settings)) %>
 <% admin_breadcrumb(Spree.t(:general_settings)) %>
-
-<%= form_tag admin_general_settings_path, method: :put do %>
+<%= form_for @store, url: admin_general_settings_path do |f| %>
   <div id="preferences" data-hook>
 
     <fieldset class="general no-border-top">
 
-      <%= fields_for :store do |f| %>
-        <div data-hook="admin_general_setting_input_name">
-          <%= f.field_container :name do %>
-            <%= f.label :name %>
-            <%= f.text_field :name, class: 'fullwidth' %>
-            <%= f.error_message_on :name %>
-          <% end %>
-        </div>
+      <div data-hook="admin_general_setting_input_name">
+        <%= f.field_container :name do %>
+          <%= f.label :name %>
+          <%= f.text_field :name, class: 'fullwidth' %>
+          <%= f.error_message_on :name %>
+        <% end %>
+      </div>
 
-        <div data-hook="admin_general_setting_input_seo_title">
-          <%= f.field_container :seo_title do %>
-            <%= f.label :seo_title %>
-            <%= f.text_field :seo_title, class: 'fullwidth'  %>
-            <%= f.error_message_on :seo_title %>
-          <% end %>
-        </div>
+      <div data-hook="admin_general_setting_input_seo_title">
+        <%= f.field_container :seo_title do %>
+          <%= f.label :seo_title %>
+          <%= f.text_field :seo_title, class: 'fullwidth'  %>
+          <%= f.error_message_on :seo_title %>
+        <% end %>
+      </div>
 
-        <div data-hook="admin_general_setting_input_meta_keywords">
-          <%= f.field_container :meta_keywords do %>
-            <%= f.label :meta_keywords %>
-            <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
-            <%= f.error_message_on :meta_keywords %>
-          <% end %>
-        </div>
+      <div data-hook="admin_general_setting_input_meta_keywords">
+        <%= f.field_container :meta_keywords do %>
+          <%= f.label :meta_keywords %>
+          <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+          <%= f.error_message_on :meta_keywords %>
+        <% end %>
+      </div>
 
-        <div data-hook="admin_general_setting_input_meta_description">
-          <%= f.field_container :meta_description do %>
-            <%= f.label :meta_description %>
-            <%= f.text_field :meta_description, class: 'fullwidth'  %>
-            <%= f.error_message_on :meta_description %>
-          <% end %>
-        </div>
+      <div data-hook="admin_general_setting_input_meta_description">
+        <%= f.field_container :meta_description do %>
+          <%= f.label :meta_description %>
+          <%= f.text_field :meta_description, class: 'fullwidth'  %>
+          <%= f.error_message_on :meta_description %>
+        <% end %>
+      </div>
 
-        <div data-hook="admin_general_setting_input_url">
-          <%= f.field_container :url do %>
-            <%= f.label :url %>
-            <%= f.text_field :url, class: 'fullwidth'  %>
-            <%= f.error_message_on :url %>
-          <% end %>
-        </div>
+      <div data-hook="admin_general_setting_input_url">
+        <%= f.field_container :url do %>
+          <%= f.label :url %>
+          <%= f.text_field :url, class: 'fullwidth'  %>
+          <%= f.error_message_on :url %>
+        <% end %>
+      </div>
 
-        <div data-hook="admin_general_setting_mail_from_address">
-          <%= f.field_container :mail_from_address do %>
-            <%= f.label :mail_from_address %>
-            <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
-            <%= f.error_message_on :mail_from_address %>
-          <% end %>
-        </div>
-      <% end %>
+      <div data-hook="admin_general_setting_mail_from_address">
+        <%= f.field_container :mail_from_address do %>
+          <%= f.label :mail_from_address %>
+          <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
+          <%= f.error_message_on :mail_from_address %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_general_setting_default_tax_country">
+        <%= f.field_container :cart_tax_country_iso do %>
+          <%= f.field_hint :cart_tax_country_iso %>
+          <%= f.label :cart_tax_country_iso %>
+          <%= f.select :cart_tax_country_iso,
+                       Spree::Country.all.map { |c| [c.name, c.iso] },
+                       { include_blank: t(".no_cart_tax_country") },
+                       { class: "select2 fullwidth" } %>
+          <%= f.error_message_on :cart_tax_country_iso %>
+        <% end %>
+      </div>
 
       <% if can? :update, :general_settings %>
         <div class="form-buttons filter-actions actions" data-hook="buttons">

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

@@ -1,18 +1,20 @@
 <div data-hook="admin_image_form_fields">
-  <div class="four columns alpha">
-    <div data-hook="file" class="field">
-      <%= f.label :attachment %><br>
-      <%= f.file_field :attachment %>
+  <div class="row">
+    <div class="col-xs-3">
+      <div data-hook="file" class="field">
+        <%= f.label :attachment %><br>
+        <%= f.file_field :attachment %>
+      </div>
+      <div data-hook="variant" class="field">
+        <%= f.label :viewable_id, Spree::Variant.model_name.human %><br>
+        <%= f.select :viewable_id, @variants, {}, { class: 'select2 fullwidth' } %>
+      </div>
     </div>
-    <div data-hook="variant" class="field">
-      <%= f.label :viewable_id, Spree::Variant.model_name.human %><br>
-      <%= f.select :viewable_id, @variants, {}, { class: 'select2 fullwidth' } %>
+    <div data-hook="alt_text" class="field col-xs-4">
+      <%= f.label :alt %><br>
+      <%= f.text_area :alt, rows: 4, class: 'fullwidth' %>
     </div>
   </div>
-  <div data-hook="alt_text" class="field omega five columns">
-    <%= f.label :alt %><br>
-    <%= f.text_area :alt, rows: 4, class: 'fullwidth' %>
-  </div>
 </div>
 
 <div class="clear"></div>

data/app/views/spree/admin/images/_image_row.html.erb

@@ -0,0 +1,22 @@
+<tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
+  <td class="no-border">
+    <% if can?(:update_positions, Spree::Image) %>
+      <span class="handle"></span>
+    <% end %>
+  </td>
+  <td>
+    <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
+  </td>
+  <% if @product.has_variants? %>
+    <td><%= options_text_for(image) %></td>
+  <% end %>
+  <td><%= image.alt %></td>
+  <td class="actions">
+    <% if can?(:update, image) %>
+      <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
+    <% end %>
+    <% if can?(:destroy, image) %>
+      <%= link_to_delete image, { :url => admin_product_image_url(@product, image), :no_text => true } %>
+    <% end %>
+  </td>
+</tr>

data/app/views/spree/admin/images/create.js.erb

@@ -0,0 +1,9 @@
+var uploadedRow = $('[data-upload-id="<%= params[:upload_id] %>"]');
+
+<% if @image.persisted? %>
+  uploadedRow.trigger('clear');
+  $('#images-table').removeClass('hidden').find('tbody').append('<%= j render partial: "image_row", locals: {image: @image } %>');
+  $('.no-objects-found').hide();
+<% else %>
+  uploadedRow.find('error').removeClass('hidden').html('<%= j @image.errors.full_messages.join("<br>").html_safe %>');
+<% end %>

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

@@ -13,17 +13,21 @@
 <%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
   <fieldset data-hook="edit_image">
     <legend align="center"><%= @image.attachment_file_name%></legend>
-    <div data-hook="thumbnail" class="field alpha three columns align-center">
-      <%= f.label Spree.t(:thumbnail) %><br>
-      <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
-    </div>
-    <div class="nine columns omega">
-      <%= render :partial => 'form', :locals => { :f => f } %>
+
+    <div class="row">
+      <div data-hook="thumbnail" class="field col-xs-2 align-center">
+        <%= f.label Spree.t(:thumbnail) %><br>
+        <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
+      </div>
+      <div class="col-xs-10">
+        <%= render :partial => 'form', :locals => { :f => f } %>
+      </div>
+      <div class="clear"></div>
     </div>
-    <div class="clear"></div>
+
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t('actions.update') %>
-      <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button remove' %>
+      <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
     </div>
   </fieldset>
 <% end %>