Commit Graph

235 Commits

Author SHA1 Message Date
Rohan Mitchell
b5479380b6 Refactor alternative distributors at checkout form, fixing indentation and removed double negatives 2013-06-17 11:41:35 +10:00
Rohan Mitchell
6d22f56c86 Distribution selection form is not shown when there are products in the cart.
This form doesn't filter options based on which can supply the products in the cart,
so don't show it in those circumstances.
2013-06-17 11:29:36 +10:00
Rohan Mitchell
f91e1144e0 Name blank order cycle option 2013-06-04 11:11:13 +10:00
Rohan Mitchell
661ce4e597 Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products 2013-06-04 10:26:13 +10:00
Rohan Mitchell
cb703c2a66 Do not give order cycle choice when there is only one option 2013-05-28 16:35:39 +10:00
Rohan Mitchell
54fe63e7f3 User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor 2013-05-28 16:20:58 +10:00
Rohan Mitchell
1f9f5efb79 Add first product to cart with order cycle choice 2013-05-28 14:06:52 +10:00
Rohan Mitchell
0e08829a29 Rename DistributorChangeValidator to DistributionChangeValidator in preparation for expansion to include order cycles 2013-05-28 12:32:52 +10:00
Rohan Mitchell
796be2ee6d Refactor add to cart form into partials and helpers 2013-05-27 11:25:09 +10:00
Rohan Mitchell
ff9200ebb8 Display order cycle distributors on product details page 2013-04-12 13:18:40 +10:00
Rohan Mitchell
ad32147576 Display correct product splitting criteria 2013-04-05 14:30:35 +11:00
Rohan Mitchell
f8ebb0c715 Rename split partial and update overrides 2013-04-05 11:34:03 +11:00
Rohan Mitchell
7cc24f7340 Handle the case where we're viewing a product from a remote distributor that we can change to 2013-04-05 10:28:08 +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
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
34cb8bab26 View order cycle and distributor choices 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
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
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
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
8f17df0e45 Name exchange elements independently 2013-01-17 11:36:56 +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
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