Commit Graph

34 Commits

Author SHA1 Message Date
Rob Harrington
ddcfe1535a Making TagRule autocomplete available to models other than Customer
Incorporate ng admin.tags module and rails TagController into existing admin.tagRules module + TagRuleController
2016-05-25 08:10:20 +10:00
Maikel Linke
fa5fa9e228 Auto-complete tags on customers page
- new controller serving tags for an enterprise as JSON
- customers page suggesting these tags
- emphasising tags that have rules
2016-04-29 15:18:17 +10:00
Maikel
f2c8ea9722 Auto-merged master into uk/account-balances on deployment. 2016-03-09 14:43:05 +11:00
Maikel Linke
d925c2aefc Translate Spree payment, shipment and order states
- Copied translations for payment_states, shipment_states and order_states
into locale en.yml.

- Enabled global Javascript function `translate` to deal with scopes like
'spree.shipment_states'.

- Removed `humanize` call from order serializer and added translation
scopes to accounts page.

- Test OrderSerializer for untranslated attributes

- Require spec helper in serializer specs
2016-03-09 14:29:54 +11:00
Rob Harrington
77e74c5642 OC Coordinators can opt to restrict products in an order cycle to those in their inventory only 2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb Adding global config to allow shop users to only select from inventory variants in OC interface 2016-03-02 12:10:22 +11:00
Steve Pettitt
ec6b0f873e style credit/debit, spec updates 2016-01-30 19:53:37 +00:00
Steve Pettitt
aa8457c40f Fix order serializer spec: change from id to number 2016-01-26 19:03:19 +00:00
stveep
48896ab3d8 More serializer specs 2015-12-22 15:09:24 +00:00
stveep
668c6ff74f Order serializer spec 2015-12-21 23:22:15 +00: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
795830d94d Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module 2015-10-28 13:07:31 +11:00
Rob Harrington
e575b0e490 Switching enterprise index to its own dedicated serializer, so we can spit out ownership 2015-06-12 01:49:37 +08:00
Rohan Mitchell
d478cc1f69 Serialize taxons and relatives in expected format 2015-05-29 14:03:44 +10:00
Rohan Mitchell
75f1f673ad Update spec for EnterpriseSerializer 2015-05-27 16:26:31 +10:00
Rohan Mitchell
99cb09c6f7 When loading products for shopfront, load all variants in one go 2015-05-27 15:44:01 +10:00
Rob Harrington
5d6f265c0a Moving spree namespaced serializers into admin 2015-04-22 21:02:06 +10:00
Rob Harrington
26d55baa35 Moving order cycle permissions to their own permissions class 2015-04-11 21:11:10 +10:00
Rob Harrington
8b7d321dfe Changing delete time to ensure not_deleted scope works 2015-04-10 16:40:33 +10:00
Rob Harrington
2280a71b23 Replace for_order_cycle rabl template with a serializer 2015-04-10 09:25:40 +10:00
Rob Harrington
63e345f819 Exchange serializer cuts down list of variants visible to the current user, based on permissions 2015-03-27 16:16:11 +11:00
Rohan Mitchell
2ea7bdbec6 Move controller spec to serializer spec 2014-12-17 14:01:59 +11:00
Rohan Mitchell
91b386003a Add VariantOverrideSerializer 2014-12-12 13:33:12 +11:00
Rob Harrington
8b819539e7 Fixing specs 2014-10-24 14:52:59 +11:00
Rob Harrington
56f4d5af0f Visibility in the front end is contingent upon enterprise being confirmed 2014-10-15 12:27:55 +11:00
summerscope
a4aa949499 Applying new icons for map view 2014-08-29 18:04:06 +10:00
Rob H
d8c1823328 Fix broken specs 2014-08-08 14:05:54 +10:00
Rob H
1abbc7fa86 Switch data injection for BPE over to AMS 2014-08-08 14:05:50 +10:00
Will Marshall
20d7484134 Merge branch 'master' into laura_and_will
Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee
2014-07-28 13:43:31 +10:00
Rob H
9055a441fd Removing trailing whitespace 2014-07-24 10:28:28 +10:00
Rob H
2200392031 Angularising Admin enterprises form 2014-07-24 10:16:54 +10:00
Will Marshall
562f8dbd4e Starting to restructure data injection 2014-07-18 11:21:51 +10:00
Will Marshall
ca6068c095 Fixing a borked test 2014-07-04 13:51:24 +10:00
Will Marshall
9667b84c5c Finishing the transition to AMS from RABL 2014-06-26 11:07:53 +10:00