Commit Graph

  • 15f212713b Updated rvmrc with rvm auto generated scripts. alexs 2013-07-22 17:33:34 +10:00
  • 9f1a7746a4 WIP: start writing order scope test David Cook 2013-07-22 17:30:01 +10:00
  • 8017d79de4 remove report tests (will test scope not_state instead) David Cook 2013-07-22 17:17:18 +10:00
  • 4cdd858f48 Disable order cycles in the front end by default. Andrew Spinks 2013-07-22 17:16:55 +10:00
  • bc913fd355 Reset ActionMailer::Base.deliveries at start of test - http://stackoverflow.com/questions/5843284/clearing-out-activemailerbase-deliveries-after-rspec-test Rohan Mitchell 2013-07-22 16:58:53 +10:00
  • f5f5433738 Require pry in test env outside of Travis Rohan Mitchell 2013-07-22 16:56:00 +10:00
  • 452ccfdb68 Remove debug statement Rohan Mitchell 2013-07-22 16:55:44 +10:00
  • 2ddc5b4e4a Move strip_html to main app, fixes context-sensitive chili feature spec fail Rohan Mitchell 2013-07-22 16:21:32 +10:00
  • d9988dac09 Remove unneeded feature application controllers and rake task files Rohan Mitchell 2013-07-22 16:15:35 +10:00
  • 55277e2f0a test for inactive enterprises being counted in 'x more' on sidebar, disable limit test David Cook 2013-07-22 14:55:46 +10:00
  • 66d345d360 fix 'x more' count, disable sidebar limit (config for this to be implemented later) David Cook 2013-07-22 14:53:08 +10:00
  • d0421cbc4d Define feature toggles in FeatureToggle class rather than ENV['OFW_DEPLOYMENT'] Rohan Mitchell 2013-07-22 14:34:29 +10:00
  • 7b1d1f1d42 Add FeatureToggle config to replace ENV['OFW_DEPLOYMENT'] Rohan Mitchell 2013-07-22 12:11:52 +10:00
  • 1ea48af98b Updated contributors list. alexs 2013-07-22 11:56:33 +10:00
  • 5e4cabc967 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-07-22 11:49:09 +10:00
  • 40bd0e9c58 Fixed product seed. alexs 2013-07-22 11:48:59 +10:00
  • 3b4ad6558c Added .rvmrc. alexs 2013-07-22 11:48:39 +10:00
  • 6f57c2a01a Bumped up debugger-ruby_core_source version to address bundle installation issues. alexs 2013-07-22 11:48:12 +10:00
  • 6ceb8e9ee7 Restore change: render checkout distributor details from partial Rohan Mitchell 2013-07-22 11:23:48 +10:00
  • 568837aa53 Revert "On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME" Rohan Mitchell 2013-07-22 11:22:20 +10:00
  • efec0b07d6 Merge branch 'amazon-ec2' Rohan Mitchell 2013-07-22 10:29:11 +10:00
  • f0755f34aa tidy up javascript, remove unnecessary disableSaveOnClick David Cook 2013-07-19 17:05:09 +10:00
  • 15c454a0f1 move style to stylesheet David Cook 2013-07-19 17:04:04 +10:00
  • 46043f2237 click new 'Save and Continue' button David Cook 2013-07-16 17:02:06 +10:00
  • 0a25dfc679 remove disabled flag David Cook 2013-07-16 17:01:12 +10:00
  • 050b884076 remove old-style deface file in favour of new .deface format David Cook 2013-07-16 17:00:04 +10:00
  • 1d2704ab4c Clean up comments David Cook 2013-07-16 15:55:28 +10:00
  • c9432288c5 Clean up comments and use admin_orders_path for checking current page David Cook 2013-07-16 15:36:14 +10:00
  • 0ad7cde198 Add factory for an order with items and valid distributor David Cook 2013-07-12 16:42:33 +10:00
  • 4fc0608a44 Finish capture order test David Cook 2013-07-12 16:41:20 +10:00
  • a76232bb7e Make sure admin_user has admin privilege for new version of Spree David Cook 2013-07-12 14:02:37 +10:00
  • 5683656605 Merge branch 'invalid-login-message' Rohan Mitchell 2013-07-12 13:07:30 +10:00
  • 7341d5e11a ignore Sublime project files David Cook 2013-07-05 16:24:37 +10:00
  • 8df0f30b4f Move override into .deface format, and removed unecessary bits David Cook 2013-07-05 16:08:26 +10:00
  • 50b5d13e1f Add javascript to hide new save button if not supported (not yet tested on old browsers) David Cook 2013-06-28 17:53:39 +10:00
  • 5b58351b73 minor changes David Cook 2013-06-28 17:04:58 +10:00
  • 3007549aa5 use .length instead of .count which produced unexpected results David Cook 2013-06-28 17:02:26 +10:00
  • 3de52b10b2 Fix JS error: Unknown provider: a from order_cycle Rohan Mitchell 2013-06-25 12:31:28 +10:00
  • ce2c6c5661 Fix uninjected directive for enterprise fees Rohan Mitchell 2013-06-25 12:17:15 +10:00
  • b7a778b0de Define order cycles JS methods in a minification-friendly manner Rohan Mitchell 2013-06-25 10:58:12 +10:00
  • f78db2493f Define enterprise fees controller in a minification-safe manner Rohan Mitchell 2013-06-25 10:35:45 +10:00
  • 2373601e9d Switch to Karma for angluar testing Rohan Mitchell 2013-06-25 10:35:17 +10:00
  • 37a4ad3372 Don't 500 when setting cart order cycle to nil Rohan Mitchell 2013-06-21 17:04:47 +10:00
  • a63b8908bb Moved inline style to stylesheet David Cook 2013-06-21 16:12:56 +10:00
  • 0525abb084 Test that scopes don't return deleted products David Cook 2013-06-21 15:53:12 +10:00
  • 250e76c281 Fix incorrect count of enterprises (due to bug in rails issue #5554) David Cook 2013-06-21 15:10:21 +10:00
  • ae43fd1333 Set distributor and order cycle in one step, avoiding validation errors. Update spec with new error messages. Rohan Mitchell 2013-06-21 11:36:24 +10:00
  • 72f1c52b3e Update Order model distribution validation - make fully inclusive of order cycles Rohan Mitchell 2013-06-21 11:35:42 +10:00
  • bc40b2c856 Test each distinct distributor/order cycle invalid combination case Rohan Mitchell 2013-06-21 11:06:21 +10:00
  • 7121860416 new view to display all distributors David Cook 2013-06-21 10:53:24 +10:00
  • 2e6387ac60 test available_on for distributors David Cook 2013-06-21 10:52:15 +10:00
  • 38c0552362 test 'more' count David Cook 2013-06-21 10:47:04 +10:00
  • 2d64e257ff break long lines into two; no functional change David Cook 2013-06-21 10:45:11 +10:00
  • d95903a82d add html output format for all distributors David Cook 2013-06-21 10:44:16 +10:00
  • b0e4bef75e rename sidebar collection variables to avoid clash, fix count to be distinct David Cook 2013-06-21 10:42:42 +10:00
  • 3386da4b4c Validate distribution combination for new products added to cart Rohan Mitchell 2013-06-21 10:39:08 +10:00
  • cfcc8c3fb2 Fix DistributionChangeValidator#variants_available_for_distribution: Do not show products distributed through a different order cycle Rohan Mitchell 2013-06-21 10:34:39 +10:00
  • 69019859da Refactor views Rohan Mitchell 2013-06-20 15:14:23 +10:00
  • b8d0e3f49a OrderPopulator decorator checks cart contents against order cycle as well as distributor Rohan Mitchell 2013-06-20 15:13:59 +10:00
  • 98be44b301 Disable asset debug logging David Cook 2013-06-20 11:50:34 +10:00
  • 4e2549d347 Add host setting, required for authenticating local DBs David Cook 2013-06-20 11:49:36 +10:00
  • 65af89c962 ignore new rvm files David Cook 2013-06-20 11:48:22 +10:00
  • 12fb43e268 DistributionChangeValidator returns an empty array when distributor and order cycle are both nil Rohan Mitchell 2013-06-17 16:01:10 +10:00
  • 1d977de328 Order validation performed over both product distribution and order cycle distribution Rohan Mitchell 2013-06-17 15:06:41 +10:00
  • 705af41684 DistributionChangeValidator finds variants distributed by product distribution when order cycle is nil Rohan Mitchell 2013-06-17 15:06:20 +10:00
  • be29974dd8 DistributionChangeValidator checks if an order can change to a specified new distributION Rohan Mitchell 2013-06-17 15:00:19 +10:00
  • 27b5dc071a Order cycle reports on the variants distributed by a particular distributor Rohan Mitchell 2013-06-17 14:58:13 +10:00
  • 17103a8b0c Remove DistributionChangeValidator#can_change_distributor? method Rohan Mitchell 2013-06-17 14:00:39 +10:00
  • da02cb5a93 Reorder specs Rohan Mitchell 2013-06-17 12:05:46 +10:00
  • a355a09a7c Disable distributor change in checkout until it takes order cycles into account Rohan Mitchell 2013-06-17 11:45:23 +10:00
  • b5479380b6 Refactor alternative distributors at checkout form, fixing indentation and removed double negatives Rohan Mitchell 2013-06-17 11:41:35 +10:00
  • 6d22f56c86 Distribution selection form is not shown when there are products in the cart. This form doesn't filter options based on which can supply the products in the cart, so don't show it in those circumstances. Rohan Mitchell 2013-06-17 11:29:36 +10:00
  • 95de78f24e Tidy-ups Rohan Mitchell 2013-06-17 10:03:00 +10:00
  • bfe8184b6a Reload order before setting variant attributes, fixes group buy Rohan Mitchell 2013-06-17 10:02:49 +10:00
  • 1a9fd4a9a8 Merge branch 'supplied-active-products-on-hand' of github.com:eaterprises/openfoodweb into supplied-active-products-on-hand David Cook 2013-06-14 17:40:12 +10:00
  • 7933dea611 WIP: add more tests David Cook 2013-06-14 17:38:51 +10:00
  • 7ce7107c6c Add meaningfull ids and classnames David Cook 2013-06-14 17:37:44 +10:00
  • 1abc0dac68 rename vars again David Cook 2013-06-14 17:36:38 +10:00
  • 065ea6a1a1 Remove controller specs that are now covered by OrderPopulator Rohan Mitchell 2013-06-14 14:57:31 +10:00
  • 4e5f0b9963 Set potential distributor and order cycle before attempting add to cart, revert on failure Rohan Mitchell 2013-06-14 14:57:08 +10:00
  • 772d01abf7 Merge branch 'favicon' Rohan Mitchell 2013-06-14 12:22:51 +10:00
  • 063d760047 Merge branch 'master' into supplied-active-products-on-hand Rohan Mitchell 2013-06-14 11:07:24 +10:00
  • 26c3b80e87 Reverse unintentional changes to database.yml and db/schema.rb Rohan Mitchell 2013-06-14 11:05:56 +10:00
  • 1a06b53b21 More verbose sign in error message David Cook 2013-06-13 16:29:45 +10:00
  • 203232de27 Disable as this has now been incorporated into move_save_checkout_button David Cook 2013-06-13 12:30:35 +10:00
  • aa468140ac Move save/process button to side on checkout pages David Cook 2013-06-13 12:29:34 +10:00
  • 5e120b35aa Ensure orders controller decorator is loaded, fixes home controller test failures Rohan Mitchell 2013-06-13 07:57:03 +10:00
  • 30253ffd07 align actions column left for better usability David Cook 2013-06-12 15:51:07 +10:00
  • 017275f40e fix error when order has no payments (ie not yet complete) David Cook 2013-06-12 15:40:36 +10:00
  • 7381163023 test for cancelled orders in order and distributor report David Cook 2013-06-12 15:19:45 +10:00
  • ea3922a023 filter out cancelled orders from the reports David Cook 2013-06-12 15:19:14 +10:00
  • 415de37a6a WIP for order spec David Cook 2013-06-12 13:33:15 +10:00
  • cf4582c08e Create respond_override to return user back to the referring page. (But it breaks payments#create respond_with..) David Cook 2013-06-12 11:24:49 +10:00
  • 2b15f92ab8 fix capture button to link to latest payment David Cook 2013-06-12 09:58:44 +10:00
  • 269c6ac14f Use CSS substring selector for selecting Capture link by order number David Cook 2013-06-11 17:16:37 +10:00
  • ada95183a2 Start respond_override David Cook 2013-06-11 17:09:41 +10:00
  • fb25946acd Start to write a test spec.. (not complete) David Cook 2013-06-11 17:00:07 +10:00
  • df769a2f4c ensure latest 'payment' object is used for the capture button David Cook 2013-06-11 16:57:14 +10:00
  • 4967093b72 Add capture button and resize columns David Cook 2013-06-11 15:07:41 +10:00
  • 71ee764d65 Fix travis fails - set deployment before requiring gems, race condition in distributor info spec Rohan Mitchell 2013-06-07 17:08:55 +10:00