raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-02 02:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 17 Branches 455 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

3145 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
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
a19a43da79 Add blank enterprise fees in js rather than in controller 2013-07-30 11:34:10 +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
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
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
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
Rob H
275b64c7d3 Fix broken delete action for variants 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
f055ece503 WIP (Spree Update): update variables.css.scss 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
f169dcda88 BPUR: Fix final unstable tests, js concurrency etc. 2013-07-23 10:40:42 +10:00
Rob H
126f11683d BPUR: Add datetimepicker to Available On 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
f750251cb8 BPUR: Visually differentiate products and variants in table 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
f9832d1375 BPUR: Remove unnecessary setValidity method in ngDecimal 2013-07-23 10:37:50 +10:00
Rob H
9beb560b72 BPUR: cancel any pre-existing timeouts on message models when new message set 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
ef435dc6da Typo 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
febb9a44a2 Remove commented (unrequired) lines on code 2013-07-23 10:37:50 +10:00
Rob H
c503c1b10c BPUR: refactor of filterSubmitProducts 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
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
1e64dab9f7 Bulk product update rewrite: basic integration test passing 2013-07-23 10:37:50 +10:00
Rob H
6b097eb9f8 WIP: minor fixes to bulk product update js 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
74291ab1f7 remove leftover debugger; call in code 2013-07-23 10:37:50 +10:00
Rob H
554c67f1a3 WIP: specs and basic js infrastructure for bulk product update 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
David Cook
15c454a0f1 move style to stylesheet 2013-07-19 17:04:04 +10:00
Rohan Mitchell
3de52b10b2 Fix JS error: Unknown provider: a from order_cycle 2013-06-25 12:31:28 +10:00
Rohan Mitchell
ce2c6c5661 Fix uninjected directive for enterprise fees 2013-06-25 12:17:15 +10:00
Rohan Mitchell
b7a778b0de Define order cycles JS methods in a minification-friendly manner 2013-06-25 10:58:12 +10:00
Rohan Mitchell
f78db2493f Define enterprise fees controller in a minification-safe manner 2013-06-25 10:35:45 +10:00
David Cook
a63b8908bb Moved inline style to stylesheet 2013-06-21 16:12:56 +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