raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

69 Commits

Author SHA1 Message Date
Will Marshall
40d1563cd9 Adding our own user registrations controller, reworking sidebar a touch 2014-03-21 15:18:27 +11:00
Will Marshall
451e76b33f Tweaking our paypal express plumbing further 2014-03-07 15:27:52 +11:00
Rob H
fc65eefcfd Add basic order cycle API 2014-03-05 12:00:26 +11:00
Will Marshall
6a861de1e1 Reworking the checkout form some more 2014-02-18 14:50:50 +11:00
Will Marshall
5c498735b0 Moving from new to edit 2014-02-14 14:26:31 +11:00
Will Marshall
b11533a629 Renaming ShopController to Shop::ShopController 2014-02-07 16:52:18 +11:00
Will Marshall
26e4adf7a6 Adding the routes, controller, new action and some tests 2014-02-07 13:53:36 +11:00
Rob H
4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page 2014-01-16 13:20:07 +08:00
Will Marshall
4d03f65766 Reworking everything to use RABL 2014-01-07 15:06:47 +11:00
Will Marshall
4db8f755bf Getting an order cycle update function in place like a boss 2013-12-11 12:42:02 +11:00
Will Marshall
63dfa0b696 Getting the test framework set up for Angular, setting up a products fetch stub 2013-12-06 15:24:42 +11:00
Will Marshall
4543e08872 Renaming everything to Shop 2013-12-05 13:40:05 +11:00
Will Marshall
9efd7c2d69 Getting the darkswarm build flow up and running. Like a boss 2013-12-04 13:09:30 +11:00
Will Marshall
b3bf3a8378 Adding the plumbing for Customers reports, and one tiny refactor to products 2013-11-22 14:56:57 +11:00
Will Marshall
5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality 2013-11-20 10:34:18 +11:00
Rohan Mitchell
27b8c4508f Split product distribution editing into its own admin page 2013-11-13 15:22:17 +11:00
Rohan Mitchell
647e1d196c Position enterprise groups 2013-10-30 14:46:49 +11:00
Rohan Mitchell
a6fa73ec13 List enterprise groups 2013-10-30 10:42:32 +11:00
Rohan Mitchell
89f93cae77 Rename namespaced includes from open_food_web to open_food_network 2013-10-18 17:43:18 +11:00
Rohan Mitchell
e47fa0edfd Rename application from Openfoodweb to Openfoodnetwork 2013-10-18 17:32:22 +11:00
Rohan Mitchell
30bc45370b When order cycle expires mid-order, clear the order cycle and display a message 2013-09-30 16:56:11 +10:00
David Cook
fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' 2013-09-18 09:25:51 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
Rohan Mitchell
8a092697ee Enterprise manager can clone an order cycle 2013-08-22 17:11:53 +10:00
Rohan Mitchell
f1fa90d7c3 Clone order cycles 2013-08-22 16:53:11 +10:00
Rohan Mitchell
aab7176f2c Enterprise manager can bulk edit products 2013-08-22 11:21:49 +10:00
alexs
8f67f385b7 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-19 17:37:49 +10:00
alexs
f160e051e5 Added new temporary landing page. 2013-08-19 17:37:22 +10:00
Andrew Spinks
a8d4efd067 Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor. 2013-08-16 17:08:19 +10:00
Andrew Spinks
fdaa5364a1 Add controller action for adding products to multi cart via javascript API. 2013-08-15 15:36:35 +10:00
alexs
bdc8387346 Added base for shop front (enterprise). 2013-08-14 17:31:25 +10:00
alexs
215d6030d7 Added link to 'About OFN' page (as well as the base for that page). 2013-08-13 11:36:24 +10:00
alexs
71262d3cb3 Base for enterprise search via suburb selector.. 2013-08-11 16:57:00 +10:00
Andrew Spinks
bc57364c7e Add simple angular cart to the main page. 2013-08-08 18:31:56 +10:00
alexs
f45ed42bdb Skeleton for the search results. 2013-08-08 11:42:45 +10:00
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +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
4ae5085192 BPUR: Remove unnecessary collections of products on bulk edit page 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
731127d55c WIP: Bulk Product Update Rewrite: initial acceptance testing 2013-07-23 10:37:50 +10:00
Rohan Mitchell
83e3c6815d Merge branch 'checkout-changes' 
Conflicts:
	.rvmrc
	app/helpers/application_helper.rb
 2013-01-22 10:30:51 +11:00
Rob H
ef22168349 Move select_distributor and deselect_distributor actions from enterprises controller to orders controller 2012-11-28 10:54:11 +11:00
Rohan Mitchell
d5310452b6 Admin list order cycles 2012-11-27 10:13:12 +11:00
Rohan Mitchell
6247bd2541 Display admin table of enterprise fees with enterprise, fee type and name columns 2012-11-15 15:03:12 +11:00
Rohan Mitchell
ec74396659 Add enterprise fees to admin configurations menu 2012-11-15 13:58:51 +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
34588e6141 Remove old supplier and distributor routes, models, controllers, views, specs 2012-11-01 09:55:45 +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