Luis Ramos
445eb9f287
Merge pull request #5121 from Matt-Yorkley/flaky-maps-js
...
Update vendor/assets/angular-google-maps.min.js
2020-04-02 22:13:51 +01:00
Matt-Yorkley
838ffdbf00
Add code comment for dependency
2020-04-02 17:33:10 +02:00
Pau Pérez Fabregat
fe8beb5448
Merge pull request #5099 from Matt-Yorkley/ticking-time-bom
...
Improve BOM
2020-04-02 16:01:48 +02:00
Matt-Yorkley
18ee5254f9
Make Geo service calls more resilient in /shops page
...
The Geo service is used heavily in the /shops page and especially in the search function. If the google maps js library has failed to load it was throwing a lot of fatal errors, so this change ensures the /shops page can at least: a) load, b) show some shops, and c) search for shops by name (but not location)
2020-04-02 13:56:25 +02:00
Matt-Yorkley
40f8cf660c
Update vendor/assets/angular-google-maps.min.js
...
Fixes an issue where if the js library from maps.googleapis.com failed to load in the <head>, all of our subsequent Angular would completely break.
See: https://github.com/angular-ui/angular-google-maps
Note: `bluebird.js` is a new dependency of `angular-google-maps.js`.
2020-04-02 13:32:55 +02:00
Luis Ramos
0e268a171f
Switch to console.error so we get a bugsnag alert everytime a user has a problem with their card
...
Add paymentMethodsAPI specific mapping function, we had some errors in production with mastercards probably caused by ActiveMerchant not handling the card type correctly
2020-04-01 18:58:43 +01:00
Luis Ramos
73c4eedd06
Translate credit card brand so that active merchant code handles the payment correctly
...
Adds a simple console.log statement in case there is an error adding the
card
2020-04-01 18:58:10 +01:00
Luis Ramos
9fa604db0d
Merge pull request #5076 from luisramos0/rails_f_helper
...
Remove Rails Foundation Helper and improve error display and logging in checkout controller
2020-04-01 18:54:45 +01:00
Matt-Yorkley
ad42b1b485
Remove pagination limits in BOM
...
We can re-assess this later, but for now it looks like some of the BOM functionality won't work if results are returned across multiple pages.
2020-04-01 13:43:21 +02:00
Luis Ramos
957b398a54
Add call to $evalAsync() after Loading and FlashLoader are updated so
...
that a angular digest is triggered
This is required so that Loading.clear triggers a refresh and makes its placeholder to be cleared
2020-04-01 12:08:55 +01:00
Luis Ramos
6a1c541479
Remove specific error color on checkout page so that the error message takes the default foundation error color which is white
2020-03-31 16:32:33 +01:00
Matt-Yorkley
95963c5732
Refactor Angular line_items_controller
2020-03-29 19:54:49 +02:00
Matt-Yorkley
fe58121c7f
Fix clear filters button
2020-03-29 19:54:49 +02:00
Matt-Yorkley
375b4648dc
Add pagination to Bulk Order Management
2020-03-29 19:54:47 +02:00
Matt-Yorkley
7c7f9551d6
Fix bug in order cycle select dropdown
...
The date filters were being filled with the string: "Invalid date" because momentjs was not able to parse the input
2020-03-28 15:17:31 +01:00
Matt-Yorkley
b76a6d15a3
Improve date field query triggers
...
Don't submit the request if the user is part-way through typing something in the date field and the date is (currently) invalid; this results in the date ranges being broken and triggering a query for *all* results (with no date range).
2020-03-28 11:16:25 +01:00
Matt-Yorkley
e63dbcfa89
Fix some SCSS linting warnings
2020-03-25 23:12:23 +01:00
Matt-Yorkley
c3283adcf5
Show full-width ordercycle subheader on tablet and below
2020-03-25 23:12:23 +01:00
Matt-Yorkley
b2ed69831b
Adjust style contexts
2020-03-25 23:12:23 +01:00
Matt-Yorkley
7daba62f43
Update colours for different order cycle sidebar cases
2020-03-25 23:12:23 +01:00
Matt-Yorkley
a08020490d
Define new colour and use variable where already in use
2020-03-25 23:12:23 +01:00
Matt-Yorkley
eb4d970bc7
Adjust positioning for order cycle sidebar
2020-03-25 23:12:23 +01:00
Matt-Yorkley
52ebd1b402
Remove order cycle popovers; these styles are no longer used
2020-03-25 23:12:08 +01:00
Matt-Yorkley
a3a26f704f
Extract re-used box-shadow style
2020-03-25 23:07:39 +01:00
Matt-Yorkley
cff8f6dd96
Add box-shadow to distributor header for cart, checkout, and order confirmation pages
2020-03-25 23:07:39 +01:00
Matt-Yorkley
81537d92cf
Extract styles for distributor header
...
These styles are used in shop, cart, checkout, order confirmation. Not just shop.
2020-03-25 23:07:39 +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
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
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
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
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
Matt-Yorkley
3430cc617a
Maximise space for tabs to fit on small screens
2020-03-17 20:32:18 +01:00
