Commit Graph

  • bdea85d1b4 Rollback all Spree 1.3 migrations Rob H 2013-02-07 15:24:17 +11:00
  • 2a07d61e81 Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue Rob H 2013-02-07 15:09:25 +11:00
  • 99b4530db2 WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name Rob H 2013-02-07 13:07:14 +11:00
  • 3507c5414d Changed Sass variable: back to our green colour following upgrade Rob H 2013-02-07 09:25:29 +11:00
  • 4b254a5529 WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name Rob H 2013-02-06 11:25:26 +11:00
  • 612017f143 WIP Upgrade to Spree 1.3 Rob H 2013-02-05 15:01:45 +11:00
  • e559870189 Merge remote-tracking branch 'origin/master' Rob H 2013-02-01 13:15:25 +11:00
  • 5b22cce950 Remove sleeps from specs Rohan Mitchell 2013-01-22 12:12:29 +11:00
  • fec81b7ed4 Fix failing specs after merge Rohan Mitchell 2013-01-22 11:34:43 +11:00
  • f2f3bbd3ed Merge branch 'order-cycles-exchange-products' Rohan Mitchell 2013-01-22 10:40:56 +11:00
  • 83e3c6815d Merge branch 'checkout-changes' Rohan Mitchell 2013-01-22 10:30:51 +11:00
  • 3f71655bd1 Test updating collection details Rohan Mitchell 2013-01-22 09:44:19 +11:00
  • 662aaf75bf When editing an order cycle, distributor collection details are loaded Rohan Mitchell 2013-01-22 09:34:07 +11:00
  • f7890bd94d Fixes following code review for checkout changes Rob H 2013-01-18 19:17:55 +11:00
  • 6a45e8be3b Make tests pass after changes to checkout broke them all Rob H 2013-01-18 15:29:36 +11:00
  • c75738893e Display supplier name on products for distribution Rohan Mitchell 2013-01-18 14:35:06 +11:00
  • 074d5715e7 Only provide distributors as coordinating enterprises. Order by name. Rohan Mitchell 2013-01-18 14:26:56 +11:00
  • 87d5ffeee2 Add fields for outgoing exchange collection details Rohan Mitchell 2013-01-18 14:24:17 +11:00
  • 9a03a58d9e Change exchange pickup time from datetime to string Rohan Mitchell 2013-01-18 14:23:58 +11:00
  • ae93d02c9c OrderCycleFormApplicator applies outgoing exchange collection details Rohan Mitchell 2013-01-18 14:23:42 +11:00
  • d8a7570a61 Display accurate counts for distributed products Rohan Mitchell 2013-01-18 12:21:35 +11:00
  • a293ea54f9 Update saves distributors and distributed products Rohan Mitchell 2013-01-18 12:13:13 +11:00
  • 33b9d45f43 Distributors and products displayed on edit Rohan Mitchell 2013-01-18 11:59:32 +11:00
  • 0a2ce30bb6 Only show variants for distribution that are supplied to the order cycle Rohan Mitchell 2013-01-18 11:52:01 +11:00
  • 1a0ef85030 Test distributor exchanges are created with order cycles Rohan Mitchell 2013-01-18 11:40:09 +11:00
  • 983ba92dea OrderCycleFormApplicator deals with outgoing exchanges Rohan Mitchell 2013-01-18 11:22:42 +11:00
  • 487247f6e7 Upgrade selenium-webdriver, fixes testing in new firefox Rohan Mitchell 2013-01-18 09:35:29 +11:00
  • 05c9a189c8 Merge branch 'email-changes' Rohan Mitchell 2013-01-17 16:09:25 +11:00
  • 43a1cf7779 Merge branch 'product-quantity-fix' Rohan Mitchell 2013-01-17 16:07:55 +11:00
  • 12dad2468d Reorder specs Rohan Mitchell 2013-01-17 15:13:41 +11:00
  • 8f17df0e45 Name exchange elements independently Rohan Mitchell 2013-01-17 11:36:56 +11:00
  • 8e9845be12 Functionalise Rohan Mitchell 2013-01-17 11:01:28 +11:00
  • 3991199c30 Only show products for distribution that have been supplied to the order cycle Rohan Mitchell 2013-01-17 10:49:59 +11:00
  • 8f05c69696 Display all supplied products for distribution Rohan Mitchell 2013-01-15 12:31:57 +11:00
  • f3f0f37716 Return to indexing for exchanges - this way new entries without an id get an index Rohan Mitchell 2013-01-15 12:21:57 +11:00
  • 850d65958b Build Enterprise.supplied_products, an array of all products supplied by any enterprise Rohan Mitchell 2013-01-15 12:21:13 +11:00
  • 488fc2d60e Upgrade capybara, spec/requests changed to spec/features Rohan Mitchell 2013-01-15 10:10:24 +11:00
  • a10eb0d0c7 List and add distributor exchanges Rohan Mitchell 2013-01-11 15:53:51 +11:00
  • 9e59dead07 Tidy up coffee Rohan Mitchell 2013-01-11 15:52:45 +11:00
  • d3fca565a3 Fix file naming and controller definition/testing Rohan Mitchell 2013-01-11 14:09:56 +11:00
  • f971958042 Port order cycles js to coffeescript Rohan Mitchell 2013-01-11 13:39:26 +11:00
  • 3e06220b7f WIP: Rename order_cycle to coffee Rohan Mitchell 2013-01-11 10:57:02 +11:00
  • 3694321f66 Use angular's extend instead of jquery's Rohan Mitchell 2013-01-11 10:54:53 +11:00
  • 24a48a9b33 Move enterpriseTotalVariants to Enterprise service Rohan Mitchell 2013-01-11 10:50:03 +11:00
  • bb13ec0e02 Rename methods Rohan Mitchell 2013-01-11 10:40:56 +11:00
  • d3189e333b Count selected variants on an exchange Rohan Mitchell 2013-01-11 10:36:27 +11:00
  • a9fb10b0ca Do not show master selection if there are variants Rohan Mitchell 2013-01-10 16:25:29 +11:00
  • 3186b703a2 Apply basic styling for order cycle product selection Rohan Mitchell 2013-01-10 15:57:22 +11:00
  • e46d61075e Simplify field naming Rohan Mitchell 2013-01-10 15:33:56 +11:00
  • 4e78fa19a3 Add spec for updating order cycle, minor fixes Rohan Mitchell 2013-01-10 15:29:13 +11:00
  • 31ea8540ea Test editing an order cycle - all data is displayed Rohan Mitchell 2013-01-10 15:02:56 +11:00
  • d27ef76ead Load exchange variants from correct attr Rohan Mitchell 2013-01-10 11:03:35 +11:00
  • 5129e31f21 Remove unneeded exchange_variants init Rohan Mitchell 2013-01-10 11:00:09 +11:00
  • c5d031a6d7 Simplify exchange products/variants JSON output format, bind angular to this Rohan Mitchell 2013-01-10 10:59:53 +11:00
  • c7d3b9ee1a Upgrade to Rails 3.2.11 Rohan Mitchell 2013-01-10 09:34:52 +11:00
  • 62a7a0db7c Add spec for updating exchanges Rohan Mitchell 2013-01-09 10:50:17 +11:00
  • f8c74e8b92 Make most OrderCycleFormApplicator methods private, add spec for adding exchanges Rohan Mitchell 2013-01-09 10:41:09 +11:00
  • e53fff8e31 Split OrderCycleFormApplicator specs into unit / integration, add integration spec for exchange_exists? Rohan Mitchell 2013-01-09 10:18:06 +11:00
  • ba19db3ccf Add or update exchange variants when creating or updating order cycles Rohan Mitchell 2013-01-09 10:06:51 +11:00
  • 04297d928e Correct naming of OrderCycleFormApplicator spec Rohan Mitchell 2013-01-09 09:16:25 +11:00
  • 1d357af708 Disable Jirafe and UserVoice outside of production -> test speedup Rohan Mitchell 2013-01-09 09:14:43 +11:00
  • 6a666dd7ec Move preventDefault from service to controller Rohan Mitchell 2013-01-08 17:51:08 +11:00
  • f705926c72 Display check boxes for products and variants, bind to model Rohan Mitchell 2013-01-08 15:16:28 +11:00
  • 7ae315a1cb Remove directives test stub Rohan Mitchell 2013-01-08 15:15:20 +11:00
  • 836f568b8e Display variants under products for exchange suppliers Rohan Mitchell 2013-01-08 13:33:02 +11:00
  • 043e67fd9d Test adding suppliers Rohan Mitchell 2013-01-08 11:58:49 +11:00
  • 6ca56cbb94 Add AGPL licence Rohan Mitchell 2012-12-18 15:56:54 +11:00
  • ebcd5fdeed Merge branch 'master', remote-tracking branch 'origin' Rob H 2012-12-14 15:55:04 +11:00
  • 63cf128f86 Remove product descriptions from line item listings in cart and order Rob H 2012-12-14 15:08:35 +11:00
  • 1f8b4d185b Rearrange 'Add To Cart' section of product page Rob H 2012-12-14 14:01:13 +11:00
  • c7ac0f7d91 Allow distributor to be changed from product page Rob H 2012-12-14 11:57:34 +11:00
  • 8a37b4e918 Push validation logic for changing distributor down into lib class Rob H 2012-12-14 11:02:01 +11:00
  • 19e55428b8 Test fetching enterprises Rohan Mitchell 2012-12-13 16:24:59 +11:00
  • 8d8c2f04d8 Add test for removesInactiveExchanges Rohan Mitchell 2012-12-13 14:55:11 +11:00
  • bec10be233 Make create test thinner Rohan Mitchell 2012-12-13 14:46:07 +11:00
  • 2382de946f Test OrderCycle service create order cycle, use $window for testability Rohan Mitchell 2012-12-13 14:37:35 +11:00
  • fc34c9c804 Add controller level check of product count_on_hand for adding products to cart Rob H 2012-12-13 11:16:46 +11:00
  • 0f5d51423b Provide jQuery to tests, test loading an order cycle Rohan Mitchell 2012-12-08 17:24:57 +11:00
  • 91e3ddb93c Begin writing test for OrderCycle service Rohan Mitchell 2012-12-07 16:24:40 +11:00
  • 8cfce57730 Add unit tests for AdminEditOrderCycleCtrl Rohan Mitchell 2012-12-07 15:30:49 +11:00
  • 9c9431ca7f Install Letter Opener for development environment Rob H 2012-12-07 14:31:23 +11:00
  • 3a3f427a8d Reference name of payment method rather than payment method itself Rob H 2012-12-07 14:30:05 +11:00
  • b5a95e73dc Only show alternative distributors on 'address' page of checkout process Rob H 2012-12-07 12:29:44 +11:00
  • 9cf6124df3 Change checkout explanations from CMS pages to CMS snippets Rob H 2012-12-07 12:24:28 +11:00
  • 46abc2fc42 Add ability to change distributor based on whether products in the cart are available Rob H 2012-12-07 11:56:40 +11:00
  • 0a6686b592 Add unit tests for AdminCreateOrderCycleCtrl angular controller Rohan Mitchell 2012-12-05 16:09:20 +11:00
  • 55423d2df1 Display all supplied products for selection Rohan Mitchell 2012-12-04 15:24:11 +11:00
  • e9746ebc9b Display exchange product names Rohan Mitchell 2012-12-04 14:52:59 +11:00
  • 505f33a3f7 Display variant image url in json output Rohan Mitchell 2012-12-04 14:14:36 +11:00
  • 1d4d7d064b Add exchange products form, shown/hidden by button press Rohan Mitchell 2012-12-04 12:26:18 +11:00
  • a4d3cc5417 Display exchange variants in JSON, load data client side Rohan Mitchell 2012-12-04 12:07:58 +11:00
  • 3080454b25 Merge branch 'order-cycles' Rohan Mitchell 2012-12-04 11:40:35 +11:00
  • cd13ab4f77 Fix failing tests Rohan Mitchell 2012-12-04 11:39:39 +11:00
  • 9880c45313 Perform all XHR with instead of Rohan Mitchell 2012-12-04 11:07:44 +11:00
  • 5afb2bb8f9 Extract Enterprise fetching into service Rohan Mitchell 2012-12-04 10:51:14 +11:00
  • aefa06b67d Edit works with service Rohan Mitchell 2012-12-04 10:30:07 +11:00
  • 7d84803bad Extract OrderCycle into service, create works Rohan Mitchell 2012-12-04 10:18:31 +11:00
  • fee64a5764 Datetime recognises input datetime format Rohan Mitchell 2012-12-04 09:43:28 +11:00
  • 34ef8a1deb Datetime pickers interact with angular model Rohan Mitchell 2012-12-04 09:38:12 +11:00
  • c055a3c594 remove old rvmrc file kirstenalarsen 2012-12-03 19:31:27 +11:00