21845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Transifex-Openfoodnetwork	c9b53022f2	Updating translations for config/locales/ar.yml	2019-11-13 05:21:47 +11:00
Pau Pérez Fabregat	a00b770229	Merge pull request #4459 from coopdevs/temporarily-disable-flaky-spec ... Temporarily disable flaky line item spec	2019-11-12 13:59:02 +01:00
Pau Perez	16f570b8f7	Temporarily disable flaky line item spec ... This is causing almost all PRs to fail in CI and blocking our delivery pipe. We're already working on a solution in https://github.com/openfoodfoundation/openfoodnetwork/pull/4458.	2019-11-12 13:23:04 +01:00
Luis Ramos	49bd21f29a	Merge pull request #4456 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.2 ... Bump i18n-js from 3.4.1 to 3.4.2	2019-11-12 12:09:34 +00:00
luisramos0	f1c055805f	Use $timeout instead of setTimeout which makes it possible to remove apply()	2019-11-12 12:06:44 +00:00
luisramos0	5cadb0d16f	Make ready for field show with red borders immediatly after exchange is added to the list	2019-11-12 12:06:44 +00:00
luisramos0	6875e9a41e	Make view a bit simpler by removing unnecessary string interpolation	2019-11-12 12:05:40 +00:00
luisramos0	b6f1d6e395	Make OC edit page steps clickable when editing an OC	2019-11-12 12:05:40 +00:00
luisramos0	6e51be095b	Add order to supplied products in enterprise serializer so that products in exchanges are sorted alphabetically	2019-11-12 12:04:42 +00:00
luisramos0	1c7237869a	Refactor products_scope to make it more simple	2019-11-12 12:04:42 +00:00
luisramos0	14433e7764	Fix some rubocop issues in admin/order_cycles_controller	2019-11-12 12:02:36 +00:00
luisramos0	5fdb86ae43	Make simple create redirect to OC list but normal create to jump to incoming settings	2019-11-12 12:00:48 +00:00
luisramos0	6615469f8b	Fix 3 more specs in OC edit pages	2019-11-12 12:00:48 +00:00
luisramos0	d281837dd9	Remove useless spec now that we have 3 steps in OC edit process	2019-11-12 12:00:48 +00:00
luisramos0	7c63e59ae9	Add OC imcoming and outgoing abilities to managers, this fixes a few OC feature specs	2019-11-12 12:00:48 +00:00
luisramos0	7c19fe418e	Adapt OC specs to new page flow with 3 steps (these specs are not green yet)	2019-11-12 12:00:48 +00:00
luisramos0	46d0023018	Adapt OC spec to new page flow with 3 steps	2019-11-12 12:00:48 +00:00
luisramos0	43cf249184	Make NoDistributors warning only appear on simple_create and simple_edit and outgoing settings	2019-11-12 12:00:48 +00:00
luisramos0	537dbd3dc0	Fix angular specs by moving specs to the same place as the code was moved previously ... Quite a few copy pasted specs were also removed	2019-11-12 12:00:48 +00:00
luisramos0	7c54781d90	Restructure OC page controllers so that methods related to exchanges are only loaded on the incoming and outgoing settings pages	2019-11-12 12:00:48 +00:00
luisramos0	3b4241c70d	Remove more copy pasted code by adding new AdminOrderCycleCtrl with common code from create and edit OC controllers	2019-11-12 12:00:48 +00:00
luisramos0	a290e83501	Move more copy pasted code to basic OC controller	2019-11-12 12:00:48 +00:00
luisramos0	6e0019227b	Remove some serious copy/paste party of the past... by extending from new AdminOrderCycleBasicCtrl where we put all the basic methods for the OC create/edit/simple_create/simple_edit controllers	2019-11-12 12:00:48 +00:00
luisramos0	7845b6c6fb	Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl ... Same for AdminOrderCycleOutgoingCtrl	2019-11-12 12:00:48 +00:00
luisramos0	e03e3ae50a	Fix the simple edit OC and the new OC page flows	2019-11-12 12:00:48 +00:00
luisramos0	305d7b1125	Adapted navigation between OC edit pages by adding new previous and next buttons	2019-11-12 12:00:48 +00:00
luisramos0	5ef751d409	Add wizard to OC new and edit pages	2019-11-12 12:00:48 +00:00
luisramos0	683232dd10	Improve page titles and fix broken translation	2019-11-12 12:00:48 +00:00
luisramos0	5f1360e226	Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page	2019-11-12 12:00:48 +00:00
Matt-Yorkley	1a5eea3303	Refactor #all_incoming_editable_variants	2019-11-12 11:59:39 +00:00
Matt-Yorkley	a1146aed1b	Refactor #sort_by_supplier_id	2019-11-12 11:59:39 +00:00
Matt-Yorkley	ab30307b1a	Simplify #active_outgoing_variants	2019-11-12 11:59:39 +00:00
Matt-Yorkley	35b68239b0	Tidy up AR query syntax	2019-11-12 11:59:39 +00:00
Matt-Yorkley	9e09a3b379	Memoize #active_outgoing_variants result	2019-11-12 11:59:39 +00:00
Matt-Yorkley	77105e265e	Memoize more repeated queries in #managed_enterprises	2019-11-12 11:59:38 +00:00
Matt-Yorkley	e73f2d682c	Remove N+1 in editable_variants_for_incoming_exchanges	2019-11-12 11:59:13 +00:00
Matt-Yorkley	f4d71ae352	Fix order_cycle_permissions tests not running locally	2019-11-12 11:59:13 +00:00
Matt-Yorkley	c2823b3ffe	Memoize #user_manages_coordinator_or result	2019-11-12 11:59:13 +00:00
Matt-Yorkley	c1366fced5	DRY some more variant queries	2019-11-12 11:59:13 +00:00
Matt-Yorkley	170bc94d92	Refactor order_cycle_serializer	2019-11-12 11:59:13 +00:00
Matt-Yorkley	2a5403e23f	Clean up "visible and editable" variants	2019-11-12 11:59:13 +00:00
Matt-Yorkley	dc540444a2	Remove pointless code	2019-11-12 11:59:13 +00:00
Matt-Yorkley	ca5ecc4696	Refactor "active outgoing variants"	2019-11-12 11:59:13 +00:00
Matt-Yorkley	5082a133a1	Refactor adjustment fetching into new service and module	2019-11-12 11:57:54 +00:00
Matt-Yorkley	1f8e0ae637	Improve SupplierTotalsByDistributorReport	2019-11-12 11:57:19 +00:00
Matt-Yorkley	24e66b635b	Improve DistributorTotalsBySupplierReport	2019-11-12 11:57:19 +00:00
Matt-Yorkley	891db4b81b	Move methods to helper	2019-11-12 11:57:19 +00:00
Matt-Yorkley	8a57977b44	Increase eager-loading and adjustment calculations	2019-11-12 11:57:19 +00:00
Matt-Yorkley	77e70fd7d3	Eager-load adjustments and calculate in place	2019-11-12 11:57:19 +00:00
Matt-Yorkley	7b5e5f4039	Clean up OpenFoodNetwork::Permissions	2019-11-12 11:57:19 +00:00