Rohan Mitchell
|
b7f7766893
|
On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME
|
2013-05-18 19:54:27 +10:00 |
|
Rohan Mitchell
|
a1f189627b
|
Only show UserVoice feedback button on Eaterprises deployment
|
2013-04-29 16:34:19 +10:00 |
|
Rohan Mitchell
|
63768df3d7
|
Replace distributor info box on product details and checkout pages with rich text field
|
2013-04-26 13:30:21 +10:00 |
|
Rohan Mitchell
|
fb999732ee
|
Rename enterprises admin extended description to profile info, add distributor info field
|
2013-04-26 13:10:32 +10:00 |
|
Rohan Mitchell
|
f17907e06f
|
Style local organics product details distributor heading
|
2013-04-26 09:56:16 +10:00 |
|
Rohan Mitchell
|
9f6d1a2f18
|
Order cycle reports are precise to time of day, not just date
|
2013-04-25 21:22:26 +10:00 |
|
Rohan Mitchell
|
f2f3bbd3ed
|
Merge branch 'order-cycles-exchange-products'
Conflicts:
Gemfile.lock
|
2013-01-22 10:40:56 +11:00 |
|
Rohan Mitchell
|
83e3c6815d
|
Merge branch 'checkout-changes'
Conflicts:
.rvmrc
app/helpers/application_helper.rb
|
2013-01-22 10:30:51 +11:00 |
|
Rohan Mitchell
|
662aaf75bf
|
When editing an order cycle, distributor collection details are loaded
|
2013-01-22 09:34:07 +11:00 |
|
Rob H
|
f7890bd94d
|
Fixes following code review for checkout changes
|
2013-01-18 19:17:55 +11:00 |
|
Rob H
|
6a45e8be3b
|
Make tests pass after changes to checkout broke them all
|
2013-01-18 15:29:36 +11:00 |
|
Rohan Mitchell
|
c75738893e
|
Display supplier name on products for distribution
|
2013-01-18 14:35:06 +11:00 |
|
Rohan Mitchell
|
074d5715e7
|
Only provide distributors as coordinating enterprises. Order by name.
|
2013-01-18 14:26:56 +11:00 |
|
Rohan Mitchell
|
87d5ffeee2
|
Add fields for outgoing exchange collection details
|
2013-01-18 14:24:17 +11:00 |
|
Rohan Mitchell
|
d8a7570a61
|
Display accurate counts for distributed products
|
2013-01-18 12:21:35 +11:00 |
|
Rohan Mitchell
|
33b9d45f43
|
Distributors and products displayed on edit
|
2013-01-18 11:59:32 +11:00 |
|
Rohan Mitchell
|
0a2ce30bb6
|
Only show variants for distribution that are supplied to the order cycle
|
2013-01-18 11:52:01 +11:00 |
|
Rohan Mitchell
|
1a0ef85030
|
Test distributor exchanges are created with order cycles
|
2013-01-18 11:40:36 +11:00 |
|
Rohan Mitchell
|
05c9a189c8
|
Merge branch 'email-changes'
|
2013-01-17 16:09:25 +11:00 |
|
Rohan Mitchell
|
8f17df0e45
|
Name exchange elements independently
|
2013-01-17 11:36:56 +11:00 |
|
Rohan Mitchell
|
3991199c30
|
Only show products for distribution that have been supplied to the order cycle
|
2013-01-17 10:49:59 +11:00 |
|
Rohan Mitchell
|
8f05c69696
|
Display all supplied products for distribution
|
2013-01-15 12:31:57 +11:00 |
|
Rohan Mitchell
|
f3f0f37716
|
Return to indexing for exchanges - this way new entries without an id get an index
|
2013-01-15 12:21:57 +11:00 |
|
Rohan Mitchell
|
850d65958b
|
Build Enterprise.supplied_products, an array of all products supplied by any enterprise
|
2013-01-15 12:21:13 +11:00 |
|
Rohan Mitchell
|
a10eb0d0c7
|
List and add distributor exchanges
|
2013-01-11 15:53:51 +11:00 |
|
Rohan Mitchell
|
bb13ec0e02
|
Rename methods
|
2013-01-11 10:40:56 +11:00 |
|
Rohan Mitchell
|
d3189e333b
|
Count selected variants on an exchange
|
2013-01-11 10:36:27 +11:00 |
|
Rohan Mitchell
|
a9fb10b0ca
|
Do not show master selection if there are variants
|
2013-01-10 16:25:29 +11:00 |
|
Rohan Mitchell
|
3186b703a2
|
Apply basic styling for order cycle product selection
|
2013-01-10 15:57:22 +11:00 |
|
Rohan Mitchell
|
e46d61075e
|
Simplify field naming
|
2013-01-10 15:33:56 +11:00 |
|
Rohan Mitchell
|
4e78fa19a3
|
Add spec for updating order cycle, minor fixes
|
2013-01-10 15:29:13 +11:00 |
|
Rohan Mitchell
|
31ea8540ea
|
Test editing an order cycle - all data is displayed
|
2013-01-10 15:02:56 +11:00 |
|
Rohan Mitchell
|
c5d031a6d7
|
Simplify exchange products/variants JSON output format, bind angular to this
|
2013-01-10 10:59:53 +11:00 |
|
Rohan Mitchell
|
1d357af708
|
Disable Jirafe and UserVoice outside of production -> test speedup
|
2013-01-09 09:14:43 +11:00 |
|
Rohan Mitchell
|
f705926c72
|
Display check boxes for products and variants, bind to model
|
2013-01-08 15:16:28 +11:00 |
|
Rohan Mitchell
|
836f568b8e
|
Display variants under products for exchange suppliers
|
2013-01-08 13:33:02 +11:00 |
|
Rohan Mitchell
|
043e67fd9d
|
Test adding suppliers
|
2013-01-08 11:58:49 +11:00 |
|
Rob H
|
63cf128f86
|
Remove product descriptions from line item listings in cart and order
|
2012-12-14 15:08:35 +11:00 |
|
Rob H
|
1f8b4d185b
|
Rearrange 'Add To Cart' section of product page
|
2012-12-14 14:01:13 +11:00 |
|
Rob H
|
c7ac0f7d91
|
Allow distributor to be changed from product page
|
2012-12-14 11:57:34 +11:00 |
|
Rob H
|
8a37b4e918
|
Push validation logic for changing distributor down into lib class
|
2012-12-14 11:02:01 +11:00 |
|
Rob H
|
3a3f427a8d
|
Reference name of payment method rather than payment method itself
|
2012-12-07 14:30:05 +11:00 |
|
Rob H
|
b5a95e73dc
|
Only show alternative distributors on 'address' page of checkout process
|
2012-12-07 12:29:44 +11:00 |
|
Rob H
|
9cf6124df3
|
Change checkout explanations from CMS pages to CMS snippets
|
2012-12-07 12:24:28 +11:00 |
|
Rob H
|
46abc2fc42
|
Add ability to change distributor based on whether products in the cart are available
|
2012-12-07 11:56:40 +11:00 |
|
Rohan Mitchell
|
55423d2df1
|
Display all supplied products for selection
|
2012-12-04 15:24:11 +11:00 |
|
Rohan Mitchell
|
e9746ebc9b
|
Display exchange product names
|
2012-12-04 14:52:59 +11:00 |
|
Rohan Mitchell
|
505f33a3f7
|
Display variant image url in json output
|
2012-12-04 14:14:36 +11:00 |
|
Rohan Mitchell
|
1d4d7d064b
|
Add exchange products form, shown/hidden by button press
|
2012-12-04 12:26:18 +11:00 |
|
Rohan Mitchell
|
a4d3cc5417
|
Display exchange variants in JSON, load data client side
|
2012-12-04 12:07:58 +11:00 |
|