From 75b24c2d4249c09ecb4863c2357c720fb97a2fa7 Mon Sep 17 00:00:00 2001 From: Nwabor Date: Tue, 14 May 2024 17:29:17 +0100 Subject: [PATCH] resolved conflict --- app/models/spree/product.rb | 3 ++- app/models/spree/tax_rate.rb | 2 +- lib/spree/core/environment_extension.rb | 2 +- spec/system/admin/variant_overrides_spec.rb | 12 ++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/models/spree/product.rb b/app/models/spree/product.rb index 219250c2cc..f5a39f182f 100755 --- a/app/models/spree/product.rb +++ b/app/models/spree/product.rb @@ -187,7 +187,8 @@ module Spree .with_permission(:add_to_order_cycle) .where(enterprises: { is_primary_producer: true }) .pluck(:parent_id) - where('spree_products.supplier_id IN (?)', [enterprise.id] | permitted_producer_ids) + # where('spree_products.supplier_id IN (?)', [enterprise.id] | permitted_producer_ids) + where(spree_products: { supplier_id: [enterprise.id] | permitted_producer_ids }) } scope :active, lambda { where(spree_products: { deleted_at: nil }) } diff --git a/app/models/spree/tax_rate.rb b/app/models/spree/tax_rate.rb index 1e93f813b0..58cabe189d 100644 --- a/app/models/spree/tax_rate.rb +++ b/app/models/spree/tax_rate.rb @@ -21,7 +21,7 @@ module Spree belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates belongs_to :tax_category, class_name: "Spree::TaxCategory", inverse_of: :tax_rates - has_many :adjustments, as: :originator, inverse_of: :adjustments + has_many :adjustments, as: :originator, dependent: true validates :amount, presence: true, numericality: true validates :tax_category, presence: true diff --git a/lib/spree/core/environment_extension.rb b/lib/spree/core/environment_extension.rb index 674ed9dbf2..56d54517ea 100644 --- a/lib/spree/core/environment_extension.rb +++ b/lib/spree/core/environment_extension.rb @@ -8,7 +8,7 @@ module Spree def add_class(name) instance_variable_set "@#{name}", Set.new - create_method( "#{name}=".to_sym ) { |val| + create_method( :"#{name}=" ) { |val| instance_variable_set( "@" + name, val) } diff --git a/spec/system/admin/variant_overrides_spec.rb b/spec/system/admin/variant_overrides_spec.rb index a06510bcd2..9e5554bc92 100644 --- a/spec/system/admin/variant_overrides_spec.rb +++ b/spec/system/admin/variant_overrides_spec.rb @@ -134,17 +134,17 @@ RSpec.describe " within "tr#v_#{variant.id}" do click_button 'Hide' end - expect(page).to have_no_selector "tr#v_#{variant.id}" + expect(page).not_to have_selector "tr#v_#{variant.id}" expect(page).to have_selector "tr#v_#{variant_related.id}" first("div#views-dropdown").click first("div#views-dropdown div.menu div.menu_item", text: "Hidden Products").click expect(page).to have_selector "tr#v_#{variant.id}" - expect(page).to have_no_selector "tr#v_#{variant_related.id}" + expect(page).not_to have_selector "tr#v_#{variant_related.id}" within "tr#v_#{variant.id}" do click_button 'Add' end - expect(page).to have_no_selector "tr#v_#{variant.id}" - expect(page).to have_no_selector "tr#v_#{variant_related.id}" + expect(page).not_to have_selector "tr#v_#{variant.id}" + expect(page).not_to have_selector "tr#v_#{variant_related.id}" first("div#views-dropdown").click first("div#views-dropdown div.menu div.menu_item", text: "Inventory Products").click expect(page).to have_selector "tr#v_#{variant.id}" @@ -502,8 +502,8 @@ RSpec.describe " within "table#new-products tr#v_#{variant2.id}" do click_button 'Hide' end - expect(page).to have_no_selector "table#new-products tr#v_#{variant1.id}" - expect(page).to have_no_selector "table#new-products tr#v_#{variant2.id}" + expect(page).not_to have_selector "table#new-products tr#v_#{variant1.id}" + expect(page).not_to have_selector "table#new-products tr#v_#{variant2.id}" click_button "Back to my inventory" expect(page).to have_selector "table#variant-overrides tr#v_#{variant1.id}"