17514 Commits

Author	SHA1	Message	Date
Will Marshall	f7f4fbf503	Displaying prices better	2014-01-17 16:32:32 +11:00
Rob H	970942ff42	Add JS spec and basic initialisation code for BOM	2014-01-17 13:16:35 +08:00
Rohan Mitchell	87cf596a30	For a product with one or more on_demand variants, don't show 'On demand' at the product level	2014-01-17 16:12:07 +11:00
Rohan Mitchell	ed78cc053b	Do not update product on_hand when product has on_demand variants	2014-01-17 16:12:07 +11:00
Rohan Mitchell	4518e30849	Display infinite on_hand as read-only	2014-01-17 16:12:07 +11:00
Rohan Mitchell	ea028ddd01	Fix invalid JSON for on_demand products/variants with infinite on_hand	2014-01-17 16:12:07 +11:00
Rohan Mitchell	5e0515e6c5	Variant value expression returns a value of 1 when unit value equals the scale	2014-01-17 16:12:07 +11:00
Will Marshall	9624a3919a	Patching a bug in shop controller	2014-01-17 15:13:48 +11:00
Rob H	15c0350c29	Add product name as proxy for variant_unit_text to Order Managment API	2014-01-17 12:09:31 +08:00
Will Marshall	f5777bc7a1	Making our form on_demand and count_on_hand aware	2014-01-17 15:07:43 +11:00
Will Marshall	b6590000a4	Improving Product's has_stock, filtering Shop#products to in_stock products	2014-01-17 14:41:15 +11:00
Rob H	cfbf4d5bc4	Adding attributes to Order Managment API	2014-01-17 10:35:40 +08:00
Will Marshall	6f5ff0ab2c	Making a light grey option	2014-01-16 16:49:50 +11:00
Will Marshall	939b216c12	Changing text to N/A	2014-01-16 16:31:46 +11:00
Will Marshall	dac287f67a	Removing distributors and farmers, curse them	2014-01-16 16:28:10 +11:00
Will Marshall	b6d796e3bc	Getting in ze test for previous commit	2014-01-16 16:25:41 +11:00
Rob H	4e9ae7549e	Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page	2014-01-16 13:20:07 +08:00
Rob H	031414a41f	Make BPE menu tab selected	2014-01-16 13:18:28 +08:00
Will Marshall	d68551c6eb	Patching an issue with quantity fields showing for products with variants	2014-01-16 16:09:03 +11:00
Will Marshall	cbce5958e0	Removing an attr_accessible which breaks EVERYTHING	2014-01-16 15:47:38 +11:00
Will Marshall	0ddef9626e	First working image upload for enterprise logos	2014-01-16 15:47:38 +11:00
Rob H	11499178cb	Set up API for Bulk Order Management (BOM)	2014-01-16 11:56:11 +08:00
Rohan Mitchell	d861495d7d	Fix incomplete save when first setting variant_unit	2014-01-16 14:20:26 +11:00
Will Marshall	26a8daed0e	Patching up the order mailer to set reply_to	2014-01-16 11:39:10 +11:00
Rob H	ce5b24a777	Prevent duplicate filters being added	2014-01-15 15:50:41 +08:00
Rob H	8146301b2f	Add validation to BPE advanced filter box	2014-01-15 14:35:46 +08:00
Rohan Mitchell	29235cd2cb	Merge branch 'master' into product-amount-units ... Conflicts: app/assets/javascripts/admin/bulk_product_update.js.coffee spec/spec_helper.rb	2014-01-14 15:34:05 +11:00
Rohan Mitchell	a30e46d747	Do not delete variant options_text when saving/refreshing products	2014-01-14 11:40:58 +11:00
Rohan Mitchell	9442b7b5dc	On save, scale from chosen unit to base unit (eg. mL to L)	2014-01-14 11:13:19 +11:00
Rohan Mitchell	c43b56f3f8	On load, scale from base unit to chosen unit (eg. g to kg)	2014-01-14 10:16:21 +11:00
Rohan Mitchell	22ec6aa852	Add comment	2014-01-10 15:59:38 +11:00
Rohan Mitchell	9c28b5baae	Fix product lists not matching when saving changes to product unit+values fields	2014-01-10 15:43:45 +11:00
Rob H	aff35e5749	Remove unused toggle-column-list directive	2014-01-10 01:08:03 +08:00
Rob H	29ba0ccc97	Initialise BPE page with 'Available On' column hidden	2014-01-10 00:46:42 +08:00
Rob H	ee2da3e008	Toggle new view controls on BPE	2014-01-10 00:26:54 +08:00
Rohan Mitchell	a60c9a9cea	When variant already has a value set, remove old option value and assign a new one	2014-01-09 14:11:54 +11:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Will Marshall	533a987684	Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom	2014-01-08 15:20:33 +11:00
Will Marshall	7838d759ee	Removing redundant functionality from the Order Populator	2014-01-08 14:45:40 +11:00
Rohan Mitchell	ea3e697b73	Rename method for clarity, remove outdated specs for OrderPopulator	2014-01-08 14:14:45 +11:00
Rohan Mitchell	20ad906f7a	Fix multicart use of OrderPopulator	2014-01-08 14:13:19 +11:00
Rohan Mitchell	dd16934496	Remove redundant serializer spec, reinstate creation of order distribution charges	2014-01-08 13:22:34 +11:00
Rohan Mitchell	eda4f241e2	Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests	2014-01-08 11:39:05 +11:00
Rohan Mitchell	ef56574d82	Pass quantity to OrderPopulator	2014-01-08 11:37:38 +11:00
Will Marshall	5e041a6f4f	Uncommenting the old OP code	2014-01-08 10:35:27 +11:00
Rohan Mitchell	2fec16af5d	Merge branch 'master' into product-amount-units	2014-01-07 16:00:06 +11:00
Rohan Mitchell	894f86350e	Fix megalitre unit specification	2014-01-07 15:17:32 +11:00
Rohan Mitchell	042e8386ab	Refactor: Extract methods to simplify	2014-01-07 15:16:36 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Rohan Mitchell	ebae76375f	Fix specs to work with unit_value stored in base units, scale units correctly for output	2014-01-07 14:57:30 +11:00