raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-24 05:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,471 Commits 15 Branches 458 Tags
1f012dc52ca447c2e1ce69c19bcf0b1fbb3e0d1e
Commit Graph

46 Commits

Author SHA1 Message Date
Will Marshall
63349c7c9a Fixing some breaking bugs in the refactored mailer 2013-12-13 15:40:23 +11:00
Will Marshall
3c37696882 Adding specs and implementation: moving current distributor to new empty order after checkout 2013-11-06 12:35:22 +11:00
Rohan Mitchell
521ed565b4 Modify specs to create enterprise groups where needed 2013-10-30 13:56:10 +11:00
Rohan Mitchell
b8320a9bb6 Rename some directives and internal login details 2013-10-19 09:45:38 +11:00
Rohan Mitchell
05932a69cd Adjust checkout spec for shipping method HABTM distributors 2013-10-17 12:30:26 +11:00
Rohan Mitchell
c9e543b25a Update delivery page of checkout, change shipping to delivery 2013-09-19 13:40:49 +10:00
Rohan Mitchell
8a849b8e47 When selecting hub, auto-select order cycle if there is only one option available 2013-09-17 10:20:14 +10:00
Rohan Mitchell
c2f1f0986b Fix broken specs 2013-09-16 14:30:46 +10:00
Rohan Mitchell
f0381f7579 Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it 2013-09-16 14:11:00 +10:00
David Cook
4f9c7fb601 Remove distributor_id from payment method and update tests 2013-09-13 16:58:19 +10:00
Rohan Mitchell
b8376a040f Remove superfluous manual change triggers 2013-09-10 12:57:49 +10:00
Rohan Mitchell
64a3a309f5 Change 'pick-up date' to 'available on', provide absolute dates in options 2013-09-10 09:16:23 +10:00
alexs333
80bb55496b Temporarily disabling some tests. 2013-09-05 14:18:40 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
David Cook
b2878ddc40 Payment Method must belong to a Distributor 2013-08-21 15:14:01 +10:00
Rohan Mitchell
673c0dca36 Fix varying shipping amounts 2013-08-20 16:26:46 +10:00
Rohan Mitchell
fa459c0395 Summarise distribution charges: order confirm page and email 2013-08-20 16:26:46 +10:00
alexs
fdf80cac5e Adjusted specs to accommodate for new (temporary) landing page. 2013-08-20 16:14:29 +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
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
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
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
David Cook
46043f2237 click new 'Save and Continue' button 2013-07-16 17:02:06 +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
cc2e8694f0 Move LineItem update to source of change (order update). On empty cart, re-instanciate shipping method adjustment, fixing no shipping fees after empty cart bug. 2013-05-20 15:01:04 +10:00
Rohan Mitchell
d65dda4dc5 When order distributor changes, update line item shipping method 2013-05-18 19:21:01 +10:00
Rob H
a59b136864 Spree 1.3 upgrade: fix final failing tests 2013-02-20 15:16:43 +11:00
Rohan Mitchell
f2f3bbd3ed Merge branch 'order-cycles-exchange-products' 
Conflicts:
	Gemfile.lock
 2013-01-22 10:40:56 +11:00
Rohan Mitchell
488fc2d60e Upgrade capybara, spec/requests changed to spec/features 2013-01-15 10:10:24 +11:00