raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

12632 Commits

Author SHA1 Message Date
Rohan Mitchell
ae0f82b479 Display only coordinator fees belonging to the selected coordinator 2013-07-30 11:34:10 +10:00
Rohan Mitchell
43474d6408 Display coordinator fees on admin edit order cycle 2013-07-30 11:34:10 +10:00
Rohan Mitchell
13a1809d6c Load enterprise fees in controllers 2013-07-30 11:34:10 +10:00
Rohan Mitchell
93e7ac53ad Add EnterpriseFee service for order cycles admin 2013-07-30 11:34:10 +10:00
Rohan Mitchell
122b9b5617 Make order cycle coordinator fees many-to-many 2013-07-30 11:34:10 +10:00
Rohan Mitchell
7640eb497a Merge branch 'supplied-active-products-on-hand' 
Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb
 2013-07-29 11:05:42 +10:00
Rohan Mitchell
863236b827 Remove speculative test 2013-07-29 09:47:28 +10:00
David Cook
6265dfc80d remove block commented code 2013-07-29 09:29:23 +10:00
Andrew Spinks
6c18c5c65f Fix bulk product edit so that it works with products with a blank available_on field. 2013-07-25 13:51:37 +10:00
alexs
fadb1e4710 Merge branch 'master' of github.com:eaterprises/openfoodweb 
Conflicts:
	Gemfile
 2013-07-23 18:02:28 +10:00
alexs
37a88a1be6 Changed JavaScript driver from selenium to phantomjs. 2013-07-23 17:54:05 +10:00
Rohan Mitchell
1d5e970b47 Fix test regressions with multiple 'Save and Continue' buttons in checkout 2013-07-23 17:48:54 +10:00
Rohan Mitchell
dd97768947 Merge branch 'move-save-checkout-button' 
Conflicts:
	spec/features/consumer/checkout_spec.rb
 2013-07-23 17:03:00 +10:00
Rohan Mitchell
638d7b1c33 Stylistic changes, extract commented code to private method 2013-07-23 17:02:06 +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
8e560a59c9 Fix selection of itemwise shipping method that broke after the spree upgrade. 2013-07-23 15:46:07 +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
3315191b81 Fix intermittent admin-user-has-no-admin-role error in specs 2013-07-23 14:00:07 +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
275b64c7d3 Fix broken delete action for variants 2013-07-23 10:43:08 +10:00
Rob H
ba04d0ea74 Increase wait time for delete action in bpe specs 2013-07-23 10:43:08 +10:00
Rob H
3c973178fd WIP: remove unneeded representative-based data request infrastructure 2013-07-23 10:43:08 +10:00
Rob H
961d63ec4c WIP: Fix references in js tests for bpe 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
1f152d8121 WIP (Spree Update): Update authentication workflow input names 2013-07-23 10:43:08 +10:00
Rob H
19fbbb8374 BPUR: match product supplier on clone 2013-07-23 10:40:42 +10:00
Rob H
c826b18584 Wait for variants and products to be deleted 2013-07-23 10:40:42 +10:00
Rob H
f169dcda88 BPUR: Fix final unstable tests, js concurrency etc. 2013-07-23 10:40:42 +10:00
Rob H
2384c4a43e Remove naughty pry 2013-07-23 10:37:51 +10:00
Rob H
23a56ff4f1 BPUR: toggle visbility of columns 2013-07-23 10:37:51 +10:00
Rob H
5d30df5717 BPUR: add supplier name to product model to allow searching 2013-07-23 10:37:50 +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
b775145b16 BPUR: Add ability to filter by search and toggle variants 2013-07-23 10:37:50 +10:00
Rob H
57f2eff1b0 BPUR: Add warnings before deleting products/variants or directing to 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
89e684a328 BPUR: add js tests for deleting products and variants 2013-07-23 10:37:50 +10:00
Rob H
e8f24dc2dd BPUR: Add edit link for products and variants 2013-07-23 10:37:50 +10:00
Rob H
dcf6446450 BPUR: can delete variants 2013-07-23 10:37:50 +10:00
Rob H
5db0d839fa BPUR: can delete products 2013-07-23 10:37:50 +10:00
Rob H
8179f45272 BPUR: remove unused product update js and tests 2013-07-23 10:37:50 +10:00
Rob H
5258cba2a2 BPUR: change to live tracking of dirty properties (variant price update still failing) 2013-07-23 10:37:50 +10:00
Rob H
c80cba7fa5 BPUR: Don't use master variant to update attributes. Changes to product filtering. 2013-07-23 10:37:50 +10:00
Rob H
0ca0abd0b2 Can alter on_hand and price of individual variants 2013-07-23 10:37:50 +10:00
Rob H
f3d778af1a BPUR: can update master on_hand 2013-07-23 10:37:50 +10:00
Rob H
fbb3657bdc BPUR: can update master price. Test refactor and added angular ng-decimal directive 2013-07-23 10:37:50 +10:00
Rob H
44ad7584f0 BPUR: can update available_on 2013-07-23 10:37:50 +10:00
Rob H
f12c1c00d0 BPUR: rearrange acceptance tests 2013-07-23 10:37:50 +10:00