Commit Graph

  • 8d270e919f Sort exchanges for display when editing an order cycle Rohan Mitchell 2015-11-24 15:31:52 +11:00
  • 1e397a41ae Refactor to simplify outgoing_exchange_variant_ids Rohan Mitchell 2015-11-24 14:38:07 +11:00
  • 243ef4ee16 When an outgoing exchange includes a variant that is not in an incoming exchange, remove it from the outgoing exchange Rohan Mitchell 2015-11-24 13:46:40 +11:00
  • ea6974d438 Add OrderCycle#supplied_variants Rohan Mitchell 2015-11-24 13:33:46 +11:00
  • ccb23cd186 Do not allow re-adding exchange Rohan Mitchell 2015-11-20 09:46:30 +11:00
  • d4ee20455e Remove enterprise options from list when added Rohan Mitchell 2015-11-20 09:27:24 +11:00
  • ef603a070e Add methods to check for novel suppliers and distributors in an order cycle Rohan Mitchell 2015-11-20 07:22:40 +11:00
  • 1a4448c6d2 Do not allow adding blank enterprises Rohan Mitchell 2015-11-18 15:56:40 +11:00
  • a78d8fa6af Build exchange form on front-end Rohan Mitchell 2015-11-18 15:54:02 +11:00
  • 8c0a82f26f Provide issues summary for enterprises, pass enterprises through to controller Rohan Mitchell 2015-11-18 15:53:32 +11:00
  • 93c42d24c7 Extract issue detection into service object Rohan Mitchell 2015-11-18 15:49:32 +11:00
  • 036ffeb634 Enterprise service splits enterprises into hubs and producers Rohan Mitchell 2015-11-18 15:45:11 +11:00
  • 3dcbdad088 Show/hide all products Rohan Mitchell 2015-11-17 14:57:20 +11:00
  • 7820c31976 Show supplier as secondary in information hierarchy Rohan Mitchell 2015-11-17 13:54:02 +11:00
  • d314f07887 Use flexbox to more neatly lay out order cycle products Rohan Mitchell 2015-11-17 13:51:01 +11:00
  • 2efaedc225 Add .exchange-products container div, fill full row with products Rohan Mitchell 2015-11-17 13:36:41 +11:00
  • c5e2ed5aa1 Order outgoing products by name Rohan Mitchell 2015-11-17 13:36:14 +11:00
  • 8f917817b8 Fix broken styles Rohan Mitchell 2015-11-17 12:09:57 +11:00
  • a2c0088c91 Do not show flash message if we're performing an async update without reload Rohan Mitchell 2015-11-17 11:42:16 +11:00
  • 9fef0a9909 When order cycle is updated, display message instead of reloading the page Rohan Mitchell 2015-11-17 11:29:25 +11:00
  • 29bfac5f54 Order cycle interface may update or update and close Rohan Mitchell 2015-11-17 10:30:55 +11:00
  • efa7c215e2 Removing usage of SimpleCov Maikel Linke 2015-12-04 14:35:49 +11:00
  • 1589bd9ac3 Use mail() instead of devise_mail Maikel Linke 2015-12-03 14:54:10 +11:00
  • a810a6e2b7 fix succeed_if_master_merged Maikel Linke 2015-10-30 14:45:17 +11:00
  • c4fb4a8510 Removing Suburbs from the code Maikel Linke 2015-11-25 15:44:27 +11:00
  • d67a5aba0e Remove script/delayed_job.sh Maikel Linke 2015-10-30 13:36:22 +11:00
  • d5c4da3bf0 Not using Paperclip's to avoid HTTP calls to S3 Maikel Linke 2015-10-28 16:32:34 +11:00
  • 261a464b50 Fixing display of shop list in group producer modal Maikel Linke 2015-11-26 16:38:16 +11:00
  • 0f2ae79e05 Fixing "Shop for" label on groups producer modal Maikel Linke 2015-11-26 15:58:57 +11:00
  • caffdee047 Removing depricated sensor parameter for Google Maps Maikel Linke 2015-11-26 14:37:22 +11:00
  • d320b2e7d4 Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job v1.3.0-pre1 Rohan Mitchell 2015-12-02 15:06:38 +11:00
  • e8ccd35363 Simplify producer email to make it more generic Rohan Mitchell 2015-11-26 11:09:28 +11:00
  • bd854bf2dd Remove receival_time from exchange, just use receival_instructions Rohan Mitchell 2015-11-26 11:03:20 +11:00
  • 10edb2b056 Fix delayed job startup - prevent error caused by double load Rohan Mitchell 2015-12-02 10:48:50 +11:00
  • 86f1afae92 derp Rob H 2015-11-29 18:10:49 +11:00
  • 1cffd35968 Fixing up specs pertaining to full_name generation for line_items Rob H 2015-11-29 17:52:01 +11:00
  • baeacfb8a9 LineItem inherits display_name from variant Rob H 2015-11-29 17:25:28 +11:00
  • 7ecf5df26a Updating line items through admin controller causes enterprise fees to be recalculated Rob Harrington 2015-11-27 15:06:49 +11:00
  • a5a886c51f Only test for coordination when orders actually have order_cycles Rob Harrington 2015-11-25 15:27:27 +11:00
  • 96aace971f Merge remote-tracking branch 'origin/master' into line_item_naming Rob Harrington 2015-11-25 15:13:56 +11:00
  • 6c254c534f Upgrade fog to resolve 'Digest::Digest is deprecated; use Digest' warning Rob Harrington 2015-11-25 15:13:25 +11:00
  • b341c1ef8a Ensure that dates in BOM AJAX requests have timezones Rob Harrington 2015-11-25 15:06:15 +11:00
  • 7e6b43266f Making sure that price and final_weight_volume can be updated (by distributor or coordinator) Rob Harrington 2015-11-25 14:23:55 +11:00
  • 3975eef0c4 Merge pull request #716 from openfoodfoundation/uk/i18n Maikel 2015-11-24 18:36:32 +11:00
  • a2a87cc68f #715: Add missing strings for en-GB locale. Paul Mackay 2015-11-23 16:44:39 +00:00
  • 4bdc1bc418 LineItem final_weight_volume is updated whenever quantity is changed, though can be set directly Rob Harrington 2015-11-18 16:22:36 +11:00
  • 33454a7090 Adding server validation errors messages to BOM interface Rob Harrington 2015-11-18 14:32:29 +11:00
  • 6268b7cc7e Printing/sending an invoice uses the same template for generating a pdf Rob Harrington 2015-11-18 10:02:51 +11:00
  • 75846a4d1f Merge branch 'master' into line_item_naming Rob Harrington 2015-11-16 10:38:42 +11:00
  • c199e22190 Make a few BOM specs more robust Rob Harrington 2015-11-16 10:31:41 +11:00
  • 3b2bdb8397 Change the way changes to underlying model are watched and updated for select2 elements Rob Harrington 2015-11-16 10:31:22 +11:00
  • 767671c3b4 New pattern: blank Options for index drop down filters are added within service Rob Harrington 2015-11-16 10:30:44 +11:00
  • 76414dedff Bumping coffee-script version Rob Harrington 2015-11-16 10:27:32 +11:00
  • ae7fb91a9a Only reloading line_items and orders on BOM, $timeout for adding blankOption Rob Harrington 2015-11-13 15:59:33 +11:00
  • 229070a76b Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n Maikel Linke 2015-11-13 15:20:58 +11:00
  • 8bfe459241 i18n fixes of html display Maikel Linke 2015-11-13 14:22:17 +11:00
  • bb6fb2f5e8 Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link Rohan Mitchell 2015-11-13 14:03:32 +11:00
  • 6de44877c8 Update link for uber-style sell food dropdown Rohan Mitchell 2015-11-04 15:43:13 +11:00
  • b6f3e6eca6 Fix broken spec Rohan Mitchell 2015-11-10 11:49:31 +11:00
  • a86cc96452 Use pluck instead of map Rohan Mitchell 2015-11-10 11:43:14 +11:00
  • 178e5f59e6 Update cart by applying differences rather than clear-and-readd every time Rohan Mitchell 2015-11-10 11:22:57 +11:00
  • 7fffa03d8d Fix bug: set difference comparison of string with number Rohan Mitchell 2015-11-10 11:18:31 +11:00
  • 888e4d80ef Add reliable way to check if cart is dirty. Previous way returned true when cart empty. Rohan Mitchell 2015-11-10 10:37:37 +11:00
  • d3c7c46800 Add method to remove a variant from an order Rohan Mitchell 2015-11-10 10:36:39 +11:00
  • c432ed9e08 Build list of variants removed from the cart when overwriting Rohan Mitchell 2015-11-06 10:19:25 +11:00
  • e175149e76 Add method to check whether a passed-in cart value varies from the cart Rohan Mitchell 2015-11-06 09:13:47 +11:00
  • 1b5901317d Separate concerns: reading products hash and adding items to cart Rohan Mitchell 2015-11-06 08:27:58 +11:00
  • 2f4b5bad26 Make benchmark more realistic Rohan Mitchell 2015-11-05 13:15:09 +11:00
  • 64e8927ae9 Add benchmark: add to cart Rohan Mitchell 2015-11-05 12:33:49 +11:00
  • c932d20ef5 Extract multi-sample benchmarking into a helper method Rohan Mitchell 2015-11-05 12:01:52 +11:00
  • 5d5fda3a25 Merge remote-tracking branch 'origin/master' into i18n Maikel Linke 2015-11-13 10:07:29 +11:00
  • a96cdd5ee7 Merge branch 'master' into line_item_naming Rob Harrington 2015-11-13 09:54:26 +11:00
  • 4191e2b6f0 Changing the way select filters are reset on BOM to try and fix specs Rob Harrington 2015-11-13 09:44:57 +11:00
  • 88fd9f72e6 Retry uncooperative BOM feature spec Rob Harrington 2015-11-13 09:14:20 +11:00
  • 3d36ebe2e6 Some Ransack trickery to get OrderCycles#index to load only recent OR undated OCs when no orders_close_at predicate is passed in Rob Harrington 2015-11-12 18:29:19 +11:00
  • 6966fbba7c Present date limits being set in line items controller .js unless orderCycleFilter has actually been set Rob Harrington 2015-11-12 17:40:35 +11:00
  • 2310bc95bc Committing changes to version used to bundle Gemfile.lock Rob Harrington 2015-11-12 17:34:22 +11:00
  • 27a5791e26 Fixing Angular Specs for line items controller Rob Harrington 2015-11-12 17:33:12 +11:00
  • be8038e9d0 Merge branch 'master' into line_item_naming Rob Harrington 2015-11-12 14:40:11 +11:00
  • 1556d38b1e Admin Enterprise#update.json renders updated enterprises using index serializer Rob Harrington 2015-11-12 14:30:43 +11:00
  • 4e4de65cba Fetch undated order cycles by default for index actions Rob Harrington 2015-11-12 12:08:39 +11:00
  • 6e8d807408 Fixing spec using text-angular broken by upgrade of poltergeist Rob Harrington 2015-11-12 11:35:22 +11:00
  • 095466cb43 Fixing syntax error for new method for OCs controller Rob Harrington 2015-11-12 10:34:09 +11:00
  • 2719c699d7 Updating line items index spec Rob Harrington 2015-11-12 10:06:41 +11:00
  • 34030276d7 Cleaning up line items index (BOM) Rob Harrington 2015-11-12 10:06:21 +11:00
  • 330977186e Using confirm-change and select2-min-search directive for line items index Rob Harrington 2015-11-12 10:05:14 +11:00
  • fc57255b40 Adding save-bar to line items index Rob Harrington 2015-11-12 10:04:18 +11:00
  • 266820742d Using request monitor on line items index (BOM) Rob Harrington 2015-11-12 10:03:28 +11:00
  • 722471a111 Allow use of completed_at for orders index ransacking Rob Harrington 2015-11-12 10:01:35 +11:00
  • 86b5e810e5 Only try to dereference attrs when enough information is present Rob Harrington 2015-11-12 09:59:46 +11:00
  • f8a31e8864 Resetting select filters in a way that actually works Rob Harrington 2015-11-12 09:58:55 +11:00
  • 639472b917 WIP: Adding a request monitoring service to handle loading status Rob Harrington 2015-11-12 09:57:02 +11:00
  • 193325f81b Improve formatting around saving on line items index (BOM) Rob Harrington 2015-11-12 09:52:10 +11:00
  • 5a7cac652c Adding confirm-link directive Rob Harrington 2015-11-12 09:49:36 +11:00
  • b5aaf36bd2 Create directive for scaling by a factor and then formatting as currency Rob Harrington 2015-11-12 09:48:43 +11:00
  • c5a26249ea Removing unneeded directives Rob Harrington 2015-11-12 09:47:37 +11:00
  • 69ead3c829 Line items serialiser gives a sensible value for max_quantity Rob Harrington 2015-11-12 09:47:12 +11:00
  • 93caa4a11d Bumping poltergeist version to 1.7.0 Rob Harrington 2015-11-12 09:45:14 +11:00
  • e20d8d3e95 Merge branch 'master' into folklabs-producer-emails Rohan Mitchell 2015-11-11 14:20:25 +11:00
  • fb3e292e20 Formatting Rohan Mitchell 2015-11-04 15:34:30 +11:00