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
François Turbelin
01746ed470
Add missing translations on views
2017-05-04 21:33:17 +02:00
François Turbelin
2fae467e9a
Translate ResetPasswordConfirmation mail
2017-05-03 11:06:48 +10:00
Em-AK
78ffdec693
Force english locale in test environment
2017-04-28 11:28:24 +10:00
Matt-Yorkley
accb3076e9
Updated translations
2017-04-21 09:32:49 +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
Matt-Yorkley
e7a5d063ac
Update simple OC form
2017-04-12 09:41:40 +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
Pierre de Lacroix
268bea25d0
add qz/ folder from ofn-qz gem to list of assets
2017-03-30 20:37:20 +02:00
Maikel Linke
a94961c0a7
Fixup merge conflicts and remove unused text
2017-03-29 14:58:19 +11:00
Lynne Davis
e8999d23e1
Updated translations
2017-03-29 13:12:29 +11:00
Transifex-Openfoodnetwork
6defb09d2e
Updating translations for config/locales/fr.yml [skip ci]
2017-03-21 09:03:15 +11:00
Transifex-Openfoodnetwork
2774c09d7a
Updating translations for config/locales/nb.yml [skip ci]
2017-03-20 07:10:53 +11:00
Matt-Yorkley
c0c6cd1a60
Product Import feature
2017-03-17 16:11:52 +11:00
Maikel Linke
8107f49373
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/fr.yml
2017-03-16 09:30:22 +11:00
Rob Harrington
bea0b2b1e5
Adding feature toggle for receipt printing using qz
2017-03-15 16:39:04 +11:00
Rob Harrington
9a69951136
Using correct key for invoice_settings title translation
2017-03-15 16:12:50 +11:00
Rob Harrington
e19bab1aa2
Fixing translations for invoice settings edit template
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
70707969f3
Add Qz integration
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
2fe25c6219
Allow both invoice layouts to coexist
...
Add a new "Invoice" page in the admin backend
with a checkbox to toggle between layouts
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
cc1ef5b28b
fixes on invoice and tax report
2017-03-15 15:04:57 +11:00
Pierre de Lacroix
88a09da325
fix for pull request #1374
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
8570471c00
add tax rates report
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
7925af30d6
add enterprise logo and custom text on invoices
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
6f59751582
change i18n fallbacks parameter to EN in production settings
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
2d2792225a
change invoice layout to include amount for each relevant tax rate
2017-03-15 15:03:18 +11:00
Maikel Linke
a079a64cbe
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n2
2017-03-15 12:35:39 +11:00
Maikel Linke
656be690a3
Remove space from permalink tip
2017-03-15 12:11:56 +11:00
Maikel Linke
167045f695
Remove forgotten " character
2017-03-15 12:01:31 +11:00
François Turbelin
dbe968afbb
Fixing translated interpolation in fr locale
2017-03-12 12:42:00 +01:00
François Turbelin
179b995fa0
Fixing wrong string interpolation in i18n files
2017-03-12 12:41:06 +01:00
François Turbelin
4791086207
Fixing i18n multiline issues
2017-03-12 12:39:29 +01:00
