Rob Harrington
38d3b446cc
Removing unused #tag_list method on VariantSerializer
2017-05-12 16:11:16 +10:00
Rob Harrington
e47e10d267
Removing n+1 query from #items_bought_by_user
2017-05-12 16:11:16 +10:00
Rob Harrington
77c8c85775
Memoizing the result of OrdersController#order_to_update
2017-05-12 16:11:16 +10:00
Rob Harrington
fab6d70832
Changeable orders only returns orders if the shop allows changes
2017-05-12 16:11:16 +10:00
Continuous Integration
1ac8c85113
Merge remote-tracking branch 'origin/master' into HEAD
2017-05-12 09:55:25 +10:00
Rob Harrington
56c2350d36
Updating enterprise fees on completed order from OrdersController#update
2017-05-10 12:04:32 +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
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
5eadb33db9
Using changes_allowed? to authorize cancellation of line_items
2017-05-05 14:20:57 +10:00
Rob Harrington
217eda8362
Shipping and payment fees are updated for completed orders when the order changes
2017-05-05 14:20:57 +10:00
Rob Harrington
579f3bf90a
Changing quantity and deleting line_items of completed orders works with inventory where present
2017-05-05 14:20:57 +10:00
Rob Harrington
348ab81c42
Overriding #increment! using variant overrides
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
07b2f0a7c2
Showing banner for distributor of order on order summary, regardless of current_distributor
2017-05-05 14:20:57 +10:00
Rob Harrington
c0445d46f3
Changeable orders ignores cancelled orders
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
314ccc2f27
Ensuring that #items_bought_by_user doesn't return items from cancelled orders
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
bfcde72855
Use explicit format for dates on front-end account page
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
47011e11ff
order_cycle.items_bought_by_user actually scopes to the current distributor
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
493a537f2c
Making out-of-stock products in the cart more visible
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
c6afa1849c
Basic routing for front-end OrdersController#cancel action
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
Rob Harrington
5af8668560
Rewriting Spree::Taxons.distributed_taxons for better performance
2017-05-05 14:19:32 +10:00
Rob Harrington
630b8a2577
Add OrdersController#order_to_update method, to allow updating a complete order where appropriate
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
db4a528ba3
Update shipment to re-calculate included tax
...
And re-create tax charges on the order. (untested)
2017-05-05 14:19:32 +10:00
Maikel Linke
479c7ba24b
Update transaction fees of completed orders
...
The adjustments associated to incomplete payments are re-calculated when
a line item is removed from a completed order.
2017-05-05 14:19:32 +10:00
Maikel Linke
1f08729df3
Update shipping fees after removing item
...
After removing an item from a completed order, update the shipping fees
of all shipments that are pending or ready (not completed).
2017-05-05 14:19:32 +10:00
Maikel Linke
811671661e
Remove item from dropdown cart after deletion
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
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
219ad4a3a7
Reload bought products after choosing order cycle
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
