Commit Graph

  • 3cceb0a7b0 Ignore app/public Rohan Mitchell 2013-04-05 16:48:38 +11:00
  • fa11ff8982 Remove more spork-specific things, remove unused cuc config from zeus Rohan Mitchell 2013-04-05 15:25:46 +11:00
  • ed7bded642 Remove spork Rohan Mitchell 2013-04-05 15:16:54 +11:00
  • 02b524bfce Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle Rohan Mitchell 2013-04-05 15:00:42 +11:00
  • 990931e006 Test splitting the product listing by local/remote order cycle Rohan Mitchell 2013-04-05 14:32:23 +11:00
  • ad32147576 Display correct product splitting criteria Rohan Mitchell 2013-04-05 14:30:35 +11:00
  • 0874f12797 Controllers provide current order cycle for product splitting Rohan Mitchell 2013-04-05 14:30:11 +11:00
  • 661b7da110 Booleanise all the logic Rohan Mitchell 2013-04-05 14:14:12 +11:00
  • f95c6a2386 Extract stub building into private method Rohan Mitchell 2013-04-05 14:11:31 +11:00
  • e735a709bf SplitProductsByDistribution deals with order cycles, and is tested by stubs Rohan Mitchell 2013-04-05 14:05:30 +11:00
  • 3aa48907a6 Add per-product tests for membership of distributor or order cycle Rohan Mitchell 2013-04-05 12:45:01 +11:00
  • cf4fe269d1 Add specs for splitting products by various distribution options Rohan Mitchell 2013-04-05 11:41:37 +11:00
  • f8ebb0c715 Rename split partial and update overrides Rohan Mitchell 2013-04-05 11:34:03 +11:00
  • a11f36e121 Provide pry in test env when we're not building with Travis Rohan Mitchell 2013-04-05 11:28:05 +11:00
  • 11ac0a1277 Fix order cycle selection on products page Rohan Mitchell 2013-04-05 11:26:47 +11:00
  • b3976bfbd0 Rename SplitProductsByDistributor to SplitProductsByDistribution Rohan Mitchell 2013-04-05 11:08:19 +11:00
  • 7cc24f7340 Handle the case where we're viewing a product from a remote distributor that we can change to Rohan Mitchell 2013-04-05 10:28:08 +11:00
  • c681750698 Move distributor/OC browsing into its own acceptance spec Rohan Mitchell 2013-03-27 11:58:38 +11:00
  • f6c76ef8ad Update pry Rohan Mitchell 2013-03-27 11:57:42 +11:00
  • 5544ccb94e Merge branch 'master', remote-tracking branch 'origin' Rob H 2013-03-27 10:42:05 +11:00
  • 3e6c56a638 Add turbo sprockets for faster asset precompile Rohan Mitchell 2013-03-16 13:08:14 +11:00
  • 1d7cf4436a Add comments linking areas concerned with separating products by distributor and order cycle Rohan Mitchell 2013-03-15 17:02:54 +11:00
  • 81b65efb29 Update selenium-webdriver Rohan Mitchell 2013-03-15 16:58:22 +11:00
  • a9a58db137 Add spec for viewing product counts when both a distributor and an order cycle are selected, scope Spree::Product.with_order_cycles_outer joins to avoid clash when using both in_distributor and in_order_cycle in the same query Rohan Mitchell 2013-03-15 12:17:29 +11:00
  • f349628202 Test that products by ProductDistribution are not shown Rohan Mitchell 2013-03-15 11:41:58 +11:00
  • 5089d3bb22 Add simplecov Rohan Mitchell 2013-03-11 10:57:14 +11:00
  • bcd545c13f Alias spree_variants join to avoid name clash when loading products for home page Rohan Mitchell 2013-03-08 17:21:11 +11:00
  • 955f313abc Remove require for queries_product_distribution Rohan Mitchell 2013-03-08 16:59:47 +11:00
  • 711f769bcd Remove QueriesProductDistribution - replaced by Product and Enterprise scopes Rohan Mitchell 2013-03-08 16:57:54 +11:00
  • c9d1573049 Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors Rohan Mitchell 2013-03-08 16:56:58 +11:00
  • b25dcaa92b Enterprise.active_distributors doesn't show distributors from inactive order cycles Rohan Mitchell 2013-03-08 16:54:22 +11:00
  • 2a890f80f4 Enterprise.active_distributors doesn't show distributors of out of stock products Rohan Mitchell 2013-03-08 16:48:35 +11:00
  • 13abf9ada7 Enterprise.active_distributors doesn't show distributors of unavailable products Rohan Mitchell 2013-03-08 16:46:25 +11:00
  • cd61bad0b9 Enterprise.active_distributors doesn't show distributors of deleted products Rohan Mitchell 2013-03-08 16:43:45 +11:00
  • 00d7fcbfb6 Enterprise.active_distributors finds active distributors by order cycles Rohan Mitchell 2013-03-08 16:39:42 +11:00
  • 977344e279 Rewrite scope with outer join Rohan Mitchell 2013-03-08 16:31:54 +11:00
  • 98cad56e7c Enterprise.active_distributors finds active distributors by product distributions Rohan Mitchell 2013-03-08 16:23:45 +11:00
  • 4b642f8c90 Convert to 1.9 hash syntax Rohan Mitchell 2013-03-08 15:08:36 +11:00
  • 43843f05b1 WIP: Add edge case tests Rohan Mitchell 2013-03-08 15:05:55 +11:00
  • d02e8fece5 WIP: Spec that no duplicates are shown Rohan Mitchell 2013-03-08 14:53:27 +11:00
  • dd3c72199a WIP: Add spec for in_order_cycle Rohan Mitchell 2013-03-08 14:43:58 +11:00
  • 6d6390b886 WIP: Spec in_supplier_or_distributor Rohan Mitchell 2013-03-08 14:41:34 +11:00
  • 5c64e18360 WIP: Refactor tests - positive and negative into single cases for easier managability Rohan Mitchell 2013-03-08 14:39:19 +11:00
  • 29a9526b3f WIP: Add spec for in_distributor Rohan Mitchell 2013-03-08 14:30:17 +11:00
  • 8e1c9e7bcc WIP: Add notes, put in Spree module, write in_supplier scope spec Rohan Mitchell 2013-03-08 14:23:45 +11:00
  • 69392100f9 Push QueriesProductDistribution.products_available_for back to model Rohan Mitchell 2013-03-08 14:12:12 +11:00
  • e326e590db Implement and use scopes for finding products by distributor via order cycle or product distribution Rohan Mitchell 2013-03-08 14:10:40 +11:00
  • 265336b70c When looking up distributors for sidebar, include both those in ProductDistributions and in OrderCycles Rohan Mitchell 2013-02-20 11:25:24 +11:00
  • 1285d507eb Revert "Create order cycles where needed by tests" Rohan Mitchell 2013-02-20 11:13:28 +11:00
  • 884dbd5de6 Keep old methods available for product distribution queries Rohan Mitchell 2013-02-20 10:47:43 +11:00
  • ebf1c8602f Write new query for Product#in_distributor that queries order cycles instead of product_distributions Rohan Mitchell 2013-02-07 10:29:48 +11:00
  • dfa94b88aa Display distributor and order cycle choice Rohan Mitchell 2013-02-06 15:35:41 +11:00
  • fcb1701d36 WIP Add hub and order cycle display stub with failing tests Rohan Mitchell 2013-02-06 15:29:55 +11:00
  • c0431c614f Clean up specs, add spec for selecting both hub and OC Rohan Mitchell 2013-02-06 15:09:10 +11:00
  • 624a2799aa Create order cycles where needed by tests Rohan Mitchell 2013-02-06 14:44:30 +11:00
  • a5c706d694 In test, create a global shipping method, which is required when creating orders Rohan Mitchell 2013-02-05 15:24:49 +11:00
  • 666f110d47 Load distributor list from those in an active order cycle Rohan Mitchell 2013-02-01 17:21:49 +11:00
  • 3aa44c3e9a Setting a remote distributor clears the order cycle, and vice versa Rohan Mitchell 2013-02-01 17:06:29 +11:00
  • e1b2490259 Selecting an order cycle highlights valid distributor choices Rohan Mitchell 2013-02-01 14:12:46 +11:00
  • 74e2b70d3a Without JS, select distributor, highlighting local order cycle choices Rohan Mitchell 2013-02-01 11:58:38 +11:00
  • 72a9286457 Add helper to generate a local/remote class for order cycle selection Rohan Mitchell 2013-02-01 11:44:28 +11:00
  • 456dfcf6db Style distribution choice, add compass for border radius mixin Rohan Mitchell 2013-01-31 12:26:29 +11:00
  • 34cb8bab26 View order cycle and distributor choices Rohan Mitchell 2013-01-31 12:26:05 +11:00
  • fe824c2d4e Add order cycle active and inactive scopes Rohan Mitchell 2013-01-31 10:14:12 +11:00
  • 8b5aea42b8 Add deface for order cycle selection Rohan Mitchell 2013-01-31 09:53:06 +11:00
  • 63f3504b81 Add order cycle reference to orders Rohan Mitchell 2013-01-31 07:48:31 +11:00
  • bd5533e2b1 Revert "Add a failing test to test travis" Rohan Mitchell 2013-02-24 20:22:37 +11:00
  • 72aa8fe5e5 Add a failing test to test travis Rohan Mitchell 2013-02-24 19:57:57 +11:00
  • cdc3ab09a1 Set up xvfb for Travis Rohan Mitchell 2013-02-24 19:42:32 +11:00
  • b030793f15 Fix migrations that fail because of coupling to changed/removed models Rohan Mitchell 2013-02-24 19:09:43 +11:00
  • 3a441cd7d9 Configure travis for postgres Rohan Mitchell 2013-02-24 18:46:31 +11:00
  • 2b19253895 Attempt 2 Rohan Mitchell 2013-02-24 18:17:46 +11:00
  • d60935c800 Exclude pry from CI build Rohan Mitchell 2013-02-24 18:05:11 +11:00
  • 4bcd55959a spree-last-address repo deleted - use mirror Rohan Mitchell 2013-02-24 17:51:46 +11:00
  • 719ef386bf Only build on Ruby 1.9.3 Rohan Mitchell 2013-02-24 17:51:20 +11:00
  • e3fdb12289 Add travis config Rohan Mitchell 2013-02-24 17:36:19 +11:00
  • b0a665aef7 Update ransack (rubygems could not find previous version) Rohan Mitchell 2013-02-20 15:44:21 +11:00
  • 3982b2a690 Merge branch 'new-spree' Rohan Mitchell 2013-02-20 15:24:27 +11:00
  • a59b136864 Spree 1.3 upgrade: fix final failing tests Rob H 2013-02-20 15:16:43 +11:00
  • 055c07a466 Add before_payment method to checkout controller (fixes issues with spree_paypal_express) Rob H 2013-02-20 14:04:10 +11:00
  • 8903c13c84 Bugsnag uses SSL, notify on staging as well as production Rohan Mitchell 2013-02-20 10:09:43 +11:00
  • 046eb256ff Fix issues causing enterprise fee tests to break Rob H 2013-02-15 14:10:56 +11:00
  • 68246e08d2 Fix stack overflow error in admin shipping method test Rob H 2013-02-15 10:34:17 +11:00
  • 1ded1bac3f Lengthen Capybara.default_wait_time for tests that fail due to long load time Rob H 2013-02-15 10:31:41 +11:00
  • 2f1a9094bf Fix StaleObjectError in order model test Rob H 2013-02-14 16:49:28 +11:00
  • 2cdf458d6a Move additional of tabs to main nav bar to defaces, rather than overriding view directly Rob H 2013-02-14 15:42:47 +11:00
  • 9e9199643e Remove unneeded :partial from override Rob H 2013-02-14 15:35:50 +11:00
  • c956706d78 Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test Rob H 2013-02-14 15:12:50 +11:00
  • 290f2276cd Update cms_admin spec work after Spree 1.3 upgrade broke it Rob H 2013-02-14 14:03:14 +11:00
  • b924b0c817 Remove unnecessary include of Spree::Core::CurrentOrder (helper is now accessible by all controllers in Spree 1.3) Rob H 2013-02-14 12:24:01 +11:00
  • d7c2bdfe22 Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3) Rob H 2013-02-14 12:12:19 +11:00
  • a3746c6c59 Add analytics helper to Enterprises Controller Rob H 2013-02-14 12:10:31 +11:00
  • 7cc1c97c53 Upgrade spree to 1.1.6beta Rohan Mitchell 2013-02-12 09:18:50 +11:00
  • ccfe6bc0b3 Update bugsnag Rohan Mitchell 2013-02-07 15:18:07 +11:00
  • 5e2fbcb874 Add script to sanitize order and user data. Andrew Spinks 2013-02-10 16:46:43 +11:00
  • 1d4fbe865b Finished revision of defaces Rob H 2013-02-09 00:40:34 +11:00
  • c517469662 Added down method to remove_display_on_from_payment_methods migration Rob H 2013-02-07 22:54:07 +11:00
  • 1ead1dadaf Upgrade database to Spree 1.3 Rob H 2013-02-07 15:58:15 +11:00
  • 109d5cfe67 Upgrade database to Spree 1.2 Rob H 2013-02-07 15:34:00 +11:00
  • 62d6745f02 Rollback all Spree 1.3 migrations (forgot db/schema.rb) Rob H 2013-02-07 15:24:59 +11:00