7324 Commits

Author	SHA1	Message	Date
Rohan Mitchell	4583e29ae3	When order is placed, subtract stock from variant override	2015-01-12 11:23:53 +11:00
Rohan Mitchell	a4d4622521	Add VariantOverride.decrement_stock	2015-01-12 10:39:23 +11:00
Rohan Mitchell	20f650b472	Add VariantOverride.stock_overriden?	2015-01-12 09:32:02 +11:00
Rohan Mitchell	d40ffeef52	Remove old sidebar	2015-01-09 13:10:17 +11:00
Rohan Mitchell	27bc845b0b	Add correct markup for tax category required asterisk	2015-01-09 12:45:35 +11:00
Rohan Mitchell	22cb8b7a71	Two-space indentation, change 'Shipping categories' to 'Shipping category'	2015-01-09 12:33:26 +11:00
Rohan Mitchell	c6db1d440c	Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category ... Conflicts: app/overrides/spree/admin/products/new/replace_form.html.haml.deface app/views/spree/order_mailer/confirm_email.text.haml	2015-01-09 12:30:19 +11:00
Rohan Mitchell	6a42f62eb2	Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report	2015-01-09 11:49:59 +11:00
Rohan Mitchell	8db09d9590	Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-09 11:48:23 +11:00
Rohan Mitchell	51b0d7e0eb	Move private method to helper	2015-01-08 10:48:02 +11:00
Rohan Mitchell	ab26902e4e	Move money decorator to lib dir, as it's a decorator for a lib class, not a model	2015-01-08 10:39:14 +11:00
Rohan Mitchell	6adb4194c2	Extract date range form to partial	2015-01-08 10:31:51 +11:00
Rohan Mitchell	b6f29c778e	Use haml syntax for defining divs	2015-01-08 10:23:37 +11:00
Rohan Mitchell	4839c00d62	Retrieve currency_symbol via private method rather than before_filter + instance var - cleaner syntax	2015-01-08 10:12:32 +11:00
Rohan Mitchell	a438216189	Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2 ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-08 10:08:12 +11:00
Rohan Mitchell	087ccb52f9	Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown	2015-01-08 09:09:20 +11:00
Maikel Linke	3b9657eb17	show map of a group's enterprises	2015-01-07 12:00:55 +11:00
Maikel Linke	9956b967f0	Fixing link to group's page	2015-01-07 10:27:08 +11:00
Maikel Linke	9310bc902a	first draft of group page, a lot of TODOs	2015-01-06 22:39:15 +11:00
Maikel Linke	9798b05a24	TabsCtrl can show tabs that don't toggle ... toggle: tabs show on first click and hide on second click select: tabs show on every click, one tab is always active	2015-01-06 22:39:15 +11:00
Maikel Linke	586753015b	Reducing the groups page to a oneline list of groups	2015-01-06 22:39:15 +11:00
Paul Mackay	67b17de695	#275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.	2014-12-30 11:33:13 +00:00
summerscope	6863dd75ef	Restyling button for price breakdown to make it more clear that users press again to close the pop over	2014-12-19 17:05:13 +11:00
Rohan Mitchell	85882a73ff	Merge branch 'lin-d-hop-266reportsbranch'	2014-12-19 16:51:38 +11:00
Rohan Mitchell	94684e9963	Show overridden price in shopping cart	2014-12-19 16:51:11 +11:00
Rob Harrington	6f95fa8546	Merge remote-tracking branch 'origin/shopfront-filters'	2014-12-19 15:40:01 +11:00
summerscope	d50f8dcd01	Tweak styling shopfront page to allow for new icons and hover state	2014-12-19 14:53:46 +11:00
summerscope	813ef463a2	Tweak markup shopfront page to add icon	2014-12-19 14:53:25 +11:00
Rob Harrington	a810fc88ac	Dedicated new enterprise form	2014-12-19 14:05:24 +11:00
Rob Harrington	24cf3dee74	Hiding Shop Preferences in enterprise form	2014-12-19 14:05:24 +11:00
Rob Harrington	21e4f40616	Implementing primary taxon ordering on the shopfront	2014-12-19 14:05:23 +11:00
Rob Harrington	0fa289a443	Changing shopfront message into an alert box	2014-12-19 14:04:02 +11:00
Rob Harrington	fcb14f32d2	Validating user input for shopfront taxon order	2014-12-19 14:04:02 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +11:00
Rob Harrington	a38e27e504	Adapting taxon autocompleter to allow multiple selection of taxons	2014-12-19 14:04:02 +11:00
Rob Harrington	4b353fa27b	Ammending comments to make slightly more clear	2014-12-19 14:04:01 +11:00
Rob Harrington	9f086facdb	Hiding link to shopfront for non-distributors	2014-12-19 14:04:01 +11:00
Rob Harrington	c5bf228cb9	Removing hashes from side menu links	2014-12-19 14:04:01 +11:00
Rob Harrington	b18163bfaf	Remove separate long description injection, use full enterprise serializer instead	2014-12-19 14:04:01 +11:00
Rob Harrington	3fa1832e7b	Adding shop closed message preference	2014-12-19 14:04:01 +11:00
Rob Harrington	d5df73c6a2	Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular	2014-12-19 14:04:01 +11:00
Rob Harrington	5a24f2c0e2	WIP: adding shopfront message to shop	2014-12-19 14:04:00 +11:00
Rob Harrington	435bc177f8	Hiding side menu elements by filtering rather than by making invisible	2014-12-19 14:04:00 +11:00
Rob Harrington	a489aa7ad9	Fixing enterprise feature spec, adding first shop preference	2014-12-19 14:04:00 +11:00
Rob Harrington	88d49148d4	Adding border to text-angular form element	2014-12-19 14:04:00 +11:00
Rob Harrington	33d4f03a99	Adding shop preferences pane, fiddling with icons	2014-12-19 14:04:00 +11:00
Rob Harrington	612c8a95b2	Adding icons to enterprise edit side menu	2014-12-19 14:04:00 +11:00
Rob Harrington	abdcdea1a2	Adding payment methods partial to new enterprirse edit screen	2014-12-19 14:04:00 +11:00
Rob Harrington	412b431f36	Fixing up tbody positions	2014-12-19 14:03:59 +11:00
Rob Harrington	25e608d9fb	Adding shipping methods partial to redone enterprise form	2014-12-19 14:03:59 +11:00