37 Commits

Author	SHA1	Message	Date
Rob Harrington	b277ff03ea	Rubocop: Auto-correct Style/TrailingBlankLines offences	2017-06-23 16:49:07 +10:00
Continuous Integration	06010bd8ad	Auto-merge from CI [skip ci]	2015-08-28 17:04:53 +10:00
Maikel Linke	85c99102dd	i18n: Replacing all language strings in app/view/ ... Languages strings were moved to config/locale/en.yml. All views contain according calls to t() now.	2015-08-28 16:59:23 +10:00
Maikel Linke	64834dd50a	Fixing display of cloned products ... The producer and the unit is displayed again.	2015-08-27 13:05:09 +10:00
Rob Harrington	c56efabfbe	Removing obsolete rabl templates	2015-05-20 11:52:49 +10:00
Rob H	f688461e84	Add fields for variant display name and display as to bpe	2014-06-12 11:49:53 +10:00
Rohan Mitchell	967d4c81ab	Cache expensive options_text call	2014-05-08 20:55:43 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rob H	de369ae32b	WIP: Can manage taxons in BPE	2014-05-02 10:28:33 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rohan Mitchell	aa1c28b163	Move enterprises api controller out of spree namespace	2014-04-11 19:08:55 +10:00
Rob H	ff531f0e18	Producers can only list line items which contain products they supply	2014-04-11 09:39:01 +10:00
Rob H	00df441bc2	Re-add changes to variant bulk show to fix 'I'm a teapot' fails	2014-03-28 16:47:52 +11:00
Rob H	ee147c232e	WIP: Remove changes to variant bulk show casuing issues	2014-03-28 14:41:03 +11:00
Rob H	ab14bf70ab	Merge branch 'bpe_issues' into bom	2014-03-27 15:39:37 +11:00
Rob H	dae2d9db9e	BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update	2014-03-27 15:38:44 +11:00
Rob H	cd1086ce05	WIP: Bulk calculation box work with shared resources	2014-03-26 16:44:26 +11:00
Rob H	f2729f9e80	Add more columns to BOM	2014-03-21 13:46:48 +11:00
Rob H	ed0b7da20f	BOM page has a fancy calculation box for managing group buys	2014-03-20 14:40:24 +11:00
Rob H	bed1c171b6	BOM: display product name and unit	2014-03-07 14:46:40 +11:00
Rob H	b6bd07abd3	BOM: show name from billing address	2014-03-07 12:56:39 +11:00
Rob H	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00
Rohan Mitchell	4ee4ea7c60	Fix mismatch between client and server variants (ordering issue)	2014-02-18 14:02:17 +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	9373dcea3d	Merge branch 'master' into bom	2014-01-31 12:32:23 +08:00
Rob H	1744cc9548	Orders API retrieves order number	2014-01-19 18:41:16 +08:00
Rob H	e2d9e9c4eb	BOM API collects distributor for orders	2014-01-18 11:50:36 +08:00
Rohan Mitchell	ea028ddd01	Fix invalid JSON for on_demand products/variants with infinite on_hand	2014-01-17 16:12:07 +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
Rob H	cfbf4d5bc4	Adding attributes to Order Managment API	2014-01-17 10:35:40 +08:00
Rob H	11499178cb	Set up API for Bulk Order Management (BOM)	2014-01-16 11:56:11 +08:00
Rob H	2df0545819	Fix some outstanding updating issues in BPE	2013-12-23 23:09:19 +08:00
Rohan Mitchell	33f06f5eff	Display unit value and description for variants in BPE	2013-12-06 15:57:37 +11:00
Rohan Mitchell	0a07f38f15	Load and display variant_unit on BPE page	2013-12-05 15:16:52 +11:00
Andrew Spinks	6c18c5c65f	Fix bulk product edit so that it works with products with a blank available_on field.	2013-07-25 13:51:37 +10:00
Rob H	9863a84a27	WIP: transfer bulk product update data requests to API	2013-07-23 10:43:08 +10:00
Rob H	97c03b50cc	Create new api routes/views/controllers for bulk product edit	2013-07-23 10:43:08 +10:00