solidus_backend 2.6.6 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b29c685193a459549259bdd7b3fee86aeb04f2189afe2f94fd11802255d8673a
-  data.tar.gz: ff69799de1b9f303a28c2093944115f9a368c06ea616b8174e7319276ae330a9
+SHA1:
+  metadata.gz: 766f093633c7ee34052a03fc7868087e727abc2f
+  data.tar.gz: c3126331f8662dae7b5f6b4bfe044607627286c5
 SHA512:
-  metadata.gz: 496416fb3e34b7f038bbc3afba42246ea20176a0d573b44ef88b225d70f29859ee04de60139de17cac78dbb2e7e71be049d50a682ff0994d4f3dd2a2f21c9234
-  data.tar.gz: 9030cde904f2e3681d884998fa11df1882929ede1099cd3c3a76e4bd4d521c2a5156d649115210d4c5a9bb602aeee000b351c41b04491c5e86454843d6d43e43
+  metadata.gz: '058e7d17f55becb37f3c0209cbe7ce3a1acca7448d22b21babbdc3008d1a24d7f53686056da7fc3abc07846cae1f6fbd9c16b36e4cde644cfd39a5928981bd59'
+  data.tar.gz: 0eb8578b917cdf6278fe214cfb313fc3ba4d8d0b1bec0e50214374bd11f7554c00e7fa551ad2a44c287e6e067f01f000dd4c4dce472a0a5454f942f2a4683210

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

@@ -22,6 +22,7 @@
 //= require spree/backend/collections
 //= require spree/backend/views
 //
+//= require spree/backend/addresses
 //= require spree/backend/adjustments
 //= require spree/backend/admin
 //= require spree/backend/calculator
@@ -52,7 +53,6 @@
 //= require spree/backend/routes
 //= require spree/backend/shipments
 //= require spree/backend/spree-select2
-//= require spree/backend/stock_location
 //= require spree/backend/stock_management
 //= require spree/backend/store_credits
 //= require spree/backend/style_guide

data/app/assets/javascripts/spree/backend/{stock_location.js → addresses.js}

@@ -3,7 +3,7 @@
 Spree.ready(function() {
   "use strict";
 
-  _.each(document.querySelectorAll('.js-stock-locations-form'), function(el) {
+  _.each(document.querySelectorAll('.js-addresses-form'), function(el) {
     var countrySelect = el.querySelector('.js-country_id');
     var model = new Backbone.Model({
       country_id: countrySelect.value

data/app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs

@@ -13,8 +13,10 @@
         <a href="#" class="js-taxon-delete fa fa-trash icon_link no-text"></a>
       </div>
     </div>
+    {{#if taxons }}
     <ul>
       {{> taxons/_tree }}
     </ul>
+    {{/if}}
   </li>
 {{/each}}

data/app/assets/stylesheets/spree/backend/globals/_functions.scss

@@ -1,5 +1,5 @@
 // Make color very close to white
-@function very-light($color, $adjust: 3){
+@function very-light($color, $adjust: 3){  
   @if type-of($adjust) == 'number' and $adjust > 0 {
     @for $i from 0 through 100 {
       @if lighten($color, $i) == white and ($i - $adjust) > $adjust {
@@ -10,7 +10,6 @@
   @else {
     @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'"
   }
-  @return $color;
 };
 
 // Quick fix for dynamic variables missing in SASS

data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss

@@ -11,15 +11,13 @@
     margin-bottom: 1.5em;
   }
 
-  .taxon {
-    border-radius: $border-radius;
-  }
-
   .taxon {
     background-color: very-light($color-3);
     border: 1px solid $color-border;
+    border-radius: $border-radius;
     color: $body-color;
     font-weight: $font-weight-bold;
+    margin: 5px 0;
     padding: 0.5em;
 
     &.sortable {

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

@@ -140,7 +140,7 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order, true).deliver_later
+        Spree::Config.order_mailer_class.confirm_email(@order, true).deliver_later
         flash[:success] = t('spree.order_email_resent')
 
         redirect_to(spree.edit_admin_order_path(@order))

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

@@ -67,10 +67,11 @@ module Spree
       end
 
       def validate_payment_method_type
-        requested_type = params[:payment_method].delete(:type)
+        requested_type = params[:payment_method][:type]
         @payment_method_type = @payment_method_types.detect do |klass|
           klass.name == requested_type
         end
+
         if !@payment_method_type
           flash[:error] = t('spree.invalid_payment_method_type')
           redirect_to new_admin_payment_method_path

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

@@ -14,7 +14,11 @@ module Spree
           if report_description_key.nil?
             report_description_key = "#{report_key}_description"
           end
-          @@available_reports[report_key] = { name: I18n.t(report_key, scope: 'spree'), description: I18n.t(report_description_key, scope: 'spree') }
+
+          @@available_reports[report_key] = {
+            name: report_key,
+            description: report_description_key,
+          }
         end
       end
 

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

@@ -10,9 +10,18 @@ module Spree
       update.fails  :load_form_data
 
       def fire
-        @return_authorization.send("#{params[:e]}!")
+        action_from_params = "#{params[:e]}!"
+
+        if @return_authorization.state_events.include?(params[:e].to_sym) &&
+           @return_authorization.send(action_from_params)
+
+          flash_message = { success: t('spree.return_authorization_updated') }
+        else
+          flash_message = { error: t('spree.return_authorization_fire_error') }
+        end
+
         redirect_back(fallback_location: admin_order_return_authorizations_path(@order),
-                    flash: { success: t('spree.return_authorization_updated') })
+                      flash: flash_message)
       end
 
       private

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

@@ -103,11 +103,11 @@ module Spree
         return @collection if @collection
         if request.xhr? && params[:q].present?
           @collection = Spree.user_class.includes(:bill_address, :ship_address)
-                            .where("spree_users.email #{LIKE} :search
-                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)
-                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)",
+                            .where("#{Spree.user_class.table_name}.email #{LIKE} :search
+                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.bill_address_id)
+                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.bill_address_id)
+                                   OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.ship_address_id)
+                                   OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = #{Spree.user_class.table_name}.ship_address_id)",
                                   { search: "#{params[:q].strip}%" })
                             .limit(params[:limit] || 100)
         else

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

@@ -50,7 +50,12 @@
       <tr class="show-tracking total">
         <td colspan="5">
           <% if carton.tracking.present? %>
-            <strong><%= Spree::Carton.human_attribute_name(:tracking) %>:</strong> <%= carton.tracking %>
+            <strong><%= Spree::Carton.human_attribute_name(:tracking) %>:</strong>
+            <% if carton.tracking_url %>
+              <%= link_to carton.tracking, carton.tracking_url, target: "_blank" %>
+            <% else %>
+              <%= carton.tracking %>
+            <% end %>
           <% else %>
             <i><%= t('spree.no_tracking_present') %></i>
           <% end %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -7,7 +7,7 @@
       <div class="col-9">
         <div class="field">
           <%= f.label :email %>
-          <%= f.email_field :email, class: 'fullwidth' %>
+          <%= f.email_field :email, required: true, class: 'fullwidth' %>
         </div>
       </div>
       <div class="col-3">

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

@@ -19,12 +19,6 @@
         <%= t('.multiple_codes') %>
       </label>
     </div>
-    <div class="form-check">
-      <label class="form-check-label">
-        <%= radio_button_tag('activation_type', 'path', activation_type == 'path') %>
-        <%= t('.path') %>
-      </label>
-    </div>
   </div>
   <div class="col-9">
     <input name="promotion[apply_automatically]" type="hidden" value="0">
@@ -60,11 +54,5 @@
       <% end %>
     </div>
 
-    <div data-activation-type="path">
-      <div class="field" id="promotion_path_field">
-        <%= f.label :path, class: "required" %>
-        <%= f.text_field :path, class: "fullwidth", required: true %>
-      </div>
-    </div>
   </div>
 </div>

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

@@ -5,21 +5,12 @@
   <div class="row">
     <div id="general_fields" class="col-9">
       <div class="row">
-        <div class="col-3">
+        <div class="col-12">
           <%= f.field_container :name do %>
             <%= f.label :name, class: 'required' %>
             <%= f.text_field :name, class: 'fullwidth', required: true %>
           <% end %>
 
-          <%= f.field_container :advertise do %>
-            <label>
-              <%= f.check_box :advertise %>
-              <%= Spree::Promotion.human_attribute_name :advertise %>
-            </label>
-          <% end %>
-        </div>
-
-        <div class="col-9">
           <%= f.field_container :description do %>
             <%= f.label :description %><br />
             <%= f.text_area :description, rows: 7, class: 'fullwidth' %>

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

@@ -11,8 +11,8 @@
   <tbody>
     <% @reports.each do |key, value| %>
     <tr data-hook="reports_row">
-      <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
-      <td><%= value[:description] %></td>
+      <td><%= link_to t(value[:name], scope: 'spree'), send("#{key}_admin_reports_url".to_sym) %></td>
+      <td><%= t(value[:description], scope: 'spree') %></td>
     </tr>
     <% end %>
   </tbody>

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

@@ -6,9 +6,16 @@
 <% if try_spree_current_user %>
   <ul id="login-nav" class="admin-login-nav">
     <li data-hook="user-account-link">
-      <%= link_to spree.polymorphic_path([:edit, :admin, try_spree_current_user]) do %>
-        <i class='fa fa-user'></i>
-        <%= try_spree_current_user.email %>
+      <% if can?(:admin, try_spree_current_user) %>
+        <%= link_to spree.edit_admin_user_path(try_spree_current_user) do %>
+          <i class='fa fa-user'></i>
+          <%= try_spree_current_user.email %>
+        <% end %>
+      <% else %>
+        <a>
+          <i class='fa fa-user'></i>
+          <%= try_spree_current_user.email %>
+        </a>
       <% end %>
     </li>
 

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

@@ -48,7 +48,7 @@
 
     <% if can? :display, Spree::CustomerReturn %>
       <% if @order.completed? %>
-        <li class="<%= "active" if current == "Customer Returns" %>">
+        <li class="<%= "active" if current == "Customer Returns" %>" data-hook='admin_order_tabs_customer_returns'>
           <%= link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order) %>
         </li>
       <% end %>

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

@@ -1,4 +1,4 @@
-<div data-hook="admin_stock_locations_form_fields" class="js-stock-locations-form">
+<div data-hook="admin_stock_locations_form_fields" class="js-addresses-form">
   <fieldset class="no-border-bottom">
     <legend><%= t('.general') %></legend>
 

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

@@ -1,6 +1,6 @@
 <div class="row">
-    
-  <div data-hook="bill_address_wrapper" class="col-6">
+
+  <div data-hook="bill_address_wrapper" class="col-6 js-addresses-form">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= t('spree.billing_address') %></legend>
       <%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
@@ -9,7 +9,7 @@
     </fieldset>
   </div>
 
-  <div data-hook="ship_address_wrapper" class="col-6">
+  <div data-hook="ship_address_wrapper" class="col-6 js-addresses-form">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= t('spree.shipping_address') %></legend>
       <%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>

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

@@ -10,9 +10,9 @@ module Spree
   describe Admin::PaymentMethodsController, type: :controller do
     stub_authorization!
 
-    context "GatewayWithPassword" do
-      let(:payment_method) { GatewayWithPassword.create!(name: "Bogus", preferred_password: "haxme") }
+    let(:payment_method) { GatewayWithPassword.create!(name: "Bogus", preferred_password: "haxme") }
 
+    context "GatewayWithPassword" do
       before do
         allow(Rails.application.config.spree).to receive(:payment_methods).and_return([GatewayWithPassword])
       end
@@ -52,7 +52,7 @@ module Spree
       expect(response).to redirect_to spree.new_admin_payment_method_path
     end
 
-    describe "GET index" do
+    describe "#index" do
       subject { get :index }
 
       let!(:first_method) { GatewayWithPassword.create! name: "First", preferred_password: "1235" }
@@ -70,5 +70,26 @@ module Spree
         expect(assigns(:payment_methods).to_a).to eql([second_method, first_method])
       end
     end
+
+    describe "#update" do
+      # Regression test for https://github.com/solidusio/solidus/issues/2789
+      let(:params) do
+        {
+          id: payment_method.id,
+          payment_method: {
+            name: 'Check',
+            type: 'Spree::PaymentMethod::Check'
+          }
+        }
+      end
+
+      it 'updates the resource' do
+        put :update, params: params
+
+        expect(response).to redirect_to(spree.edit_admin_payment_method_path(payment_method))
+        response_payment_method = Spree::PaymentMethod.find(payment_method.id)
+        expect(response_payment_method.name).to eql('Check')
+      end
+    end
   end
 end

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

@@ -9,24 +9,16 @@ describe Spree::Admin::ReportsController, type: :controller do
     it 'should contain sales_total' do
       expect(Spree::Admin::ReportsController.available_reports.keys.include?(:sales_total)).to be true
     end
-
-    it 'should have the proper sales total report description' do
-      expect(Spree::Admin::ReportsController.available_reports[:sales_total][:description]).to eql('Sales Total For All Orders')
-    end
   end
 
   describe 'ReportsController.add_available_report!' do
     context 'when adding the report name' do
       it 'should contain the report' do
-        I18n.backend.store_translations(:en, spree: {
-          some_report: 'Awesome Report',
-          some_report_description: 'This report is great!'
-        })
         Spree::Admin::ReportsController.add_available_report!(:some_report)
         expect(Spree::Admin::ReportsController.available_reports.keys.include?(:some_report)).to be true
         expect(Spree::Admin::ReportsController.available_reports[:some_report]).to eq(
-          name: 'Awesome Report',
-          description: 'This report is great!'
+          name: :some_report,
+          description: 'some_report_description'
         )
       end
     end

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

@@ -12,6 +12,55 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
   let(:inventory_unit_2) { order.inventory_units.order('id asc')[1] }
   let(:inventory_unit_3) { order.inventory_units.order('id asc')[2] }
 
+  describe '#fire' do
+    let(:return_authorization) { create(:return_authorization, order: order) }
+
+    context 'with the event parameter set' do
+      let(:params) do
+        {
+          id: return_authorization.to_param,
+          order_id: return_authorization.order.to_param,
+          e: event,
+        }
+      end
+
+      context 'when event method exists on return authorization' do
+        let(:event) { 'cancel' }
+
+        it 'sends method with ! to return authorization and redirect back' do
+          get :fire, params: params
+
+          expect(response).to redirect_to(admin_order_return_authorizations_path(order))
+          expect(flash[:success]).to eq 'Return merchandise authorization updated'
+        end
+      end
+
+      context 'when event method does not exist on return authorization' do
+        let(:event) { 'do_something_crazy' }
+
+        it 'redirects back with an error message' do
+          get :fire, params: params
+
+          expect(response).to redirect_to(admin_order_return_authorizations_path(order))
+          expect(flash[:error]).to eq 'Cannot perform this action on return merchandise authorization'
+        end
+      end
+
+      context 'when event method exists but it is not a state machine event' do
+        let(:event) { 'destroy' }
+
+        it 'redirects back with an error message' do
+          expect(return_authorization).not_to receive :destroy!
+
+          get :fire, params: params
+
+          expect(response).to redirect_to(admin_order_return_authorizations_path(order))
+          expect(flash[:error]).to eq 'Cannot perform this action on return merchandise authorization'
+        end
+      end
+    end
+  end
+
   describe "#load_return_reasons" do
     let!(:inactive_rma_reason) { create(:return_reason, active: false) }
 

data/spec/features/admin/promotion_adjustments_spec.rb

@@ -180,20 +180,6 @@ describe "Promotion Adjustments", type: :feature, js: true do
       expect(promotion.rules).to be_blank
     end
 
-    it "should allow an admin to create a promo requiring a landing page to be visited" do
-      fill_in "Name", with: "SAVE SAVE SAVE"
-      choose "URL Path"
-      fill_in "Path", with: "content/cvv"
-      click_button "Create"
-      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
-
-      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
-      expect(promotion.path).to eq("content/cvv")
-      expect(promotion).not_to be_apply_automatically
-      expect(promotion.codes).to be_empty
-      expect(promotion.rules).to be_blank
-    end
-
     it "should allow an admin to create a promo with generated codes" do
       fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Multiple promotion codes"

data/spec/views/spree/admin/shared/navigation_footer_spec.rb

@@ -4,8 +4,10 @@ require 'spec_helper'
 
 describe "spree/admin/shared/_navigation_footer", type: :view do
   let(:user) { FactoryBot.build_stubbed(:admin_user) }
+  let(:ability) { Object.new.extend(CanCan::Ability) }
   before do
     allow(view).to receive(:try_spree_current_user).and_return(user)
+    allow(controller).to receive(:current_ability).and_return(ability)
   end
 
   it "has a a login-nav section" do
@@ -13,9 +15,32 @@ describe "spree/admin/shared/_navigation_footer", type: :view do
     expect(rendered).to have_selector("#login-nav")
   end
 
-  it "has a user-account-link" do
-    render
-    expect(rendered).to have_link(user.email, href: Spree::Core::Engine.routes.url_helpers.edit_admin_user_path(user))
+  context "authorized user" do
+    before do
+      ability.can :admin, user
+    end
+
+    it "has a user-account-link that links to edit_admin_user_path" do
+      render
+      expect(rendered).to have_link(user.email, href: Spree::Core::Engine.routes.url_helpers.edit_admin_user_path(user))
+    end
+
+    it "has not a user-account-link that links to admin_path" do
+      render
+      expect(rendered).to_not have_link(user.email, href: Spree::Core::Engine.routes.url_helpers.admin_path)
+    end
+  end
+
+  context "unauthorized user" do
+    it "has a user-account-link that links to admin_path" do
+      render
+      expect(rendered).to_not have_link(user.email, href: Spree::Core::Engine.routes.url_helpers.admin_path)
+    end
+
+    it "has not a user-account-link that links to edit_admin_user_path" do
+      render
+      expect(rendered).to_not have_link(user.email, href: Spree::Core::Engine.routes.url_helpers.edit_admin_user_path(user))
+    end
   end
 
   context "with a required spree_logout_path helper" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.7.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.6
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.6
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.6
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.6
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +176,7 @@ files:
 - app/assets/config/solidus_backend_manifest.js
 - app/assets/images/solidus-style-guide-logo.png
 - app/assets/javascripts/spree/backend.js
+- app/assets/javascripts/spree/backend/addresses.js
 - app/assets/javascripts/spree/backend/adjustments.js
 - app/assets/javascripts/spree/backend/admin.js
 - app/assets/javascripts/spree/backend/backbone-overrides.js
@@ -225,7 +226,6 @@ files:
 - app/assets/javascripts/spree/backend/routes.js
 - app/assets/javascripts/spree/backend/shipments.js
 - app/assets/javascripts/spree/backend/spree-select2.js
-- app/assets/javascripts/spree/backend/stock_location.js
 - app/assets/javascripts/spree/backend/stock_management.js
 - app/assets/javascripts/spree/backend/store_credits.js
 - app/assets/javascripts/spree/backend/style_guide.js
@@ -993,7 +993,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.