Will Marshall
|
934f1eb196
|
Re-arranging product page into partials, redoing price display
|
2014-02-04 11:24:27 +11:00 |
|
Will Marshall
|
c270473c93
|
Patching up the shopping spec
|
2014-01-22 14:36:31 +11:00 |
|
Will Marshall
|
803f653d39
|
Cleaning up handling of the page when no order cycle is selected
|
2014-01-22 14:25:41 +11:00 |
|
Will Marshall
|
7737a5da1d
|
Patching some regressed tests, getting in some responsive layout
|
2014-01-22 13:38:07 +11:00 |
|
Will Marshall
|
17c6321c8b
|
Adding some basic collapse/expand for variants in Shop
|
2014-01-22 11:55:57 +11:00 |
|
Will Marshall
|
8879181a27
|
Adding promo image to about panel
|
2014-01-21 16:56:00 +11:00 |
|
Will Marshall
|
aec5894c70
|
Adding a promo image to enterprises
|
2014-01-21 16:32:55 +11:00 |
|
Will Marshall
|
8cc18e8db4
|
Fixing the shopping spec to conform to the new format of dates
|
2014-01-21 15:42:11 +11:00 |
|
Will Marshall
|
1e88c0a6f1
|
Adding max quantity for group buy to ze form
|
2014-01-17 16:32:32 +11:00 |
|
Will Marshall
|
b6590000a4
|
Improving Product's has_stock, filtering Shop#products to in_stock products
|
2014-01-17 14:41:15 +11:00 |
|
Will Marshall
|
b6d796e3bc
|
Getting in ze test for previous commit
|
2014-01-16 16:25:41 +11:00 |
|
Will Marshall
|
35cc113aca
|
Fixing the checkout spec to conform to reply_to instead of from on mailer
|
2014-01-16 13:04:26 +11:00 |
|
Will Marshall
|
e5514920c8
|
Fixing up the error messages in our specs
|
2014-01-08 15:11:23 +11:00 |
|
Will Marshall
|
e0c352d135
|
Merge branch 'master' into darkswarm
Conflicts:
spec/features/admin/products_spec.rb
|
2014-01-08 14:49:47 +11:00 |
|
Rohan Mitchell
|
c42d741d3d
|
Remove browse product specs for removed feature
|
2014-01-08 14:41:06 +11:00 |
|
Rohan Mitchell
|
dd16934496
|
Remove redundant serializer spec, reinstate creation of order distribution charges
|
2014-01-08 13:22:34 +11:00 |
|
Rohan Mitchell
|
df53a14d4b
|
Remove specs that are no longer relevant - distribution selection on product page no longer present
|
2014-01-08 11:51:26 +11:00 |
|
Rohan Mitchell
|
eda4f241e2
|
Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests
|
2014-01-08 11:39:05 +11:00 |
|
Will Marshall
|
06ab4d5384
|
Patching some further regression bugs
|
2014-01-07 15:28:11 +11:00 |
|
Will Marshall
|
936d80b2c5
|
Removing a redundant test: no longer show current distributor and order cycle
|
2014-01-07 15:16:36 +11:00 |
|
Will Marshall
|
4d03f65766
|
Reworking everything to use RABL
|
2014-01-07 15:06:47 +11:00 |
|
Will Marshall
|
dd1b3311d7
|
Removing all the old order populator stuff
|
2014-01-06 15:23:21 +11:00 |
|
Will Marshall
|
985cebb44a
|
Massaging the form to push orders to the cart: some refactoring still required
|
2013-12-19 15:51:51 +11:00 |
|
Will Marshall
|
1048bab303
|
Patching up some edge cases
|
2013-12-19 14:20:16 +11:00 |
|
Will Marshall
|
37f8ce68fb
|
Adding one additional mailer test
|
2013-12-19 11:58:08 +11:00 |
|
Will Marshall
|
b5dd921a81
|
Our feature spec is breaking but we'll work that out
|
2013-12-19 10:44:47 +11:00 |
|
Will Marshall
|
6d124b3275
|
Failing tests, forcing the orders close text to change
|
2013-12-18 16:12:06 +11:00 |
|
Will Marshall
|
a3dfe1b147
|
Working on the HTML structure, variants etc
|
2013-12-18 12:26:34 +11:00 |
|
Will Marshall
|
7ea9cf6862
|
Adding price to serializer
|
2013-12-17 15:45:06 +11:00 |
|
Will Marshall
|
67fcf0f534
|
Fixing up the feature specs
|
2013-12-17 15:26:49 +11:00 |
|
Will Marshall
|
c4c5f3a8c7
|
Merging from master
|
2013-12-17 14:18:21 +11:00 |
|
Will Marshall
|
63349c7c9a
|
Fixing some breaking bugs in the refactored mailer
|
2013-12-13 15:40:23 +11:00 |
|
Will Marshall
|
3670d68265
|
Correctly failing tests forcing us to build out OrderCycle switching in Angular
|
2013-12-05 16:48:29 +11:00 |
|
Will Marshall
|
165513fdea
|
Adding some feature tests for the basic products page
|
2013-12-05 16:30:59 +11:00 |
|
Will Marshall
|
7e9f389900
|
Getting the order cycles dropdown rendering correctly
|
2013-12-05 15:15:15 +11:00 |
|
Will Marshall
|
ec72e9137a
|
We can now hit the index page
|
2013-12-05 15:07:46 +11:00 |
|
Will Marshall
|
4543e08872
|
Renaming everything to Shop
|
2013-12-05 13:40:05 +11:00 |
|
Will Marshall
|
acdbbb153d
|
Fixing up the landing page spec to cover the new login text
|
2013-11-28 15:24:38 +11:00 |
|
Will Marshall
|
b227be4a62
|
Adding an override to suppress the products display unless we actually have an order_cycle in play
|
2013-11-08 16:04:31 +11:00 |
|
Will Marshall
|
317b2f1ced
|
Helperizing some of the order cycles stuff
|
2013-11-08 15:19:27 +11:00 |
|
Rohan Mitchell
|
04387aa6b7
|
Scope time since last oc expired to distributor
|
2013-11-06 16:17:36 +11:00 |
|
Will Marshall
|
3c37696882
|
Adding specs and implementation: moving current distributor to new empty order after checkout
|
2013-11-06 12:35:22 +11:00 |
|
Will Marshall
|
9f150c8d87
|
Adding a small display on the distributor page indicating when the next order cycle is, if any - BugHerd#127
|
2013-11-01 16:12:31 +11:00 |
|
Will Marshall
|
b8fcfbd72b
|
Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125
|
2013-11-01 14:48:23 +11:00 |
|
Rohan Mitchell
|
758676c1ea
|
When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products
|
2013-10-31 14:49:26 +11:00 |
|
Rohan Mitchell
|
217f1b58ad
|
Fix spec broken by 8595839
|
2013-10-31 13:49:57 +11:00 |
|
Rohan Mitchell
|
32889715f0
|
Grey out hubs that have no products available for distribution and are not in an order cycle
|
2013-10-30 16:09:18 +11:00 |
|
Rohan Mitchell
|
521ed565b4
|
Modify specs to create enterprise groups where needed
|
2013-10-30 13:56:10 +11:00 |
|
Rohan Mitchell
|
57a450b0aa
|
Load landing page distributors from enterprise groups instead of yaml file
|
2013-10-30 13:55:47 +11:00 |
|
Rohan Mitchell
|
fb22b5e2b7
|
When there are no order cycles open, display an 'orders closed' message
|
2013-10-24 10:32:30 +11:00 |
|