solidus_backend 2.7.4 → 2.8.0

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

@@ -0,0 +1,18 @@
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
+
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::StoreCreditReason), spree.admin_store_credit_reasons_path) %>
+<% admin_breadcrumb(t('spree.new_store_credit_reason')) %>
+
+<% content_for :page_actions do %>
+<% end %>
+
+<%= render partial: 'spree/shared/error_messages', locals: { target: @object } %>
+
+<%= form_for [:admin, @object] do |f| %>
+  <fieldset class='no-border-top'>
+    <%= render partial: 'spree/admin/store_credit_reasons/shared/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,15 @@
+<div data-hook='admin_named_type_form_fields' class='row'>
+  <div class='col-3'>
+    <%= f.field_container :name do %>
+      <%= f.label :name, class: 'required' %><br />
+      <%= f.text_field :name, class: 'fullwidth' %>
+    <% end %>
+
+    <div class='checkbox'>
+      <label>
+        <%= f.check_box :active %>
+        <%= t('spree.active') %>
+      </label>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<%= f.field_container :reason do %>
+  <%= f.label :store_credit_reason, t('spree.reason'), class: 'required' %>
+  <%= select_tag :store_credit_reason_id, options_from_collection_for_select(@store_credit_reasons, :id, :name),
+    include_blank: t('spree.choose_reason'), class: 'custom-select fullwidth',
+    placeholder: t('spree.admin.store_credits.select_amount_store_credit_reason') %>
+  <%= f.error_message_on :store_credit_reason %>
+<% end %>

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

@@ -23,7 +23,7 @@
         <% end %>
       </div>
       <div class="col-6">
-        <%= render 'update_reason_field', f: f %>
+        <%= render 'store_credit_reason_field', f: f %>
       </div>
     </div>
     <%= render 'spree/admin/shared/edit_resource_links',

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

@@ -15,7 +15,7 @@
     <legend align="center"><%= t('spree.admin.store_credits.invalidate_store_credit') %></legend>
     <div data-hook="admin_store_credit_form_fields" class="row">
       <div class="col-12">
-        <%= render partial: 'update_reason_field', locals: { f: f } %>
+        <%= render partial: 'store_credit_reason_field', locals: { f: f } %>
       </div>
     </div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">

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

@@ -84,7 +84,7 @@
         <th><%= t('spree.admin.store_credits.created_by') %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:user_total_amount) %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:amount_remaining) %></th>
-        <th><%= Spree::StoreCreditUpdateReason.human_attribute_name(:name) %></th>
+        <th><%= Spree::StoreCreditReason.human_attribute_name(:name) %></th>
       </tr>
     </thead>
     <tbody>
@@ -98,7 +98,7 @@
           <td><%= store_credit_event_originator_link(event) %></td>
           <td><%= event.display_user_total_amount %></td>
           <td><%= event.display_remaining_amount %></td>
-          <td><%= event.update_reason.try!(:name) %></td>
+          <td><%= event.store_credit_reason.try!(:name) %></td>
         </tr>
       <% end %>
     </tbody>

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

@@ -41,7 +41,9 @@
             <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
               <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
               <td class="item-image">
-                <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
+                <%= render 'spree/admin/shared/image',
+                  image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+                  size: :mini %>
               </td>
               <td class="item-name">
                 <%= item.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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

@@ -74,7 +74,7 @@
     <div class="no-objects-found">
       <%= render 'spree/admin/shared/no_objects_found',
                    resource: Spree::Order,
-                   new_resource_url: spree.new_admin_order_path %>
+                   new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
     </div>
   <% end %>
 

data/config/routes.rb

@@ -16,7 +16,7 @@ Spree::Core::Engine.routes.draw do
     resources :promotions do
       resources :promotion_rules
       resources :promotion_actions
-      resources :promotion_codes, only: [:index]
+      resources :promotion_codes, only: [:index, :new, :create]
       resources :promotion_code_batches, only: [:index, :new, :create] do
         get '/download', to: "promotion_code_batches#download", defaults: { format: "csv" }
       end
@@ -141,17 +141,11 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
-    resources :reports, only: [:index] do
-      collection do
-        get :sales_total
-        post :sales_total
-      end
-    end
-
     resources :reimbursement_types, only: [:index]
     resources :adjustment_reasons, except: [:show, :destroy]
     resources :refund_reasons, except: [:show, :destroy]
     resources :return_reasons, except: [:show, :destroy]
+    resources :store_credit_reasons, except: [:show]
 
     resources :shipping_methods
     resources :shipping_categories

data/lib/spree/backend.rb

@@ -3,7 +3,7 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'coffee-rails'
-require 'sass-rails'
+require 'sassc-rails'
 require 'handlebars_assets'
 require 'font-awesome-rails'
 require 'autoprefixer-rails'

data/solidus_backend.gemspec

@@ -26,12 +26,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'coffee-rails'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
-  s.add_dependency 'jbuilder', '~> 2.6'
+  s.add_dependency 'jbuilder', '~> 2.8'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'sass', '>= 3.5.2'
+  s.add_dependency 'sassc-rails'
 
-  s.add_dependency 'autoprefixer-rails', '~> 7.1'
+  s.add_dependency 'autoprefixer-rails'
   s.add_dependency 'handlebars_assets', '~> 0.23'
 end

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

@@ -15,7 +15,7 @@ describe Spree::Admin::BaseController, type: :controller do
 
   context "unauthorized request" do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
     end
 
     it "redirects to unauthorized" do

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

@@ -22,7 +22,7 @@ describe Spree::Admin::CancellationsController do
   describe "#cancel" do
     subject { post :short_ship, params: { order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) } }
 
-    let(:order) { create(:order_ready_to_ship, number: "R100", state: "complete", line_items_count: 1) }
+    let(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: 4 }]) }
     let(:referer) { "order_admin_page" }
 
     context "no inventory unit ids are provided" do
@@ -67,12 +67,16 @@ describe Spree::Admin::CancellationsController do
       end
 
       it "creates a unit cancel" do
-        expect { subject }.to change { Spree::UnitCancel.count }.by(1)
+        expect { subject }.to change { Spree::UnitCancel.count }.by(4)
       end
 
       it "cancels the inventory" do
         subject
-        expect(order.inventory_units.map(&:state).uniq).to match_array(['canceled'])
+        expect(order.reload.inventory_units.map(&:state).uniq).to match_array(['canceled'])
+      end
+
+      it "adjusts the order" do
+        expect { subject }.to change { order.reload.total }.by(-40.0)
       end
     end
   end

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -7,11 +7,59 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
   context "with authorization" do
     stub_authorization!
 
-    let(:order) { create(:order, number: "R123456789") }
+    context '#edit' do
+      context 'when order has no shipping nor billing address' do
+        let(:order) { create(:order, number: "R123456789", ship_address: nil, bill_address: nil) }
 
-    before { allow(Spree::Order).to receive_message_chain(:includes, :find_by!) { order } }
+        context "with a checkout_zone set as the country of Canada" do
+          let!(:united_states) { create(:country, iso: 'US', states_required: true) }
+          let!(:canada) { create(:country, iso: 'CA', states_required: true) }
+          let!(:checkout_zone) { create(:zone, name: "Checkout Zone", countries: [canada]) }
+
+          before do
+            Spree::Config.checkout_zone = checkout_zone.name
+          end
+
+          context "and default_country_iso of the Canada" do
+            before do
+              Spree::Config.default_country_iso = Spree::Country.find_by!(iso: "CA").iso
+            end
+
+            it 'defaults the shipping address country to Canada' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).shipping_address.country_id).to eq canada.id
+            end
+
+            it 'defaults the billing address country to Canada' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).billing_address.country_id).to eq canada.id
+            end
+          end
+
+          context "and default_country_iso of the United States" do
+            before do
+              Spree::Config.default_country_iso = Spree::Country.find_by!(iso: "US").iso
+            end
+
+            it 'defaults the shipping address country to nil' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).shipping_address.country_id).to be_nil
+            end
+
+            it 'defaults the billing address country to nil' do
+              get :edit, params: { order_id: order.number }
+              expect(assigns(:order).billing_address.country_id).to be_nil
+            end
+          end
+        end
+      end
+    end
 
     context "#update" do
+      let(:order) { create(:order, number: "R123456789") }
+
+      before { allow(Spree::Order).to receive_message_chain(:includes, :find_by!) { order } }
+
       it "updates + progresses the order" do
         expect(order).to receive(:update_attributes) { true }
         expect(order).to receive(:next) { false }

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

@@ -69,7 +69,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "can page through the orders" do
         get :index, params: { page: 2, per_page: 10 }
         expect(assigns[:orders].offset_value).to eq(10)
-        expect(assigns[:orders].current_per_page).to eq(10)
+        expect(assigns[:orders].limit_value).to eq(10)
       end
     end
 
@@ -77,7 +77,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     context "#new" do
       let(:user) { create(:user) }
       before do
-        allow(controller).to receive_messages spree_current_user: user
+        allow(controller).to receive_messages try_spree_current_user: user
       end
 
       it "imports a new order and sets the current user as a creator" do
@@ -288,18 +288,30 @@ describe Spree::Admin::OrdersController, type: :controller do
       let(:user) { create(:user) }
 
       before do
-        allow(controller).to receive_messages spree_current_user: user
+        allow(controller).to receive_messages try_spree_current_user: user
         user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
 
-        create(:completed_order_with_totals)
-        expect(Spree::Order.count).to eq 1
+        create_list(:completed_order_with_totals, 2)
+        expect(Spree::Order.count).to eq 2
       end
 
-      it "does not display duplicated results" do
-        get :index, params: { q: {
-          line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
-        } }
-        expect(assigns[:orders].map(&:number).count).to eq 1
+      context 'by line_items_variant_id_in' do
+        it "does not display duplicated results" do
+          get :index, params: { q: {
+            line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
+            } }
+          expect(assigns[:orders].size).to eq 1
+        end
+      end
+
+      context 'by email' do
+        it "does not display duplicated results" do
+          get :index, params: { q: {
+            email_start: Spree::Order.first.email
+            } }
+          expect(assigns[:orders].size).to eq 1
+          expect(assigns[:orders][0].email).to eq(Spree::Order.first.email)
+        end
       end
     end
 
@@ -349,7 +361,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     let!(:order) { create(:completed_order_with_totals, number: 'R987654321') }
 
     before do
-      allow(controller).to receive_messages spree_current_user: user
+      allow(controller).to receive_messages try_spree_current_user: user
     end
 
     it 'should grant access to users with an admin role' do

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

@@ -6,7 +6,7 @@ module Spree
   module Admin
     describe PaymentsController, type: :controller do
       before do
-        allow(controller).to receive_messages spree_current_user: user
+        allow(controller).to receive_messages try_spree_current_user: user
       end
 
       let(:user) { create(:admin_user) }

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

@@ -50,6 +50,78 @@ describe Spree::Admin::ProductsController, type: :controller do
     end
   end
 
+  # regression test for https://github.com/solidusio/solidus/issues/2791
+  context "creating a product" do
+    before(:all) do
+      create(:shipping_category)
+    end
+
+    it "creates a product" do
+      post :create, params: {
+             product: {
+               name: "Product #1 - 9632",
+               description: "As seen on TV!",
+               price: 19.99,
+               shipping_category_id: Spree::ShippingCategory.first.id,
+             }
+           }
+      expect(flash[:success]).to eq("Product \"Product #1 - 9632\" has been successfully created!")
+    end
+
+    context "when there is a taxon" do
+      let(:first_taxon) { create(:taxon) }
+
+      it "creates a product with a taxon" do
+        post :create, params: {
+               product: {
+                 name: "Product #1 - 9632",
+                 description: "As seen on TV!",
+                 price: 19.99,
+                 shipping_category_id: Spree::ShippingCategory.first.id,
+                 taxon_ids: first_taxon.id.to_s
+               }
+             }
+        expect(flash[:success]).to eq("Product \"Product #1 - 9632\" has been successfully created!")
+      end
+
+      context "when their are multiple taxons" do
+        let(:second_taxon) { create(:taxon) }
+
+        it "creates a product with multiple taxons" do
+          post :create, params: {
+                 product: {
+                   name: "Product #1 - 9632",
+                   description: "As seen on TV!",
+                   price: 19.99,
+                   shipping_category_id: Spree::ShippingCategory.first.id,
+                   taxon_ids: "#{first_taxon.id}, #{second_taxon.id}"
+                 }
+               }
+          expect(flash[:success]).to eq("Product \"Product #1 - 9632\" has been successfully created!")
+        end
+      end
+    end
+  end
+
+  context "adding taxons to a product" do
+    let(:product) { create(:product) }
+    let(:first_taxon) { create(:taxon) }
+
+    it "adds a single taxon to a product" do
+      put :update, params: { id: product.to_param, product: { taxon_ids: first_taxon.id.to_s } }
+      expect(flash[:success]).to eq("Product #{product.name.inspect} has been successfully updated!")
+    end
+
+    context "when there are mulitple taxons" do
+      let(:second_taxon) { create(:taxon) }
+
+      it "adds multiple taxons to a product" do
+        put :update, params: { id: product.to_param, product: { taxon_ids: "#{first_taxon.id}, #{second_taxon.id}" } }
+        expect(flash[:success]).to eq("Product #{product.name.inspect} has been successfully updated!")
+      end
+    end
+  end
+
   describe "creating variant property rules" do
     let(:first_property) { create(:property) }
     let(:second_property) { create(:property) }

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

@@ -11,10 +11,22 @@ describe Spree::Admin::PromotionCodesController do
   let!(:code2) { create(:promotion_code, promotion: promotion) }
   let!(:code3) { create(:promotion_code, promotion: promotion) }
 
-  it "can create a promotion rule of a valid type" do
+  it "can create a CSV file with all promotion codes" do
     get :index, params: { promotion_id: promotion.id, format: 'csv' }
     expect(response).to be_successful
     parsed = CSV.parse(response.body, headers: true)
     expect(parsed.entries.map(&:to_h)).to eq([{ "Code" => code1.value }, { "Code" => code2.value }, { "Code" => code3.value }])
   end
+
+  it "can create a new code" do
+    post :create, params: { promotion_id: promotion.id, promotion_code: { value: "new_code" } }
+    expect(response).to redirect_to(spree.admin_promotion_promotion_codes_path(promotion))
+    expect(Spree::PromotionCode.where(promotion: promotion).count).to eql(4)
+  end
+
+  it "cannot create an existing code" do
+    post :create, params: { promotion_id: promotion.id, promotion_code: { value: code1.value } }
+    expect(flash[:error]).not_to be_nil
+    expect(Spree::PromotionCode.where(promotion: promotion).count).to eql(3)
+  end
 end

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

@@ -9,6 +9,13 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
     Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false)
   end
 
+  let(:user) { stub_model(Spree::LegacyUser, has_spree_role?: true, id: 1) }
+
+  before do
+    allow_any_instance_of(described_class).to receive(:try_spree_current_user).
+      and_return(user)
+  end
+
   describe '#edit' do
     let(:reimbursement) { create(:reimbursement) }
     let(:order) { reimbursement.order }
@@ -42,6 +49,10 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
       expect(assigns(:reimbursement).return_items.to_a).to eq customer_return.return_items.to_a
     end
 
+    it 'order is recalculated' do
+      expect { subject }.to change { order.reload.payment_state }.from('paid').to('credit_owed')
+    end
+
     it 'redirects to the edit page' do
       subject
       expect(response).to redirect_to(spree.edit_admin_order_reimbursement_path(order, assigns(:reimbursement)))