raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-04 07:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,201 Commits 19 Branches 460 Tags
56590e2f4ad8ceda722c92d84d33793224895843
Commit Graph

71 Commits

Author SHA1 Message Date
Rohan Mitchell
56590e2f4a Instrument saving spree addresses with invalid values in an attempt to track down the cause of some invalid records finding their way into the database 2013-09-17 18:06:06 +10:00
David Cook
61e5ec24e7 Generalise ModelClassFromControllerName 2013-08-30 15:21:30 +10:00
David Cook
5b824c1e22 Prevent exception when order has no payments 2013-08-22 13:07:17 +10:00
alexs
798565bb42 Overriding accidental commit. 2013-08-21 10:59:25 +10:00
alexs
f6983078a2 Removed search box and distributor/supplier sidebar from the hub page. 2013-08-21 10:49:43 +10:00
Rohan Mitchell
693fa9f37b Enable enterprises_distributor_info_rich_text by default 2013-08-19 16:47:17 +10:00
Rohan Mitchell
4d04a24342 Translate exchange fees for processing by rails 2013-08-16 10:22:29 +10:00
Rohan Mitchell
7fc0787e36 OrderCycleFormApplicator sets exchange fees 2013-08-16 10:22:29 +10:00
Andrew Spinks
bc57364c7e Add simple angular cart to the main page. 2013-08-08 18:31:56 +10:00
Rohan Mitchell
ec3e00c128 Refactor LineItem and clients for new fields 2013-08-06 13:47:17 +10:00
Andrew Spinks
1add182757 Feature toggle order cycles. 2013-07-23 15:57:43 +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
7b1d1f1d42 Add FeatureToggle config to replace ENV['OFW_DEPLOYMENT'] 2013-07-22 12:11:52 +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
12fb43e268 DistributionChangeValidator returns an empty array when distributor and order cycle are both nil 2013-06-17 16:01:10 +10:00
Rohan Mitchell
705af41684 DistributionChangeValidator finds variants distributed by product distribution when order cycle is nil 2013-06-17 15:06:20 +10:00
Rohan Mitchell
be29974dd8 DistributionChangeValidator checks if an order can change to a specified new distributION 2013-06-17 15:00:19 +10:00
Rohan Mitchell
17103a8b0c Remove DistributionChangeValidator#can_change_distributor? method 2013-06-17 14:00:39 +10:00
Rohan Mitchell
661ce4e597 Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products 2013-06-04 10:26:13 +10:00
Rohan Mitchell
fbac41b060 Add DistributionChangeValidator#available_order_cycles, analagous to available_distributors 2013-05-28 13:51:52 +10:00
Rohan Mitchell
11755346ce DistributionChangeValidator finds available order cycles for a product 2013-05-28 13:40:13 +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
a2abcaf7bd Push product_compatible_with_current_order and available_distributors_for down to DistributorChangeValidator, add tests 2013-05-27 13:50:33 +10:00
Rohan Mitchell
a21783c814 Allow changing distributor when there are alternate distributors available that can service the cart's order 2013-05-27 13:11: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
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
661b7da110 Booleanise all the logic 2013-04-05 14:14:12 +11:00
Rohan Mitchell
e735a709bf SplitProductsByDistribution deals with order cycles, and is tested by stubs 2013-04-05 14:05:30 +11:00
Rohan Mitchell
cf4fe269d1 Add specs for splitting products by various distribution options 2013-04-05 11:41:37 +11:00
Rohan Mitchell
b3976bfbd0 Rename SplitProductsByDistributor to SplitProductsByDistribution 2013-04-05 11:08:19 +11:00
Rohan Mitchell
1d7cf4436a Add comments linking areas concerned with separating products by distributor and order cycle 2013-03-15 17:02:54 +11:00
Rohan Mitchell
711f769bcd Remove QueriesProductDistribution - replaced by Product and Enterprise scopes 2013-03-08 16:57:54 +11:00
Rohan Mitchell
69392100f9 Push QueriesProductDistribution.products_available_for back to model 2013-03-08 15:18:53 +11:00
Rohan Mitchell
e326e590db Implement and use scopes for finding products by distributor via order cycle or product distribution 2013-03-08 15:18:53 +11:00
Rohan Mitchell
265336b70c When looking up distributors for sidebar, include both those in ProductDistributions and in OrderCycles 2013-03-08 15:18:53 +11:00
Rohan Mitchell
666f110d47 Load distributor list from those in an active order cycle 2013-03-08 15:17:23 +11:00
Rohan Mitchell
f2f3bbd3ed Merge branch 'order-cycles-exchange-products' 
Conflicts:
	Gemfile.lock
 2013-01-22 10:40:56 +11:00
Rohan Mitchell
83e3c6815d Merge branch 'checkout-changes' 
Conflicts:
	.rvmrc
	app/helpers/application_helper.rb
 2013-01-22 10:30:51 +11:00
Rohan Mitchell
ae93d02c9c OrderCycleFormApplicator applies outgoing exchange collection details 2013-01-18 14:23:42 +11:00
Rohan Mitchell
983ba92dea OrderCycleFormApplicator deals with outgoing exchanges 2013-01-18 11:22:42 +11:00
Rohan Mitchell
d27ef76ead Load exchange variants from correct attr 2013-01-10 11:27:39 +11:00
Rohan Mitchell
f8c74e8b92 Make most OrderCycleFormApplicator methods private, add spec for adding exchanges 2013-01-09 10:41:09 +11:00
Rohan Mitchell
ba19db3ccf Add or update exchange variants when creating or updating order cycles 2013-01-09 10:06:51 +11:00
Rob H
8a37b4e918 Push validation logic for changing distributor down into lib class 2012-12-14 11:02:01 +11:00
Rohan Mitchell
07eac918a3 OrderCycleFormApplicator deletes removed exchanges 2012-11-30 17:08:57 +11:00
Rohan Mitchell
5655b0b7a5 OrderCycleFormApplicator updates existing exchanges 2012-11-30 16:07:21 +11:00
Rohan Mitchell
2c8d313c77 Create OrderCycleFormApplicator, for interfacing between front-end form and OrderCycle exchanges model. 2012-11-29 11:40:15 +11:00
Rohan Mitchell
3a116dc13d Fix product filtering on supplier and distributor pages 2012-11-01 16:37:12 +11:00
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises 
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
 2012-11-01 11:02:02 +11:00