Commit Graph

34 Commits

Author SHA1 Message Date
Rohan Mitchell
e46d61075e Simplify field naming 2013-01-10 15:33:56 +11:00
Rohan Mitchell
d27ef76ead Load exchange variants from correct attr 2013-01-10 11:27:39 +11:00
Rohan Mitchell
62a7a0db7c Add spec for updating exchanges 2013-01-09 10:50:17 +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
e53fff8e31 Split OrderCycleFormApplicator specs into unit / integration, add integration spec for exchange_exists? 2013-01-09 10:18:06 +11:00
Rohan Mitchell
ba19db3ccf Add or update exchange variants when creating or updating order cycles 2013-01-09 10:06:51 +11:00
Rohan Mitchell
04297d928e Correct naming of OrderCycleFormApplicator spec 2013-01-09 09:16:25 +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
8736254f12 Create incoming exchanges on save 2012-11-29 11:52:34 +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
682c09f516 Remove use of old Distributor model, fix before all not cleaning db 2012-11-01 10:05:39 +11:00
Rohan Mitchell
5dcba7403b Avoid contaminating test data 2012-10-31 13:54:14 +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
41d547ac2d Minor formatting changes to Order Group Spec 2012-10-24 16:13:23 +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
c05911fa10 Fix spree_creditcards table renamed in Spree 1.2 upgrade, remove old pending test 2012-10-11 10:50:37 +11:00
Rob H
5803da9c55 Syntax fixes for group buy report classes and tests 2012-10-10 15:13:15 +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
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
Rohan Mitchell
412eb4365e Provide searching by supplier or distributor via spree searcher class 2012-06-20 17:44:58 +10:00
Rohan Mitchell
1207062f7c Filter products by distributor 2012-06-20 14:20:07 +10:00