Commit Graph

  • da9e756d9f Fix migration for envs without distributors Rohan Mitchell 2013-09-19 11:32:00 +10:00
  • 08941ae22b Data integrity Rohan Mitchell 2013-09-19 11:22:55 +10:00
  • f06f4702ed Update newrelic agent Rohan Mitchell 2013-09-19 09:35:13 +10:00
  • 136ec7d9d3 Remove heroku newrelic config Rohan Mitchell 2013-09-19 09:34:57 +10:00
  • dc9206ccf6 Re-arrange top nav area Rohan Mitchell 2013-09-18 16:27:08 +10:00
  • b544c3a4f9 Add distributor column to admin shipping methods and payment methods pages David Cook 2013-09-18 13:29:24 +10:00
  • c30b8554da Pin deface to working version, update spree_paypal_express with state capitalisation fix Rohan Mitchell 2013-09-18 12:38:41 +10:00
  • 633399bbfb Rename 'Inner Melbourne' region to 'Eaterprises' Rohan Mitchell 2013-09-18 11:55:10 +10:00
  • 42a31ccd74 Show all relevant suppliers and distributors in report drop-down David Cook 2013-09-18 12:30:31 +10:00
  • ad4301df90 Add supplier selection to Orders & Fulfillment Report David Cook 2013-09-18 11:52:08 +10:00
  • fb9adf051e Update bugsnag. I can haz custom exception metadata? Rohan Mitchell 2013-09-18 11:42:09 +10:00
  • 4c2d6b38ea Ensure 'No Order Cycle' remains selected after clicking 'Search' David Cook 2013-09-18 09:57:03 +10:00
  • b34d940457 Renamed report column to 'Curr. Cost per Unit' for clarity David Cook 2013-09-16 14:43:31 +10:00
  • 3fbd5dc625 Fix 'No Order Cycle' dropdown in Orders & Fulfillment Reports David Cook 2013-09-16 14:30:20 +10:00
  • 9782dd8264 Get line item cost from order, not current product price which may have changed. Also removed unnecessary total columns. David Cook 2013-09-11 16:08:22 +10:00
  • e57ad81934 Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports David Cook 2013-09-11 12:20:44 +10:00
  • 5ec3c1831d Only show order cycles that the user has access to in reports drop-down David Cook 2013-09-06 16:58:12 +10:00
  • fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' David Cook 2013-09-06 14:39:50 +10:00
  • 5d0dabc1e8 Switch to eaterprises spree_paypal_express with instrumentation to debug state-blank-from-paypal issue Rohan Mitchell 2013-09-18 09:15:30 +10:00
  • 2f73161421 Move patch to address class - much simpler Rohan Mitchell 2013-09-18 07:14:21 +10:00
  • 56590e2f4a Instrument saving spree addresses with invalid values in an attempt to track down the cause of some invalid records finding their way into the database Rohan Mitchell 2013-09-17 18:06:06 +10:00
  • 42a6ad6e7c Inline spree_last_address into the codebase to attempt to fix errors with it appearing only in prod Rohan Mitchell 2013-09-17 13:48:53 +10:00
  • 8a849b8e47 When selecting hub, auto-select order cycle if there is only one option available Rohan Mitchell 2013-09-17 09:57:44 +10:00
  • a929312979 Add scope: OrderCycle.with_distributor Rohan Mitchell 2013-09-17 07:59:11 +10:00
  • c2f1f0986b Fix broken specs Rohan Mitchell 2013-09-16 14:30:46 +10:00
  • d1979a70a1 Fix migration - dependency on modified model relations Rohan Mitchell 2013-09-16 14:26:43 +10:00
  • b032bc0420 Add commented-out code for debugging specs that are otherwise thwarted by poltergeist's timeout Rohan Mitchell 2013-09-16 14:13:07 +10:00
  • f0381f7579 Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it Rohan Mitchell 2013-09-16 14:10:40 +10:00
  • c1a28023ce Move js file to avoid clobbering spree file Rohan Mitchell 2013-09-16 11:17:41 +10:00
  • 9410123841 Convert to github-specific notation in gemfile Rohan Mitchell 2013-09-15 10:09:25 +10:00
  • 4f9c7fb601 Remove distributor_id from payment method and update tests David Cook 2013-09-13 16:58:19 +10:00
  • ee9d9a36d5 Make distributor payment method multi-select David Cook 2013-09-13 12:03:37 +10:00
  • 107c6978c2 Create many-to-many relationship between payment method and distributor David Cook 2013-09-13 10:25:25 +10:00
  • 7e96ba909e Show a list of Order Cycles report types in the description column David Cook 2013-09-13 09:59:35 +10:00
  • 29e1f38207 Set up production distributors for current order cycle Rohan Mitchell 2013-09-12 18:20:50 +10:00
  • af71838610 Fix deface comment David Cook 2013-09-12 15:33:17 +10:00
  • a99f23eb01 Add distributor name to admin orders table David Cook 2013-09-12 15:16:51 +10:00
  • b7541dcd52 Rename 'Home' link to 'OFN' David Cook 2013-09-11 15:13:45 +10:00
  • 8f768d3b84 Update staging distributors Rohan Mitchell 2013-09-10 15:17:18 +10:00
  • b8376a040f Remove superfluous manual change triggers Rohan Mitchell 2013-09-10 12:57:49 +10:00
  • a136161dd6 When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header Rohan Mitchell 2013-09-10 11:56:00 +10:00
  • 583164efb5 Fix variant price calculation Rohan Mitchell 2013-09-10 11:52:13 +10:00
  • 315876ca9d Don't display bullets next to variant options Rohan Mitchell 2013-09-10 11:52:04 +10:00
  • 0e8443e118 Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil. Rohan Mitchell 2013-09-10 11:28:49 +10:00
  • d43df754d3 Load correct products on enterprise and product listing pages Rohan Mitchell 2013-09-10 10:36:13 +10:00
  • 91550ac82f Move distributor config to its own file, re-enable pry for tests Rohan Mitchell 2013-09-10 09:50:16 +10:00
  • 64a3a309f5 Change 'pick-up date' to 'available on', provide absolute dates in options Rohan Mitchell 2013-09-10 09:11:37 +10:00
  • 15d3bff92d Add delete_content_for helper, can be used for removing the sidebar from spree views Rohan Mitchell 2013-09-10 08:45:59 +10:00
  • 3ac4bd3b5f Hide adjustments in cart by default, show by click Rohan Mitchell 2013-09-09 14:37:36 +10:00
  • 644beeb093 Revert "Fix test fail" Rohan Mitchell 2013-09-09 10:55:40 +10:00
  • 1de0f85c73 Fix test fail Rohan Mitchell 2013-09-09 10:41:28 +10:00
  • d32a8b56d0 When order cycle is selected, only show variants that are in it Rohan Mitchell 2013-09-09 10:40:15 +10:00
  • 57906e6f8b Fix seed failure due to ShippingMethod factory creating an enterprise, preventing enterprises from being seeded Rohan Mitchell 2013-09-06 16:01:00 +10:00
  • 33d1948bda Display log in / sign up links on landing page Rohan Mitchell 2013-09-06 13:44:35 +10:00
  • 80bb55496b Temporarily disabling some tests. alexs333 2013-09-05 14:18:40 +10:00
  • 4f64679de7 Simplified shop flow. alexs333 2013-09-04 20:32:47 +10:00
  • 999bc2697a Implemented simlified shop flow. alexs333 2013-09-04 20:32:21 +10:00
  • 25b25b7681 New scope Order.not_state to filter out cancelled orders from reports David Cook 2013-08-30 17:07:17 +10:00
  • bf3c5c6dd6 Merge branch 'master' into reports-completed-only David Cook 2013-08-30 16:42:00 +10:00
  • b0abe566eb Comments David Cook 2013-08-30 16:28:02 +10:00
  • 6a303d7db9 Merge branch 'enterprise-reports' David Cook 2013-08-30 16:27:13 +10:00
  • 61e5ec24e7 Generalise ModelClassFromControllerName David Cook 2013-08-23 14:35:42 +10:00
  • 80bfc5ce53 Ensure Supplier enterprise users can only view their own products in reports David Cook 2013-08-30 15:17:27 +10:00
  • cace60b187 Shipping methods are only shown at checkout if their distributor matches the order Rohan Mitchell 2013-08-30 12:27:13 +10:00
  • 911d8b8bbc Shipping method has a distributor, admin can create and edit Rohan Mitchell 2013-08-30 11:43:45 +10:00
  • 314e464c3f Add failing spec for admin creatin a shipping method owned by a distributor Rohan Mitchell 2013-08-27 10:53:59 +10:00
  • 9824e1b9c5 Make spec more precise and robust - query was finding outgoing instead of incoming exchange Rohan Mitchell 2013-08-27 10:41:02 +10:00
  • 72136a59ae Remove permission dupliation, fixes accessible_by errors when accessing admin backend Rohan Mitchell 2013-08-27 10:19:54 +10:00
  • 6a5d819fa6 Enterprise manager can create an order Rohan Mitchell 2013-08-27 09:32:41 +10:00
  • 019d8ed2dc Reverted poltergeist/capybara upgrade. alexs333 2013-08-23 17:02:33 +10:00
  • ef96099f2d Merge branch 'master' of https://github.com/eaterprises/openfoodweb alexs333 2013-08-23 16:11:02 +10:00
  • 9de5a0061e Enterprise user can only view their own distributors in reports (and remove redundant feature test) David Cook 2013-08-23 16:09:37 +10:00
  • 9be7b5eecc Updated poltergeist. alexs333 2013-08-23 15:40:04 +10:00
  • 4f8014306e Admin can't change distributor or order cycle once order has been finalized Rohan Mitchell 2013-08-23 13:58:59 +10:00
  • 158cd6994b Update spree, syntax fix Rohan Mitchell 2013-08-23 13:18:27 +10:00
  • 2a662e6b6f Switch from rvmrc to ruby-version/gemset Rohan Mitchell 2013-08-23 13:17:36 +10:00
  • 2cab83cb29 Admin create order can set distributor and order cycle Rohan Mitchell 2013-08-23 13:13:26 +10:00
  • 2e1de9a6d3 Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error Rohan Mitchell 2013-08-23 13:12:36 +10:00
  • 02089541cd Syntax tweaks Rohan Mitchell 2013-08-23 12:16:57 +10:00
  • 078bd033b6 Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions) David Cook 2013-08-23 13:25:42 +10:00
  • 1bfb54f310 Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions) David Cook 2013-08-23 13:25:10 +10:00
  • 8a092697ee Enterprise manager can clone an order cycle Rohan Mitchell 2013-08-22 17:11:53 +10:00
  • f1fa90d7c3 Clone order cycles Rohan Mitchell 2013-08-22 16:53:11 +10:00
  • 3d32e6480b Enterprise user can access all OFN reports David Cook 2013-08-22 11:49:18 +10:00
  • 5b824c1e22 Prevent exception when order has no payments David Cook 2013-08-22 11:31:07 +10:00
  • f1c2582e65 WIP: Test for enterprise user access in reports David Cook 2013-08-22 12:49:39 +10:00
  • 3a75f6b86a Enterprise user can access all OFN reports David Cook 2013-08-22 11:49:18 +10:00
  • f870e70560 Enterprise manager can edit and bulk edit enterprises they have access to Rohan Mitchell 2013-08-22 11:40:33 +10:00
  • 346113966e Prevent exception when order has no payments David Cook 2013-08-22 11:31:07 +10:00
  • aab7176f2c Enterprise manager can bulk edit products Rohan Mitchell 2013-08-22 11:21:49 +10:00
  • d465560dba Update selenium-webdriver (for test debugging with selenium) Rohan Mitchell 2013-08-22 10:49:42 +10:00
  • b41f6234db Test to filter report by order cycle David Cook 2013-08-21 17:16:01 +10:00
  • 01ad4a04a4 Bumped up the sleep time in the spec. alexs 2013-08-21 16:26:08 +10:00
  • a623e2dee6 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-21 16:05:29 +10:00
  • 8b4c0682fb Replaced eaterprises logo with the distributor name header. alexs 2013-08-21 16:05:06 +10:00
  • b2878ddc40 Payment Method must belong to a Distributor David Cook 2013-08-21 15:14:01 +10:00
  • f5b326ee1a Fixed the bug where search gets cleared after user clicks inside the suburb input field. alexs 2013-08-21 12:04:35 +10:00
  • acfb1bd600 Making sure that only distributor enterprises are displayed on the landing page. alexs 2013-08-21 12:03:44 +10:00
  • 798565bb42 Overriding accidental commit. alexs 2013-08-21 10:59:25 +10:00
  • 845f7bb8d7 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-21 10:50:08 +10:00