raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
610 Commits 21 Branches 450 Tags
02561ee252fa054c5db3d46c604d70ebe030074d
Commit Graph

55 Commits

Author SHA1 Message Date
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
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
02b524bfce Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle 2013-04-05 15:00:42 +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
Rob H
c956706d78 Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test 2013-02-14 15:12:50 +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
Rohan Mitchell
9b32579bd6 Group buy report handles nil variant weight gracefully 2012-10-31 10:37:40 +11:00
Rohan Mitchell
077098e6c1 Refactor libs to use enterprise instead of supplier and distributor 2012-10-29 14:57:03 +11:00
Rohan Mitchell
a3042118c7 Merge branch 'group-reports' 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb
 2012-10-26 17:14:49 +11:00
Rohan Mitchell
c46019d68c WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace 2012-10-25 10:45:39 +11:00
Rob H
81b33772fe Fixes to syntax and formatting for group-reports 2012-10-24 15:21:16 +11:00
Rob H
3b855a866a Merge branch 'grouper-reports' into group-reports 2012-10-22 11:35:56 +11:00
Rob H
ddb01e4ccb WIP: Create report grouper, write reports for bulk co-ops and payments 2012-10-21 13:12:48 +11:00
Rohan Mitchell
fe5fd76415 Further syntax fixes for GroupBuyReport 2012-10-11 10:53:33 +11:00
Rob H
5803da9c55 Syntax fixes for group buy report classes and tests 2012-10-10 15:13:15 +11:00
Rohan Mitchell
0ad6045363 Fix struct superclass mismatch error 2012-10-10 14:02:44 +11:00
Rob H
9737f21bb8 WIP: Write body of group buy report 2012-10-10 13:46:51 +11:00
Rob H
d7a5a87aef create group buy report, display header 2012-10-03 11:49:21 +10:00
Rohan Mitchell
f1f9b5b2e8 Make order and distributor report resilient to orders without distributors 2012-09-19 15:19:30 +10:00
Rohan Mitchell
3a391d1e76 Give undefined payment method tolerance to orders and distributors report 2012-08-08 15:30:25 +10:00
Rohan Mitchell
f0ec3080e4 Remove instrumentation 2012-08-04 17:50:30 +10:00
Rohan Mitchell
245de4fe1a Add instrumentation to debug products not appearing on distributor view 2012-08-04 16:52:18 +10:00
Rohan Mitchell
9d3afe80c6 split_products_by_distributor was not written with pre-pagination by searcher in mind, resulting in silently dropped products. Disable pagination at searcher. 2012-08-03 18:47:33 +10:00
Rohan Mitchell
306cb5b089 Add max quantity to order and distributor report 2012-08-02 15:07:34 +10:00
Andrew Spinks
2826f62497 Add extra details to the order report. 2012-07-20 20:25:53 +10:00
Andrew Spinks
7172fe0c87 added extra fields to order report. 2012-07-20 00:07:41 +10:00
Andrew Spinks
7e9a84087e cleaning up order report 2012-07-19 22:48:42 +10:00
Rohan Mitchell
5411685c83 Split products by local/remote distributor: logic 2012-06-24 07:36:56 +10:00