Maikel Linke
3bce2eb7b5
Rename translation key checkout to avoid conflicts
...
A top-level translation key `checkout` can't co-exist with translation
keys in the path `checkout`. Moving the old key to
`shared.menu.cart.checkout` avoids conflicts. It also structures the
locale better by view.
2017-05-05 14:19:32 +10:00
Maikel Linke
bf05866f92
Change headline of already ordered items
2017-05-05 14:19:32 +10:00
Maikel Linke
219ad4a3a7
Reload bought products after choosing order cycle
2017-05-05 14:19:32 +10:00
Maikel Linke
a7d8028d5a
Add retry: 3 to intermittently failing spec
2017-05-05 14:19:32 +10:00
Maikel Linke
d49469a3e6
Show bought items only if changes are allowed
...
An enterprise can decide to allow changes to orders in open order
cycles. The items of these orders are then displayed in the shopping
cart and can be removed on the cart edit page.
2017-05-05 14:19:32 +10:00
Maikel Linke
4835ef067f
Add feature to remove line items from open order cycle
...
- Add JS controller to send delete requests.
- Add resource controller to destroy items.
- Add authorisation check to abilities.
- Update fees after removing line item.
2017-05-05 14:19:32 +10:00
Maikel Linke
4112c3cc75
Set auth token for all JS HTTP requests
2017-05-05 14:19:32 +10:00
Maikel Linke
0fe4030d71
Display bought items only if present
2017-05-05 14:19:32 +10:00
Maikel Linke
e8d2d4d96f
Display already bought items in edit cart view
2017-05-05 14:19:32 +10:00
Maikel Linke
88c3f414fb
Handle missing order in cart
2017-05-05 14:18:20 +10:00
Maikel Linke
c0d6b68233
Apply some style guidelines to older code
2017-05-05 14:18:20 +10:00
Maikel Linke
65f62c42b9
Display products already ordered in this oc
...
Github issue #1083 , part of standing orders.
For now, just display already bought products within the same order
cycle in the popup cart view. The edit cart view should follow. Later,
it should be possible to remove items as well.
2017-05-05 14:18:20 +10:00
Maikel Linke
fe7bd5e2cd
Serialise tag_list only for variant overrides
...
Don't try to call tag_list on just variants since that will fail.
Normally, all variants of `current_order` should be extended to
VariantOverrides of the current order cycle. But in development
environment, it can happen that the variants are reloaded without being
extended again.
2017-05-05 14:18:20 +10:00
Maikel Linke
e1b40142b8
Remove unused translations
2017-05-05 14:18:20 +10:00
Maikel Linke
963b4617a9
Add allow-order-changes option to enterprise
2017-05-05 14:18:20 +10:00
François Turbelin
01746ed470
Add missing translations on views
2017-05-04 21:33:17 +02:00
Lynne
29e2886b05
Update contributing.md
...
Include link to discourse post: How to raise a github issue
2017-05-03 11:50:07 +01:00
Maikel Linke
d91c3d1241
Format reset password instructions like Spree
2017-05-03 11:06:48 +10:00
Maikel Linke
b302deb7a3
Add UserMailer specs adapted from Spree code
2017-05-03 11:06:48 +10:00
François Turbelin
2fae467e9a
Translate ResetPasswordConfirmation mail
2017-05-03 11:06:48 +10:00
Em-AK
c72d17dc83
Run karma task only in test environment
...
and fails otherwise, as it needs the defaults defined in test environment
2017-04-28 11:28:24 +10:00
Em-AK
78ffdec693
Force english locale in test environment
2017-04-28 11:28:24 +10:00
Pierre de Lacroix
49c19a1d6a
update wkhtmltopdf-binary and wicked_pdf
2017-04-27 18:38:47 +10:00
Pierre de Lacroix
e854eb0426
add tests
...
for methods Spree::Order#tax_adjustment_totals
and Spree::Adjustment#find_closest_tax_rate_from_included_tax
2017-04-27 17:32:36 +10:00
Pierre de Lacroix
4a9c17cb28
better tax aggregation
2017-04-27 17:32:36 +10:00
Matt-Yorkley
0d1547f439
Require OC ready_for in simple OC UI
2017-04-21 09:34:50 +10:00
Matt-Yorkley
fa5ed529cb
Added OC form validation
2017-04-21 09:32:49 +10:00
Matt-Yorkley
accb3076e9
Updated translations
2017-04-21 09:32:49 +10:00
Matt-Yorkley
a4e4e1ec68
Require OC name
2017-04-21 09:32:49 +10:00
Maikel Linke
4809237ecc
Fast fail set_order_cycles if distributor not ready
2017-04-19 14:28:17 +10:00
Maikel Linke
81877fedb6
Remove useless andand called on scope
2017-04-19 14:28:17 +10:00
Matt-Yorkley
1f2c6f2a85
Ensure shops display as closed when not configured for sales
...
squashme
squashme
squash
squash
squash
2017-04-19 14:28:17 +10:00
Matt-Yorkley
4fe5e60967
Updated controller stub to pass test
2017-04-19 14:28:17 +10:00
Matt-Yorkley
f4eb9cb790
Hubs display as closed when not configured for payment or shipping
2017-04-19 14:28:16 +10:00
Maikel Linke
775f9b3ada
Move text from view to locale (i18n)
2017-04-12 10:06:53 +10:00
Maikel Linke
188b33921c
Remove test entry in locale
2017-04-12 09:56:24 +10:00
Maikel Linke
20c033317f
Remove unnecessary string interpolation from view
2017-04-12 09:49:24 +10:00
Matt-Yorkley
e7a5d063ac
Update simple OC form
2017-04-12 09:41:40 +10:00
Matt-Yorkley
1fda781d7e
Set maxlength on OC displayname field
2017-04-12 09:41:39 +10:00
Matt-Yorkley
45fc801a08
Added tooltips to OC form
2017-04-12 09:41:39 +10:00
Maikel Linke
21337a5b50
Merge tag 'v1.8.9' into transifex
2017-04-06 10:36:14 +10:00
Maikel Linke
ec36a843cf
Merge tag 'v1.8.8' into transifex
2017-04-06 10:31:26 +10:00
Transifex-Openfoodnetwork
e99dbaf4d8
Updating translations for config/locales/es.yml [skip ci]
2017-04-05 19:40:18 +10:00
Rob Harrington
c83ad2ecc4
Fixing broken limited reached page in registration flow
2017-04-05 17:02:40 +10:00
Matt-Yorkley
80d8d18eb2
Update terms of service config
2017-04-05 15:48:50 +10:00
Rob Harrington
903d1afb53
Stripping html tags from products description on new form as well
2017-04-05 14:29:23 +10:00
Matt-Yorkley
cd55d2e2ff
Product Description - strip weird tags on paste
...
squashme
2017-04-05 11:29:35 +10:00
Rob Harrington
05cf8c4351
Sanitizing product description for textAngular input
2017-04-05 11:29:35 +10:00
Matt-Yorkley
b04d815408
Changes for code review
...
Fixed spec
2017-04-05 11:29:35 +10:00
Matt-Yorkley
7b370a2eb6
Removed underline option
2017-04-05 11:29:35 +10:00
