From bf9db13bb38873841aaf0c0267b4d54cf1ea7c61 Mon Sep 17 00:00:00 2001 From: Neal Chambers Date: Thu, 14 Sep 2023 11:04:59 +0900 Subject: [PATCH] Fix Style/HashSyntax --- app/services/address_geocoder.rb | 2 +- app/services/customer_syncer.rb | 4 ++-- app/services/exchange_variant_bulk_updater.rb | 2 +- app/services/image_importer.rb | 2 +- app/services/order_cycle_warning.rb | 4 ++-- app/services/order_invoice_comparator.rb | 2 +- app/services/order_syncer.rb | 6 +++--- app/services/products_renderer.rb | 2 +- app/services/recurring_payments.rb | 2 +- app/services/shop/order_cycles_list.rb | 2 +- app/services/voucher_adjustments_service.rb | 4 ++-- engines/dfc_provider/app/services/dfc_builder.rb | 2 +- .../spec/services/quantitative_value_builder_spec.rb | 2 +- .../spec/support/authorization_helper.rb | 2 +- .../app/services/order_management/stock/estimator.rb | 2 +- .../subscriptions/proxy_order_syncer.rb | 2 +- .../order_management/subscriptions/validator.rb | 2 +- .../services/order_management/order/updater_spec.rb | 12 ++++++------ .../services/order_management/stock/package_spec.rb | 4 ++-- .../services/order_management/stock/packer_spec.rb | 4 ++-- .../order_management/subscriptions/estimator_spec.rb | 4 ++-- .../subscriptions/payment_setup_spec.rb | 4 ++-- .../subscriptions/proxy_order_syncer_spec.rb | 10 +++++----- .../subscriptions/stripe_payment_setup_spec.rb | 2 +- .../order_management/subscriptions/validator_spec.rb | 6 +++--- .../subscriptions/variants_list_spec.rb | 4 ++-- engines/web/app/helpers/web/cookies_policy_helper.rb | 6 +++--- engines/web/lib/web/cookies_consent.rb | 4 ++-- lib/open_food_network/address_finder.rb | 4 ++-- lib/open_food_network/enterprise_fee_applicator.rb | 4 ++-- 30 files changed, 56 insertions(+), 56 deletions(-) diff --git a/app/services/address_geocoder.rb b/app/services/address_geocoder.rb index ba63715667..789e0695d4 100644 --- a/app/services/address_geocoder.rb +++ b/app/services/address_geocoder.rb @@ -10,7 +10,7 @@ class AddressGeocoder return unless latitude.present? && longitude.present? - address.update(latitude: latitude, longitude: longitude) + address.update(latitude:, longitude:) end private diff --git a/app/services/customer_syncer.rb b/app/services/customer_syncer.rb index f97b845c64..43c301bc42 100644 --- a/app/services/customer_syncer.rb +++ b/app/services/customer_syncer.rb @@ -18,7 +18,7 @@ class CustomerSyncer return unless email && customer && email != customer.email - duplicate = Customer.find_by(email: email, enterprise: order.distributor) + duplicate = Customer.find_by(email:, enterprise: order.distributor) if duplicate.present? Spree::Order.where(customer_id: duplicate.id).update_all(customer_id: customer.id) @@ -27,7 +27,7 @@ class CustomerSyncer duplicate.destroy end - customer.update(email: email) + customer.update(email:) end def self.create_customer(order) diff --git a/app/services/exchange_variant_bulk_updater.rb b/app/services/exchange_variant_bulk_updater.rb index 3e5345fff2..6c0603f321 100644 --- a/app/services/exchange_variant_bulk_updater.rb +++ b/app/services/exchange_variant_bulk_updater.rb @@ -27,7 +27,7 @@ class ExchangeVariantBulkUpdater return if variant_ids.blank? new_exchange_variants = variant_ids.map do |variant_id| - ExchangeVariant.new(exchange_id: @exchange.id, variant_id: variant_id) + ExchangeVariant.new(exchange_id: @exchange.id, variant_id:) end ExchangeVariant.import!(new_exchange_variants) end diff --git a/app/services/image_importer.rb b/app/services/image_importer.rb index bdf32fcf2a..377881fa00 100644 --- a/app/services/image_importer.rb +++ b/app/services/image_importer.rb @@ -7,7 +7,7 @@ class ImageImporter filename = File.basename(valid_url.path) Spree::Image.create( - attachment: { io: file, filename: filename }, + attachment: { io: file, filename: }, viewable_id: product.id, viewable_type: Spree::Product, ) diff --git a/app/services/order_cycle_warning.rb b/app/services/order_cycle_warning.rb index 5f8b532f68..7e7afad8d8 100644 --- a/app/services/order_cycle_warning.rb +++ b/app/services/order_cycle_warning.rb @@ -28,10 +28,10 @@ class OrderCycleWarning if distributors.count > 1 I18n.t(:active_distributors_not_ready_for_checkout_message_plural, - distributor_names: distributor_names) + distributor_names:) else I18n.t(:active_distributors_not_ready_for_checkout_message_singular, - distributor_names: distributor_names) + distributor_names:) end end end diff --git a/app/services/order_invoice_comparator.rb b/app/services/order_invoice_comparator.rb index bd19f9dabe..d306a972ce 100644 --- a/app/services/order_invoice_comparator.rb +++ b/app/services/order_invoice_comparator.rb @@ -65,7 +65,7 @@ class OrderInvoiceComparator def current_state_invoice @current_state_invoice ||= Invoice.new( - order: order, + order:, data: serialize_for_invoice, date: Time.zone.today, number: invoices.count + 1 diff --git a/app/services/order_syncer.rb b/app/services/order_syncer.rb index 7ba47823e3..83ed767426 100644 --- a/app/services/order_syncer.rb +++ b/app/services/order_syncer.rb @@ -13,7 +13,7 @@ class OrderSyncer def sync! orders_in_order_cycles_not_closed.all? do |order| - order.assign_attributes(customer_id: customer_id, email: customer&.email, + order.assign_attributes(customer_id:, email: customer&.email, distributor_id: shop_id) update_associations_for(order) line_item_syncer.sync!(order) @@ -60,9 +60,9 @@ class OrderSyncer with_state('checkout').where(payment_method_id: payment_method_id_was).last if payment payment&.void_transaction! - order.payments.create(payment_method_id: payment_method_id, amount: order.reload.total) + order.payments.create(payment_method_id:, amount: order.reload.total) else - unless order.payments.with_state('checkout').where(payment_method_id: payment_method_id).any? + unless order.payments.with_state('checkout').where(payment_method_id:).any? order_update_issues.add(order, I18n.t('admin.payment_method')) end end diff --git a/app/services/products_renderer.rb b/app/services/products_renderer.rb index 50bdae4066..99745ca451 100644 --- a/app/services/products_renderer.rb +++ b/app/services/products_renderer.rb @@ -23,7 +23,7 @@ class ProductsRenderer current_order_cycle: order_cycle, current_distributor: distributor, variants: variants_for_shop_by_id, - enterprise_fee_calculator: enterprise_fee_calculator).to_json + enterprise_fee_calculator:).to_json end private diff --git a/app/services/recurring_payments.rb b/app/services/recurring_payments.rb index e7c9e682fe..3062d1a1d2 100644 --- a/app/services/recurring_payments.rb +++ b/app/services/recurring_payments.rb @@ -9,7 +9,7 @@ class RecurringPayments Stripe::CreditCardCloner.new(card, stripe_account).find_or_clone setup_intent = Stripe::SetupIntent.create( { payment_method: payment_method_id, customer: customer_id }, - stripe_account: stripe_account + stripe_account: ) setup_intent.client_secret end diff --git a/app/services/shop/order_cycles_list.rb b/app/services/shop/order_cycles_list.rb index 2328b0b0b7..7f3ab665a3 100644 --- a/app/services/shop/order_cycles_list.rb +++ b/app/services/shop/order_cycles_list.rb @@ -9,7 +9,7 @@ module Shop def self.ready_for_checkout_for(distributor, customer) new(distributor, customer).call.select do |order_cycle| - order = Spree::Order.new(distributor: distributor, order_cycle: order_cycle) + order = Spree::Order.new(distributor:, order_cycle:) OrderAvailablePaymentMethods.new(order, customer).to_a.any? && OrderAvailableShippingMethods.new(order, customer).to_a.any? end diff --git a/app/services/voucher_adjustments_service.rb b/app/services/voucher_adjustments_service.rb index 98a4c63f5e..dfd926a489 100644 --- a/app/services/voucher_adjustments_service.rb +++ b/app/services/voucher_adjustments_service.rb @@ -76,8 +76,8 @@ class VoucherAdjustmentsService return unless amount != adjustment.amount || included_tax != 0 adjustment.update_columns( - amount: amount, - included_tax: included_tax, + amount:, + included_tax:, updated_at: Time.zone.now ) end diff --git a/engines/dfc_provider/app/services/dfc_builder.rb b/engines/dfc_provider/app/services/dfc_builder.rb index d67630c5a0..b3b3373172 100644 --- a/engines/dfc_provider/app/services/dfc_builder.rb +++ b/engines/dfc_provider/app/services/dfc_builder.rb @@ -9,7 +9,7 @@ class DfcBuilder product = SuppliedProductBuilder.supplied_product(variant) DataFoodConsortium::Connector::CatalogItem.new( - id, product: product, + id, product:, sku: variant.sku, stockLimitation: stock_limitation(variant), offers: [offer(variant)], diff --git a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb index 4d4382931a..20b3f46d1e 100644 --- a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb +++ b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb @@ -4,7 +4,7 @@ require_relative "../spec_helper" describe QuantitativeValueBuilder do subject(:builder) { described_class } - let(:variant) { build(:variant, product: product) } + let(:variant) { build(:variant, product:) } let(:product) { build(:product, name: "Apple") } describe ".quantity" do diff --git a/engines/dfc_provider/spec/support/authorization_helper.rb b/engines/dfc_provider/spec/support/authorization_helper.rb index c6e32f86b5..85f622115b 100644 --- a/engines/dfc_provider/spec/support/authorization_helper.rb +++ b/engines/dfc_provider/spec/support/authorization_helper.rb @@ -2,7 +2,7 @@ module AuthorizationHelper def auth_header(email) - token = allow_token_for(email: email) + token = allow_token_for(email:) { "Authorization" => "JWT #{token}" } end diff --git a/engines/order_management/app/services/order_management/stock/estimator.rb b/engines/order_management/app/services/order_management/stock/estimator.rb index 6cc57d7fe5..9206faccfe 100644 --- a/engines/order_management/app/services/order_management/stock/estimator.rb +++ b/engines/order_management/app/services/order_management/stock/estimator.rb @@ -17,7 +17,7 @@ module OrderManagement shipping_methods.each do |shipping_method| cost = calculate_cost(shipping_method, package) - shipping_rates << shipping_method.shipping_rates.new(cost: cost) unless cost.nil? + shipping_rates << shipping_method.shipping_rates.new(cost:) unless cost.nil? end shipping_rates.sort_by! { |r| r.cost || 0 } diff --git a/engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb b/engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb index bdb5737090..9c50e175d5 100644 --- a/engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb +++ b/engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb @@ -40,7 +40,7 @@ module OrderManagement uninitialised_order_cycle_ids.each do |order_cycle_id| Rails.logger.info "Initializing Proxy Order " \ "of subscription #{@subscription.id} in order cycle #{order_cycle_id}" - proxy_orders << ProxyOrder.new(subscription: subscription, order_cycle_id: order_cycle_id) + proxy_orders << ProxyOrder.new(subscription:, order_cycle_id:) end end diff --git a/engines/order_management/app/services/order_management/subscriptions/validator.rb b/engines/order_management/app/services/order_management/subscriptions/validator.rb index e9eab98a6e..4808d7353c 100644 --- a/engines/order_management/app/services/order_management/subscriptions/validator.rb +++ b/engines/order_management/app/services/order_management/subscriptions/validator.rb @@ -116,7 +116,7 @@ module OrderManagement return if available_variant_ids.include? variant.id name = "#{variant.product.name} - #{variant.full_name}" - errors.add(:subscription_line_items, :not_available, name: name) + errors.add(:subscription_line_items, :not_available, name:) end def available_variant_ids diff --git a/engines/order_management/spec/services/order_management/order/updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb index fd549e415a..921c4cc18a 100644 --- a/engines/order_management/spec/services/order_management/order/updater_spec.rb +++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb @@ -10,7 +10,7 @@ module OrderManagement context "updating order totals" do before do - 2.times { create(:line_item, order: order, price: 10) } + 2.times { create(:line_item, order:, price: 10) } end it "updates payment totals" do @@ -151,7 +151,7 @@ module OrderManagement end context "when the order has a payment that requires authorization" do - let!(:payment) { create(:payment, order: order, state: "requires_authorization") } + let!(:payment) { create(:payment, order:, state: "requires_authorization") } it "returns requires_authorization" do expect { @@ -161,8 +161,8 @@ module OrderManagement end context "when order has a payment that requires authorization and a completed payment" do - let!(:payment) { create(:payment, order: order, state: "requires_authorization") } - let!(:completed_payment) { create(:payment, :completed, order: order) } + let!(:payment) { create(:payment, order:, state: "requires_authorization") } + let!(:completed_payment) { create(:payment, :completed, order:) } it "returns paid" do updater.update_payment_state @@ -282,7 +282,7 @@ module OrderManagement context '#shipping_address_from_distributor' do let(:distributor) { build(:distributor_enterprise) } let(:shipment) { - create(:shipment_with, :shipping_method, shipping_method: shipping_method) + create(:shipment_with, :shipping_method, shipping_method:) } before do @@ -337,7 +337,7 @@ module OrderManagement context "and the order has legacy taxes" do let!(:legacy_tax_adjustment) { - create(:adjustment, order: order, adjustable: order, included: false, + create(:adjustment, order:, adjustable: order, included: false, originator_type: "Spree::TaxRate") } diff --git a/engines/order_management/spec/services/order_management/stock/package_spec.rb b/engines/order_management/spec/services/order_management/stock/package_spec.rb index 55d1e9a37f..5f36592a67 100644 --- a/engines/order_management/spec/services/order_management/stock/package_spec.rb +++ b/engines/order_management/spec/services/order_management/stock/package_spec.rb @@ -9,7 +9,7 @@ module OrderManagement let(:variant) { build(:variant, weight: 25.0) } let(:stock_location) { build(:stock_location) } let(:distributor) { create(:enterprise) } - let(:order) { build(:order, distributor: distributor) } + let(:order) { build(:order, distributor:) } subject { Package.new(stock_location, order) } @@ -91,7 +91,7 @@ module OrderManagement shipping_method = build(:shipping_method) subject.shipping_rates = [ - Spree::ShippingRate.new(shipping_method: shipping_method, cost: 10.00, selected: true) + Spree::ShippingRate.new(shipping_method:, cost: 10.00, selected: true) ] shipment = subject.to_shipment diff --git a/engines/order_management/spec/services/order_management/stock/packer_spec.rb b/engines/order_management/spec/services/order_management/stock/packer_spec.rb index d77fe1e071..80666eb3d4 100644 --- a/engines/order_management/spec/services/order_management/stock/packer_spec.rb +++ b/engines/order_management/spec/services/order_management/stock/packer_spec.rb @@ -6,7 +6,7 @@ module OrderManagement module Stock describe Packer do let(:distributor) { create(:distributor_enterprise) } - let(:order) { create(:order_with_line_items, line_items_count: 5, distributor: distributor) } + let(:order) { create(:order_with_line_items, line_items_count: 5, distributor:) } let(:stock_location) { create(:stock_location) } subject { Packer.new(stock_location, order) } @@ -34,7 +34,7 @@ module OrderManagement variant.on_demand = false variant.save expect { - create(:variant_override, variant: variant, hub: distributor, count_on_hand: 10) + create(:variant_override, variant:, hub: distributor, count_on_hand: 10) }.to change { subject.package.on_hand.size }.from(4).to(5) diff --git a/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb index ad14253a98..238aa8e322 100644 --- a/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb +++ b/engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb @@ -81,8 +81,8 @@ module OrderManagement describe "updating estimates for shipping and payment fees" do let(:subscription) { create(:subscription, with_items: true, - payment_method: payment_method, - shipping_method: shipping_method) + payment_method:, + shipping_method:) } let!(:sli1) { subscription.subscription_line_items.first } let!(:sli2) { subscription.subscription_line_items.second } diff --git a/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb index b0bf259c41..210c9e602f 100644 --- a/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb +++ b/engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb @@ -48,8 +48,8 @@ module OrderManagement end context "when more that one payment exists on the order" do - let!(:payment1) { create(:payment, order: order) } - let!(:payment2) { create(:payment, order: order) } + let!(:payment1) { create(:payment, order:) } + let!(:payment2) { create(:payment, order:) } before do allow(order).to receive(:new_outstanding_balance) { 7 } diff --git a/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb index 45fbdf7df9..e9307cb82a 100644 --- a/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb +++ b/engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb @@ -62,7 +62,7 @@ module OrderManagement :subscription, begins_at: now + 1.minute, ends_at: now + 2.minutes, - schedule: schedule + schedule: ) end @@ -140,7 +140,7 @@ module OrderManagement before { expect(subscription.save!).to be true } context "when a proxy order exists" do - let!(:proxy_order) { create(:proxy_order, subscription: subscription, order_cycle: oc) } + let!(:proxy_order) { create(:proxy_order, subscription:, order_cycle: oc) } context "for an oc included in the relevant schedule" do context "and the proxy order has already been placed" do @@ -228,7 +228,7 @@ module OrderManagement :subscription, begins_at: now + 1.minute, ends_at: now + 2.minutes, - schedule: schedule + schedule: ) end @@ -284,7 +284,7 @@ module OrderManagement context "for an oc not included in the relevant schedule" do let!(:proxy_order) { - create(:proxy_order, subscription: subscription, order_cycle: open_oc) + create(:proxy_order, subscription:, order_cycle: open_oc) } before do open_oc.schedule_ids = [] @@ -412,7 +412,7 @@ module OrderManagement :subscription, begins_at: now + 1.minute, ends_at: now + 2.minutes, - schedule: schedule + schedule: ) end let(:syncer) { ProxyOrderSyncer.new(subscription) } diff --git a/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb index c9f819b7bb..8e9b063f3c 100644 --- a/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb +++ b/engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb @@ -20,7 +20,7 @@ module OrderManagement end context "when a payment is present" do - let(:payment) { create(:payment, payment_method: payment_method, amount: 10) } + let(:payment) { create(:payment, payment_method:, amount: 10) } before { allow(order).to receive(:pending_payments).once { [payment] } } diff --git a/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb index 37a6003ff7..6df7740d4e 100644 --- a/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb +++ b/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb @@ -6,10 +6,10 @@ module OrderManagement module Subscriptions describe Validator do let(:owner) { create(:user) } - let(:shop) { create(:enterprise, name: "Shop", owner: owner) } + let(:shop) { create(:enterprise, name: "Shop", owner:) } describe "delegation" do - let(:subscription) { create(:subscription, shop: shop) } + let(:subscription) { create(:subscription, shop:) } let(:validator) { Validator.new(subscription) } it "delegates to subscription" do @@ -28,7 +28,7 @@ module OrderManagement describe "validations" do let(:subscription_stubs) do { - shop: shop, + shop:, customer: true, schedule: true, shipping_method: true, diff --git a/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb index 2ea3206045..0e00df50df 100644 --- a/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb +++ b/engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb @@ -12,9 +12,9 @@ module OrderManagement let!(:variant) { product.variants.first } let!(:schedule) { create(:schedule, order_cycles: [order_cycle]) } - let!(:subscription) { create(:subscription, shop: shop, schedule: schedule) } + let!(:subscription) { create(:subscription, shop:, schedule:) } let!(:subscription_line_item) do - create(:subscription_line_item, subscription: subscription, variant: variant) + create(:subscription_line_item, subscription:, variant:) end let(:current_order_cycle) do diff --git a/engines/web/app/helpers/web/cookies_policy_helper.rb b/engines/web/app/helpers/web/cookies_policy_helper.rb index 2af14e4730..bd6a593a2d 100644 --- a/engines/web/app/helpers/web/cookies_policy_helper.rb +++ b/engines/web/app/helpers/web/cookies_policy_helper.rb @@ -4,9 +4,9 @@ module Web module CookiesPolicyHelper def render_cookie_entry(cookie_name, cookie_desc, cookie_domain = nil) render partial: 'cookies_policy_entry', - locals: { cookie_name: cookie_name, - cookie_desc: cookie_desc, - cookie_domain: cookie_domain } + locals: { cookie_name:, + cookie_desc:, + cookie_domain: } end def matomo_iframe_src diff --git a/engines/web/lib/web/cookies_consent.rb b/engines/web/lib/web/cookies_consent.rb index a2f085d520..7835fa2ada 100644 --- a/engines/web/lib/web/cookies_consent.rb +++ b/engines/web/lib/web/cookies_consent.rb @@ -14,14 +14,14 @@ module Web end def destroy - cookies.delete(COOKIE_NAME, domain: domain) + cookies.delete(COOKIE_NAME, domain:) end def set cookies[COOKIE_NAME] = { value: COOKIE_NAME, expires: 1.year.from_now, - domain: domain, + domain:, httponly: true } end diff --git a/lib/open_food_network/address_finder.rb b/lib/open_food_network/address_finder.rb index 7af08a5a7c..32975f9428 100644 --- a/lib/open_food_network/address_finder.rb +++ b/lib/open_food_network/address_finder.rb @@ -77,7 +77,7 @@ module OpenFoodNetwork return nil unless allow_search_by_email? Spree::Order.joins(:bill_address).order('id DESC') - .complete.where(email: email) + .complete.where(email:) .first&.bill_address end @@ -85,7 +85,7 @@ module OpenFoodNetwork return nil unless allow_search_by_email? Spree::Order.complete.joins(:ship_address, shipments: :shipping_methods).order('id DESC') - .where(email: email, spree_shipping_methods: { require_ship_address: true }) + .where(email:, spree_shipping_methods: { require_ship_address: true }) .first&.ship_address end diff --git a/lib/open_food_network/enterprise_fee_applicator.rb b/lib/open_food_network/enterprise_fee_applicator.rb index db50ceabb5..227947777c 100644 --- a/lib/open_food_network/enterprise_fee_applicator.rb +++ b/lib/open_food_network/enterprise_fee_applicator.rb @@ -17,7 +17,7 @@ module OpenFoodNetwork label, adjustable, true, "closed", tax_category(adjustable) ) - AdjustmentMetadata.create! adjustment: adjustment, enterprise: enterprise_fee.enterprise, + AdjustmentMetadata.create! adjustment:, enterprise: enterprise_fee.enterprise, fee_name: enterprise_fee.name, fee_type: enterprise_fee.fee_type, enterprise_role: role end @@ -31,7 +31,7 @@ module OpenFoodNetwork end def base_adjustment_label - I18n.t(:enterprise_fee_by_name, name: enterprise_fee.name, role: role, + I18n.t(:enterprise_fee_by_name, name: enterprise_fee.name, role:, enterprise_name: enterprise_fee.enterprise.name) end