Maikel
687612dba8
Merge pull request #2403 from luisramos0/hide-stripe-postcode
...
Hide postcode - not necessary as passed from billing address and wrec…
2018-06-28 08:55:42 +10:00
Pau Perez
7707df354b
Merge branch 'master' into 2-0-stable
...
* master: (206 commits)
embedded groups layout changes
embedded groups initial test
Allow html requests for OrderCycleController#update
Move applicator calls to OrderCycleForm
Refactor OrderCycleForm to make logic clearer
Extract schedule syncing logic into OrderCycleForm
Add basic specs for OrderCyclesController#create
Add basic OrderCycleForm to handle create/update logic
Remove unnecessary respond_to blocks from OrderCyclesController
Include admin users as managers on new enterprises
Remove obsolete goWithoutHashFragments
Simplify Navigation.go, not preserving hash fragments
Only show change warning for open order cycles
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
Preload subscription counts for serialization in order cycle collection actions
Request the subscription count for change warning each time, don't cache
Ask user to confirm oc date change for open order cycles with subsciptions
Fix ordering of Gemfile.lock
Add rack-rewrite to handle redirects
Renames product bulk edit action to index
...
2018-06-22 13:23:18 +02:00
luisramos0
0d9b03b066
Hide postcode - not necessary as passed from billing address and wrecks mobile UX
2018-06-22 11:42:50 +01:00
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
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
luisramos0
836a5836d9
fixed country_state selectors on checkout
2018-06-18 14:50:03 +10:00
Hugo Daniel
6e2966d7e8
Changed require syntax to fit jquery < 5.0
2018-06-12 15:59:41 +02: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
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
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
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
Matt-Yorkley
1c57f0f241
Update :return_url value when re-sending email confirmations
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1f23402912
Disable password reset for unconfirmed users
2018-04-27 12:37:42 +10:00
stveep
46d2d6cb8a
Include option text in dropdown cart even if the variant and product have the same name
2018-04-04 16:40:18 +10:00
duende13
61300a62c2
Added 'meta_keywords' to search of products in shop page. Changed labels
...
on SEO tab and SEO form (edit product Screen) and added in en.yml file.
2018-03-27 15:21:11 +11:00
Pau Pérez Fabregat
1005c299a2
Merge pull request #1464 from Matt-Yorkley/uk/bep_images
...
Uk/bep_images
2018-03-23 12:40:16 +01:00
Matt-Yorkley
e2f3feccf0
Add comments to authentication_service.js
2018-03-14 12:13:45 +11:00
Matt-Yorkley
e6bdbccffa
Ensure email links return to proper path on private shops, refactor modal logic
2018-03-14 12:13:45 +11:00
Matt-Yorkley
e8bc87e62b
Ensure email validation link returns to /register paths properly
2018-03-14 12:13:45 +11:00
Matt-Yorkley
595bc5d1a5
Show confirmation message in modal
2018-03-14 12:13:45 +11:00
Matt-Yorkley
bc621a3c43
Return user to same URL from confirmation link
2018-03-14 12:13:45 +11:00
Matt-Yorkley
7d27d1325e
Bulk Edit image upload
...
Image Upload Translations
Squashme
Squashme
Squashme
Code review tweaks
2018-02-14 13:46:05 +00:00
Matt-Yorkley
14b73149be
Remove stale form validation messages when showing new confirmation sent message
2018-02-07 10:41:54 +11:00
Matt-Yorkley
ba98c7e2c5
Rewrite enterprise contact functionality
2018-02-07 10:41:52 +11:00
Matt-Yorkley
97f5022bdd
Show signup message in modal wihout redirect
2018-02-07 10:41:51 +11:00
Matt-Yorkley
522aaee1a3
Update login modal for resending confirmations
2018-02-07 10:41:51 +11:00
Matt-Yorkley
28ded1f0c2
Adjust user signup feedback
2018-02-07 10:41:51 +11:00
Pau Perez
e98d934a67
Include localization files as documented in gem
...
I followed the Usage help in
https://github.com/derekprior/momentjs-rails .
2017-11-29 10:13:05 +11:00
leandroalemao
31a846b9c3
Refactor _i18n_script.html.haml file and add new momentjs internationalisation files
2017-11-29 10:13:05 +11:00
leandroalemao
5eaea28401
Switch momentjs internationalisation according to I18n locale
2017-11-29 10:13:05 +11:00
Pau Perez
ed18244070
Remove TODO in favour of an issue in Github
...
It has become the issue
https://github.com/openfoodfoundation/openfoodnetwork/issues/1961
2017-11-23 11:12:17 +11:00
Pierre de Lacroix
65d176f533
Fix wrong way to force currency symbol after the amount
2017-10-13 10:26:13 +11:00
Pierre de Lacroix
aae8f1cbc4
Change localizeCurrency filter to use I18n.toCurrency
2017-10-13 10:26:12 +11:00
Enrico Stano
bdc701f880
Merge pull request #1816 from coopdevs/disable-create-profile-on-submit
...
Disable create profile on submit
2017-10-05 15:25:37 +02:00
Pau Perez
d8e3052575
Ensure a callback function is provided
2017-09-29 16:10:11 +02:00
Rob Harrington
0f19be4db4
Configure StripeElements service to map cc_type to that used by activemerchant
2017-09-23 14:58:35 +10:00
Rob Harrington
34b109cbb7
Add basic validation to credit card form on account page
2017-09-23 14:58:35 +10:00
