Rob Harrington
5e6291bce3
Don't request customers if list is already populated
2018-06-22 15:39:47 +10:00
Rob Harrington
32622c77bc
Add basic help modal directive
...
Useful for showing help text that is too long for a tool tip
2018-06-22 15:39:47 +10:00
Rob Harrington
6457a17fde
Add basic view allowing customers to authorise shop use of their credit cards
2018-06-22 15:39:47 +10:00
Keir Osborn
bd7e072938
embedded groups layout changes
2018-06-22 14:03:00 +10:00
Maikel Linke
d510df5236
Remove obsolete goWithoutHashFragments
...
It was introduced, because `Navigation.go` perserved hash fragments. We
actually don't need that behaviour and it has been corrected.
`goWithoutHashFragments` also didn't deal with absolute URLs. And it used
`location.origin` which is not supported by Internet Explorer. That is
fixed by our use of Modernizr though.
2018-06-21 10:29:32 +10:00
Maikel Linke
fb02bdd25a
Simplify Navigation.go, not preserving hash fragments
...
I looked through the history and it looks like this function was a bit
flawed (preserving hash fragments) from the beginning. It has been
patched a few times without addressing the underlying issue that we want
more than just replacing the pathname. We want to go somewhere else.
2018-06-21 10:29:32 +10:00
Maikel
3399eba428
Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel
...
Move product bulk edit to product index route
2018-06-20 17:53:57 +10:00
Rob Harrington
a29a1bd047
Only show change warning for open order cycles
2018-06-20 16:28:36 +10:00
Rob Harrington
8770122eae
Request the subscription count for change warning each time, don't cache
2018-06-20 13:06:05 +10:00
Rob Harrington
86d7453d26
Ask user to confirm oc date change for open order cycles with subsciptions
2018-06-20 13:06:05 +10:00
Maikel Linke
bbe21b7804
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel
2018-06-20 10:31:17 +10:00
Pau Pérez Fabregat
20c25cd030
Merge pull request #2368 from Matt-Yorkley/uk/admin_orders
...
Uk/admin orders
2018-06-19 11:00:35 +02:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat
3484996dbd
Merge pull request #2335 from luisramos0/issue2334
...
Fixed missing translations on shops filter - delivery option
2018-06-19 09:34:13 +02:00
Rob Harrington
dabef16606
Use ofn-select2 directive for country and state selectors on enterprise forms
2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e
changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed
2018-06-19 10:34:02 +10:00
luisramos0
836a5836d9
fixed country_state selectors on checkout
2018-06-18 14:50:03 +10:00
Rob Harrington
d0f8e9fba6
Reimplement import date filter as an actual Filter
2018-06-15 11:31:47 +10:00
Matt-Yorkley
d90e362e6f
Remove guest checkout radio buttons from admin order view
2018-06-09 02:43:42 +01:00
Rob Harrington
18c211e97c
Ensure that savedCreditCards always exists
2018-06-08 15:30:08 +10:00
Rob Harrington
254f0db97c
Automatically select the customer's default card in the checkout
2018-06-08 15:30:07 +10:00
Rob Harrington
e88e963b4c
Alter cards interface to allow updating of default card
2018-06-08 15:30:07 +10:00
Pau Pérez Fabregat
3283c5158b
Merge pull request #1492 from Matt-Yorkley/uk/import2
...
Uk/import2
2018-06-04 09:56:36 +02:00
Pau Pérez Fabregat
cf77bb439a
Merge pull request #2337 from Matt-Yorkley/uk/modal_fix
...
Fix guest checkout login modal
2018-06-04 09:56:00 +02:00
Rob Harrington
16211da5f6
Reimplement tabs on shopfront using our custom tab directive
2018-05-30 08:35:21 +10:00
Maikel
307132d1f7
Merge pull request #2298 from frank-west-iii/issue-953-ent-description-formatting
...
Fix enterprise description display formatting
2018-05-29 17:36:47 +10:00
Matt-Yorkley
6f6db9384f
Tidy up SCSS and coffeescript
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c5b7cec19f
Change checkbox confirmation behaviour
2018-05-26 19:34:20 +01:00
Matt-Yorkley
b42e3eb2c9
Product Import Guide WIP
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7da97be7d2
Create separate angular module
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a
Product Import refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ed49d397e
Refactor PI
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1c34ce6162
PI exception handling
2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400
PI inventories UX
...
Minor tweaks
2018-05-26 19:34:19 +01:00
Matt-Yorkley
fe01e8ede3
PI human-readable unit fields
...
Enhanced unit specs
2018-05-26 19:34:19 +01:00
Matt-Yorkley
b3c906b3a4
Product Import v3 with asynchronous processing
...
Fixed spec
Quick spec tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480
PI inventories additions
2018-05-26 19:34:19 +01:00
Matt-Yorkley
a2a65a8900
PI inventories and overhaul
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Matt-Yorkley
fc2cc09ea5
checkout redirect excludes angular path variables
2018-05-26 18:13:35 +01:00
luisramos0
533ae77234
Fixed missing translations on shops filter - delivery option
2018-05-25 23:46:44 +01:00
Pau Perez
51f3542a92
Remove no longer used Angular controller
...
There are no tabs to keep track of now.
2018-05-22 10:21:35 +02:00
Frank West
b05b9747b8
Fix enterprise description display formatting
...
Removes `text-small` class from container and change container to `div`
instead of `p` for semantic differentiation.
2018-05-18 07:20:56 -07:00
Matt-Yorkley
495f932069
Authentication service class description
2018-05-11 12:05:27 +10:00
Matt-Yorkley
74689afb8a
Unregistered user checkout issue
2018-05-11 12:05:27 +10:00
Matt-Yorkley
d3344973b7
checkout_controller clarity
2018-05-11 12:05:27 +10:00
Matt-Yorkley
0741b5fa58
Ensure checkout modal opens at correct height
2018-05-11 12:05:27 +10:00
Matt-Yorkley
598677be3f
Disable guest checkout for registered users
2018-05-11 12:05:26 +10:00
Daniel Dominguez
4551fa60c5
Lowercase tag when adding a tag to the array, as they are lowercased after at the database level,
...
there is no point to display them with uppercase letters on the view.
2018-05-11 11:16:58 +10:00
Matt-Yorkley
1c57f0f241
Update :return_url value when re-sending email confirmations
2018-04-27 12:37:42 +10:00
