215 Commits

Author	SHA1	Message	Date
Rob H	9f19e91e90	Merge branch 'master' into bom	2014-03-05 10:15:39 +11:00
Rob H	2a713245a8	BOM: date filter refactor and works with pending changes	2014-03-05 10:14:35 +11:00
Will Marshall	3db601f362	Merge branch 'master' into checkout	2014-02-27 16:29:21 +11:00
Will Marshall	d6c71d5416	Fixing a nil bug in the referrer handling on login	2014-02-27 16:24:10 +11:00
Rohan Mitchell	3196e28d88	Admin can assign units to a product	2014-02-27 11:29:39 +11:00
Rohan Mitchell	353d2a4d9c	Do not error when creating variant for product without non-unit option type	2014-02-27 11:28:07 +11:00
Rob H	41c61b3b12	BOM date filters work	2014-02-22 15:51:14 +11:00
Rob H	1f569e4be1	Add loading splash to BOM	2014-02-22 14:49:19 +11:00
Rob H	83e228dc63	Display message when no matching orders found for BOM	2014-02-22 11:48:24 +11:00
Rob H	1b10bf53c0	WIP: BOM loads with orders filtered by default date restrictions	2014-02-22 11:33:36 +11:00
Rob H	5ec7a10e16	Add date filter fields to BOM	2014-02-21 14:01:33 +11:00
Rohan Mitchell	6d1a202800	Fix grammar	2014-02-19 13:32:57 +11:00
Rohan Mitchell	acbf1ed680	Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI	2014-02-19 13:12:52 +11:00
Rohan Mitchell	3f9f24157c	Do not show unit value or description when product does not have a unit-related option type	2014-02-19 12:07:53 +11:00
Rohan Mitchell	3024bbbeb5	Edit unit value and description of variant	2014-02-19 11:56:37 +11:00
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Rohan Mitchell	701896be95	BPE: Add variant and save it to server. Edit the saved variant.	2014-02-13 11:52:44 +11:00
Rohan Mitchell	4d24fec6fb	BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants.	2014-02-13 09:26:07 +11:00
Rohan Mitchell	4aa43cfbe0	Set the master unit value for a product without variants	2014-02-12 13:57:49 +11:00
Rob H	17456ebf2e	BOM: only fetch completed orders	2014-02-07 15:29:31 +11:00
Will Marshall	2bb004ebaa	Adding notes field to products	2014-02-04 14:11:32 +11:00
Rob H	9373dcea3d	Merge branch 'master' into bom	2014-01-31 12:32:23 +08:00
Rob H	58d1bf0092	BOM: can update quantities of line_items	2014-01-31 11:57:57 +08:00
Rob H	3beb633ed9	BOM: 'update-pending' class removed when value is init value	2014-01-31 11:24:14 +08:00
Rob H	7dbb7a5c2c	BOM: applying ofnLineItemUpdAttr directive to quantity field, tracks changes with update-pending class	2014-01-31 11:17:27 +08:00
Rob H	a5ffdbb1ba	Display quantity in field for BOM	2014-01-31 10:48:28 +08:00
Rob H	3bf36f0e55	Fix orders specs which fail because of new admin orders submenu	2014-01-30 14:06:32 +08:00
Rohan Mitchell	6d2f77b308	Fix report spec	2014-01-22 10:16:45 +11:00
Will Marshall	aec5894c70	Adding a promo image to enterprises	2014-01-21 16:32:55 +11:00
Rob H	b9a3031663	Line item delete button works	2014-01-19 21:46:11 +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	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
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
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
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
Rohan Mitchell	d861495d7d	Fix incomplete save when first setting variant_unit	2014-01-16 14:20:26 +11: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	68e5de0290	Update acceptance specs to expect unit values to be stored in base units	2014-01-14 15:14:54 +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