Commit Graph

  • f6983078a2 Removed search box and distributor/supplier sidebar from the hub page. alexs 2013-08-21 10:49:43 +10:00
  • 1a328e9567 Simplify syntax Rohan Mitchell 2013-08-20 15:01:58 +10:00
  • 31a078a53c Enterprise manager can access enterprise fees for enterprises they manage - fixes fees on order cycles interface Rohan Mitchell 2013-08-20 14:37:55 +10:00
  • 673c0dca36 Fix varying shipping amounts Rohan Mitchell 2013-08-20 14:25:35 +10:00
  • fa459c0395 Summarise distribution charges: order confirm page and email Rohan Mitchell 2013-08-20 14:25:18 +10:00
  • fdf80cac5e Adjusted specs to accommodate for new (temporary) landing page. alexs 2013-08-20 16:14:29 +10:00
  • dd9b6b344f Changed links to point to the shopfront urls (that set the distributor). alexs 2013-08-20 15:31:43 +10:00
  • 7061d0c53e Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-20 11:06:06 +10:00
  • 18d60a1643 Fixed specs broken by new temp landing page (take 1). alexs 2013-08-20 11:05:06 +10:00
  • fb33b853dd Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5 Rohan Mitchell 2013-08-20 10:47:56 +10:00
  • 8dd602f9de Remove pry from spec Rohan Mitchell 2013-08-20 09:19:38 +10:00
  • 7b5eca3a50 Fix error when generating checkout email when distributor_info is nil Rohan Mitchell 2013-08-20 09:19:23 +10:00
  • 8f67f385b7 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-19 17:37:49 +10:00
  • f160e051e5 Added new temporary landing page. alexs 2013-08-19 17:37:22 +10:00
  • 5f01bd6901 Generalise checkout email signoff message Rohan Mitchell 2013-08-19 17:35:09 +10:00
  • 64c9d4254a Fix spec failures - enterprise fee calculator type change, distributor info rich text tests, summarised distribution fee at checkout Rohan Mitchell 2013-08-19 17:28:00 +10:00
  • 0458f7a6bb Summarise distribution fees in checkout after cart page Rohan Mitchell 2013-08-19 17:02:02 +10:00
  • 693fa9f37b Enable enterprises_distributor_info_rich_text by default Rohan Mitchell 2013-08-19 16:47:17 +10:00
  • 010c58fffd Ignore libpeerconnection.log from phantomjs Rohan Mitchell 2013-08-19 16:46:51 +10:00
  • 5f7cbe3882 Ensure distributor is set on payment method factories David Cook 2013-08-19 16:18:50 +10:00
  • 5a3ad8e68b Remove test for payment method with no distributor David Cook 2013-08-19 16:17:38 +10:00
  • 562365311e Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks Rohan Mitchell 2013-08-19 14:38:30 +10:00
  • a9b70e67df Change to using flat rate per item calculators - per-order is confusing when used against line items Rohan Mitchell 2013-08-19 14:26:12 +10:00
  • 3ffe732b30 Ensure valid payment method is selected David Cook 2013-08-19 12:51:49 +10:00
  • 2d305b59d9 Only show payment methods for the distributor of the order David Cook 2013-08-19 12:43:45 +10:00
  • 08babeed65 Payment Method must have one Distributor David Cook 2013-08-19 12:05:25 +10:00
  • 6f73f41700 Create Payment Methods for each Enterprise instead of generic Payment Method David Cook 2013-08-19 12:04:45 +10:00
  • 77329b5532 Allow user to delete their enterprises' own payment methods David Cook 2013-08-19 11:31:39 +10:00
  • 4be2fe5fe9 Only show payment methods that user has access to David Cook 2013-08-19 11:29:54 +10:00
  • c1f9d9789d Extract table test to private method Rohan Mitchell 2013-08-19 12:29:26 +10:00
  • ba4d3d5d7d Removing a product from cart removes its fees Rohan Mitchell 2013-08-19 12:19:03 +10:00
  • 6c24c0ef68 Make specs more resilient and less context-sensitive Rohan Mitchell 2013-08-19 11:10:00 +10:00
  • 24cd5209d6 Do not error when attempting to mix product and order cycle distribution Rohan Mitchell 2013-08-19 10:41:01 +10:00
  • 80d6e3b87f Do not charge for distributor fees for a distributor you're not checking out with Rohan Mitchell 2013-08-19 10:06:26 +10:00
  • 7a75898b2b Find exchanges going to/from any number of enterprises Rohan Mitchell 2013-08-19 09:53:08 +10:00
  • e15e9a1476 Charge order cycle fees Rohan Mitchell 2013-08-19 09:27:18 +10:00
  • dfd1a89975 Test whether exchanges are incoming Rohan Mitchell 2013-08-16 15:42:06 +10:00
  • 9563aad9fa Find exchanges with a particular variant Rohan Mitchell 2013-08-16 15:12:03 +10:00
  • 1d23446c40 ProductDistribution validates_presence_of enterprise fee, check no longer required Rohan Mitchell 2013-08-16 14:12:22 +10:00
  • 591f6a8a57 Move ProductDistribution#clear_all_enterprise_fee_adjustments_for to EnterpriseFee class Rohan Mitchell 2013-08-16 14:10:03 +10:00
  • e318a1591d Add FeatureToggleHelper for tests, enabling feature toggle changes for tests Rohan Mitchell 2013-08-16 13:35:30 +10:00
  • 5ffd56aad7 Re-write spec with new fee display at checkout Rohan Mitchell 2013-08-16 11:47:04 +10:00
  • 38522e2b74 Fix order cycle permissions for enterprise user. Andrew Spinks 2013-08-18 19:41:04 +10:00
  • a8d4efd067 Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor. Andrew Spinks 2013-08-16 16:47:24 +10:00
  • 8ee98e3d96 Added bugherd to admin and sree frontend and re-arranged the bugherd code. alexs 2013-08-16 15:50:45 +10:00
  • d73dc1dc48 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-16 12:13:47 +10:00
  • ec9bfa3114 Added BugHerd script for new landing page (staging only). alexs 2013-08-16 12:13:25 +10:00
  • 82726d032c Add enterprise roles for order cycles. Andrew Spinks 2013-08-16 09:24:21 +10:00
  • 19e7537b64 Style order cycle fees Rohan Mitchell 2013-08-16 10:36:41 +10:00
  • 290607b5bf CrUD for order cycle exchange fees Rohan Mitchell 2013-08-16 10:22:12 +10:00
  • 552cecb2e0 Find incoming and outgoing exchanges Rohan Mitchell 2013-08-16 10:05:04 +10:00
  • 715ec9b21a Send enterprise id along with exchange enterprise fees Rohan Mitchell 2013-08-16 09:45:29 +10:00
  • 4d04a24342 Translate exchange fees for processing by rails Rohan Mitchell 2013-08-16 09:43:55 +10:00
  • 7fc0787e36 OrderCycleFormApplicator sets exchange fees Rohan Mitchell 2013-08-16 09:33:42 +10:00
  • 20853501e1 Delete unneeded angular scripts Rohan Mitchell 2013-08-16 09:30:16 +10:00
  • e6fdcf581a OrderCycle can fetch the direction of an exchange (incoming/outgoing) Rohan Mitchell 2013-08-14 14:04:42 +10:00
  • a3970dde8a Forcing POST for the search form. alexs 2013-08-16 10:18:46 +10:00
  • 4e715f62a2 Moved limit into the model. alexs 2013-08-16 09:53:40 +10:00
  • 82df7cddeb Added staging environment. alexs 2013-08-15 17:43:21 +10:00
  • b8bc30d4ab Fixed the test setup and added the text for the bug found in 'Enterprise.find_near'. alexs 2013-08-15 17:34:51 +10:00
  • a7256611cf Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-15 16:54:47 +10:00
  • da68dae586 Added unicorn-rails gem for running unicorn in dev. alexs 2013-08-15 16:34:21 +10:00
  • cfffced652 Fixed the bug in the enterprise geo search. alexs 2013-08-15 16:33:41 +10:00
  • fdaa5364a1 Add controller action for adding products to multi cart via javascript API. Andrew Spinks 2013-08-14 16:58:10 +10:00
  • d160a3256a Make adding to cart via spree front end kind of work again. Andrew Spinks 2013-08-14 11:16:27 +10:00
  • 88484f2d8b Added tests for suburbs JSON. alexs 2013-08-15 11:40:09 +10:00
  • c72a4a961f Added the mechanism to test JSON APIs (Rabl stuff etc.) alexs 2013-08-15 11:38:52 +10:00
  • 0705c7af36 Added vertical separators for search results. alexs 2013-08-15 11:37:50 +10:00
  • 0c8779041f Slightly increase the top bar height. alexs 2013-08-15 11:35:24 +10:00
  • d3842b2d8d Further compressed the landing page image to make it really light. alexs 2013-08-15 11:34:48 +10:00
  • bdc8387346 Added base for shop front (enterprise). alexs 2013-08-14 17:31:25 +10:00
  • e1da63d18f Added some more dev sample data. alexs 2013-08-14 17:30:17 +10:00
  • 42c912bb0d Using webmock for test group only. alexs 2013-08-14 17:26:42 +10:00
  • 773c2b4217 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-14 11:31:25 +10:00
  • c39bd6b59d Remove shipping methods with the now-absent itemwise calculator Rohan Mitchell 2013-08-14 11:27:16 +10:00
  • eaf71e28bb Raise an error when tests hit the network Rohan Mitchell 2013-08-14 11:12:19 +10:00
  • a8a0c0513e Fixed id duplication for login and sign up forms. alexs 2013-08-14 11:12:36 +10:00
  • 9c6c4724be Ensure line items only get created in correct orders when adding a product to a cart. Andrew Spinks 2013-08-14 10:49:37 +10:00
  • 0f1142fc30 Define class used in migration. Andrew Spinks 2013-08-14 10:32:47 +10:00
  • d5791657f3 Support multiple orders when adding a product to a cart. Andrew Spinks 2013-08-14 09:43:23 +10:00
  • dd3aaccf9f When adding a variant to a cart, split into multiple orders depending on the distributors that it contains. Andrew Spinks 2013-08-13 09:27:07 +10:00
  • 20bb5c9de7 Make sure angular injections work after magnification. Andrew Spinks 2013-08-13 09:26:10 +10:00
  • 59fce8a964 Show line items for each order in multi-cart. Andrew Spinks 2013-08-09 19:16:20 +10:00
  • 0a39fb87a5 Fix multi-cart association and add some temporary multi-cart support into the current front end. Andrew Spinks 2013-08-09 11:00:32 +10:00
  • 77d31b3004 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-14 10:48:47 +10:00
  • 5fac29d2ed Do not merge current and incomplete orders when logging in - fixes #20 Rohan Mitchell 2013-08-14 10:44:02 +10:00
  • 48cb725da5 Upgraded fundation to fetch from the edge (until the next release when gmaps4rails integration is fixed). alexs 2013-08-14 10:39:42 +10:00
  • 9501d2c8a1 Core of sign up functionality. alexs 2013-08-14 10:38:49 +10:00
  • 6b760f3068 Added feedback info for search criteria. alexs 2013-08-14 10:37:25 +10:00
  • 51c898625e Fixed link colors on map view. alexs 2013-08-14 10:36:04 +10:00
  • 8ff749d0eb Find enterprises participating in an order cycle Rohan Mitchell 2013-08-13 16:29:27 +10:00
  • 0293942816 Add order cycle service method to add and remove exchange fees Rohan Mitchell 2013-08-13 14:58:37 +10:00
  • 13df3b098b Make error messages more descriptive Rohan Mitchell 2013-08-13 14:41:20 +10:00
  • 47f6a5fbbf Add controller methods to add and remove exchange fees Rohan Mitchell 2013-08-13 14:40:07 +10:00
  • f67a6fa3fb Extract coordinator fees to partial Rohan Mitchell 2013-08-13 14:34:06 +10:00
  • 4120bc3dca Output exchange fees as JSON Rohan Mitchell 2013-08-13 14:33:00 +10:00
  • 293661377e Remove text to the left of TOTAL David Cook 2013-08-13 17:01:19 +10:00
  • 015dbc5c01 Only show active or complete order cycles, ordered by cycle close date David Cook 2013-08-13 16:47:23 +10:00
  • 6bad6e2675 Add order cycle selection to Order Cycles Report David Cook 2013-08-13 15:45:15 +10:00
  • 0a5f8afcb6 Added modal placeholders for new distributors and farmers sections. alexs 2013-08-13 15:20:21 +10:00