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
68c8759af1
Count of items in cart form looks is consistent with rest of UI (ie. uses quantities)
2017-05-05 14:20:57 +10:00
Rob Harrington
0029a1b6cf
Ensure order adjustments are displayed in edit form for customers
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
ae28d7a96b
Adding a link in cart to allow user to edit existing + open orders for same OC
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
e21bfd95f4
Renaming order.editable? to order.changes_allowed?
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
b0ff7ca767
Making accounts page orders listing full-width
2017-05-05 14:19:32 +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
eec3a21c89
Allow editing of completed orders from confirmation page where distributor allows it
2017-05-05 14:19:32 +10:00
Rob Harrington
768240a5ba
Reorganising darkswarm order views into partials
2017-05-05 14:19:32 +10:00
Maikel Linke
936df71d0d
Link to bought products on cart page
...
The checkout page was just linking to the cart page, but not scrolling
down.
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
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
François Turbelin
01746ed470
Add missing translations on views
2017-05-04 21:33:17 +02:00
Maikel Linke
d91c3d1241
Format reset password instructions like Spree
2017-05-03 11:06:48 +10:00
François Turbelin
2fae467e9a
Translate ResetPasswordConfirmation mail
2017-05-03 11:06:48 +10:00
Rob Harrington
7ef0964af2
Adding shortcuts for both sales tax reports to the reports index
2017-03-15 23:57:13 +11:00
Rob Harrington
18472ea8c3
Making 'tax types' report the default sales tax report
2017-03-15 23:56:44 +11:00
Rob Harrington
36e0f45a89
Show the shops invoice text on old invoice template
2017-03-15 17:39:21 +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
Rob Harrington
0429906eed
Slight adjustments to invoice layout
...
1. Hide tax column when no tax included in the order
2. Save a little bit of space in the header by sharing rows
2017-03-15 15:03:46 +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
2d2792225a
change invoice layout to include amount for each relevant tax rate
2017-03-15 15:03:18 +11:00
François Turbelin
be6b09a6e0
Adding i18n keys on JS templates
2017-03-12 12:22:13 +01:00
Lynne Davis
cad3464f56
Adjusted BOM spec to reflect currency symbol changes
2016-12-09 11:40:55 +00:00
Rohan Mitchell
dabac50128
Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products
2016-11-25 14:14:42 +11:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Rohan Mitchell
d574b8943b
WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM
2016-11-04 09:39:17 +11:00
Rob Harrington
261a574da9
Tweaking styling on enterprise change form, and dashboard header row
2016-09-07 11:13:48 +10:00
Rob Harrington
be51a55f16
Only display shopfront trial message on dashboard page. Fixes #1120
2016-09-02 13:45:49 +10:00
Maikel Linke
c4f81b019e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n
2016-08-19 09:27:17 +10:00
Maikel Linke
c34e9c046b
Remove quotes around url
2016-08-17 16:44:27 +10:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +10:00
Rohan Mitchell
6f947380cb
Remove unused overrides and views
2016-07-29 09:18:31 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Maikel Linke
af6d0ec107
Remove unused code from order confirmation page
2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775
Inject only needed enterprises into order confirmation page
2016-07-13 13:54:32 +10:00
Maikel Linke
52f68dac33
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-06 11:35:26 +10:00
