raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,276 Commits 21 Branches 450 Tags
ea17e475a605fdffd58ee80074d2d8cbaf85d8b2
Commit Graph

138 Commits

Author SHA1 Message Date
Rohan Mitchell
ea17e475a6 When viewing enterprise fees, only show those for the enterprise I select 2013-10-18 14:44:01 +11:00
Rohan Mitchell
a6877c6981 Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page. 2013-10-16 10:37:09 +11:00
Rohan Mitchell
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rohan Mitchell
44aac294e0 Merge branch 'issue14' 2013-09-23 15:39:13 +10:00
Rohan Mitchell
803594b4d7 Confirm change hub when it would empty cart 2013-09-23 10:07:25 +10:00
Rob H
08eb865469 Increase pagination size for products in BPE, resolves #14 2013-09-20 13:25:07 +05:45
Rohan Mitchell
d100d12ebe When a variant is removed from supply to an order cycle, remove it from distribution also 2013-09-20 11:11:59 +10:00
Rohan Mitchell
c9e543b25a Update delivery page of checkout, change shipping to delivery 2013-09-19 13:40:49 +10:00
Rohan Mitchell
c1a28023ce Move js file to avoid clobbering spree file 2013-09-16 14:11:00 +10:00
Rohan Mitchell
583164efb5 Fix variant price calculation 2013-09-10 11:52:13 +10:00
Rohan Mitchell
3ac4bd3b5f Hide adjustments in cart by default, show by click 2013-09-09 14:37:36 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
Rohan Mitchell
aab7176f2c Enterprise manager can bulk edit products 2013-08-22 11:21:49 +10:00
alexs
f5b326ee1a Fixed the bug where search gets cleared after user clicks inside the suburb input field. 2013-08-21 12:04:35 +10:00
Rohan Mitchell
4d04a24342 Translate exchange fees for processing by rails 2013-08-16 10:22:29 +10:00
Rohan Mitchell
e6fdcf581a OrderCycle can fetch the direction of an exchange (incoming/outgoing) 2013-08-16 10:22:29 +10:00
Andrew Spinks
20bb5c9de7 Make sure angular injections work after magnification. 2013-08-14 10:49:55 +10:00
Andrew Spinks
59fce8a964 Show line items for each order in multi-cart. 2013-08-14 10:49:55 +10:00
Andrew Spinks
0a39fb87a5 Fix multi-cart association and add some temporary multi-cart support into the current front end. 2013-08-14 10:49:54 +10:00
alexs
77d31b3004 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-14 10:48:47 +10:00
alexs
9501d2c8a1 Core of sign up functionality. 2013-08-14 10:38:49 +10:00
Rohan Mitchell
8ff749d0eb Find enterprises participating in an order cycle 2013-08-14 09:48:45 +10:00
Rohan Mitchell
0293942816 Add order cycle service method to add and remove exchange fees 2013-08-14 09:48:45 +10:00
Rohan Mitchell
13df3b098b Make error messages more descriptive 2013-08-14 09:48:45 +10:00
Rohan Mitchell
47f6a5fbbf Add controller methods to add and remove exchange fees 2013-08-14 09:48:45 +10:00
Rohan Mitchell
4120bc3dca Output exchange fees as JSON 2013-08-14 09:48:45 +10:00
alexs
3cf58c8415 Re-enabled Foundation JavaScript. 2013-08-13 15:19:37 +10:00
alexs
f2f507c5c7 Suburb auto-complete functionality for the new landing page. 2013-08-12 17:34:56 +10:00
alexs
71262d3cb3 Base for enterprise search via suburb selector.. 2013-08-11 16:57:00 +10:00
alexs
4ff8e825e9 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-09 13:21:24 +10:00
alexs
d3ab78e2c6 Assets for gmap4rails gem. 2013-08-09 13:20:49 +10:00
alexs
b5cc2ab4cf Added postcode search that redirect to page with map view. 2013-08-09 13:20:22 +10:00
Andrew Spinks
bc57364c7e Add simple angular cart to the main page. 2013-08-08 18:31:56 +10:00
alexs
8efc95e095 Separated Foundation powered site from the Spree powered content (for now). 2013-08-07 19:25:48 +10:00
alexs
17f9a4645a Added login to the landing page. 2013-08-06 12:34:22 +10:00
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +10:00
Rohan Mitchell
4a0e35deef Clear coordinator fees when coordinator changes 2013-07-30 13:46:30 +10:00
Rohan Mitchell
d64bcf0e94 Remove coordinator fees 2013-07-30 11:55:21 +10:00
Rohan Mitchell
24b957dc57 Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees. 2013-07-30 11:34:10 +10:00
Rohan Mitchell
dc7f8986a0 Click to add coordinator fee 2013-07-30 11:34:10 +10:00
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
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
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
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