Fix rebase issue

spec/helpers/admin/orders_helper_spec.rb

@@ -70,7 +70,8 @@ RSpec.describe Admin::OrdersHelper, type: :helper do
       }
       let!(:ship_address){ create(:ship_address) }
       let!(:product) {
-        create(:simple_product, supplier: enterprise, price: 10, tax_category_id: tax_category.id)
+        create(:simple_product, supplier_id: enterprise.id, price: 10,
+                                tax_category_id: tax_category.id)
       }
       let!(:variant){
         create(:variant, :with_order_cycle, product:, distributor: enterprise, order_cycle:,

spec/system/admin/products_spec.rb

@@ -670,7 +670,7 @@ RSpec.describe '
 
       it "checks error when creating product image with unsupported format" do
         unsupported_image_file_path = Rails.root.join("README.md").to_s
-        product = create(:simple_product, supplier_id: @supplier2.id)
+        product = create(:simple_product, supplier_id: supplier2.id)
 
         image = white_logo_file
         Spree::Image.create(viewable_id: product.id, viewable_type: 'Spree::Product',

spec/system/admin/reports_spec.rb

@@ -385,7 +385,8 @@ RSpec.describe '
     let(:product2) {
       create(:simple_product, name: "Product 2", price: 99.0, variant_unit: 'weight',
                               variant_unit_scale: 1, unit_value: '100',
-                              primary_taxon_id: taxon.id, sku: "product_sku", supplier_id: supplier.id)
+                              primary_taxon_id: taxon.id, sku: "product_sku",
+                              supplier_id: supplier.id)
     }
     let(:variant1) { product1.variants.first }
     let(:variant2) { create(:variant, product: product1, price: 80.0, primary_taxon: taxon, supplier:) }