raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-25 01:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,445 Commits 17 Branches 454 Tags
45bcee16efc6ed560e2e10038b7ff1d755b21e5b
Commit Graph

461 Commits

Author SHA1 Message Date
Rob Harrington
45bcee16ef Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails 2014-11-27 09:44:13 +11:00
Rohan Mitchell
58fdc48b9f Display products in table 2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1 User can select a hub 2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720 Do not show producers in hubs list 2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31 Show list of hubs to select for managing variant overrides 2014-11-21 13:49:09 +11:00
Rohan Mitchell
29e49b67cc In BPE, rename producer and category JSON attrs to producer_id and category_id 
Conflicts:

	spec/features/admin/bulk_product_update_spec.rb
 2014-11-21 08:41:41 +11:00
Rob Harrington
d9d6b7bee4 Adding filtering to Users and Enterprises report 2014-11-14 16:36:22 +11:00
Rob Harrington
65a5960fcc WIP: Add route for User and Enterprise report 2014-11-14 16:36:22 +11:00
Rohan Mitchell
1506b10d8f Fix brittle spec 2014-11-05 16:08:45 +11:00
Rohan Mitchell
8c2adb2a05 Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue 2014-11-01 12:11:50 +11:00
Rohan Mitchell
0d05c7163d Use factory shortcut for creating shipping and payment methods 2014-10-31 16:26:13 +11:00
Rohan Mitchell
94d50f220f Display an error message to admin when there are hubs in order cycles that are not ready for checkout 2014-10-31 12:22:02 +11:00
Rohan Mitchell
1d9a3f33e0 Order cycle distributors must have shipping and payment methods 2014-10-31 12:22:02 +11:00
Rob Harrington
65d13e0490 Show error messages on enterprise index page 2014-10-30 13:02:16 +11:00
Rafael Schouten
095dd28505 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork 2014-10-25 18:53:46 +11:00
Rafael Schouten
feff4fd46f fix reports taxons and specs 2014-10-25 18:51:03 +11:00
Rob Harrington
cc0e205f50 Merge master into onbaording 2014-10-24 15:36:59 +11:00
Rob Harrington
a157528974 Adding specs for single ent dash and remove product ability for profiles 2014-10-24 15:27:08 +11:00
Rob Harrington
8b819539e7 Fixing specs 2014-10-24 14:52:59 +11:00
Rohan Mitchell
bf61d12bfa Merge branch 'simple-order-cycles' 
Conflicts:
	app/views/admin/order_cycles/_row.html.haml
 2014-10-23 12:11:34 +11:00
Rohan Mitchell
ab76c66b68 Admin can update order cycles with simple interface 2014-10-23 11:38:15 +11:00
Rohan Mitchell
f7c1340f99 Admin can view an order cycle in the simple edit form 2014-10-23 11:08:27 +11:00
Rohan Mitchell
94e1995469 Merge branch 'master' into simple-order-cycles 2014-10-23 09:36:03 +11:00
Rohan Mitchell
3e61aa7267 Simple interface remove coordinator fee 2014-10-22 17:26:22 +11:00
Rohan Mitchell
8fb95769bf Fix tested values in spec 2014-10-22 17:07:45 +11:00
Rafael Schouten
89ce4ba632 Merge branch 'master' into bugfix 
Conflicts:
	app/models/enterprise.rb
 2014-10-21 08:51:23 +11:00
Rafael Schouten
08cd273be3 Merge branch 'migrate_ent_types' into bugfix 
Conflicts:
	app/models/spree/ability_decorator.rb
 2014-10-18 07:37:41 +11:00
Rafael Schouten
b71a40ae6d show all permitted enterprises in order cycle summery 2014-10-18 03:26:57 +11:00
Rohan Mitchell
deedafde9a WIP: Simple order cycle form loads and displays correct info 2014-10-17 16:55:55 +11:00
Rob Harrington
b2565991e6 Merge branch 'master' into reg_and_ent_types 2014-10-17 12:33:21 +11:00
Rohan Mitchell
694dd0c329 Enterprise user selling own produce only sees simple order cycle listing 2014-10-17 10:52:36 +11:00
Rohan Mitchell
0e03b5f209 Admin can change the format that Spree::Images are stored/served in 2014-10-16 12:41:11 +11:00
Rohan Mitchell
7e23479f3a Consistency 2014-10-16 12:08:12 +11:00
Rafael Schouten
20a94b4365 Merge branch 'master' into migrate_ent_types 
Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb
 2014-10-07 10:52:26 +11:00
Rafael Schouten
f0c9e7cd44 fix for tests, remove open in new tab 2014-10-04 13:12:36 +10:00
Rafael Schouten
884c111240 fix failing tests 2014-10-04 11:56:35 +10:00
Rafael Schouten
4c1fc5671f Minor fixes 2014-10-02 10:43:17 +10:00
Rafael Schouten
4fde0ad2d7 Merge branch 'master' into migrate_ent_types 2014-10-01 16:11:20 +10:00
Rafael Schouten
5c0d846643 bugfix sells and is_distributor specs and code 2014-09-28 11:55:46 +10:00
Rafael Schouten
b821107c27 bugfix migration ad specs 2014-09-27 18:14:10 +10:00
Rob Harrington
4b2f1cefa0 Spliting order management abilities out of product management abilities 2014-09-26 17:11:11 +10:00
Rob Harrington
9520eeeb15 can specify attributes for create_enterpise_user 2014-09-25 11:56:18 +10:00
Rob Harrington
ed91cd6463 Make sure d1 != d2 2014-09-24 20:48:52 +10:00
Rob Harrington
c6d463bf25 Revert "Pending bulk order mgmt specs" 
This reverts commit eead8d665f.
 2014-09-20 18:06:42 +10:00
Rob Harrington
544e6e074a Stop being lazy 2014-09-19 14:38:59 +10:00
Rob Harrington
0fdbcc0023 Make dates consistent 2014-09-17 11:39:39 +10:00
Rob Harrington
eead8d665f Pending bulk order mgmt specs 2014-09-17 11:39:20 +10:00
Rob Harrington
22e61d9834 TEMP: spit out variables in failing oc spec 2014-09-16 23:47:34 +10:00
Rob H
143545da0d Try newer syntax to fix spec failing on CI 2014-09-12 23:41:26 +10:00
Rob H
05d8c825c7 Enterprise User should NOT see form elements for changing type 2014-09-12 13:40:47 +10:00