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
97401ca370 Remove exchanges in both create and edit 2012-12-02 14:32:52 +11:00
Rohan Mitchell
8e4b729351 Load correct order cycle, prep for saving order cycle 2012-12-02 13:53:35 +11:00
Rohan Mitchell
34120730cd Load enterprises, all data displays 2012-11-30 15:46:53 +11:00
Rohan Mitchell
31735d3d10 Add edit order cycle controller, load basic data 2012-11-30 15:44:07 +11:00
Rohan Mitchell
6e4638b12d Upgrade angular to 1.0.3, move form to partial, use angular resource 2012-11-30 15:17:21 +11:00
Rohan Mitchell
243e1ccd93 Add supplier to order cycle 2012-11-29 11:16:59 +11:00
Rohan Mitchell
ac66bf4871 Add client-side validation to order cycle form 2012-11-29 10:40:19 +11:00
Rohan Mitchell
64d4e405dd Add datetimepicker for order cycle opening and closing times 2012-11-29 10:25:33 +11:00
Rohan Mitchell
aacc36ea44 Create order cycle basic fields 2012-11-29 10:02:23 +11:00
Rohan Mitchell
6106f1b469 Calculator type change works, enterprise fee tests pass 2012-11-26 09:45:06 +11:00
Rohan Mitchell
5e0a5654ff Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled. 2012-11-23 17:02:58 +11:00
Rob H
ee482d520c Replace order information display for Confirm and Complete stages of checkout 2012-11-23 10:51:14 +11:00
Rohan Mitchell
fd0cc93e68 Add delete link 2012-11-22 16:19:10 +11:00
Rohan Mitchell
b7bd21e498 Full-text search of form 2012-11-22 12:15:39 +11:00
Rohan Mitchell
dd155532f8 Add angular include, basic controller for listing enterprise fees, display fee ids using angular 2012-11-21 14:59:02 +11:00
Rohan Mitchell
77b78f5bbb Edit enterprise fee 2012-11-21 11:50:37 +11:00
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises 
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
 2012-11-01 11:02:02 +11:00
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +11:00
Rohan Mitchell
c5941d6cb5 Update distributor details when distributor is changed 2012-10-27 18:50:09 +11:00
Rohan Mitchell
773adca838 Display distributor details on product page when distributor is selected 2012-10-27 12:49:57 +11:00
Rohan Mitchell
13317347bb Display an explanation message on product page when no distributor is selected 2012-10-27 12:19:44 +11:00
Rohan Mitchell
a686a820d9 Add distributor show page, redirect here after selecting distributor 2012-10-11 10:50:36 +11:00
Rohan Mitchell
0b830a7845 Suppliers and distributors long description editable with WYSIWYG editor from CMS and displayed as HTML 2012-10-11 10:50:36 +11:00
Rohan Mitchell
bc408d8b6e Add jquery and jquery_ujs includes to admin/all.js, as these have been removed from spree/admin/spree_core.js 2012-09-22 09:20:27 +10:00
Rohan Mitchell
62d6067c1a Do not truncate cents for product price update on add to cart JS 2012-09-21 12:44:38 +10:00
Rohan Mitchell
334f84637d Fix empty cart button alignment at checkout 2012-09-14 13:32:49 +10:00
Rohan Mitchell
a013854d2d Change logo to Eaterprises, update link colour to match 2012-09-14 11:25:36 +10:00
Rohan Mitchell
9d33ef460c Max quantity field doesn't affect JS price calcs on products without variants 2012-08-04 16:51:43 +10:00
Rohan Mitchell
28e75d6467 Fix add to cart JS for compatibility with group buy 2012-08-03 18:32:19 +10:00
Rohan Mitchell
aa027f6e29 Display subtotal for delivery fees 2012-07-02 16:13:55 +10:00
Rohan Mitchell
cb56e9f658 Display delivery fee breakdown along with cart 2012-07-01 19:09:34 +10:00
Rohan Mitchell
258559f9d0 Update the price on the product details page in real time when the variant or the quantity are changed 2012-07-01 10:07:08 +10:00
Rohan Mitchell
cb6ac2064d Rearrange buttons on cart checkout form 2012-06-26 10:50:50 +10:00
Rohan Mitchell
34b694666c Grey out inactive distributors 2012-06-26 08:24:32 +10:00
Rohan Mitchell
0662e8f676 Show links to distributor home page, particularly when viewing product not available at current distributor 2012-06-26 08:12:35 +10:00
Rohan Mitchell
a7df5a2f1e Include jquery, add basic styling for add to cart form, split supplier and distributors in product details sidebar 2012-06-25 08:57:53 +10:00
Rohan Mitchell
9be5dc41b9 Split products by local/remote distributor: style 2012-06-24 09:41:33 +10:00
Rohan Mitchell
32050bbba4 Split products by local/remote distributor: views and basic style 2012-06-24 07:37:25 +10:00
Rohan Mitchell
4911a06c9d Display current distributor in main nav bar 2012-06-22 11:46:40 +10:00
Rohan Mitchell
f9d290f00d Show product supplier and distributors on product details page 2012-06-20 16:28:09 +10:00
Rohan Mitchell
9adfe58086 Display distributor filter as links instead of checkboxes, style in the same way as taxonomy selectors 2012-06-20 15:05:54 +10:00
Rohan Mitchell
b38692d8c0 Style product distributor check boxes 2012-06-19 10:51:17 +10:00
Andrew Spinks
04e4523f6b upgrade to spree 1.1 2012-05-20 16:28:14 +10:00
Andrew Spinks
cd1938a74e spree install. 2012-03-27 11:06:49 +11:00
Andrew Spinks
b6ca20beee new rails 3.1.4 app 2012-03-27 10:10:26 +11:00