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,079 Commits 18 Branches 451 Tags
9563aad9fa01ac206b752fa28a0ff594dcd55e32
Commit Graph

133 Commits

Author SHA1 Message Date
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
Rohan Mitchell
fe61cddda6 Merge branch 'local-organics' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb
 2013-07-23 11:40:03 +10:00
Rob H
3c973178fd WIP: remove unneeded representative-based data request infrastructure 2013-07-23 10:43:08 +10:00
Rob H
9863a84a27 WIP: transfer bulk product update data requests to API 2013-07-23 10:43:08 +10:00
Rob H
97c03b50cc Create new api routes/views/controllers for bulk product edit 2013-07-23 10:43:08 +10:00
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
David Cook
1d2704ab4c Clean up comments 2013-07-16 15:55:28 +10:00
Rohan Mitchell
bfe8184b6a Reload order before setting variant attributes, fixes group buy 2013-06-17 10:02:49 +10:00
Rohan Mitchell
5e120b35aa Ensure orders controller decorator is loaded, fixes home controller test failures 2013-06-13 07:57:03 +10:00
David Cook
cf4582c08e Create respond_override to return user back to the referring page. (But it breaks payments#create respond_with..) 2013-06-12 11:24:49 +10:00
David Cook
ada95183a2 Start respond_override 2013-06-11 17:09:41 +10:00
Rohan Mitchell
1e94f88c5e Ensure order decorator is required, fix test fragility 2013-06-07 15:40:03 +10:00
Rohan Mitchell
98f3197c08 WIP Move orders#populate logic to OrderPopulator class 2013-06-05 11:47:47 +10:00
Rohan Mitchell
54fe63e7f3 User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor 2013-05-28 16:20:58 +10:00
Rohan Mitchell
1f9f5efb79 Add first product to cart with order cycle choice 2013-05-28 14:06:52 +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
02561ee252 With order cycle distribution, show error message when adding a product to cart with no distribution chosen 2013-05-28 11:54:46 +10:00
Rohan Mitchell
612e6aed2c Include order cycle distributions in distributor choice when adding product to cart 2013-05-27 13:12:29 +10:00
Rohan Mitchell
571dfd9e9f Regroup OrderController methods - actions / callbacks / utils 2013-05-20 14:56:39 +10:00
Rohan Mitchell
9f6d1a2f18 Order cycle reports are precise to time of day, not just date 2013-04-25 21:22:26 +10:00
Rohan Mitchell
0874f12797 Controllers provide current order cycle for product splitting 2013-04-05 14:30:11 +11:00
Rohan Mitchell
b3976bfbd0 Rename SplitProductsByDistributor to SplitProductsByDistribution 2013-04-05 11:08:19 +11:00
Rohan Mitchell
3aa44c3e9a Setting a remote distributor clears the order cycle, and vice versa 2013-03-08 15:17:23 +11:00
Rohan Mitchell
e1b2490259 Selecting an order cycle highlights valid distributor choices 2013-03-08 15:17:23 +11:00
Rohan Mitchell
74e2b70d3a Without JS, select distributor, highlighting local order cycle choices 2013-03-08 15:17:22 +11:00
Rob H
055c07a466 Add before_payment method to checkout controller (fixes issues with spree_paypal_express) 2013-02-20 14:04:10 +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