8189 Commits

Author	SHA1	Message	Date
Rohan Mitchell	fe61cddda6	Merge branch 'local-organics' ... Conflicts: Gemfile Gemfile.lock app/assets/stylesheets/store/variables.css.scss app/overrides/add_feedback_script.rb app/views/spree/shared/_order_details_steps_data.html.erb db/schema.rb script/rails spec/spec_helper.rb	2013-07-23 11:40:03 +10:00
Rob H	0322f21e5c	Rearrange bpe action buttons	2013-07-23 10:43:08 +10:00
Rob H	275b64c7d3	Fix broken delete action for variants	2013-07-23 10:43:08 +10:00
Rob H	4c435e118a	BPE action buttons in separate columns	2013-07-23 10:43:08 +10:00
Rob H	3c973178fd	WIP: remove unneeded representative-based data request infrastructure	2013-07-23 10:43:08 +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
Rob H	8f6ec9bd9b	WIP (Spree Update): Fix frontend order payment summary	2013-07-23 10:43:08 +10:00
Rob H	45309d6a75	WIP (Spree Update): Remove unrequired reference to AnalyticsHelper	2013-07-23 10:43:08 +10:00
Rob H	78263f6835	WIP (Spree Update): change formats of tab overrides	2013-07-23 10:43:08 +10:00
Rob H	f055ece503	WIP (Spree Update): update variables.css.scss	2013-07-23 10:43:08 +10:00
Rob H	19fbbb8374	BPUR: match product supplier on clone	2013-07-23 10:40:42 +10:00
Rob H	f169dcda88	BPUR: Fix final unstable tests, js concurrency etc.	2013-07-23 10:40:42 +10:00
Rob H	126f11683d	BPUR: Add datetimepicker to Available On	2013-07-23 10:37:51 +10:00
Rob H	23a56ff4f1	BPUR: toggle visbility of columns	2013-07-23 10:37:51 +10:00
Rob H	f750251cb8	BPUR: Visually differentiate products and variants in table	2013-07-23 10:37:51 +10:00
Rob H	5d30df5717	BPUR: add supplier name to product model to allow searching	2013-07-23 10:37:50 +10:00
Rob H	f9832d1375	BPUR: Remove unnecessary setValidity method in ngDecimal	2013-07-23 10:37:50 +10:00
Rob H	4ae5085192	BPUR: Remove unnecessary collections of products on bulk edit page	2013-07-23 10:37:50 +10:00
Rob H	0ddd9cc6d0	BPUR: use where rather than select for product collection	2013-07-23 10:37:50 +10:00
Rob H	9beb560b72	BPUR: cancel any pre-existing timeouts on message models when new message set	2013-07-23 10:37:50 +10:00
Rob H	b775145b16	BPUR: Add ability to filter by search and toggle variants	2013-07-23 10:37:50 +10:00
Rob H	57f2eff1b0	BPUR: Add warnings before deleting products/variants or directing to edit page	2013-07-23 10:37:50 +10:00
Rob H	ef435dc6da	Typo	2013-07-23 10:37:50 +10:00
Rob H	8453b43c25	BPUR: Allow updating of delegated variant properties	2013-07-23 10:37:50 +10:00
Rob H	1bd4875a6f	BPUR: Can clone products	2013-07-23 10:37:50 +10:00
Rob H	e8f24dc2dd	BPUR: Add edit link for products and variants	2013-07-23 10:37:50 +10:00
Rob H	febb9a44a2	Remove commented (unrequired) lines on code	2013-07-23 10:37:50 +10:00
Rob H	c503c1b10c	BPUR: refactor of filterSubmitProducts	2013-07-23 10:37:50 +10:00
Rob H	dcf6446450	BPUR: can delete variants	2013-07-23 10:37:50 +10:00
Rob H	5db0d839fa	BPUR: can delete products	2013-07-23 10:37:50 +10:00
Rob H	8179f45272	BPUR: remove unused product update js and tests	2013-07-23 10:37:50 +10:00
Rob H	5258cba2a2	BPUR: change to live tracking of dirty properties (variant price update still failing)	2013-07-23 10:37:50 +10:00
Rob H	c80cba7fa5	BPUR: Don't use master variant to update attributes. Changes to product filtering.	2013-07-23 10:37:50 +10:00
Rob H	0ca0abd0b2	Can alter on_hand and price of individual variants	2013-07-23 10:37:50 +10:00
Rob H	f3d778af1a	BPUR: can update master on_hand	2013-07-23 10:37:50 +10:00
Rob H	fbb3657bdc	BPUR: can update master price. Test refactor and added angular ng-decimal directive	2013-07-23 10:37:50 +10:00
Rob H	44ad7584f0	BPUR: can update available_on	2013-07-23 10:37:50 +10:00
Rob H	344a084494	BPUR: can update supplier	2013-07-23 10:37:50 +10:00
Rob H	1e64dab9f7	Bulk product update rewrite: basic integration test passing	2013-07-23 10:37:50 +10:00
Rob H	6b097eb9f8	WIP: minor fixes to bulk product update js	2013-07-23 10:37:50 +10:00
Rob H	3c57680303	WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet	2013-07-23 10:37:50 +10:00
Rob H	74291ab1f7	remove leftover debugger; call in code	2013-07-23 10:37:50 +10:00
Rob H	554c67f1a3	WIP: specs and basic js infrastructure for bulk product update	2013-07-23 10:37:50 +10:00
Rob H	731127d55c	WIP: Bulk Product Update Rewrite: initial acceptance testing	2013-07-23 10:37:50 +10:00
Andrew Spinks	4cdd858f48	Disable order cycles in the front end by default.	2013-07-22 17:16:55 +10:00
Rohan Mitchell	2ddc5b4e4a	Move strip_html to main app, fixes context-sensitive chili feature spec fail	2013-07-22 16:21:32 +10:00
David Cook	66d345d360	fix 'x more' count, disable sidebar limit (config for this to be implemented later)	2013-07-22 14:53:08 +10:00
Rohan Mitchell	6ceb8e9ee7	Restore change: render checkout distributor details from partial	2013-07-22 11:23:48 +10:00
Rohan Mitchell	568837aa53	Revert "On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME" ... This reverts commit b7f7766893.	2013-07-22 11:22:20 +10:00