6603 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Steve Pettitt	e423e890e0	Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly	2016-01-15 09:07:50 +11:00
Steve Pettitt	25454d3e97	Added new fields to fix VO deletion feature specs	2016-01-15 09:07:49 +11:00
Steve Pettitt	75127f2a63	Fix feature specs for VO reset	2016-01-15 09:07:49 +11:00
Rob Harrington	94785d4157	Fixing authorization for VariantOverridesController#bulk_reset	2016-01-15 09:07:49 +11:00
Rob Harrington	d01da727f0	Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead	2016-01-15 09:07:49 +11:00
Steve Pettitt	5a62098b95	Cleaning up and attempt to add feature spec	2016-01-15 09:07:49 +11:00
Steve Pettitt	0ee078e232	Added toggle to enable/disable reset stock. Updated specs	2016-01-15 09:07:48 +11:00
Steve Pettitt	2921958788	Variant override controller spec added	2016-01-15 09:07:48 +11:00
Steve Pettitt	34c603a9c3	Added angular service tests for variant overrides stock reset	2016-01-15 09:07:48 +11:00
Steve Pettitt	6c0dd7e25f	Adding 'default_stock' to VariantOverride	2016-01-15 09:07:48 +11:00
Rob Harrington	53d97dab08	WIP: Adding view and routes for resetting variant_overrides count_on_hand	2016-01-15 09:07:48 +11:00
Rob Harrington	3b7700131c	Specify controller specs as such	2016-01-15 09:07:47 +11:00
Rob Harrington	14c8683535	Updating active_model_serializers	2016-01-15 09:07:47 +11:00
Rob Harrington	cc4dc068ab	Adding variant SKU field to BPE	2016-01-13 18:49:34 +11:00
Rob Harrington	64cd52e067	Adding SKU and on demand to a few VO specs	2016-01-13 18:49:34 +11:00
Rob Harrington	4553bc2997	Moving SaveBar directive and StatusMessage service into admin.utils module	2016-01-13 18:49:33 +11:00
Rob Harrington	521f227f74	Adding sku and on_demand to VariantOverride	2016-01-13 18:49:33 +11:00
Rob Harrington	cab6871de3	Pulling bulk actions dropdown out into partial	2016-01-13 18:49:33 +11:00
Rob Harrington	7cd8f35ac8	Tidying up styling and use of skeleton columns on index pages	2016-01-13 18:49:33 +11:00
Rob Harrington	2b70ddb23c	Adding columns toggle to variant overrides index	2016-01-13 18:49:33 +11:00
Rob Harrington	9eaec6061e	Pulling columns dropdown out into a shared partial	2016-01-13 18:49:32 +11:00
Rob Harrington	54e7677888	Integrating StatusMessages into save-bar, adding to variant overrides index	2016-01-13 18:49:32 +11:00
Rob Harrington	c781113a65	Adding filters to variant overrides interface	2016-01-13 18:49:32 +11:00
Rob Harrington	4237a83028	Moving components required for variant overrides into appropriate modules	2016-01-13 18:49:32 +11:00
Rob Harrington	f11e878e7f	WIP: Reorganising variant overrides javascript files	2016-01-13 18:49:31 +11:00
Maikel Linke	1cfb5a7feb	Merge branch 'master' of https://github.com/blancnic/openfoodnetwork into blancnic-master	2016-01-13 15:06:11 +11:00
Maikel Linke	00af6ef9de	cleanup knapsack integration	2016-01-13 15:05:48 +11:00
Maikel Linke	7a998663b2	Knapsack report and test splitting	2016-01-13 15:05:48 +11:00
Maikel Linke	749061d60a	knapsack report generation	2016-01-13 15:05:48 +11:00
Nicolas Blanc	770a8d0b17	#771-minor-bug-on-Firefox ... Z-index:1 solved problem on Firefox. It works on Chrome too.	2016-01-10 09:54:35 +01:00
Rohan Mitchell	71569324f4	Serialise cart updates - do not submit another until the previous has completed	2016-01-07 13:53:37 +11:00
Rohan Mitchell	257b5a9eef	Move premature Spree::Order#update prevention up a level, for even greater efficiency gains	2016-01-07 12:09:57 +11:00
Rohan Mitchell	ac650ebd46	Add support for mirroring Norway's database	2016-01-07 10:56:56 +11:00
Rohan Mitchell	e24027a8d0	Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee	2016-01-07 10:52:36 +11:00
Rohan Mitchell	a27e593924	Fix deprecation notices	2016-01-07 10:51:39 +11:00
Maikel Linke	9342ceb968	Adding translation notes to en.yml v1.3.1	2015-12-24 11:44:13 +11:00
Maikel	324f58a636	Updating translations for es.yml, fr.yml and nb.yml	2015-12-24 11:44:12 +11:00
Maikel Linke	20b3ad2cd6	Transifex configuration file ... This configuration file enables easy use of the Transifex client to download and upload translations.	2015-12-24 11:44:12 +11:00
Christian	823a6bff5b	Use config to get logo in mails ... Use ContentConfig.footer_logo to get localized logo file instead of defaut AUS logo.	2015-12-24 11:31:47 +11:00
Maikel Linke	59c51f9e7c	Fixing typo in locale: email_payment_method	2015-12-24 11:09:37 +11:00
Maikel Linke	61a58bca7d	Travis can trigger the Github deploy API ... And other build tools like Buildkite can listen to the deploy event. v1.3.0	2015-12-18 10:41:25 +11:00
Rob Harrington	e67e22ee73	Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security ... Conflicts: lib/open_food_network/xero_invoices_report.rb	2015-12-17 14:22:16 +11:00
Rob Harrington	7a23f671a2	Restricting access to orders within Sales Tax Report ... Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for	2015-12-17 14:21:30 +11:00
Rob Harrington	d115eb816e	Restricting access to orders within Xero Invoices Report ... Managers of suppliers should not be able to generate xero invoices for orders they supply products for	2015-12-17 14:21:30 +11:00
Rob Harrington	4b5e33d5b0	Implementing new permissions for producers in reports_controller_spec	2015-12-17 14:21:30 +11:00
Rob Harrington	c579d302d5	Fixing customer info security for orders and distributors report	2015-12-17 14:21:30 +11:00
Rob Harrington	2f2ebf419c	Fixing customer info security for packing reports	2015-12-17 14:21:30 +11:00
Rob Harrington	2f13ab6adf	Fixing customer info security for orders and fulfillments report	2015-12-17 14:21:29 +11:00
Rob Harrington	b121984e76	Fixing customer info security for bulk coop report	2015-12-17 14:21:29 +11:00
Continuous Integration	23b9dd5c71	Auto-merge from CI [skip ci]	2015-12-17 13:02:37 +11:00