Rohan Mitchell
|
4b7fc8b5e4
|
In production, redirect to hostname with the SSL certificate
|
2013-10-14 10:44:14 +11:00 |
|
Rohan Mitchell
|
072ce67b78
|
Redirect if distributor not chosen
|
2013-09-23 13:39:13 +10:00 |
|
Rohan Mitchell
|
36a124c10e
|
Fix merge issues: DCV name change and application controller var name issues.
|
2013-07-29 11:49:43 +10:00 |
|
Rohan Mitchell
|
7640eb497a
|
Merge branch 'supplied-active-products-on-hand'
Conflicts:
app/controllers/application_controller.rb
app/models/enterprise.rb
app/views/spree/products/_source_sidebar.html.haml
spec/features/consumer/distributors_spec.rb
spec/models/enterprises_spec.rb
|
2013-07-29 11:05:42 +10:00 |
|
David Cook
|
66d345d360
|
fix 'x more' count, disable sidebar limit (config for this to be implemented later)
|
2013-07-22 14:53:08 +10:00 |
|
David Cook
|
5b58351b73
|
minor changes
|
2013-06-28 17:04:58 +10:00 |
|
David Cook
|
250e76c281
|
Fix incorrect count of enterprises (due to bug in rails issue #5554)
|
2013-06-21 15:10:21 +10:00 |
|
David Cook
|
b0e4bef75e
|
rename sidebar collection variables to avoid clash, fix count to be distinct
|
2013-06-21 10:42:42 +10:00 |
|
David Cook
|
1abc0dac68
|
rename vars again
|
2013-06-14 17:36:38 +10:00 |
|
David Cook
|
423bd52fd6
|
rename _count vars to _total
|
2013-05-22 14:03:51 +10:00 |
|
vagrant
|
4e7f966429
|
add suppliers scope, limit by 5, test
|
2013-05-22 13:07:30 +10:00 |
|
Rohan Mitchell
|
955f313abc
|
Remove require for queries_product_distribution
|
2013-03-08 16:59:47 +11:00 |
|
Rohan Mitchell
|
c9d1573049
|
Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors
|
2013-03-08 16:56:58 +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
|
666f110d47
|
Load distributor list from those in an active order cycle
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
34cb8bab26
|
View order cycle and distributor choices
|
2013-03-08 15:15:15 +11:00 |
|
Rohan Mitchell
|
2a645d04ae
|
Move presentation to presenter, display calculator fields
|
2012-11-22 14:37:38 +11:00 |
|
Rohan Mitchell
|
c2133d70ac
|
Rename Enterprise is_supplier scope to is_primary_producer
|
2012-11-01 15:02:57 +11:00 |
|
Rohan Mitchell
|
9d5c127f0d
|
Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes.
|
2012-10-31 16:47:01 +11:00 |
|
Rohan Mitchell
|
c46019d68c
|
WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace
|
2012-10-25 10:45:39 +11:00 |
|
Rohan Mitchell
|
3dd3d8030f
|
Display CMS pages in menu
|
2012-10-11 17:00:34 +11:00 |
|
Rohan Mitchell
|
9f013f0e37
|
When loading distributors for sidebar, only show those that have active products on hand
|
2012-08-04 17:51:08 +10:00 |
|
Rohan Mitchell
|
768a170bb8
|
Fix with_products_on_hand query for server db compatibility
|
2012-08-03 08:21:45 +10:00 |
|
Rohan Mitchell
|
63bf25293d
|
Only show distributors in sidebar that have products in stock
|
2012-08-02 11:49:10 +10:00 |
|
Rohan Mitchell
|
93867682bb
|
Only show distributors in sidebar that have products
|
2012-08-02 11:33:36 +10:00 |
|
Rohan Mitchell
|
93e3f82392
|
Display product count next to taxons in sidebar
|
2012-06-21 16:15:40 +10:00 |
|
Rohan Mitchell
|
b0a8645738
|
Display suppliers and distributors in sidebar
|
2012-06-20 17:44:11 +10:00 |
|
Andrew Spinks
|
b6ca20beee
|
new rails 3.1.4 app
|
2012-03-27 10:10:26 +11:00 |
|