Commit Graph

238 Commits

Author SHA1 Message Date
Rohan Mitchell
d65dda4dc5 When order distributor changes, update line item shipping method 2013-05-18 19:21:01 +10:00
Rohan Mitchell
06c285689e Order confirmation email contains distributor info 2013-04-29 11:14:00 +10:00
Rohan Mitchell
92a7f19ff1 Add specs for enterprises distributor info as rich text feature 2013-04-26 15:43:13 +10:00
Rohan Mitchell
9f6d1a2f18 Order cycle reports are precise to time of day, not just date 2013-04-25 21:22:26 +10:00
Rohan Mitchell
7bee04e5f6 Update selenium-webdriver, test with eaterprises deployment settings by default 2013-04-22 16:48:49 +10:00
Rohan Mitchell
5b22cce950 Remove sleeps from specs 2013-01-22 12:12:29 +11:00
Rohan Mitchell
fec81b7ed4 Fix failing specs after merge 2013-01-22 11:34:43 +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
3f71655bd1 Test updating collection details 2013-01-22 09:44:19 +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
87d5ffeee2 Add fields for outgoing exchange collection details 2013-01-18 14:24:17 +11:00
Rohan Mitchell
ae93d02c9c OrderCycleFormApplicator applies outgoing exchange collection details 2013-01-18 14:23:42 +11:00
Rohan Mitchell
a293ea54f9 Update saves distributors and distributed products 2013-01-18 12:13:13 +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
983ba92dea OrderCycleFormApplicator deals with outgoing exchanges 2013-01-18 11:22:42 +11:00
Rohan Mitchell
12dad2468d Reorder specs 2013-01-17 15:13:41 +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
850d65958b Build Enterprise.supplied_products, an array of all products supplied by any enterprise 2013-01-15 12:21:13 +11:00
Rohan Mitchell
488fc2d60e Upgrade capybara, spec/requests changed to spec/features 2013-01-15 10:10:24 +11:00
Rohan Mitchell
a10eb0d0c7 List and add distributor exchanges 2013-01-11 15:53:51 +11:00
Rohan Mitchell
d3fca565a3 Fix file naming and controller definition/testing 2013-01-11 14:09:56 +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
Rohan Mitchell
d3189e333b Count selected variants on an exchange 2013-01-11 10:36:27 +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
Rohan Mitchell
31ea8540ea Test editing an order cycle - all data is displayed 2013-01-10 15:02:56 +11:00
Rohan Mitchell
d27ef76ead Load exchange variants from correct attr 2013-01-10 11:27:39 +11:00
Rohan Mitchell
62a7a0db7c Add spec for updating exchanges 2013-01-09 10:50:17 +11:00
Rohan Mitchell
f8c74e8b92 Make most OrderCycleFormApplicator methods private, add spec for adding exchanges 2013-01-09 10:41:09 +11:00
Rohan Mitchell
e53fff8e31 Split OrderCycleFormApplicator specs into unit / integration, add integration spec for exchange_exists? 2013-01-09 10:18:06 +11:00
Rohan Mitchell
ba19db3ccf Add or update exchange variants when creating or updating order cycles 2013-01-09 10:06:51 +11:00
Rohan Mitchell
04297d928e Correct naming of OrderCycleFormApplicator spec 2013-01-09 09:16:25 +11:00
Rohan Mitchell
6a666dd7ec Move preventDefault from service to controller 2013-01-08 17:51:08 +11:00
Rohan Mitchell
7ae315a1cb Remove directives test stub 2013-01-08 15:15:20 +11:00
Rohan Mitchell
043e67fd9d Test adding suppliers 2013-01-08 11:58:49 +11:00
Rob H
8a37b4e918 Push validation logic for changing distributor down into lib class 2012-12-14 11:02:01 +11:00
Rohan Mitchell
19e55428b8 Test fetching enterprises 2012-12-13 16:24:59 +11:00
Rohan Mitchell
8d8c2f04d8 Add test for removesInactiveExchanges 2012-12-13 14:55:11 +11:00
Rohan Mitchell
bec10be233 Make create test thinner 2012-12-13 14:46:07 +11:00
Rohan Mitchell
2382de946f Test OrderCycle service create order cycle, use $window for testability 2012-12-13 14:37:35 +11:00
Rohan Mitchell
0f5d51423b Provide jQuery to tests, test loading an order cycle 2012-12-08 17:24:57 +11:00
Rohan Mitchell
91e3ddb93c Begin writing test for OrderCycle service 2012-12-07 16:24:40 +11:00
Rohan Mitchell
8cfce57730 Add unit tests for AdminEditOrderCycleCtrl 2012-12-07 15:30:49 +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