raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,471 Commits 15 Branches 453 Tags
1f012dc52ca447c2e1ce69c19bcf0b1fbb3e0d1e
Commit Graph

123 Commits

Author SHA1 Message Date
Rohan Mitchell
e443495a7e Remove reference to deleted stylesheet 2013-12-17 12:48:44 +11:00
Will Marshall
222ed20361 Defaulting to bulk products 2013-12-13 15:57:32 +11:00
Will Marshall
12743850b4 Removing a chili, refactoring order mailer 2013-12-13 15:40:22 +11:00
Rohan Mitchell
b101a37dad Rearrange columns 2013-11-21 14:42:28 +11:00
Rohan Mitchell
27b8c4508f Split product distribution editing into its own admin page 2013-11-13 15:22:17 +11:00
Will Marshall
b7104add1c Patching up the footer, partialising it 2013-11-08 16:37:02 +11:00
Will Marshall
b227be4a62 Adding an override to suppress the products display unless we actually have an order_cycle in play 2013-11-08 16:04:31 +11:00
Rohan Mitchell
71d6e51078 Put distributors column second, no need to explicitly set column widths, so remove this 2013-11-07 16:25:43 +11:00
Will Marshall
e33ff15151 Adding a small override to unbreak the New Product link 2013-11-06 16:28:51 +11:00
Will Marshall
0784642517 Removing the copyright from the footer 2013-11-06 13:40:05 +11:00
Rohan Mitchell
a6fa73ec13 List enterprise groups 2013-10-30 10:42:32 +11:00
Rohan Mitchell
358ca25f31 Admin can assign multiple distributors to a shipping method 2013-10-17 11:16:26 +11:00
Rohan Mitchell
de8d7bd66e Clean up payment methods form 2013-10-17 11:08:25 +11:00
Rohan Mitchell
000b13782e Remove taxon crumbs, since taxon view is not yet supported and produces errors 2013-09-23 11:06:02 +10:00
Rohan Mitchell
767478a0ee Add link to change hub 2013-09-23 09:17:17 +10:00
David Cook
2df2096d74 Sort payment and shipping methods by distributor name 2013-09-19 15:21:14 +10:00
Rohan Mitchell
c9e543b25a Update delivery page of checkout, change shipping to delivery 2013-09-19 13:40:49 +10:00
David Cook
e4127358c3 Rearrange admin payment methods table (BH#73) 2013-09-19 12:12:50 +10:00
David Cook
b544c3a4f9 Add distributor column to admin shipping methods and payment methods pages 2013-09-18 13:48:50 +10:00
David Cook
ee9d9a36d5 Make distributor payment method multi-select 2013-09-13 12:03:37 +10:00
David Cook
af71838610 Fix deface comment 2013-09-12 15:33:17 +10:00
David Cook
a99f23eb01 Add distributor name to admin orders table 2013-09-12 15:16:51 +10:00
Rohan Mitchell
d32a8b56d0 When order cycle is selected, only show variants that are in it 2013-09-09 10:40:15 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
Rohan Mitchell
911d8b8bbc Shipping method has a distributor, admin can create and edit 2013-08-30 11:43:45 +10:00
Rohan Mitchell
4f8014306e Admin can't change distributor or order cycle once order has been finalized 2013-08-23 14:00:31 +10:00
Rohan Mitchell
2cab83cb29 Admin create order can set distributor and order cycle 2013-08-23 14:00:31 +10:00
alexs
a623e2dee6 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-21 16:05:29 +10:00
alexs
8b4c0682fb Replaced eaterprises logo with the distributor name header. 2013-08-21 16:05:06 +10:00
David Cook
b2878ddc40 Payment Method must belong to a Distributor 2013-08-21 15:14:01 +10:00
alexs
845f7bb8d7 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-21 10:50:08 +10:00
alexs
f6983078a2 Removed search box and distributor/supplier sidebar from the hub page. 2013-08-21 10:49:43 +10:00
Rohan Mitchell
fa459c0395 Summarise distribution charges: order confirm page and email 2013-08-20 16:26:46 +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
David Cook
08babeed65 Payment Method must have one Distributor 2013-08-19 13:57:40 +10:00
alexs
8ee98e3d96 Added bugherd to admin and sree frontend and re-arranged the bugherd code. 2013-08-16 15:50:45 +10:00
David Cook
98d520f0e3 Filter PaymentMethods by distributor 2013-08-13 10:55:52 +10:00
David Cook
1621e4c4a4 Add distributor to PaymentMethod 2013-08-13 10:55:51 +10:00
Rohan Mitchell
b7ea03f7fc Remove distributor fees table at checkout, pending design of new breakdown 2013-08-13 09:11:25 +10:00
Andrew Spinks
bc57364c7e Add simple angular cart to the main page. 2013-08-08 18:31:56 +10:00
Andrew Spinks
65617e0e77 Add enterprise roles for a user and wire up interface. 2013-08-01 10:32:50 +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
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
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
8f6ec9bd9b WIP (Spree Update): Fix frontend order payment summary 2013-07-23 10:43:08 +10:00
Rob H
78263f6835 WIP (Spree Update): change formats of tab overrides 2013-07-23 10:43:08 +10:00
Rob H
4ae5085192 BPUR: Remove unnecessary collections of products on bulk edit page 2013-07-23 10:37:50 +10:00