Rob H
|
4ae5085192
|
BPUR: Remove unnecessary collections of products on bulk edit page
|
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
|
1bd4875a6f
|
BPUR: Can clone products
|
2013-07-23 10:37:50 +10:00 |
|
Rob H
|
1e64dab9f7
|
Bulk product update rewrite: basic integration test passing
|
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 |
|
Rob H
|
0d99d9d18f
|
Don't display unit size in reports for products that are not group buy items
|
2012-11-16 17:00:57 +11:00 |
|
Rob H
|
32acba05a3
|
Fixed total row labels in bulk co-op allocation report.
|
2012-11-16 15:28:06 +11:00 |
|
Rob H
|
9cb5ac95ff
|
More brackets make everything even better
|
2012-11-11 15:30:01 +11:00 |
|
Rohan Mitchell
|
076c64f7b0
|
Brackets make everything better
|
2012-11-10 12:53:03 +11:00 |
|
Rohan Mitchell
|
9a9bef5304
|
Report filtering on completion date, not creation date
|
2012-11-09 20:31:08 +11:00 |
|
Rob H
|
a15f96aa68
|
Fix for case where no group_buy_size_has been set. ie. = nil
|
2012-11-07 18:34:54 +11:00 |
|
Rob H
|
5f07df9316
|
Add calculation fields to bulk co-op and order cycle reports
|
2012-11-03 11:36:17 +11:00 |
|
Rob H
|
9e4edd5da0
|
Change the basis of line_item grouping for Bulk Co-op and Order Cycle reports from User to Order
|
2012-11-02 16:41:32 +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
|
d89945bbb2
|
Add smoke test for reports, fix use of old Distributor model
|
2012-11-01 10:20:06 +11:00 |
|
Rohan Mitchell
|
926440a978
|
Fix namespacing of Distributor in reports controller
|
2012-10-31 11:13:55 +11:00 |
|
Rohan Mitchell
|
5ac904005b
|
Merge branch 'order-cycle-reports'
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
config/routes.rb
|
2012-10-31 10:18:11 +11:00 |
|
Rob H
|
f960cc44ba
|
Fixed calculations when variant weight is nil
|
2012-10-26 17:27:08 +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 |
|
Rob H
|
4dd5e12968
|
Fix reports controller, previous changes to fix change generate_report were incomplete
|
2012-10-26 13:49:39 +11:00 |
|
Rob H
|
d74591afe6
|
Fixes to reports controller and addition of order cycles reports
|
2012-10-26 13:44:13 +11:00 |
|
Rohan Mitchell
|
784969097d
|
Move admin non-Spree controllers out of Spree namespace
|
2012-10-25 10:45:39 +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
|
a362dd5161
|
Change reports controller: generate_report to render_report
|
2012-10-24 17:01:50 +11:00 |
|
Rob H
|
81b33772fe
|
Fixes to syntax and formatting for group-reports
|
2012-10-24 15:21:16 +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 |
|
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 |
|
Rohan Mitchell
|
6d9257d941
|
Do not delete shipping method referenced by a line item
|
2012-10-02 12:15:09 +10:00 |
|
Rohan Mitchell
|
7430fc9bdd
|
Do not delete shipping method referenced by a product distribution
|
2012-10-02 11:58:18 +10:00 |
|
Rohan Mitchell
|
2aa450b072
|
Do not delete shipping method referenced by an order
|
2012-10-02 11:51:13 +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 |
|
Andrew Spinks
|
58e9cd3eeb
|
fix distributor name in report
|
2012-07-15 21:00:10 +10:00 |
|
Andrew Spinks
|
54559c4a5f
|
first cut at orders report.
|
2012-07-15 20:48:10 +10:00 |
|
Rohan Mitchell
|
718e54f933
|
Add distributor next_collection_at field, bulk edit in admin backend
|
2012-07-02 14:24:52 +10:00 |
|
Rohan Mitchell
|
4b9c0f01e2
|
Update admin backend for supplier/distributor address extraction
|
2012-06-26 14:54:35 +10:00 |
|
Andrew Spinks
|
c9effe5926
|
Add seperate address fields - don't become too attached to spree.
|
2012-04-29 17:31:47 +10:00 |
|
Andrew Spinks
|
7ea0f73398
|
begin adding suppliers
|
2012-04-22 14:51:24 +10:00 |
|
Andrew Spinks
|
147985b94d
|
fix sorting of distributors by name
|
2012-04-22 12:58:40 +10:00 |
|
Andrew Spinks
|
f7372a80c2
|
add distributor to checkout
|
2012-04-09 09:56:37 +10:00 |
|
Andrew Spinks
|
3f1ed0ca06
|
make distributors work in spree admin framework.
|
2012-04-07 12:10:44 +10:00 |
|