Pierre de Lacroix
a245590114
Fix some translations
2017-10-18 14:38:40 +11:00
Continuous Integration
5ecae39051
Merge remote-tracking branch 'origin/master' into HEAD
2017-10-17 19:36:45 +11:00
Transifex-Openfoodnetwork
2508234a7c
Updating translations for config/locales/en_GB.yml [skip ci]
2017-10-17 19:23:35 +11:00
Transifex-Openfoodnetwork
da5f9e7ebc
Updating translations for config/locales/nb.yml [skip ci]
2017-10-16 20:00:37 +11:00
Rob Harrington
0d483882de
Update helper messages in Stripe Connect config UI
2017-10-16 10:37:04 +11:00
Rob Harrington
9e40502876
Update stripe controller routing comments
2017-10-16 09:39:15 +11:00
Continuous Integration
c38e58159f
Merge remote-tracking branch 'origin/master' into HEAD
2017-10-13 18:57:25 +11:00
Transifex-Openfoodnetwork
acf0919bfa
Updating translations for config/locales/en_GB.yml [skip ci]
2017-10-13 18:33:41 +11:00
Rob Harrington
bca409bfe4
Bumping very outdated versions of pry and byebug
2017-10-13 15:47:59 +11:00
Pierre de Lacroix
1fe10b4b25
Add pointer cursor to other links in products bulk edit
2017-10-13 15:33:30 +11:00
Pierre de Lacroix
768378b147
Add pointer cursor to EXPAND ALL link in products bulk edit
2017-10-13 15:33:30 +11:00
Rob Harrington
1fcbf6b44d
Clear shipping_method_id from order when restarting checkout
...
If the order is allowed to retain a shipping_method_id, then subsequent
saves of the order will cause a new shipment to be initialised. Seems to
only happen for delivery shipping methods. This is undesirable because
fees for the new shipment will appear in the checkout summary, which is
not smart enough to recognise existing shipment fees and adjust the order
total accordingly.
2017-10-13 12:53:35 +11:00
Rob Harrington
f96502c369
Add unit specs for CheckoutController#restart_checkout
2017-10-13 12:53:35 +11:00
Rob Harrington
c031b0e52b
Clear shipments and payments after failed payment at checkout
2017-10-13 12:53:35 +11:00
Rob Harrington
6006952603
Moving checkout request specs into their own folder
2017-10-13 12:53:35 +11:00
Duende13
e5fb8712d7
Simplify Product Edit Screen removing fields and adding 2 new menu options for seo and group buy ( #1741 )
2017-10-13 11:37:57 +11:00
Pierre de Lacroix
508dfa4f23
Fix failing tests assuming localizeCurrency has no "delimiter"
2017-10-13 10:26:13 +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
089c754f62
Remove conversion of amounts to currency strings via Money in serializers as it's better done in JS
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
Matt-Yorkley
7194db40ee
Merge pull request #1895 from Matt-Yorkley/codeclimate-symbol-arrays
...
Relax rubocop Style/SymbolArray rule
2017-10-13 00:06:32 +01:00
Rob Harrington
f2ad087be5
Change inheritance of StripeAccountsController
2017-10-13 07:57:16 +11:00
Rob Harrington
0b8b5e694e
Move Stripe Connect callback action to dedicated controller
2017-10-12 22:47:51 +11:00
Rob Harrington
01f9fd3232
Rename webhook handler status mappings
2017-10-12 22:47:51 +11:00
Rob Harrington
99cac20725
Fall back to 200 when handler returns an unknown result
2017-10-12 22:47:51 +11:00
Rob Harrington
068dbe5013
Add verification to Stripe webhook endpoint
2017-10-12 22:47:45 +11:00
Rob Harrington
ed375a1e2c
Build Event object in controller instead of service object
2017-10-12 20:51:17 +11:00
Rob Harrington
4345285164
Allow more granularity in Stripe WebhookHandler responses
2017-10-12 20:51:17 +11:00
Rob Harrington
eb7cb02f33
Namespace stripe webhook controller in Stripe module
2017-10-12 20:50:29 +11:00
Rob Harrington
f22dd7513d
Add a service object for handling Stripe webhooks
2017-10-11 17:50:46 +11:00
Rob Harrington
c54119f482
Rename stripe controller action from 'deauthorize' to 'webhook'
2017-10-11 17:11:02 +11:00
Rob Harrington
23d2b3a664
Move Stripe webhook logic into dedicated frontend controller
2017-10-11 16:38:19 +11:00
Rob Harrington
c747bb5305
Remove improper use of quick_login_as_admin from unit spec
2017-10-11 16:10:08 +11:00
Matt-Yorkley
d147d2035d
Disable symbol array cop
2017-10-07 11:50:59 +01:00
Maikel Linke
4dd71c1240
Add CSS workaround to display repeated table head
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1738
2017-10-06 16:51:19 +11:00
Maikel Linke
6ad7c7b835
Tidy up HTML indent
2017-10-06 14:24:28 +11:00
Maikel Linke
10bbc5f9ef
Hide the menu on embedded group pages
2017-10-06 14:24:28 +11:00
Maikel Linke
b8a124b99e
Add preview page for embedded groups
2017-10-06 14:24:28 +11:00
Maikel Linke
28b1ea2d9f
Allow group pages to be in iframes
2017-10-06 14:24:28 +11:00
Maikel Linke
2b989f49ea
Enable iframes in development environment
2017-10-06 14:24:28 +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
Enrico Stano
7af154d675
Merge pull request #1820 from coopdevs/missing-translations-register
...
Missing translations in Enterprise Registration
2017-10-05 13:12:09 +02:00
Pau Perez
2552b5faac
Track node version in .node-version
...
This is used by https://github.com/nodenv/nodenv
2017-09-29 16:11:22 +02:00
Pau Perez
d8e3052575
Ensure a callback function is provided
2017-09-29 16:10:11 +02:00
Transifex-Openfoodnetwork
3c797d3b86
Updating translations for config/locales/es.yml [skip ci]
2017-09-27 00:23:20 +10:00
Transifex-Openfoodnetwork
46ca3bc950
Updating translations for config/locales/fr.yml [skip ci]
2017-09-26 19:51:50 +10:00
Rob Harrington
75ec77dc31
Remove the 'confirm' step from the order checkout flow
...
This step is not being responded to anyway, since we are not rending a page for each checkout step
It was causing an issue whereby an order in the 'confirm' state was not able to progress through the
checkout controller because it was expecting to only redirect to paypal from the 'payment' state.
figured it was easiest to just remove the step, seeing as it wasn't being used in any meaningful way.
It should be fine to bring the 'confirm' step back in the future if we need it, we will just have to
make sure paypal the paypal issue is resolved.
2017-09-23 15:15:06 +10:00
Rob Harrington
a09a54e4cb
Set transaction fee adjustments to ineligible if payment is invalid or failed
2017-09-23 15:15:06 +10:00
Rob Harrington
e486dbd4f8
Respond to Stripe webhook with status of 204 if specified account is not found
2017-09-23 14:58:35 +10:00
Rob Harrington
db5503dd80
Allow destruction of StripeAccounts even if deauthorise request fails
...
Log deauthorise failures to Bugsnag
2017-09-23 14:58:35 +10:00
