raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 18 Branches 451 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

214 Commits

Author SHA1 Message Date
David Cook
ad4301df90 Add supplier selection to Orders & Fulfillment Report 2013-09-18 12:34:43 +10:00
David Cook
4c2d6b38ea Ensure 'No Order Cycle' remains selected after clicking 'Search' 2013-09-18 09:57:03 +10:00
David Cook
b34d940457 Renamed report column to 'Curr. Cost per Unit' for clarity 2013-09-18 09:27:34 +10:00
David Cook
3fbd5dc625 Fix 'No Order Cycle' dropdown in Orders & Fulfillment Reports 2013-09-18 09:27:34 +10:00
David Cook
9782dd8264 Get line item cost from order, not current product price which may have changed. Also removed unnecessary total columns. 2013-09-18 09:27:34 +10:00
David Cook
e57ad81934 Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports 2013-09-18 09:27:34 +10:00
David Cook
5ec3c1831d Only show order cycles that the user has access to in reports drop-down 2013-09-18 09:26:50 +10:00
David Cook
fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' 2013-09-18 09:25:51 +10:00
Rohan Mitchell
42a6ad6e7c Inline spree_last_address into the codebase to attempt to fix errors with it appearing only in prod 2013-09-17 13:48:53 +10:00
David Cook
7e96ba909e Show a list of Order Cycles report types in the description column 2013-09-13 09:59:35 +10:00
Rohan Mitchell
0e8443e118 Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil. 2013-09-10 11:28:49 +10:00
Rohan Mitchell
d43df754d3 Load correct products on enterprise and product listing pages 2013-09-10 10:36:13 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
David Cook
25b25b7681 New scope Order.not_state to filter out cancelled orders from reports 2013-08-30 17:07:17 +10:00
David Cook
bf3c5c6dd6 Merge branch 'master' into reports-completed-only 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
 2013-08-30 16:42:00 +10:00
David Cook
6a303d7db9 Merge branch 'enterprise-reports' 
Conflicts:
	app/models/spree/ability_decorator.rb
 2013-08-30 16:27:13 +10:00
David Cook
61e5ec24e7 Generalise ModelClassFromControllerName 2013-08-30 15:21:30 +10:00
David Cook
80bfc5ce53 Ensure Supplier enterprise users can only view their own products in reports 2013-08-30 15:17:27 +10:00
David Cook
9de5a0061e Enterprise user can only view their own distributors in reports (and remove redundant feature test) 2013-08-23 16:09:37 +10:00
Rohan Mitchell
02089541cd Syntax tweaks 2013-08-23 14:00:31 +10:00
David Cook
078bd033b6 Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions) 2013-08-23 13:25:42 +10:00
David Cook
1bfb54f310 Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions) 2013-08-23 13:25:10 +10:00
David Cook
3d32e6480b Enterprise user can access all OFN reports 2013-08-22 13:07:17 +10:00
David Cook
3a75f6b86a Enterprise user can access all OFN reports 2013-08-22 11:49:18 +10:00
Rohan Mitchell
aab7176f2c Enterprise manager can bulk edit products 2013-08-22 11:21:49 +10:00
David Cook
b2878ddc40 Payment Method must belong to a Distributor 2013-08-21 15:14:01 +10:00
Rohan Mitchell
fb33b853dd Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5 2013-08-20 10:47:56 +10:00
David Cook
3ffe732b30 Ensure valid payment method is selected 2013-08-19 13:57:40 +10:00
David Cook
2d305b59d9 Only show payment methods for the distributor of the order 2013-08-19 13:57:40 +10:00
David Cook
4be2fe5fe9 Only show payment methods that user has access to 2013-08-19 13:57:40 +10:00
Andrew Spinks
d160a3256a Make adding to cart via spree front end kind of work again. 2013-08-15 15:36:35 +10:00
Andrew Spinks
59fce8a964 Show line items for each order in multi-cart. 2013-08-14 10:49:55 +10:00
Andrew Spinks
0a39fb87a5 Fix multi-cart association and add some temporary multi-cart support into the current front end. 2013-08-14 10:49:54 +10:00
David Cook
293661377e Remove text to the left of TOTAL 2013-08-13 17:01:19 +10:00
David Cook
015dbc5c01 Only show active or complete order cycles, ordered by cycle close date 2013-08-13 16:47:23 +10:00
David Cook
6bad6e2675 Add order cycle selection to Order Cycles Report 2013-08-13 15:48:04 +10:00
Rohan Mitchell
f3447f2898 Remove shipping method field from product distributions 2013-08-13 10:14:51 +10:00
David Cook
c5f0848a56 More comments 2013-08-12 14:44:27 +10:00
David Cook
2ae4efbeba Add more order privileges for distributor enterprise users 2013-08-12 14:44:26 +10:00
David Cook
c247c2d3ea WIP: Allow distributor enterprise user to access their orders 2013-08-07 09:19:28 +10:00
Rohan Mitchell
ec3e00c128 Refactor LineItem and clients for new fields 2013-08-06 13:47:17 +10:00
alexs
17f9a4645a Added login to the landing page. 2013-08-06 12:34:22 +10:00
alexs
24d559cd3a Merge branch 'master' into landing_page 
Conflicts:
	db/schema.rb
	db/seeds.rb
 2013-08-05 17:08:39 +10:00
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +10:00
Andrew Spinks
e75021d7bd Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way. 2013-08-02 18:13:42 +10:00
Andrew Spinks
9d32a5775a Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products. 2013-08-02 16:08:10 +10:00
Andrew Spinks
0bb4f676e1 Add permissions to enterprise users so they can manage their own products. 2013-08-02 11:51:25 +10:00
Rohan Mitchell
2f83cecc23 Merge branch 'add-capture-order-shortcut-deface' 
Conflicts:
	spec/support/request/authentication_workflow.rb
 2013-07-23 16:55:33 +10:00
Rohan Mitchell
d83e8cb3ba Remove commented out code, clean up comments and style 2013-07-23 16:51:22 +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