raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,900 Commits 17 Branches 453 Tags
7cc2bc4fde83d2c4c059c19afee3242afc01e821
Commit Graph

105 Commits

Author SHA1 Message Date
Continuous Integration
c76021462c Auto-merge from CI [skip ci] 2015-06-16 14:12:16 +10:00
Rohan Mitchell
610a4c03fe Merge branch 'master' into redesign 
Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb
 2015-06-10 18:27:50 +10:00
Rohan Mitchell
ee01113fe1 Fix duplicate factory value spec error 2015-06-10 15:31:53 +10:00
Rob Harrington
439d122e93 Merge branch 'master' into customers 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee
 2015-06-03 15:19:40 +08:00
Rohan Mitchell
6f513fee77 Merge branch 'master' into redesign 2015-05-29 15:20:21 +10:00
Continuous Integration
c14de4e97f Auto-merge from CI [skip ci] 2015-05-29 14:29:23 +10:00
Continuous Integration
1d08ae89da Auto-merge from CI [skip ci] 2015-05-28 14:31:25 +10:00
Maikel Linke
e4f93863fd Finding unique permalink before validation. 2015-05-28 11:27:40 +10:00
Maikel Linke
19448a182e Add permalink field to enterprise groups 2015-05-28 11:27:39 +10:00
Rob Harrington
e931f4b31f Merge branch 'master' into require_standard_variant 2015-05-22 12:22:54 +10:00
Rob Harrington
79a59e2e81 Add order_with_distributor factory 2015-05-21 13:34:32 +10:00
Rob Harrington
3431c687b8 Making sure every created by factories has a distributor 2015-05-20 20:54:27 +10:00
Rohan Mitchell
0ac7dbf23b Update spec references to removed file logo.jpg 2015-05-13 14:27:43 +10:00
Rob Harrington
7a4f0e214c Adding customers index view 2015-05-13 12:44:33 +10:00
Rob Harrington
a75a76840d Merging master into require_standard_variant 2015-04-17 21:18:24 +10:00
Rohan Mitchell
829d11d4b2 Deliver a warning if attempting to create an invalid taxed_product from factory 2015-04-17 13:39:09 +10:00
Rob Harrington
b9f19d5777 Fixing broken specs 2015-04-17 13:00:20 +10:00
Rob Harrington
0a7b01ff07 Product requires variant_unit and master requires unit_value and/or unit_desc 2015-04-17 11:25:16 +10:00
Rohan Mitchell
7f6c02ca29 Add User#customer_of to look up customers 2015-04-16 10:59:15 +10:00
Rohan Mitchell
84f3097217 Calculate total tax from the tax included in all the adjustments on the order 2015-03-25 16:27:29 +11:00
Rohan Mitchell
40b4edeca1 Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies. 2015-03-25 16:27:29 +11:00
Rohan Mitchell
69dc92dec1 Create factories zoned_order and taxed_product 2015-03-25 16:27:29 +11:00
Rohan Mitchell
1a44e74a9d When enterprise user creates an enterprise, make it a hub if they have other hubs 2015-03-13 16:06:42 +11:00
Maikel Linke
903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge 
Conflicts:
	README.markdown
	db/schema.rb
 2015-02-13 15:42:36 +11:00
Maikel Linke
7a48d7fe22 Updating feature spec for groups 2015-01-22 16:04:46 +11:00
Rob Harrington
9f0aeb5adf Adding unique permalink to enterprises 2015-01-22 10:19:41 +11:00
Rohan Mitchell
3aedbb6c48 Display variant overrides 2014-12-12 13:33:12 +11:00
Rohan Mitchell
f5b20b7afc Give distributors a payment and shipping method where required 2014-10-31 16:02:43 +11:00
Rob Harrington
f499cc375b Adding confirmed_at to enterprise factory 2014-10-17 17:32:27 +11:00
Rafael Schouten
b3520c4385 Bugfix for specs 2014-10-02 16:49:32 +10:00
Rafael Schouten
b821107c27 bugfix migration ad specs 2014-09-27 18:14:10 +10:00
Rob Harrington
f0f165a129 Explicitly create enterprises in order_cycle factory to fix intermittent fail 2014-09-24 14:00:08 +10:00
Rob H
31de5d45ea Adding owner to enterprise 2014-09-11 14:36:09 +10:00
Rohan Mitchell
1a995aedda Simplify enterprise_relationship factory - leverage permissions_list= model method 2014-08-25 15:20:46 +10:00
Rohan Mitchell
70feef1256 Add EnterpriseRelationshipPermission model 2014-08-25 13:26:23 +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
1d77812ab8 Admin can list enterprise roles 2014-08-15 16:09:04 +10:00
Rohan Mitchell
6dfd26ac69 order_with_totals_and_distribut{or,ion} 2014-07-16 10:33:23 +10:00
Will Marshall
1c31ac56ea Adding primary taxon field to product 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
 2014-05-30 14:31:03 +10:00
Rohan Mitchell
acbe49b8de Revert primary taxons 2014-05-24 17:13:01 +10:00
Will Marshall
17f09d1852 Adding primary taxon field to product 2014-05-24 09:29:19 +10:00
Rohan Mitchell
ad1f852bdd Revert "Adding primary taxon field to product" 
This reverts commit fd1e7ebaa3.
 2014-05-24 09:07:57 +10:00
Will Marshall
fd1e7ebaa3 Adding primary taxon field to product 2014-05-23 15:59:06 +10:00
Rohan Mitchell
d8fa30ea6f Add a sequence to option type position, prevents inconsistent ordering in specs 2014-05-21 16:54:26 +10:00
Rohan Mitchell
4f1b8d06e7 Construct enterprise relationships with a factory 2014-05-21 11:29:11 +10:00
Will Marshall
0958602418 Starting on migrations and admin forms 2014-05-20 12:18:27 +10:00
Rohan Mitchell
d707624525 Fix warnings - faker clash with ffaker, i18n enforce_available_locales 2014-05-02 14:25:32 +10:00
Rohan Mitchell
ec0191806a Update specs to explicitly specify exchange direction 2014-03-26 12:17:49 +11:00
Rob H
ea3bd86318 Make enterprise factory get it own address 2014-03-07 12:14:09 +11:00
Rohan Mitchell
0bae3e58b8 Add product units and amount fields to product and variant models, add validations 2013-12-05 15:16:51 +11:00