12963 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
luisramos0	a2a8b330b7	Add User class from spree_auth_devise as is	2019-07-05 21:58:28 +01:00
luisramos0	9669016573	Add required views from spree_auth_devise	2019-07-05 21:58:28 +01:00
luisramos0	2755cb9ec7	Add users_tab partial from spree_auth_devise	2019-07-05 21:58:28 +01:00
luisramos0	fdcc4c2447	Remove dependency to spree auth devise	2019-07-05 21:58:07 +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	8ab77b077b	Fix spec ... This needs to be revisited. I'm not sure it's the most appropriate spec as it seems to be testing just part of story.	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	fc0ffda8ec	Bring routes and controllers from spree_auth_devise	2019-07-05 15:08:42 +01:00
Luis Ramos	397729ed3d	Merge pull request #4001 from pacodelaluna/3990-display-enterprise-id-in-profile ... Display enterprise ID in profile	2019-07-05 11:14:43 +01:00
luisramos0	88312b8e4a	Make OrdersHelper.invoice_links simpler	2019-07-05 11:08:51 +01:00
luisramos0	9be3ff90f7	Make OrdersHelper.complete_order_links simpler	2019-07-05 11:06:49 +01:00
luisramos0	a5b5e5de32	Remove trailing backslash	2019-07-05 10:58:53 +01:00
luisramos0	e66dea7e03	Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity.	2019-07-05 10:37:27 +01:00
Maikel	4c5ed2fa45	Merge pull request #3999 from openfoodfoundation/transifex ... Transifex	2019-07-05 11:59:40 +10:00
Maikel	40c0e69f11	Merge pull request #4000 from Matt-Yorkley/v2_migrations ... Fix failing migration by clearing schema cache	2019-07-05 10:56:26 +10:00
Transifex-Openfoodnetwork	f3837fb6af	Updating translations for config/locales/en_GB.yml	2019-07-05 05:08:46 +10: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
luisramos0	91da0114e3	Upgrade fuubar to 241 to skip yanked 240	2019-07-04 16:09:36 +01:00
Pau Perez	ee301c5e2f	Address Code Climate (rubocop) issues	2019-07-04 17:01:06 +02:00
Pau Perez	4a67ffab25	Add a test case for reports with deleted products	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
Transifex-Openfoodnetwork	d1faed282f	Updating translations for config/locales/es.yml	2019-07-05 00:22:01 +10:00
Transifex-Openfoodnetwork	26195314eb	Updating translations for config/locales/ca.yml	2019-07-05 00:09:05 +10:00
François Turbelin	912483660f	Put the uid under the permalink	2019-07-04 09:51:32 +02:00
François Turbelin	d12a7c2c76	Apply last suggestions	2019-07-04 09:43:35 +02:00
luisramos0	dee1c3d139	Fix typo in order_cycle_permissions.rb	2019-07-03 22:58:33 +01:00
François Turbelin	101cff02c6	Add locale keys	2019-07-03 23:06:50 +02:00
luisramos0	bb9c54a445	Use enterprises.id instead of :id to remove ambiguous column errors	2019-07-03 22:03:40 +01:00
François Turbelin	5ce2af454e	Clean id field	2019-07-03 23:00:36 +02: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
Luis Ramos	b35743b6e4	Merge pull request #3968 from mkllnk/3924-rescue-failing-shipment ... Rescue checkout on shipping id conflict	2019-07-03 19:56:24 +01:00
Luis Ramos	4fc30ba50e	Merge pull request #3994 from openfoodfoundation/dependabot/bundler/knapsack-1.17.2 ... Bump knapsack from 1.17.1 to 1.17.2	2019-07-03 19:55:20 +01:00
François Turbelin	97a401a307	Display enterprise ID in profile	2019-07-03 18:10:59 +02:00
Pau Pérez Fabregat	232e3b8262	Merge pull request #3993 from openfoodfoundation/dependabot/bundler/simplecov-0.17.0 ... Bump simplecov from 0.16.1 to 0.17.0	2019-07-03 16:28:56 +02: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
Pau Pérez Fabregat	1b532f995c	Merge pull request #3919 from mkllnk/db-mirror-script ... Db mirror script	2019-07-03 16:24:01 +02:00
Pau Pérez Fabregat	f5544494f0	Merge pull request #3997 from mkllnk/remove-ng-test-script ... Remove obsolete Javascript test script	2019-07-03 16:23:41 +02:00
Pau Pérez Fabregat	2de32b54ba	Merge pull request #3995 from mkllnk/how-to-not-archive-branches ... Remove obsolete script to archive branches	2019-07-03 16:23:15 +02:00
Pau Pérez Fabregat	b6e2dadbb3	Merge pull request #3996 from mkllnk/remove-backup-script ... Remove obsolete backup script	2019-07-03 16:22:36 +02:00
Matt-Yorkley	473e635d54	Merge pull request #3982 from luisramos0/mobile_bug ... Fixes menu problem with long shop names	2019-07-03 13:30:41 +01:00
Transifex-Openfoodnetwork	3e11cdb5c1	Updating translations for config/locales/fr.yml	2019-07-03 22:14:43 +10:00