9182 Commits

Author	SHA1	Message	Date
Luis Ramos	ac0a62e962	Merge pull request #5050 from Matt-Yorkley/bullet_tweaks ... Performance tweaks 2	2020-03-25 18:32:49 +00:00
Luis Ramos	2c5db8935b	Merge pull request #5022 from Matt-Yorkley/performance_tweaks ... Performance tweaks	2020-03-25 15:42:07 +00:00
Luis Ramos	b801bffcd9	Merge pull request #5030 from Matt-Yorkley/reports-loading ... Improve reports performance	2020-03-25 12:54:34 +00:00
Matt-Yorkley	d847560d7c	Fix rubocop issues	2020-03-25 10:15:03 +01:00
Matt-Yorkley	36aa52736a	Refactor order filtering logic	2020-03-24 09:36:59 +01:00
Matt-Yorkley	ac38b2735c	Eager-load data in OrdersController	2020-03-23 22:38:57 +01:00
Matt-Yorkley	8b93c5ab56	Invert conditionals for better readability	2020-03-23 22:38:57 +01:00
Matt-Yorkley	434f98fb46	Fix insane N+1 in Package ... The #ships_with? method was being called ~800 times when loading the admin order edit page (with Aus production data), and triggering a new query each time it was called.	2020-03-23 22:38:57 +01:00
Matt-Yorkley	c82c54873c	Pluck :id when querying active distributors for serializer data	2020-03-23 22:38:55 +01:00
Matt-Yorkley	5b481c19cc	Eager-load country in Producers controller	2020-03-23 19:33:15 +01:00
Matt-Yorkley	7110f9e6ee	Eager-load data used in EnterpriseGroupsController ... Cuts page load time by ~75%	2020-03-23 19:33:13 +01:00
Luis Ramos	26cd0f4a9d	Merge pull request #5023 from mkllnk/5019-invoice-bill-address ... Display shipping and billing address on invoices	2020-03-21 20:38:00 +00:00
Matt-Yorkley	0b878dd0a2	Use named scope for finding line_items in a set of orders	2020-03-21 09:45:35 +01:00
Matt-Yorkley	45c204017f	Improve reports performance ... Add the scoping from the search filters for reports into the logic of building sets like `editable_line_items` before combining them into the query to reduce the number of `line_item` ids in the IN clause.	2020-03-21 09:45:33 +01:00
Luis Ramos	17c2f7b138	Merge pull request #4889 from luisramos0/3-0-prod-set ... [Spree 2.1] Fix ProductSet spec (1 broken spec)	2020-03-20 19:33:19 +00:00
Matt-Yorkley	62a00b17a2	Merge pull request #5026 from Matt-Yorkley/checkout_display ... Temporarily hide OC selector in checkout page	2020-03-20 18:33:47 +01:00
Pau Pérez Fabregat	c4f96a1dcf	Merge pull request #4972 from mkllnk/4810-tab-navigation ... 4810 Shop tab / page navigation with browser buttons	2020-03-20 15:24:50 +01:00
Matt-Yorkley	e8692fec4c	Temporarily hide OC selector in checkout page	2020-03-20 12:08:58 +01:00
Luis Ramos	3b2c10526d	Merge pull request #4838 from openfoodfoundation/dependabot/bundler/jquery-rails-3.1.5 ... [Security] Bump jquery-rails from 3.0.4 to 3.1.5	2020-03-20 09:49:22 +00:00
Maikel Linke	25b11f1f4b	Display delivery details in the header	2020-03-20 15:51:49 +11:00
Maikel Linke	22384cb4da	Display shipping and billing address on invoices	2020-03-20 15:14:24 +11:00
Matt-Yorkley	7baa875a91	Fix big N+1 issues in enterprises#edit for superadmin ... The page is usable now as superadmin. Roughly 10x faster...	2020-03-19 23:41:47 +01:00
Matt-Yorkley	3de887e1d8	Remove some N+1s relating to address (found with bullet gem)	2020-03-19 23:41:47 +01:00
Maikel Linke	7e00f78a77	Highlight menu item only when active or hovered ... The `:focus` selector meant that every link that was clicked on was still highlighted after going back or forward in the browser history. We don't need that selector because tabs you click on are then active and are highlighted anyway.	2020-03-19 15:49:29 +11:00
Maikel Linke	5a9b5660f1	Simplify logic in PageSelectionCtrl	2020-03-19 15:38:00 +11:00
Maikel Linke	1d42ce885b	Stay on shop page when opening login modal ... The login modal changes the URL to `#/login` which interfers with our shop pages. In order to show the right shop page, we need to know which pages are valid and where we have been before we clicked on Login.	2020-03-19 15:38:00 +11:00
Maikel Linke	17751c448f	Rename PageSelectionCtrl for clarity	2020-03-19 15:37:13 +11:00
Maikel Linke	4b8d9d18d7	Simplify PagesetCtrl	2020-03-19 15:37:13 +11:00
Maikel Linke	a21ef19529	Render only shop tabs within shop ... The include directive was listening to all $location paths including `#login` which is unrelated to the shop tabs. Angular tried to load the template `shop/login.html` which doesn't exist. We now whitelist the templates that can be included by having an include tag for each shop tab/page.	2020-03-19 15:37:13 +11:00
Maikel Linke	ea80ae3832	Enable page navigation via URL fragment ... The broadcasting of notifications didn't update properly and I couldn't find a way to listen to $location updates. I replaced the three intertwined directives with one controller and a bit more HTML code. Now we have only one scope that listens to $location and all browser actions like the back button is reflected in the page. As nice side-effect, the menu links have now the right destination so that you can copy the link and paste it into another browser window. 40 lines less code.	2020-03-19 15:37:13 +11:00
Maikel Linke	bf26a26743	Reduce complexity by removing unused code branch	2020-03-19 15:36:24 +11:00
Maikel Linke	e3f840f48c	Remove dependency to Tabsets	2020-03-19 15:36:23 +11:00
Maikel Linke	42ca7888c0	Simplify by reducing unused options	2020-03-19 15:36:23 +11:00
Maikel Linke	8aa892136e	Duplicate shop tab code for rewrite ... The old code is still used on the user page.	2020-03-19 15:36:23 +11:00
Maikel	c4e4beb912	Revert "Inner join visible orders"	2020-03-19 12:01:00 +11:00
Maikel	27d8951add	Merge pull request #5013 from openfoodfoundation/mobile-ux-3 ... Merge mobile-ux-3 branch into master	2020-03-19 11:51:41 +11:00
Luis Ramos	2590745b2e	Merge pull request #4954 from luisramos0/dead_temp ... Delete templates that are not used	2020-03-18 13:52:15 +00:00
Maikel	b63c47cca2	Merge pull request #4816 from mkllnk/1860-copy-paste ... 1860 Remove style from pasted text for shopfront messages	2020-03-18 16:23:50 +11:00
Maikel	2b9f57f4e0	Merge pull request #4998 from mkllnk/4277-signup-flow ... Direct new enterprise users to their dashboard	2020-03-18 16:17:41 +11:00
Matt-Yorkley	8a1de72542	Center order cycle select elements in tablet view	2020-03-17 20:32:18 +01:00
Matt-Yorkley	2cb3a0cd99	Adjust padding, size, colour (transparency), caret size and position, border-radius, etc	2020-03-17 20:32:18 +01:00
Matt-Yorkley	b0637a24ff	Adjust padding, size, colour transparency, caret size	2020-03-17 20:32:18 +01:00
Matt-Yorkley	d969b68c8c	Add placeholder to order cycle selector	2020-03-17 20:32:18 +01:00
Matt-Yorkley	a89d4266d5	Update ordercycleselector to show message in red and remove powertip.	2020-03-17 20:32:18 +01:00
Matt-Yorkley	4b8ced5fc0	Add right-margin on bullet points in groups tab	2020-03-17 20:32:18 +01:00
Matt-Yorkley	2678342122	Reduce padding on ordercycle selector	2020-03-17 20:32:18 +01:00
Matt-Yorkley	b33c819863	Reduce rounding on ordercycle edges (box-radius)	2020-03-17 20:32:18 +01:00
Matt-Yorkley	97d7e27786	Update social icon colours	2020-03-17 20:32:18 +01:00
Matt-Yorkley	e73e43838c	Add 2px margin under Contact subheadings	2020-03-17 20:32:18 +01:00
Matt-Yorkley	cdc40fbc38	Update Contact tab subheading text colour	2020-03-17 20:32:18 +01:00