raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,679 Commits 18 Branches 452 Tags
2cd5afbf9ccbc68fa86f6635110d197c4e242e23
Commit Graph

722 Commits

Author SHA1 Message Date
Rohan Mitchell
e72c3d861b Enterprise manager can edit products from enterprises it has manage_products permission on 2014-09-01 11:49:09 +10:00
Rohan Mitchell
c81503d95f Include producers I have permission to in BPE producers choice 2014-09-01 10:44:09 +10:00
Rohan Mitchell
cfb31b46e4 Bulk product edit lists managed products 2014-09-01 10:13:59 +10:00
Rohan Mitchell
66f20a6b8a Name test enterprises semantically 2014-09-01 09:17:38 +10:00
Rohan Mitchell
7f74854a2f For OC, fetch all enterprises we have access to, including those via E2E relationships 2014-08-29 16:38:23 +10:00
Rohan Mitchell
0b61872d96 Revert 5ede8d1, reinstating a4be0ff..7b89e6a 2014-08-29 16:38:10 +10:00
Rob H
ba3f97ca1f Fixing enterprise relationships spec 2014-08-28 14:45:24 +10:00
Rob H
5ede8d169f Revert a4be0ff..7b89e6a for deployment 2014-08-28 14:32:57 +10:00
Rob H
bfd9ffd84a Adding missing data-bindings for country/state 2014-08-28 14:25:21 +10:00
Rohan Mitchell
1871d42e68 Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page 2014-08-28 10:09:50 +10:00
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
34602244ca Show permitted suppliers in order cycle add supplier select box 2014-08-28 10:09:50 +10:00
Rohan Mitchell
a7689973be Semantically name enterprises in spec 2014-08-28 10:09:50 +10:00
Rohan Mitchell
5e8bdce67d Refactor spec 2014-08-28 10:09:50 +10:00
Rohan Mitchell
1a995aedda Simplify enterprise_relationship factory - leverage permissions_list= model method 2014-08-25 15:20:46 +10:00
Rohan Mitchell
3932884dba Admin can create enterprise relationships with permissions 2014-08-25 14:59:10 +10:00
Rohan Mitchell
50c559964c Display enterprise relationship permissions 2014-08-25 13:28:02 +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
dd42b0c239 Split out opening payments into own context 2014-08-22 14:38:44 +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
79387d3d82 On admin enterprises listing page, do not show links to pages without perms 2014-08-19 16:15:17 +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
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
0e6cd30e7e Edit for clarity 2014-08-19 13:27:45 +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
2660ffd459 Fix duplicate enterprise role 2014-08-16 16:33:07 +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
1d77812ab8 Admin can list enterprise roles 2014-08-15 16:09:04 +10:00
Rob H
c20369919c Can change hub after changing pm type 2014-08-09 11:23:05 +10:00
Rob H
a8b823668f Fix checkout specs failing due to payment method not having hub 2014-08-08 22:40:24 +10:00
Rob H
40d290951c Fix failing specs related to requiring distributor for payment method 2014-08-08 17:47:51 +10:00
Rob H
f021d260b1 Require payment_methods to be associated with at least one hub 2014-08-08 17:47:50 +10:00
Rob H
d8c1823328 Fix broken specs 2014-08-08 14:05:54 +10:00
Rob H
e6f7f26a95 Add loading gif to BPE, fiddle with interface 2014-08-08 14:05:53 +10:00
Rob H
32c8b9cdcd Switch Taxons input over to category selection on BPE, clean up interface 2014-08-08 14:05:53 +10:00
Rob H
d27908fd2f Add ability to reset filters to BPE 2014-08-08 14:05:53 +10:00
Rob H
5f277dae61 Fixing BPE specs related to filtering 2014-08-08 14:05:52 +10:00
Rob H
c139e2fab2 Remove 500 product warning 2014-08-08 14:05:51 +10:00
Rob H
b9f49344b4 BPE: Switch column toggle to dropdown, clean up specs 2014-08-08 14:05:51 +10:00
Rob H
a14c2dbb04 Decouple bpe specs from update process 2014-08-08 14:05:50 +10:00
Rohan Mitchell
16847025dd Fix bug: local storage was not correctly keyed to user id 2014-08-08 11:14:50 +10:00
Rohan Mitchell
f8c71ced45 Fix display of state_name, after attribute was renamed in serializer 2014-08-07 16:46:57 +10:00
Rohan Mitchell
769e8410cc Fix checkout total display 2014-08-07 14:53:30 +10:00
Rohan Mitchell
a1dd5dabac Replace sleep with wait, add cart_dirty spec helper 2014-07-31 11:36:53 +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