6357 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maikel	3975eef0c4	Merge pull request #716 from openfoodfoundation/uk/i18n ... #715: Add missing strings for en-GB locale.	2015-11-24 18:36:32 +11:00
Paul Mackay	a2a87cc68f	#715: Add missing strings for en-GB locale.	2015-11-23 16:44:39 +00:00
Maikel Linke	229070a76b	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n	2015-11-13 15:20:58 +11:00
Maikel Linke	8bfe459241	i18n fixes of html display	2015-11-13 14:22:17 +11:00
Rohan Mitchell	bb6fb2f5e8	Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link	2015-11-13 14:03:32 +11:00
Rohan Mitchell	6de44877c8	Update link for uber-style sell food dropdown	2015-11-13 14:03:14 +11:00
Rohan Mitchell	b6f3e6eca6	Fix broken spec	2015-11-13 14:03:07 +11:00
Rohan Mitchell	a86cc96452	Use pluck instead of map	2015-11-13 14:03:07 +11:00
Rohan Mitchell	178e5f59e6	Update cart by applying differences rather than clear-and-readd every time	2015-11-13 14:03:07 +11:00
Rohan Mitchell	7fffa03d8d	Fix bug: set difference comparison of string with number	2015-11-13 14:03:07 +11:00
Rohan Mitchell	888e4d80ef	Add reliable way to check if cart is dirty. Previous way returned true when cart empty.	2015-11-13 14:03:07 +11:00
Rohan Mitchell	d3c7c46800	Add method to remove a variant from an order	2015-11-13 14:03:07 +11:00
Rohan Mitchell	c432ed9e08	Build list of variants removed from the cart when overwriting	2015-11-13 14:03:07 +11:00
Rohan Mitchell	e175149e76	Add method to check whether a passed-in cart value varies from the cart	2015-11-13 14:03:07 +11:00
Rohan Mitchell	1b5901317d	Separate concerns: reading products hash and adding items to cart	2015-11-13 14:03:07 +11:00
Rohan Mitchell	2f4b5bad26	Make benchmark more realistic	2015-11-13 14:03:07 +11:00
Rohan Mitchell	64e8927ae9	Add benchmark: add to cart	2015-11-13 14:03:07 +11:00
Rohan Mitchell	c932d20ef5	Extract multi-sample benchmarking into a helper method	2015-11-13 14:03:07 +11:00
Maikel Linke	5d5fda3a25	Merge remote-tracking branch 'origin/master' into i18n ... Conflicts: config/locales/en.yml	2015-11-13 10:07:29 +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
Maikel Linke	5e59048705	i18n typo	2015-11-05 14:39:33 +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
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
Rohan Mitchell	a3d638df67	Merge branch 'master' into folklabs-producer-emails	2015-11-04 11:15:01 +11:00
Rohan Mitchell	9227df54b6	Display detail rows for admin adjustments	2015-11-01 15:19:03 +11:00