15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	6d2f77b308	Fix report spec	2014-01-22 10:16:45 +11:00
Rohan Mitchell	5adc4f27f4	Do not display option type when showing variant options_text. This makes variant names cleaner.	2014-01-22 09:24:09 +11:00
Will Marshall	8879181a27	Adding promo image to about panel	2014-01-21 16:56:00 +11:00
Will Marshall	aec5894c70	Adding a promo image to enterprises	2014-01-21 16:32:55 +11:00
Will Marshall	8cc18e8db4	Fixing the shopping spec to conform to the new format of dates	2014-01-21 15:42:11 +11:00
Rob H	90f88d260b	Confirm deletion of line items on BOM	2014-01-19 21:59:07 +08:00
Rob H	b9a3031663	Line item delete button works	2014-01-19 21:46:11 +08:00
Rob H	1744cc9548	Orders API retrieves order number	2014-01-19 18:41:16 +08:00
Rob H	02f8917722	Add delete button to BOM page	2014-01-18 21:00:54 +08:00
Rob H	701b5aceb4	Add 'All' option to supplier and distributor filters	2014-01-18 14:26:07 +08:00
Rob H	79631ebb8e	Add distributor filter to BOM	2014-01-18 12:48:52 +08:00
Rob H	e2d9e9c4eb	BOM API collects distributor for orders	2014-01-18 11:50:36 +08:00
Rob H	3f5930032b	Add more detailed tests for output of orders API	2014-01-18 11:35:47 +08:00
Rob H	680b5c8a42	Add supplier filter to BOM	2014-01-18 11:13:32 +08:00
Rob H	6c1d149397	Add columns for quantity and max to BOM	2014-01-17 18:26:30 +08:00
Rob H	0e861d98af	Add column for variant description to BOM	2014-01-17 17:32:29 +08:00
Rob H	d6b4f8129c	Match supplier of each line item with the list fetched from server	2014-01-17 17:14:05 +08:00
Rob H	94c375ad31	WIP: changing BOM listing from orders to line items	2014-01-17 16:57:08 +08:00
Rob H	e0d03fa305	Listing more attributes of orders on BOM page	2014-01-17 15:29:08 +08:00
Rob H	00dfa62f43	Basic listing of orders on BOM page	2014-01-17 14:56:26 +08:00
Will Marshall	48854fdcf5	Adding date parsing to Angular	2014-01-17 17:13:15 +11:00
Rob H	5aa032b54c	BOM: fetchOrders sends request to API and resetOrders stores returned data	2014-01-17 14:00:02 +08:00
Rob H	c6d9bfafbc	Create shared services module for backend angularjs, rename modules	2014-01-17 13:48:28 +08:00
Will Marshall	053f2446bf	Adding a temporary note to the product page	2014-01-17 16:37:24 +11:00
Will Marshall	6e622ffb37	Changing the logo to go back to the home page	2014-01-17 16:36:28 +11:00
Will Marshall	1e88c0a6f1	Adding max quantity for group buy to ze form	2014-01-17 16:32:32 +11:00
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	ef00927885	Adding a nice little JSON/controller test	2014-01-17 14:48:38 +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