7876 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matt-Yorkley	41b5cf10dd	Quick testing update	2017-05-24 15:05:33 +10:00
Matt-Yorkley	b6955cb98c	Updated variant feature spec	2017-05-24 15:05:33 +10:00
Matt-Yorkley	6c36c269c8	Product Edit UX adjustments	2017-05-24 15:05:33 +10:00
Pierre de Lacroix	b879ea5a96	add comments	2017-05-24 14:37:54 +10:00
Pierre de Lacroix	a6ed4a2c6a	fix bad return value ... in method Spree::Adjustment#find_closest_tax_rates_from_included_tax	2017-05-24 14:37:54 +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
Rob Harrington	848193434b	Show item single_display_amount instead of variant price in order details table ... Also has the effect of taking the inventory price into account (since it is stored against the line item price)	2017-05-19 17:27:04 +10:00
stveep	570f0344da	Remove unused method in wrong controller ^_^	2017-05-19 16:14:22 +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	3b4ffe1f70	Suppress line item validation error for newly-created orders	2017-05-19 16:10:06 +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
stveep	fcce858ea4	Fix OC with override factory	2017-05-19 16:06:43 +10:00
stveep	1f9698f7a2	Test to reproduce bug with overridden price not being displayed when an order is added manually	2017-05-19 16:06:43 +10:00
Rob Harrington	1766da9d60	Adding ng-cloak directive to changeable orders banner	2017-05-19 15:54:55 +10:00
Rob Harrington	15ee62aaa8	Fixing race condition on link click in spec/features/consumer/shops_spec.rb	2017-05-19 13:29:47 +10:00
Rob Harrington	6fc4a297a0	Fixing race condition on link click in spec/features/consumer/shopping/products_spec.rb	2017-05-19 13:15:30 +10:00
Rob Harrington	74d8dc48b4	Rewriting shopfront alert regarding changeable orders to be dynamic	2017-05-18 15:35:07 +10:00
Rob Harrington	b6f4ce373e	Preloading variants for VariantOverride.indexed	2017-05-18 15:34:22 +10:00
Rob Harrington	c9f186f48f	Fixing SlideOutUp animation for darkswarm	2017-05-18 15:33:14 +10:00
Rob Harrington	daab0dfd7a	Refactor: Splitting changeable_order_from_number out into separate method	2017-05-17 12:38:17 +10:00
Rob Harrington	22b5dafad2	Further tweaks to LineItemsController	2017-05-17 12:27:29 +10:00
Rob Harrington	61cb78fc93	Tweaks to LineItemsController, renaming #index to #bought	2017-05-12 16:29:15 +10:00
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
Rob Harrington	9586666248	Updating translation for allow_changes option	2017-05-12 16:11:16 +10:00
Continuous Integration	f5ab9a3445	Merge remote-tracking branch 'origin/master' into HEAD	2017-05-12 10:39:06 +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	f977a05b08	Fixing broken spec for fetching list of bought items as json	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	314e9a4f15	Open shopfront existing orders flash link in a new window	2017-05-05 14:20:57 +10:00