Rohan Mitchell
|
638d7b1c33
|
Stylistic changes, extract commented code to private method
|
2013-07-23 17:02:06 +10:00 |
|
David Cook
|
f0755f34aa
|
tidy up javascript, remove unnecessary disableSaveOnClick
|
2013-07-19 17:05:09 +10:00 |
|
David Cook
|
15c454a0f1
|
move style to stylesheet
|
2013-07-19 17:04:04 +10:00 |
|
David Cook
|
0a25dfc679
|
remove disabled flag
|
2013-07-16 17:01:12 +10:00 |
|
David Cook
|
050b884076
|
remove old-style deface file in favour of new .deface format
|
2013-07-16 17:00:04 +10:00 |
|
David Cook
|
8df0f30b4f
|
Move override into .deface format, and removed unecessary bits
|
2013-07-05 16:08:26 +10:00 |
|
David Cook
|
50b5d13e1f
|
Add javascript to hide new save button if not supported (not yet tested on old browsers)
|
2013-06-28 17:53:39 +10:00 |
|
David Cook
|
203232de27
|
Disable as this has now been incorporated into move_save_checkout_button
|
2013-06-13 12:30:35 +10:00 |
|
David Cook
|
aa468140ac
|
Move save/process button to side on checkout pages
|
2013-06-13 12:29:34 +10:00 |
|
Rohan Mitchell
|
1e94f88c5e
|
Ensure order decorator is required, fix test fragility
|
2013-06-07 15:40:03 +10:00 |
|
Rob H
|
055c07a466
|
Add before_payment method to checkout controller (fixes issues with spree_paypal_express)
|
2013-02-20 14:04:10 +11:00 |
|
Rob H
|
046eb256ff
|
Fix issues causing enterprise fee tests to break
|
2013-02-15 14:10:56 +11:00 |
|
Rob H
|
2cdf458d6a
|
Move additional of tabs to main nav bar to defaces, rather than overriding view directly
|
2013-02-14 15:42:47 +11:00 |
|
Rob H
|
9e9199643e
|
Remove unneeded :partial from override
|
2013-02-14 15:35:50 +11:00 |
|
Rob H
|
c956706d78
|
Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test
|
2013-02-14 15:12:50 +11:00 |
|
Rob H
|
a3746c6c59
|
Add analytics helper to Enterprises Controller
|
2013-02-14 12:10:31 +11:00 |
|
Rob H
|
1d4fbe865b
|
Finished revision of defaces
|
2013-02-09 00:40:34 +11:00 |
|
Rob H
|
2a07d61e81
|
Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue
|
2013-02-07 15:09:25 +11:00 |
|
Rob H
|
99b4530db2
|
WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name
|
2013-02-07 13:07:14 +11:00 |
|
Rob H
|
3507c5414d
|
Changed Sass variable: back to our green colour following upgrade
|
2013-02-07 09:25:29 +11:00 |
|
Rob H
|
4b254a5529
|
WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name
|
2013-02-06 11:25:26 +11:00 |
|
Rob H
|
612017f143
|
WIP Upgrade to Spree 1.3
|
2013-02-05 15:01:45 +11: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 |
|