alexs
|
9501d2c8a1
|
Core of sign up functionality.
|
2013-08-14 10:38:49 +10:00 |
|
alexs
|
6b760f3068
|
Added feedback info for search criteria.
|
2013-08-14 10:37:25 +10:00 |
|
Rohan Mitchell
|
f67a6fa3fb
|
Extract coordinator fees to partial
|
2013-08-14 09:48:45 +10:00 |
|
Rohan Mitchell
|
4120bc3dca
|
Output exchange fees as JSON
|
2013-08-14 09:48:45 +10:00 |
|
David Cook
|
6bad6e2675
|
Add order cycle selection to Order Cycles Report
|
2013-08-13 15:48:04 +10:00 |
|
alexs
|
0a5f8afcb6
|
Added modal placeholders for new distributors and farmers sections.
|
2013-08-13 15:20:21 +10:00 |
|
alexs
|
886ac4a892
|
Added an escape patch with a small logo.
|
2013-08-13 12:07:32 +10:00 |
|
alexs
|
e90ccef337
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-13 11:40:54 +10:00 |
|
alexs
|
779befe3cf
|
Links to the enterpise pages.
|
2013-08-13 11:40:35 +10:00 |
|
alexs
|
6a17f80c93
|
Added logo to the landing page.
|
2013-08-13 11:40:14 +10:00 |
|
alexs
|
8b87c33c97
|
Added layout based wrapping for the main component (used in off canvas layout).
|
2013-08-13 11:37:36 +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 |
|
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 |
|
alexs
|
03b36bb14b
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-12 17:35:36 +10:00 |
|
alexs
|
f2f507c5c7
|
Suburb auto-complete functionality for the new landing page.
|
2013-08-12 17:34:56 +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 |
|
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
|
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 |
|
Andrew Spinks
|
ac37dff946
|
Add controller for cart and beginnings of an API.
|
2013-08-08 18:31:56 +10:00 |
|
alexs
|
f45ed42bdb
|
Skeleton for the search results.
|
2013-08-08 11:42:45 +10:00 |
|
alexs
|
7f74b85040
|
Markup tweak.
|
2013-08-07 19:26:21 +10:00 |
|
alexs
|
8efc95e095
|
Separated Foundation powered site from the Spree powered content (for now).
|
2013-08-07 19:25:48 +10:00 |
|
Rohan Mitchell
|
ec3e00c128
|
Refactor LineItem and clients for new fields
|
2013-08-06 13:47:17 +10:00 |
|
alexs
|
57e185af78
|
Merge branch 'landing_page'
|
2013-08-06 12:35:06 +10:00 |
|
alexs
|
17f9a4645a
|
Added login to the landing page.
|
2013-08-06 12:34:22 +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 |
|
alexs
|
24d559cd3a
|
Merge branch 'master' into landing_page
Conflicts:
db/schema.rb
db/seeds.rb
|
2013-08-05 17:08:39 +10:00 |
|
alexs
|
38b0a581e0
|
New landing page - initial layout and functionality
|
2013-08-05 17:04:56 +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 |
|
Rohan Mitchell
|
4a893fd548
|
Style
|
2013-07-30 13:49:38 +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
|
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
|
43474d6408
|
Display coordinator fees on admin edit order cycle
|
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
|
f613da30d0
|
Output order cycle coordinator fees in JSON
|
2013-07-30 11:34:10 +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 |
|