raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-30 06:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,960 Commits 15 Branches 460 Tags
1ce431b671bd97caee5bdca7ef3869eaa7f95bee
Commit Graph

975 Commits

Author SHA1 Message Date
Rohan Mitchell
fd989e3a77 Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items. 2013-08-09 15:27:52 +10:00
Rohan Mitchell
239dd29511 Weight calculator will calculate against a single line item as well as an order 2013-08-09 15:27:52 +10:00
Rohan Mitchell
a338c974f8 Create line item adjustments for product distributions 2013-08-09 15:27:52 +10:00
Rohan Mitchell
8c9a3c8a91 Add Product#product_distribution_for 2013-08-09 15:26:57 +10:00
alexs
4ff8e825e9 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-09 13:21:24 +10:00
alexs
39623d45d6 Tests for building full addresses. 2013-08-09 13:19:07 +10:00
alexs
7c96c17c88 Tests for geo search. 2013-08-09 13:15:36 +10:00
Andrew Spinks
7fe1aab903 Simplest version of a cart that supports multiple orders. 2013-08-08 18:31:56 +10:00
David Cook
c247c2d3ea WIP: Allow distributor enterprise user to access their orders 2013-08-07 09:19:28 +10:00
alexs
3f82147024 Merge branch 'master' of github.com:eaterprises/openfoodweb 
Conflicts:
	db/schema.rb
 2013-08-06 18:32:53 +10:00
alexs
82ea8adfe3 Added list of geocoded suburbs. 2013-08-06 18:31:08 +10:00
Rohan Mitchell
ec3e00c128 Refactor LineItem and clients for new fields 2013-08-06 13:47:17 +10:00
alexs
57e185af78 Merge branch 'landing_page' 2013-08-06 12:35:06 +10:00
David Cook
27c17d6b07 Test that enterprise user can't access other enterprises' products 2013-08-06 11:22:44 +10:00
David Cook
0a7c5d4992 Add cancan ability tests on enterprise user roles 2013-08-06 11:12:37 +10:00
alexs
24d559cd3a Merge branch 'master' into landing_page 
Conflicts:
	db/schema.rb
	db/seeds.rb
 2013-08-05 17:08:39 +10:00
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +10:00
Andrew Spinks
e75021d7bd Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way. 2013-08-02 18:13:42 +10:00
Andrew Spinks
9d32a5775a Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products. 2013-08-02 16:08:10 +10:00
Andrew Spinks
5bccd38b5e Fix tests - don't have feature toggle overrides on when running tests! 2013-08-01 15:37:42 +10:00
Rohan Mitchell
122b9b5617 Make order cycle coordinator fees many-to-many 2013-07-30 11:34:10 +10:00
Rohan Mitchell
7640eb497a Merge branch 'supplied-active-products-on-hand' 
Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb
 2013-07-29 11:05:42 +10:00
Andrew Spinks
8e560a59c9 Fix selection of itemwise shipping method that broke after the spree upgrade. 2013-07-23 15:46:07 +10:00
Andrew Spinks
7cb054f430 Merge branch 'master' into order-cycle-selection 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/spree/orders_controller_decorator.rb
	app/models/enterprise.rb
	app/models/spree/order_decorator.rb
	app/views/spree/checkout/_other_available_distributors.html.erb
	app/views/spree/products/_add_to_cart.html.haml
	lib/open_food_web/distributor_change_validator.rb
	spec/spec_helper.rb
 2013-07-23 14:42:57 +10:00
Rohan Mitchell
fe61cddda6 Merge branch 'local-organics' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb
 2013-07-23 11:40:03 +10:00
David Cook
2e2dc216fa WIP: writing order scope test 2013-07-22 17:33:50 +10:00
David Cook
9f1a7746a4 WIP: start writing order scope test 2013-07-22 17:30:01 +10:00
Rohan Mitchell
37a4ad3372 Don't 500 when setting cart order cycle to nil 2013-06-21 17:04:47 +10:00
David Cook
0525abb084 Test that scopes don't return deleted products 2013-06-21 15:53:12 +10:00
David Cook
250e76c281 Fix incorrect count of enterprises (due to bug in rails issue #5554) 2013-06-21 15:10:21 +10:00
Rohan Mitchell
ae43fd1333 Set distributor and order cycle in one step, avoiding validation errors. Update spec with new error messages. 2013-06-21 11:36:24 +10:00
Rohan Mitchell
72f1c52b3e Update Order model distribution validation - make fully inclusive of order cycles 2013-06-21 11:35:42 +10:00
David Cook
2e6387ac60 test available_on for distributors 2013-06-21 10:52:15 +10:00
Rohan Mitchell
3386da4b4c Validate distribution combination for new products added to cart 2013-06-21 10:39:08 +10:00
Rohan Mitchell
cfcc8c3fb2 Fix DistributionChangeValidator#variants_available_for_distribution: Do not show products distributed through a different order cycle 2013-06-21 10:34:39 +10:00
Rohan Mitchell
b8d0e3f49a OrderPopulator decorator checks cart contents against order cycle as well as distributor 2013-06-20 15:13:59 +10:00
Rohan Mitchell
27b5dc071a Order cycle reports on the variants distributed by a particular distributor 2013-06-17 14:58:13 +10:00
Rohan Mitchell
da02cb5a93 Reorder specs 2013-06-17 12:05:46 +10:00
Rohan Mitchell
4e5f0b9963 Set potential distributor and order cycle before attempting add to cart, revert on failure 2013-06-14 14:57:08 +10:00
Rohan Mitchell
1e0491e90f Add spec for OrderPopulator#check_variant_available_under_distributor 2013-06-05 16:00:17 +10:00
Rohan Mitchell
e90077bb09 Add spec for OrderPopulator#order_cycle_required_for 2013-06-05 15:54:45 +10:00
Rohan Mitchell
4bcae29553 Add specs for OrderPopulator#check_distribution_provided_for and distribution_provided_for 2013-06-05 15:50:20 +10:00
Rohan Mitchell
f4df69765d Add spec for OrderPopulator#distributor_can_supply_products_in_cart 2013-06-05 15:09:11 +10:00
Rohan Mitchell
3724a67d16 Add spec for OrderPopulator#set_cart_distributor_and_order_cycle 2013-06-05 15:04:42 +10:00
Rohan Mitchell
bfc300a3c2 Add spec for OrderPopulator#load_distributor_and_order_cycle 2013-06-05 15:01:52 +10:00
Rohan Mitchell
437da7425c Add spec for OrderPopulator#attempt_cart_add 2013-06-05 14:55:56 +10:00
Rohan Mitchell
fb4f533976 Refactor OrderPopulator, add outside level spec 2013-06-05 14:44:57 +10:00
Rohan Mitchell
9ef7da1339 Add OrderCycle#distributed_variants 2013-05-28 14:01:04 +10:00
Rohan Mitchell
3bedfc3d1d Add OrderCycle distributing_product scope 2013-05-28 13:27:52 +10:00
Rohan Mitchell
e3a419993c Work around order cycles not having fees / shipping methods yet - notify bugsnag and provide an undefined shipping method 2013-05-27 13:00:12 +10:00