Commit Graph

  • f3d52825ae Remove redirect_back_or_default, which was causing unexpected behaviour Rohan Mitchell 2012-06-26 07:54:55 +10:00
  • 9258d47e55 When adding subsequent products, add valid products to cart Rohan Mitchell 2012-06-26 07:52:45 +10:00
  • a48a100bcc Merge branch 'shop-by-distributor' v0.0.2 Rohan Mitchell 2012-06-25 09:10:50 +10:00
  • 32dca81467 Update spec for markup change Rohan Mitchell 2012-06-25 09:10:34 +10:00
  • 6cd9bff29f Convert most templates from erb to haml Rohan Mitchell 2012-06-25 09:06:56 +10:00
  • a7df5a2f1e Include jquery, add basic styling for add to cart form, split supplier and distributors in product details sidebar Rohan Mitchell 2012-06-25 08:57:53 +10:00
  • f4108921ed When adding subsequent product to cart, do not allow the user to add a product from another distributor Rohan Mitchell 2012-06-25 08:45:08 +10:00
  • 178f581452 When an item has been added to the cart, do not allow the user to select a distributor when adding a subsequent item Rohan Mitchell 2012-06-25 07:25:31 +10:00
  • 98bcc9ce71 When adding first product to cart, add the product and set the distributor even if the order has a different distributor set Rohan Mitchell 2012-06-25 06:57:24 +10:00
  • df831a9128 Do not add the product to cart if the chosen distributor is different from the order's distributor Rohan Mitchell 2012-06-24 20:14:07 +10:00
  • 4481ca83f9 OrdersController does not permit adding products with invalid distributors Rohan Mitchell 2012-06-24 19:58:09 +10:00
  • 24ad4f53fc Raise error if distributor changed illegally Rohan Mitchell 2012-06-24 19:23:44 +10:00
  • a41c5d4735 Move distributor permissions onto order class, do not show links to change distributor if the action is invalid Rohan Mitchell 2012-06-24 15:15:53 +10:00
  • 7b92fcb614 Do not allow deselecting distributor after product added to cart at controller level Rohan Mitchell 2012-06-24 14:56:27 +10:00
  • d3c80e99fc Do not allow changing distributor after product added to cart at controller level Rohan Mitchell 2012-06-24 14:54:48 +10:00
  • 056733a426 Add controller spec for deselecting distributors Rohan Mitchell 2012-06-24 13:48:55 +10:00
  • 3219006423 Push several request specs down to controller level, replace with scenario. Set order's distributor when adding product to cart Rohan Mitchell 2012-06-24 13:21:36 +10:00
  • fc5795173e Do not add the product to cart if the user specifies a distributor that the product is not available at Rohan Mitchell 2012-06-24 12:56:47 +10:00
  • 99d6f0baa9 Require a distributor when adding a product to the cart Rohan Mitchell 2012-06-24 12:13:33 +10:00
  • b5082009ce Add pending specs for adding products to cart with distributor Rohan Mitchell 2012-06-24 12:13:13 +10:00
  • 4faed954e6 use database truncation for javascript request tests. Andrew Spinks 2012-06-24 11:41:19 +10:00
  • b2f5e23fa4 Test selecting distributor when adding item to cart, for no/remote distributor selected Rohan Mitchell 2012-06-24 11:41:10 +10:00
  • a91722a593 Display distributor choice on add to cart form Rohan Mitchell 2012-06-24 11:28:06 +10:00
  • 9be5dc41b9 Split products by local/remote distributor: style Rohan Mitchell 2012-06-24 09:41:33 +10:00
  • 34f95ffb4a Split products by local/remote distributor: apply to products, search results and taxon pages Rohan Mitchell 2012-06-24 09:21:44 +10:00
  • ebb624bdc3 Reload application files, routes and factories each spork run Rohan Mitchell 2012-06-24 09:10:25 +10:00
  • 32050bbba4 Split products by local/remote distributor: views and basic style Rohan Mitchell 2012-06-24 07:37:25 +10:00
  • 5411685c83 Split products by local/remote distributor: logic Rohan Mitchell 2012-06-24 07:36:56 +10:00
  • 5e6c4de34b Leave a distributor Rohan Mitchell 2012-06-23 12:33:38 +10:00
  • 2cdf32590c Fix indentation of markdown code blocks v0.0.1 Rohan Mitchell 2012-06-22 15:46:13 +10:00
  • d0422d20b0 Update setup instructions Rohan Mitchell 2012-06-22 15:41:49 +10:00
  • 9acdce06c3 Replace stock Rails README file with project-specific info Rohan Mitchell 2012-06-22 15:31:24 +10:00
  • b9229f9166 DB seeds create some default taxonomies, suppliers, distributors and products, and are now idempotent Rohan Mitchell 2012-06-22 15:15:20 +10:00
  • 4b118a26ff Show distributor-scoped product counts next to taxons Rohan Mitchell 2012-06-22 13:40:43 +10:00
  • 0c5162f9fb Move distributor lookup code into current_distributor helper Rohan Mitchell 2012-06-22 11:48:39 +10:00
  • 4911a06c9d Display current distributor in main nav bar Rohan Mitchell 2012-06-22 11:46:40 +10:00
  • 03b87225d0 Add spec for selecting a distributor, add distributor to order model, add controller method for selecting distributor Rohan Mitchell 2012-06-22 11:25:32 +10:00
  • 16ff9e9611 Set up spree controller testing environment Rohan Mitchell 2012-06-22 11:00:44 +10:00
  • 93e3f82392 Display product count next to taxons in sidebar Rohan Mitchell 2012-06-21 16:15:40 +10:00
  • 4c6486e66f Product requires a supplier Rohan Mitchell 2012-06-21 14:59:22 +10:00
  • 65d39e5867 Display supplier/distributor search results Rohan Mitchell 2012-06-21 07:31:33 +10:00
  • 412eb4365e Provide searching by supplier or distributor via spree searcher class Rohan Mitchell 2012-06-20 17:44:58 +10:00
  • b0a8645738 Display suppliers and distributors in sidebar Rohan Mitchell 2012-06-20 17:44:11 +10:00
  • d656898ecb Disable filtering distributors using spree filters Rohan Mitchell 2012-06-20 17:43:14 +10:00
  • f9d290f00d Show product supplier and distributors on product details page Rohan Mitchell 2012-06-20 16:28:09 +10:00
  • 103aad467c Tweak override names Rohan Mitchell 2012-06-20 16:00:39 +10:00
  • a445216e6c Add test for filtering by distributor Rohan Mitchell 2012-06-20 15:19:26 +10:00
  • 9adfe58086 Display distributor filter as links instead of checkboxes, style in the same way as taxonomy selectors Rohan Mitchell 2012-06-20 15:05:54 +10:00
  • 1207062f7c Filter products by distributor Rohan Mitchell 2012-06-20 14:20:07 +10:00
  • 423ab26a1a Show product filters in sidebar on all pages Rohan Mitchell 2012-06-20 14:15:58 +10:00
  • b54cb00b29 Change database cleaner strategy to transaction, removing a 5 s per-test delay Rohan Mitchell 2012-06-19 14:03:20 +10:00
  • f962db4288 Convert factories from machinist to factory girl Rohan Mitchell 2012-06-19 13:54:34 +10:00
  • 865f562dd0 Tidy up spec_helper.rb Rohan Mitchell 2012-06-19 11:33:28 +10:00
  • 5e9fa37f11 Add failing spec for viewing distributors in sidebar Rohan Mitchell 2012-06-19 11:32:49 +10:00
  • b38692d8c0 Style product distributor check boxes Rohan Mitchell 2012-06-19 10:51:17 +10:00
  • b89562823b Add distributors to admin product forms Rohan Mitchell 2012-06-19 10:38:44 +10:00
  • 44e33b2b69 Add default simple_form configuration, locales, scaffold Rohan Mitchell 2012-06-19 10:29:26 +10:00
  • 13569b5263 Switch to patched version of simple_form, which fixes collection_check_boxes when used within form_for block Rohan Mitchell 2012-06-19 10:27:09 +10:00
  • eb095baf64 Installed spork Rohan Mitchell 2012-06-19 07:08:27 +10:00
  • cb899575b7 Product requires at least one distributor Rohan Mitchell 2012-06-18 19:53:53 +10:00
  • 3b075a7c14 Change product-distributor relation to *..* Rohan Mitchell 2012-06-18 19:43:30 +10:00
  • 3d0f6a43b4 Add pry to Gemfile Rohan Mitchell 2012-06-18 19:41:00 +10:00
  • cc45812764 Add failing test for product distributor selection Rohan Mitchell 2012-06-18 17:50:14 +10:00
  • 8f8f119295 Rename request to requests for consistency Rohan Mitchell 2012-06-18 17:02:04 +10:00
  • 82ca7112c2 Remove distributor association from orders and from the checkout process Rohan Mitchell 2012-06-18 17:01:08 +10:00
  • d704f3aa68 Enable therubyracer JS env, reqd on linux Rohan Mitchell 2012-06-18 16:58:06 +10:00
  • f8411cd5db Add db schema, remove from .gitignore Rohan Mitchell 2012-06-18 09:23:06 +10:00
  • 93a5bddeb5 Added initial request spec for making a purchase. Andrew Spinks 2012-06-11 13:18:04 +10:00
  • d089500a5e Added product request spec and fixed bug when setting supplier. Andrew Spinks 2012-06-10 16:54:38 +10:00
  • 92b55e6478 Added distributors request spec. Andrew Spinks 2012-06-10 13:31:07 +10:00
  • 1288760839 Added first working acceptance spec for supplier. Andrew Spinks 2012-06-09 14:41:09 +10:00
  • 3361d29146 fix defaulting of country to australia so that it doesn't stop db:reset from working. Andrew Spinks 2012-06-09 11:23:07 +10:00
  • 04e4523f6b upgrade to spree 1.1 Andrew Spinks 2012-05-20 16:28:14 +10:00
  • 0f42ad07a7 fix s3 bucket. Andrew Spinks 2012-05-12 13:48:43 +10:00
  • 02f5d01ca1 try to get s3 to work. Andrew Spinks 2012-05-12 13:37:26 +10:00
  • 5088363c84 add supplier to product on admin views. Andrew Spinks 2012-04-29 18:35:14 +10:00
  • 3b2ae5bca1 add supplier validations Andrew Spinks 2012-04-29 17:39:30 +10:00
  • c9effe5926 Add seperate address fields - don't become too attached to spree. Andrew Spinks 2012-04-29 17:31:47 +10:00
  • e4fd20b807 Add default supplier view and relationship to address. Andrew Spinks 2012-04-29 16:32:38 +10:00
  • 7ea0f73398 begin adding suppliers Andrew Spinks 2012-04-22 14:51:24 +10:00
  • 4ad11c1faf delete and edit distributors Andrew Spinks 2012-04-22 13:01:56 +10:00
  • 147985b94d fix sorting of distributors by name Andrew Spinks 2012-04-22 12:58:40 +10:00
  • c3f7a7fd2c fix default country and state selection. Andrew Spinks 2012-04-22 12:45:05 +10:00
  • 48c6f4d7cc default states to current zone. Andrew Spinks 2012-04-22 12:10:35 +10:00
  • f075c50926 disable distributors in checkout - broken states. Andrew Spinks 2012-04-09 10:50:56 +10:00
  • 088febfe7b dont barf on distributors without a country. Andrew Spinks 2012-04-09 10:37:35 +10:00
  • 2e9e441ba1 fix bug with states screwing up when using deface. Andrew Spinks 2012-04-09 10:31:47 +10:00
  • 7f5e0c406d Copy spree address partial so bug can be fixed. Andrew Spinks 2012-04-09 10:24:18 +10:00
  • f7372a80c2 add distributor to checkout Andrew Spinks 2012-04-09 09:56:37 +10:00
  • b2b8bd0112 add selector for distributor in checkout. Not saving relation as yet. Andrew Spinks 2012-04-07 16:34:27 +10:00
  • 3f1ed0ca06 make distributors work in spree admin framework. Andrew Spinks 2012-04-07 12:10:44 +10:00
  • 0a6852616d added distributors. Andrew Spinks 2012-03-31 19:16:57 +11:00
  • 511dfa23af add rspec Andrew Spinks 2012-03-31 16:38:16 +11:00
  • e93c1decde Change checkout zone so that Austrlia is the default country selected in checkout. Andrew Spinks 2012-03-31 16:37:29 +11:00
  • 5ae983caba Use Australian locale. Andrew Spinks 2012-03-28 20:28:52 +11:00
  • 6debd10a0a lockit! Andrew Spinks 2012-03-27 14:05:48 +11:00
  • 44a9fc46f8 disable s3 support to try and fix heroku deploy issue. Andrew Spinks 2012-03-27 14:04:52 +11:00
  • 7f33da5cb1 add initial s3 support. Andrew Spinks 2012-03-27 12:09:54 +11:00
  • f9bd58bf5f switch to unicorn. Andrew Spinks 2012-03-27 11:22:20 +11:00
  • cd1938a74e spree install. Andrew Spinks 2012-03-27 11:06:49 +11:00