raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 19 Branches 454 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

320 Commits

Author SHA1 Message Date
Rob H
8831dfc660 Fix #42 2013-09-20 14:28:46 +05:45
David Cook
ad4301df90 Add supplier selection to Orders & Fulfillment Report 2013-09-18 12:34:43 +10:00
David Cook
4c2d6b38ea Ensure 'No Order Cycle' remains selected after clicking 'Search' 2013-09-18 09:57:03 +10:00
David Cook
e57ad81934 Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports 2013-09-18 09:27:34 +10:00
David Cook
fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' 2013-09-18 09:25:51 +10:00
David Cook
7e96ba909e Show a list of Order Cycles report types in the description column 2013-09-13 09:59:35 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
Rohan Mitchell
2e1de9a6d3 Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error 2013-08-23 14:00:31 +10:00
alexs
8b4c0682fb Replaced eaterprises logo with the distributor name header. 2013-08-21 16:05:06 +10:00
Rohan Mitchell
0458f7a6bb Summarise distribution fees in checkout after cart page 2013-08-19 17:02:02 +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
David Cook
6bad6e2675 Add order cycle selection to Order Cycles Report 2013-08-13 15:48:04 +10:00
Rohan Mitchell
60956e9789 Display sum of distribution fees at cart by adjustment, not shipping methods 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
David Cook
5baf9938e1 Ensure capture shortcut button shows for the correct payment 2013-08-12 14:44:26 +10:00
Rohan Mitchell
af6b16ecc4 Admin can assign enterprise fees to product distributions 2013-08-12 11:05:00 +10:00
Andrew Spinks
bc57364c7e Add simple angular cart to the main page. 2013-08-08 18:31:56 +10:00
Rohan Mitchell
ec3e00c128 Refactor LineItem and clients for new fields 2013-08-06 13:47:17 +10:00
David Cook
fd8fc480dc Always show supplier form for enterprise user again (list is now filtered according to enterprise_roles) 2013-08-06 10:56:31 +10:00
Andrew Spinks
9d32a5775a Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products. 2013-08-02 16:08:10 +10:00
Andrew Spinks
0bb4f676e1 Add permissions to enterprise users so they can manage their own products. 2013-08-02 11:51:25 +10:00
Andrew Spinks
65617e0e77 Add enterprise roles for a user and wire up interface. 2013-08-01 10:32:50 +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
36a124c10e Fix merge issues: DCV name change and application controller var name issues. 2013-07-29 11:49:43 +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
5adab948c9 Re-instate old order checkout behaviour. 2013-07-26 14:30:54 +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
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
1dd92d0133 Move deface to a partial 2013-07-23 16:50:42 +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
b73c584c3b Update order confirmation email in line with changes in spree 2013-07-23 14:00:29 +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
0322f21e5c Rearrange bpe action buttons 2013-07-23 10:43:08 +10:00
Rob H
4c435e118a BPE action buttons in separate columns 2013-07-23 10:43:08 +10:00
Rob H
3c973178fd WIP: remove unneeded representative-based data request infrastructure 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
97c03b50cc Create new api routes/views/controllers for bulk product edit 2013-07-23 10:43:08 +10:00
Rob H
8f6ec9bd9b WIP (Spree Update): Fix frontend order payment summary 2013-07-23 10:43:08 +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
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
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