solidus_backend 2.0.3 → 2.1.0.beta1

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

@@ -1,46 +1,60 @@
 <div data-hook="variants">
   <fieldset class="no-border-top no-border-bottom">
-    <div class="field four columns alpha" data-hook="sku">
-      <%= f.label :sku %>
-      <%= f.text_field :sku, :class => 'fullwidth' %>
-    </div>
-    <div class="field four columns checkbox" data-hook="track_inventory">
-      <%= f.label :track_inventory do %>
-        <%= f.check_box :track_inventory %>
-        <%= Spree::Variant.human_attribute_name(:track_inventory) %>
-      <% end %>
+    <div class="row">
+      <div class="col-xs-3">
+        <div class="field" data-hook="sku">
+          <%= f.label :sku %>
+          <%= f.text_field :sku, :class => 'fullwidth' %>
+        </div>
+      </div>
+      <div class="col-xs-3">
+        <div class="field checkbox" data-hook="track_inventory">
+          <%= f.label :track_inventory do %>
+            <%= f.check_box :track_inventory %>
+            <%= Spree::Variant.human_attribute_name(:track_inventory) %>
+          <% end %>
+        </div>
+      </div>
     </div>
   </fieldset>
   <% if f.object.new_record? %>
     <fieldset class="no-border-top no-border-bottom">
+      <div class="row">
       <% @product.option_types.each_with_index do |option_type, index| %>
-        <div class="field four columns <%= 'alpha' if index % 3 == 0 %><%= 'omega' if index % 3 == 2 %>" data-hook="presentation">
-          <%= label :new_variant, option_type.presentation %>
-          <%= f.collection_select 'option_value_ids',
-                                  option_type.option_values,
-                                  :id,
-                                  :presentation,
-                                  { include_blank: true },
-                                  {
-                                    name: 'variant[option_value_ids][]',
-                                    class: "select2 fullwidth"
-                                  } %>
-        </div>
+          <div class="col-xs-3">
+            <div class="field" data-hook="presentation">
+              <%= label :new_variant, option_type.presentation %>
+              <%= f.collection_select 'option_value_ids',
+                                      option_type.option_values,
+                                      :id,
+                                      :presentation,
+                                      { include_blank: true },
+                                      {
+                                        name: 'variant[option_value_ids][]',
+                                        class: "select2 fullwidth"
+                                      } %>
+            </div>
+          </div>
       <% end %>
+      </div>
     </fieldset>
   <% end %>
 </div>
 
 <div data-hook="admin_variant_form_additional_fields">
   <fieldset class="no-border-top no-border-bottom">
-    <% [:weight, :height, :width, :depth].each_with_index do |field, index| %>
-      <div class="field four columns <%= 'alpha' if index % 4 == 0 %> <%= 'omega' if index % 4 == 3 %>" data-hook="<%= field %>">
-        <%= f.label field %>
-        <%= f.text_field field,
-                         value: number_with_precision(@variant.send(field), :precision => 2),
-                         class: 'fullwidth' %>
-      </div>
-    <% end %>
+    <div class="row">
+      <% [:weight, :height, :width, :depth].each_with_index do |field, index| %>
+        <div class="col-xs-3">
+          <div class="field" data-hook="<%= field %>">
+            <%= f.label field %>
+            <%= f.text_field field,
+                            value: number_with_precision(@variant.send(field), :precision => 2),
+                            class: 'fullwidth' %>
+          </div>
+        </div>
+      <% end %>
+    </div>
   </fieldset>
 </div>
 
@@ -48,29 +62,39 @@
   <fieldset class="no-border-top no-border-bottom">
     <p> <%== t('.pricing_hint') %> </p>
 
-    <div class="field four columns alpha" data-hook="price">
-      <%= f.label :price %>
-      <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'fullwidth' %>
-    </div>
+    <div class="row">
+      <div class="col-xs-3">
+        <div class="field" data-hook="price">
+          <%= f.label :price %>
+          <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'fullwidth' %>
+        </div>
+      </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 %>
+      <% if show_rebuild_vat_checkbox? %>
+        <div class="col-xs-3">
+          <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "variant", wrapper_class: "field" %>
+        </div>
+      <% 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' %>
-    </div>
+      <div class="col-xs-3">
+        <div class="field" data-hook="cost_price">
+          <%= f.label :cost_price %>
+          <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'fullwidth' %>
+        </div>
+      </div>
 
-    <div class="field four columns omega" data-hook="tax_category">
-      <%= f.label :tax_category %>
-      <%= f.field_hint :tax_category %>
-      <%= f.collection_select :tax_category_id,
-                              @tax_categories,
-                              :id,
-                              :name,
-                              { :include_blank => t('.use_product_tax_category') },
-                              { :class => 'select2 fullwidth' } %>
+      <div class="col-xs-3">
+        <div class="field" data-hook="tax_category">
+          <%= f.label :tax_category %>
+          <%= f.field_hint :tax_category %>
+          <%= f.collection_select :tax_category_id,
+                                  @tax_categories,
+                                  :id,
+                                  :name,
+                                  { :include_blank => t('.use_product_tax_category') },
+                                  { :class => 'select2 fullwidth' } %>
+        </div>
+      </div>
     </div>
   </fieldset>
 </div>

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

@@ -4,17 +4,21 @@
 
 <% content_for :table_filter do %>
   <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
-    <div data-hook="admin_variants_index_search" class="field thirteen columns alpha">
-      <%= f.label :variant_search_term, Spree.t(:variant_search_placeholder) %>
-      <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
+    <div class="col-xs-10">
+      <div data-hook="admin_variants_index_search" class="field">
+        <%= f.label :variant_search_term, Spree.t(:variant_search_placeholder) %>
+        <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
+      </div>
     </div>
 
     <% if product.variants.only_deleted.any? %>
-      <div class="field checkbox three columns omega">
-        <%= label_tag :deleted do %>
-          <%= check_box_tag :deleted, "on", params[:deleted] == "on" %>
-          <%= t('.show_deleted') %>
-        <% end %>
+      <div class="col-xs-2">
+        <div class="field checkbox">
+          <%= label_tag :deleted do %>
+            <%= check_box_tag :deleted, "on", params[:deleted] == "on" %>
+            <%= t('.show_deleted') %>
+          <% end %>
+        </div>
       </div>
     <% end %>
 

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

@@ -17,12 +17,12 @@
       <% end %>
     </p>
   <% elsif @product.empty_option_values? %>
-    <div class="alpha twelve columns no-objects-found">
+    <div class="col-xs-9 no-objects-found">
       <%= Spree.t :no_option_values_on_product_html,
                   link: link_to(Spree.t(:product_details), [:edit, :admin, @product]) %>
     </div>
   <% else %>
-    <div class="alpha twelve columns no-objects-found">
+    <div class="col-xs-9 no-objects-found">
       <%= Spree.t(:no_resource, resource: plural_resource_name(Spree::Variant)) %>
       <% if can? :create, Spree::Variant %>
         <%= link_to Spree.t(:create_one), new_object_url, remote: true %>

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

@@ -1,4 +1,4 @@
-<div id="country_members" data-hook="member" class="omega six columns">
+<div id="country_members" data-hook="member">
   <fieldset class="no-border-bottom">
     <legend align="center"><%= plural_resource_name(Spree::Country) %></legend>
 

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

@@ -1,37 +1,40 @@
-<div class="alpha six columns" data-hook="admin_zone_form_fields">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:general_settings)%></legend>
+<div class="row">
+  <div class="col-xs-5">
 
-    <%= zone_form.field_container :name do %>
-      <%= zone_form.label :name %><br />
-      <%= zone_form.text_field :name, :class => 'fullwidth' %>
-    <% end %>
+    <div data-hook="admin_zone_form_fields">
+      <fieldset class="no-border-bottom">
+        <legend align="center"><%= Spree.t(:general_settings)%></legend>
 
-    <%= zone_form.field_container :description do %>
-      <%= zone_form.label :description %><br />
-      <%= zone_form.text_field :description, :class => 'fullwidth' %>
-    <% end %>
+        <%= zone_form.field_container :name do %>
+          <%= zone_form.label :name %><br />
+          <%= zone_form.text_field :name, :class => 'fullwidth' %>
+        <% end %>
 
-    <div data-hook="default" class="field">
-      <%= zone_form.check_box :default_tax %>
-      <%= zone_form.label :default_tax %>
-    </div>
+        <%= zone_form.field_container :description do %>
+          <%= zone_form.label :description %><br />
+          <%= zone_form.text_field :description, :class => 'fullwidth' %>
+        <% end %>
 
-    <div data-hook="type" class="field">
-      <%= label_tag Spree.t(:type) %>
-      <ul>
-        <li>
-          <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
-          <%= label_tag :country_based, Spree.t(:country_based) %>
-        </li>
-        <li>
-          <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
-          <%= label_tag :state_based, Spree.t(:state_based) %>
-        </li>
-      </ul>
+        <div data-hook="type" class="field">
+          <%= label_tag Spree.t(:type) %>
+          <ul>
+            <li>
+              <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
+              <%= label_tag :country_based, Spree.t(:country_based) %>
+            </li>
+            <li>
+              <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
+              <%= label_tag :state_based, Spree.t(:state_based) %>
+            </li>
+          </ul>
+        </div>
+      </fieldset>
     </div>
-  </fieldset>
-</div>
+  </div>
+  <div class="col-xs-5">
 
-<%= render :partial => 'state_members', :locals => { :zone_form => zone_form }%>
-<%= render :partial => 'country_members', :locals => { :zone_form => zone_form } %>
+    <%= render :partial => 'state_members', :locals => { :zone_form => zone_form }%>
+    <%= render :partial => 'country_members', :locals => { :zone_form => zone_form } %>
+  </div>
+
+</div>

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

@@ -1,4 +1,4 @@
-<div id="state_members" data-hook="member" class="omega six columns">
+<div id="state_members" data-hook="member">
   <fieldset class="no-border-bottom">
     <legend align="center"><%= plural_resource_name(Spree::State) %></legend>
 

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

@@ -29,7 +29,6 @@
         <th>
           <%= sort_link @search,:description, Spree::Zone.human_attribute_name(:description), {}, {:title => 'zones_order_by_description_title'} %>
         </th>
-        <th><%= Spree.t(:default_tax) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -38,7 +37,6 @@
         <tr id="<%= spree_dom_id zone %>" data-hook="zones_row" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= zone.name %></td>
           <td><%= zone.description %></td>
-          <td class="align-center"><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions">
             <% if can?(:update, zone) %>
               <%= link_to_edit zone, :no_text => true %>
@@ -52,7 +50,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Zone,
                  new_resource_url: new_object_url %>

data/app/views/spree/layouts/admin.html.erb

@@ -24,14 +24,14 @@
       <% else %>
         <% # Legacy layout %>
         <div class="container">
-          <div class="row">
-            <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
+          <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
+            <div class="row">
               <% if content_for?(:tabs) %>
-                <div class="sixteen columns">
+                <div class="col-xs-12">
                   <%= yield :tabs %>
                 </div>
               <% end %>
-              <div class="js-content-below-tabs <%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
+              <div class="js-content-below-tabs <%= if content_for?(:sidebar) then 'col-xs-9' else 'col-xs-12' end %>">
                 <%= render :partial => 'spree/admin/shared/table_filter' %>
                 <%= yield %>
               </div>

data/config/routes.rb

@@ -71,16 +71,6 @@ Spree::Core::Engine.routes.draw do
 
     delete '/product_properties/:id', to: "product_properties#destroy", as: :product_property
 
-    resources :prototypes do
-      member do
-        get :select
-      end
-
-      collection do
-        get :available
-      end
-    end
-
     resources :orders, except: [:show] do
       member do
         get :cart
@@ -183,7 +173,6 @@ Spree::Core::Engine.routes.draw do
     resources :stock_items, except: [:show, :new, :edit]
     resources :tax_rates
 
-    resources :trackers
     resources :payment_methods do
       collection do
         post :update_positions

data/solidus_backend.gemspec

@@ -12,12 +12,15 @@ Gem::Specification.new do |s|
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
   s.homepage    = 'http://solidus.io'
-  s.rubyforge_project = 'solidus_backend'
+  s.license     = 'BSD-3-Clause'
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
+  s.required_ruby_version = '>= 2.2.2'
+  s.required_rubygems_version = '>= 1.8.23'
+
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 

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

@@ -13,7 +13,7 @@ module Spree
       describe '#create' do
         context "with a valid credit card" do
           let(:order) { create(:order_with_line_items, state: "payment") }
-          let(:payment_method) { create(:credit_card_payment_method, display_on: "back_end") }
+          let(:payment_method) { create(:credit_card_payment_method, available_to_admin: true) }
           let(:attributes) do
             {
               order_id: order.number,
@@ -54,7 +54,6 @@ module Spree
             let(:address_attributes) do
               {
                 'firstname' => address.firstname,
-                'lastname' => address.lastname,
                 'address1' => address.address1,
                 'city' => address.city,
                 'country_id' => address.country_id,
@@ -77,7 +76,7 @@ module Spree
         # Regression test for https://github.com/spree/spree/issues/3233
         context "with a backend payment method" do
           before do
-            @payment_method = create(:check_payment_method, display_on: "back_end")
+            @payment_method = create(:check_payment_method, available_to_admin: true)
           end
 
           it "loads backend payment methods" do

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

@@ -16,7 +16,8 @@ describe Spree::Admin::PricesController do
       it 'assigns usable instance variables' do
         subject
         expect(assigns(:search)).to be_a(Ransack::Search)
-        expect(assigns(:prices)).to eq(product.prices)
+        expect(assigns(:variant_prices)).to eq(product.prices.for_variant)
+        expect(assigns(:master_prices)).to eq(product.prices.for_master)
         expect(assigns(:product)).to eq(product)
       end
     end
@@ -32,8 +33,9 @@ describe Spree::Admin::PricesController do
       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(:variant_prices)).to eq(product.prices.for_variant)
+        expect(assigns(:master_prices)).to eq(product.prices.for_master)
+        expect(assigns(:variant_prices)).to include(variant.default_price)
         expect(assigns(:product)).to eq(product)
       end
     end

data/spec/features/admin/configuration/general_settings_spec.rb

@@ -8,6 +8,8 @@ describe "Store", type: :feature, js: true do
            mail_from_address: 'test@example.org')
   end
 
+  let!(:vat_country) { create(:country, iso: "DE", name: "Germany") }
+
   before(:each) do
     visit spree.admin_path
     click_link "Settings"
@@ -35,6 +37,16 @@ describe "Store", type: :feature, js: true do
       expect(page).to have_field("store_name", with: "Spree Demo Site99")
       expect(page).to have_field("store_mail_from_address", with: "spree@example.org")
     end
+
+    it "should be able to update the default cart tax country" do
+      expect(page).to have_select("Tax Country for Empty Carts", selected: "No taxes on carts without address")
+
+      select "Germany", from: "Tax Country for Empty Carts"
+      click_button "Update"
+
+      assert_successful_update_message(:general_settings)
+      expect(page).to have_select("Tax Country for Empty Carts", selected: "Germany")
+    end
   end
 
   context "update fails" do

data/spec/features/admin/configuration/payment_methods_spec.rb

@@ -17,8 +17,9 @@ describe "Payment Methods", type: :feature do
       within("table#listing_payment_methods") do
         expect(all("th")[1].text).to eq("Name")
         expect(all("th")[2].text).to eq("Provider")
-        expect(all("th")[3].text).to eq("Display")
-        expect(all("th")[4].text).to eq("Active")
+        expect(all("th")[3].text).to eq("Available to users")
+        expect(all("th")[4].text).to eq("Available to admin")
+        expect(all("th")[5].text).to eq("Active")
       end
 
       within('table#listing_payment_methods') do

data/spec/features/admin/configuration/shipping_methods_spec.rb

@@ -26,7 +26,7 @@ describe "Shipping Methods", type: :feature do
         expect(column_text(1)).to eq(shipping_method.name)
         expect(column_text(2)).to eq(zone.name)
         expect(column_text(3)).to eq("Flat rate")
-        expect(column_text(4)).to eq("Both")
+        expect(column_text(4)).to eq("Yes")
       end
     end
   end

data/spec/features/admin/homepage_spec.rb

@@ -47,9 +47,6 @@ describe "Homepage", type: :feature do
         within('.selected .admin-subnav') { page.find_link("Property Types")['/admin/properties'] }
       end
 
-      it "should have a link to prototypes" do
-        within('.selected .admin-subnav') { page.find_link("Prototypes")['/admin/prototypes'] }
-      end
     end
   end
 

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

@@ -3,29 +3,26 @@ require 'spec_helper'
 describe "Adjustments", type: :feature do
   stub_authorization!
 
-  let!(:order) { create(:completed_order_with_totals, line_items_count: 5) }
-  let!(:line_item) do
-    line_item = order.line_items.first
-    # so we can be sure of a determinate price in our assertions
-    line_item.update_column(:price, 10)
-    line_item
+  let!(:ship_address) { create(:address) }
+  let!(:tax_zone) { create(:global_zone) } # will include the above address
+  let!(:tax_rate) { create(:tax_rate, amount: 0.20, zone: tax_zone, tax_category: tax_category) }
+
+  let!(:order) do
+    create(
+      :completed_order_with_totals,
+      line_items_attributes: [{ price: 10, variant: variant }] * 5,
+      ship_address: ship_address,
+    )
   end
+  let!(:line_item) { order.line_items[0] }
 
-  let!(:tax_adjustment) do
-    create(:tax_adjustment,
-      adjustable: line_item,
-      finalized: true,
-      order: order,
-      label: "VAT 5%",
-      amount: 10)
-  end
+  let(:tax_category) { create(:tax_category) }
+  let(:variant) { create(:variant, tax_category: tax_category) }
 
   let!(:adjustment) { order.adjustments.create!(order: order, label: 'Rebate', amount: 10) }
 
   before(:each) do
-    # To ensure the order totals are correct
-    order.update_totals
-    order.persist_totals
+    order.update!
 
     visit spree.admin_path
     click_link "Orders"
@@ -35,9 +32,9 @@ describe "Adjustments", type: :feature do
 
   context "admin managing adjustments" do
     it "should display the correct values for existing order adjustments" do
-      within_row(1) do
-        expect(column_text(2)).to eq("VAT 5%")
-        expect(column_text(3)).to eq("$10.00")
+      within first('table tr', text: 'Tax') do
+        expect(column_text(2)).to match(/TaxCategory - \d+ 20\.000%/)
+        expect(column_text(3)).to eq("$2.00")
       end
     end
 
@@ -76,7 +73,9 @@ describe "Adjustments", type: :feature do
 
   context "admin editing an adjustment" do
     before(:each) do
-      within_row(2) { click_icon :edit }
+      within('table tr', text: 'Rebate') do
+        click_icon :edit
+      end
     end
 
     context "successfully" do
@@ -106,15 +105,19 @@ describe "Adjustments", type: :feature do
   end
 
   context "deleting an adjustment" do
-    it "should not be possible if adjustment is closed" do
-      within_row(1) do
-        expect(page).not_to have_css('.fa-trash')
+    context 'when the adjustment is finalized' do
+      let!(:adjustment) { super().tap(&:finalize!) }
+
+      it 'should not be possible' do
+        within('table tr', text: 'Rebate') do
+          expect(page).not_to have_css('.fa-trash')
+        end
       end
     end
 
     it "should update the total", js: true do
       accept_alert do
-        within_row(2) do
+        within('table tr', text: 'Rebate') do
           click_icon(:trash)
         end
       end

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

@@ -5,7 +5,7 @@ describe "Customer Details", type: :feature, js: true do
 
   let(:country) { create(:country, name: "Kangaland") }
   let(:state) { create(:state, name: "Alabama", country: country) }
-  let!(:shipping_method) { create(:shipping_method, display_on: "front_end") }
+  let!(:shipping_method) { create(:shipping_method) }
   let!(:order) { create(:order, ship_address: ship_address, bill_address: bill_address, state: 'complete', completed_at: "2011-02-01 12:36:15") }
   let!(:product) { create(:product_in_stock) }
 

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

@@ -77,7 +77,7 @@ describe "Order Details", type: :feature, js: true do
 
         within_row(1) do
           # Click "cancel" on confirmation dialog
-          dismiss_alert do
+          dismiss_confirm do
             click_icon :trash
           end
         end
@@ -438,6 +438,32 @@ describe "Order Details", type: :feature, js: true do
           end
         end
       end
+
+      describe 'line item sort order' do
+        let(:product2) { create(:product) }
+        let(:product3) { create(:product) }
+
+        before do
+          # grab this one first and then create others that should end up before
+          # and after
+          @middle_line_item = order.line_items[0]
+
+          @first_line_item  = order.contents.add(product2.master)
+          @first_line_item.update_columns(created_at: 1.day.ago)
+          @last_line_item  = order.contents.add(product3.master)
+          @last_line_item.update_columns(created_at: 1.day.from_now)
+        end
+
+        it 'orders the items in a shipment by created_at' do
+          visit spree.edit_admin_order_path(order)
+
+          stock_items = page.all(:css, '.stock-item', count: 3)
+
+          expect(stock_items[0]).to have_text(@first_line_item.variant.sku)
+          expect(stock_items[1]).to have_text(@middle_line_item.variant.sku)
+          expect(stock_items[2]).to have_text(@last_line_item.variant.sku)
+        end
+      end
     end
   end
 

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

@@ -27,7 +27,7 @@ describe 'Payments', type: :feature do
         create(:payment,
           order:          order,
           amount:         order.outstanding_balance,
-          payment_method: create(:check_payment_method) # Check
+          payment_method: create(:check_payment_method, available_to_admin: true) # Check
         )
       end