Rob Harrington
efa71c4ac8
Use Spree's approach for handling config when testing
2017-11-02 17:43:04 +11:00
Rob Harrington
d4eb27a4ed
Fix race condition in shipping method order spec
2017-11-01 16:37:12 +11:00
Duende13
eca18ba6ee
Test to control order of shipping methods by name
2017-11-01 15:30:42 +11:00
Duende13
31fa49feed
Added orderBy 'name' to the list of shipping methods offered.
2017-11-01 15:30:42 +11:00
yasirazgar
b68aafdb72
1799 - adding missing translations in new shipping methods page
2017-11-01 10:50:21 +11:00
Andy Palmer
fd09a63e48
Imperative specs as per review comments
2017-10-24 17:56:04 +11:00
Andy Palmer
afc50863cd
Replace Deface with update to overridden template
2017-10-24 17:39:34 +11:00
Andy Palmer
fea2240c39
Disabled product links in cart for openfoodfoundation/openfoodnetwork#1075
2017-10-24 14:56:35 +11:00
Rob H
9642e8295e
Merge transifex translations
2017-10-21 00:23:40 +11:00
Enrico Stano
1424d44eab
Merge pull request #1919 from nicolauduran/add-dev-doc
...
Add more development documentation
2017-10-20 14:31:43 +02:00
Nicolau Duran
0a5f0a518d
Add development doc
2017-10-20 13:18:21 +02:00
Transifex-Openfoodnetwork
ff1672e411
Updating translations for config/locales/nb.yml [skip ci]
2017-10-20 19:50:21 +11:00
Transifex-Openfoodnetwork
32d8368990
Updating translations for config/locales/fr.yml [skip ci]
2017-10-20 19:42:24 +11:00
Lynne
e7f8102eb9
Update en-GB.yml
2017-10-20 08:29:18 +01:00
Rob Harrington
24e1d0b775
Fix mistyped translation key for 'dashboard'
2017-10-20 16:26:08 +11:00
Rob Harrington
ceadd386aa
Update order spec to test an order with a total > 0
...
This is necessary because the previous commit changed the logic
around payment state, meaning that a complete order with a total
of 0 and no complete paymnents is considered to have a payment
state of 'paid'. I don't think this is problematic, since it is
not possible to check out an order without line items.
This way the spec tests an order modelled on the real world.
2017-10-20 15:21:59 +11:00
Rob Harrington
d42dc2b286
Fix #1902 : ensure correct payment state when failed payments are present
...
Problem: order payments didn't seem to be loaded in any particular order,
and OrderUpdater#update_payment_state was relying on payment order to de-
termine payment state.
Strategy: Adapt a version of this method from a future version of Spree.
I tried to select a version where I would have to make the absolute mini-
mum number of changes to get it to work. See comments in code for justif-
ications of the changes that I did make.
2017-10-20 15:21:59 +11:00
Continuous Integration
e9c8e17710
Merge remote-tracking branch 'origin/master' into HEAD
2017-10-19 20:42:35 +11:00
Lynne
bfd845915c
Update en-GB.yml
2017-10-19 10:41:21 +01:00
Rob Harrington
b7976a2356
Do not update finalized fee adjustments
2017-10-19 16:54:39 +11:00
Rob Harrington
cd744dab68
Ignore .byebug_history after recent update of byebug gem
2017-10-19 10:45:24 +11:00
Transifex-Openfoodnetwork
02e3aac3f0
Updating translations for config/locales/fr.yml [skip ci]
2017-10-19 04:38:24 +11:00
Transifex-Openfoodnetwork
50075f02a0
Updating translations for config/locales/es.yml [skip ci]
2017-10-18 19:29:14 +11:00
Enrico Stano
05d8cd09e3
Merge pull request #1890 from coopdevs/add-node-version
...
Track node version in .node-version
2017-10-18 09:24:06 +02:00
Justyna Field
02fd87158e
Add display flex on active table row to fix misalignment
2017-10-18 15:05:55 +11:00
Pierre de Lacroix
165af4b812
Use I18n "lazy" lookup
2017-10-18 14:38:40 +11:00
Pierre de Lacroix
dba8e36752
Change key for uncapitalized "items" translation
2017-10-18 14:38:40 +11:00
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
