Commit Graph

  • 1b52564d58 Rerouting welcome page to be an enterprise action, updates to copy for package selection Rob Harrington 2015-06-11 18:53:00 +08:00
  • 1cd6866879 Fixing issue with auto-creation of new contact user for enterprises caused by delayed-job Rob Harrington 2015-06-11 15:25:18 +08:00
  • 1c1f82f4ee Using events to update index row text on save, adding alert icons for enterprises without producer or package selected Rob Harrington 2015-06-11 13:47:02 +08:00
  • 95073f6fe7 Adding actual link to the manage link on enterprises index Rob Harrington 2015-06-11 10:42:19 +08:00
  • e575b0e490 Switching enterprise index to its own dedicated serializer, so we can spit out ownership Rob Harrington 2015-06-11 10:38:05 +08:00
  • 5a08344812 Changing 'shop' column and panel to 'package' Rob Harrington 2015-06-11 09:46:13 +08:00
  • e3d7c00c8e Removing option of 'producer profile only' from enterprise shop panel Rob Harrington 2015-06-10 17:49:22 +08:00
  • 8aa55088ab Adding a parent directive to coorindate styling of panel tabs Rob Harrington 2015-06-10 17:19:38 +08:00
  • a90cd0f8e0 Owners can update sells on enterprises they own Rob Harrington 2015-06-10 17:17:55 +08:00
  • 6b35e993bd WIP: More work on panel content, styling and data submission logic Rob Harrington 2015-06-10 09:40:28 +08:00
  • a586a52c23 Shortcutting around existing Enterprise service, so that we can use it for something more useful Rob Harrington 2015-06-08 15:37:34 +08:00
  • b84f5a26a1 WIP: Splitting type panel into separate producer and shop panels, playing with styling Rob Harrington 2015-06-08 15:16:48 +08:00
  • 451ba1c01b panel rows adjust to span the number of visible columns Rob Harrington 2015-06-08 12:05:04 +08:00
  • c441c8c6cb Columns service holds a column count and notifies rootscope when it changes Rob Harrington 2015-06-08 11:34:33 +08:00
  • 0c36738472 Adding basic generalised panel row infrastructure to indexUtils Rob Harrington 2015-06-05 16:38:14 +08:00
  • ff3d9e27ec Upgrade angular-rails-templates Rob Harrington 2015-06-05 14:46:49 +08:00
  • d5f9b40707 WIP: Basic version of revamped enterprise index Rob Harrington 2015-06-04 13:52:41 +08:00
  • 02d3d34826 Adding basic angular infrastructure for enterprises Rob Harrington 2015-06-04 12:14:24 +08:00
  • 5215623864 Adding bindonce to admin Rob Harrington 2015-06-04 12:05:20 +08:00
  • ed7a53968c Using clearer json_request? method for customers controller Rob Harrington 2015-06-04 12:04:47 +08:00
  • c311bcdca7 Overriding enterprises index action to use AMS for json requests, and prevent collection loading for html requests Rob Harrington 2015-06-04 12:03:02 +08:00
  • d908701b59 Merge branch 'master' into folklabs-producer-emails Rohan Mitchell 2015-06-11 17:02:34 +10:00
  • ecbf3c8fa7 Ensure we start with consistent config settings Rohan Mitchell 2015-06-11 16:16:36 +10:00
  • 5ae88dbd6c Fix content overlapping alert Rohan Mitchell 2015-06-11 14:29:49 +10:00
  • bfeb63c8d7 Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec Rohan Mitchell 2015-06-11 14:16:18 +10:00
  • 6dea3fa19d Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees Rohan Mitchell 2015-06-11 12:56:32 +10:00
  • 075e9edbf6 Merge branch 'ginerr_bugfixes' into combined/ginerr_bugfixes_fix-duplicate-fees Rohan Mitchell 2015-06-11 12:56:27 +10:00
  • 5175fe9a03 Make stats more accurate by excluding invisible, inactivated enterprises and incomplete orders Rohan Mitchell 2015-06-11 12:53:23 +10:00
  • 662330b222 Alert appears at top of page. It slides in on page load and slides out on close. Rohan Mitchell 2015-06-11 12:10:50 +10:00
  • a8b6f2942a Releasing Assets Version 1.1 Maikel Linke 2015-06-11 10:54:30 +10:00
  • f4e0baa56a Basic click-to-close for sell-food alert Rohan Mitchell 2015-06-10 19:03:40 +10:00
  • 686a54c121 Make 'selling food' alert visible, basic styling Rohan Mitchell 2015-06-10 19:03:25 +10:00
  • b37f21dce1 Remove load_active_distributors call missed by merge Rohan Mitchell 2015-06-10 18:38:32 +10:00
  • 610a4c03fe Merge branch 'master' into redesign Rohan Mitchell 2015-06-10 18:27:50 +10:00
  • 604360034b Make filter method private Rohan Mitchell 2015-06-10 17:04:09 +10:00
  • a0fd91dc57 Do not preload_app with unicorn, update newrelic agent so that it doesn't require this setting. Rohan Mitchell 2015-06-10 17:03:56 +10:00
  • d79129880e Put lock around adjustment clear/re-create to avoid race condition resulting in duplicate fees Rohan Mitchell 2015-06-10 17:02:30 +10:00
  • 7412e92665 Merge branch 'master' into optimise-shopfront Rohan Mitchell 2015-06-10 16:39:02 +10:00
  • ee01113fe1 Fix duplicate factory value spec error Rohan Mitchell 2015-06-10 15:31:53 +10:00
  • 5a7231579c update uglifier to 2.7.1 Maikel Linke 2015-06-10 13:58:52 +10:00
  • 3c38c8e504 Merge branch 'adjustment-metadata-deletion' into combined/session-store_adjustment-metadata_uglifier Maikel Linke 2015-06-10 13:56:36 +10:00
  • 6c0238deac scoping down large request spec Maikel Linke 2015-06-06 13:26:21 +10:00
  • f88f42283a Session stored in ActiveRecored instead of Cookies Maikel Linke 2015-06-04 15:10:41 +10:00
  • 88872b4b49 add spec_helper to customers_controller_spec Maikel Linke 2015-06-05 14:25:45 +10:00
  • 153360d17b Let the database delete adjustment metadata Maikel Linke 2015-06-05 16:10:58 +10:00
  • 80834a0c27 Merge branch 'master' into ginerr_bugfixes Rohan Mitchell 2015-06-05 15:49:43 +10:00
  • d6c630dad9 add spec_helper to customers_controller_spec Maikel Linke 2015-06-05 14:25:45 +10:00
  • 7461009c3b Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes Maikel Linke 2015-06-05 14:23:58 +10:00
  • 252e9be016 Merge branch 'remove-old-bugsnag-notification' into combined/xero-report_analytics-bugfixes Maikel Linke 2015-06-05 14:23:03 +10:00
  • f324471495 Merge branch 'index_enterprise_permalink' into combined/xero-report_analytics-bugfixes Maikel Linke 2015-06-05 14:20:13 +10:00
  • f438a44f26 Merge remote-tracking branch 'origin/analytics' into combined/xero-report_analytics-bugfixes Maikel Linke 2015-06-05 14:19:54 +10:00
  • 1b91082c1c Merge branch 'show-order-without-current-distributor' into combined/xero-report_show-order-without-distributor Maikel Linke 2015-06-05 13:48:47 +10:00
  • ffa960b02e Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor Maikel Linke 2015-06-05 13:48:24 +10:00
  • 41dafce0db Remove obsolete Bugsnag notification Maikel Linke 2015-06-04 16:04:49 +10:00
  • e35b39c7cf Handle invalid referer URLs Maikel Linke 2015-06-05 12:43:49 +10:00
  • 552bbf221c Delete obsolete paragraph in registration #595 Maikel Linke 2015-06-05 10:59:39 +10:00
  • f09fad464e Merge branch 'master' into optimise-shopfront Rohan Mitchell 2015-06-05 07:28:05 +10:00
  • fc7e33d706 Fall back on individual calculations when pre-prepared values are not present Rohan Mitchell 2015-06-04 16:43:19 +10:00
  • ef3155a16a Pull product listing fee calculations out of serializer loop Rohan Mitchell 2015-06-04 16:27:32 +10:00
  • 3846d16822 Add methods to load fees for a number of variants in one go Rohan Mitchell 2015-06-04 16:22:06 +10:00
  • 6051c81959 Auto-merge from CI [skip ci] Continuous Integration 2015-06-04 15:39:43 +10:00
  • 486c2f9b42 WIP: Skip EnterpriseFeeApplicator step when computing fees Rohan Mitchell 2015-06-04 12:13:04 +10:00
  • 27bc28ffa4 Index variants by id Rohan Mitchell 2015-06-04 12:09:34 +10:00
  • cf0031d9a5 WIP: Optimise enterprise fee calculation Rohan Mitchell 2015-06-04 11:53:09 +10:00
  • 85d1d67dac Sort orders as required by spec, fixes intermittent fail Rohan Mitchell 2015-06-04 09:42:03 +10:00
  • a1425c5e07 Auto-merge from CI [skip ci] Continuous Integration 2015-06-04 07:22:43 +10:00
  • 5d77a48ef3 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into show-order-without-current-distributor Maikel Linke 2015-06-03 20:36:12 +10:00
  • e93736b123 Ordering managed orders by id to fix spec Rob Harrington 2015-06-03 18:16:07 +08:00
  • aea6277b77 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into index_enterprise_permalink Maikel Linke 2015-06-03 19:54:29 +10:00
  • 3855ae1337 Fixing bug on OC interface that prevented hubs from pulling their own products through Rob Harrington 2015-05-14 13:04:16 +10:00
  • 359328a96e Producers and distributors lists include self where appropriate Rob Harrington 2015-05-13 15:37:08 +10:00
  • dbd81e60a1 Fixing customer index feature spec, only checking shop when something has been selected Rob Harrington 2015-06-03 16:18:09 +08:00
  • 7c9b4dbc3e Resolving unmerged section in bulk order management template Rob Harrington 2015-06-03 15:33:04 +08:00
  • 09160c8ea6 Fixing customers controller spec Rob Harrington 2015-06-03 15:23:55 +08:00
  • 439d122e93 Merge branch 'master' into customers Rob Harrington 2015-06-03 15:19:40 +08:00
  • f1019e9221 Upgrade unicorn Rohan Mitchell 2015-06-03 16:53:46 +10:00
  • 2c0da5e350 Output parallel spec runtime log -> evenly split spec grouping Rohan Mitchell 2015-06-03 16:38:47 +10:00
  • d2a61dc096 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text Maikel Linke 2015-06-03 16:37:25 +10:00
  • 0569ef0505 Only record analytics in production. Also record them in admin backend. Rohan Mitchell 2015-06-03 16:36:31 +10:00
  • 17d123db63 ng-cloak producers page Rohan Mitchell 2015-06-03 16:28:43 +10:00
  • 4d789b70ed Merge branch 'products-and-inventory-report' into combined/bulk-product-edit-and-ng-cloak Rohan Mitchell 2015-06-03 15:12:29 +10:00
  • 7302963605 inventory report: filter was broken because filter_to_order_cycle returned nil Maikel Linke 2015-06-03 15:11:32 +10:00
  • ad4e17b77a Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak Rohan Mitchell 2015-06-03 15:10:12 +10:00
  • cd8084ae3f Merge branch 'master' into parallel-tests Rohan Mitchell 2015-06-03 15:08:15 +10:00
  • 41b348f594 Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak Rohan Mitchell 2015-06-03 15:05:51 +10:00
  • 2b3689fd93 Run CI specs in parallel Rohan Mitchell 2015-06-03 14:29:24 +10:00
  • db47c01784 Initial config for parallel spec running Rohan Mitchell 2015-05-01 09:50:12 +10:00
  • 769a04d2e0 Merge branch 'master' into optimise-shopfront Rohan Mitchell 2015-06-03 13:02:58 +10:00
  • 36dc0d5ccd Do not run performance specs in CI Rohan Mitchell 2015-06-03 13:00:07 +10:00
  • b3878b126b Decouple generic injection spec from EnterpriseSerializer Rohan Mitchell 2015-06-03 12:53:46 +10:00
  • c6f6c11a43 Add wait between clicks to fix race condition Rohan Mitchell 2015-06-03 12:51:15 +10:00
  • 473322c7e6 CI: Add more robust merge-to-master script Rohan Mitchell 2015-06-03 12:25:28 +10:00
  • 8afffdae9a Fix error when product does not have a master variant Rohan Mitchell 2015-06-03 12:13:42 +10:00
  • 4b6222bbe2 Updating spec using new button label Maikel Linke 2015-06-03 12:08:47 +10:00
  • 96177b7cd7 Add unique index to enterprise permalink Maikel Linke 2015-06-03 11:57:22 +10:00
  • cb2adea59f Remove executable bit from a migration file Maikel Linke 2015-06-03 10:16:29 +10:00
  • 22230294ab Merge branch 'master' into optimise-shopfront Rohan Mitchell 2015-06-03 10:07:42 +10:00
  • 2853885f26 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text Maikel Linke 2015-06-03 09:47:37 +10:00
  • db19303f1a Added asterisk to new field Owner since it seems to be required also Liv Galendez 2015-06-02 18:23:41 +10:00
  • 2c22d4e774 Merge https://github.com/openfoodfoundation/openfoodnetwork into indicate-required-fields-for-new-enterprise-form Liv Galendez 2015-06-02 18:11:17 +10:00