Julius Pabrinkis
ef488133e8
Add missing translations from files list.
2017-07-21 12:17:12 +10:00
clairezed
5c66a2fc9d
Fix wrong key replacement for producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
5f8890e963
update producers pack translation key from sell_description_text to producer_shop_description_text
2017-07-21 11:15:03 +10:00
Maikel Linke
1a57a0b3ca
Revert changes in fr.yml
2017-07-19 09:46:23 +10:00
François Turbelin
a0595bc45a
Add missing translations on views
2017-07-19 09:45:11 +10:00
Maikel Linke
dc0da6f7b7
Correct typo raised by Sergi
2017-07-12 14:40:44 +10:00
Maikel Linke
b7f99c3185
Merge branch 'transifex'
2017-06-30 16:28:08 +10:00
Diogo Matsubara
386d651678
Fix #1611 (Rephrase error message for people logging in with an existing user email)
...
update test to use new rspec syntax
2017-06-28 15:35:21 +10:00
Transifex-Openfoodnetwork
6c69eebcbf
Updating translations for config/locales/nb.yml [skip ci]
2017-06-27 05:41:31 +10:00
Transifex-Openfoodnetwork
63e453e2c7
Updating translations for config/locales/fr.yml [skip ci]
2017-06-23 18:09:39 +10:00
Maikel Linke
ec53d9df7a
Merge tag 'v1.8.11' into transifex
2017-06-15 09:59:59 +10:00
Maikel Linke
1196cd7df4
Add style guide to the source locale
...
There has been a lack of rules how to structure our locale en.yml. This
is a start to document some guidelines which can evolve over time.
Rules can be discussed in the community forum or in pull requests. Once
there is a strong agreement, we should add it to this guide.
2017-06-14 15:20:01 +10:00
sseerrggii
18c7b03f3d
Add plurals
2017-05-26 16:51:29 +10:00
Matt-Yorkley
6c36c269c8
Product Edit UX adjustments
2017-05-24 15:05:33 +10:00
Pierre de Lacroix
db63f30a76
cosmetic fixes to the ticket view
2017-05-24 13:35:59 +10:00
stveep
38c25c412f
Remove duplicated spec, better error message suppression, fix shipping test to wait correctly
2017-05-19 16:14:22 +10:00
stveep
c1c5d00f45
Add new view to set distribution, ensure the scoped variant single item price is used.
2017-05-19 16:10:06 +10:00
Rob Harrington
74d8dc48b4
Rewriting shopfront alert regarding changeable orders to be dynamic
2017-05-18 15:35:07 +10:00
Transifex-Openfoodnetwork
110f74eee8
Updating translations for config/locales/es.yml [skip ci]
2017-05-12 20:49:15 +10:00
Rob Harrington
61cb78fc93
Tweaks to LineItemsController, renaming #index to #bought
2017-05-12 16:29:15 +10:00
Rob Harrington
9586666248
Updating translation for allow_changes option
2017-05-12 16:11:16 +10:00
Transifex-Openfoodnetwork
6eafed00f5
Updating translations for config/locales/fr.yml [skip ci]
2017-05-05 21:35:28 +10:00
Transifex-Openfoodnetwork
74661c0b77
Updating translations for config/locales/nb.yml [skip ci]
2017-05-05 18:10:25 +10:00
Rob Harrington
c4fbcb19d0
Only show Admin & Handling fees once on completed order form
2017-05-05 15:28:01 +10:00
Rob Harrington
08e391856c
Ask user to confirm cancellation of order
2017-05-05 15:17:14 +10:00
Rob Harrington
8c8b40c5a8
Showing order cycle close time on banner when multiple open orders are present
2017-05-05 14:20:57 +10:00
Rob Harrington
3df629bc6e
Prevent users from removing the final line item of an order, suggest cancelling instead
2017-05-05 14:20:57 +10:00
Rob Harrington
6c90b4e6d0
Adding alert to order summary, notifying user of remaining time to make changes
2017-05-05 14:20:57 +10:00
Rob Harrington
e79a23a554
Disabling save button on order page until changes are made to the order
2017-05-05 14:20:57 +10:00
Rob Harrington
314e9a4f15
Open shopfront existing orders flash link in a new window
2017-05-05 14:20:57 +10:00
Rob Harrington
840c936a6f
OrderSerializer#changes_allowed_until returns 'Not allowed' unless changes are allowed
2017-05-05 14:20:57 +10:00
Rob Harrington
7ea74ccf4a
Order confirmation redirects 'Back to Cart' if cart is non-empty
2017-05-05 14:20:57 +10:00
Rob Harrington
b55036e165
Adding alert to shopfront to alert user to presence of orders open for editing
2017-05-05 14:20:57 +10:00
Rob Harrington
316b0915e4
Just display the date that orders can be changed until
...
No fancy moment.js stuff
2017-05-05 14:20:57 +10:00
Rob Harrington
893331c7bb
Adding 'Open Orders' section to the top of customer accounts page
2017-05-05 14:20:57 +10:00
Rob Harrington
cda43f075b
Moving bought items listing up into main section of cart
2017-05-05 14:19:32 +10:00
Rob Harrington
5d9f92eaa7
Adding 'Cancel Order' button to order confimation interface
2017-05-05 14:19:32 +10:00
Rob Harrington
c6afa1849c
Basic routing for front-end OrdersController#cancel action
2017-05-05 14:19:32 +10:00
Maikel Linke
12a6f652ad
Warn when allowing guest orders and order changes
2017-05-05 14:19:32 +10:00
Maikel Linke
f3f6714472
Add message about previous orders on checkout page
...
The message appears if the user ordered before within the same order
cycle and the shop allows to change previous orders.
2017-05-05 14:19:32 +10:00
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
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
e8d2d4d96f
Display already bought items in edit cart view
2017-05-05 14:19:32 +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
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
Maikel Linke
95ddfc4e40
Merge tag 'v1.8.10' into transifex
2017-05-05 12:28:16 +10:00
François Turbelin
01746ed470
Add missing translations on views
2017-05-04 21:33:17 +02:00
