7324 Commits

Author	SHA1	Message	Date
Rohan Mitchell	727ecae62b	Admin can modify a taxed adjustment on an order	2015-11-11 11:53:04 +11:00
Rohan Mitchell	85e45fa558	Use select2	2015-11-11 11:53:04 +11:00
Rohan Mitchell	83c0093665	Admin can include tax when creating an adjustment	2015-11-11 11:53:04 +11:00
Rohan Mitchell	46a9304ae1	Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model	2015-11-11 11:53:04 +11:00
Rohan Mitchell	d794981ecf	Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.	2015-11-11 11:53:04 +11:00
Rob Harrington	27903a46e6	Adding new save-bar directive for handling save actions for index pages	2015-11-06 09:53:31 +11:00
Rob Harrington	330882c689	Pulling out styling for red buttons in admin into more generic .red class	2015-11-06 09:52:48 +11:00
Rob Harrington	b1bac703ed	WIP: BOM Refactor, delete line_items using ngResource, updating data requests in line_items_controller	2015-11-05 17:50:18 +11:00
Rob Harrington	eb7b2e7a3b	Use ams_prefix not ams_suffix!	2015-11-05 17:17:45 +11:00
Rob Harrington	73c80cb5e5	Ordering index orders within query	2015-11-05 17:11:13 +11:00
Rob Harrington	6769c2c729	Can pass params for order or line items into LineItemsController#index	2015-11-05 17:07:47 +11:00
Rob Harrington	afef9e3211	WIP: BOM Refactor, building order_cycle fetch and update logic with ngResource	2015-11-05 15:13:19 +11:00
Rob Harrington	a9e5f2912f	WIP: Fixing Orders service specs	2015-11-05 14:48:26 +11:00
Rob Harrington	66d1e4297e	WIP: Renaming admin.order_cycles to admin.orderCycles for consistency	2015-11-05 14:40:42 +11:00
Maikel Linke	5e59048705	i18n typo	2015-11-05 14:39:33 +11:00
Rob Harrington	4d4e2d4abd	WIP: Moving order_cycle controller into order_cycles folder	2015-11-05 14:38:01 +11:00
Rob Harrington	db4e8382e4	Oops, updating template to make order filtering work	2015-11-05 14:05:14 +11:00
Rob Harrington	51762753f4	WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt	2015-11-05 14:04:29 +11:00
Rob Harrington	2483eef4be	WIP: BOM Refactor, removing obsolete OrderCycle.recently_closed scope, ordering closed OCs	2015-11-05 14:02:04 +11:00
Maikel Linke	0505a45de5	Invalidate I18n asset if locale changes	2015-11-05 12:47:15 +11:00
Rob Harrington	e96fa967b8	WIP: BOM refactor, rebuilding bulk orders controller as line items controller using new AJAX routes	2015-11-05 11:54:36 +11:00
Maikel Linke	8b29612614	Merge remote-tracking branch 'origin/master' into i18n	2015-11-05 11:54:06 +11:00
Rob Harrington	d731d4e803	Making sure flash is a hash so that is can be used to initialize OpenStuct	2015-11-05 11:09:21 +11:00
Rohan Mitchell	65589d25c6	Display more verbose product and variant name	2015-11-05 09:50:00 +11:00
Rohan Mitchell	5ffad4d343	Fix quantity calculation	2015-11-05 09:43:44 +11:00
Rob Harrington	50a551a87e	Coffeescript!	2015-11-04 18:35:14 +11:00
Rob Harrington	1494389d34	WIP: BOM Refactor, organising admin.products files in appropriate folders	2015-11-04 18:28:53 +11:00
Rob Harrington	b43049af47	WIP: BOM Refactor, building line_item fetch and update logic with ngResource	2015-11-04 18:16:17 +11:00
Rob Harrington	f563f04f1c	WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes	2015-11-04 16:35:56 +11:00
Rob Harrington	ae7e744644	WIP: BOM Refactor, adding for_line_items action to enterprises controller	2015-11-04 15:02:29 +11:00
Rob Harrington	625e0888ea	Adding logic to Admin::BaseController to standardise rendering of data with AMS	2015-11-04 12:10:50 +11:00
Rohan Mitchell	a3d638df67	Merge branch 'master' into folklabs-producer-emails	2015-11-04 11:15:01 +11:00
Rohan Mitchell	015f3eb9ac	Display summary rows for admin adjustments	2015-11-01 13:42:59 +11:00
Lynne Davis	7350dbb75e	Adding tweaks that have been missed from merges	2015-10-30 11:54:06 +11:00
Maikel Linke	4eed222f18	Fixed several i18n issues reported by Myriam	2015-10-29 14:55:38 +11:00
Rohan Mitchell	f63a80300b	Merge branch 'master' into folklabs-producer-emails	2015-10-29 11:49:24 +11:00
Rohan Mitchell	87cf3eda41	Amend 'Detailed orders breakdown' heading with missing content	2015-10-29 11:48:12 +11:00
Rob Harrington	cb1f79f59a	Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants	2015-10-28 15:42:14 +11:00
Rob Harrington	18a7317185	Merge branch 'account-invoices' into line_item_naming ... Conflicts: app/models/spree/line_item_decorator.rb	2015-10-28 13:42:27 +11:00
Rob Harrington	c5810fc003	Improving BOM form validation	2015-10-28 13:08:50 +11:00
Rob Harrington	f60b6994eb	Wrapping line_item update with order.update_distribution_charge inside lock	2015-10-28 13:08:50 +11:00
Rob Harrington	50b3635e7e	Locking line_items on API update	2015-10-28 13:08:50 +11:00
Rob Harrington	ab7bfd10c5	Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module" ... This reverts commit e86e08b72e939fee61eddd41d56081395666a877. Conflicts: lib/open_food_network/order_and_distributor_report.rb spec/features/admin/variants_spec.rb spec/lib/open_food_network/order_and_distributor_report_spec.rb	2015-10-28 13:08:50 +11:00
Rob Harrington	cdb0c2db33	Admin Orders show page uses line_item.full_name to describe line_items	2015-10-28 13:07:32 +11:00
Rob Harrington	21e5895a8a	Group Buy panel on BOM takes changes to final_weight_volumes into account	2015-10-28 13:07:32 +11:00
Rob Harrington	33e1322a44	Adding form validation to BOM	2015-10-28 13:07:32 +11:00
Rob Harrington	b08556ec7f	WIP: Making final_weight_volume adjustment a bit nicer	2015-10-28 13:07:31 +11:00
Rob Harrington	2d468f5022	Fixing attr_accessible for line_items (broken in previous commit)	2015-10-28 13:07:31 +11:00
Rob Harrington	eba13a0dd7	Line items inherit units from variants upon creation	2015-10-28 13:07:31 +11:00
Rob Harrington	e52f7165c3	Overriding any last references to options_text in the spree codebase	2015-10-28 13:07:31 +11:00