raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 19 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

4161 Commits

Author SHA1 Message Date
Andrew Spinks
4f5679aac3 Add EnterpriseRole model and link up to users and enterprises. 2013-08-01 10:32:49 +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
Rob H
4ae5085192 BPUR: Remove unnecessary collections of products on bulk edit page 2013-07-23 10:37:50 +10:00
Rob H
0ddd9cc6d0 BPUR: use where rather than select for product collection 2013-07-23 10:37:50 +10:00
Rob H
8453b43c25 BPUR: Allow updating of delegated variant properties 2013-07-23 10:37:50 +10:00
Rob H
c80cba7fa5 BPUR: Don't use master variant to update attributes. Changes to product filtering. 2013-07-23 10:37:50 +10:00
Rob H
fbb3657bdc BPUR: can update master price. Test refactor and added angular ng-decimal directive 2013-07-23 10:37:50 +10:00
Rob H
731127d55c WIP: Bulk Product Update Rewrite: initial acceptance testing 2013-07-23 10:37:50 +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
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
2d64e257ff break long lines into two; no functional change 2013-06-21 10:45:11 +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
1d977de328 Order validation performed over both product distribution and order cycle distribution 2013-06-17 15:06:41 +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
95de78f24e Tidy-ups 2013-06-17 10:03:00 +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
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
fb4f533976 Refactor OrderPopulator, add outside level spec 2013-06-05 14:44:57 +10:00
Rohan Mitchell
98f3197c08 WIP Move orders#populate logic to OrderPopulator class 2013-06-05 11:47:47 +10:00
Rohan Mitchell
54fe63e7f3 User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor 2013-05-28 16:20:58 +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
1b25364160 Cherry-pick c3b2f52: Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement 
Conflicts:

	app/models/enterprise.rb
	lib/open_food_web/distribution_change_validator.rb
 2013-05-28 13:01:07 +10:00
Rohan Mitchell
0e08829a29 Rename DistributorChangeValidator to DistributionChangeValidator in preparation for expansion to include order cycles 2013-05-28 12:32: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
vagrant
4e7f966429 add suppliers scope, limit by 5, test 2013-05-22 13:07:30 +10:00
Rohan Mitchell
c3b2f52b7a Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement 2013-05-20 21:16:43 +10:00
Rohan Mitchell
cc2e8694f0 Move LineItem update to source of change (order update). On empty cart, re-instanciate shipping method adjustment, fixing no shipping fees after empty cart bug. 2013-05-20 15:01:04 +10:00
Rohan Mitchell
d65dda4dc5 When order distributor changes, update line item shipping method 2013-05-18 19:21:01 +10:00
Rohan Mitchell
234b2d26e9 Add MiGS payment gateway 2013-04-29 15:37:48 +10:00
Rohan Mitchell
6e7ee6481d Fetch enterprises that are distributing a product via a product or order cycle distribution 2013-04-12 10:13:04 +10:00
Rohan Mitchell
32629a27e7 Remove explicit class specification 2013-04-05 16:57:53 +11:00
Rohan Mitchell
f66ff0f8b1 Rename Enterprise#available_variants to distributed_variants to remove ambiguity between supplied/distributed variants 2013-04-05 16:51:51 +11:00
Rohan Mitchell
5649a50e28 Add tests around Enterprise#available_variants, make it also show variants distributed via an order cycle 2013-04-05 16:49:27 +11:00
Rohan Mitchell
3aa48907a6 Add per-product tests for membership of distributor or order cycle 2013-04-05 12:45:01 +11:00
Rohan Mitchell
a9a58db137 Add spec for viewing product counts when both a distributor and an order cycle are selected, scope Spree::Product.with_order_cycles_outer joins to avoid clash when using both in_distributor and in_order_cycle in the same query 2013-03-15 12:17:29 +11:00
Rohan Mitchell
bcd545c13f Alias spree_variants join to avoid name clash when loading products for home page 2013-03-08 17:21:18 +11:00
Rohan Mitchell
c9d1573049 Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors 2013-03-08 16:56:58 +11:00
Rohan Mitchell
b25dcaa92b Enterprise.active_distributors doesn't show distributors from inactive order cycles 2013-03-08 16:54:22 +11:00
Rohan Mitchell
2a890f80f4 Enterprise.active_distributors doesn't show distributors of out of stock products 2013-03-08 16:48:35 +11:00
Rohan Mitchell
13abf9ada7 Enterprise.active_distributors doesn't show distributors of unavailable products 2013-03-08 16:46:25 +11:00