Rohan Mitchell
|
571dfd9e9f
|
Regroup OrderController methods - actions / callbacks / utils
|
2013-05-20 14:56:39 +10:00 |
|
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
|
d65dda4dc5
|
When order distributor changes, update line item shipping method
|
2013-05-18 19:21:01 +10:00 |
|
Rohan Mitchell
|
a1f189627b
|
Only show UserVoice feedback button on Eaterprises deployment
|
2013-04-29 16:34:19 +10:00 |
|
Rohan Mitchell
|
da3267a302
|
Add OpenFoodWeb logo to footer
|
2013-04-29 16:20:26 +10:00 |
|
Rohan Mitchell
|
234b2d26e9
|
Add MiGS payment gateway
|
2013-04-29 15:37:48 +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
|
3dd4e074fc
|
Split spree variable changes into per-feature files, add an eaterprises feature for default layout
|
2013-04-22 16:12:50 +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
|
43a1cf7779
|
Merge branch 'product-quantity-fix'
|
2013-01-17 16:07:55 +11:00 |
|
Rohan Mitchell
|
8f17df0e45
|
Name exchange elements independently
|
2013-01-17 11:36:56 +11:00 |
|
Rohan Mitchell
|
8e9845be12
|
Functionalise
|
2013-01-17 11:03:15 +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
|
9e59dead07
|
Tidy up coffee
|
2013-01-11 15:52:45 +11:00 |
|
Rohan Mitchell
|
d3fca565a3
|
Fix file naming and controller definition/testing
|
2013-01-11 14:09:56 +11:00 |
|
Rohan Mitchell
|
f971958042
|
Port order cycles js to coffeescript
|
2013-01-11 13:39:26 +11:00 |
|
Rohan Mitchell
|
3e06220b7f
|
WIP: Rename order_cycle to coffee
|
2013-01-11 10:57:02 +11:00 |
|
Rohan Mitchell
|
3694321f66
|
Use angular's extend instead of jquery's
|
2013-01-11 10:54:53 +11:00 |
|
Rohan Mitchell
|
24a48a9b33
|
Move enterpriseTotalVariants to Enterprise service
|
2013-01-11 10:50:03 +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
|
d27ef76ead
|
Load exchange variants from correct attr
|
2013-01-10 11:27:39 +11:00 |
|
Rohan Mitchell
|
5129e31f21
|
Remove unneeded exchange_variants init
|
2013-01-10 11:00:09 +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
|
ba19db3ccf
|
Add or update exchange variants when creating or updating order cycles
|
2013-01-09 10:06:51 +11:00 |
|
Rohan Mitchell
|
1d357af708
|
Disable Jirafe and UserVoice outside of production -> test speedup
|
2013-01-09 09:14:43 +11:00 |
|