45 Commits

Author	SHA1	Message	Date
Gaetan Craig-Riou	d073a181e9	Fix EnterpriseRelationship	2024-07-03 10:17:49 +10:00
cyrillefr	404fcf1f72	Fix FixRailsWhereEquals ... - fixes offenses caused by RuboCop::Cop::Rails::WhereEquals cop	2024-04-09 10:44:02 +02:00
Neal Chambers	4ffd3759cc	Fix Style/HashSyntax	2023-09-12 23:19:05 +09:00
Neal Chambers	06e217c527	Safely autocorrect Rails/WhereNot ... Inspecting 1483 files ........................................................................................................................C..................................................................................................................C...........CC.C..........................................C......C..........C.........................C......................CC..........C........................................................................................................................C.......................................................................................................C........................................................C...........................................................................................................................................C......................................C......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... Offenses: app/controllers/spree/admin/products_controller.rb:183:11: C: [Corrected] Rails/WhereNot: Use where.not(spree_variants: { import_date: nil }) instead of manually constructing negated SQL in where. where('spree_variants.import_date IS NOT NULL'). ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/concerns/permalink_generator.rb:37:26: C: [Corrected] Rails/WhereNot: Use where.not(id: id) instead of manually constructing negated SQL in where. scope_with_deleted.where('id != ?', id) ^^^^^^^^^^^^^^^^^^^^ app/models/concerns/permalink_generator.rb:37:40: C: [Corrected] Style/HashSyntax: Omit the hash value. scope_with_deleted.where.not(id: id) ^^ app/models/enterprise.rb:152:7: C: [Corrected] Rails/WhereNot: Use where.not(enterprises: { id: ready_enterprises }) instead of manually constructing negated SQL in where. where("enterprises.id NOT IN (?)", ready_enterprises) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:158:31: C: [Corrected] Rails/WhereNot: Use where.not(sells: 'none') instead of manually constructing negated SQL in where. scope :is_distributor, -> { where('sells != ?', 'none') } ^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:479:17: C: [Corrected] Rails/WhereNot: Use where.not(id: id) instead of manually constructing negated SQL in where. dups = dups.where('id != ?', id) unless new_record? ^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:534:43: C: [Corrected] Rails/WhereNot: Use where.not(enterprises: { id: self }) instead of manually constructing negated SQL in where. enterprises = owner.owned_enterprises.where('enterprises.id != ?', self) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:583:7: C: [Corrected] Rails/WhereNot: Use where.not(enterprises: { id: id }) instead of manually constructing negated SQL in where. where('enterprises.id != ?', id). ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise_fee.rb:40:24: C: [Corrected] Rails/WhereNot: Use where.not(spree_calculators: { type: PER_ORDER_CALCULATORS }) instead of manually constructing negated SQL in where. joins(:calculator).where('spree_calculators.type NOT IN (?)', PER_ORDER_CALCULATORS) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise_relationship.rb:78:19: C: [Corrected] Rails/WhereNot: Use where.not(name: perms) instead of manually constructing negated SQL in where. permissions.where('name NOT IN (?)', perms).destroy_all ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/product_import/inventory_reset_strategy.rb:27:16: C: [Corrected] Rails/WhereNot: Use where.not(id: excluded_items_ids) instead of manually constructing negated SQL in where. relation.where('id NOT IN (?)', excluded_items_ids) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/proxy_order.rb:19:25: C: [Corrected] Rails/WhereNot: Use where.not(proxy_orders: { canceled_at: nil }) instead of manually constructing negated SQL in where. scope :canceled, -> { where('proxy_orders.canceled_at IS NOT NULL') } ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/credit_card.rb:26:39: C: [Corrected] Rails/WhereNot: Use where.not(gateway_customer_profile_id: nil) instead of manually constructing negated SQL in where. scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') } ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/product.rb:166:9: C: [Corrected] Rails/WhereNot: Use where.not(order_cycles: { id: nil }) instead of manually constructing negated SQL in where. where('order_cycles.id IS NOT NULL') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/variant.rb:94:30: C: [Corrected] Rails/WhereNot: Use where.not(deleted_at: nil) instead of manually constructing negated SQL in where. scope :deleted, lambda { where('deleted_at IS NOT NULL') } ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/variant.rb:165:43: C: [Corrected] Rails/WhereNot: Use where.not(spree_prices: { amount: nil }) instead of manually constructing negated SQL in where. where('spree_prices.amount IS NOT NULL'). ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/zone.rb:141:19: C: [Corrected] Rails/WhereNot: Use where.not(id: id) instead of manually constructing negated SQL in where. Spree::Zone.where('id != ?', id).update_all(default_tax: false) if default_tax ^^^^^^^^^^^^^^^^^^^^ app/models/spree/zone.rb:141:33: C: [Corrected] Style/HashSyntax: Omit the hash value. Spree::Zone.where.not(id: id).update_all(default_tax: false) if default_tax ^^ app/models/variant_override.rb:32:7: C: [Corrected] Rails/WhereNot: Use where.not(variant_overrides: { import_date: nil }) instead of manually constructing negated SQL in where. where('variant_overrides.import_date IS NOT NULL'). ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/services/cap_quantity.rb:45:22: C: [Corrected] Rails/WhereNot: Use where.not(variant_id: available_variants_for.select(&:id)) instead of manually constructing negated SQL in where. order.line_items.where('variant_id NOT IN (?)', available_variants_for.select(&:id)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ engines/catalog/app/services/catalog/product_import/products_reset_strategy.rb:32:18: C: [Corrected] Rails/WhereNot: Use where.not(spree_variants: { id: excluded_items_ids }) instead of manually constructing negated SQL in where. relation.where('spree_variants.id NOT IN (?)', excluded_items_ids) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb:78:18: C: [Corrected] Rails/WhereNot: Use where.not(order_cycle_id: order_cycle_ids) instead of manually constructing negated SQL in where. orphaned.where('order_cycle_id NOT IN (?)', order_cycle_ids) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/reporting/reports/users_and_enterprises/base.rb:27:14: C: [Corrected] Rails/WhereNot: Use where.not(enterprises: { id: nil }) instead of manually constructing negated SQL in where. .where("enterprises.id IS NOT NULL") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/reporting/reports/users_and_enterprises/base.rb:39:14: C: [Corrected] Rails/WhereNot: Use where.not(enterprise_id: nil) instead of manually constructing negated SQL in where. .where("enterprise_id IS NOT NULL") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/reporting/reports/users_and_enterprises/base.rb:40:14: C: [Corrected] Rails/WhereNot: Use where.not(user_id: nil) instead of manually constructing negated SQL in where. .where("user_id IS NOT NULL") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/tasks/data/anonymize_data.rake:50:16: C: [Corrected] Rails/WhereNot: Use where.not(user_id: nil) instead of manually constructing negated SQL in where. Customer.where("user_id IS NOT NULL") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1483 files inspected, 26 offenses detected, 26 offenses corrected	2023-08-20 12:33:43 +09:00
Maikel Linke	4a13576f78	Remove now superfluous belongs_to default declaration	2023-08-11 10:14:47 +10:00
Maikel Linke	cb494b84f2	Require EnterpriseRelationship.belongs_to by default	2023-08-11 10:13:29 +10:00
Neal Chambers	44cf2faa1e	Safely autocorrect Rails/ActiveRecordCallbacksOrder ... Inspecting 1481 files ...........................................................................................................................................................................................................................................................C..C.CC........................................................................C...C..........C..C..................CC........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................ Offenses: app/models/customer.rb:32:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_validation is supposed to appear before before_destroy. before_validation :downcase_email ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/customer.rb:33:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_validation is supposed to appear before before_destroy. before_validation :empty_code ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/customer.rb:34:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/models/customer.rb:49:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/models/customer.rb:49:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_create is supposed to appear before before_destroy. before_create :associate_user ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:129:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before after_touch. after_create :set_default_contact ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:130:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before after_touch. after_create :relate_to_owners_enterprises ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:133:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_rollback is supposed to appear before after_touch. after_rollback :restore_permalink ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise.rb:134:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/models/enterprise_group.rb:18:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_save is supposed to appear before after_find. after_save :unset_undefined_address_fields ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise_group.rb:18:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_validation is supposed to appear before after_save. before_validation :sanitize_permalink ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise_group.rb:19:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_validation is supposed to appear before after_find. before_validation :sanitize_permalink ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise_group.rb:23:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_validation is supposed to appear before after_save. before_validation :sanitize_permalink ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise_relationship.rb:15:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_destroy is supposed to appear before after_save. before_destroy :revoke_all_child_variant_overrides ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/enterprise_relationship.rb:16:3: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_destroy is supposed to appear before after_save. before_destroy :destroy_related_exchanges ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/order.rb:108:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_save is supposed to appear before before_create. before_save :update_shipping_fees!, if: :complete? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/order.rb:109:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_save is supposed to appear before before_create. before_save :update_payment_fees!, if: :complete? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:30:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_initialize is supposed to appear before before_create. after_initialize :build_source ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:32:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_initialize is supposed to appear before after_create. after_initialize :build_source ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:33:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before after_save. after_create :invalidate_old_payments ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:34:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_initialize is supposed to appear before after_save. after_initialize :build_source ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:35:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before after_save. after_create :invalidate_old_payments ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:36:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_initialize is supposed to appear before after_save. after_initialize :build_source ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:46:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_initialize is supposed to appear before after_create. after_initialize :build_source ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/payment.rb:47:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/models/spree/product.rb:87:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before after_save. after_create :ensure_standard_variant ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/return_authorization.rb:12:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: before_save is supposed to appear before before_create. before_save :force_positive_amount ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/user.rb:49:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before before_destroy. after_create :associate_customers, :associate_orders ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/user.rb:50:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/models/spree/variant.rb:88:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before after_save. after_create :create_stock_items ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/variant.rb:89:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: after_create is supposed to appear before after_save. after_create :set_position ^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/variant.rb:90:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/models/spree/variant.rb:91:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/models/spree/variant.rb:91:5: C: [Corrected] Rails/ActiveRecordCallbacksOrder: around_destroy is supposed to appear before after_save. around_destroy :destruction ^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/variant.rb:92:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. 1481 files inspected, 35 offenses detected, 35 offenses corrected	2023-08-01 22:50:21 +09:00
Neal Chambers	77733169fc	Update OCs after ERs Permissions are Revoked	2023-04-04 09:37:13 +09:00
Maikel Linke	1364b878fe	Add ApplicationRecord for customisations ... Rails 5 introduced this new class to confine application-specific monkey patches to our models only, and not leak into other libraries using ActiveRecord::Base. https://bigbinary.com/blog/application-record-in-rails-5	2021-04-15 15:59:03 +10:00
Matt-Yorkley	26ed44412f	Update #validates definitions ... Where the presence of an object is being validated and that object comes from an *association*, we should use `validates :object, presence: true` instead of `validates :object_id, presence: true`. This does not apply in the same way to validations on uniqueness of certain attributes, such as `validates :object_id, uniqueness...`	2021-03-24 15:43:09 +00:00
Matt-Yorkley	2d9d293405	Replace deprecated use of :reload argument	2021-03-16 12:04:35 +00:00
Luis Ramos	9c0c324835	Add some requires now required as spree does not contain controller helpers	2020-09-04 14:30:17 +01:00
Luis Ramos	32a4355f09	Merge branch 'master' into 3-0-stable-mar6	2020-03-12 16:54:09 +00:00
Matt-Yorkley	a8b8269a02	Update deprecated #find_or_initialize_by_* methods	2020-02-22 11:06:51 +00:00
Luis Ramos	1eba17f048	Make select column explicit to avoid too many columns sql error	2020-02-18 18:32:52 +00:00
luisramos0	5184fa540c	Adapt enterprise_relationship permitting and permitted_by scopes to rails 4	2019-07-03 20:18:00 +01:00
luisramos0	06c0b1375b	Fix rubocop issues in enterprise_relationship model	2019-05-28 16:07:10 +01:00
luisramos0	ffbd79d3dd	Change all model scopes without a callable object to use a proc	2019-05-28 15:55:13 +01:00
luisramos0	86b0d71c7e	Result of rubocop auto-correct and rebuilding rubocop_manual_todo	2019-05-28 12:57:29 +01:00
luisramos0	9079437284	Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted	2018-10-20 12:32:51 +01:00
luisramos0	5ae0ad87a7	Refactor EnterpriseRelationship before save hook: some renames and extract methods	2018-10-20 11:52:11 +01:00
Pau Perez	cee24dcca7	Use indented style for multiline method calls ... This enables the Rubocop's Style/MultilineMethodCallIndentation cop with indentend enforced style. Which makes you split multiline method calls like: orders = Spree::Order .an_scope .another_scope .where(id: list_of_ids) It also autofixes the current violations and updates the rubocop_todo.yml	2017-07-12 10:40:53 +02:00
Rob Harrington	7bb58342fc	Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences	2017-06-23 16:49:08 +10:00
Maikel Linke	2a3b3b6dd2	Merge remote-tracking branch 'origin/master' into i18n-hackathon ... Conflicts: app/assets/javascripts/admin/enterprise_fees.js app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee app/views/admin/shared/_columns_dropdown.html.haml app/views/admin/variant_overrides/_header.html.haml app/views/admin/variant_overrides/_products.html.haml spec/features/admin/bulk_order_management_spec.rb spec/features/admin/variant_overrides_spec.rb	2016-03-11 15:38:28 +11:00
Rob Harrington	4bf27982f4	Applying variant override permissions when they are added or removed ... Also remove variant overrides with revoked permissions from the default scope	2016-03-02 12:10:49 +11:00
Emmanuel	5e081ce3ee	Translations of validation messages in app/models	2015-12-21 10:11:08 +01:00
Rohan Mitchell	0dbecce65d	Optimise relatives including self - minor improvement	2015-06-16 17:43:13 +10:00
Rob Harrington	30af5d4278	Enterprise relatives include self where appropriate for serialized injection data	2015-06-15 19:45:29 +08:00
Rohan Mitchell	3f4f8afacd	EnterpriseRelationship.relatives does not show duplicates	2015-05-29 12:19:38 +10:00
Rohan Mitchell	cdbf02ca20	EnterpriseRelationship.relatives can find activated enterprises only	2015-05-29 12:07:43 +10:00
Rohan Mitchell	cf79b90044	Load relatives of all enterprises in one go	2015-05-27 15:44:01 +10:00
Rob Harrington	96c173414b	Adding has_permission method to enterprise_relationship	2015-04-10 12:48:27 +10:00
Rohan Mitchell	c0a7d22a50	Add permitted_by scope to EnterpriseRelationship	2015-01-30 16:36:45 +11:00
Rohan Mitchell	32a2e793ad	When deleting enterprise relationships, delete dependent permissions	2014-09-10 14:49:15 +10:00
Rohan Mitchell	913c167fdf	Revert 5ede8d1, reinstating a4be0ff..7b89e6a	2014-09-05 15:10:12 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +10:00
Rohan Mitchell	1871d42e68	Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page	2014-08-28 10:09:50 +10:00
Rohan Mitchell	b9e5821497	Add EnterpriseRelationship scopes permitting and with_permission	2014-08-28 10:09:50 +10:00
Rohan Mitchell	057ad9c6d3	Set enterprise relationship permissions from a list	2014-08-25 14:54:52 +10:00
Rohan Mitchell	70feef1256	Add EnterpriseRelationshipPermission model	2014-08-25 13:26:23 +10:00
Will Marshall	79f42ccc61	Temporary/demonstration caching behaviour, INCOMPLETE	2014-07-04 13:51:22 +10:00
Rohan Mitchell	d7b4318aff	Find enterprise relationships involving any of a number of enterprises	2014-05-22 11:25:37 +10:00
Rohan Mitchell	e40843bccb	Allow error messages without attribute name. Improve enterprise relationship error message.	2014-05-21 11:29:11 +10:00
Rohan Mitchell	1a854b89ec	Sort enterprise relationships by enterprise name	2014-05-21 11:29:11 +10:00
Rohan Mitchell	6c5172c567	Add EnterpriseRelationship. An Enterprise can find its relatives.	2014-05-14 15:50:25 +10:00