Commit Graph

2731 Commits

Author SHA1 Message Date
Rohan Mitchell
a5debc19dc Permit edits to exchanges involving enterprises permitted via E2E relationships 2014-08-28 10:09:50 +10:00
Rohan Mitchell
628d87b69a Add to OC permission allows adding distributors to order cycle 2014-08-28 10:09:50 +10:00
Rohan Mitchell
5ef13d3c5a Change 'add products to OC' permission into the more general 'add enterprise to OC' 2014-08-28 10:09:50 +10:00
Rohan Mitchell
099a5b0b7b Show E2E related enterprise exchanges in OC 2014-08-28 10:09:50 +10:00
Rohan Mitchell
b9e5821497 Add EnterpriseRelationship scopes permitting and with_permission 2014-08-28 10:09:50 +10:00
Rohan Mitchell
8548a1a67e Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class 2014-08-28 10:09:50 +10:00
Rohan Mitchell
5e8bdce67d Refactor spec 2014-08-28 10:09:50 +10:00
Rob H
a4be0ff55a Comment out ERPs which have confusing names, use old 'permits' 2014-08-27 17:07:30 +10:00
Rob H
7124dc57fd Requiring a state in checkout 2014-08-27 16:59:26 +10:00
Rob H
400f2ea9b9 Don't add payment forms to checkout DOM unless required 2014-08-27 15:09:41 +10:00
Rob H
435819acc4 Removing unit text from total units column 2014-08-25 20:29:24 +10:00
Rob H
310d1b3726 Zeus server does not crash when editing controllers 2014-08-25 20:29:24 +10:00
Rohan Mitchell
c3224ce668 Style permission list items, order perms consistently by name 2014-08-25 15:05:49 +10:00
Rohan Mitchell
3932884dba Admin can create enterprise relationships with permissions 2014-08-25 14:59:10 +10:00
Rohan Mitchell
057ad9c6d3 Set enterprise relationship permissions from a list 2014-08-25 14:54:52 +10:00
Rohan Mitchell
50c559964c Display enterprise relationship permissions 2014-08-25 13:28:02 +10:00
Rohan Mitchell
b4e89ad2c0 Convert enterprise relationship permission to string presentation 2014-08-25 13:27:01 +10:00
Rohan Mitchell
70feef1256 Add EnterpriseRelationshipPermission model 2014-08-25 13:26:23 +10:00
Rohan Mitchell
cb615ba994 Render enterprise relationships JSON with AMS instead of rabl 2014-08-25 13:07:31 +10:00
Rohan Mitchell
3524e658f8 Error when creating product and master is invalid, instead of creating a product without a master 2014-08-25 11:52:15 +10:00
Rohan Mitchell
4ceaec0ef5 Do not error when checking out with a pre-loaded shipping/billing address 2014-08-22 17:34:42 +10:00
Rohan Mitchell
e173c69ee3 Fix arrow position 2014-08-19 16:53:23 +10:00
Rohan Mitchell
e3b4f6efc1 When profile admin only, do not show payment methods, shipping methods or enterprise fees when editing profile 2014-08-19 16:43:18 +10:00
Rohan Mitchell
a533daab96 Split sidebar into parts 2014-08-19 16:41:49 +10:00
Rohan Mitchell
4b42c28bd5 Refactor admin enterpriseCtrl - variable naming, if x then true else false antipattern 2014-08-19 16:34:56 +10:00
Rohan Mitchell
3e97762f7e Remove unused producer options on hub tab, make logic consistently ordered 2014-08-19 16:23:05 +10:00
Rohan Mitchell
79387d3d82 On admin enterprises listing page, do not show links to pages without perms 2014-08-19 16:15:17 +10:00
Rohan Mitchell
2706c0e47e Extract enterprise actions to partial 2014-08-19 16:11:20 +10:00
Rohan Mitchell
5dc7d1ee11 For users without product management perms, show a cut-down admin dashboard 2014-08-19 16:02:11 +10:00
Rohan Mitchell
9451f3659c Use pluralize helper, sentence case 2014-08-19 15:41:01 +10:00
Rohan Mitchell
e1a1b74f03 Extract dashboard enterprises table markup into partials 2014-08-19 14:49:20 +10:00
Rohan Mitchell
50e4c5fac9 Users with only a profile-level enterprise see only menu items for enterprise management 2014-08-19 14:26:45 +10:00
Rohan Mitchell
abe592c9a3 Allow Reports admin tab to be enabled/disabled through cancan :report resource 2014-08-19 14:22:19 +10:00
Rohan Mitchell
732a61664f Split abilities into enterprises/products/relationships 2014-08-19 13:21:20 +10:00
Rohan Mitchell
a858c21296 Enterprise has a type (full, single, profile), editable by admin 2014-08-19 11:37:31 +10:00
Rohan Mitchell
63f9abdf5c Add CSS3 animations to enterprise roles admin 2014-08-15 16:09:06 +10:00
Rohan Mitchell
9ddfb1584b Admin can delete enterprise roles 2014-08-15 16:09:06 +10:00
Rohan Mitchell
95a0bf39f7 Enterprise roles must be unique 2014-08-15 16:09:05 +10:00
Rohan Mitchell
6e17f0aaa2 Admin can create enterprise roles 2014-08-15 16:09:05 +10:00
Rohan Mitchell
8bc9def6ae Switch to AMS for enterprise role serialisation 2014-08-15 16:09:05 +10:00
Rohan Mitchell
1d77812ab8 Admin can list enterprise roles 2014-08-15 16:09:04 +10:00
summerscope
a03c4f7110 Merge branch 'master' into laura_and_will 2014-08-15 12:17:05 +10:00
summerscope
7f6a7b4254 Adding underlines to links on modals for map view etc to try and make these more intuitive and usable 2014-08-15 11:02:21 +10:00
summerscope
8ef91d1b2a Styling and layout tweaks for checkout page to improve how columns sit on small devices 2014-08-14 12:09:55 +10:00
summerscope
3d2c196237 Tweak layout for checkout accordions to prevent expand and hide from dropping over two lines on small devices 2014-08-14 12:09:23 +10:00
Rohan Mitchell
50b8eaecab Add fundraising fees 2014-08-13 15:07:32 +10:00
Rohan Mitchell
d05e5e430a Revert "Adding CTA button for crowdfunding site to homepage & countdown timer directive"
This reverts commit 75f3358e2a.
2014-08-12 14:06:13 +10:00
Rob H
a7b3bbee74 Overriding payment method load_data to hide Bogus Gateways 2014-08-09 12:52:00 +10:00
Rob H
c20369919c Can change hub after changing pm type 2014-08-09 11:23:05 +10:00
Rob H
044a4c6816 Finish changing class names for PayPal gateways 2014-08-08 23:19:13 +10:00