650 Commits

Author	SHA1	Message	Date
Rob Harrington	903ed7e507	Merge branch 'master' into variable_weights ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/views/spree/admin/orders/bulk_management.html.haml app/views/spree/api/line_items/bulk_show.v1.rabl spec/features/admin/bulk_order_management_spec.rb	2015-05-21 17:31:33 +10:00
Rob Harrington	05131de1ad	Use full_name on BOM instead of options_text	2015-05-20 14:11:31 +10:00
Rob Harrington	c56efabfbe	Removing obsolete rabl templates	2015-05-20 11:52:49 +10:00
Rohan Mitchell	924492ec5b	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-05-15 10:37:34 +10:00
Lynne Davis	3179887842	Do not allow line_item.unit_value to be updated if the variant.unit_value is zero	2015-05-09 19:12:24 +01:00
Lynne Davis	2a991ad130	Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.	2015-05-09 19:10:55 +01:00
Rohan Mitchell	03ae740cd6	Revert "Display header for Xero invoices report" ... This reverts commit a6cecdcc25.	2015-05-01 14:55:26 +10:00
Rohan Mitchell	153604dd64	Merge branch 'single-order-patches'	2015-05-01 14:39:17 +10:00
Rohan Mitchell	a6cecdcc25	Display header for Xero invoices report	2015-05-01 11:59:52 +10:00
Maikel Linke	f6d87eee87	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-29 13:20:44 +10:00
Lynne Davis	9e61a7d083	Adding report type drop down to order_cycle_management_report	2015-04-26 11:03:32 +01:00
Maikel Linke	3412bc25bf	Edit Orders: more variant info in variant search ... Displaying variant's full name and the producer's name.	2015-04-23 10:17:01 +10:00
Rob Harrington	0251d8962d	Adding sku to BPE	2015-04-22 21:02:07 +10:00
Rob Harrington	f610a709e1	Adding inherits_properties to BPE	2015-04-22 21:02:06 +10:00
Rohan Mitchell	08fef890ec	Do not show tax lines if there is no tax on the order	2015-04-17 13:41:14 +10:00
Rohan Mitchell	a93633a626	Show tax on order confirmation emails	2015-04-17 13:41:14 +10:00
Rohan Mitchell	4bd1ff2011	Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication	2015-04-17 13:40:08 +10:00
Rohan Mitchell	3ce2c5b84f	Show tax on order confirmation page	2015-04-17 13:40:08 +10:00
Rohan Mitchell	77d7255243	Use short syntax for rendering partials	2015-04-17 13:39:10 +10:00
Rohan Mitchell	beec910445	Display tax in cart	2015-04-17 13:39:09 +10:00
Rob Harrington	226e2f0e2c	Fixing error caused by order show template doing a lookup based on current distributor rather than order distributor	2015-04-10 09:26:20 +10:00
Rohan Mitchell	cf4ccc268a	Admin may set no tax category on product unless tax category is required	2015-03-18 10:12:32 +11:00
Rob Harrington	d684a88697	Merge branch 'order-confirmation' into ready-to-merge	2015-03-13 18:11:53 +11:00
summerscope	d2fbf9f14d	Fixing logic for instance where collection instructions are not entered	2015-03-13 18:00:36 +11:00
Rob Harrington	dd8c769ea9	Hiding fee breakdown on cart page for now	2015-03-13 16:50:57 +11:00
summerscope	864c9ec1da	This changes the user menu labels to show Account next to user email. ... Small tweak to user account page to make it less awful.	2015-03-13 16:49:26 +11:00
Rob Harrington	44511b8b61	Only display shipping description if it exists	2015-03-12 16:18:30 +11:00
Rob Harrington	6cd6b751c8	Merge branch 'master' into order-confirmation	2015-03-12 15:34:49 +11:00
summerscope	f698408d40	Logic for delivery vs collection - making template	2015-03-10 14:58:58 +11:00
summerscope	21b18a8cc5	WIP commit so i can see what i messed up.	2015-03-10 12:31:53 +11:00
summerscope	91bf588bcc	Order details page add in mini thumbnail for product image	2015-03-10 12:03:21 +11:00
summerscope	a8de4dc039	WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience.	2015-03-10 11:35:53 +11:00
summerscope	c3c1573f54	Adding a comment	2015-03-05 23:22:31 +11:00
summerscope	a0af22350d	Order conf page WIP	2015-03-05 17:21:25 +11:00
summerscope	e3b660abb9	Shopping cart page update to simplify, improve and expose fees	2015-03-05 17:21:13 +11:00
summerscope	574a215525	Order Confirmation Page WIP	2015-03-05 11:26:29 +11:00
summerscope	2cdab7af25	More label tweaks and logic tweaks to templates	2015-03-05 11:26:15 +11:00
Rohan Mitchell	67c77cea81	Tidy up haml	2015-03-05 10:43:54 +11:00
Matt-Yorkley	d194e74eda	Rohan's suggested changes	2015-03-05 10:43:51 +11:00
Matt-Yorkley	371f966f63	sales tax view	2015-03-05 10:43:50 +11:00
summerscope	e6591be55c	More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.	2015-03-04 17:34:24 +11:00
summerscope	5b6bff1691	Removing bad nasty overrides which are confusing and bad. and nasty.	2015-03-04 17:20:05 +11:00
summerscope	47b08269d6	Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.	2015-03-04 17:19:24 +11:00
summerscope	76f234ee4d	Order confirmation top page working on header label	2015-03-04 17:18:55 +11:00
summerscope	163035dcad	Tweaking email template to be more like order confirmation	2015-03-04 17:18:37 +11:00
Victor Nava	6e800341c3	Fixes issue #362 Change admin account link to point to account page instead of edit user.	2015-03-04 16:00:46 +11:00
summerscope	b097a62c7a	WIP adding variant name logic to the email templates	2015-03-04 12:37:57 +11:00
summerscope	2c2352cd4e	Final tweaks to different layout use cases for these emails.	2015-02-27 17:14:33 +11:00
summerscope	12bfb9301a	More updates dealing with pick up instructions.	2015-02-27 17:09:59 +11:00
summerscope	ba0d4c2111	More order confirmation email updates. Making language correct for hub vs user.	2015-02-27 16:55:36 +11:00