raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-16 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,111 Commits 15 Branches 457 Tags
fdf80cac5ed95da3a114eeecf770bef69f007d03
Commit Graph

77 Commits

Author SHA1 Message Date
alexs
fdf80cac5e Adjusted specs to accommodate for new (temporary) landing page. 2013-08-20 16:14:29 +10:00
alexs
7061d0c53e Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-20 11:06:06 +10:00
alexs
18d60a1643 Fixed specs broken by new temp landing page (take 1). 2013-08-20 11:05:06 +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
alexs
8f67f385b7 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-19 17:37:49 +10:00
alexs
f160e051e5 Added new temporary landing page. 2013-08-19 17:37:22 +10:00
Rohan Mitchell
64c9d4254a Fix spec failures - enterprise fee calculator type change, distributor info rich text tests, summarised distribution fee at checkout 2013-08-19 17:28:00 +10:00
Rohan Mitchell
0458f7a6bb Summarise distribution fees in checkout after cart page 2013-08-19 17:02:02 +10:00
David Cook
5a3ad8e68b Remove test for payment method with no distributor 2013-08-19 16:19:18 +10:00
Rohan Mitchell
562365311e Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks 2013-08-19 14:38:51 +10:00
Rohan Mitchell
a9b70e67df Change to using flat rate per item calculators - per-order is confusing when used against line items 2013-08-19 14:38:51 +10:00
Rohan Mitchell
c1f9d9789d Extract table test to private method 2013-08-19 12:29:26 +10:00
Rohan Mitchell
ba4d3d5d7d Removing a product from cart removes its fees 2013-08-19 12:19:03 +10:00
Rohan Mitchell
6c24c0ef68 Make specs more resilient and less context-sensitive 2013-08-19 11:10:00 +10:00
Rohan Mitchell
24cd5209d6 Do not error when attempting to mix product and order cycle distribution 2013-08-19 10:41:14 +10:00
Rohan Mitchell
80d6e3b87f Do not charge for distributor fees for a distributor you're not checking out with 2013-08-19 10:41:14 +10:00
Rohan Mitchell
5ffd56aad7 Re-write spec with new fee display at checkout 2013-08-19 10:41:14 +10:00
alexs
a8a0c0513e Fixed id duplication for login and sign up forms. 2013-08-14 11:12:36 +10:00
alexs
e90ccef337 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-13 11:40:54 +10:00
David Cook
725766d82e Feature tests for PaymentMethod in admin and checkout 2013-08-13 10:57:36 +10:00
Rohan Mitchell
b71f7eec3d Fix spec for charges by adjustment not shipping method 2013-08-13 09:11:26 +10:00
Rohan Mitchell
b5d324ec8c Drop itemwise shipping method use in tests 2013-08-13 09:11:25 +10:00
Rohan Mitchell
b7ea03f7fc Remove distributor fees table at checkout, pending design of new breakdown 2013-08-13 09:11:25 +10:00
alexs
f2f507c5c7 Suburb auto-complete functionality for the new landing page. 2013-08-12 17:34:56 +10:00
alexs
653525e9b0 Updated the spec to reflect the field name change. 2013-08-11 17:19:17 +10:00
alexs
3b4c02865f Tests for logging in from the new landing page. 2013-08-09 13:16:58 +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
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
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
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
Andrew Spinks
4cdd858f48 Disable order cycles in the front end by default. 2013-07-22 17:16:55 +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
David Cook
46043f2237 click new 'Save and Continue' button 2013-07-16 17:02:06 +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
Rohan Mitchell
6d22f56c86 Distribution selection form is not shown when there are products in the cart. 
This form doesn't filter options based on which can supply the products in the cart,
so don't show it in those circumstances.
 2013-06-17 11:29:36 +10:00
Rohan Mitchell
95de78f24e Tidy-ups 2013-06-17 10:03:00 +10:00
David Cook
7933dea611 WIP: add more tests 2013-06-14 17:38:51 +10:00
Rohan Mitchell
98f3197c08 WIP Move orders#populate logic to OrderPopulator class 2013-06-05 11:47:47 +10:00
Rohan Mitchell
661ce4e597 Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products 2013-06-04 10:26:13 +10:00
Rohan Mitchell
cb703c2a66 Do not give order cycle choice when there is only one option 2013-05-28 16:35:39 +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