7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Harrington	193325f81b	Improve formatting around saving on line items index (BOM)	2015-11-12 09:52:10 +11:00
Rob Harrington	5a7cac652c	Adding confirm-link directive	2015-11-12 09:49:36 +11:00
Rob Harrington	b5aaf36bd2	Create directive for scaling by a factor and then formatting as currency	2015-11-12 09:48:43 +11:00
Rob Harrington	c5a26249ea	Removing unneeded directives	2015-11-12 09:47:37 +11:00
Rob Harrington	69ead3c829	Line items serialiser gives a sensible value for max_quantity	2015-11-12 09:47:12 +11:00
Rob Harrington	93caa4a11d	Bumping poltergeist version to 1.7.0	2015-11-12 09:45:14 +11:00
Rohan Mitchell	e20d8d3e95	Merge branch 'master' into folklabs-producer-emails	2015-11-11 14:20:25 +11:00
Rohan Mitchell	fb3e292e20	Formatting	2015-11-11 11:53:04 +11:00
Rohan Mitchell	f499dd627a	with_tax_included_in_price handles exceptions gracefully	2015-11-11 11:53:04 +11:00
Rohan Mitchell	8e1bade355	Move adjustment specs to their own spec file	2015-11-11 11:53:04 +11:00
Rohan Mitchell	a32321df68	Clarify label	2015-11-11 11:53:04 +11:00
Rohan Mitchell	5a29311137	Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax	2015-11-11 11:53:04 +11:00
Rohan Mitchell	3e7a12cca1	Rename spec support method for faster tab completion on save_and_open_page	2015-11-11 11:53:04 +11:00
Rohan Mitchell	81a6e07d5c	Admin can remove tax on an adjustment	2015-11-11 11:53:04 +11:00
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
Rohan Mitchell	6476ce6ba9	Make spec more resilient	2015-11-10 15:05:45 +11:00
Maikel Linke	a06b452e7e	updated norwegian locale	2015-11-07 16:42:35 +11:00
Maikel Linke	0b6cbb43d6	updated locale nb.yml	2015-11-06 11:56:25 +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	bf6bd2dc68	Hack down routes available for Admin::LineItemsController	2015-11-05 17:18:32 +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	38d2616ea0	No need to empty cache if I18n asset depends on locale	2015-11-05 12:50:11 +11:00
Rohan Mitchell	5db64b6f21	Update travis config and README with new ruby version	2015-11-05 12:48:22 +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
Maikel Linke	90d52151b6	Updated fr.yml	2015-11-05 11:53:38 +11:00
Rohan Mitchell	6666de96b2	Update ruby version used in CI	2015-11-05 11:24:12 +11:00
Rob Harrington	b7d92786d0	Bumping ruby version to 2.1.5	2015-11-05 11:09:22 +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
Rob Harrington	2277b9f5a6	Changing ruby version in version manager config	2015-11-05 11:09:21 +11:00
Rob Harrington	aef8b9648e	Initial upgrade of Gemfile	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