955 Commits

Author	SHA1	Message	Date
luisramos0	25451eed6b	Bring api spec helpers from spree_api into ofn/api_helper	2019-07-31 09:36:48 +01:00
luisramos0	2ae75ce13e	Add ControllerSetup from spree_api as it is used in spree/api/base_controller	2019-07-31 09:35:46 +01:00
Luis Ramos	340b92e580	Merge pull request #3700 from luisramos0/2-0-without-auth-devise ... Remove dependency to spree_auth_devise	2019-07-26 10:57:38 +01:00
Luis Ramos	a6a695660f	Merge pull request #4002 from luisramos0/more_rails4 ... Adapting queries in permissions to Rails 4	2019-07-19 15:17:01 +01:00
Maikel	869431c68d	Merge pull request #3926 from mkllnk/report-missing-payments ... Add rake task to report lost payments	2019-07-18 15:01:14 +10:00
luisramos0	e897eb0439	Remove Spree::BaseController.class_eval, these methods are already in the application helper through spree::application_helpers ... We can ignore the difference in spree_logout_path as spree.logout_path is the user_sessions#destroy route	2019-07-08 13:59:26 +01:00
luisramos0	10e123a9c4	Move spree/authentication_helpers injection from spree initializers directly to the application_controller ... Also, switch from using send to public_send making rubocop happier	2019-07-08 13:11:57 +01:00
luisramos0	17448699f9	Bring devise initializer from spree_auth_devise and fix spree initializer details	2019-07-05 22:45:59 +01:00
Pau Perez	f42bf72b32	Fix rubocop violations ... It's not affordable to fix the failed Metrics cops in the scope of this bug fix, but now, with a separate class, it'll be easier.	2019-07-05 18:19:58 +02:00
Pau Perez	9b03833df0	Extract orders & fulfillments default report clasts	2019-07-05 18:19:58 +02:00
Pau Perez	fada30435f	DRY some procs from report	2019-07-05 18:19:58 +02:00
luisramos0	a5b5e5de32	Remove trailing backslash	2019-07-05 10:58:53 +01:00
Pau Perez	db7b7bbde2	Fix finding supplier for a deleted product	2019-07-04 18:52:56 +02:00
luisramos0	ef61310bad	Fix long lines in order_cycle_permissions and permissions	2019-07-04 17:17:58 +01:00
Pau Perez	ee301c5e2f	Address Code Climate (rubocop) issues	2019-07-04 17:01:06 +02:00
Pau Perez	4d060815d0	Extract unscoping logic into method ... DRYies out the code a bit.	2019-07-04 17:01:06 +02:00
Pau Perez	f91bd03c25	Add clarifying comment to report	2019-07-04 17:01:06 +02:00
Pau Perez	7de4ec2a90	Fix orders and fulfillments report ... It bypasses the default_scope to retrieve deleted variants in the orders and fulfillment report.	2019-07-04 17:01:06 +02:00
Pau Perez	812d8cac4a	Make complex method a bit more readable	2019-07-04 17:01:06 +02:00
luisramos0	dee1c3d139	Fix typo in order_cycle_permissions.rb	2019-07-03 22:58:33 +01:00
luisramos0	bb9c54a445	Use enterprises.id instead of :id to remove ambiguous column errors	2019-07-03 22:03:40 +01:00
luisramos0	e5f396f975	Fix Permissions.related_enterprises_granted by adding explicit reference to table	2019-07-03 20:18:01 +01:00
luisramos0	a57a93d414	Adapt permissions.rb and order_cycle_permissions to rails 4	2019-07-03 20:18:01 +01:00
luisramos0	a82b1d8129	Adapt exchange.involving scope to rails 4	2019-07-03 20:18:00 +01:00
luisramos0	5184fa540c	Adapt enterprise_relationship permitting and permitted_by scopes to rails 4	2019-07-03 20:18:00 +01:00
Luis Ramos	951787d456	Merge pull request #3987 from mkllnk/3978-optimise-products-cache ... 3978 Optimise products cache	2019-07-03 19:59:07 +01:00
Pau Pérez Fabregat	b3b66d5825	Merge pull request #3970 from mkllnk/444-feature-toggle-use-env ... Toggle features via env instead of initializer	2019-07-03 16:27:01 +02:00
Maikel Linke	04b07a1ff5	Further optimise querying affected exchanges ... The implementation queried the database for each incoming variant that was changed. This rewrite combines ActiveRecord relations so that it creates only one query. This saves another 5-10% of execution time when updating enterprise fees on production instances.	2019-07-02 18:42:01 +10:00
Maikel Linke	0da7c93bc6	Collect affected exchanges more efficiently ... When an incoming exchange of an order cycle changes, the ProductsCache queries all affected outgoing exchanges to update them. It was creating a big collection of exchanges with duplicates and then calling `uniq`. That call was hitting a custom implementation of `eql?` which is very inefficient. And since `Exchange.eql?` is ignoring the order cycle id, it was probably filtering too many exchanges from the collection. Fixed bug: If two order cycles sell exactly the same variants to the same shop, the two outgoing exchanges are seen as equal. When the variants change, ProductsCache would only update one of those two exchanges, leaving one order cycle out of sync. This case is very rare. It only happens if there is a shop with two active order cycles selling exactly the same. The new uniqueness test looks only at the attributes that are later used to refresh the cache. I measured a page speed improvement from 90 seconds to 3 seconds (30 times faster).	2019-07-02 18:29:50 +10:00
Maikel Linke	bfe41d4cbc	Extract method to simplify	2019-07-02 18:29:50 +10:00
Maikel Linke	3e6e0b73ee	Style products cache ... The `private` modifier doesn't affect class methods. Class methods have to be declared as private separately. Also using more guard clauses, brackets and linebreaks.	2019-07-02 18:29:49 +10:00
Maikel Linke	5d3dbca9c3	Toggle features via env instead of initializer ... A FeatureToggle could be switched via a class_eval in an initializer. The initializer was installed via ofn-install. We want to get rid of custom, untracked initializers. Here I'm changing the FeatureToggle class to use environment variables instead. This change needs to be followed up with a change in ofn-install to use the new environment variable. It affects only Australian production.	2019-06-26 11:43:22 +10:00
François Turbelin	5dcf456c90	Remove old Rake task for sample data	2019-06-25 11:18:48 +02:00
Matt-Yorkley	60e67ae1a4	Run all setup steps on startup ... It's a bit dirty, but it works :)	2019-06-25 11:18:48 +02:00
François Turbelin	c5addb8c1d	Fix comment spacings, gloupsss	2019-06-25 11:18:48 +02:00
François Turbelin	b4fe44510b	Tune up the Rake task	2019-06-25 11:18:48 +02:00
François Turbelin	9df5d78f27	Add a Rake task in order to setup dev env	2019-06-25 11:18:48 +02:00
Maikel	5b0c8bbaef	Merge pull request #3836 from Matt-Yorkley/fast_and_furious2 ... Improve /shops, /producers, and /groups performance	2019-06-21 15:02:19 +10:00
Maikel Linke	ee65d70eec	Deal with empty payments sequence ... The task was crashing when there were no payments in the query range.	2019-06-19 09:58:47 +10:00
luisramos0	b025df1798	Fix a few more rubocop issues	2019-06-18 10:52:56 +01:00
luisramos0	ba91abd20e	Adapt exchanges.with_any_variant scope to rails 4	2019-06-18 10:40:49 +01:00
Luis Ramos	91401446a5	Merge pull request #3915 from mkllnk/3844-permalink-conflicts ... Consider deleted products when creating permalinks	2019-06-14 13:20:35 +01:00
Maikel Linke	bf8a31abda	Add rake task to report lost payments ... In rare cases, payment records can get lost through database rollbacks. This new rake task tries to find log entries for lost transactions and reports them as CSV.	2019-06-14 11:10:31 +10:00
Matt-Yorkley	45d65baf8e	Improve shops performance	2019-06-12 09:47:01 +01:00
Maikel Linke	a10bb5acbd	Consider deleted products when creating permalinks ... https://github.com/openfoodfoundation/openfoodnetwork/issues/3844 Spree's implementation and our implementation to create a unique permalink failed to notice conflicts with soft-deleted products. This patch looks at deleted products as well.	2019-06-11 18:20:41 +10:00
Kristina Lim	75fdfb3c6a	Remove some usage of guard clauses for OC update	2019-05-28 21:32:25 +08:00
Kristina Lim	56a2347ea0	Extract removal of unauthorized OC exchange attributes to method	2019-05-28 21:29:20 +08:00
Kristina Lim	ea8d189d6c	Bulk update OC variant changes in OC form	2019-05-28 21:27:43 +08:00
luisramos0	07854cf372	Fix a few problems introduced by rubocop auto correct	2019-05-28 12:57:29 +01:00
luisramos0	86b0d71c7e	Result of rubocop auto-correct and rebuilding rubocop_manual_todo	2019-05-28 12:57:29 +01:00