Rohan Mitchell
|
4120bc3dca
|
Output exchange fees as JSON
|
2013-08-14 09:48:45 +10:00 |
|
David Cook
|
293661377e
|
Remove text to the left of TOTAL
|
2013-08-13 17:01:19 +10:00 |
|
David Cook
|
015dbc5c01
|
Only show active or complete order cycles, ordered by cycle close date
|
2013-08-13 16:47:23 +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
|
3cf58c8415
|
Re-enabled Foundation JavaScript.
|
2013-08-13 15:19:37 +10:00 |
|
alexs
|
e1a876a4b5
|
Added default minimum height for text areas.
|
2013-08-13 15:19:03 +10:00 |
|
alexs
|
886ac4a892
|
Added an escape patch with a small logo.
|
2013-08-13 12:07:32 +10:00 |
|
alexs
|
7206bf6393
|
Re-adjusted vertical positioning of the landing page.
|
2013-08-13 11:49:04 +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
|
72a422f7e7
|
Added the link that navigates to the current enterprise shopfront (for now).
|
2013-08-13 11:38:19 +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 |
|
David Cook
|
6c4ace8d14
|
Ensure that all PaymentMethod-derived classes also allow distributor_id
|
2013-08-13 10:57:36 +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
|
f3447f2898
|
Remove shipping method field from product distributions
|
2013-08-13 10:14:51 +10:00 |
|
Rohan Mitchell
|
5f4313b588
|
Remove itemwise shipping calculator
|
2013-08-13 10:14:39 +10:00 |
|
Rohan Mitchell
|
7677f79f17
|
Remove the now-unused Product#shipping_method_for_distributor
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
7e30b664f2
|
Add enterprise fees relation to enterprise
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
9aad44f093
|
Strip shipping method mechanics out of LineItem and Order
|
2013-08-13 09:11:25 +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 |
|
Rohan Mitchell
|
2379cc0c3c
|
Do not display double error when using js
|
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
|
c5f0848a56
|
More comments
|
2013-08-12 14:44:27 +10:00 |
|
David Cook
|
5baf9938e1
|
Ensure capture shortcut button shows for the correct payment
|
2013-08-12 14:44:26 +10:00 |
|
David Cook
|
2ae4efbeba
|
Add more order privileges for distributor enterprise users
|
2013-08-12 14:44:26 +10:00 |
|
David Cook
|
c645ad25a7
|
Add more order privileges for distributor enterprise users
|
2013-08-12 14:44:26 +10:00 |
|
Rohan Mitchell
|
d7cce918f5
|
Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees
|
2013-08-12 14:22:11 +10:00 |
|
Rohan Mitchell
|
af6b16ecc4
|
Admin can assign enterprise fees to product distributions
|
2013-08-12 11:05:00 +10:00 |
|
Rohan Mitchell
|
14268b7be0
|
Create adjustment metadata when creating adjustment
|
2013-08-12 10:00:35 +10:00 |
|
Rohan Mitchell
|
149d48ff5a
|
Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation
|
2013-08-12 10:00:35 +10:00 |
|
alexs
|
efc5943f57
|
Increase compression for landing page images.
|
2013-08-11 17:38:25 +10:00 |
|
alexs
|
e9110ac752
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
Conflicts:
Gemfile.lock
|
2013-08-11 16:59:02 +10:00 |
|
alexs
|
71262d3cb3
|
Base for enterprise search via suburb selector..
|
2013-08-11 16:57:00 +10:00 |
|
Rohan Mitchell
|
b065d7db36
|
When updating product distribution charge, skip line items that don't have a product distribution
|
2013-08-09 15:30:35 +10:00 |
|
Rohan Mitchell
|
b4a7ccf1b4
|
Adjustments on LineItems don't modify the order total. Make adjustments on Order instead.
|
2013-08-09 15:28:48 +10:00 |
|
Rohan Mitchell
|
513993324d
|
Clean up old adjustments when changing distributor
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
fd989e3a77
|
Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items.
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
239dd29511
|
Weight calculator will calculate against a single line item as well as an order
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
a338c974f8
|
Create line item adjustments for product distributions
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
8c9a3c8a91
|
Add Product#product_distribution_for
|
2013-08-09 15:26:57 +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 |
|