solidus_backend 1.3.0.beta1 → 1.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d7f8257531544954cfb58934778763acca81477
-  data.tar.gz: e84a434b1008caaf54ce913f3bab66d25916faa1
+  metadata.gz: 51cce8989f8468b9b8c46fa6e106fac9ce528a43
+  data.tar.gz: 97c4feba8c1f166dd176ad53ac9c25d2a53cc487
 SHA512:
-  metadata.gz: ffa2d4bcfa0c61e67b21662adc9ab2be1457f2ba6225202a7c977d2db7784f7173a3e4bb07890bfeda8150960687c44853cc2a9934631e9ab49da8cf6da03888
-  data.tar.gz: 23c7b13590263d67042317d05b5c1b88a5a14bfa7c2941314f6d3aa6d81798791951e2f932225ba54bbf4bc928ccef66a65a3741b0c84f6726447662f5cc7aca
+  metadata.gz: 603dfb79d475ca639c882863bf420f219169aabba2768902fc6c3292db11cb3df60f2c204bf88580c2cebfa6dfad6b09b2628f2cc65e1d582cd3b420e35d59e4
+  data.tar.gz: 7be5c607ace3fc7b1b26942312f9a76f7ad2ecb3c8aaf4890992b3a2c0589e50c48f02725794c36ac8ba846dff6f3a661db8c510b265ae0002916a4da9287137

data/Gemfile

@@ -1,4 +1,4 @@
-eval_gemfile File.expand_path('../../common_spree_dependencies.rb', __FILE__)
+eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
 
 gem 'solidus_core', path: '../core'
 gem 'solidus_api', path: '../api'

data/app/assets/javascripts/spree/backend/select_payments.js.coffee

@@ -1,7 +1,12 @@
 $ ->
   if $('.new_payment').is('*')
-    $('.payment-method-settings fieldset').addClass('hidden').first().removeClass('hidden')
-    $('input[name="payment[payment_method_id]"]').click ()->
-      $('.payment-method-settings fieldset').addClass('hidden')
-      id = $(this).parents('li').data('id')
-      $("fieldset[data-id='#{id}']").removeClass('hidden')
+    $input = $('input[name="payment[payment_method_id]"]')
+    $paymentMethods = $('.payment-method-settings .payment-methods')
+
+    updateSelected = ->
+      id = $input.filter(":checked").val()
+      $paymentMethods.addClass('hidden')
+      $paymentMethods.filter("#payment_method_#{id}").removeClass('hidden')
+
+    $input.on('click', updateSelected)
+    updateSelected()

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

@@ -0,0 +1,20 @@
+module Spree
+  module Admin
+    class PricesController < ResourceController
+      belongs_to 'spree/product', find_by: :slug
+
+      def index
+        params[:q] ||= {}
+
+        @search = @product.prices.accessible_by(current_ability, :index).ransack(params[:q])
+        @prices = @search.result
+          .currently_valid
+          .order(:variant_id, :country_iso, :currency)
+          .page(params[:page]).per(Spree::Config.admin_variants_per_page)
+      end
+
+      def edit
+      end
+    end
+  end
+end

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

@@ -82,7 +82,7 @@ module Spree
       end
 
       def render_after_create_error
-        load_stock_locations
+        load_source_stock_locations
         super
       end
 

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

@@ -24,6 +24,10 @@ module Spree
         end
         safe_join(options)
       end
+
+      def show_rebuild_vat_checkbox?
+        Spree::TaxRate.included_in_price.exists?
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@
       <label><%= Spree::PaymentMethod.model_name.human %></label>
       <ul>
         <% @payment_methods.each do |method| %>
-          <li data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
+          <li>
             <label data-hook="payment_method_field">
               <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method, { class: "payment_methods_radios" } %>
               <%= method.name %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -1,4 +1,4 @@
-<fieldset data-id='credit-card' class="no-border-bottom">
+<fieldset class="no-border-bottom">
   <div class="field" data-hook="previous_cards">
     <% if previous_cards.any? %>
       <% previous_cards.each do |card| %>

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

@@ -0,0 +1,52 @@
+<div data-hook="admin_product_price_fields">
+
+  <div data-hook="admin_product_price_form">
+    <div class="four columns alpha" data-hook="admin_product_price_form_variant">
+      <%= f.field_container :variant do %>
+        <%= f.label :variant %>
+        <%= f.select :variant_id,
+                     @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
+                     {},
+                     class: "select2 fullwidth", disabled: !f.object.new_record? %>
+      <% end %>
+    </div>
+
+    <div class="three columns alpha" data-hook="admin_product_price_form_currency">
+      <%= f.field_container :currency do %>
+        <%= f.label :currency %>
+        <%= f.select :currency,
+                     Money::Currency.all.map { |c| ["#{c.iso_code} (#{c.name})", c.iso_code] },
+                     {},
+                     class: "select2 fullwidth", disabled: !f.object.new_record? %>
+      <% end %>
+    </div>
+
+    <div class="three columns" data-hook="admin_product_price_form_country">
+      <%= f.field_container :country do %>
+        <%= f.label :country %>
+        <%= f.collection_select :country_iso, available_countries, :iso, :name,
+                                {
+                                  include_blank: t(:any_country, scope: [:spree, :admin, :prices]),
+                                  selected: Spree::Config.admin_vat_country_iso
+                                },
+                                { class: 'select2 fullwidth', disabled: !f.object.new_record? } %>
+      <% end %>
+    </div>
+
+    <div class="three columns" data-hook="admin_product_price_form_amount">
+      <%= f.field_container :price do %>
+        <%= f.label :price %>
+        <%= f.text_field :price, value: f.object.money.format, class: 'fullwidth title' %>
+      <% end %>
+    </div>
+
+    <div class="field three columns checkbox omega" data-hook="is_default_price">
+      <%= f.label :is_default do %>
+        <%= f.check_box :is_default %>
+        <%= Spree::Price.human_attribute_name(:is_default) %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<div class="clear"></div>

data/app/views/spree/admin/prices/_table.html.erb

@@ -0,0 +1,35 @@
+<%= paginate prices, theme: "solidus_admin" %>
+
+<table class="index prices">
+  <thead data-hook="prices_header">
+    <tr>
+      <th><%= Spree::Variant.model_name.human %> </th>
+      <th><%= Spree::Price.human_attribute_name(:country) %></th>
+      <th><%= Spree::Price.human_attribute_name(:currency) %></th>
+      <th><%= Spree::Price.human_attribute_name(:amount) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+  <% prices.each do |price| %>
+    <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %> <%= cycle('odd', 'even')%>">
+      <td><%= price.variant.descriptive_name %></td>
+      <td><%= price.display_country %>
+      <td><%= price.currency %></td>
+      <td class="align-right"><%= price.money.to_html %></td>
+      <td class="actions">
+        <% if can?(:update, price) %>
+          <%= link_to_edit(price, :no_text => true) unless price.deleted? %>
+        <% end %>
+        <% if can?(:destroy, price) %>
+          &nbsp;
+          <%= link_to_delete(price, :no_text => true) unless price.deleted? %>
+        <% end %>
+      </td>
+    </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= paginate prices, theme: "solidus_admin" %>

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

@@ -0,0 +1,12 @@
+<%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+
+<%= form_for @price, url: spree.admin_product_price_path(@product, @price) do |f| %>
+  <fieldset>
+    <legend> <%= t('.edit_price') %> </legend>
+    <%= render 'form', f: f %>
+
+    <% if can?(:update, @product) %>
+      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <% end %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,73 @@
+<%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+
+<% content_for :page_actions do %>
+  <li id="new_price_link">
+    <%= button_link_to t(".new_price"), new_object_url, { :remote => true, :icon => 'plus', :id => 'admin_new_product' } %>
+  </li>
+<% end if can?(:create, Spree::Product) %>
+
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+<div data-hook="admin_product_prices_index_search">
+  <%= search_form_for [:admin, :product, @search] do |f| %>
+
+  <div class="alpha four columns">
+    <div class="field" data-hook="sku-select">
+      <%= label_tag :q_variant_id_eq, Spree::Variant.model_name.human %>
+      <%= f.select :variant_id_eq,
+                   @product.variants_including_master.map { |v| [v.descriptive_name, v.id] },
+                   {include_blank: true},
+                   class: "select2 fullwidth" %>
+    </div>
+  </div>
+
+  <div class="three columns">
+    <div class="field" data-hook="currency-select">
+      <%= label_tag :q_currency_eq, Spree::Price.human_attribute_name(:currency) %>
+      <%= f.select :currency_eq,
+                   @prices.map(&:currency).uniq,
+                   {include_blank: true},
+                   class: "select2 fullwidth" %>
+    </div>
+  </div>
+
+  <div class="three columns">
+    <div class="field" data-hook="country-select">
+      <%= label_tag :q_country_iso_eq, Spree::Price.human_attribute_name(:country) %>
+      <%= f.select :country_iso_eq,
+                   @prices.map(&:country).compact.uniq.map { |c| [c.name, c.iso]},
+                   {include_blank: true},
+                   class: "select2 fullwidth" %>
+    </div>
+  </div>
+
+  <div class="three columns">
+    <div class="field">
+      <%= label_tag :q_amount_gt, t(".amount_greater_than") %>
+      <%= f.text_field :amount_gt %>
+    </div>
+  </div>
+
+  <div class="omega three columns">
+    <div class="field">
+      <%= label_tag :q_amount_lt, t(".amount_less_than") %>
+      <%= f.text_field :amount_lt %>
+    </div>
+  </div>
+
+  <div class="clearfix"></div>
+
+  <div class="actions filter-actions">
+    <div data-hook="admin_orders_index_search_buttons">
+      <%= button Spree.t(:filter_results), 'search' %>
+    </div>
+  </div>
+
+  <% end %>
+</div>
+<% end %>
+
+<%= render 'table', prices: @prices %>

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

@@ -0,0 +1,7 @@
+<%= form_for [:admin, @product, @product.prices.build] do |f| %>
+  <fieldset data-hook="admin_product_price_new_form">
+    <legend><%= t('.new_price') %></legend>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/prices/new.js.erb

@@ -0,0 +1,2 @@
+$(".js-content-below-tabs").html('<%= escape_javascript(render :template => 'spree/admin/prices/new', :formats => [:html], :handlers => [:erb]) %>');
+$(".js-content-below-tabs .select2").select2();

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

@@ -27,14 +27,19 @@
   </div>
 
   <div class="right four columns omega" data-hook="admin_product_form_right">
-    <div data-hook="admin_product_form_price">
-    <%= f.field_container :price do %>
-      <%= f.label :price, class: 'required' %>
-      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
-      <%= f.error_message_on :price %>
-    <% end %>
+    <div data-hook="admin_product_form_price" class="alpha omega four columns">
+      <%= f.field_container :price do %>
+        <%= f.label :price, class: 'required' %>
+        <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
+        <%= f.error_message_on :price %>
+      <% end %>
     </div>
 
+    <% if show_rebuild_vat_checkbox? %>
+      <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "product", wrapper_class: "alpha omega field four columns" %>
+      <div class="clearfix"></div>
+    <% end %>
+
     <div data-hook="admin_product_form_cost_price" class="alpha two columns">
       <%= f.field_container :cost_price do %>
         <%= f.label :cost_price %>

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

@@ -49,7 +49,7 @@
     </div>
 
     <div class='row'>
-      <div data-hook="new_product_shipping_category" class="alpha four columns">
+      <div data-hook="new_product_shipping_category" class="alpha field four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree::ShippingCategory.
                 model_name.human, class: 'required' %><br />
@@ -57,6 +57,14 @@
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>
+
+      <div data-hook="new_product_tax_category" class="field four columns">
+        <%= f.field_container :tax_category do %>
+          <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
+          <%= f.error_message_on :tax_category %>
+        <% end %>
+      </div>
     </div>
 
     <div class="clearfix" data-hook="product-from-prototype" id="product-from-prototype">

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

@@ -79,7 +79,7 @@
     <thead data-hook="customer_return_header">
       <tr>
         <th><%= Spree.t(:description) %></th>
-        <th><%= Spree::ReimbursementCredit.human_attribute_name(:amount) %></th>
+        <th><%= Spree::Reimbursement::Credit.human_attribute_name(:amount) %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/spree/admin/search/products.rabl

@@ -3,7 +3,7 @@ node(:count) { @products.count }
 node(:total_count) { @products.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
-node(:pages) { @products.num_pages }
+node(:pages) { @products.total_pages }
 child(@products => :products) do
   attributes :id, :name
 end

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

@@ -14,6 +14,9 @@
       <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
         <%= link_to_with_icon 'th-large', Spree::Variant.model_name.human(count: :other),  spree.admin_product_variants_url(@product) %>
       <% end if can?(:admin, Spree::Variant) %>
+      <%= content_tag :li, :class => ('active' if current == 'Prices') do %>
+        <%= link_to_with_icon 'money', Spree::Price.model_name.human(count: :other),  spree.admin_product_prices_url(@product) %>
+      <% end if can?(:admin, Spree::Price) %>
       <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
         <%= link_to_with_icon 'tasks', Spree::ProductProperty.model_name.human(count: :other), spree.admin_product_product_properties_url(@product) %>
       <% end if can?(:admin, Spree::ProductProperty) %>

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

@@ -0,0 +1,12 @@
+<div data-hook="admin_<%= model_name %>_form_generate_vat_prices" class="<%= wrapper_class %> checkbox">
+  <%= form.label :rebuild_vat_prices do %>
+    <%= form.check_box :rebuild_vat_prices, checked: form.object.prices.size <= 1 %>
+    <%= Spree::Variant.human_attribute_name(:rebuild_vat_prices) %>
+  <% end %>
+</div>
+
+<script type="text/javascript">
+  $('#<%= model_name %>_price').on('change', function(e) {
+    $('#<%= model_name %>_rebuild_vat_prices').prop('checked', true);
+  });
+</script>

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

@@ -21,6 +21,6 @@
   <% end %>
 
   <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>
-    <%= tab :shipping, url: admin_shipping_methods_path %>
+    <%= tab :shipping, url: admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
   <% end %>
 </ul>

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

@@ -25,7 +25,11 @@
 <% end %>
 
 <% if can? :admin, Spree::StockItem %>
-  <%= tab(*Spree::BackendConfiguration::STOCK_TABS, url: spree.admin_stock_items_path, label: :stock, icon: 'cubes', match_path: %r(^/admin/stock)) do %>
+  <%= tab(
+    *Spree::BackendConfiguration::STOCK_TABS,
+    url: spree.admin_stock_items_path,
+    label: :stock, icon: 'cubes',
+    match_path: %r(^/admin/stock(?!_locations))) do %>
     <%- render partial: 'spree/admin/shared/stock_sub_menu' %>
   <%- end %>
 <% end %>

data/app/views/spree/admin/store_credits/edit_amount.html.erb

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :store_credits } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_edit"), admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
 <% end %>

data/app/views/spree/admin/store_credits/edit_validity.html.erb

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :store_credits } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_edit"), admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
 <% end %>

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

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :store_credits } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_user_list"), admin_users_path, class: 'button' %></li>
   <% if can?(:create, Spree::StoreCredit) %>

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

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :store_credits } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_store_credit_list"), admin_user_store_credits_path(@user), class: 'button' %></li>
 <% end %>

data/app/views/spree/admin/store_credits/show.html.erb

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :store_credits } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_store_credit_list"), admin_user_store_credits_path(@user), class: 'button' %></li>
   <% if @store_credit.editable? && can?(:edit, @store_credit) %>

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

@@ -1,37 +1,10 @@
 <% content_for :sidebar_title do %>
-  <%= Spree.t(:"admin.user.user_information") %>
+  <%= Spree.t(:lifetime_stats) %>
 <% end %>
 
 <% content_for :sidebar do %>
   <nav class="menu">
-    <ul data-hook="admin_user_tab_options">
-      <li<%== ' class="active"' if current == :account %>>
-        <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
-      </li>
-      <% if can?(:addresses, @user) %>
-        <li<%== ' class="active"' if current == :address %>>
-          <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
-        </li>
-      <% end %>
-      <% if can?(:orders, @user) %>
-        <li<%== ' class="active"' if current == :orders %>>
-          <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), spree.orders_admin_user_path(@user) %>
-        </li>
-      <% end %>
-      <% if can?(:items, @user) %>
-        <li<%== ' class="active"' if current == :items %>>
-          <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
-        </li>
-      <% end %>
-      <% if can?(:display, Spree::StoreCredit) %>
-        <li<%== ' class="active"' if current == :store_credits %>>
-          <%= link_to_with_icon 'money', Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
-        </li>
-      <% end %>
-    </ul>
-
-    <fieldset data-hook="admin_user_lifetime_stats">
-      <legend><%= Spree.t(:lifetime_stats) %></legend>
+    <fieldset class='no-border-top' data-hook="admin_user_lifetime_stats">
       <dl id="user-lifetime-stats">
         <dt><%= Spree.t(:total_sales) %>:</dt>
           <dd><%= @user.display_lifetime_value.to_html %></dd>

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

@@ -0,0 +1,29 @@
+<% content_for :tabs do %>
+  <nav>
+    <ul class='tabs' data-hook="admin_user_tab_options">
+      <li<%== ' class="active"' if current == :account %>>
+        <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
+      </li>
+      <% if can?(:addresses, @user) %>
+        <li<%== ' class="active"' if current == :address %>>
+          <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
+        </li>
+      <% end %>
+      <% if can?(:orders, @user) %>
+        <li<%== ' class="active"' if current == :orders %>>
+          <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.order_history"), spree.orders_admin_user_path(@user) %>
+        </li>
+      <% end %>
+      <% if can?(:items, @user) %>
+        <li<%== ' class="active"' if current == :items %>>
+          <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
+        </li>
+      <% end %>
+      <% if can?(:display, Spree::StoreCredit) %>
+        <li<%== ' class="active"' if current == :store_credits %>>
+          <%= link_to_with_icon 'money', Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
+        </li>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

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

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :address } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :address %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses" class="alpha twelve columns">

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

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :account } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :account %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_edit_general_settings" class="alpha twelve columns">

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

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:"admin.user.items_purchased")} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :items } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :items %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_items_purchased" class="alpha twelve columns">

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

@@ -2,7 +2,8 @@
   <%= link_to "#{Spree.t(:"admin.user.order_history")} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :orders } %>
+<%= render 'spree/admin/users/sidebar' %>
+<%= render 'spree/admin/users/tabs', current: :orders %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_order_history" class="alpha twelve columns">

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

@@ -53,6 +53,10 @@
       <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'fullwidth' %>
     </div>
 
+    <% if show_rebuild_vat_checkbox? %>
+      <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "variant", wrapper_class: "field four columns" %>
+    <% end %>
+
     <div class="field four columns" data-hook="cost_price">
       <%= f.label :cost_price %>
       <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'fullwidth' %>

data/config/routes.rb

@@ -50,6 +50,7 @@ Spree::Core::Engine.add_routes do
         end
       end
       resources :variants_including_master, only: [:update]
+      resources :prices, only: [:destroy, :index, :edit, :update, :new, :create]
     end
     get '/products/:product_slug/stock', to: "stock_items#index", as: :product_stock
 

data/spec/controllers/spree/admin/prices_controller_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Spree::Admin::PricesController do
+  stub_authorization!
+
+  let!(:product) { create(:product) }
+
+  describe '#index' do
+    context "when only given a product" do
+      let(:product) { create(:product) }
+
+      subject { spree_get :index, product_id: product.slug }
+
+      it { is_expected.to be_success }
+
+      it 'assigns usable instance variables' do
+        subject
+        expect(assigns(:search)).to be_a(Ransack::Search)
+        expect(assigns(:prices)).to eq(product.prices)
+        expect(assigns(:product)).to eq(product)
+      end
+    end
+
+    context "when given a product and a variant" do
+      let(:variant) { create(:variant) }
+      let(:product) { variant.product }
+
+      subject { spree_get :index, product_id: product.slug, variant_id: variant.id }
+
+      it { is_expected.to be_success }
+
+      it 'assigns usable instance variables' do
+        subject
+        expect(assigns(:search)).to be_a(Ransack::Search)
+        expect(assigns(:prices)).to eq(product.prices)
+        expect(assigns(:prices)).to include(variant.default_price)
+        expect(assigns(:product)).to eq(product)
+      end
+    end
+  end
+end

data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb

@@ -97,6 +97,18 @@ module Spree
           expect(assigns(:stock_transfer).created_by).to eq(user)
         end
       end
+
+      # Regression spec for Solidus issue #1087
+      context "missing source_stock_location parameter" do
+        subject do
+          spree_post :create, stock_transfer: { source_location_id: nil, description: nil }
+        end
+
+        it "sets a flash error" do
+          subject
+          expect(flash[:error]).to eq assigns(:stock_transfer).errors.full_messages.join(', ')
+        end
+      end
     end
 
     context "#receive" do

data/spec/features/admin/orders/payments_spec.rb

@@ -223,4 +223,25 @@ describe 'Payments', type: :feature do
       end
     end
   end
+
+  # Previously this would fail unless the method was named "Credit Card"
+  context "with an differently named payment method" do
+    let(:order) { create(:order_with_line_items, line_items_count: 1) }
+    let!(:chequing_payment_method) { create(:check_payment_method) }
+    let!(:payment_method) { create(:credit_card_payment_method, name: "Multipass!") }
+
+    before do
+      visit spree.admin_order_payments_path(order.reload)
+    end
+
+    it "is able to create a new payment", js: true do
+      choose payment_method.name
+      fill_in "Card Number", with: "4111 1111 1111 1111"
+      fill_in "Name", with: "Test User"
+      fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+      fill_in "Card Code", with: "007"
+      click_button "Continue"
+      expect(page).to have_content("Payment has been successfully created!")
+    end
+  end
 end

data/spec/features/admin/products/pricing_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe 'Pricing' do
+  stub_authorization!
+
+  let(:product) { create(:product) }
+
+  before do
+    visit spree.edit_admin_product_path(product)
+  end
+
+  it 'has a Prices tab' do
+    within(".tabs") do
+      expect(page).to have_link("Prices")
+    end
+  end
+
+  context "in the prices tab" do
+    let!(:country) { create :country, iso: "DE" }
+    let(:master_price) { product.master.default_price }
+    let!(:other_price) { product.master.prices.create(amount: 34.56, currency: "RUB", country_iso: "DE") }
+
+    before do
+      visit spree.admin_product_prices_path(product)
+    end
+
+    it 'displays a table with the prices' do
+      expect(page).to have_content(product.name)
+      within(".tabs .active") do
+        expect(page).to have_content("Prices")
+      end
+
+      within('table.prices') do
+        expect(page).to have_content("$19.99")
+        expect(page).to have_content("USD")
+        expect(page).to have_content("34.56 ₽")
+        expect(page).to have_content("RUB")
+        expect(page).to have_content("Master")
+        expect(page).to have_content("Any Country")
+        expect(page).to have_content("Germany")
+      end
+    end
+
+    context "searching" do
+      let(:variant) { create(:variant, price: 20) }
+      let(:product) { variant.product }
+
+      before do
+        product.master.update(price: 49.99)
+      end
+
+      it 'has a working table filter' do
+        expect(page).to have_selector("#table-filter")
+        within "#table-filter" do
+          within "fieldset legend" do
+            expect(page).to have_content("Search")
+          end
+        end
+        select variant.options_text, from: "q_variant_id_eq"
+        click_button "Filter Results"
+        expect(page).to have_content("20")
+        expect(page).to_not have_content("49.99")
+      end
+    end
+
+    context "deleting", js: true do
+      let(:product) { create(:product, price: 65.43) }
+      let!(:variant) { product.master }
+      let!(:other_price) { product.master.prices.create(amount: 34.56, currency: "EUR") }
+
+      it "will delete the non-default price" do
+        within "#spree_price_#{other_price.id}" do
+          accept_alert do
+            click_icon :trash
+          end
+        end
+        expect(page).to have_content("Price has been successfully removed")
+      end
+
+      it "does not break when default price is deleted" do
+        within "#spree_price_#{variant.default_price.id}" do
+          accept_alert do
+            click_icon :trash
+          end
+        end
+        expect(page).to have_content("Price has been successfully removed")
+        visit spree.admin_products_path
+        expect(page).to have_selector("#spree_product_#{product.id}")
+      end
+    end
+  end
+end

data/spec/features/admin/reimbursements_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'Promotions', type: :feature do
+  stub_authorization!
+  let!(:reimbursement) { create(:reimbursement) }
+
+  it "should display the reimbursements table" do
+    visit spree.admin_order_reimbursement_path(reimbursement.order, reimbursement)
+    expect(page).to have_css('table thead tr th', text: 'Product')
+    expect(page).to have_css('table thead tr th', text: 'Preferred Reimbursement Type')
+    expect(page).to have_css('table thead tr th', text: 'Reimbursement Type Override')
+    expect(page).to have_css('table thead tr th', text: 'Exchange for')
+    expect(page).to have_css('table thead tr th', text: 'Amount Before Sales Tax')
+    expect(page).to have_css('table thead tr th', text: 'Total')
+  end
+end

data/spec/features/admin/stock_transfer_spec.rb

@@ -30,6 +30,17 @@ describe 'Stock Transfers', type: :feature, js: true do
       expect(page).to have_content('Stock Transfer has been successfully updated')
       expect(page).to have_content("NY")
     end
+
+    # Regression spec for Solidus issue #1087
+    it 'displays an error if no source location is selected' do
+      create(:stock_location_with_items, name: 'NY')
+      create(:stock_location, name: 'SF')
+      visit spree.new_admin_stock_transfer_path
+      fill_in 'stock_transfer_description', with: description
+      click_button 'Continue'
+
+      expect(page).to have_content("Source location can't be blank")
+    end
   end
 
   describe 'view a stock transfer' do

data/spec/features/admin/users_spec.rb

@@ -41,7 +41,7 @@ describe 'Users', type: :feature do
     end
 
     it 'can navigate to the order history' do
-      expect(page).to have_link Spree.t(:"admin.user.orders"), href: spree.orders_admin_user_path(user_a)
+      expect(page).to have_link Spree.t(:"admin.user.order_history"), href: spree.orders_admin_user_path(user_a)
     end
 
     it 'can navigate to the items purchased' do
@@ -201,7 +201,7 @@ describe 'Users', type: :feature do
     before do
       orders
       click_link user_a.email
-      within("#sidebar") { click_link Spree.t(:"admin.user.orders") }
+      within(".tabs") { click_link Spree.t(:"admin.user.order_history") }
     end
 
     it_behaves_like 'a user page'
@@ -231,7 +231,7 @@ describe 'Users', type: :feature do
     before do
       orders
       click_link user_a.email
-      within("#sidebar") { click_link Spree.t(:"admin.user.items") }
+      within(".tabs") { click_link Spree.t(:"admin.user.items") }
     end
 
     it_behaves_like 'a user page'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta1
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta1
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta1
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta1
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta1
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +300,7 @@ files:
 - app/controllers/spree/admin/orders_controller.rb
 - app/controllers/spree/admin/payment_methods_controller.rb
 - app/controllers/spree/admin/payments_controller.rb
+- app/controllers/spree/admin/prices_controller.rb
 - app/controllers/spree/admin/product_properties_controller.rb
 - app/controllers/spree/admin/products_controller.rb
 - app/controllers/spree/admin/promotion_actions_controller.rb
@@ -440,6 +441,12 @@ files:
 - app/views/spree/admin/payments/source_views/_check.html.erb
 - app/views/spree/admin/payments/source_views/_gateway.html.erb
 - app/views/spree/admin/payments/source_views/_storecredit.html.erb
+- app/views/spree/admin/prices/_form.html.erb
+- app/views/spree/admin/prices/_table.html.erb
+- app/views/spree/admin/prices/edit.html.erb
+- app/views/spree/admin/prices/index.html.erb
+- app/views/spree/admin/prices/new.html.erb
+- app/views/spree/admin/prices/new.js.erb
 - app/views/spree/admin/product_properties/_product_property_fields.html.erb
 - app/views/spree/admin/product_properties/index.html.erb
 - app/views/spree/admin/products/_form.html.erb
@@ -547,6 +554,7 @@ files:
 - app/views/spree/admin/shared/_product_sub_menu.html.erb
 - app/views/spree/admin/shared/_product_tabs.html.erb
 - app/views/spree/admin/shared/_promotion_sub_menu.html.erb
+- app/views/spree/admin/shared/_rebuild_vat_prices_checkbox.html.erb
 - app/views/spree/admin/shared/_refunds.html.erb
 - app/views/spree/admin/shared/_report_criteria.html.erb
 - app/views/spree/admin/shared/_report_order_criteria.html.erb
@@ -647,6 +655,7 @@ files:
 - app/views/spree/admin/users/_addresses_form.html.erb
 - app/views/spree/admin/users/_form.html.erb
 - app/views/spree/admin/users/_sidebar.html.erb
+- app/views/spree/admin/users/_tabs.html.erb
 - app/views/spree/admin/users/_user_page_actions.html.erb
 - app/views/spree/admin/users/addresses.html.erb
 - app/views/spree/admin/users/edit.html.erb
@@ -690,6 +699,7 @@ files:
 - spec/controllers/spree/admin/orders_controller_spec.rb
 - spec/controllers/spree/admin/payment_methods_controller_spec.rb
 - spec/controllers/spree/admin/payments_controller_spec.rb
+- spec/controllers/spree/admin/prices_controller_spec.rb
 - spec/controllers/spree/admin/product_properties_controller_spec.rb
 - spec/controllers/spree/admin/products_controller_spec.rb
 - spec/controllers/spree/admin/promotion_actions_controller_spec.rb
@@ -743,6 +753,7 @@ files:
 - spec/features/admin/products/edit/taxons_spec.rb
 - spec/features/admin/products/edit/variants_spec.rb
 - spec/features/admin/products/option_types_spec.rb
+- spec/features/admin/products/pricing_spec.rb
 - spec/features/admin/products/products_spec.rb
 - spec/features/admin/products/properties_spec.rb
 - spec/features/admin/products/prototypes_spec.rb
@@ -752,6 +763,7 @@ files:
 - spec/features/admin/promotions/option_value_rule_spec.rb
 - spec/features/admin/promotions/tiered_calculator_spec.rb
 - spec/features/admin/promotions/user_rule_spec.rb
+- spec/features/admin/reimbursements_spec.rb
 - spec/features/admin/reports_spec.rb
 - spec/features/admin/stock_transfer_spec.rb
 - spec/features/admin/store_credits_spec.rb