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

452 Commits

Author SHA1 Message Date
Rohan Mitchell
43474d6408 Display coordinator fees on admin edit order cycle 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
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
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
ba04d0ea74 Increase wait time for delete action in bpe specs 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
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
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
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
Rob H
344a084494 BPUR: can update supplier 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
246c6de495 WIP: remove reference to pry 2013-07-23 10:37:50 +10:00
Rob H
3c57680303 WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet 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
Andrew Spinks
4cdd858f48 Disable order cycles in the front end by default. 2013-07-22 17:16:55 +10:00
Rohan Mitchell
bc913fd355 Reset ActionMailer::Base.deliveries at start of test - http://stackoverflow.com/questions/5843284/clearing-out-activemailerbase-deliveries-after-rspec-test 2013-07-22 16:58:53 +10:00
David Cook
55277e2f0a test for inactive enterprises being counted in 'x more' on sidebar, disable limit test 2013-07-22 14:55:46 +10:00
Rohan Mitchell
d0421cbc4d Define feature toggles in FeatureToggle class rather than ENV['OFW_DEPLOYMENT'] 2013-07-22 14:34:29 +10:00
David Cook
46043f2237 click new 'Save and Continue' button 2013-07-16 17:02:06 +10:00
David Cook
c9432288c5 Clean up comments and use admin_orders_path for checking current page 2013-07-16 15:36:14 +10:00
David Cook
4fc0608a44 Finish capture order test 2013-07-12 16:41:20 +10:00
David Cook
5b58351b73 minor changes 2013-06-28 17:04:58 +10:00
Rohan Mitchell
ae43fd1333 Set distributor and order cycle in one step, avoiding validation errors. Update spec with new error messages. 2013-06-21 11:36:24 +10:00
David Cook
38c0552362 test 'more' count 2013-06-21 10:47:04 +10:00
Rohan Mitchell
a355a09a7c Disable distributor change in checkout until it takes order cycles into account 2013-06-17 11:45:23 +10:00