Rohan Mitchell
|
e3a419993c
|
Work around order cycles not having fees / shipping methods yet - notify bugsnag and provide an undefined shipping method
|
2013-05-27 13:00:12 +10:00 |
|
Rohan Mitchell
|
6e7ee6481d
|
Fetch enterprises that are distributing a product via a product or order cycle distribution
|
2013-04-12 10:13:04 +10:00 |
|
Rohan Mitchell
|
32629a27e7
|
Remove explicit class specification
|
2013-04-05 16:57:53 +11:00 |
|
Rohan Mitchell
|
f66ff0f8b1
|
Rename Enterprise#available_variants to distributed_variants to remove ambiguity between supplied/distributed variants
|
2013-04-05 16:51:51 +11:00 |
|
Rohan Mitchell
|
5649a50e28
|
Add tests around Enterprise#available_variants, make it also show variants distributed via an order cycle
|
2013-04-05 16:49:27 +11:00 |
|
Rohan Mitchell
|
3aa48907a6
|
Add per-product tests for membership of distributor or order cycle
|
2013-04-05 12:45:01 +11:00 |
|
Rohan Mitchell
|
a9a58db137
|
Add spec for viewing product counts when both a distributor and an order cycle are selected, scope Spree::Product.with_order_cycles_outer joins to avoid clash when using both in_distributor and in_order_cycle in the same query
|
2013-03-15 12:17:29 +11:00 |
|
Rohan Mitchell
|
bcd545c13f
|
Alias spree_variants join to avoid name clash when loading products for home page
|
2013-03-08 17:21:18 +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
|
b25dcaa92b
|
Enterprise.active_distributors doesn't show distributors from inactive order cycles
|
2013-03-08 16:54:22 +11:00 |
|
Rohan Mitchell
|
2a890f80f4
|
Enterprise.active_distributors doesn't show distributors of out of stock products
|
2013-03-08 16:48:35 +11:00 |
|
Rohan Mitchell
|
13abf9ada7
|
Enterprise.active_distributors doesn't show distributors of unavailable products
|
2013-03-08 16:46:25 +11:00 |
|
Rohan Mitchell
|
cd61bad0b9
|
Enterprise.active_distributors doesn't show distributors of deleted products
|
2013-03-08 16:43:45 +11:00 |
|
Rohan Mitchell
|
00d7fcbfb6
|
Enterprise.active_distributors finds active distributors by order cycles
|
2013-03-08 16:39:42 +11:00 |
|
Rohan Mitchell
|
977344e279
|
Rewrite scope with outer join
|
2013-03-08 16:31:54 +11:00 |
|
Rohan Mitchell
|
98cad56e7c
|
Enterprise.active_distributors finds active distributors by product distributions
|
2013-03-08 16:23:45 +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
|
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
|
3aa44c3e9a
|
Setting a remote distributor clears the order cycle, and vice versa
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
fe824c2d4e
|
Add order cycle active and inactive scopes
|
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 |
|
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 |
|
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
|
ba19db3ccf
|
Add or update exchange variants when creating or updating order cycles
|
2013-01-09 10:06:51 +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
|
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
|
cfa96c7615
|
Each order cycle may not have duplicate exchanges between the same enterprises
|
2012-11-30 16:37:29 +11:00 |
|
Rohan Mitchell
|
8736254f12
|
Create incoming exchanges on save
|
2012-11-29 11:52:34 +11:00 |
|
Rohan Mitchell
|
aacc36ea44
|
Create order cycle basic fields
|
2012-11-29 10:02:23 +11:00 |
|
Rob H
|
43248aee99
|
Add can_change_distributor validation to the Order model
|
2012-11-28 09:17:05 +11:00 |
|
Rohan Mitchell
|
d5310452b6
|
Admin list order cycles
|
2012-11-27 10:13:12 +11:00 |
|
Rohan Mitchell
|
47c28e65a7
|
Add detailed order cycle factory, add methods to report on order cycle suppliers, distributors and products/variants exchanged
|
2012-11-27 10:09:40 +11:00 |
|
Rohan Mitchell
|
6b97872a25
|
Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants
|
2012-11-26 11:03:44 +11:00 |
|
Rohan Mitchell
|
5e0a5654ff
|
Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled.
|
2012-11-23 17:02:58 +11:00 |
|
Rohan Mitchell
|
2a645d04ae
|
Move presentation to presenter, display calculator fields
|
2012-11-22 14:37:38 +11:00 |
|
Rohan Mitchell
|
b7bd21e498
|
Full-text search of form
|
2012-11-22 12:15:39 +11:00 |
|
Rohan Mitchell
|
a4d10ab4e0
|
Create new enterprise fee, display errors when present
|
2012-11-21 09:47:51 +11:00 |
|
Rohan Mitchell
|
ff0d2bc983
|
Create EnterpriseSet as subclass of ModelSet
|
2012-11-21 09:08:41 +11:00 |
|
Rohan Mitchell
|
98143ffe5b
|
Add calculator to EnterpriseFee, test passes for listing enterprise fees
|
2012-11-16 16:07:40 +11:00 |
|
Rohan Mitchell
|
6247bd2541
|
Display admin table of enterprise fees with enterprise, fee type and name columns
|
2012-11-15 15:03:12 +11:00 |
|
Rohan Mitchell
|
03764881c8
|
Generalise EnterpriseSet to ModelSet
|
2012-11-15 14:29:38 +11:00 |
|
Rohan Mitchell
|
192d4993a1
|
Add EnterpriseFee model
|
2012-11-15 13:42:55 +11:00 |
|
Rohan Mitchell
|
580486a347
|
Do not show duplicate products with in_supplier_or_distributor scope
|
2012-11-10 12:26:41 +11:00 |
|
Rohan Mitchell
|
3a116dc13d
|
Fix product filtering on supplier and distributor pages
|
2012-11-01 16:37:12 +11:00 |
|
Rohan Mitchell
|
c2133d70ac
|
Rename Enterprise is_supplier scope to is_primary_producer
|
2012-11-01 15:02:57 +11:00 |
|
Rohan Mitchell
|
34588e6141
|
Remove old supplier and distributor routes, models, controllers, views, specs
|
2012-11-01 09:55:45 +11:00 |
|