raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Spinks
5810503068 Move test data seeding into separate rake task. Add new role to seeds file. 2013-08-01 10:31:58 +10:00
Rohan Mitchell
c64944d11a Fix test 2013-07-30 17:32:53 +10:00
Rohan Mitchell
4a893fd548 Style 2013-07-30 13:49:38 +10:00
Rohan Mitchell
4a0e35deef Clear coordinator fees when coordinator changes 2013-07-30 13:46:30 +10:00
Rohan Mitchell
d64bcf0e94 Remove coordinator fees 2013-07-30 11:55:21 +10:00
Rohan Mitchell
24b957dc57 Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees. 2013-07-30 11:34:10 +10:00
Rohan Mitchell
dc7f8986a0 Click to add coordinator fee 2013-07-30 11:34:10 +10:00
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
f613da30d0 Output order cycle coordinator fees in JSON 2013-07-30 11:34:10 +10:00
Rohan Mitchell
a19a43da79 Add blank enterprise fees in js rather than in controller 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
alexs
bb9368a1b2 Listed dependecy on PhantomJS. 2013-07-29 18:20:34 +10:00
Andrew Spinks
d107786614 Make sure the payment details are shown prominently in the checkout screen. 2013-07-29 16:29:27 +10:00
Rohan Mitchell
dcc23078ff Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-07-29 11:52:06 +10:00
Rohan Mitchell
36a124c10e Fix merge issues: DCV name change and application controller var name issues. 2013-07-29 11:49:43 +10:00
alexs
285353fb9a Updated copyright info. 2013-07-29 11:13:48 +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
5adab948c9 Re-instate old order checkout behaviour. 2013-07-26 14:30:54 +10:00
Andrew Spinks
1797933501 Remove xvfb from travis deploy. Should no longer be required. 2013-07-25 14:13:06 +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
Andrew Spinks
39536b2a13 And another dependency getting lost. 2013-07-24 17:52:15 +10:00
Andrew Spinks
54a79bc6ab Fix other dependency injection problems in bpe angular code after magnification. 2013-07-24 17:47:48 +10:00
Andrew Spinks
24414036b9 Attempt to fix bulk product angular dependency injection which breaks on minification. 2013-07-23 18:16:39 +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
Rohan Mitchell
1dd92d0133 Move deface to a partial 2013-07-23 16:50:42 +10:00
Andrew Spinks
1add182757 Feature toggle order cycles. 2013-07-23 15:57:43 +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
f580b43619 Merge remote-tracking branch 'origin/master' 2013-07-23 14:03:08 +10:00
Rohan Mitchell
b73c584c3b Update order confirmation email in line with changes in spree 2013-07-23 14:00:29 +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
7532ebee5a Require feature toggle within engines needs require_relative 2013-07-23 13:59:39 +10:00
alexs
418393afbd Updated requirements documentation. 2013-07-23 13:53:00 +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
Rohan Mitchell
86616c4a6c Add sass gem explicitly 2013-07-23 10:47:35 +10:00
Rob H
de78d09790 New branch for spree_last_address to fix compatibility issue with spree_auth_devise 1.3 2013-07-23 10:43:08 +10:00
Rob H
0322f21e5c Rearrange bpe action buttons 2013-07-23 10:43:08 +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