solidus_backend 2.8.2 → 2.9.2

data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb

@@ -9,39 +9,49 @@
 <%-
 colors = [
   {
-    name: '$color-1',
+    name: '$color-white',
     value: '#FFFFFF',
-    used_for: 'Backgrounds.'
+    used_for: 'Body background color.'
   },
   {
-    name: '$color-2',
-    value: '#9FC820',
-    used_for: 'Active states.'
+    name: '$color-light',
+    value: '#F9FAFB',
+    used_for: 'Sidebar and header background color.'
   },
   {
-    name: '$color-3',
-    value: '#5498DA',
-    used_for: 'Buttons, links, form text.'
+    name: '$color-light-dark',
+    value: '#E5E7EB',
+    used_for: 'Borders color.'
   },
   {
-    name: '$color-4',
-    value: '#6788A2',
-    used_for: 'Non-interactive text outside of form fields.'
+    name: '$color-dark',
+    value: '#24282F',
+    used_for: 'Text and headings color.'
   },
   {
-    name: '$color-5',
-    value: '#C60F13',
-    used_for: 'Errors, destructive action warnings.'
+    name: '$color-dark-light',
+    value: '#808C9E',
+    used_for: 'Main text color for navigation, tabs, breadcrumb.'
+  },
+  {
+    name: '$color-primary',
+    value: '#3D76F1',
+    used_for: 'Buttons primary actions, links, active states.'
   },
   {
-    name: '$color-6',
-    value: '#FF9300',
-    used_for: 'Warnings'
+    name: '$color-success',
+    value: '#52B73B',
+    used_for: 'Success actions.'
+  },
+  {
+    name: '$color-error',
+    value: '#CE452A',
+    used_for: 'Errors, destructive action warnings.'
   },
   {
-    name: '$color-7',
-    value: '#F4F4F4',
-    used_for: 'Disabled states'
+    name: '$color-notice',
+    value: '#FFDD59',
+    used_for: 'Warnings actions.'
   }
 ]
 

data/app/views/spree/admin/style_guide/topics/typography/_fonts.html.erb

@@ -1,6 +1,6 @@
 <div class="half">
   <p>
-    The typography base is "Open Sans" and Helvetica which we leave to the browser to provide.
+    The typography base is "Inter" and Helvetica which we load by stylesheet with @font-face rule.
     Set at 13px with no specified line-height.
   </p>
 

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

@@ -14,7 +14,7 @@
     <%= render partial: 'form', locals: { f: f } %>
     <div class="filter-actions actions">
       <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
-      <%= link_to t('spree.actions.cancel'), admin_taxonomies_path, class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_taxonomies_path, class: 'btn btn-default' %>
     </div>
   </fieldset>
 

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

@@ -23,7 +23,7 @@
     <%= f.field_container :icon do %>
       <%= f.label :icon %><br />
       <%= f.file_field :icon %>
-      <%= image_tag f.object.icon(:mini) if f.object.icon.present? %>
+      <%= image_tag f.object.icon(:mini) if f.object.icon_present? %>
     <% end %>
   </div>
 

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

@@ -3,7 +3,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path, class: 'btn btn-primary' %>
+    <%= link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path, class: 'btn btn-default' %>
   </li>
 <% end %>
 
@@ -14,6 +14,6 @@
 
   <div class="form-buttons filter-actions" data-hook="buttons">
     <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
-    <%= link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy), class: 'btn btn-primary' %>
+    <%= link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy), class: 'btn btn-default' %>
   </div>
 <% end %>

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

@@ -41,8 +41,8 @@
 
       </div>
       <div class="filter-actions actions">
-        <%= button_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-primary' %>
-        <%= button_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-primary' %>
+        <%= button_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-default' %>
+        <%= button_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-default' %>
       </div>
 
     <% else %>

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

@@ -82,14 +82,14 @@
       <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
         <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
         <td><%= user.spree_roles.map(&:name).to_sentence %></td>
-        <td class="align-center"><%= link_to user.orders.count, spree.orders_admin_user_path(user) %></td>
+        <td class="align-center"><%= link_to user.order_count, spree.orders_admin_user_path(user) %></td>
         <td class="align-center"><%= link_to user.display_lifetime_value, spree.items_admin_user_path(user) %></td>
         <td class="align-center"><%= l user.created_at.to_date %></td>
         <td data-hook="admin_users_index_row_actions" class="actions">
           <% if can?(:edit, user) %>
             <%= link_to_edit user, no_text: true %>
           <% end %>
-          <% if can?(:destroy, user) %>
+          <% if can?(:destroy, user) && user.orders.count.zero? %>
             <%= link_to_delete user, no_text: true %>
           <% end %>
         </td>

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

@@ -65,7 +65,7 @@
       <div class="col-3">
         <div class="field" data-hook="price">
           <%= f.label :price %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.default_price.currency %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.find_or_build_default_price.currency %>
         </div>
       </div>
 

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

@@ -8,7 +8,7 @@
       <%= link_to(
         t('spree.new_variant'),
         new_admin_product_variant_url(@product),
-        class: 'button'
+        class: 'btn btn-primary'
       ) %>
     </li>
   <% end %>

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -4,7 +4,7 @@
 
     <%= zone_form.field_container :state_ids do %>
       <%= zone_form.label :state_ids, plural_resource_name(Spree::State) %><br>
-      <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { multiple: true, class: "select2 fullwidth" } %>
+      <%= zone_form.collection_select :state_ids, @states, :id, :state_with_country, {}, { multiple: true, class: "select2 fullwidth" } %>
     <% end %>
   </fieldset>
 </div>

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::LocaleController, type: :controller do
+  stub_authorization!
+
+  before { I18n.backend.store_translations(:fr, {}) }
+
+  after do
+    I18n.locale = :en
+    I18n.reload!
+  end
+
+  context 'switch_to_locale specified' do
+    let(:json_response) { JSON.parse(response.body, symbolize_names: true) }
+
+    before do
+      get :set, params: { switch_to_locale: switch_to_locale, format: :json }
+    end
+
+    context 'available locale' do
+      let(:switch_to_locale) { 'fr' }
+
+      it 'sets locale and returns the location for the redirect' do
+        expect(I18n.locale).to eq :fr
+        expect(session[:admin_locale]).to eq(switch_to_locale)
+        expect(json_response).
+          to eq({ locale: switch_to_locale,
+                  location: spree.admin_url(host: 'test.host') })
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context 'unavailable locale' do
+      let(:switch_to_locale) { 'klingon' }
+
+      it 'does not change locale and returns 404' do
+        expect(I18n.locale).to eq :en
+        expect(json_response).to eq({ locale: 'en', })
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+end

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

@@ -17,12 +17,12 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
           let!(:checkout_zone) { create(:zone, name: "Checkout Zone", countries: [canada]) }
 
           before do
-            Spree::Config.checkout_zone = checkout_zone.name
+            stub_spree_preferences(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
+              stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: "CA").iso)
             end
 
             it 'defaults the shipping address country to Canada' do
@@ -38,7 +38,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
 
           context "and default_country_iso of the United States" do
             before do
-              Spree::Config.default_country_iso = Spree::Country.find_by!(iso: "US").iso
+              stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: "US").iso)
             end
 
             it 'defaults the shipping address country to nil' do

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

@@ -140,7 +140,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         end
 
         context 'when order_bill_address_used is true' do
-          before { Spree::Config[:order_bill_address_used] = true }
+          before { stub_spree_preferences(order_bill_address_used: true) }
 
           it "should redirect to the customer details page" do
             get :edit, params: { id: order.number }
@@ -149,7 +149,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         end
 
         context 'when order_bill_address_used is false' do
-          before { Spree::Config[:order_bill_address_used] = false }
+          before { stub_spree_preferences(order_bill_address_used: false) }
 
           it "should redirect to the customer details page" do
             get :edit, params: { id: order.number }

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

@@ -20,7 +20,7 @@ module Spree
         let(:country) { create :country, iso: "BR" }
 
         before do
-          Spree::Config[:default_country_iso] = country.iso
+          stub_spree_preferences(default_country_iso: country.iso)
         end
 
         it "can create a new stock location" do

data/spec/features/admin/locale_spec.rb

@@ -19,12 +19,11 @@ describe "setting locale", type: :feature do
         },
         listing_orders: "Ordres"
       })
-    Spree::Backend::Config[:locale] = "fr"
+    stub_spree_preferences(Spree::Backend::Config, locale: "fr")
   end
 
   after do
     I18n.locale = I18n.default_locale
-    Spree::Backend::Config[:locale] = "en"
     ActionView::Base.raise_on_missing_translations = true
   end
 

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

@@ -124,7 +124,7 @@ describe "Adjustments", type: :feature do
         end
       end
 
-      expect(page).to have_content(/Total: ?\$170\.00/)
+      expect(page).to have_content('Total: $170.00', normalize_ws: true)
     end
   end
 end

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

@@ -70,10 +70,10 @@ describe "Customer Details", type: :feature, js: true do
 
   context "editing an order" do
     before do
-      configure_spree_preferences do |config|
-        config.default_country_iso = country.iso
-        config.company = true
-      end
+      stub_spree_preferences(
+        default_country_iso: country.iso,
+        company: true
+      )
 
       visit spree.admin_path
       click_link "Orders"
@@ -153,9 +153,7 @@ describe "Customer Details", type: :feature, js: true do
 
       before do
         order.bill_address.country.destroy
-        configure_spree_preferences do |config|
-          config.default_country_iso = brazil.iso
-        end
+        stub_spree_preferences(default_country_iso: brazil.iso)
       end
 
       it "sets default country when displaying form" do

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Customer returns', type: :feature do
+  stub_authorization!
+
+  context 'when the order has more than one line item' do
+    let(:order) { create :shipped_order, line_items_count: 2 }
+
+    context 'when creating a return with state "Received"' do
+      it 'marks the order as returned', :js do
+        visit spree.new_admin_order_customer_return_path(order)
+
+        find('#select-all').click
+        page.execute_script "$('select.add-item').val('receive')"
+        select 'NY Warehouse', from: 'Stock Location'
+        click_button 'Create'
+
+        expect(page).to have_content 'Customer Return has been successfully created'
+
+        within 'dd.order-state' do
+          expect(page).to have_content 'Returned'
+        end
+      end
+    end
+  end
+end

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

@@ -114,12 +114,7 @@ describe "Orders Listing", type: :feature, js: true do
 
       context "when pagination is really short" do
         before do
-          @old_per_page = Spree::Config[:orders_per_page]
-          Spree::Config[:orders_per_page] = 1
-        end
-
-        after do
-          Spree::Config[:orders_per_page] = @old_per_page
+          stub_spree_preferences(orders_per_page: 1)
         end
 
         # Regression test for https://github.com/spree/spree/issues/4004

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

@@ -23,7 +23,7 @@ describe "Log entries", type: :feature do
     it "shows a successful attempt" do
       visit spree.admin_order_payments_path(payment.order)
       click_on payment.number
-      click_link "Logs"
+
       within("#listing_log_entries") do
         expect(page).to have_content("Transaction successful")
       end
@@ -47,7 +47,7 @@ describe "Log entries", type: :feature do
     it "shows a failed attempt" do
       visit spree.admin_order_payments_path(payment.order)
       click_on payment.number
-      click_link "Logs"
+
       within("#listing_log_entries") do
         expect(page).to have_content("Transaction failed")
       end

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

@@ -208,12 +208,12 @@ describe "New Order", type: :feature do
 
     before do
       Spree::Country.update_all(states_required: true)
-      Spree::Config.checkout_zone = checkout_zone.name
+      stub_spree_preferences(checkout_zone: checkout_zone.name)
     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
+        stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: 'US').iso)
       end
 
       it 'the shipping address country select includes only options for Canada' do
@@ -267,7 +267,7 @@ describe "New Order", type: :feature do
 
     context 'and default_country_iso of Canada' do
       before do
-        Spree::Config.default_country_iso = Spree::Country.find_by!(iso: 'CA').iso
+        stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: 'CA').iso)
       end
 
       it 'defaults the shipping address country to Canada' do

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

@@ -191,9 +191,14 @@ describe "Order Details", type: :feature, js: true do
       end
 
       context 'splitting to location' do
-        # can not properly implement until poltergeist supports checking alert text
-        # see https://github.com/teampoltergeist/poltergeist/pull/516
-        it 'should warn you if you have not selected a location or shipment'
+        it 'should warn you if you have not selected a location or shipment' do
+          visit spree.edit_admin_order_path(order)
+
+          within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+          accept_alert 'Please select the split destination.' do
+            click_icon :ok
+          end
+        end
 
         context 'there is enough stock at the other location' do
           it 'should allow me to make a split' do

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

@@ -5,17 +5,24 @@ require 'spec_helper'
 describe 'Payments', type: :feature do
   stub_authorization!
 
-  context "with a pre-existing payment" do
-    let!(:payment) do
-      create(:payment,
-        order:          order,
-        amount:         order.outstanding_balance,
+  let(:state) { 'checkout' }
+
+  def create_payment(opts = {})
+    create(
+      :payment,
+      {
+        order: order,
+        amount: order.outstanding_balance,
         payment_method: create(:credit_card_payment_method),
-        state:          state)
-    end
+        state: state
+      }.merge(opts)
+    )
+  end
+
+  context "with a pre-existing payment" do
+    let!(:payment) { create_payment }
 
     let(:order) { create(:completed_order_with_totals, number: 'R100', line_items_price: 50) }
-    let(:state) { 'checkout' }
 
     before do
       visit "/admin/orders/#{order.number}/payments"
@@ -24,12 +31,7 @@ describe 'Payments', type: :feature do
     # Regression tests for https://github.com/spree/spree/issues/1453
     context 'with a check payment', js: true do
       let(:order) { create(:completed_order_with_totals, number: 'R100') }
-      let!(:payment) do
-        create(:payment,
-          order:          order,
-          amount:         order.outstanding_balance,
-          payment_method: create(:check_payment_method, available_to_admin: true)) # Check
-      end
+      let!(:payment) { create_payment(payment_method: create(:check_payment_method, available_to_admin: true)) }
 
       it 'capturing a check payment from a new order' do
         click_icon(:capture)
@@ -49,11 +51,9 @@ describe 'Payments', type: :feature do
 
       visit spree.admin_order_payment_path(order, payment)
       expect(page).to have_content 'Capture Events'
-      # within '#capture_events' do
-      within_row(1) do
+      within '#capture_events' do
         expect(page).to have_content(capture_amount / 100)
       end
-      # end
     end
 
     it 'displays the address for a credit card when present' do
@@ -62,6 +62,57 @@ describe 'Payments', type: :feature do
       expect(page).to have_content 'my cc address'
     end
 
+    context 'when there are multiple pending payments', :js do
+      context 'while marking all payments as void' do
+        let(:card_payment_method) { create(:credit_card_payment_method) }
+
+        let!(:payment) do
+          create_payment(
+            payment_method: card_payment_method,
+            state: :pending
+          )
+        end
+
+        let!(:second_payment) do
+          create_payment(
+            payment_method: card_payment_method,
+            state: :pending
+          )
+        end
+
+        it 'updates the order payment state correctly at each iteration' do
+          visit current_path
+          expect(page).to have_css('#payment_status', text: 'Balance due')
+
+          within '#payments' do
+            expect(page).to have_selector('.pill-pending', count: 2)
+            within "#payment_#{payment.id}" do
+              find('.fa-void').click
+            end
+          end
+
+          expect(page).to have_css('#payment_status', text: 'Balance due')
+
+          within '#payments' do
+            expect(page).to have_selector('.pill-pending', count: 1)
+            within "#payment_#{payment.id}" do
+              expect(page).to have_selector('.pill-void', count: 1)
+            end
+          end
+
+          within "#payment_#{second_payment.id}" do
+            find('.fa-void').click
+          end
+
+          within '#payments' do
+            expect(page).not_to have_selector('.pill-pending')
+            expect(page).to have_selector('.pill-void', count: 2)
+          end
+          expect(page).to have_css('#payment_status', text: 'Failed')
+        end
+      end
+    end
+
     it 'lists, updates and creates payments for an order', js: true do
       within_row(1) do
         expect(column_text(3)).to eq('Credit Card')
@@ -70,7 +121,7 @@ describe 'Payments', type: :feature do
       end
 
       click_icon :void
-      expect(page).to have_css('#payment_status', text: 'Balance due')
+      expect(page).to have_css('#payment_status', text: 'Failed')
       expect(page).to have_content('Payment Updated')
 
       within_row(1) do
@@ -105,7 +156,7 @@ describe 'Payments', type: :feature do
         within_row(1) do
           click_icon(:edit)
           fill_in('amount', with: '$1')
-          click_icon(:save)
+          click_icon(:ok)
           expect(page).to have_selector('td.amount span', text: '$1.00')
           expect(payment.reload.amount).to eq(1.00)
         end
@@ -114,12 +165,7 @@ describe 'Payments', type: :feature do
       it 'allows the amount change to be cancelled by clicking on the cancel button' do
         within_row(1) do
           click_icon(:edit)
-
-          # Can't use fill_in here, as under poltergeist that will unfocus (and
-          # thus submit) the field under poltergeist
-          find('td.amount input').click
-          page.execute_script("$('td.amount input').val('$1')")
-
+          fill_in 'amount', with: '$1'
           click_icon(:cancel)
           expect(page).to have_selector('td.amount span', text: '$150.00')
           expect(payment.reload.amount).to eq(150.00)
@@ -130,7 +176,7 @@ describe 'Payments', type: :feature do
         within_row(1) do
           click_icon(:edit)
           fill_in('amount', with: 'invalid')
-          click_icon(:save)
+          click_icon(:ok)
         end
         expect(page).to have_selector('.flash.error', text: 'Invalid resource. Please fix errors and try again.')
         expect(payment.reload.amount).to eq(150.00)
@@ -159,9 +205,9 @@ describe 'Payments', type: :feature do
       end
 
       it "is able to create a new credit card payment with valid information", js: true do
-        fill_in "Card Number", with: "4111 1111 1111 1111"
+        fill_in_with_force "Card Number", with: "4111 1111 1111 1111"
         fill_in "Name", with: "Test User"
-        fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+        fill_in_with_force "Expiration", with: "09 / #{Time.current.year + 1}"
         fill_in "Card Code", with: "007"
         # Regression test for https://github.com/spree/spree/issues/4277
         expect(page).to have_css('.ccType[value="visa"]', visible: false)
@@ -182,7 +228,7 @@ describe 'Payments', type: :feature do
 
     context "user existing card" do
       let!(:cc) do
-        create(:credit_card, payment_method: payment_method, gateway_customer_profile_id: "BGS-RFRE")
+        create(:credit_card, payment_method: payment_method, gateway_customer_profile_id: "BGS-RFRE", user: order.user)
       end
 
       before do
@@ -216,12 +262,7 @@ describe 'Payments', type: :feature do
     context 'with a soft-deleted payment method' do
       let(:order) { create(:completed_order_with_totals, line_items_count: 1) }
       let!(:payment_method) { create(:check_payment_method) }
-      let!(:payment) do
-        create(:payment,
-          order:          order,
-          amount:         order.outstanding_balance,
-          payment_method: payment_method)
-      end
+      let!(:payment) { create_payment(payment_method: payment_method) }
 
       before do
         payment_method.discard
@@ -249,9 +290,9 @@ describe 'Payments', type: :feature do
 
     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_with_force "Card Number", with: "4111 1111 1111 1111"
       fill_in "Name", with: "Test User"
-      fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+      fill_in_with_force "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!")
@@ -278,9 +319,9 @@ describe 'Payments', type: :feature do
 
     it "displays an error" do
       choose payment_method.name
-      fill_in "Card Number", with: "4111 1111 1111 1111"
+      fill_in_with_force "Card Number", with: "4111 1111 1111 1111"
       fill_in "Name", with: "Test User"
-      fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+      fill_in_with_force "Expiration", with: "09 / #{Time.current.year + 1}"
       fill_in "Card Code", with: "007"
       click_button "Continue"
       expect(page).to have_content I18n.t('spree.insufficient_stock_for_order')