Luis Ramos
ce2a164c66
Stop using f_form_for
...
Add labels for some fields, this was done automatically by rails foundation helper
2020-04-01 12:03:39 +01:00
Luis Ramos
b898ce1ae1
Make checkout controller add flash error if order contains any type of error
...
Here we add translations for a particular case where the credit card expiry date is in the past
2020-04-01 12:03:39 +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
Luis Ramos
523faa670d
Remove FoundationRailsHelper, this is dead code now
2020-03-25 17:31:56 +00:00
Luis Ramos
434b68b019
Merge pull request #5048 from Matt-Yorkley/3-0-user-spec
...
Ensure perform_deliveries is correctly set in user email spec
2020-03-25 11:52:43 +00:00
Pau Pérez Fabregat
87fae15434
Merge pull request #4909 from luisramos0/line_items_spec
...
Adapt line_items_spec to work in the rails 4 branch as well
2020-03-25 10:05:20 +01:00
Matt-Yorkley
e27f7a4301
Ensure perform_deliveries is correctly set when testing user confirmation emails
2020-03-25 08:42:21 +01:00
Luis Ramos
8dfdc9bc15
Merge pull request #5056 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.0
...
Bump rubocop-rails from 2.4.2 to 2.5.0
2020-03-24 11:22:21 +00:00
dependabot-preview[bot]
de180d32bf
Bump rubocop-rails from 2.4.2 to 2.5.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-23 20:37:57 +00: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
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
70643a84b2
Update all locales with the latest Transifex translations
2020-03-20 18:44:23 +01: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
Pau Pérez Fabregat
6f4f3d42cc
Merge pull request #5012 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.1
...
Bump rack-mini-profiler from 2.0.0 to 2.0.1
2020-03-20 15:22:43 +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
b1a274ea27
Update translations
2020-03-20 16:20:21 +11:00
Maikel
00c7b9986b
Merge pull request #5020 from openfoodfoundation/transifex
...
Transifex
2020-03-20 16:15:54 +11: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
Transifex-Openfoodnetwork
9dc18afef0
Updating translations for config/locales/pt_BR.yml
2020-03-20 12:20:04 +11:00
Transifex-Openfoodnetwork
d2d3d767ac
Updating translations for config/locales/en_GB.yml
2020-03-19 23:53:09 +11:00
Transifex-Openfoodnetwork
a4ff74272b
Updating translations for config/locales/nb.yml
2020-03-19 22:47:36 +11:00
Transifex-Openfoodnetwork
1000dc52bf
Updating translations for config/locales/en_FR.yml
2020-03-19 19:37:32 +11:00
Transifex-Openfoodnetwork
54b8d22e0d
Updating translations for config/locales/fr.yml
2020-03-19 19:37:21 +11: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 Linke
2d21341183
Update all locales with the latest Transifex translations
2020-03-19 14:06:04 +11:00
Maikel
5cabf59015
Merge pull request #5016 from openfoodfoundation/revert-4879-inner-join-visible-orders
...
Revert "Inner join visible orders"
2020-03-19 12:37:20 +11:00
Maikel
289dff5b91
Merge pull request #4988 from openfoodfoundation/transifex
...
Transifex
2020-03-19 12:06:37 +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
Transifex-Openfoodnetwork
f7720f1b1f
Updating translations for config/locales/en_FR.yml
2020-03-19 05:18:19 +11:00
Transifex-Openfoodnetwork
c46ae4354d
Updating translations for config/locales/en_FR.yml
2020-03-19 05:15:09 +11:00
Transifex-Openfoodnetwork
5f00323cbb
Updating translations for config/locales/fr.yml
2020-03-19 05:14:27 +11:00
Transifex-Openfoodnetwork
c52f29706b
Updating translations for config/locales/en_CA.yml
2020-03-19 03:47:42 +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
Matt-Yorkley
6db0421347
Merge pull request #4764 from Matt-Yorkley/mobile-tabs-styling
...
[mobile ux] Mobile tabs styling
2020-03-18 08:42:44 +01: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
