Maikel Linke
71742a80b5
Make two more strings translatable
2017-07-21 12:17:13 +10:00
Maikel Linke
f4b1667005
Replace global translations by local ones
2017-07-21 12:17:13 +10:00
Maikel Linke
e5c9845b10
Remove duplicate haml code
2017-07-21 12:17:13 +10:00
Maikel Linke
d3fc89f42a
Unify haml code for colouring
2017-07-21 12:17:13 +10:00
Maikel Linke
9c6454b47a
Remove duplicated code
...
A label was accidentally inserted twice. Also removed some duplicate
translation.
2017-07-21 12:17:13 +10:00
Maikel Linke
7d2484c8bf
Remove superfluous string interpolation
2017-07-21 12:17:13 +10:00
Maikel Linke
9723c8b82b
Move translation into the right place
...
The dashboard couldn't find a translation, because it is in the spree
namespace.
Also simplified the translation using the `count` feature.
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
ef488133e8
Add missing translations from files list.
2017-07-21 12:17:12 +10:00
François Turbelin
a0595bc45a
Add missing translations on views
2017-07-19 09:45:11 +10:00
Rob Harrington
b277ff03ea
Rubocop: Auto-correct Style/TrailingBlankLines offences
2017-06-23 16:49:07 +10:00
Pierre de Lacroix
6972822c49
fix escaping problems on ticket view
2017-05-24 13:35:59 +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
4699c654fc
Fix feature specs for new 'new admin order' flow
2017-05-19 16:10:06 +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
stveep
220693f4e3
Starting alternative flow for new manual order
2017-05-19 16:06:43 +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
c3eda435eb
Hiding 'Back to Cart' and 'Back to Store' buttons on completed orders when distributor does not match cart
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
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
