Rohan Mitchell
|
8e1c9e7bcc
|
WIP: Add notes, put in Spree module, write in_supplier scope spec
|
2013-03-08 15:18:53 +11:00 |
|
Rohan Mitchell
|
69392100f9
|
Push QueriesProductDistribution.products_available_for back to model
|
2013-03-08 15:18:53 +11:00 |
|
Rohan Mitchell
|
e326e590db
|
Implement and use scopes for finding products by distributor via order cycle or product distribution
|
2013-03-08 15:18:53 +11:00 |
|
Rohan Mitchell
|
265336b70c
|
When looking up distributors for sidebar, include both those in ProductDistributions and in OrderCycles
|
2013-03-08 15:18:53 +11:00 |
|
Rohan Mitchell
|
1285d507eb
|
Revert "Create order cycles where needed by tests"
This reverts commit b82e0007c9b0322e85e5597634628024e839d102.
Conflicts:
spec/factories.rb
spec/features/consumer/order_cycles_spec.rb
|
2013-03-08 15:18:53 +11:00 |
|
Rohan Mitchell
|
884dbd5de6
|
Keep old methods available for product distribution queries
|
2013-03-08 15:18:52 +11:00 |
|
Rohan Mitchell
|
ebf1c8602f
|
Write new query for Product#in_distributor that queries order cycles instead of product_distributions
|
2013-03-08 15:18:52 +11:00 |
|
Rohan Mitchell
|
dfa94b88aa
|
Display distributor and order cycle choice
|
2013-03-08 15:18:52 +11:00 |
|
Rohan Mitchell
|
fcb1701d36
|
WIP Add hub and order cycle display stub with failing tests
|
2013-03-08 15:18:52 +11:00 |
|
Rohan Mitchell
|
c0431c614f
|
Clean up specs, add spec for selecting both hub and OC
|
2013-03-08 15:18:52 +11:00 |
|
Rohan Mitchell
|
624a2799aa
|
Create order cycles where needed by tests
|
2013-03-08 15:18:52 +11:00 |
|
Rohan Mitchell
|
a5c706d694
|
In test, create a global shipping method, which is required when creating orders
|
2013-03-08 15:18:52 +11:00 |
|
Rohan Mitchell
|
666f110d47
|
Load distributor list from those in an active order cycle
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
3aa44c3e9a
|
Setting a remote distributor clears the order cycle, and vice versa
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
e1b2490259
|
Selecting an order cycle highlights valid distributor choices
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
74e2b70d3a
|
Without JS, select distributor, highlighting local order cycle choices
|
2013-03-08 15:17:22 +11:00 |
|
Rohan Mitchell
|
72a9286457
|
Add helper to generate a local/remote class for order cycle selection
|
2013-03-08 15:17:22 +11:00 |
|
Rohan Mitchell
|
456dfcf6db
|
Style distribution choice, add compass for border radius mixin
|
2013-03-08 15:17:22 +11:00 |
|
Rohan Mitchell
|
34cb8bab26
|
View order cycle and distributor choices
|
2013-03-08 15:15:15 +11:00 |
|
Rohan Mitchell
|
fe824c2d4e
|
Add order cycle active and inactive scopes
|
2013-03-08 15:15:15 +11:00 |
|
Rohan Mitchell
|
8b5aea42b8
|
Add deface for order cycle selection
|
2013-03-08 15:15:15 +11:00 |
|
Rohan Mitchell
|
63f3504b81
|
Add order cycle reference to orders
|
2013-03-08 15:15:15 +11:00 |
|
Rohan Mitchell
|
bd5533e2b1
|
Revert "Add a failing test to test travis"
This reverts commit 72aa8fe5e5.
|
2013-02-24 20:22:37 +11:00 |
|
Rohan Mitchell
|
72aa8fe5e5
|
Add a failing test to test travis
|
2013-02-24 19:57:57 +11:00 |
|
Rohan Mitchell
|
cdc3ab09a1
|
Set up xvfb for Travis
|
2013-02-24 19:42:32 +11:00 |
|
Rohan Mitchell
|
b030793f15
|
Fix migrations that fail because of coupling to changed/removed models
|
2013-02-24 19:09:43 +11:00 |
|
Rohan Mitchell
|
3a441cd7d9
|
Configure travis for postgres
|
2013-02-24 18:46:31 +11:00 |
|
Rohan Mitchell
|
2b19253895
|
Attempt 2
|
2013-02-24 18:17:46 +11:00 |
|
Rohan Mitchell
|
d60935c800
|
Exclude pry from CI build
|
2013-02-24 18:05:11 +11:00 |
|
Rohan Mitchell
|
4bcd55959a
|
spree-last-address repo deleted - use mirror
|
2013-02-24 17:51:46 +11:00 |
|
Rohan Mitchell
|
719ef386bf
|
Only build on Ruby 1.9.3
|
2013-02-24 17:51:20 +11:00 |
|
Rohan Mitchell
|
e3fdb12289
|
Add travis config
|
2013-02-24 17:36:19 +11:00 |
|
Rohan Mitchell
|
b0a665aef7
|
Update ransack (rubygems could not find previous version)
|
2013-02-20 15:44:21 +11:00 |
|
Rohan Mitchell
|
3982b2a690
|
Merge branch 'new-spree'
Conflicts:
Gemfile.lock
|
2013-02-20 15:24:27 +11:00 |
|
Rob H
|
a59b136864
|
Spree 1.3 upgrade: fix final failing tests
|
2013-02-20 15:16:43 +11: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 |
|
Rohan Mitchell
|
8903c13c84
|
Bugsnag uses SSL, notify on staging as well as production
|
2013-02-20 10:09:43 +11:00 |
|
Rob H
|
046eb256ff
|
Fix issues causing enterprise fee tests to break
|
2013-02-15 14:10:56 +11:00 |
|
Rob H
|
68246e08d2
|
Fix stack overflow error in admin shipping method test
|
2013-02-15 10:34:17 +11:00 |
|
Rob H
|
1ded1bac3f
|
Lengthen Capybara.default_wait_time for tests that fail due to long load time
|
2013-02-15 10:31:41 +11:00 |
|
Rob H
|
2f1a9094bf
|
Fix StaleObjectError in order model test
|
2013-02-14 16:49:28 +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
|
290f2276cd
|
Update cms_admin spec work after Spree 1.3 upgrade broke it
|
2013-02-14 14:03:14 +11:00 |
|
Rob H
|
b924b0c817
|
Remove unnecessary include of Spree::Core::CurrentOrder (helper is now accessible by all controllers in Spree 1.3)
|
2013-02-14 12:24:01 +11:00 |
|
Rob H
|
d7c2bdfe22
|
Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3)
|
2013-02-14 12:12:19 +11:00 |
|
Rob H
|
a3746c6c59
|
Add analytics helper to Enterprises Controller
|
2013-02-14 12:10:31 +11:00 |
|
Rohan Mitchell
|
7cc1c97c53
|
Upgrade spree to 1.1.6beta
|
2013-02-12 09:18:50 +11:00 |
|
Rohan Mitchell
|
ccfe6bc0b3
|
Update bugsnag
|
2013-02-12 09:11:38 +11:00 |
|