Merge pull request #3891 from openfoodfoundation/2-0-1

Bring changes introduced in v2.0.1 into 2-0-stable
Merge pull request #3892 from coopdevs/hide-product-from-shopfront-when-out-of-stock
2026-01-13 18:46:49 +00:00 · 2019-06-03 22:01:22 +02:00 · 2019-05-31 19:21:47 +01:00 · 2019-05-31 10:35:05 +02:00 · 2019-05-31 09:30:26 +02:00 · 2019-05-13 15:27:04 +02:00
804 changed files with 14025 additions and 20866 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +0,0 @@
-.git
-.gitignore
-log/*
-tmp/*
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -22,43 +22,48 @@
 Metrics/LineLength:
  Max: 100
  Exclude:
-  - Gemfile
  - app/controllers/admin/bulk_line_items_controller.rb
  - app/controllers/admin/contents_controller.rb
  - app/controllers/admin/customers_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/admin/enterprise_fees_controller.rb
  - app/controllers/admin/enterprise_groups_controller.rb
  - app/controllers/admin/enterprise_relationships_controller.rb
-  - app/controllers/admin/enterprise_roles_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/admin/inventory_items_controller.rb
  - app/controllers/admin/manager_invitations_controller.rb
  - app/controllers/admin/order_cycles_controller.rb
  - app/controllers/admin/product_import_controller.rb
  - app/controllers/admin/proxy_orders_controller.rb
  - app/controllers/admin/schedules_controller.rb
+  - app/controllers/admin/subscription_line_items_controller.rb
  - app/controllers/admin/subscriptions_controller.rb
  - app/controllers/admin/variant_overrides_controller.rb
  - app/controllers/api/enterprise_attachment_controller.rb
-  - app/controllers/api/order_cycles_controller.rb
  - app/controllers/api/product_images_controller.rb
  - app/controllers/application_controller.rb
+  - app/controllers/base_controller.rb
+  - app/controllers/cart_controller.rb
  - app/controllers/checkout_controller.rb
+  - app/controllers/shop_controller.rb
  - app/controllers/spree/admin/adjustments_controller_decorator.rb
  - app/controllers/spree/admin/base_controller_decorator.rb
+  - app/controllers/spree/admin/line_items_controller_decorator.rb
  - app/controllers/spree/admin/orders_controller_decorator.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
  - app/controllers/spree/admin/payment_methods_controller_decorator.rb
  - app/controllers/spree/admin/products_controller_decorator.rb
  - app/controllers/spree/admin/reports_controller_decorator.rb
+  - app/controllers/spree/admin/shipping_methods_controller_decorator.rb
  - app/controllers/spree/api/products_controller_decorator.rb
  - app/controllers/spree/credit_cards_controller.rb
  - app/controllers/spree/orders_controller_decorator.rb
  - app/controllers/spree/paypal_controller_decorator.rb
  - app/controllers/stripe/callbacks_controller.rb
+  - app/controllers/user_confirmations_controller.rb
+  - app/helpers/admin/account_helper.rb
  - app/helpers/admin/injection_helper.rb
  - app/helpers/angular_form_builder.rb
  - app/helpers/angular_form_helper.rb
+  - app/helpers/application_helper.rb
  - app/helpers/checkout_helper.rb
  - app/helpers/enterprises_helper.rb
  - app/helpers/footer_links_helper.rb
@@ -68,19 +73,24 @@ Metrics/LineLength:
  - app/helpers/shop_helper.rb
  - app/helpers/spree/admin/base_helper_decorator.rb
  - app/helpers/spree/admin/navigation_helper_decorator.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
  - app/helpers/spree/orders_helper.rb
+  - app/jobs/products_cache_integrity_checker_job.rb
  - app/jobs/subscription_confirm_job.rb
+  - app/jobs/subscription_placement_job.rb
+  - app/mailers/producer_mailer.rb
+  - app/mailers/spree/order_mailer_decorator.rb
  - app/mailers/subscription_mailer.rb
  - app/models/column_preference.rb
-  - app/models/concerns/order_shipment.rb
-  - app/models/concerns/product_stock.rb
-  - app/models/concerns/variant_stock.rb
  - app/models/content_configuration.rb
  - app/models/customer.rb
  - app/models/enterprise_fee.rb
-  - app/models/enterprise_group.rb
+  - app/models/enterprise.rb
+  - app/models/enterprise_relationship.rb
  - app/models/enterprise_role.rb
+  - app/models/exchange.rb
  - app/models/inventory_item.rb
+  - app/models/order_cycle.rb
  - app/models/product_import/entry_processor.rb
  - app/models/product_import/entry_validator.rb
  - app/models/product_import/product_importer.rb
@@ -91,10 +101,9 @@ Metrics/LineLength:
  - app/models/schedule.rb
  - app/models/spree/ability_decorator.rb
  - app/models/spree/adjustment_decorator.rb
-  - app/models/spree/app_configuration_decorator.rb
  - app/models/spree/calculator/default_tax_decorator.rb
+  - app/models/spree/calculator/flexi_rate_decorator.rb
  - app/models/spree/classification_decorator.rb
-  - app/models/spree/concerns/payment_method_distributors.rb
  - app/models/spree/gateway/stripe_connect.rb
  - app/models/spree/line_item_decorator.rb
  - app/models/spree/order_decorator.rb
@@ -103,14 +112,16 @@ Metrics/LineLength:
  - app/models/spree/product_decorator.rb
  - app/models/spree/shipment_decorator.rb
  - app/models/spree/shipping_method_decorator.rb
-  - app/models/spree/tax_rate_decorator.rb
  - app/models/spree/taxon_decorator.rb
  - app/models/spree/user_decorator.rb
  - app/models/spree/variant_decorator.rb
  - app/models/subscription.rb
  - app/models/variant_override.rb
  - app/models/variant_override_set.rb
+  - app/overrides/add_distributor_details_js_to_product.rb
  - app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb
+  - app/overrides/replace_checkout_payment_button.rb
+  - app/overrides/replace_payment_name_with_description.rb
  - app/serializers/api/admin/basic_enterprise_serializer.rb
  - app/serializers/api/admin/enterprise_fee_serializer.rb
  - app/serializers/api/admin/enterprise_serializer.rb
@@ -120,43 +131,47 @@ Metrics/LineLength:
  - app/serializers/api/admin/index_order_cycle_serializer.rb
  - app/serializers/api/admin/line_item_serializer.rb
  - app/serializers/api/admin/order_cycle_serializer.rb
+  - app/serializers/api/admin/product_serializer.rb
  - app/serializers/api/admin/subscription_serializer.rb
  - app/serializers/api/admin/tag_rule_serializer.rb
  - app/serializers/api/admin/variant_override_serializer.rb
  - app/serializers/api/admin/variant_serializer.rb
  - app/services/cart_service.rb
-  - app/services/default_stock_location.rb
  - app/services/embedded_page_service.rb
  - app/services/line_item_syncer.rb
  - app/services/order_cycle_form.rb
  - app/services/order_factory.rb
  - app/services/order_syncer.rb
  - app/services/subscriptions_count.rb
-  - app/services/variants_stock_levels.rb
  - app/views/json/_groups.rabl
-  - app/views/json/_producer.rabl
  - app/views/json/partials/_enterprise.rabl
+  - app/views/json/_producer.rabl
  - app/views/spree/api/products/bulk_show.v1.rabl
  - app/views/spree/api/variants/bulk_show.v1.rabl
  - engines/web/app/helpers/web/cookies_policy_helper.rb
+  - Gemfile
  - lib/discourse/single_sign_on.rb
  - lib/open_food_network/available_payment_method_filter.rb
  - lib/open_food_network/bulk_coop_report.rb
  - lib/open_food_network/customers_report.rb
+  - app/services/order_cycle_distributed_variants.rb
  - lib/open_food_network/enterprise_fee_applicator.rb
  - lib/open_food_network/enterprise_fee_calculator.rb
  - lib/open_food_network/enterprise_issue_validator.rb
  - lib/open_food_network/group_buy_report.rb
  - lib/open_food_network/lettuce_share_report.rb
+  - lib/open_food_network/locking.rb
  - lib/open_food_network/order_and_distributor_report.rb
  - lib/open_food_network/order_cycle_form_applicator.rb
  - lib/open_food_network/order_cycle_management_report.rb
+  - lib/open_food_network/order_cycle_permissions.rb
  - lib/open_food_network/order_grouper.rb
  - lib/open_food_network/orders_and_fulfillments_report.rb
  - lib/open_food_network/payments_report.rb
  - lib/open_food_network/permalink_generator.rb
+  - lib/open_food_network/permissions.rb
+  - lib/open_food_network/products_and_inventory_report_base.rb
  - lib/open_food_network/products_cache.rb
-  - lib/open_food_network/products_renderer.rb
  - lib/open_food_network/proxy_order_syncer.rb
  - lib/open_food_network/reports/bulk_coop_allocation_report.rb
  - lib/open_food_network/reports/line_items.rb
@@ -164,13 +179,16 @@ Metrics/LineLength:
  - lib/open_food_network/users_and_enterprises_report.rb
  - lib/open_food_network/variant_and_line_item_naming.rb
  - lib/open_food_network/xero_invoices_report.rb
+  - lib/spree/core/calculated_adjustments_decorator.rb
  - lib/spree/core/controller_helpers/respond_with_decorator.rb
  - lib/spree/localized_number.rb
  - lib/spree/product_filters.rb
  - lib/stripe/profile_storer.rb
  - lib/tasks/cache.rake
  - lib/tasks/data.rake
+  - lib/tasks/dev.rake
  - lib/tasks/enterprises.rake
+  - spec/archive/features/consumer/checkout_spec.rb
  - spec/controllers/admin/bulk_line_items_controller_spec.rb
  - spec/controllers/admin/column_preferences_controller_spec.rb
  - spec/controllers/admin/customers_controller_spec.rb
@@ -198,20 +216,18 @@ Metrics/LineLength:
  - spec/controllers/shops_controller_spec.rb
  - spec/controllers/spree/admin/adjustments_controller_spec.rb
  - spec/controllers/spree/admin/base_controller_spec.rb
-  - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
+  - spec/controllers/spree/admin/line_items_controller_spec.rb
  - spec/controllers/spree/admin/orders_controller_spec.rb
+  - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
  - spec/controllers/spree/admin/payment_methods_controller_spec.rb
  - spec/controllers/spree/admin/payments_controller_spec.rb
  - spec/controllers/spree/admin/reports_controller_spec.rb
-  - spec/controllers/spree/admin/variants_controller_spec.rb
-  - spec/controllers/spree/api/line_items_controller_spec.rb
  - spec/controllers/spree/api/products_controller_spec.rb
-  - spec/controllers/spree/api/shipments_controller_spec.rb
  - spec/controllers/spree/api/variants_controller_spec.rb
  - spec/controllers/spree/credit_cards_controller_spec.rb
  - spec/controllers/spree/orders_controller_spec.rb
-  - spec/controllers/spree/user_sessions_controller_spec.rb
  - spec/controllers/spree/users_controller_spec.rb
+  - spec/controllers/spree/user_sessions_controller_spec.rb
  - spec/controllers/stripe/callbacks_controller_spec.rb
  - spec/controllers/stripe/webhooks_controller_spec.rb
  - spec/controllers/user_confirmations_controller_spec.rb
@@ -223,10 +239,10 @@ Metrics/LineLength:
  - spec/features/admin/enterprise_fees_spec.rb
  - spec/features/admin/enterprise_relationships_spec.rb
  - spec/features/admin/enterprise_roles_spec.rb
-  - spec/features/admin/enterprise_user_spec.rb
  - spec/features/admin/enterprises/images_spec.rb
  - spec/features/admin/enterprises/index_spec.rb
  - spec/features/admin/enterprises_spec.rb
+  - spec/features/admin/enterprise_user_spec.rb
  - spec/features/admin/image_settings_spec.rb
  - spec/features/admin/multilingual_spec.rb
  - spec/features/admin/order_cycles_spec.rb
@@ -267,7 +283,6 @@ Metrics/LineLength:
  - spec/helpers/order_cycles_helper_spec.rb
  - spec/helpers/spree/admin/base_helper_spec.rb
  - spec/jobs/confirm_order_job_spec.rb
-  - spec/jobs/products_cache_integrity_checker_job_spec.rb
  - spec/jobs/refresh_products_cache_job_spec.rb
  - spec/jobs/subscription_confirm_job_spec.rb
  - spec/jobs/subscription_placement_job_spec.rb
@@ -275,6 +290,7 @@ Metrics/LineLength:
  - spec/lib/open_food_network/bulk_coop_report_spec.rb
  - spec/lib/open_food_network/cached_products_renderer_spec.rb
  - spec/lib/open_food_network/customers_report_spec.rb
+  - spec/services/order_cycle_distributed_variants.rb
  - spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
  - spec/lib/open_food_network/enterprise_injection_data_spec.rb
@@ -285,7 +301,6 @@ Metrics/LineLength:
  - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
  - spec/lib/open_food_network/order_cycle_permissions_spec.rb
  - spec/lib/open_food_network/order_grouper_spec.rb
-  - spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
  - spec/lib/open_food_network/packing_report_spec.rb
  - spec/lib/open_food_network/permissions_spec.rb
  - spec/lib/open_food_network/products_and_inventory_report_spec.rb
@@ -304,8 +319,6 @@ Metrics/LineLength:
  - spec/mailers/producer_mailer_spec.rb
  - spec/mailers/subscription_mailer_spec.rb
  - spec/models/column_preference_spec.rb
-  - spec/models/concerns/order_shipment_spec.rb
-  - spec/models/concerns/product_stock_spec.rb
  - spec/models/customer_spec.rb
  - spec/models/enterprise_caching_spec.rb
  - spec/models/enterprise_fee_spec.rb
@@ -332,8 +345,8 @@ Metrics/LineLength:
  - spec/models/spree/product_spec.rb
  - spec/models/spree/property_spec.rb
  - spec/models/spree/shipping_method_spec.rb
-  - spec/models/spree/tax_rate_spec.rb
  - spec/models/spree/taxon_spec.rb
+  - spec/models/spree/tax_rate_spec.rb
  - spec/models/spree/user_spec.rb
  - spec/models/spree/variant_spec.rb
  - spec/models/stripe_account_spec.rb
@@ -357,19 +370,17 @@ Metrics/LineLength:
  - spec/serializers/admin/for_order_cycle/supplied_product_serializer_spec.rb
  - spec/serializers/admin/subscription_customer_serializer_spec.rb
  - spec/serializers/admin/variant_override_serializer_spec.rb
-  - spec/serializers/api/enterprise_shopfront_serializer_spec.rb
-  - spec/serializers/current_order_serializer_spec.rb
+  - spec/serializers/current_order_serializer.rb
+  - spec/serializers/enterprise_serializer_spec.rb
  - spec/serializers/order_serializer_spec.rb
  - spec/services/cart_service_spec.rb
  - spec/services/embedded_page_service_spec.rb
-  - spec/services/order_cycle_distributed_variants_spec.rb
  - spec/services/order_cycle_form_spec.rb
  - spec/services/order_factory_spec.rb
  - spec/services/order_syncer_spec.rb
  - spec/services/subscription_estimator_spec.rb
  - spec/services/subscription_form_spec.rb
  - spec/services/subscription_validator_spec.rb
-  - spec/services/subscription_variants_service_spec.rb
  - spec/spec_helper.rb
  - spec/support/cancan_helper.rb
  - spec/support/delayed_job_helper.rb
@@ -386,8 +397,8 @@ Metrics/AbcSize:
  Exclude:
  - app/controllers/admin/bulk_line_items_controller.rb
  - app/controllers/admin/customers_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/admin/order_cycles_controller.rb
  - app/controllers/admin/product_import_controller.rb
  - app/controllers/admin/schedules_controller.rb
@@ -401,19 +412,17 @@ Metrics/AbcSize:
  - app/controllers/cart_controller.rb
  - app/controllers/checkout_controller.rb
  - app/controllers/discourse_sso_controller.rb
-  - app/controllers/enterprises_controller.rb
  - app/controllers/spree/admin/adjustments_controller_decorator.rb
-  - app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
+  - app/controllers/spree/admin/line_items_controller_decorator.rb
  - app/controllers/spree/admin/orders_controller_decorator.rb
  - app/controllers/spree/admin/overview_controller_decorator.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
  - app/controllers/spree/admin/payment_methods_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller_decorator.rb
  - app/controllers/spree/admin/products_controller_decorator.rb
  - app/controllers/spree/admin/reports_controller_decorator.rb
  - app/controllers/spree/admin/search_controller_decorator.rb
-  - app/controllers/spree/admin/variants_controller_decorator.rb
+  - app/controllers/spree/admin/shipping_methods_controller_decorator.rb
  - app/controllers/spree/api/products_controller_decorator.rb
-  - app/controllers/spree/api/shipments_controller_decorator.rb
  - app/controllers/spree/credit_cards_controller.rb
  - app/controllers/spree/orders_controller_decorator.rb
  - app/controllers/spree/user_sessions_controller_decorator.rb
@@ -424,19 +433,21 @@ Metrics/AbcSize:
  - app/helpers/checkout_helper.rb
  - app/helpers/i18n_helper.rb
  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
  - app/helpers/spree/orders_helper.rb
  - app/jobs/subscription_placement_job.rb
  - app/mailers/producer_mailer.rb
  - app/models/calculator/flat_percent_per_item.rb
  - app/models/column_preference.rb
-  - app/models/enterprise.rb
  - app/models/enterprise_group.rb
+  - app/models/enterprise.rb
  - app/models/enterprise_relationship.rb
  - app/models/model_set.rb
  - app/models/product_import/entry_processor.rb
  - app/models/product_import/entry_validator.rb
  - app/models/proxy_order.rb
  - app/models/spree/ability_decorator.rb
+  - app/models/spree/adjustment_decorator.rb
  - app/models/spree/calculator/default_tax_decorator.rb
  - app/models/spree/calculator/flexi_rate_decorator.rb
  - app/models/spree/line_item_decorator.rb
@@ -446,6 +457,7 @@ Metrics/AbcSize:
  - app/models/spree/product_set.rb
  - app/models/spree/taxon_decorator.rb
  - app/serializers/api/admin/enterprise_serializer.rb
+  - app/serializers/api/enterprise_serializer.rb
  - app/serializers/api/product_serializer.rb
  - app/serializers/api/variant_serializer.rb
  - app/services/cart_service.rb
@@ -477,99 +489,33 @@ Metrics/AbcSize:
  - lib/spree/localized_number.rb
  - lib/stripe/account_connector.rb
  - lib/tasks/enterprises.rake
-  - lib/tasks/sample_data/product_factory.rb
-  - spec/controllers/spree/api/shipments_controller_spec.rb
-  - spec/features/admin/product_import_spec.rb
+  - spec/archive/features/consumer/checkout_spec.rb
+  - spec/controllers/spree/admin/orders_controller_spec.rb
  - spec/features/admin/reports_spec.rb
-  - spec/features/admin/subscriptions_spec.rb
  - spec/features/consumer/shopping/checkout_spec.rb
  - spec/features/consumer/shopping/variant_overrides_spec.rb
  - spec/models/enterprise_spec.rb
  - spec/models/product_importer_spec.rb
  - spec/support/performance_helper.rb

-Metrics/BlockLength:
-  Max: 25
-  ExcludedMethods: ["class_eval", "collection", "context", "describe", "it", "member", "namespace", "resource", "resources"]
-  Exclude:
-  - lib/tasks/data.rake
-  - lib/tasks/dev.rake
-  - spec/controllers/spree/admin/invoices_controller_spec.rb
-  - spec/factories/variant_factory.rb
-  - spec/features/admin/adjustments_spec.rb
-  - spec/features/admin/bulk_order_management_spec.rb
-  - spec/features/admin/bulk_product_update_spec.rb
-  - spec/features/admin/caching_spec.rb
-  - spec/features/admin/content_spec.rb
-  - spec/features/admin/customers_spec.rb
-  - spec/features/admin/enterprise_fees_spec.rb
-  - spec/features/admin/enterprise_groups_spec.rb
-  - spec/features/admin/enterprise_relationships_spec.rb
-  - spec/features/admin/enterprise_roles_spec.rb
-  - spec/features/admin/enterprises/images_spec.rb
-  - spec/features/admin/enterprises/index_spec.rb
-  - spec/features/admin/enterprises_spec.rb
-  - spec/features/admin/enterprise_user_spec.rb
-  - spec/features/admin/multilingual_spec.rb
-  - spec/features/admin/order_cycles_spec.rb
-  - spec/features/admin/orders_spec.rb
-  - spec/features/admin/overview_spec.rb
-  - spec/features/admin/payment_method_spec.rb
-  - spec/features/admin/product_import_spec.rb
-  - spec/features/admin/products_spec.rb
-  - spec/features/admin/reports/enterprise_fee_summaries_spec.rb
-  - spec/features/admin/reports_spec.rb
-  - spec/features/admin/schedules_spec.rb
-  - spec/features/admin/shipping_methods_spec.rb
-  - spec/features/admin/subscriptions_spec.rb
-  - spec/features/admin/tag_rules_spec.rb
-  - spec/features/admin/tax_settings_spec.rb
-  - spec/features/admin/users_spec.rb
-  - spec/features/admin/variant_overrides_spec.rb
-  - spec/features/admin/variants_spec.rb
-  - spec/features/consumer/account/cards_spec.rb
-  - spec/features/consumer/account/settings_spec.rb
-  - spec/features/consumer/account_spec.rb
-  - spec/features/consumer/authentication_spec.rb
-  - spec/features/consumer/cookies_spec.rb
-  - spec/features/consumer/external_services_spec.rb
-  - spec/features/consumer/groups_spec.rb
-  - spec/features/consumer/multilingual_spec.rb
-  - spec/features/consumer/producers_spec.rb
-  - spec/features/consumer/registration_spec.rb
-  - spec/features/consumer/shopping/cart_spec.rb
-  - spec/features/consumer/shopping/checkout_auth_spec.rb
-  - spec/features/consumer/shopping/checkout_spec.rb
-  - spec/features/consumer/shopping/embedded_groups_spec.rb
-  - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
-  - spec/features/consumer/shopping/orders_spec.rb
-  - spec/features/consumer/shopping/products_spec.rb
-  - spec/features/consumer/shopping/shopping_spec.rb
-  - spec/features/consumer/shopping/variant_overrides_spec.rb
-  - spec/features/consumer/shops_spec.rb
-  - spec/lib/open_food_network/group_buy_report_spec.rb
-  - spec/models/tag_rule/discount_order_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/delayed_job_helper.rb
-  - spec/support/matchers/select2_matchers.rb
-  - spec/support/matchers/table_matchers.rb
-
 Metrics/CyclomaticComplexity:
  Max: 6
  Exclude:
-  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
  - app/controllers/spree/orders_controller_decorator.rb
  - app/helpers/checkout_helper.rb
  - app/helpers/i18n_helper.rb
  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
  - app/models/enterprise.rb
  - app/models/enterprise_relationship.rb
  - app/models/product_import/entry_processor.rb
  - app/models/product_import/entry_validator.rb
  - app/models/spree/ability_decorator.rb
+  - app/models/spree/adjustment_decorator.rb
  - app/models/spree/payment_decorator.rb
  - app/models/spree/product_decorator.rb
  - app/models/spree/product_set.rb
@@ -589,15 +535,17 @@ Metrics/PerceivedComplexity:
  Exclude:
  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
  - app/controllers/spree/orders_controller_decorator.rb
  - app/helpers/checkout_helper.rb
  - app/helpers/i18n_helper.rb
  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
  - app/models/enterprise_relationship.rb
  - app/models/product_import/entry_processor.rb
  - app/models/product_import/entry_validator.rb
  - app/models/spree/ability_decorator.rb
+  - app/models/spree/line_item_decorator.rb
  - app/models/spree/order_decorator.rb
  - app/models/spree/product_decorator.rb
  - app/models/spree/product_set.rb
@@ -614,8 +562,8 @@ Metrics/MethodLength:
  Max: 10
  Exclude:
  - app/controllers/admin/customers_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
  - app/controllers/admin/manager_invitations_controller.rb
  - app/controllers/admin/order_cycles_controller.rb
  - app/controllers/admin/stripe_accounts_controller.rb
@@ -624,12 +572,14 @@ Metrics/MethodLength:
  - app/controllers/cart_controller.rb
  - app/controllers/checkout_controller.rb
  - app/controllers/shop_controller.rb
-  - app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/line_items_controller_decorator.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
  - app/controllers/spree/admin/payment_methods_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller_decorator.rb
  - app/controllers/spree/admin/products_controller_decorator.rb
  - app/controllers/spree/admin/reports_controller_decorator.rb
  - app/controllers/spree/admin/search_controller_decorator.rb
+  - app/controllers/spree/admin/shipping_methods_controller_decorator.rb
  - app/controllers/spree/credit_cards_controller.rb
  - app/controllers/spree/orders_controller_decorator.rb
  - app/controllers/spree/user_sessions_controller_decorator.rb
@@ -639,6 +589,7 @@ Metrics/MethodLength:
  - app/controllers/user_registrations_controller.rb
  - app/helpers/checkout_helper.rb
  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
  - app/jobs/subscription_placement_job.rb
  - app/mailers/producer_mailer.rb
  - app/models/column_preference.rb
@@ -650,23 +601,24 @@ Metrics/MethodLength:
  - app/models/product_import/entry_validator.rb
  - app/models/product_import/product_importer.rb
  - app/models/spree/ability_decorator.rb
+  - app/models/spree/adjustment_decorator.rb
  - app/models/spree/calculator/default_tax_decorator.rb
  - app/models/spree/calculator/flexi_rate_decorator.rb
+  - app/models/spree/line_item_decorator.rb
  - app/models/spree/order_decorator.rb
  - app/models/spree/payment_decorator.rb
  - app/models/spree/payment_method_decorator.rb
-  - app/models/spree/product_decorator.rb
  - app/models/spree/product_set.rb
+  - app/models/spree/taxon_decorator.rb
  - app/serializers/api/admin/order_cycle_serializer.rb
-  - app/serializers/api/cached_enterprise_serializer.rb
+  - app/services/cart_service.rb
  - app/services/order_cycle_form.rb
-  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
  - lib/discourse/single_sign_on.rb
  - lib/open_food_network/bulk_coop_report.rb
+  - lib/open_food_network/cached_products_renderer.rb
  - lib/open_food_network/column_preference_defaults.rb
  - lib/open_food_network/customers_report.rb
  - lib/open_food_network/enterprise_fee_calculator.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
  - lib/open_food_network/group_buy_report.rb
  - lib/open_food_network/lettuce_share_report.rb
  - lib/open_food_network/option_value_namer.rb
@@ -691,7 +643,7 @@ Metrics/MethodLength:
  - lib/spree/core/controller_helpers/respond_with_decorator.rb
  - lib/spree/localized_number.rb
  - lib/stripe/profile_storer.rb
-  - lib/tasks/sample_data/product_factory.rb
+  - spec/archive/features/consumer/checkout_spec.rb
  - spec/features/consumer/shopping/checkout_spec.rb
  - spec/features/consumer/shopping/variant_overrides_spec.rb
  - spec/models/product_importer_spec.rb
@@ -710,10 +662,8 @@ Metrics/ClassLength:
  - app/models/product_import/entry_validator.rb
  - app/models/product_import/product_importer.rb
  - app/models/spree/ability_decorator.rb
-  - app/serializers/api/cached_enterprise_serializer.rb
-  - app/serializers/api/enterprise_shopfront_serializer.rb
+  - app/serializers/api/enterprise_serializer.rb
  - app/services/cart_service.rb
-  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
  - lib/open_food_network/bulk_coop_report.rb
  - lib/open_food_network/enterprise_fee_calculator.rb
  - lib/open_food_network/order_cycle_form_applicator.rb
@@ -736,7 +686,6 @@ Metrics/ModuleLength:
  - spec/controllers/api/orders_controller_spec.rb
  - spec/controllers/spree/api/products_controller_spec.rb
  - spec/lib/open_food_network/address_finder_spec.rb
-  - spec/lib/open_food_network/cached_products_renderer_spec.rb
  - spec/lib/open_food_network/customers_report_spec.rb
  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
  - spec/lib/open_food_network/option_value_namer_spec.rb
@@ -767,3 +716,8 @@ Metrics/ParameterLists:
  - app/models/product_import/entry_validator.rb
  - lib/open_food_network/xero_invoices_report.rb
  - spec/features/admin/reports_spec.rb
+
+Metrics/BlockNesting:
+  Max: 3
+  Exclude:
+  - app/controllers/checkout_controller.rb
--- a/.rubocop_styleguide.yml
+++ b/.rubocop_styleguide.yml
@@ -13,6 +13,8 @@ AllCops:
    - 'script/**/*'
    - 'vendor/**/*'
    - 'node_modules/**/*'
+    # The parser gem fails to parse this file with out current Ruby version.
+    - 'spec/factories.rb'
    # Excluding: inadequate Naming/FileName rule rejects GemFile name with camelcase
    - 'engines/web/Gemfile'

@@ -185,14 +187,15 @@ Metrics/AbcSize:
  Max: 15

 Metrics/BlockLength:
-  Max: 25
-  ExcludedMethods: ["class_eval", "collection", "context", "describe", "it", "member", "namespace", "resource", "resources"]
+  ExcludedMethods: ["collection", "context", "describe", "it", "member", "namespace", "resource", "resources"]

 Metrics/BlockNesting:
  Max: 3

 Metrics/ClassLength:
  Max: 100
+  Exclude:
+  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb

 Metrics/ModuleLength:
  Max: 100
@@ -202,6 +205,8 @@ Metrics/CyclomaticComplexity:

 Metrics/MethodLength:
  Max: 10
+  Exclude:
+  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb

 Metrics/ParameterLists:
  Max: 5
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,60 @@
+language: ruby
+sudo: false
+cache: bundler
+bundler_args: --without development
+rvm:
+  - "2.1.5"
+addons:
+  postgresql: "9.5"
+
+# Set the timezone for phantomjs with TZ
+# Set the timezone for karma with TIMEZONE
+env:
+  global:
+    - TZ="Australia/Melbourne"
+    - TIMEZONE="Australia/Melbourne"
+    - CI_NODE_TOTAL=5
+  matrix:
+    - CI_NODE_INDEX=0
+    - CI_NODE_INDEX=1
+    - CI_NODE_INDEX=2
+    - CI_NODE_INDEX=3 RSPEC_ENGINES="true"
+    - CI_NODE_INDEX=4 KARMA="true" GITHUB_DEPLOY="true"
+
+before_script:
+  - cp config/database.travis.yml config/database.yml
+  - cp config/application.yml.example config/application.yml
+  - RAILS_ENV=test bundle exec rake db:create db:schema:load
+
+  # Only install PhantomJS if it is not already present (ie. cached)
+  - npm list -g phantomjs-prebuilt@~2.1.7 --depth=0 || npm install -g phantomjs-prebuilt@~2.1.7
+  - export PATH=`npm bin -g`:$PATH
+
+  - >
+    if [ "$KARMA" = "true" ]; then
+      npm install -g npm@'3.8.8'
+      npm install
+      npm install -g karma-cli@0.1.2
+    fi
+
+script:
+  - 'if [ "$KARMA" = "true" ]; then bundle exec rake karma:run; else echo "Skipping karma run"; fi'
+  - 'if [ "$RSPEC_ENGINES" = "true" ]; then bundle exec rake ofn:specs:engines:rspec; else echo "Skipping RSpec run in engines"; fi'
+  - "bundle exec rake 'knapsack:rspec[--format progress --tag ~performance]'"
+
+after_success:
+  - >
+    if [ "$GITHUB_DEPLOY" = "true" -a "$TRAVIS_PULL_REQUEST" = "false" -a -n "$TRAVIS_BRANCH" -a "$TRAVIS_BRANCH" != "transifex" -a -n "$GITHUB_API_SECRET" ]; then
+      description="`git show "$TRAVIS_BRANCH" -s --oneline --no-color`"
+      data="{
+        \"ref\":\"$TRAVIS_BRANCH\",
+        \"description\":\"$description\",
+        \"environment\":\"staging\",
+        \"required_contexts\":[]}"
+      curl -u "$GITHUB_API_SECRET" -d "$data" "https://api.github.com/repos/$TRAVIS_REPO_SLUG/deployments"
+    else
+      echo "Not deploying on this build."
+    fi
+
+notifications:
+  email: false
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -1,47 +0,0 @@
-### Docker
-
-It is possible to setup the Open Food Network app easily with Docker and Docker Compose.
-The objective is to spare configuration time, in order to help people testing the app and contribute to it.
-It can also be used as documentation. It is not perfect but it is used in many other projects and many devs are used to it nowadays.
-
-### Install Docker
-
-Please check the documentation here, https://docs.docker.com/install/ to install Docker.
-
-For Docker Compose, information are here: https://docs.docker.com/compose/install/.
-
-Better to have at least 2GB free on your computer in order to download images and create containers for Open Food Network app.
-
-
-### Use Docker with Open Food Network
-
-Open a terminal with a shell.
-
-Clone the repository:
-
-```sh
-$ git clone git@github.com:openfoodfoundation/openfoodnetwork.git
-```
-
-Go at the root of the app:
-
-```sh
-$ cd openfoodnetwork
-```
-
-Download the Docker images and build the containers:
-
-```sh
-$ docker-compose build
-```
-
-Run the app with all the required containers:
-
-```sh
-$ docker-compose up
-```
-
-This command will setup the database and seed it with sample data. The default admin user is 'ofn@example.com' with 'ofn123' password.
-Check the app in the browser at `http:://localhost:3000`.
-
-You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
--- a/31
+++ b/31
@@ -1,31 +0,0 @@
-FROM ubuntu:18.04
-
-# Install all the requirements
-RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it
-
-# Setup ENV variables
-ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:$PATH
-ENV RBENV_ROOT /usr/local/src/rbenv
-ENV RUBY_VERSION 2.1.5
-ENV CONFIGURE_OPTS --disable-install-doc
-
-# Rbenv & Ruby part
-RUN git clone https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
-    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
-    ${RBENV_ROOT}/plugins/ruby-build/install.sh && \
-    echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
-    rbenv install $RUBY_VERSION && \
-    rbenv global $RUBY_VERSION && \
-    gem install bundler --version=1.17.2
-
-# Postgres
-RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \
-    wget --quiet -O - https://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - && \
-    apt-get update && \
-    apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
-
-ENV BUNDLE_PATH /bundles
-
-COPY . /usr/src/app/
-
-WORKDIR /usr/src/app
--- a/97
+++ b/97
@@ -2,13 +2,11 @@ source 'https://rubygems.org'
 ruby "2.1.5"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

-gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.3.0'
 gem 'rails', '~> 3.2.22'
 gem 'rails-i18n', '~> 3.0.0'
-gem 'rails_safe_tasks', '~> 1.0'
+gem 'i18n', '~> 0.6.11'
+gem 'i18n-js', '~> 3.2.1'

-gem "activerecord-import"
 # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
 gem 'nokogiri', '>= 1.6.7.1'

@@ -20,11 +18,10 @@ gem 'pg'
 # OFN-maintained and patched version of Spree v2.0.4. See
 # https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade
 # for details.
-gem 'spree_api', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
-gem 'spree_backend', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
-gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
+gem 'spree', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'

 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'

 # Our branch contains two changes
 # - Pass customer email and phone number to PayPal (merged to upstream master)
@@ -36,53 +33,51 @@ gem 'stripe'
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78'

-gem 'devise', '~> 2.2.5'
-gem 'devise-encryptable', '0.1.2'
-gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.1' # Used for Stripe Connect
+gem 'jwt', '~> 2.1'

-gem 'daemons'
 gem 'delayed_job_active_record'
+gem 'daemons'
 gem 'delayed_job_web'

 # Fix bug in simple_form preventing collection_check_boxes usage within form_for block
 # When merged, revert to upstream gem
 gem 'simple_form', github: 'RohanM/simple_form'

-gem 'andand'
+gem 'unicorn'
 gem 'angularjs-rails', '1.5.5'
-gem 'aws-sdk'
 gem 'bugsnag'
-gem 'db2fog'
 gem 'haml'
-gem 'rabl'
-gem 'redcarpet'
 gem 'sass', "~> 3.3"
 gem 'sass-rails', '~> 3.2.3', groups: [:default, :assets]
+gem 'redcarpet'
+gem 'aws-sdk'
+gem 'db2fog'
+gem 'andand'
 gem 'truncate_html'
-gem 'unicorn'
+gem 'rabl'

 # AMS is pinned to 0.8.4 because 0.9.x is a complete re-write, as is 0.10.x
 # Once Rails is updated to 5.x we should bump directly to 0.10.x
 gem "active_model_serializers", "0.8.4"
-gem 'acts-as-taggable-on', '~> 3.4'
-gem 'angularjs-file-upload-rails', '~> 2.4.1'
-gem 'blockenspiel'
-gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
+gem 'oj'
+gem 'deface', '1.0.0'
+gem 'paperclip', '~> 3.4.1'
 gem 'dalli'
-gem 'deface', '1.0.2'
-gem 'diffy'
-gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
-gem 'oj'
-gem 'paper_trail', '~> 5.2.3'
-gem 'paperclip', '~> 3.4.1'
-gem 'rack-rewrite'
-gem 'rack-ssl', require: 'rack/ssl'
-gem 'roadie-rails', '~> 1.1.1'
-gem 'skylight', '< 2.0'
 gem 'spinjs-rails'
+gem 'rack-ssl', require: 'rack/ssl'
+gem 'rack-rewrite'
+gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
+gem 'angularjs-file-upload-rails', '~> 2.4.1'
+gem 'roadie-rails', '~> 1.1.1'
+gem 'figaro'
+gem 'blockenspiel'
+gem 'acts-as-taggable-on', '~> 3.4'
+gem 'paper_trail', '~> 5.2.3'
+gem 'diffy'
+gem 'skylight', '< 2.0'

 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -98,64 +93,64 @@ gem 'whenever', require: false
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'coffee-rails', '~> 3.2.1'
  gem 'compass-rails'
+  gem 'coffee-rails', '~> 3.2.1'

  gem 'therubyracer', '=0.12.0'

  gem 'uglifier', '>= 1.0.3'

-  gem 'angular-rails-templates', '~> 0.3.0'
+  gem 'turbo-sprockets-rails3'
  gem 'foundation-icons-sass-rails'
  gem 'momentjs-rails'
-  gem 'turbo-sprockets-rails3'
+  gem 'angular-rails-templates', '~> 0.3.0'
 end

 gem "foundation-rails"
 gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"

+gem 'jquery-rails', '3.0.0'
 gem 'jquery-migrate-rails'
-gem 'jquery-rails', '3.0.4'

 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c'

 group :test, :development do
  # Pretty printed test output
-  gem 'atomic'
-  gem 'awesome_print'
+  gem 'fuubar', '~> 2.3.2'
+  gem 'rspec-rails', ">= 3.5.2"
+  gem 'shoulda-matchers'
+  gem "factory_bot_rails", require: false
  gem 'capybara', '>= 2.15.4'
  gem 'database_cleaner', '0.7.1', require: false
-  gem "factory_bot_rails", require: false
-  gem 'fuubar', '~> 2.4.1'
-  gem 'json_spec', '~> 1.1.4'
-  gem 'knapsack'
+  gem 'awesome_print'
  gem 'letter_opener', '>= 1.4.1'
-  gem 'rspec-rails', ">= 3.5.2"
-  gem 'rspec-retry'
-  gem 'selenium-webdriver'
-  gem 'shoulda-matchers'
  gem 'timecop'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'rspec-retry'
+  gem 'json_spec', '~> 1.1.4'
  gem 'unicorn-rails'
-  gem 'webdrivers', '3.8.1'
+  gem 'atomic'
+  gem 'knapsack'
 end

 group :test do
-  gem 'simplecov', require: false
  gem 'webmock'
+  gem 'simplecov', require: false
  # See spec/spec_helper.rb for instructions
-  # gem 'perftools.rb'
+  #gem 'perftools.rb'
 end

 group :development do
  gem 'byebug', '~> 9.0.0' # 9.1 requires ruby 2.2
+  gem "newrelic_rpm", "~> 3.0"
+  gem 'pry-byebug', '>= 3.4.3'
  gem 'debugger-linecache'
  gem 'guard'
+  gem 'listen', '3.0.8' # 3.1.0 requires ruby 2.2
  gem 'guard-livereload'
  gem 'guard-rails'
  gem 'guard-rspec', '~> 4.7.3'
-  gem 'listen', '3.0.8' # 3.1.0 requires ruby 2.2
-  gem "newrelic_rpm", "~> 3.0"
-  gem 'pry-byebug', '>= 3.4.3'
  gem 'rubocop', '>= 0.49.1'
  gem 'spring', '1.7.2'
  gem 'spring-commands-rspec'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,9 +31,16 @@ GIT

 GIT
  remote: https://github.com/openfoodfoundation/spree.git
-  revision: 8a8585a43cd04d1a50dc65227f337a91b18d66d5
+  revision: 46d6f8f5fd434105b0c69958276d1727a3066a97
  branch: 2-0-4-stable
  specs:
+    spree (2.0.4)
+      spree_api (= 2.0.4)
+      spree_backend (= 2.0.4)
+      spree_cmd (= 2.0.4)
+      spree_core (= 2.0.4)
+      spree_frontend (= 2.0.4)
+      spree_sample (= 2.0.4)
    spree_api (2.0.4)
      rabl (= 0.8.4)
      spree_core (= 2.0.4)
@@ -46,6 +53,8 @@ GIT
      select2-rails (~> 3.4.7)
      spree_api (= 2.0.4)
      spree_core (= 2.0.4)
+    spree_cmd (2.0.4)
+      thor (>= 0.14.6)
    spree_core (2.0.4)
      activemerchant (~> 1.34)
      acts_as_list (= 0.2.0)
@@ -66,6 +75,28 @@ GIT
      state_machine (= 1.2.0)
      stringex (~> 1.5.1)
      truncate_html (= 0.9.2)
+    spree_frontend (2.0.4)
+      canonical-rails
+      deface (>= 0.9.0)
+      jquery-rails (~> 3.0.0)
+      rails (~> 3.2.13)
+      spree_api (= 2.0.4)
+      spree_core (= 2.0.4)
+      stringex (~> 1.5.1)
+    spree_sample (2.0.4)
+      spree_core (= 2.0.4)
+
+GIT
+  remote: https://github.com/spree/spree_auth_devise.git
+  revision: 0181835fb6ac77a05191d26f6f32a0f4a548d851
+  branch: 2-0-stable
+  specs:
+    spree_auth_devise (2.0.0)
+      devise (~> 2.2.5)
+      devise-encryptable (= 0.1.2)
+      spree_backend (~> 2.0.0)
+      spree_core (~> 2.0.0)
+      spree_frontend (~> 2.0.0)

 GIT
  remote: https://github.com/spree/spree_i18n.git
@@ -129,8 +160,6 @@ GEM
      activesupport (= 3.2.22.5)
      arel (~> 3.0.2)
      tzinfo (~> 0.3.29)
-    activerecord-import (1.0.2)
-      activerecord (>= 3.2)
    activeresource (3.2.22.5)
      activemodel (= 3.2.22.5)
      activesupport (= 3.2.22.5)
@@ -141,7 +170,7 @@ GEM
      activerecord (>= 3.2, < 5)
    acts_as_list (0.2.0)
      activerecord (>= 3.0)
-    addressable (2.6.0)
+    addressable (2.5.2)
      public_suffix (>= 2.0.2, < 4.0)
    andand (1.3.3)
    angular-rails-templates (0.3.0)
@@ -150,6 +179,8 @@ GEM
      tilt
    angularjs-file-upload-rails (2.4.1)
    angularjs-rails (1.5.5)
+    archive-zip (0.7.0)
+      io-like (~> 0.3.0)
    arel (3.0.3)
    ast (2.4.0)
    atomic (1.1.101)
@@ -160,7 +191,7 @@ GEM
      json (~> 1.4)
      nokogiri (>= 1.4.4)
      uuidtools (~> 2.1)
-    bcrypt (3.1.13)
+    bcrypt (3.1.11)
    bcrypt-ruby (3.1.5)
      bcrypt (>= 3.1.3)
    blockenspiel (0.5.0)
@@ -169,6 +200,8 @@ GEM
    builder (3.0.4)
    byebug (9.0.6)
    cancan (1.6.10)
+    canonical-rails (0.1.0)
+      rails (>= 3.1, < 5.1)
    capybara (2.18.0)
      addressable
      mini_mime (>= 0.1.3)
@@ -178,6 +211,9 @@ GEM
      xpath (>= 2.0, < 4.0)
    childprocess (0.9.0)
      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.1.0)
+      archive-zip (~> 0.7.0)
+      nokogiri (~> 1.6)
    chronic (0.10.2)
    chunky_png (1.3.10)
    climate_control (0.2.0)
@@ -224,10 +260,9 @@ GEM
      fog (~> 1.0)
      rails (>= 3.2.0, < 5.0)
    debugger-linecache (1.2.0)
-    deface (1.0.2)
+    deface (1.0.0)
      colorize (>= 0.5.8)
      nokogiri (~> 1.6.0)
-      polyglot
      rails (>= 3.1)
    delayed_job (4.1.5)
      activesupport (>= 3.0, < 5.3)
@@ -248,7 +283,7 @@ GEM
      devise (>= 2.1.0)
    diff-lcs (1.3)
    diffy (3.3.0)
-    docile (1.3.2)
+    docile (1.3.1)
    dry-inflector (0.1.2)
    em-websocket (0.5.1)
      eventmachine (>= 0.12.9)
@@ -425,7 +460,7 @@ GEM
    foundation-rails (5.5.2.1)
      railties (>= 3.1.0)
      sass (>= 3.3.0, < 3.5)
-    fuubar (2.4.1)
+    fuubar (2.3.2)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
    geocoder (1.1.8)
@@ -454,22 +489,23 @@ GEM
      rspec (>= 2.99.0, < 4.0)
    haml (4.0.7)
      tilt
-    hashdiff (0.4.0)
+    hashdiff (0.3.7)
    highline (1.6.18)
    hike (1.2.3)
    http_parser.rb (0.6.0)
    httparty (0.16.2)
      multi_xml (>= 0.5.2)
    i18n (0.6.11)
-    i18n-js (3.3.0)
+    i18n-js (3.2.1)
      i18n (>= 0.6.6)
    immigrant (0.3.6)
      activerecord (>= 3.0)
+    io-like (0.3.0)
    ipaddress (0.8.3)
    jaro_winkler (1.5.1)
    journey (1.0.4)
    jquery-migrate-rails (1.2.1)
-    jquery-rails (3.0.4)
+    jquery-rails (3.0.0)
      railties (>= 3.0, < 5.0)
      thor (>= 0.14, < 2.0)
    jquery-ui-rails (4.0.5)
@@ -478,12 +514,12 @@ GEM
    json_spec (1.1.5)
      multi_json (~> 1.0)
      rspec (>= 2.0, < 4.0)
-    jwt (2.2.1)
+    jwt (2.1.0)
    kaminari (0.14.1)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
    kgio (2.11.2)
-    knapsack (1.17.2)
+    knapsack (1.17.1)
      rake
    launchy (2.4.3)
      addressable (~> 2.3)
@@ -507,9 +543,9 @@ GEM
      i18n (~> 0.6.0)
    multi_json (1.13.1)
    multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.0.0)
    nenv (0.3.0)
-    net-http-persistent (3.0.1)
+    net-http-persistent (3.0.0)
      connection_pool (~> 2.2)
    newrelic_rpm (3.18.1.330)
    nokogiri (1.6.8.1)
@@ -559,7 +595,7 @@ GEM
    rabl (0.8.4)
      activesupport (>= 2.3.14)
    rack (1.4.7)
-    rack-cache (1.9.0)
+    rack-cache (1.8.0)
      rack (>= 0.4)
    rack-mini-profiler (0.10.7)
      rack (>= 1.2.0)
@@ -581,7 +617,6 @@ GEM
    rails-i18n (3.0.1)
      i18n (~> 0.5)
      rails (>= 3.0.0, < 4.0.0)
-    rails_safe_tasks (1.0.0)
    railties (3.2.22.5)
      actionpack (= 3.2.22.5)
      activesupport (= 3.2.22.5)
@@ -606,7 +641,7 @@ GEM
      trollop (~> 2.1)
    rdoc (3.12.2)
      json (~> 1.4)
-    redcarpet (3.5.0)
+    redcarpet (3.4.0)
    ref (2.0.0)
    request_store (1.4.1)
      rack (>= 1.4)
@@ -655,10 +690,10 @@ GEM
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
    ruby-ole (1.2.12.1)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.10.0)
    ruby-rc4 (0.1.5)
    rubyzip (1.2.2)
-    safe_yaml (1.0.5)
+    safe_yaml (1.0.4)
    sass (3.3.14)
    sass-rails (3.2.6)
      railties (~> 3.2.0)
@@ -673,7 +708,7 @@ GEM
    shellany (0.0.1)
    shoulda-matchers (2.8.0)
      activesupport (>= 3.0.0)
-    simplecov (0.17.0)
+    simplecov (0.16.1)
      docile (~> 1.1)
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
@@ -698,7 +733,7 @@ GEM
      tilt (~> 1.1, != 1.3.0)
    state_machine (1.2.0)
    stringex (1.5.1)
-    stripe (4.19.0)
+    stripe (4.11.0)
      faraday (~> 0.13)
      net-http-persistent (~> 3.0)
    therubyracer (0.12.0)
@@ -719,7 +754,7 @@ GEM
    uglifier (4.1.20)
      execjs (>= 0.3.0, < 3)
    unicode-display_width (1.3.2)
-    unicorn (5.5.1)
+    unicorn (5.5.0)
      kgio (~> 2.6)
      raindrops (~> 0.7)
    unicorn-rails (2.2.1)
@@ -732,14 +767,10 @@ GEM
      railties (>= 3.0)
    warden (1.2.7)
      rack (>= 1.0)
-    webdrivers (3.8.1)
-      nokogiri (~> 1.6)
-      rubyzip (~> 1.0)
-      selenium-webdriver (~> 3.0)
-    webmock (3.6.0)
+    webmock (3.5.1)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
+      hashdiff
    whenever (0.11.0)
      chronic (>= 0.6.3)
    wicked_pdf (1.1.0)
@@ -754,7 +785,6 @@ PLATFORMS
 DEPENDENCIES
  active_model_serializers (= 0.8.4)
  activemerchant (~> 1.78)
-  activerecord-import
  acts-as-taggable-on (~> 3.4)
  andand
  angular-rails-templates (~> 0.3.0)
@@ -767,6 +797,7 @@ DEPENDENCIES
  bugsnag
  byebug (~> 9.0.0)
  capybara (>= 2.15.4)
+  chromedriver-helper
  coffee-rails (~> 3.2.1)
  combine_pdf
  compass-rails
@@ -776,11 +807,9 @@ DEPENDENCIES
  database_cleaner (= 0.7.1)
  db2fog
  debugger-linecache
-  deface (= 1.0.2)
+  deface (= 1.0.0)
  delayed_job_active_record
  delayed_job_web
-  devise (~> 2.2.5)
-  devise-encryptable (= 0.1.2)
  diffy
  eventmachine (>= 1.2.3)
  factory_bot_rails
@@ -789,7 +818,7 @@ DEPENDENCIES
  foundation-icons-sass-rails
  foundation-rails
  foundation_rails_helper!
-  fuubar (~> 2.4.1)
+  fuubar (~> 2.3.2)
  geocoder
  gmaps4rails
  guard
@@ -798,12 +827,12 @@ DEPENDENCIES
  guard-rspec (~> 4.7.3)
  haml
  i18n (~> 0.6.11)
-  i18n-js (~> 3.3.0)
+  i18n-js (~> 3.2.1)
  immigrant
  jquery-migrate-rails
-  jquery-rails (= 3.0.4)
+  jquery-rails (= 3.0.0)
  json_spec (~> 1.1.4)
-  jwt (~> 2.2)
+  jwt (~> 2.1)
  knapsack
  letter_opener (>= 1.4.1)
  listen (= 3.0.8)
@@ -824,7 +853,6 @@ DEPENDENCIES
  rack-ssl
  rails (~> 3.2.22)
  rails-i18n (~> 3.0.0)
-  rails_safe_tasks (~> 1.0)
  redcarpet
  roadie-rails (~> 1.1.1)
  roo (~> 2.7.0)
@@ -840,9 +868,8 @@ DEPENDENCIES
  simplecov
  skylight (< 2.0)
  spinjs-rails
-  spree_api!
-  spree_backend!
-  spree_core!
+  spree!
+  spree_auth_devise!
  spree_i18n!
  spree_paypal_express!
  spring (= 1.7.2)
@@ -856,7 +883,6 @@ DEPENDENCIES
  unicorn
  unicorn-rails
  web!
-  webdrivers (= 3.8.1)
  webmock
  whenever
  wicked_pdf
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Supported by the Open Food Foundation and a network of global affiliates, we are

 We're part of global movement - get involved!

+* Fill in this [short survey][survey] to tell us who you are and what you want to do with OFN.
 * Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel
 * Head to [https://openfoodnetwork.org](https://openfoodnetwork.org) for more information about the global OFN project.
 * Check out the [User Guide](https://guide.openfoodnetwork.org/) for a list of features and tutorials.
@@ -27,13 +28,28 @@ If you're interested in provisioning a server, see [ofn-install][ofn-install] fo

 We also have a [Super Admin Guide][super-admin-guide] to help with configuration of new servers.

-## Testing

-We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them!
+## Credits
+
+* Andrew Spinks (http://github.com/andrewspinks)
+* Rohan Mitchell (http://github.com/rohanm)
+* Rob Harrington (http://github.com/oeoeaio)
+* Alex Serdyuk (http://github.com/alexs333)
+* David Cook (http://github.com/dacook)
+* Will Marshall (http://soundcloud.com/willmarshall)
+* Laura Summers (https://github.com/summerscope)
+* Maikel Linke (https://github.com/mkllnk)
+* Lynne Davis (https://github.com/lin-d-hop)
+* Paul Mackay (https://github.com/pmackay)
+* Steve Pettitt (https://github.com/stveep)
+* Matt Yorkley (https://github.com/Matt-Yorkley)
+* Pau Pérez (https://github.com/sauloperez)
+* Enrico Stano (https://github.com/enricostano)
+

 ## Licence

-Copyright (c) 2012 - 2019 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2018 Open Food Foundation, released under the AGPL licence.

 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://openfoodnetwork.org/slack-invite
--- a/0
+++ b/0
--- a/app/assets/images/datepicker/cal.gif
+++ b/app/assets/images/datepicker/cal.gif
--- a/app/assets/images/map_001-producer-only.svg
+++ b/app/assets/images/map_001-producer-only.svg
@@ -1,110 +1,67 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_producer.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs29" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1803"
-   inkscape:window-height="857"
-   id="namedview27"
-   showgrid="false"
-   inkscape:zoom="17.609546"
-   inkscape:cx="3.0055332"
-   inkscape:cy="16.5"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g20" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g24">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g22">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g20">
-			<path
-   fill="#C1122B"
-   d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002     l-0.935-2.824L9.46,8.846z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="8.728"
-   cy="17.454"
-   r="1.569"
-   id="circle10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075     c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464     c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112     c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727     c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069     s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="20.826"
-   cy="19.013"
-   r="1.006"
-   id="circle14"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839     c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484     S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065     c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0     v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252     c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147     c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037     c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0     c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147     c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163     c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018     C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257     c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
-   id="path16"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013     c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98     c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018     c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455     c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679     c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572     c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23     c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073     c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208     c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
-   id="path18"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#0B8C61" d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002
+				l-0.935-2.824L9.46,8.846z"/>
+			<circle fill="#0B8C61" cx="8.728" cy="17.454" r="1.569"/>
+			<path fill="#0B8C61" d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075
+				c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464
+				c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112
+				c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727
+				c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069
+				s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"/>
+			<circle fill="#0B8C61" cx="20.826" cy="19.013" r="1.006"/>
+			<path fill="#0B8C61" d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839
+				c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484
+				S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065
+				c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0
+				v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252
+				c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147
+				c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037
+				c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0
+				c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147
+				c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163
+				c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018
+				C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257
+				c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"/>
+			<path fill="#0B8C61" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013
+				c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98
+				c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018
+				c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455
+				c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679
+				c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572
+				c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23
+				c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073
+				c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208
+				c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/map_002-producer-only-profile.svg
+++ b/app/assets/images/map_002-producer-only-profile.svg
@@ -1,110 +1,69 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_producer.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs29" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1803"
-   inkscape:window-height="857"
-   id="namedview27"
-   showgrid="false"
-   inkscape:zoom="17.609546"
-   inkscape:cx="3.0055332"
-   inkscape:cy="16.5"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g20" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g24">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g22">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g20">
-			<path
-   fill="#C1122B"
-   d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002     l-0.935-2.824L9.46,8.846z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="8.728"
-   cy="17.454"
-   r="1.569"
-   id="circle10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075     c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464     c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112     c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727     c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069     s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="20.826"
-   cy="19.013"
-   r="1.006"
-   id="circle14"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839     c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484     S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065     c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0     v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252     c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147     c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037     c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0     c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147     c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163     c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018     C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257     c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
-   id="path16"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013     c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98     c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018     c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455     c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679     c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572     c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23     c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073     c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208     c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
-   id="path18"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#0B8C61" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+				C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1c7.44,0,13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+			<path fill="#0B8C61" d="M23.703,15.582c0.123-0.658,0.214-1.36,0.284-2.208c0.035-0.422,0.026-0.962-0.358-1.396
+				c-0.433-0.489-1.081-0.514-1.358-0.525c-0.659-0.024-1.281-0.048-1.916-0.073c0.011-0.745,0.028-1.56,0.028-1.56l0.011-0.52
+				l-0.419-0.307c-0.106-0.078-0.495-0.332-1.044-0.332c-0.306,0-0.599,0.077-0.872,0.23l-0.512,0.286v0.586v1.502
+				c-0.378-0.009-0.845-0.02-1.376-0.031c-0.062-0.164-0.135-0.355-0.217-0.572c-0.298-0.78-0.706-1.847-1.203-3.283l-0.011-0.03
+				l-0.013-0.03c-0.234-0.557-0.969-1.5-2.238-1.5H7.811h-1v1v4.407L6.3,11.276l-0.125,0.757c-0.061,0.373-0.13,0.911,0.148,1.375
+				C4.939,14.233,4,15.729,4,17.455c0,2.606,2.121,4.727,4.728,4.727c2.39,0,4.349-1.79,4.661-4.096
+				c0.107,0.016,0.212,0.03,0.315,0.03h0.018l0.037-0.001c0.706-0.018,1.421-0.031,2.137-0.043c0.639-0.011,1.288-0.023,1.94-0.039
+				c-0.103,0.311-0.158,0.641-0.158,0.98c0,1.735,1.412,3.147,3.148,3.147c1.736,0,3.147-1.412,3.147-3.147
+				c0-0.706-0.242-1.369-0.651-1.903c0.135-0.239,0.23-0.556,0.292-0.981C23.636,15.978,23.662,15.798,23.703,15.582z M8.728,21.181
+				C6.672,21.181,5,19.51,5,17.455c0-1.562,0.969-2.898,2.335-3.451c0.026,0.001,0.046,0.009,0.074,0.009
+				c0.197,0,0.409-0.034,0.685-0.112c0.289-0.081,0.586-0.122,0.881-0.122c0.21,0,0.417,0.021,0.619,0.061
+				c0.888,0.213,1.652,0.741,2.166,1.464c0.041,0.06,0.082,0.121,0.119,0.184c0.057,0.091,0.105,0.188,0.155,0.285
+				c0.16,0.334,0.279,0.693,0.325,1.075c0.009,0.083,0.022,0.176,0.037,0.283l0.011,0.082l0.041,0.296
+				C12.417,19.539,10.763,21.181,8.728,21.181z M22.973,19.013c0,1.184-0.964,2.147-2.147,2.147c-1.186,0-2.148-0.963-2.148-2.147
+				c0-0.985,0.669-1.815,1.575-2.067c-2.174,0.109-4.353,0.113-6.529,0.169c-0.007,0-0.013,0-0.02,0
+				c-0.092,0-0.188-0.022-0.289-0.036c-0.032-0.402-0.111-0.788-0.238-1.156c-0.004-0.012-0.007-0.024-0.011-0.037
+				c-0.063-0.177-0.134-0.348-0.217-0.515c-0.076-0.163-0.161-0.318-0.255-0.469c-0.032-0.05-0.062-0.099-0.096-0.147
+				c-0.646-0.956-1.628-1.642-2.748-1.879c-0.362-0.089-0.734-0.149-1.122-0.149c-0.509,0-0.991,0.102-1.451,0.252
+				c-0.181-0.073-0.192-0.312-0.115-0.784c0.296-0.029,0.649-0.178,0.649-0.178V6.819c0,0,3.899,0,4.679,0
+				c0.943,0,1.316,0.888,1.316,0.888c0.72,2.081,1.269,3.432,1.52,4.126c0.097,0.264,0.303,0.39,0.378,0.392
+				c1.672,0.035,2.844,0.065,2.844,0.065c0-0.873,0-1.706,0-2.527c0.136-0.076,0.267-0.103,0.383-0.103
+				c0.265,0,0.453,0.138,0.453,0.138s-0.037,1.76-0.037,2.484c0,0.038,0.048,0.059,0.077,0.06c0.961,0.038,1.848,0.075,2.808,0.109
+				c0.646,0.025,0.813,0.18,0.758,0.839c-0.059,0.705-0.14,1.412-0.271,2.108c-0.269,1.444,0.042,1.395-1.562,1.496
+				C22.183,17.055,22.973,17.943,22.973,19.013z"/>
+			<path fill="#0B8C61" d="M19.57,19.013c0,0.693,0.564,1.257,1.256,1.257c0.692,0,1.256-0.564,1.256-1.257
+				c0-0.692-0.564-1.255-1.256-1.255C20.134,17.758,19.57,18.321,19.57,19.013z M21.832,19.013c0,0.555-0.451,1.007-1.006,1.007
+				c-0.555,0-1.006-0.452-1.006-1.007c0-0.554,0.451-1.005,1.006-1.005C21.381,18.008,21.832,18.459,21.832,19.013z"/>
+			<path fill="#0B8C61" d="M12.919,8.341L8.961,8.347l-0.004,0.97l-0.003,2.916c1.209-0.044,2.595-0.069,3.939-0.069
+				c0.452,0,0.9,0.003,1.334,0.009l-0.045-0.018L12.919,8.341z M12.893,11.663c-1.138,0-2.34,0.018-3.438,0.052l0.003-2.397
+				L9.46,8.846l3.098-0.005l0.935,2.824C13.294,11.664,13.094,11.663,12.893,11.663z"/>
+			<path fill="#0B8C61" d="M8.728,15.385c-1.142,0-2.07,0.929-2.07,2.07s0.928,2.069,2.07,2.069c1.141,0,2.069-0.928,2.069-2.069
+				S9.869,15.385,8.728,15.385z M8.728,19.023c-0.865,0-1.57-0.704-1.57-1.569c0-0.866,0.704-1.57,1.57-1.57
+				c0.865,0,1.569,0.704,1.569,1.57C10.297,18.32,9.593,19.023,8.728,19.023z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/map_003-producer-shop.svg
+++ b/app/assets/images/map_003-producer-shop.svg
@@ -1,110 +1,67 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_producer.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs29" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1803"
-   inkscape:window-height="857"
-   id="namedview27"
-   showgrid="false"
-   inkscape:zoom="17.609546"
-   inkscape:cx="3.0055332"
-   inkscape:cy="16.5"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g20" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g24">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g22">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g20">
-			<path
-   fill="#C1122B"
-   d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002     l-0.935-2.824L9.46,8.846z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="8.728"
-   cy="17.454"
-   r="1.569"
-   id="circle10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075     c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464     c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112     c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727     c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069     s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="20.826"
-   cy="19.013"
-   r="1.006"
-   id="circle14"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839     c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484     S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065     c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0     v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252     c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147     c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037     c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0     c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147     c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163     c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018     C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257     c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
-   id="path16"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013     c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98     c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018     c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455     c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679     c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572     c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23     c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073     c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208     c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
-   id="path18"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002
+				l-0.935-2.824L9.46,8.846z"/>
+			<circle fill="#C1122B" cx="8.728" cy="17.454" r="1.569"/>
+			<path fill="#C1122B" d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075
+				c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464
+				c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112
+				c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727
+				c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069
+				s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"/>
+			<circle fill="#C1122B" cx="20.826" cy="19.013" r="1.006"/>
+			<path fill="#C1122B" d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839
+				c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484
+				S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065
+				c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0
+				v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252
+				c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147
+				c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037
+				c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0
+				c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147
+				c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163
+				c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018
+				C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257
+				c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"/>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013
+				c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98
+				c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018
+				c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455
+				c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679
+				c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572
+				c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23
+				c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073
+				c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208
+				c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/map_004-producer-shop-profile.svg
+++ b/app/assets/images/map_004-producer-shop-profile.svg
@@ -1,110 +1,69 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_producer.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs29" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1803"
-   inkscape:window-height="857"
-   id="namedview27"
-   showgrid="false"
-   inkscape:zoom="17.609546"
-   inkscape:cx="3.0055332"
-   inkscape:cy="16.5"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g20" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g24">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g22">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g20">
-			<path
-   fill="#C1122B"
-   d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002     l-0.935-2.824L9.46,8.846z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="8.728"
-   cy="17.454"
-   r="1.569"
-   id="circle10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075     c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464     c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112     c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727     c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069     s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<circle
-   fill="#C1122B"
-   cx="20.826"
-   cy="19.013"
-   r="1.006"
-   id="circle14"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839     c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484     S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065     c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0     v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252     c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147     c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037     c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0     c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147     c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163     c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018     C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257     c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
-   id="path16"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013     c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98     c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018     c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455     c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679     c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572     c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23     c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073     c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208     c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
-   id="path18"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+				C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1c7.44,0,13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+			<path fill="#C1122B" d="M23.703,15.582c0.123-0.658,0.214-1.36,0.284-2.208c0.035-0.422,0.026-0.962-0.358-1.396
+				c-0.433-0.489-1.081-0.514-1.358-0.525c-0.659-0.024-1.281-0.048-1.916-0.073c0.011-0.745,0.028-1.56,0.028-1.56l0.011-0.52
+				l-0.419-0.307c-0.106-0.078-0.495-0.332-1.044-0.332c-0.306,0-0.599,0.077-0.872,0.23l-0.512,0.286v0.586v1.502
+				c-0.378-0.009-0.845-0.02-1.376-0.031c-0.062-0.164-0.135-0.355-0.217-0.572c-0.298-0.78-0.706-1.847-1.203-3.283l-0.011-0.03
+				l-0.013-0.03c-0.234-0.557-0.969-1.5-2.238-1.5H7.811h-1v1v4.407L6.3,11.276l-0.125,0.757c-0.061,0.373-0.13,0.911,0.148,1.375
+				C4.939,14.233,4,15.729,4,17.455c0,2.606,2.121,4.727,4.728,4.727c2.39,0,4.349-1.79,4.661-4.096
+				c0.107,0.016,0.212,0.03,0.315,0.03h0.018l0.037-0.001c0.706-0.018,1.421-0.031,2.137-0.043c0.639-0.011,1.288-0.023,1.94-0.039
+				c-0.103,0.311-0.158,0.641-0.158,0.98c0,1.735,1.412,3.147,3.148,3.147c1.736,0,3.147-1.412,3.147-3.147
+				c0-0.706-0.242-1.369-0.651-1.903c0.135-0.239,0.23-0.556,0.292-0.981C23.636,15.978,23.662,15.798,23.703,15.582z M8.728,21.181
+				C6.672,21.181,5,19.51,5,17.455c0-1.562,0.969-2.898,2.335-3.451c0.026,0.001,0.046,0.009,0.074,0.009
+				c0.197,0,0.409-0.034,0.685-0.112c0.289-0.081,0.586-0.122,0.881-0.122c0.21,0,0.417,0.021,0.619,0.061
+				c0.888,0.213,1.652,0.741,2.166,1.464c0.041,0.06,0.082,0.121,0.119,0.184c0.057,0.091,0.105,0.188,0.155,0.285
+				c0.16,0.334,0.279,0.693,0.325,1.075c0.009,0.083,0.022,0.176,0.037,0.283l0.011,0.082l0.041,0.296
+				C12.417,19.539,10.763,21.181,8.728,21.181z M22.973,19.013c0,1.184-0.964,2.147-2.147,2.147c-1.186,0-2.148-0.963-2.148-2.147
+				c0-0.985,0.669-1.815,1.575-2.067c-2.174,0.109-4.353,0.113-6.529,0.169c-0.007,0-0.013,0-0.02,0
+				c-0.092,0-0.188-0.022-0.289-0.036c-0.032-0.402-0.111-0.788-0.238-1.156c-0.004-0.012-0.007-0.024-0.011-0.037
+				c-0.063-0.177-0.134-0.348-0.217-0.515c-0.076-0.163-0.161-0.318-0.255-0.469c-0.032-0.05-0.062-0.099-0.096-0.147
+				c-0.646-0.956-1.628-1.642-2.748-1.879c-0.362-0.089-0.734-0.149-1.122-0.149c-0.509,0-0.991,0.102-1.451,0.252
+				c-0.181-0.073-0.192-0.312-0.115-0.784c0.296-0.029,0.649-0.178,0.649-0.178V6.819c0,0,3.899,0,4.679,0
+				c0.943,0,1.316,0.888,1.316,0.888c0.72,2.081,1.269,3.432,1.52,4.126c0.097,0.264,0.303,0.39,0.378,0.392
+				c1.672,0.035,2.844,0.065,2.844,0.065c0-0.873,0-1.706,0-2.527c0.136-0.076,0.267-0.103,0.383-0.103
+				c0.265,0,0.453,0.138,0.453,0.138s-0.037,1.76-0.037,2.484c0,0.038,0.048,0.059,0.077,0.06c0.961,0.038,1.848,0.075,2.808,0.109
+				c0.646,0.025,0.813,0.18,0.758,0.839c-0.059,0.705-0.14,1.412-0.271,2.108c-0.269,1.444,0.042,1.395-1.562,1.496
+				C22.183,17.055,22.973,17.943,22.973,19.013z"/>
+			<path fill="#C1122B" d="M19.57,19.013c0,0.693,0.564,1.257,1.256,1.257c0.692,0,1.256-0.564,1.256-1.257
+				c0-0.692-0.564-1.255-1.256-1.255C20.134,17.758,19.57,18.321,19.57,19.013z M21.832,19.013c0,0.555-0.451,1.007-1.006,1.007
+				c-0.555,0-1.006-0.452-1.006-1.007c0-0.554,0.451-1.005,1.006-1.005C21.381,18.008,21.832,18.459,21.832,19.013z"/>
+			<path fill="#C1122B" d="M12.919,8.341L8.961,8.347l-0.004,0.97l-0.003,2.916c1.209-0.044,2.595-0.069,3.939-0.069
+				c0.452,0,0.9,0.003,1.334,0.009l-0.045-0.018L12.919,8.341z M12.893,11.663c-1.138,0-2.34,0.018-3.438,0.052l0.003-2.397
+				L9.46,8.846l3.098-0.005l0.935,2.824C13.294,11.664,13.094,11.663,12.893,11.663z"/>
+			<path fill="#C1122B" d="M8.728,15.385c-1.142,0-2.07,0.929-2.07,2.07s0.928,2.069,2.07,2.069c1.141,0,2.069-0.928,2.069-2.069
+				S9.869,15.385,8.728,15.385z M8.728,19.023c-0.865,0-1.57-0.704-1.57-1.569c0-0.866,0.704-1.57,1.57-1.57
+				c0.865,0,1.569,0.704,1.569,1.57C10.297,18.32,9.593,19.023,8.728,19.023z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/map_005-hub.svg
+++ b/app/assets/images/map_005-hub.svg
@@ -1,96 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_hub.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs25" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1041"
-   inkscape:window-height="590"
-   id="namedview23"
-   showgrid="false"
-   inkscape:zoom="7.1515152"
-   inkscape:cx="-9.0021186"
-   inkscape:cy="16.5"
-   inkscape:window-x="752"
-   inkscape:window-y="122"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g16" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g20">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g18">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g16">
-			<path
-   fill="#C1122B"
-   d="M13.999,8.546c-1.24,0-2.249,1.009-2.249,2.248c0,1.242,1.009,2.253,2.249,2.253     c1.241,0,2.251-1.01,2.251-2.253C16.25,9.555,15.24,8.546,13.999,8.546z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,6.348c-2.453,0-4.448,1.995-4.448,4.448c0,0.859,0.468,3.112,3.602,8.541l0.387,0.671l0.134,0.225     l0.09,0.15l0.043,0.072l0.085,0.144l0.108,0.178l0.104-0.172l0.036-0.061l0.088-0.149l0.032-0.054l0.19-0.319l0.395-0.685     c3.134-5.44,3.602-7.687,3.602-8.542C18.448,8.343,16.452,6.348,14,6.348z M13.999,13.797c-1.654,0-2.999-1.347-2.999-3.003     c0-1.655,1.346-2.998,2.999-2.998c1.655,0,3.001,1.345,3.001,2.998C17,12.451,15.654,13.797,13.999,13.797z"
-   id="path10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M19.336,22.021     c-0.002,1.728-2.686,2.632-5.337,2.632c-2.652,0-5.337-0.905-5.337-2.634c0-1.158,1.352-2.099,3.465-2.462     c-1.721-3.01-3.577-6.721-3.577-8.76c0-3.004,2.444-5.448,5.448-5.448s5.448,2.444,5.449,5.447c0,2.036-1.858,5.75-3.578,8.762     C17.984,19.92,19.336,20.86,19.336,22.021z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M15.175,20.763c-0.029,0.048-0.059,0.1-0.088,0.148c-0.04,0.068-0.084,0.142-0.121,0.204     c-0.111,0.184-0.206,0.339-0.293,0.483c-0.021,0.03-0.042,0.066-0.061,0.096c-0.081,0.133-0.142,0.231-0.194,0.313     c-0.015,0.025-0.032,0.054-0.045,0.073c-0.052,0.082-0.08,0.125-0.08,0.125l-0.295,0.463l-0.293-0.463     c0,0-0.031-0.048-0.085-0.134c-0.006-0.009-0.013-0.023-0.019-0.029c-0.053-0.086-0.123-0.198-0.212-0.345     c-0.025-0.038-0.052-0.086-0.079-0.127c-0.083-0.136-0.17-0.278-0.274-0.448c-0.042-0.072-0.089-0.15-0.134-0.225     c-0.026-0.044-0.053-0.09-0.078-0.132l-0.381,0.061c-1.729,0.277-2.477,0.925-2.477,1.195c0,0.172,0.269,0.481,0.859,0.754     c0.8,0.37,1.926,0.574,3.172,0.574c2.608,0,4.031-0.878,4.031-1.329c0-0.269-0.748-0.917-2.476-1.195L15.175,20.763z"
-   id="path14"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M13.999,8.546c-1.24,0-2.249,1.009-2.249,2.248c0,1.242,1.009,2.253,2.249,2.253
+				c1.241,0,2.251-1.01,2.251-2.253C16.25,9.555,15.24,8.546,13.999,8.546z"/>
+			<path fill="#C1122B" d="M14,6.348c-2.453,0-4.448,1.995-4.448,4.448c0,0.859,0.468,3.112,3.602,8.541l0.387,0.671l0.134,0.225
+				l0.09,0.15l0.043,0.072l0.085,0.144l0.108,0.178l0.104-0.172l0.036-0.061l0.088-0.149l0.032-0.054l0.19-0.319l0.395-0.685
+				c3.134-5.44,3.602-7.687,3.602-8.542C18.448,8.343,16.452,6.348,14,6.348z M13.999,13.797c-1.654,0-2.999-1.347-2.999-3.003
+				c0-1.655,1.346-2.998,2.999-2.998c1.655,0,3.001,1.345,3.001,2.998C17,12.451,15.654,13.797,13.999,13.797z"/>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M19.336,22.021
+				c-0.002,1.728-2.686,2.632-5.337,2.632c-2.652,0-5.337-0.905-5.337-2.634c0-1.158,1.352-2.099,3.465-2.462
+				c-1.721-3.01-3.577-6.721-3.577-8.76c0-3.004,2.444-5.448,5.448-5.448s5.448,2.444,5.449,5.447c0,2.036-1.858,5.75-3.578,8.762
+				C17.984,19.92,19.336,20.86,19.336,22.021z"/>
+			<path fill="#C1122B" d="M15.175,20.763c-0.029,0.048-0.059,0.1-0.088,0.148c-0.04,0.068-0.084,0.142-0.121,0.204
+				c-0.111,0.184-0.206,0.339-0.293,0.483c-0.021,0.03-0.042,0.066-0.061,0.096c-0.081,0.133-0.142,0.231-0.194,0.313
+				c-0.015,0.025-0.032,0.054-0.045,0.073c-0.052,0.082-0.08,0.125-0.08,0.125l-0.295,0.463l-0.293-0.463
+				c0,0-0.031-0.048-0.085-0.134c-0.006-0.009-0.013-0.023-0.019-0.029c-0.053-0.086-0.123-0.198-0.212-0.345
+				c-0.025-0.038-0.052-0.086-0.079-0.127c-0.083-0.136-0.17-0.278-0.274-0.448c-0.042-0.072-0.089-0.15-0.134-0.225
+				c-0.026-0.044-0.053-0.09-0.078-0.132l-0.381,0.061c-1.729,0.277-2.477,0.925-2.477,1.195c0,0.172,0.269,0.481,0.859,0.754
+				c0.8,0.37,1.926,0.574,3.172,0.574c2.608,0,4.031-0.878,4.031-1.329c0-0.269-0.748-0.917-2.476-1.195L15.175,20.763z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/map_006-hub-profile.svg
+++ b/app/assets/images/map_006-hub-profile.svg
@@ -1,96 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_hub.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs25" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1041"
-   inkscape:window-height="590"
-   id="namedview23"
-   showgrid="false"
-   inkscape:zoom="7.1515152"
-   inkscape:cx="-9.0021186"
-   inkscape:cy="16.5"
-   inkscape:window-x="752"
-   inkscape:window-y="122"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g16" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g20">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g18">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g16">
-			<path
-   fill="#C1122B"
-   d="M13.999,8.546c-1.24,0-2.249,1.009-2.249,2.248c0,1.242,1.009,2.253,2.249,2.253     c1.241,0,2.251-1.01,2.251-2.253C16.25,9.555,15.24,8.546,13.999,8.546z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,6.348c-2.453,0-4.448,1.995-4.448,4.448c0,0.859,0.468,3.112,3.602,8.541l0.387,0.671l0.134,0.225     l0.09,0.15l0.043,0.072l0.085,0.144l0.108,0.178l0.104-0.172l0.036-0.061l0.088-0.149l0.032-0.054l0.19-0.319l0.395-0.685     c3.134-5.44,3.602-7.687,3.602-8.542C18.448,8.343,16.452,6.348,14,6.348z M13.999,13.797c-1.654,0-2.999-1.347-2.999-3.003     c0-1.655,1.346-2.998,2.999-2.998c1.655,0,3.001,1.345,3.001,2.998C17,12.451,15.654,13.797,13.999,13.797z"
-   id="path10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M19.336,22.021     c-0.002,1.728-2.686,2.632-5.337,2.632c-2.652,0-5.337-0.905-5.337-2.634c0-1.158,1.352-2.099,3.465-2.462     c-1.721-3.01-3.577-6.721-3.577-8.76c0-3.004,2.444-5.448,5.448-5.448s5.448,2.444,5.449,5.447c0,2.036-1.858,5.75-3.578,8.762     C17.984,19.92,19.336,20.86,19.336,22.021z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M15.175,20.763c-0.029,0.048-0.059,0.1-0.088,0.148c-0.04,0.068-0.084,0.142-0.121,0.204     c-0.111,0.184-0.206,0.339-0.293,0.483c-0.021,0.03-0.042,0.066-0.061,0.096c-0.081,0.133-0.142,0.231-0.194,0.313     c-0.015,0.025-0.032,0.054-0.045,0.073c-0.052,0.082-0.08,0.125-0.08,0.125l-0.295,0.463l-0.293-0.463     c0,0-0.031-0.048-0.085-0.134c-0.006-0.009-0.013-0.023-0.019-0.029c-0.053-0.086-0.123-0.198-0.212-0.345     c-0.025-0.038-0.052-0.086-0.079-0.127c-0.083-0.136-0.17-0.278-0.274-0.448c-0.042-0.072-0.089-0.15-0.134-0.225     c-0.026-0.044-0.053-0.09-0.078-0.132l-0.381,0.061c-1.729,0.277-2.477,0.925-2.477,1.195c0,0.172,0.269,0.481,0.859,0.754     c0.8,0.37,1.926,0.574,3.172,0.574c2.608,0,4.031-0.878,4.031-1.329c0-0.269-0.748-0.917-2.476-1.195L15.175,20.763z"
-   id="path14"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+				C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1s13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+			<path fill="#C1122B" d="M14,7.796c-1.654,0-3,1.344-3,2.998c0,1.656,1.346,3.003,3,3.003c1.655,0,3-1.347,3-3.003
+				C17,9.141,15.654,7.796,14,7.796z M14,13.047c-1.24,0-2.25-1.01-2.25-2.253c0-1.24,1.009-2.248,2.25-2.248
+				c1.241,0,2.25,1.009,2.25,2.248C16.25,12.037,15.24,13.047,14,13.047z"/>
+			<path fill="#C1122B" d="M14,5.348c-3.004,0-5.448,2.444-5.448,5.448c0,2.039,1.856,5.75,3.577,8.76
+				c-2.113,0.363-3.465,1.304-3.465,2.462c0,1.729,2.685,2.634,5.337,2.634c2.65,0,5.335-0.904,5.337-2.632
+				c0-1.16-1.352-2.1-3.465-2.464c1.719-3.012,3.578-6.725,3.578-8.762C19.448,7.792,17.003,5.348,14,5.348z M18.031,22.018
+				c0,0.451-1.423,1.329-4.031,1.329c-1.246,0-2.372-0.204-3.172-0.574c-0.591-0.273-0.859-0.582-0.859-0.754
+				c0-0.269,0.748-0.917,2.477-1.195l0.381-0.061c0.025,0.042,0.053,0.088,0.078,0.132c0.045,0.075,0.092,0.153,0.134,0.225
+				c0.104,0.17,0.191,0.313,0.274,0.448c0.027,0.042,0.054,0.089,0.079,0.127c0.089,0.147,0.159,0.258,0.212,0.345
+				c0.006,0.007,0.013,0.021,0.019,0.029c0.053,0.086,0.085,0.134,0.085,0.134l0.293,0.463l0.295-0.463c0,0,0.028-0.044,0.08-0.125
+				c0.012-0.019,0.029-0.048,0.045-0.073c0.052-0.082,0.113-0.18,0.194-0.313c0.019-0.029,0.04-0.066,0.061-0.096
+				c0.086-0.143,0.181-0.298,0.293-0.483c0.037-0.063,0.081-0.136,0.121-0.204c0.029-0.048,0.06-0.1,0.088-0.148l0.38,0.061
+				C17.283,21.101,18.031,21.749,18.031,22.018z M14.847,19.337l-0.396,0.688l-0.189,0.316l-0.032,0.054l-0.089,0.151l-0.036,0.06
+				l-0.104,0.172L13.892,20.6l-0.085-0.144l-0.043-0.072l-0.09-0.15l-0.135-0.227l-0.387-0.67c-3.134-5.43-3.602-7.682-3.602-8.541
+				c0-2.453,1.995-4.448,4.448-4.448c2.453,0,4.448,1.995,4.449,4.447C18.449,11.65,17.981,13.897,14.847,19.337z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/map_007-shop.svg
+++ b/app/assets/images/map_007-shop.svg
@@ -1,91 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_shop.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs23" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1707"
-   inkscape:window-height="910"
-   id="namedview21"
-   showgrid="false"
-   inkscape:zoom="7.1515152"
-   inkscape:cx="-9.0021186"
-   inkscape:cy="16.5"
-   inkscape:window-x="32"
-   inkscape:window-y="20"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g14" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g18">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g16">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g14">
-			<path
-   fill="#C1122B"
-   d="M21.552,10.282h-3.274l-1.683-2.709c-0.165-0.287-0.533-0.384-0.8-0.228     c-0.135,0.078-0.229,0.201-0.27,0.35c-0.041,0.153-0.019,0.315,0.062,0.457l1.359,2.129h-6.311l1.379-2.161     c0.066-0.114,0.087-0.271,0.046-0.421c-0.04-0.15-0.136-0.275-0.271-0.353c-0.266-0.156-0.64-0.053-0.787,0.202l-1.697,2.733     H6.448c-0.522,0-0.948,0.426-0.948,0.948v0.827c0,0.492,0.363,0.97,0.793,1.041l0.105,0.018h15.156l0.119-0.016     c0.44-0.058,0.827-0.545,0.827-1.043V11.23C22.5,10.708,22.074,10.282,21.552,10.282z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M8.057,20.02c0.007,0.222,0.122,0.337,0.263,0.337h11.365c0.142,0,0.257-0.115,0.257-0.256l0.007-0.1     l0.971-5.886H7.082L8.057,20.02z M17.116,16.074c0-0.298,0.22-0.539,0.518-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017     c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.518-0.241-0.518-0.539V16.074z M14.694,16.074c0-0.298,0.219-0.539,0.517-0.539     s0.517,0.241,0.517,0.539v2.017c0,0.298-0.219,0.539-0.517,0.539s-0.517-0.241-0.517-0.539V16.074z M12.272,16.074     c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.517,0.241,0.517,0.539v2.017c0,0.298-0.22,0.539-0.517,0.539     c-0.298,0-0.517-0.241-0.517-0.539V16.074z M9.85,16.074c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017     c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.517-0.241-0.517-0.539V16.074z"
-   id="path10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M23.5,12.057     c0,0.863-0.567,1.661-1.325,1.942l-1.025,5.889c-0.015,0.976-0.889,1.831-1.94,1.831H8.744c-1.052,0-1.925-0.855-1.947-1.906     l-1.024-5.828C5.036,13.691,4.5,12.91,4.5,12.057V11.23c0-1.074,0.874-1.948,1.948-1.948H8.75l1.396-2.247     c0.4-0.698,1.417-0.978,2.145-0.555c0.755,0.435,1.015,1.403,0.58,2.159l-0.41,0.642h2.662l-0.39-0.61     c-0.227-0.391-0.284-0.823-0.174-1.235c0.109-0.406,0.37-0.745,0.734-0.955c0.716-0.417,1.739-0.148,2.159,0.579l1.381,2.223     h2.718c1.074,0,1.948,0.874,1.948,1.948V12.057z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M21.552,10.282h-3.274l-1.683-2.709c-0.165-0.287-0.533-0.384-0.8-0.228
+				c-0.135,0.078-0.229,0.201-0.27,0.35c-0.041,0.153-0.019,0.315,0.062,0.457l1.359,2.129h-6.311l1.379-2.161
+				c0.066-0.114,0.087-0.271,0.046-0.421c-0.04-0.15-0.136-0.275-0.271-0.353c-0.266-0.156-0.64-0.053-0.787,0.202l-1.697,2.733
+				H6.448c-0.522,0-0.948,0.426-0.948,0.948v0.827c0,0.492,0.363,0.97,0.793,1.041l0.105,0.018h15.156l0.119-0.016
+				c0.44-0.058,0.827-0.545,0.827-1.043V11.23C22.5,10.708,22.074,10.282,21.552,10.282z"/>
+			<path fill="#C1122B" d="M8.057,20.02c0.007,0.222,0.122,0.337,0.263,0.337h11.365c0.142,0,0.257-0.115,0.257-0.256l0.007-0.1
+				l0.971-5.886H7.082L8.057,20.02z M17.116,16.074c0-0.298,0.22-0.539,0.518-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017
+				c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.518-0.241-0.518-0.539V16.074z M14.694,16.074c0-0.298,0.219-0.539,0.517-0.539
+				s0.517,0.241,0.517,0.539v2.017c0,0.298-0.219,0.539-0.517,0.539s-0.517-0.241-0.517-0.539V16.074z M12.272,16.074
+				c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.517,0.241,0.517,0.539v2.017c0,0.298-0.22,0.539-0.517,0.539
+				c-0.298,0-0.517-0.241-0.517-0.539V16.074z M9.85,16.074c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017
+				c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.517-0.241-0.517-0.539V16.074z"/>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M23.5,12.057
+				c0,0.863-0.567,1.661-1.325,1.942l-1.025,5.889c-0.015,0.976-0.889,1.831-1.94,1.831H8.744c-1.052,0-1.925-0.855-1.947-1.906
+				l-1.024-5.828C5.036,13.691,4.5,12.91,4.5,12.057V11.23c0-1.074,0.874-1.948,1.948-1.948H8.75l1.396-2.247
+				c0.4-0.698,1.417-0.978,2.145-0.555c0.755,0.435,1.015,1.403,0.58,2.159l-0.41,0.642h2.662l-0.39-0.61
+				c-0.227-0.391-0.284-0.823-0.174-1.235c0.109-0.406,0.37-0.745,0.734-0.955c0.716-0.417,1.739-0.148,2.159,0.579l1.381,2.223
+				h2.718c1.074,0,1.948,0.874,1.948,1.948V12.057z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/map_008-shop-profile.svg
+++ b/app/assets/images/map_008-shop-profile.svg
@@ -1,91 +1,73 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:ns="&amp;ns_sfw;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="28px"
-   height="33px"
-   viewBox="0 0 28 33"
-   enable-background="new 0 0 28 33"
-   xml:space="preserve"
-   sodipodi:docname="green_shop.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
-   id="defs23" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1707"
-   inkscape:window-height="910"
-   id="namedview21"
-   showgrid="false"
-   inkscape:zoom="7.1515152"
-   inkscape:cx="-9.0021186"
-   inkscape:cy="16.5"
-   inkscape:window-x="32"
-   inkscape:window-y="20"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g14" />
-<metadata
-   id="metadata2">
-	<ns:sfw>
-		<ns:slices />
-		<ns:sliceSourceBounds
-   height="96"
-   width="16383"
-   y="-85.5"
-   x="-8112"
-   bottomLeftOrigin="true" />
-	</ns:sfw>
-<rdf:RDF><cc:Work
-     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<g
-   id="g18">
-	<path
-   opacity="0.25"
-   fill="#282828"
-   d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z"
-   id="path4" />
-	<g
-   id="g16">
-		<path
-   fill="#FFFFFF"
-   d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
-   id="path6" />
-		<g
-   id="g14">
-			<path
-   fill="#C1122B"
-   d="M21.552,10.282h-3.274l-1.683-2.709c-0.165-0.287-0.533-0.384-0.8-0.228     c-0.135,0.078-0.229,0.201-0.27,0.35c-0.041,0.153-0.019,0.315,0.062,0.457l1.359,2.129h-6.311l1.379-2.161     c0.066-0.114,0.087-0.271,0.046-0.421c-0.04-0.15-0.136-0.275-0.271-0.353c-0.266-0.156-0.64-0.053-0.787,0.202l-1.697,2.733     H6.448c-0.522,0-0.948,0.426-0.948,0.948v0.827c0,0.492,0.363,0.97,0.793,1.041l0.105,0.018h15.156l0.119-0.016     c0.44-0.058,0.827-0.545,0.827-1.043V11.23C22.5,10.708,22.074,10.282,21.552,10.282z"
-   id="path8"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M8.057,20.02c0.007,0.222,0.122,0.337,0.263,0.337h11.365c0.142,0,0.257-0.115,0.257-0.256l0.007-0.1     l0.971-5.886H7.082L8.057,20.02z M17.116,16.074c0-0.298,0.22-0.539,0.518-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017     c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.518-0.241-0.518-0.539V16.074z M14.694,16.074c0-0.298,0.219-0.539,0.517-0.539     s0.517,0.241,0.517,0.539v2.017c0,0.298-0.219,0.539-0.517,0.539s-0.517-0.241-0.517-0.539V16.074z M12.272,16.074     c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.517,0.241,0.517,0.539v2.017c0,0.298-0.22,0.539-0.517,0.539     c-0.298,0-0.517-0.241-0.517-0.539V16.074z M9.85,16.074c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017     c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.517-0.241-0.517-0.539V16.074z"
-   id="path10"
-   style="fill:#0b8c61;fill-opacity:1" />
-			<path
-   fill="#C1122B"
-   d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32     c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M23.5,12.057     c0,0.863-0.567,1.661-1.325,1.942l-1.025,5.889c-0.015,0.976-0.889,1.831-1.94,1.831H8.744c-1.052,0-1.925-0.855-1.947-1.906     l-1.024-5.828C5.036,13.691,4.5,12.91,4.5,12.057V11.23c0-1.074,0.874-1.948,1.948-1.948H8.75l1.396-2.247     c0.4-0.698,1.417-0.978,2.145-0.555c0.755,0.435,1.015,1.403,0.58,2.159l-0.41,0.642h2.662l-0.39-0.61     c-0.227-0.391-0.284-0.823-0.174-1.235c0.109-0.406,0.37-0.745,0.734-0.955c0.716-0.417,1.739-0.148,2.159,0.579l1.381,2.223     h2.718c1.074,0,1.948,0.874,1.948,1.948V12.057z"
-   id="path12"
-   style="fill:#0b8c61;fill-opacity:1" />
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+			C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1s13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+		<g>
+			<g>
+				<path fill="#C1122B" d="M19.457,22.366H8.494c-1.074,0-1.965-0.873-1.988-1.946l-1.079-6.143
+					C4.661,13.986,4.1,13.177,4.1,12.295v-0.866c0-1.097,0.892-1.989,1.988-1.989h2.441l1.479-2.379
+					c0.408-0.709,1.438-0.99,2.177-0.563c0.37,0.214,0.635,0.559,0.747,0.973c0.11,0.413,0.054,0.846-0.16,1.216l-0.479,0.751h2.98
+					L14.813,8.72c-0.229-0.395-0.288-0.833-0.177-1.251c0.11-0.413,0.375-0.758,0.745-0.971c0.731-0.428,1.766-0.151,2.191,0.588
+					l1.463,2.354h2.877c1.096,0,1.988,0.892,1.988,1.989v0.866c0,0.894-0.594,1.719-1.382,1.996l-1.08,6.199
+					C21.423,21.492,20.532,22.366,19.457,22.366z M6.088,10.383c-0.576,0-1.045,0.47-1.045,1.046v0.866
+					c0,0.54,0.401,1.064,0.874,1.143l0.33,0.055l1.195,6.836c0.019,0.635,0.488,1.094,1.052,1.094h10.964
+					c0.565,0,1.034-0.459,1.045-1.023l1.199-6.915l0.344-0.045c0.494-0.064,0.912-0.588,0.912-1.145v-0.866
+					c0-0.576-0.469-1.046-1.045-1.046H18.51L16.762,7.57c-0.186-0.324-0.605-0.433-0.909-0.256
+					c-0.153,0.088-0.262,0.229-0.307,0.398c-0.046,0.175-0.021,0.358,0.072,0.518l1.373,2.152h-6.42l1.393-2.183
+					c0.077-0.134,0.1-0.313,0.055-0.483c-0.046-0.17-0.156-0.313-0.308-0.401c-0.304-0.179-0.729-0.061-0.895,0.23l-1.763,2.838
+					H6.088z"/>
+			</g>
+			<g>
+				<path fill="#C1122B" d="M19.956,21.986H8.049c-0.697,0-1.264-0.566-1.264-1.263l-1.207-7.266h16.845l-1.204,7.282
+					C21.22,21.419,20.653,21.986,19.956,21.986z M6.69,14.399l1.031,6.247c0.006,0.253,0.151,0.397,0.328,0.397h11.907
+					c0.177,0,0.321-0.144,0.321-0.32l0.006-0.097l1.029-6.226H6.69z"/>
+			</g>
+			<g>
+				<g>
+					<path fill="#C1122B" d="M17.807,19.181c0.311,0,0.541-0.253,0.541-0.565v-2.113c0-0.312-0.23-0.565-0.541-0.565
+						c-0.312,0-0.542,0.253-0.542,0.565v2.113C17.264,18.929,17.495,19.181,17.807,19.181z"/>
+				</g>
+				<g>
+					<path fill="#C1122B" d="M15.268,19.181c0.312,0,0.542-0.253,0.542-0.565v-2.113c0-0.312-0.23-0.565-0.542-0.565
+						s-0.542,0.253-0.542,0.565v2.113C14.727,18.929,14.957,19.181,15.268,19.181z"/>
+				</g>
+				<g>
+					<path fill="#C1122B" d="M12.731,19.181c0.311,0,0.542-0.253,0.542-0.565v-2.113c0-0.312-0.23-0.565-0.542-0.565
+						c-0.312,0-0.542,0.253-0.542,0.565v2.113C12.19,18.929,12.419,19.181,12.731,19.181z"/>
+				</g>
+				<g>
+					<path fill="#C1122B" d="M10.194,19.181c0.311,0,0.541-0.253,0.541-0.565v-2.113c0-0.312-0.23-0.565-0.541-0.565
+						c-0.312,0-0.542,0.253-0.542,0.565v2.113C9.652,18.929,9.882,19.181,10.194,19.181z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
--- a/app/assets/images/menu/icn-cart.svg
+++ b/app/assets/images/menu/icn-cart.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="18" viewBox="0 0 20 18">
-    <path fill="#FFF" fill-opacity=".5" fill-rule="nonzero" d="M18.338 10.593l1.64-7.312a.841.841 0 0 0-.812-1.031H5.528L5.21.675A.836.836 0 0 0 4.393 0H.833A.839.839 0 0 0 0 .844v.562c0 .466.373.844.833.844H3.26l2.439 12.074c-.584.34-.977.977-.977 1.707 0 1.088.87 1.969 1.945 1.969 1.074 0 1.944-.881 1.944-1.969 0-.55-.224-1.049-.584-1.406h7.28c-.36.357-.585.855-.585 1.406 0 1.088.87 1.969 1.945 1.969 1.074 0 1.944-.881 1.944-1.969 0-.78-.447-1.453-1.096-1.772l.191-.853a.841.841 0 0 0-.812-1.031h-9.32l-.228-1.125h10.179c.389 0 .726-.273.813-.657z"/>
-</svg>
--- a/app/assets/images/menu/icn-login.svg
+++ b/app/assets/images/menu/icn-login.svg
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-    <g fill="none" fill-rule="evenodd">
-        <path d="M0 0h16v16H0z"/>
-        <path fill="#F4704C" d="M13.85 5.928h-1.234v-1.54c0-2.338-2.026-4.234-4.525-4.234-2.5 0-4.526 1.896-4.526 4.235v1.54H2.33c-.682 0-1.235.516-1.235 1.154v7.7c0 .637.553 1.154 1.235 1.154h11.52c.681 0 1.234-.517 1.234-1.154v-7.7c0-.638-.553-1.155-1.234-1.155zM4.8 4.388c0-1.7 1.473-3.08 3.29-3.08 1.818 0 3.292 1.38 3.292 3.08v1.54H4.799v-1.54z"/>
-        <path fill="#FFF" d="M8.296 13.23c1.243 0 2.25-.942 2.25-2.105 0-1.162-1.007-2.105-2.25-2.105-1.242 0-2.25.943-2.25 2.105.003 1.162 1.009 2.103 2.25 2.106zm0-3.211c.654 0 1.183.495 1.183 1.106 0 .612-.53 1.107-1.183 1.107s-1.183-.495-1.183-1.107c0-.61.53-1.106 1.183-1.106z"/>
-    </g>
-</svg>
--- a/app/assets/images/menu/icn-profile.svg
+++ b/app/assets/images/menu/icn-profile.svg
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-    <defs>
-        <path id="a" d="M15 15.2a.79.79 0 0 1-.778.8H1.778A.79.79 0 0 1 1 15.2v-2.4c0-2.21 1.741-4 3.889-4h6.222c2.148 0 3.889 1.79 3.889 4v2.4zM8 8C5.852 8 4.111 6.21 4.111 4S5.852 0 8 0c2.148 0 3.889 1.79 3.889 4S10.148 8 8 8z"/>
-    </defs>
-    <use fill="#F4704C" fill-rule="nonzero" xlink:href="#a"/>
-</svg>
--- a/app/assets/images/spinner.gif
+++ b/app/assets/images/spinner.gif
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -15,6 +15,7 @@
 //= require angular-animate
 //= require angular-sanitize
 //= require admin/spree_backend
+//= require admin/spree_auth
 //= require admin/spree_paypal_express
 //= require ../shared/ng-infinite-scroll.min.js
 //= require ../shared/ng-tags-input.min.js
--- a/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
@@ -1,26 +1 @@
-angular.module("admin.enterprises", [
-  "admin.paymentMethods",
-  "admin.utils",
-  "admin.shippingMethods",
-  "admin.users",
-  "textAngular",
-  "admin.side_menu",
-  "admin.taxons",
-  'admin.indexUtils',
-  'admin.tagRules',
-  'admin.dropdown',
-  'ngSanitize']
-)
-# For more options: https://github.com/textAngular/textAngular/blob/master/src/textAngularSetup.js
-.config [
-  '$provide', ($provide) ->
-    $provide.decorator 'taTranslations', [
-      '$delegate'
-      (taTranslations) ->
-        taTranslations.insertLink = {
-          tooltip: t('admin.enterprises.form.shop_preferences.shopfront_message_link_tooltip'),
-          dialogPrompt: t('admin.enterprises.form.shop_preferences.shopfront_message_link_prompt')
-        }
-        taTranslations
-    ]
-]
+angular.module("admin.enterprises", [
--- a/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee
@@ -5,7 +5,7 @@ angular.module('admin.orderCycles')
    $scope.distributor_enterprises = Enterprise.hub_enterprises
    $scope.supplied_products = Enterprise.supplied_products
    $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)
-    $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id})
+    $scope.schedules = Schedules.index()

    $scope.OrderCycle = OrderCycle
    $scope.order_cycle = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id})
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -1,12 +1,12 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) ->
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor) ->
    order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
    $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
    $scope.supplier_enterprises = Enterprise.producer_enterprises
    $scope.distributor_enterprises = Enterprise.hub_enterprises
    $scope.supplied_products = Enterprise.supplied_products
    $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id)
-    $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id})
+    $scope.schedules = Schedules.index()

    $scope.OrderCycle = OrderCycle
    $scope.order_cycle = OrderCycle.load(order_cycle_id)
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
@@ -1,7 +1,7 @@
 angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) ->
  $scope.StatusMessage = StatusMessage
  $scope.OrderCycle = OrderCycle
-  $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id})
+  $scope.schedules = Schedules.index()
  $scope.order_cycle = OrderCycle.new {coordinator_id: ocInstance.coordinator_id}, =>
    # TODO: make this a get method, which only fetches one enterprise
    $scope.enterprises = Enterprise.index {coordinator_id: ocInstance.coordinator_id}, (enterprises) =>
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -1,11 +1,11 @@
-angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, StatusMessage, ocInstance) ->
+angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, StatusMessage) ->
  $scope.orderCycleId = ->
    $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]

  $scope.StatusMessage = StatusMessage
  $scope.enterprises = Enterprise.index(order_cycle_id: $scope.orderCycleId())
  $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: $scope.orderCycleId())
-  $scope.schedules = Schedules.index({enterprise_id: ocInstance.coordinator_id})
+  $scope.schedules = Schedules.index()
  $scope.OrderCycle = OrderCycle
  $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
    $scope.init()
--- a/app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee
@@ -47,7 +47,7 @@ angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compi
      scope.schedule_form.$setPristine()
      scope.submitted = true
      scope.errors = []
-      return scope.errors.push(t('js.admin.order_cycles.schedules.no_order_cycles_error')) unless scope.selectedOrderCycles.length > 0
+      return scope.errors.push(t('admin.order_cycles.index.no_order_cycles_error')) unless scope.selectedOrderCycles.length > 0
      scope.schedule.order_cycle_ids = scope.selectedOrderCycles.map (oc) -> oc.id
      if scope.schedule_form.$valid
        method = if scope.schedule.id? then Schedules.update else Schedules.add
--- a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee
@@ -24,3 +24,8 @@ angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycl

  for shop in $scope.shops
    shop.disabled = !$scope.distributorHasOrderCycles(shop)
+
+  # Removes the split button introduced by spree in the order form
+  #   We only have one stock location in OFN so it's meaningless to split the order between stock locations
+  #   We delete it instead of hiding or changing CSS so that, when spree code toggles the element, nothing hapens
+  $('.split-item').remove()
--- a/app/assets/javascripts/admin/products/products.js.coffee
+++ b/app/assets/javascripts/admin/products/products.js.coffee
@@ -1 +1 @@
-angular.module("admin.products", ["textAngular", "admin.utils"])
+angular.module("admin.products", ["textAngular", "admin.utils"])
--- a/app/assets/javascripts/admin/resources/resources/schedule_resource.js.coffee
+++ b/app/assets/javascripts/admin/resources/resources/schedule_resource.js.coffee
@@ -3,8 +3,6 @@ angular.module("admin.resources").factory 'ScheduleResource', ($resource) ->
    'index':
      method: 'GET'
      isArray: true
-      params:
-        enterprise_id: '@enterprise_id'
    'create':
      method: 'POST'
    'update':
--- a/app/assets/javascripts/admin/resources/services/schedules.js.coffee
+++ b/app/assets/javascripts/admin/resources/services/schedules.js.coffee
@@ -17,7 +17,7 @@ angular.module("admin.resources").factory "Schedules", ($q, $injector, RequestMo
        @byID[schedule.id] = schedule if schedule.id?
        Dereferencer.dereference(schedule.order_cycles, OrderCycles.byID)
        orderCycle.schedules.push(schedule) for orderCycle in schedule.order_cycles
-        StatusMessage.display 'success', "#{t('js.admin.order_cycles.schedules.created_schedule')}: '#{schedule.name}'"
+        StatusMessage.display 'success', "#{t('admin.order_cycles.index.created_schedule')}: '#{schedule.name}'"

    update: (params) =>
      ScheduleResource.update params, (schedule) =>
@@ -29,7 +29,7 @@ angular.module("admin.resources").factory "Schedules", ($q, $injector, RequestMo
          for orderCycle in schedule.order_cycles when orderCycle.id not in @byID[schedule.id].order_cycle_ids
            orderCycle.schedules.push(@byID[schedule.id])
          angular.extend(@byID[schedule.id], schedule)
-          StatusMessage.display 'success', "#{t('js.admin.order_cycles.schedules.updated_schedule')}: '#{schedule.name}'"
+          StatusMessage.display 'success', "#{t('admin.order_cycles.index.updated_schedule')}: '#{schedule.name}'"

    remove: (schedule) ->
      params = id: schedule.id
@@ -38,9 +38,9 @@ angular.module("admin.resources").factory "Schedules", ($q, $injector, RequestMo
          if orderCycle.schedules # Only if we need to update the schedules
            orderCycle.schedules.splice(i, 1) for s, i in orderCycle.schedules by -1 when s.id == schedule.id
        delete @byID[schedule.id]
-        StatusMessage.display 'success', "#{t('js.admin.order_cycles.schedules.deleted_schedule')}: '#{schedule.name}'"
+        StatusMessage.display 'success', "#{t('admin.order_cycles.index.deleted_schedule')}: '#{schedule.name}'"

-    index: (params) ->
-      request = ScheduleResource.index params, (data) => @load(data)
+    index: ->
+      request = ScheduleResource.index (data) => @load(data)
      RequestMonitor.load(request.$promise)
      request
--- a/app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee
+++ b/app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee
@@ -5,7 +5,6 @@ angular.module("admin.subscriptions").controller "OrderUpdateIssuesController",
    OrderCycles.byID[id].name

  $scope.orderCycleCloses = (id) ->
-    closes_at = moment(OrderCycles.byID[id].orders_close_at, "YYYY-MM-DD HH:mm:SS Z")
-    key = if closes_at > moment() then "closes" else "closed"
-    text = t("js.subscriptions." + key)
+    closes_at = moment(OrderCycles.byID[id].orders_close_at)
+    text = if closes_at > moment() then t('js.closes') else t('js.closed')
    "#{text} #{closes_at.fromNow()}"
--- a/app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee
+++ b/app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee
@@ -15,7 +15,7 @@ angular.module("admin.subscriptions").controller "OrdersPanelController", ($scop
  $scope.orderCycleCloses = (id) ->
    oc = OrderCycles.byID[id]
    return t('js.subscriptions.close_date_not_set') unless oc?.orders_close_at?
-    closes_at = moment(oc.orders_close_at, "YYYY-MM-DD HH:mm:SS Z")
+    closes_at = moment(oc.orders_close_at)
    text = if closes_at > moment() then t('js.subscriptions.closes') else t('js.subscriptions.closed')
    "#{text} #{closes_at.fromNow()}"

--- a/app/assets/javascripts/admin/subscriptions/controllers/products_panel_controller.js.coffee
+++ b/app/assets/javascripts/admin/subscriptions/controllers/products_panel_controller.js.coffee
@@ -10,14 +10,14 @@ angular.module("admin.subscriptions").controller "ProductsPanelController", ($sc

  $scope.save = ->
    $scope.saving = true
-    StatusMessage.display 'progress', t('js.saving')
+    StatusMessage.display 'progress', 'Saving...'
    $scope.subscription.update().then (response) ->
      $scope.saving = false
-      StatusMessage.display 'success', t('js.changes_saved')
+      StatusMessage.display 'success', 'Saved'
    , (response) ->
      $scope.saving = false
      if response.data?.errors?
        keys = Object.keys(response.data.errors)
        StatusMessage.display 'failure', response.data.errors[keys[0]][0]
      else
-        StatusMessage.display 'success', t('js.changes_saved')
+        StatusMessage.display 'success', 'Saved'
--- a/app/assets/javascripts/admin/tag_rules/directives/tag_rules/tag_rule.js.coffee
+++ b/app/assets/javascripts/admin/tag_rules/directives/tag_rules/tag_rule.js.coffee
@@ -4,8 +4,8 @@ angular.module("admin.tagRules").directive "tagRule", ->
  link: (scope, element, attrs) ->
    scope.opt =
      "TagRule::FilterShippingMethods":
-         textTop: t('js.admin.tag_rules.shipping_method_tagged_top')
-         textBottom: t('js.admin.tag_rules.shipping_method_tagged_bottom')
+         textTop: "Shipping methods tagged"
+         textBottom: "are:"
         taggable: "shipping_method"
         tagsAttr: "shipping_method_tags"
         tagListAttr: "preferred_shipping_method_tags"
@@ -13,8 +13,8 @@ angular.module("admin.tagRules").directive "tagRule", ->
         tagListFor: (rule) ->
          rule.preferred_shipping_method_tags
      "TagRule::FilterPaymentMethods":
-         textTop: t('js.admin.tag_rules.payment_method_tagged_top')
-         textBottom: t('js.admin.tag_rules.payment_method_tagged_bottom')
+         textTop: "Payment methods tagged"
+         textBottom: "are:"
         taggable: "payment_method"
         tagsAttr: "payment_method_tags"
         tagListAttr: "preferred_payment_method_tags"
@@ -22,8 +22,8 @@ angular.module("admin.tagRules").directive "tagRule", ->
         tagListFor: (rule) ->
          rule.preferred_payment_method_tags
      "TagRule::FilterOrderCycles":
-         textTop: t('js.admin.tag_rules.order_cycle_tagged_top')
-         textBottom: t('js.admin.tag_rules.order_cycle_tagged_bottom')
+         textTop: "Order Cycles tagged"
+         textBottom: "are:"
         taggable: "exchange"
         tagsAttr: "exchange_tags"
         tagListAttr: "preferred_exchange_tags"
@@ -31,8 +31,8 @@ angular.module("admin.tagRules").directive "tagRule", ->
         tagListFor: (rule) ->
           rule.preferred_exchange_tags
      "TagRule::FilterProducts":
-         textTop: t('js.admin.tag_rules.inventory_tagged_top')
-         textBottom: t('js.admin.tag_rules.inventory_tagged_bottom')
+         textTop: "Inventory variants tagged"
+         textBottom: "are:"
         taggable: "variant"
         tagsAttr: "variant_tags"
         tagListAttr: "preferred_variant_tags"
--- a/app/assets/javascripts/darkswarm/controllers/group_enterprise_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/group_enterprise_node_controller.js.coffee
@@ -0,0 +1,12 @@
+Darkswarm.controller "GroupEnterpriseNodeCtrl", ($scope, CurrentHub) ->
+
+  $scope.active = false
+
+  $scope.toggle = ->
+    $scope.active = !$scope.active
+
+  $scope.open = ->
+    $scope.active
+
+  $scope.current = ->
+    $scope.hub.id is CurrentHub.hub.id
--- a/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
@@ -1,6 +1,22 @@
-Darkswarm.controller "GroupPageCtrl", ($scope, enterprises, Enterprises, MapConfiguration, OfnMap) ->
+Darkswarm.controller "GroupPageCtrl", ($scope, group_enterprises, Enterprises, MapConfiguration, OfnMap, visibleFilter, Navigation) ->
  $scope.Enterprises = Enterprises

+  all_enterprises_by_id = Enterprises.enterprises_by_id
+
+  dereferenced_enterprises = group_enterprises.map (enterprise) =>
+    all_enterprises_by_id[enterprise.id]
+
+  visible_enterprises = visibleFilter dereferenced_enterprises
+
+  # TODO: this is duplicate code with app/assets/javascripts/darkswarm/services/enterprises.js.coffee
+  # It would be better to load only the needed enterprises (group + related shops).
+  $scope.group_producers = visible_enterprises.filter (enterprise) ->
+        enterprise.category in ["producer_hub", "producer_shop", "producer"]
+  $scope.group_hubs = visible_enterprises.filter (enterprise) ->
+        enterprise.category in ["hub", "hub_profile", "producer_hub", "producer_shop"]
+
+  $scope.producers_to_filter = $scope.group_producers
+
  $scope.map = angular.copy MapConfiguration.options
-  $scope.mapMarkers = OfnMap.enterprise_markers enterprises
-  $scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1
+  $scope.mapMarkers = OfnMap.enterprise_markers visible_enterprises
+  $scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1
--- a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
@@ -1,44 +1,9 @@
-Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, CurrentHub, $http, $timeout) ->
-  $scope.shopfront_loading = false
-  $scope.enterprise_details = []
+Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, Navigation, $location, $templateCache, CurrentHub) ->
+  $scope.toggle = (e) ->
+    HashNavigation.toggle $scope.hub.hash if !angular.element(e.target).inheritedData('is-link')

-  $timeout ->
-    if $scope.open()
-      $scope.load_shopfront()
-
-  # Toggles shopfront tabs open/closed. Fetches enterprise details from the api, diplays them and adds them
-  # to $scope.enterprise_details, or simply displays the details again if previously fetched
-  $scope.toggle = (event) ->
-    if $scope.open()
-      $scope.toggle_tab(event)
-      return
-
-    if $scope.enterprise_details[$scope.hub.id]
-      $scope.hub = $scope.enterprise_details[$scope.hub.id]
-      $scope.toggle_tab(event)
-      return
-
-    $scope.load_shopfront(event)
-
-  $scope.load_shopfront = (event=null) ->
-    $scope.shopfront_loading = true
-    $scope.toggle_tab(event)
-
-    $http.get("/api/enterprises/" + $scope.hub.id + "/shopfront")
-      .success (data) ->
-        $scope.shopfront_loading = false
-        $scope.hub = data
-        $scope.enterprise_details[$scope.hub.id] = $scope.hub
-      .error (data) ->
-        console.error(data)
-
-  $scope.toggle_tab = (event) ->
-    HashNavigation.toggle $scope.hub.hash if event && !angular.element(event.target).inheritedData('is-link')
-
-  # Returns boolean: pulldown tab is currently open/closed
  $scope.open = ->
    HashNavigation.active $scope.hub.hash
-
-  # Returns boolean: is this hub the hub that the user is currently "shopping" in?
+  
  $scope.current = ->
    $scope.hub.id is CurrentHub.hub.id
--- a/app/assets/javascripts/darkswarm/controllers/offcanvas_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/offcanvas_controller.js.coffee
@@ -1,11 +0,0 @@
-Darkswarm.controller "OffcanvasCtrl", ($scope) ->
-  $scope.menu = $(".left-off-canvas-menu")
-
-  $scope.setOffcanvasMenuHeight = ->
-    $scope.menu.height($(window).height())
-
-  $scope.bind = ->
-    $(window).on("resize", $scope.setOffcanvasMenuHeight)
-    $scope.setOffcanvasMenuHeight()
-
-  $scope.bind()
--- a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
@@ -1,39 +1,6 @@
-Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll, $http, $timeout) ->
-  $scope.shopfront_loading = false
-  $scope.enterprise_details = []
-
-  $timeout ->
-    if $scope.open()
-      $scope.load_shopfront()
-
-  # Toggles shopfront tabs open/closed. Fetches enterprise details from the api, diplays them and adds them
-  # to $scope.enterprise_details, or simply displays the details again if previously fetched
-  $scope.toggle = (event) ->
-    if $scope.open()
-      $scope.toggle_tab(event)
-      return
-
-    if $scope.enterprise_details[$scope.producer.id]
-      $scope.producer = $scope.enterprise_details[$scope.producer.id]
-      $scope.toggle_tab(event)
-      return
-
-    $scope.load_shopfront(event)
-
-  $scope.load_shopfront = (event=null) ->
-    $scope.shopfront_loading = true
-    $scope.toggle_tab(event)
-
-    $http.get("/api/enterprises/" + $scope.producer.id + "/shopfront")
-      .success (data) ->
-        $scope.shopfront_loading = false
-        $scope.producer = data
-        $scope.enterprise_details[$scope.producer.id] = $scope.producer
-      .error (data) ->
-        console.error(data)
-
-  $scope.toggle_tab = (event) ->
-    HashNavigation.toggle $scope.producer.hash if event && !angular.element(event.target).inheritedData('is-link')
+Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll) ->
+  $scope.toggle = ->
+    HashNavigation.toggle $scope.producer.hash

  $scope.open = ->
    HashNavigation.active($scope.producer.hash)
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -45,12 +45,12 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
  $scope.appliedTaxonsList = ->
    $scope.activeTaxons.map( (taxon_id) ->
      Taxons.taxons_by_id[taxon_id].name
-    ).join(" #{t('products_or')} ") if $scope.activeTaxons?
+    ).join(" & ") if $scope.activeTaxons?

  $scope.appliedPropertiesList = ->
    $scope.activeProperties.map( (property_id) ->
      Properties.properties_by_id[property_id].name
-    ).join(" #{t('products_or')} ") if $scope.activeProperties?
+    ).join(" & ") if $scope.activeProperties?

  $scope.clearAll = ->
    $scope.query = ""
--- a/app/assets/javascripts/darkswarm/controllers/tabs/about_us_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/tabs/about_us_controller.js.coffee
@@ -1,2 +1,2 @@
-Darkswarm.controller "AboutUsCtrl", ($scope, Shopfront) ->
-  $scope.shopfront = Shopfront.shopfront
+Darkswarm.controller "AboutUsCtrl", ($scope, CurrentHub) ->
+  $scope.CurrentHub = CurrentHub
--- a/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
@@ -1,2 +1,4 @@
-Darkswarm.controller "ProducersTabCtrl", ($scope, Shopfront, EnterpriseModal) ->
-  $scope.shopfront = Shopfront.shopfront
+Darkswarm.controller "ProducersTabCtrl", ($scope, CurrentHub, Enterprises, EnterpriseModal) ->
+  # Injecting Enterprises so CurrentHub.producers is dereferenced.
+  # We should probably dereference here instead and separate out CurrentHub dereferencing from the Enterprise factory.
+  $scope.CurrentHub = CurrentHub
--- a/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee
@@ -1,10 +1,15 @@
-Darkswarm.directive "enterpriseModal", (EnterpriseModal) ->
+Darkswarm.directive "enterpriseModal", ($modal, Enterprises, EnterpriseResource) ->
  restrict: 'E'
  replace: true
  template: "<a ng-transclude></a>"
  transclude: true
  link: (scope, elem, attrs, ctrl) ->
-    elem.on "click", (event) =>
-      event.stopPropagation()
-
-      scope.modalInstance = EnterpriseModal.open scope.enterprise
+    elem.on "click", (ev) =>
+      ev.stopPropagation()
+      params =
+        id: scope.enterprise.id
+      EnterpriseResource.relatives params, (data) =>
+        Enterprises.addEnterprises data
+        scope.enterprise = Enterprises.enterprises_by_id[scope.enterprise.id]
+        Enterprises.dereferenceEnterprise scope.enterprise
+      scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'enterprise_modal.html', scope: scope)
--- a/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee
@@ -13,16 +13,11 @@ Darkswarm.directive "ofnOnHand", ->
      ngModel.$setDirty = setDirty

    ngModel.$parsers.push (viewValue) ->
-      available_quantity = scope.available_quantity()
-      if parseInt(viewValue) > available_quantity
-        alert t("js.insufficient_stock", {on_hand: available_quantity})
-        viewValue = available_quantity
+      on_hand = parseInt(attr.ofnOnHand)
+      if parseInt(viewValue) > on_hand
+        alert t("js.insufficient_stock", {on_hand: on_hand})
+        viewValue = on_hand
        ngModel.$setViewValue viewValue
        ngModel.$render()

      viewValue
-
-    scope.available_quantity = ->
-      on_hand = parseInt(attr.ofnOnHand)
-      finalized_quantity = parseInt(attr.finalizedquantity) || 0 # finalizedquantity is optional
-      on_hand + finalized_quantity
--- a/app/assets/javascripts/darkswarm/directives/page_alert.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/page_alert.js.coffee
@@ -2,14 +2,7 @@ Darkswarm.directive "ofnPageAlert", ($timeout) ->
  restrict: 'A'
  scope: true
  link: (scope, elem, attrs) ->
-    moveSelectors = [".off-canvas-wrap .inner-wrap",
-                     ".off-canvas-wrap .inner-wrap .fixed",
-                     ".off-canvas-fixed .top-bar",
-                     ".off-canvas-fixed ofn-flash",
-                     ".off-canvas-fixed nav.tab-bar",
-                     ".off-canvas-fixed .page-alert"]
-
-    container_elems = $(moveSelectors.join(", "))
+    container_elems = $(".off-canvas-wrap .inner-wrap, .off-canvas-wrap .inner-wrap .fixed, .page-alert")

    # Wait a moment after page load before showing the alert. Otherwise we often miss the
    # start of the animation.
--- a/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee
@@ -1,12 +1,9 @@
-Darkswarm.factory "EnterpriseModal", ($modal, $rootScope, $http)->
+Darkswarm.factory "EnterpriseModal", ($modal, $rootScope)->
  # Build a modal popup for an enterprise.
  new class EnterpriseModal
    open: (enterprise)->
      scope = $rootScope.$new(true) # Spawn an isolate to contain the enterprise
      scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1

-      $http.get("/api/enterprises/" + enterprise.id + "/shopfront").success (data) ->
-        scope.enterprise = data
-        $modal.open(templateUrl: "enterprise_modal.html", scope: scope)
-      .error (data) ->
-        console.error(data)
+      scope.enterprise = enterprise
+      $modal.open(templateUrl: "enterprise_modal.html", scope: scope)
--- a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
@@ -1,21 +1,18 @@
-Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer, Matcher, Geo, $rootScope) ->
+Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer, visibleFilter, Matcher, Geo, $rootScope) ->
  new class Enterprises
    enterprises_by_id: {}
-
    constructor: ->
      # Populate Enterprises.enterprises from json in page.
      @enterprises = enterprises
-
      # Map enterprises to id/object pairs for lookup.
      for enterprise in enterprises
        @enterprises_by_id[enterprise.id] = enterprise
-
      # Replace enterprise and taxons ids with actual objects.
      @dereferenceEnterprises()
-
-      @producers = @enterprises.filter (enterprise)->
+      @visible_enterprises = visibleFilter @enterprises
+      @producers = @visible_enterprises.filter (enterprise)->
        enterprise.category in ["producer_hub", "producer_shop", "producer"]
-      @hubs = @enterprises.filter (enterprise)->
+      @hubs = @visible_enterprises.filter (enterprise)->
        enterprise.category in ["hub", "hub_profile", "producer_hub", "producer_shop"]

    dereferenceEnterprises: ->
@@ -25,6 +22,8 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer,
        @dereferenceEnterprise enterprise

    dereferenceEnterprise: (enterprise) ->
+      @dereferenceProperty(enterprise, 'hubs', @enterprises_by_id)
+      @dereferenceProperty(enterprise, 'producers', @enterprises_by_id)
      @dereferenceProperty(enterprise, 'taxons', Taxons.taxons_by_id)
      @dereferenceProperty(enterprise, 'supplied_taxons', Taxons.taxons_by_id)

--- a/app/assets/javascripts/darkswarm/services/groups.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/groups.js.coffee
@@ -1,3 +1,14 @@
-Darkswarm.factory 'Groups', (groups) ->
+Darkswarm.factory 'Groups', (groups, Enterprises, Dereferencer) ->
  new class Groups
    groups: groups
+    groups_by_id: {} 
+    constructor: ->
+      for group in @groups
+        @groups_by_id[group.id] = group
+      @dereference()
+    dereference: ->
+      for group in @groups
+        Dereferencer.dereference group.enterprises, Enterprises.enterprises_by_id 
+      for enterprise in Enterprises.enterprises
+        Dereferencer.dereference enterprise.groups, @groups_by_id
+
--- a/app/assets/javascripts/darkswarm/services/map.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal) ->
+Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal, visibleFilter) ->
  new class OfnMap
    constructor: ->
      @enterprises = @enterprise_markers(Enterprises.enterprises)
@@ -6,7 +6,7 @@ Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal) ->
        enterprise.latitude != null || enterprise.longitude != null # Remove enterprises w/o lat or long

    enterprise_markers: (enterprises) ->
-      @extend(enterprise) for enterprise in enterprises
+      @extend(enterprise) for enterprise in visibleFilter(enterprises)

    # Adding methods to each enterprise
    extend: (enterprise) ->
--- a/app/assets/javascripts/darkswarm/services/products.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/products.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Products', ($resource, Shopfront, Dereferencer, Taxons, Properties, Cart, Variants) ->
+Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Properties, Cart, Variants) ->
  new class Products
    constructor: ->
      @update()
@@ -31,7 +31,7 @@ Darkswarm.factory 'Products', ($resource, Shopfront, Dereferencer, Taxons, Prope

    dereference: ->
      for product in @products
-        product.supplier = Shopfront.producers_by_id[product.supplier.id]
+        product.supplier = Enterprises.enterprises_by_id[product.supplier.id]
        Dereferencer.dereference product.taxons, Taxons.taxons_by_id

        product.properties = angular.copy(product.properties_with_values)
--- a/app/assets/javascripts/darkswarm/services/shopfront.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/shopfront.js.coffee
@@ -1,8 +0,0 @@
-Darkswarm.factory 'Shopfront', (shopfront) ->
-  new class Shopfront
-    shopfront: shopfront
-    producers_by_id: {}
-
-    constructor: ->
-      for producer in shopfront.producers
-        @producers_by_id[producer.id] = producer
--- a/app/assets/javascripts/templates/admin/new_customer_dialog.html.haml
+++ b/app/assets/javascripts/templates/admin/new_customer_dialog.html.haml
@@ -1,15 +1,15 @@
 #new-customer-dialog
  .text-normal.margin-bottom-30.text-center
-    {{ 'js.admin.customers.index.add_a_new_customer_for' | t:{ shop_name: CurrentShop.shop.name } }}
+    {{ 'admin.customers.index.add_a_new_customer_for' | t:{ shop_name: CurrentShop.shop.name } }}

  %form{ name: 'new_customer_form', novalidate: true, ng: { submit: "addCustomer()" }}

    .text-center.margin-bottom-30
-      %input.fullwidth{ type: 'email', name: 'email', required: true, placeholder: "{{ 'js.admin.customers.index.customer_placeholder' | t }}", ng: { model: "email" } }
+      %input.fullwidth{ type: 'email', name: 'email', required: true, placeholder: t('admin.customers.index.customer_placeholder'), ng: { model: "email" } }
      %div{ ng: { show: "submitted && new_customer_form.$pristine" } }
        .error{ ng: { show: "(new_customer_form.email.$error.email || new_customer_form.email.$error.required)" } }
-          {{ 'js.admin.customers.index.valid_email_error' | t }}
+          {{ 'admin.customers.index.valid_email_error' | t }}
        .error{ ng: { repeat: "error in errors", bind: "error" } }

    .text-center
-      %input.button.red.icon-plus{ type: 'submit', value: "{{ 'js.admin.customers.index.add_customer' | t }}" }
+      %input.button.red.icon-plus{ type: 'submit', value: t('admin.customers.index.add_customer') }
--- a/app/assets/javascripts/templates/admin/new_subscription_dialog.html.haml
+++ b/app/assets/javascripts/templates/admin/new_subscription_dialog.html.haml
@@ -1,6 +1,6 @@
 #new-subscription-dialog
  .text-normal.margin-bottom-30.text-center
-    = t('js.admin.subscriptions.new.please_select_a_shop')
+    = t('admin.subscriptions.index.please_select_a_shop')

  %form{ name: 'new_subscription_form', novalidate: true, ng: { submit: "newSubscription()" }}

@@ -8,7 +8,7 @@
      %input.ofn-select2.fullwidth#new_subscription_shop_id{ ng: { model: 'shop_id' }, required: true, name: 'shop_id', data: 'shops' }
      %div{ ng: { show: "submitted && new_subscription_form.$pristine" } }
        .error{ ng: { show: "new_subscription_form.shop_id.$error.required" } }
-          = t('js.admin.subscriptions.new.please_select_a_shop')
+          = t('admin.subscriptions.index.please_select_a_shop')

    .text-center
      %input.button.red.icon-plus{ type: 'submit', value: t('continue') }
--- a/app/assets/javascripts/templates/admin/new_tag_rule_dialog.html.haml
+++ b/app/assets/javascripts/templates/admin/new_tag_rule_dialog.html.haml
@@ -7,4 +7,4 @@
    %input.ofn-select2.fullwidth{ :id => 'rule_type_selector', ng: { model: "ruleType" }, data: "ruleTypes", 'min-search' => "5" }

  .text-center
-    %input.button.red.icon-plus{ type: 'button', value: "{{ 'js.admin.new_tag_rule_dialog.add_rule' | t }}", ng: { click: 'addRule(tagGroup, ruleType)' } }
+    %input.button.red.icon-plus{ type: 'button', value: "Add Rule", ng: { click: 'addRule(tagGroup, ruleType)' } }
--- a/app/assets/javascripts/templates/admin/order_cycles_selector.html.haml
+++ b/app/assets/javascripts/templates/admin/order_cycles_selector.html.haml
@@ -1,7 +1,7 @@
 %table
  %tr
    %td#available-order-cycles
-      {{ 'js.admin.order_cycles.schedules.available' | t }}
+      Available
      .order-cycles
        .order-cycle{ ng: { repeat: 'orderCycle in orderCycles | available:selectedOrderCycles as availableOrderCycles', click: 'selections.available = orderCycle', dblclick: 'add(orderCycle)', class: '{selected: selections.available == orderCycle}' } }
          {{ orderCycle.name }}
@@ -11,7 +11,7 @@
      %a.remove.button{ href: 'javascript:void(0)', ng: { click: 'remove()' } }
        %i.icon-chevron-left
    %td#selected-order-cycles
-      {{ 'js.admin.order_cycles.schedules.selected' | t }}
+      Selected
      .order-cycles
        .order-cycle{ ng: { repeat: 'orderCycle in selectedOrderCycles', click: 'selections.selected = orderCycle', dblclick: 'remove(orderCycle)', class: '{selected: selections.selected == orderCycle}' } }
          {{ orderCycle.name }}
--- a/app/assets/javascripts/templates/admin/schedule_dialog.html.haml
+++ b/app/assets/javascripts/templates/admin/schedule_dialog.html.haml
@@ -1,25 +1,23 @@
 #schedule-dialog
  .text-normal.margin-bottom-30.text-center
-    %span{ ng: { hide: 'schedule.id' } }
-      {{ 'js.admin.order_cycles.schedules.adding_a_new_schedule' | t }}
-    %span{ ng: { show: 'schedule.id' } }
-      {{ 'js.admin.order_cycles.schedules.updating_a_schedule' | t }}
+    %span{ ng: { hide: 'schedule.id' } }= t('admin.order_cycles.index.adding_a_new_schedule')
+    %span{ ng: { show: 'schedule.id' } }= t('admin.order_cycles.index.updating_a_schedule')

  %form{ name: 'schedule_form', novalidate: true, ng: { submit: "submit()" }}

    .text-center.margin-bottom-20
-      %input.fullwidth{ type: 'text', name: 'name', required: true, placeholder: "{{ 'js.admin.order_cycles.schedules.schedule_name_placeholder' | t }}", ng: { model: "schedule.name" } }
+      %input.fullwidth{ type: 'text', name: 'name', required: true, placeholder: t('admin.order_cycles.index.schedule_name_placeholder'), ng: { model: "schedule.name" } }
      %div{ ng: { show: "submitted && schedule_form.$pristine" } }
        .error{ ng: { show: "(schedule_form.name.$error.required)" } }
-          {{ 'js.admin.order_cycles.schedules.name_required_error' | t }}
+          = t('admin.order_cycles.index.name_required_error')

    .order-cycles-selector.text-center.margin-bottom-30

    .text-center

-      %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.create_schedule' | t }}", ng: { hide: 'schedule.id' } }
-      %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", ng: { show: 'schedule.id' } }
+      %input.button{ type: 'submit', value: t('admin.order_cycles.index.create_schedule'), ng: { hide: 'schedule.id' } }
+      %input.button{ type: 'submit', value: t('admin.order_cycles.index.update_schedule'), ng: { show: 'schedule.id' } }
      %span{ ng: { show: 'schedule.id' } } or
-      %input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", ng: { show: 'schedule.id', click: 'delete()'} }
+      %input.button.red{ type: 'button', value: t('admin.order_cycles.index.delete_schedule'), ng: { show: 'schedule.id', click: 'delete()'} }
      or
-      %input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", ng: { click: 'close()' } }
+      %input.button{ type: 'button', value: t('actions.cancel'), ng: { click: 'close()' } }
--- a/app/assets/javascripts/templates/partials/producer_details.html.haml
+++ b/app/assets/javascripts/templates/partials/producer_details.html.haml
@@ -2,14 +2,14 @@
 -# Do not show this for producer shops selling only their own produce,
 -# Since a shopping link will already have been displayed in hub_details.html.haml
 .row.active_table_row.pad-top{ "ng-if" => "enterprise.is_primary_producer && enterprise.hubs.length > 0 && !(enterprise.hubs.length == 1 && enterprise.hubs[0] == enterprise)"}
-  .columns.small-12.cta-container
+  .columns.small-12
    .row
      .columns.small-12.fat
        %div{"ng-if" => "::enterprise.name"}
-          %label{"ng-bind-html" => "::'shop_for_products_html' | t:{enterprise: enterprise.name}"}
+          %label{"ng-html" => "::'shop_for_products_html' | t:{enterprise: enterprise.name}"}
        %div.show-for-medium-up{"ng-if" => "::!enterprise.name"}
          &nbsp;
-    .row
+    .row.cta-container
      .columns.small-12
        %a.cta-hub{"ng-repeat" => "hub in enterprise.hubs | filter:{id: '!'+enterprise.id} | orderBy:'-active'",
        "ng-href" => "{{::hub.path}}", "ofn-empties-cart" => "hub",
--- a/app/assets/stylesheets/admin/all.scss
+++ b/app/assets/stylesheets/admin/all.scss
@@ -5,10 +5,12 @@
 *

 *= require admin/spree_backend
+ *= require admin/spree_auth

 *= require jquery-ui-timepicker-addon
 *= require shared/textAngular
 *= require shared/ng-tags-input.min
+ *= require admin/custom

 *= require_self
 */
--- a/app/assets/stylesheets/admin/components/timepicker.css.scss
+++ b/app/assets/stylesheets/admin/components/timepicker.css.scss
@@ -1 +1,2 @@
+/* Custom fix */
 .ui-timepicker-div.ui-timepicker-oneLine dl dd { width: 25%; }
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -154,6 +154,19 @@ form.order_cycle {
  .actions {
    margin-top: 3em;
  }
+
+  /* This styling makes it easier to read the debug info at the same time as working with the
+   * interface, but it breaks the tests. Enable when you need it.
+  #order-cycles-debug {
+    position: fixed;
+    top: 0px;
+    left: 0px;
+    height: 100%;
+    width: 316px;
+    overflow-y: scroll;
+    background-color: #fff;
+  }
+  */
 }

 table#listing_order_cycles {
--- a/app/assets/stylesheets/darkswarm/all.scss
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -10,7 +10,6 @@
@import 'foundation-icons';

@import 'base/*';
-@import 'layout/*';
@import '*';
@import 'pages/*';
@import '../web/all';
--- a/app/assets/stylesheets/darkswarm/collapsible.css.scss
+++ b/app/assets/stylesheets/darkswarm/collapsible.css.scss
@@ -1,52 +0,0 @@
-// A bit arbitrary, works for it's use at time of implementation
-$collapsible-max-height: 350px;
-
-.collapsible-checkbox {
-  display: none;
-}
-
-.collapsible-label > ::before {
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid currentColor;
-  border-top: 5px solid transparent;
-
-  content: ' ';
-  display: inline-block;
-
-  margin-right: .7rem;
-  transform: translateY(-2px);
-  transition: transform .2s ease-out;
-
-  vertical-align: middle;
-}
-
-.collapsible-content {
-  max-height: 0;
-  overflow: hidden;
-
-  transition: max-height .25s ease-in-out;
-}
-
-.collapsible-checkbox:checked + .collapsible-label + .collapsible-content {
-  max-height: $collapsible-max-height;
-}
-
-.collapsible-checkbox:checked + .collapsible-label > ::before {
-  transform: rotate(90deg) translateX(-3px);
-}
-
-@media only screen and (min-width: 1025px) {
-  // This double class is used to so this rule is more specific than the one in
-  // all.scss
-  .collapsible-label.collapsible-label-md {
-    margin-left: 0;
-  }
-
-  .collapsible-label-md > ::before {
-    display: none;
-  }
-
-  .collapsible-content-md {
-    max-height: $collapsible-max-height;
-  }
-}
--- a/app/assets/stylesheets/darkswarm/embedded_shopfront.css.scss
+++ b/app/assets/stylesheets/darkswarm/embedded_shopfront.css.scss
@@ -60,6 +60,7 @@ body.embedded {
        vertical-align: top;

        &.cart {
+
          div.joyride-tip-guide { // Cart Dropdown
            top: 75px;
            overflow: visible;
--- a/app/assets/stylesheets/darkswarm/header.css.scss
+++ b/app/assets/stylesheets/darkswarm/header.css.scss
@@ -0,0 +1,31 @@
+@import "variables";
+
+nav.top-bar {
+  margin-bottom: 0px;
+
+  a.icon {
+    &:hover {
+      text-decoration: none;
+    }
+
+    height: $topbar-height;
+    color: white;
+
+    i {
+      font-size: 29px;
+      line-height: $topbar-height;
+    }
+
+    span {
+      font-size: 13px;
+      display: inline-block;
+      line-height: $topbar-height;
+      height: $topbar-height;
+      vertical-align: top;
+    }
+  }
+}
+
+body > section[role='main'] {
+  padding: 0px;
+}
--- a/app/assets/stylesheets/darkswarm/layout/offcanvas.css.scss
+++ b/app/assets/stylesheets/darkswarm/layout/offcanvas.css.scss
@@ -1,17 +0,0 @@
-@import "compass/css3/transition";
-
-.off-canvas-fixed {
-  @include transition(transform 1000ms ease-in-out);
-}
-
-.move-right > .off-canvas-fixed {
-  height: 100%;
-  -webkit-transform: translate3d(15.625rem, 0, 0);
-  transform: translate3d(15.625rem, 0, 0);
-}
-
-.left-off-canvas-menu {
-  -webkit-transform: none;
-  transform: none;
-  margin-left: -15.625rem;
-}
--- a/app/assets/stylesheets/darkswarm/menu.css.scss
+++ b/app/assets/stylesheets/darkswarm/menu.css.scss
@@ -1,212 +1,103 @@
-@import 'compass';
-@import 'branding';
-@import 'mixins';
-@import 'typography';
-@import 'variables';
+@import "compass";
+@import "branding";
+@import "mixins";
+@import "typography";
+@import "variables";

-nav.top-bar {
+nav {
  @include textpress;
-  text-shadow: none;
-  text-align: center;
-  font-size: 16px;
-  margin-bottom: 0;
-  height: $topbar-height;
-}

-@media #{$large-only} {
-  .top-bar--menu-item-with-icon span {
+  text-shadow: none;
+
+  // Create center style for nav ul (foundation provides left and right)
+  text-align: center;
+
+  .top-bar-section {
+    // Avoid menu items blocking logo
+    li:not(.has-form), li:not(.has-form) a:not(.button), li:not(.has-form) a:not(.button):hover {
+      background-color: transparent;
+    }
+
+    ul.center {
+      display: inline-block;
+
+      // By default, we center between the left and right uls, but we want to be centered
+      // relative to the whole page. The difference in width between the other uls is 74px,
+      // so we offset by that amount here.
+      margin-left: -74px;
+    }
+  }
+
+  .joyride-tip-guide .button {
+    text-shadow: none;
+  }
+
+  // Default overrides - big menu
+  .top-bar-section .has-dropdown > a {
+    padding-right: ($topbar-height / 3) !important;
+
+    i.ofn-i_022-cog, .ofn-i_071-globe {
+      font-size: 24px;
+      line-height: $topbar-height;
+    }
+
+    i.ofn-i_071-globe {
+      color: #666;
+      font-size: 27px
+    }
+  }
+
+  .top-bar-section .has-dropdown > a:after {
    display: none;
  }

-  .top-bar--current-hub-prefix,
-  .top-bar--current-hub-name {
-    display: inline-block;
+  .top-bar-section ul li > a {
+    font-size: 0.75rem;
+    height: $topbar-height;
+    opacity: 0.8;
+
+    &:hover, &:focus, &:active {
+      opacity: 1;
+    }
+
+    @include transition(all 0.3s ease-in-out);
+  }
+
+  .top-bar-section ul li.ofn-logo > a {
+    display: table-cell;
    vertical-align: middle;
+    opacity: 1;
  }

-  .top-bar--current-hub-name {
-    max-width: 10em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
+  .nav-branded {
+    color: $brand-colour;

-.top-bar-section ul li > a.top-bar--menu-item-with-icon {
-  display: inline;
-}
-
-.top-bar--menu-item-with-icon i,
-.top-bar--menu-item-with-icon img {
-  line-height: $topbar-height;
-}
-
-.top-bar-section {
-  border-bottom: 1px solid $ofn-grey;
-
-  a.icon {
-    &:hover {
-      text-decoration: none;
-    }
-
-    > span {
-      display: inline-block;
-      font-weight: 300;
-      height: $topbar-height;
-      line-height: $topbar-height;
-      vertical-align: top;
+    span {
+      font-size: 13px;
    }
  }

-  // Avoid menu items blocking logo
-  li:not(.has-form), li:not(.has-form) a:not(.button), li:not(.has-form) a:not(.button):hover {
-    background-color: transparent;
+  .nav-primary {
+    @include headingFont;
+
+    font-size: 0.875rem;
+    font-weight: 300;
  }

-  li.cart {
-    background-color: #f4704c;
-
-    a span {
-      color: white;
-    }
-
-    i {
-      color: white;
-    }
-
-    .count {
-      position: relative;
-
-      img {
-        width: 32px;
-        height: 26px;
-        margin-top: 16px;
-        margin-right: 5px;
-      }
-
-      span {
-        background-color: white;
-        border-radius: 20px;
-        color: #f4704c;
-        font-size: 12px;
-        line-height: 18px;
-        position: absolute;
-        right: -8px;
-        top: 8px;
-        width: 18px;
-      }
-    }
-  }
-
-  ul.center {
-    display: inline-block;
-
-    // By default, we center between the left and right uls, but we want to be centered
-    // relative to the whole page. The difference in width between the other uls is 74px,
-    // so we offset by that amount here.
-    margin-left: -74px;
+  ul .nav-primary {
+    text-transform: uppercase;
  }

  ul.dropdown {
    border: 1px solid $smoke;
    border-top: none;
  }
-
-  ul.right {
-    > li {
-      border-left: 1px solid #ddd;
-      padding: 0 14px;
-
-      @media screen and (max-width: 1450px) {
-        padding: 0 6px;
-      }
-    }
-
-    li > a {
-      opacity: 0.8;
-
-      &:hover, &:focus, &:active {
-        opacity: 1;
-      }
-
-      i {
-        color: #f4704c;
-        display: inline-block;
-        margin-right: 2px;
-        margin-top: -3px;
-        vertical-align: middle;
-      }
-
-      img {
-        margin-right: 2px;
-        margin-top: -5px;
-      }
-    }
-  }
-
-  ul li > a {
-    font-size: 16px;
-    height: $topbar-height;
-  }
-
-  ul li.ofn-logo > a {
-    display: table-cell;
-    vertical-align: middle;
-  }
-
-  ul .nav-primary {
-    @include headingFont;
-    text-transform: uppercase;
-    font-weight: 300;
-    font-size: 16px;
-  }
-
-  .joyride-tip-guide .button {
-    text-shadow: none;
-  }
 }

 // Mobile Menu

 .tab-bar {
  background-color: white;
-  position: fixed;
-  width: 100%;
-  height: 2.8em;
-  z-index: 1;
-
-  .cart-span {
-    background-color: #f4704c;
-    padding: 13px;
-
-    a,
-    span {
-      color: white;
-      display: inline-block;
-    }
-
-    .count {
-      position: relative;
-
-      img {
-        margin-left: 2px;
-        width: 26px;
-      }
-
-      span {
-        background-color: white;
-        border-radius: 20px;
-        color: #f4704c;
-        font-size: 12px;
-        line-height: 16px;
-        position: absolute;
-        right: -10px;
-        text-align: center;
-        top: -9px;
-        width: 16px;
-      }
-    }
-  }
 }

 .off-canvas-list li.language-switcher ul li {
@@ -223,6 +114,8 @@ nav.top-bar {
 }

 .off-canvas-wrap.move-right .tab-bar .menu-icon span {
+  -moz-box-shadow: 0 0px 0 1px #666, 0 7px 0 1px #666, 0 14px 0 1px #666;
+  -webkit-box-shadow: 0 0px 0 1px #666, 0 7px 0 1px #666, 0 14px 0 1px #666;
  box-shadow: 0 0px 0 1px #666, 0 7px 0 1px #666, 0 14px 0 1px #666;
 }

@@ -234,19 +127,10 @@ nav.top-bar {
  padding: 9px 0 0 9px;
 }

-// Leave space for tab bar, in screens smaller than large.
-[role="main"] {
-  margin-top: 2.8em;
-
-  @media #{$large-up} {
-    margin-top: 0;
-  }
-}
-
 .top-bar .ofn-logo img {
  height: auto;
  width: auto;
-  max-height: 44px;
+  max-height: 51px;
  max-width: 250px;
 }

@@ -254,7 +138,7 @@ nav.top-bar {
  background-color: white;
 }

-.off-canvas-wrap ul.off-canvas-list {
+.off-canvas-wrap.move-right ul.off-canvas-list {
  font-size: 0.875rem;

  .li-menu {
@@ -274,10 +158,12 @@ nav.top-bar {
      background-color: transparent;
      color: $brand-colour;
    }
+
+    @include transition(all 0.3s ease-in-out);
  }
 }

-.off-canvas-wrap ul.off-canvas-list i {
+.off-canvas-wrap.move-right ul.off-canvas-list i {
  font-size: 1.5rem;
  margin-right: 0.25rem;
 }
@@ -286,8 +172,7 @@ nav.top-bar {

@media screen and (max-width: 1450px) {
  nav .top-bar-section {
-    ul li a,
-    .has-dropdown > a {
+    ul li a, .has-dropdown > a {
      padding: 0 ($topbar-height / 8) !important;
    }

@@ -309,4 +194,10 @@ nav.top-bar {
    // padding required to placehold for fixed menu bar
    padding-top: 0;
  }
+
+  section.right {
+    .nav-branded {
+      padding: 0 1em;
+    }
+  }
 }
--- a/app/assets/stylesheets/darkswarm/page_alert.css.scss
+++ b/app/assets/stylesheets/darkswarm/page_alert.css.scss
@@ -2,12 +2,10 @@
@import "animations";
@import "compass/css3/transition";

-$page-alert-height: 55px;
-
 // Basic style \\
 .page-alert {
  .alert-box {
-    height: $page-alert-height;
+    height: 55px;
    overflow: hidden;
    border: 1px solid rgba($dark-grey, 0.35);
    border-left: none;
@@ -47,26 +45,33 @@ $page-alert-height: 55px;
 }

 // Show-hide animation \\
-
-.off-canvas-wrap .inner-wrap,
-.off-canvas-fixed .top-bar,
-.off-canvas-fixed ofn-flash,
-.off-canvas-fixed nav.tab-bar,
-.off-canvas-fixed .page-alert {
-  @include transition(all 1000ms ease-in-out);
+.off-canvas-wrap .inner-wrap, .off-canvas-wrap .inner-wrap .fixed, nav.tab-bar {
+  @include transition(all, 1000ms, ease-in-out);

  &.move-down {
-    margin-top: $page-alert-height;
+    margin-top: 55px;
+
+    @include transition(all, 1000ms, ease-in-out);
  }
 }

-.off-canvas-wrap .page-alert {
-  top: -1 * $page-alert-height;
-  z-index: 100;
+.off-canvas-wrap .inner-wrap .page-alert.fixed {
+  top: -55px;
+  z-index: 1;
+
+  // TODO: Compass to disable transition
+  -moz-transition: none;
+  -webkit-transition: none;
+  -o-transition: color 0 ease-in;
+  transition: none;
 }

 .off-canvas-wrap.move-right .inner-wrap.move-down {
+  .page-alert {
+    top: -55px * 2;
+  }
+
  .left-off-canvas-menu {
-    top: -1 * $page-alert-height;
+    top: -55px;
  }
 }
--- a/app/assets/stylesheets/darkswarm/pages/login_modal.css.scss
+++ b/app/assets/stylesheets/darkswarm/pages/login_modal.css.scss
@@ -1,5 +1,4 @@
@import '../base/colors';
-@import '../collapsible';

 // Styling for login modal to style tabs
 .reveal-modal.login-modal {
@@ -24,10 +23,3 @@
    }
  }
 }
-
-@media only screen and (min-width: 1025px) {
-  // make sure styling doesn't get messed up if resizing down and back up
-  .collapsible-menus-container {
-    min-height: 250px;
-  }
-}
--- a/app/assets/stylesheets/darkswarm/variables.css.scss
+++ b/app/assets/stylesheets/darkswarm/variables.css.scss
@@ -13,9 +13,8 @@
 $brand-colour: #f27052;

 // Topbar
-$topbar-height: rem-calc(64);
-$topbar-link-padding: $topbar-height / 4;
-$topbar-arrows: false;
+$topbar-height: rem-calc(75);
+$topbar-link-padding: $topbar-height / 3;

 $topbar-bg: $white;
 $topbar-bg-color: $topbar-bg;
--- a/app/controllers/admin/bulk_line_items_controller.rb
+++ b/app/controllers/admin/bulk_line_items_controller.rb
@@ -22,9 +22,9 @@ module Admin
      order.with_lock do
        if @line_item.update_attributes(params[:line_item])
          order.update_distribution_charge!
-          render nothing: true, status: :no_content # No Content, does not trigger ng resource auto-update
+          render nothing: true, status: 204 # No Content, does not trigger ng resource auto-update
        else
-          render json: { errors: @line_item.errors }, status: :precondition_failed
+          render json: { errors: @line_item.errors }, status: 412
        end
      end
    end
@@ -36,7 +36,7 @@ module Admin
      authorize! :update, order

      @line_item.destroy
-      render nothing: true, status: :no_content # No Content, does not trigger ng resource auto-update
+      render nothing: true, status: 204 # No Content, does not trigger ng resource auto-update
    end

    private
--- a/app/controllers/admin/column_preferences_controller.rb
+++ b/app/controllers/admin/column_preferences_controller.rb
@@ -12,9 +12,9 @@ module Admin
        render json: @cp_set.collection, each_serializer: Api::Admin::ColumnPreferenceSerializer
      else
        if @cp_set.errors.present?
-          render json: { errors: @cp_set.errors }, status: :bad_request
+          render json: { errors: @cp_set.errors }, status: 400
        else
-          render nothing: true, status: :internal_server_error
+          render nothing: true, status: 500
        end
      end
    end
@@ -23,7 +23,7 @@ module Admin

    def load_collection
      collection_hash = Hash[params[:column_preferences].each_with_index.map { |cp, i| [i, cp] }]
-      collection_hash.select!{ |_i, cp| cp[:action_name] == params[:action_name] }
+      collection_hash.reject!{ |i, cp| cp[:action_name] != params[:action_name] }
      @cp_set = ColumnPreferenceSet.new @column_preferences, collection_attributes: collection_hash
    end

--- a/app/controllers/admin/contents_controller.rb
+++ b/app/controllers/admin/contents_controller.rb
@@ -16,7 +16,7 @@ module Admin
      # Save any uploaded images
      ContentConfig.save

-      flash[:success] = t(:successfully_updated, resource: I18n.t('admin.contents.edit.your_content'))
+      flash[:success] = t(:successfully_updated, :resource => I18n.t('admin.contents.edit.your_content'))

      redirect_to main_app.edit_admin_contents_path
    end
--- a/app/controllers/admin/customers_controller.rb
+++ b/app/controllers/admin/customers_controller.rb
@@ -34,7 +34,7 @@ module Admin
          tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: @customer.enterprise))
          render_as_json @customer, tag_rule_mapping: tag_rule_mapping
        else
-          render json: { errors: @customer.errors.full_messages }, status: :bad_request
+          render json: { errors: @customer.errors.full_messages }, status: 400
        end
      else
        redirect_to '/unauthorized'
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -1,8 +1,9 @@
 module Admin
  class EnterpriseFeesController < ResourceController
-    before_filter :load_enterprise_fee_set, only: :index
+    before_filter :load_enterprise_fee_set, :only => :index
    before_filter :load_data

+
    def index
      @include_calculators = params[:include_calculators].present?
      @enterprise = current_enterprise
@@ -33,17 +34,18 @@ module Admin
        if params.key? :enterprise_id
          redirect_path = main_app.admin_enterprise_fees_path(enterprise_id: params[:enterprise_id])
        end
-        redirect_to redirect_path, notice: I18n.t(:enterprise_fees_update_notice)
+        redirect_to redirect_path, :notice => I18n.t(:enterprise_fees_update_notice)

      else
        render :index
      end
    end

+
    private

    def load_enterprise_fee_set
-      @enterprise_fee_set = EnterpriseFeeSet.new collection: collection
+      @enterprise_fee_set = EnterpriseFeeSet.new :collection => collection
    end

    def load_data
@@ -58,7 +60,7 @@ module Admin
        coordinator = Enterprise.find_by_id(params[:coordinator_id]) if params[:coordinator_id]
        order_cycle = OrderCycle.new(coordinator: coordinator) if order_cycle.nil? && coordinator.present?
        enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, order_cycle).visible_enterprises
-        EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name')
+        return EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name')
      else
        collection = EnterpriseFee.managed_by(spree_current_user).order('enterprise_id', 'fee_type', 'name')
        collection = collection.for_enterprise(current_enterprise) if current_enterprise
@@ -73,5 +75,6 @@ module Admin
    def current_enterprise
      Enterprise.find params[:enterprise_id] if params.key? :enterprise_id
    end
+
  end
 end
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -12,7 +12,7 @@ module Admin
      if @enterprise_relationship.save
        render text: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json
      else
-        render status: :bad_request, json: { errors: @enterprise_relationship.errors.full_messages.join(', ') }
+        render status: 400, json: {errors: @enterprise_relationship.errors.full_messages.join(', ')}
      end
    end

--- a/app/controllers/admin/enterprise_roles_controller.rb
+++ b/app/controllers/admin/enterprise_roles_controller.rb
@@ -13,7 +13,7 @@ module Admin
        render text: Api::Admin::EnterpriseRoleSerializer.new(@enterprise_role).to_json

      else
-        render status: :bad_request, json: { errors: @enterprise_role.errors.full_messages.join(', ') }
+        render status: 400, json: {errors: @enterprise_role.errors.full_messages.join(', ')}
      end
    end

--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -6,11 +6,11 @@ module Admin
    prepend_before_filter :override_owner, only: :create
    prepend_before_filter :override_sells, only: :create

-    before_filter :load_enterprise_set, only: :index
-    before_filter :load_countries, except: [:index, :register, :check_permalink]
-    before_filter :load_methods_and_fees, only: [:edit, :update]
-    before_filter :load_groups, only: [:new, :edit, :update, :create]
-    before_filter :load_taxons, only: [:new, :edit, :update, :create]
+    before_filter :load_enterprise_set, :only => :index
+    before_filter :load_countries, :except => [:index, :register, :check_permalink]
+    before_filter :load_methods_and_fees, :only => [:edit, :update]
+    before_filter :load_groups, :only => [:new, :edit, :update, :create]
+    before_filter :load_taxons, :only => [:new, :edit, :update, :create]
    before_filter :check_can_change_sells, only: :update
    before_filter :check_can_change_bulk_sells, only: :bulk_update
    before_filter :check_can_change_owner, only: :update
@@ -45,7 +45,7 @@ module Admin
        flash[:success] = flash_message_for(@object, :successfully_updated)
        respond_with(@object) do |format|
          format.html { redirect_to location_after_save }
-          format.js   { render layout: false }
+          format.js   { render :layout => false }
          format.json { render_as_json @object, ams_prefix: 'index', spree_current_user: spree_current_user }
        end
      else
@@ -142,15 +142,7 @@ module Admin
        @order_cycle = OrderCycle.find_by_id(params[:order_cycle_id]) if params[:order_cycle_id]
        coordinator = Enterprise.find_by_id(params[:coordinator_id]) if params[:coordinator_id]
        @order_cycle = OrderCycle.new(coordinator: coordinator) if @order_cycle.nil? && coordinator.present?
-
-        enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, @order_cycle)
-          .visible_enterprises
-
-        unless enterprises.empty?
-          enterprises.includes(
-            supplied_products: [:supplier, :variants, master: [:images]]
-          )
-        end
+        return OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, @order_cycle).visible_enterprises
      when :index
        if spree_current_user.admin?
          OpenFoodNetwork::Permissions.new(spree_current_user).
@@ -162,8 +154,7 @@ module Admin
          Enterprise.where("1=0")
        end
      when :visible
-        OpenFoodNetwork::Permissions.new(spree_current_user).visible_enterprises
-          .includes(:shipping_methods, :payment_methods).ransack(params[:q]).result
+        OpenFoodNetwork::Permissions.new(spree_current_user).visible_enterprises.ransack(params[:q]).result
      else
        # TODO was ordered with is_distributor DESC as well, not sure why or how we want to sort this now
        OpenFoodNetwork::Permissions.new(spree_current_user).
@@ -177,20 +168,9 @@ module Admin
    end

    def load_methods_and_fees
-      # rubocop:disable Style/TernaryParentheses
-      @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).sort_by! do |pm|
-        [(@enterprise.payment_methods.include? pm) ? 0 : 1, pm.name]
-      end
-      @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user).sort_by! do |sm|
-        [(@enterprise.shipping_methods.include? sm) ? 0 : 1, sm.name]
-      end
-      # rubocop:enable Style/TernaryParentheses
-
-      @enterprise_fees = EnterpriseFee
-        .managed_by(spree_current_user)
-        .for_enterprise(@enterprise)
-        .order(:fee_type, :name)
-        .all
+      @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).sort_by!{ |pm| [(@enterprise.payment_methods.include? pm) ? 0 : 1, pm.name] }
+      @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user).sort_by!{ |sm| [(@enterprise.shipping_methods.include? sm) ? 0 : 1, sm.name] }
+      @enterprise_fees = EnterpriseFee.managed_by(spree_current_user).for_enterprise(@enterprise).order(:fee_type, :name).all
    end

    def load_groups
@@ -207,8 +187,8 @@ module Admin
      # methods that are specific to each class do not become available until after the
      # record is persisted. This problem is compounded by the use of calculators.
      @object.transaction do
-        tag_rules_attributes.select{ |_i, attrs| attrs[:type].present? }.each do |_i, attrs|
-          rule = @object.tag_rules.find_by_id(attrs.delete(:id)) || attrs[:type].constantize.new(enterprise: @object)
+        tag_rules_attributes.select{ |i, attrs| attrs[:type].present? }.each do |i, attrs|
+          rule = @object.tag_rules.find_by_id(attrs.delete :id) || attrs[:type].constantize.new(enterprise:  @object)
          create_calculator_for(rule, attrs) if rule.type == "TagRule::DiscountOrder" && rule.calculator.nil?
          rule.update_attributes(attrs)
        end
@@ -224,13 +204,13 @@ module Admin
    def create_calculator_for(rule, attrs)
      if attrs[:calculator_type].present? && attrs[:calculator_attributes].present?
        rule.update_attributes(calculator_type: attrs[:calculator_type])
-        attrs[:calculator_attributes].merge!( id: rule.calculator.id )
+        attrs[:calculator_attributes].merge!( { id: rule.calculator.id } )
      end
    end

    def check_can_change_bulk_sells
      unless spree_current_user.admin?
-        params[:enterprise_set][:collection_attributes].each do |_i, enterprise_params|
+        params[:enterprise_set][:collection_attributes].each do |i, enterprise_params|
          enterprise_params.delete :sells unless spree_current_user == Enterprise.find_by_id(enterprise_params[:id]).owner
        end
      end
@@ -250,7 +230,7 @@ module Admin
      unless spree_current_user.admin?
        has_hub = spree_current_user.owned_enterprises.is_hub.any?
        new_enterprise_is_producer = Enterprise.new(params[:enterprise]).is_primary_producer
-        params[:enterprise][:sells] = has_hub && !new_enterprise_is_producer ? 'any' : 'none'
+        params[:enterprise][:sells] = (has_hub && !new_enterprise_is_producer) ? 'any' : 'none'
      end
    end

@@ -262,7 +242,7 @@ module Admin

    def check_can_change_bulk_owner
      unless spree_current_user.admin?
-        params[:enterprise_set][:collection_attributes].each do |_i, enterprise_params|
+        params[:enterprise_set][:collection_attributes].each do |i, enterprise_params|
          enterprise_params.delete :owner_id
        end
      end
@@ -293,10 +273,8 @@ module Admin

    # Overriding method on Spree's resource controller
    def location_after_save
-      referer_path = OpenFoodNetwork::RefererParser.path(request.referer)
-      # rubocop:disable Style/RegexpLiteral
+      referer_path = OpenFoodNetwork::RefererParser::path(request.referer)
      refered_from_producer_properties = referer_path =~ /\/producer_properties$/
-      # rubocop:enable Style/RegexpLiteral

      if refered_from_producer_properties
        main_app.admin_enterprise_producer_properties_path(@enterprise)
--- a/app/controllers/admin/inventory_items_controller.rb
+++ b/app/controllers/admin/inventory_items_controller.rb
@@ -1,5 +1,6 @@
 module Admin
  class InventoryItemsController < ResourceController
+
    respond_to :json

    respond_override update: { json: {
--- a/app/controllers/admin/manager_invitations_controller.rb
+++ b/app/controllers/admin/manager_invitations_controller.rb
@@ -20,7 +20,7 @@ module Admin
      if new_user
        render json: { user: new_user.id }, status: :ok
      else
-        render json: { errors: t('admin.enterprises.invite_manager.error') }, status: :internal_server_error
+        render json: { errors: t('admin.enterprises.invite_manager.error') }, status: 500
      end
    end

--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -53,7 +53,7 @@ module Admin
        respond_to do |format|
          flash[:notice] = I18n.t(:order_cycles_update_notice) if params[:reloading] == '1'
          format.html { redirect_to main_app.edit_admin_order_cycle_path(@order_cycle) }
-          format.json { render json: { success: true } }
+          format.json { render json: { :success => true } }
        end
      else
        render json: { errors: @order_cycle.errors.full_messages }, status: :unprocessable_entity
@@ -82,19 +82,20 @@ module Admin
      redirect_to main_app.admin_order_cycles_path, notice: I18n.t(:order_cycles_email_to_producers_notice)
    end

+
    protected

    def collection
      return Enterprise.where("1=0") unless json_request?
      return order_cycles_from_set if params[:order_cycle_set]
      ocs = if params[:as] == "distributor"
-              OrderCycle.preload(:schedules).ransack(params[:q]).result.
-                involving_managed_distributors_of(spree_current_user).order('updated_at DESC')
-            elsif params[:as] == "producer"
-              OrderCycle.preload(:schedules).ransack(params[:q]).result.
-                involving_managed_producers_of(spree_current_user).order('updated_at DESC')
-            else
-              OrderCycle.preload(:schedules).ransack(params[:q]).result.accessible_by(spree_current_user)
+        OrderCycle.preload(:schedules).ransack(params[:q]).result.
+          involving_managed_distributors_of(spree_current_user).order('updated_at DESC')
+      elsif params[:as] == "producer"
+        OrderCycle.preload(:schedules).ransack(params[:q]).result.
+          involving_managed_producers_of(spree_current_user).order('updated_at DESC')
+      else
+        OrderCycle.preload(:schedules).ransack(params[:q]).result.accessible_by(spree_current_user)
      end

      ocs.undated |
@@ -114,7 +115,7 @@ module Admin
        # Split ransack params into all those that currently exist and new ones to limit returned ocs to recent or undated
        orders_close_at_gt = params[:q].andand.delete(:orders_close_at_gt) || 31.days.ago
        params[:q] = {
-          g: [params.delete(:q) || {}, { m: 'or', orders_close_at_gt: orders_close_at_gt, orders_close_at_null: true }]
+          g: [ params.delete(:q) || {}, { m: 'or', orders_close_at_gt: orders_close_at_gt, orders_close_at_null: true } ]
        }
        @collection = collection
      end
@@ -157,7 +158,7 @@ module Admin
      params[:order_cycle].delete :coordinator_id

      unless Enterprise.managed_by(spree_current_user).include?(@order_cycle.coordinator)
-        params[:order_cycle].delete_if{ |k, _v| [:name, :orders_open_at, :orders_close_at].include? k.to_sym }
+        params[:order_cycle].delete_if{ |k,v| [:name, :orders_open_at, :orders_close_at].include? k.to_sym }
      end
    end

@@ -172,7 +173,7 @@ module Admin

    def order_cycles_from_set
      remove_unauthorized_bulk_attrs
-      OrderCycle.where(id: params[:order_cycle_set][:collection_attributes].map{ |_k, v| v[:id] })
+      OrderCycle.where(id: params[:order_cycle_set][:collection_attributes].map{ |k,v| v[:id] })
    end

    def order_cycle_set
--- a/app/controllers/admin/producer_properties_controller.rb
+++ b/app/controllers/admin/producer_properties_controller.rb
@@ -4,6 +4,7 @@ module Admin
    before_filter :load_properties
    before_filter :setup_property, only: [:index]

+
    private

    def collection_url
--- a/app/controllers/admin/resource_controller.rb
+++ b/app/controllers/admin/resource_controller.rb
@@ -1,7 +1,7 @@
 module Admin
  class ResourceController < Spree::Admin::ResourceController
    def model_class
-      controller_name.classify.to_s.constantize
+      "#{controller_name.classify}".constantize
    end

    # URL helpers
@@ -22,7 +22,7 @@ module Admin
    end

    def object_url(object = nil, options = {})
-      target = object || @object
+      target = object ? object : @object
      if parent_data.present?
        main_app.public_send "admin_#{model_name}_#{object_name}_url", parent, target, options
      else
--- a/app/controllers/admin/schedules_controller.rb
+++ b/app/controllers/admin/schedules_controller.rb
@@ -31,16 +31,7 @@ module Admin

    def collection
      return Schedule.where("1=0") unless json_request?
-      if params[:enterprise_id]
-        filter_schedules_by_enterprise_id(permissions.visible_schedules, params[:enterprise_id])
-      else
-        permissions.visible_schedules
-      end
-    end
-
-    # Filter schedules by OCs with a given coordinator id
-    def filter_schedules_by_enterprise_id(schedules, enterprise_id)
-      schedules.joins(:order_cycles).where(order_cycles: { coordinator_id: enterprise_id.to_i })
+      permissions.visible_schedules
    end

    def collection_actions
--- a/app/controllers/admin/stripe_connect_settings_controller.rb
+++ b/app/controllers/admin/stripe_connect_settings_controller.rb
@@ -18,7 +18,7 @@ module Admin
    def update
      Spree::Config.set(params[:settings])
      resource = t('admin.controllers.stripe_connect_settings.resource')
-      flash[:success] = t(:successfully_updated, resource: resource)
+      flash[:success] = t(:successfully_updated, :resource => resource)
      redirect_to_edit
    end

--- a/app/controllers/admin/tag_rules_controller.rb
+++ b/app/controllers/admin/tag_rules_controller.rb
@@ -1,9 +1,10 @@
 module Admin
  class TagRulesController < ResourceController
+
    respond_to :json

    respond_override destroy: { json: {
-      success: lambda { render nothing: true, status: :no_content }
+      success: lambda { render nothing: true, :status => 204 }
    } }

    def map_by_tag
@@ -15,6 +16,7 @@ module Admin
      end
    end

+
    private

    def collection_actions
--- a/app/controllers/admin/variant_overrides_controller.rb
+++ b/app/controllers/admin/variant_overrides_controller.rb
@@ -9,7 +9,9 @@ module Admin
    before_filter :load_collection, only: [:bulk_update]
    before_filter :load_spree_api_key, only: :index

-    def index; end
+
+    def index
+    end

    def bulk_update
      # Ensure we're authorised to update all variant overrides
@@ -20,9 +22,9 @@ module Admin
        render json: @vo_set.collection, each_serializer: Api::Admin::VariantOverrideSerializer
      else
        if @vo_set.errors.present?
-          render json: { errors: @vo_set.errors }, status: :bad_request
+          render json: { errors: @vo_set.errors }, status: 400
        else
-          render nothing: true, status: :internal_server_error
+          render nothing: true, status: 500
        end
      end
    end
@@ -33,12 +35,13 @@ module Admin
      @collection.each(&:reset_stock!)

      if collection_errors.present?
-        render json: { errors: collection_errors }, status: :bad_request
+        render json: { errors: collection_errors }, status: 400
      else
        render json: @collection, each_serializer: Api::Admin::VariantOverrideSerializer
      end
    end

+
    private

    def load_data
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -9,7 +9,6 @@ module Api
    include ActionController::UrlFor
    include Rails.application.routes.url_helpers
    use_renderers :json
-    check_authorization

    def respond_with_conflict(json_hash)
      render json: json_hash, status: :conflict
@@ -22,13 +21,5 @@ module Api
      @current_api_user = try_spree_current_user
      super
    end
-
-    # Allows API access without authentication, but only for OFN controllers which inherit
-    # from Api::BaseController. @current_api_user will now initialize an empty Spree::User
-    # unless one is present. We now also apply devise's `check_authorization`. See here for
-    # details: https://github.com/CanCanCommunity/cancancan/wiki/Ensure-Authorization
-    def requires_authentication?
-      false
-    end
  end
 end
--- a/app/controllers/api/customers_controller.rb
+++ b/app/controllers/api/customers_controller.rb
@@ -1,7 +1,5 @@
 module Api
  class CustomersController < BaseController
-    skip_authorization_check only: :index
-
    def index
      @customers = current_api_user.customers
      render json: @customers, each_serializer: CustomerSerializer
@@ -12,7 +10,7 @@ module Api
      authorize! :update, @customer

      if @customer.update_attributes(params[:customer])
-        render json: @customer, serializer: CustomerSerializer, status: :ok
+        render json: @customer, serializer: CustomerSerializer, status: 200
      else
        invalid_resource!(@customer)
      end
--- a/app/controllers/api/enterprise_fees_controller.rb
+++ b/app/controllers/api/enterprise_fees_controller.rb
@@ -6,9 +6,9 @@ module Api
      authorize! :destroy, enterprise_fee

      if enterprise_fee.destroy
-        render text: I18n.t(:successfully_removed), status: :no_content
+        render text: I18n.t(:successfully_removed), status: 204
      else
-        render text: enterprise_fee.errors.full_messages.first, status: :forbidden
+        render text: enterprise_fee.errors.full_messages.first, status: 403
      end
    end

--- a/app/controllers/api/enterprises_controller.rb
+++ b/app/controllers/api/enterprises_controller.rb
@@ -1,18 +1,23 @@
 module Api
-  class EnterprisesController < BaseController
+  class EnterprisesController < Spree::Api::BaseController
+
    before_filter :override_owner, only: [:create, :update]
    before_filter :check_type, only: :update
    before_filter :override_sells, only: [:create, :update]
    before_filter :override_visible, only: [:create, :update]
    respond_to :json
-    skip_authorization_check only: [:shopfront]
+
+    def managed
+      @enterprises = Enterprise.ransack(params[:q]).result.managed_by(current_api_user)
+      render params[:template] || :bulk_index
+    end

    def create
      authorize! :create, Enterprise

      @enterprise = Enterprise.new(params[:enterprise])
      if @enterprise.save
-        render text: @enterprise.id, status: :created
+        render text: @enterprise.id, :status => 201
      else
        invalid_resource!(@enterprise)
      end
@@ -23,7 +28,7 @@ module Api
      authorize! :update, @enterprise

      if @enterprise.update_attributes(params[:enterprise])
-        render text: @enterprise.id, status: :ok
+        render text: @enterprise.id, :status => 200
      else
        invalid_resource!(@enterprise)
      end
@@ -33,21 +38,15 @@ module Api
      @enterprise = Enterprise.find_by_permalink(params[:id]) || Enterprise.find(params[:id])
      authorize! :update, @enterprise

-      if params[:logo] && @enterprise.update_attributes( logo: params[:logo] )
-        render text: @enterprise.logo.url(:medium), status: :ok
-      elsif params[:promo] && @enterprise.update_attributes( promo_image: params[:promo] )
-        render text: @enterprise.promo_image.url(:medium), status: :ok
+      if params[:logo] && @enterprise.update_attributes( { logo: params[:logo] } )
+        render text: @enterprise.logo.url(:medium), :status => 200
+      elsif params[:promo] && @enterprise.update_attributes( { promo_image: params[:promo] } )
+        render text: @enterprise.promo_image.url(:medium), :status => 200
      else
        invalid_resource!(@enterprise)
      end
    end

-    def shopfront
-      enterprise = Enterprise.find_by_id(params[:id])
-
-      render text: Api::EnterpriseShopfrontSerializer.new(enterprise).to_json, status: :ok
-    end
-
    private

    def override_owner
--- a/app/controllers/api/order_cycles_controller.rb
+++ b/app/controllers/api/order_cycles_controller.rb
@@ -0,0 +1,25 @@
+module Api
+  class OrderCyclesController < Spree::Api::BaseController
+    respond_to :json
+    def managed
+      authorize! :admin, OrderCycle
+      authorize! :read, OrderCycle
+      @order_cycles = OrderCycle.ransack(params[:q]).result.managed_by(current_api_user)
+      render params[:template] || :bulk_index
+    end
+
+    def accessible
+      @order_cycles = if params[:as] == "distributor"
+        OrderCycle.ransack(params[:q]).result.
+          involving_managed_distributors_of(current_api_user).order('updated_at DESC')
+      elsif params[:as] == "producer"
+        OrderCycle.ransack(params[:q]).result.
+          involving_managed_producers_of(current_api_user).order('updated_at DESC')
+      else
+        OrderCycle.ransack(params[:q]).result.accessible_by(current_api_user)
+      end
+
+      render params[:template] || :bulk_index
+    end
+  end
+end
--- a/app/controllers/api/statuses_controller.rb
+++ b/app/controllers/api/statuses_controller.rb
@@ -3,9 +3,10 @@ module Api
    respond_to :json

    def job_queue
-      render json: { alive: job_queue_alive? }
+      render json: {alive: job_queue_alive?}
    end

+
    private

    def job_queue_alive?
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,29 +1,22 @@
 require 'open_food_network/referer_parser'
-require 'spree/authentication_helpers'

 class ApplicationController < ActionController::Base
  protect_from_forgery

  prepend_before_filter :restrict_iframes
-  before_filter :set_cache_headers # prevent cart emptying via cache when using back button #1213
+  before_filter :set_cache_headers # Issue #1213, prevent cart emptying via cache when using back button

  include EnterprisesHelper
-  include Spree::AuthenticationHelpers

  def redirect_to(options = {}, response_status = {})
-    ::Rails.logger.error("Redirected by #{begin
-                                            caller(1).first
-                                          rescue StandardError
-                                            'unknown'
-                                          end}")
+    ::Rails.logger.error("Redirected by #{caller(1).first rescue "unknown"}")
    super(options, response_status)
  end

  def set_checkout_redirect
-    referer_path = OpenFoodNetwork::RefererParser.path(request.referer)
+    referer_path = OpenFoodNetwork::RefererParser::path(request.referer)
    if referer_path
-      is_checkout_path_the_referer = [main_app.checkout_path].include?(referer_path)
-      session["spree_user_return_to"] = is_checkout_path_the_referer ? referer_path : root_path
+      session["spree_user_return_to"] = [main_app.checkout_path].include?(referer_path) ? referer_path : root_path
    end
  end

@@ -34,13 +27,13 @@ class ApplicationController < ActionController::Base

  def enable_embedded_styles
    session[:embedded_shopfront] = true
-    render json: {}, status: :ok
+    render json: {}, status: 200
  end

  def disable_embedded_styles
    session.delete :embedded_shopfront
    session.delete :shopfront_redirect
-    render json: {}, status: :ok
+    render json: {}, status: 200
  end

  protected
@@ -51,7 +44,7 @@ class ApplicationController < ActionController::Base
  end

  def after_sign_out_path_for(_resource_or_scope)
-    session[:shopfront_redirect] || root_path
+    session[:shopfront_redirect] ? session[:shopfront_redirect] : root_path
  end

  private
@@ -88,8 +81,8 @@ class ApplicationController < ActionController::Base
    # This condition is more rigourous than required by development to avoid coupling this
    # condition to every controller spec
    if current_distributor && current_order &&
-       current_distributor.respond_to?(:ready_for_checkout?) &&
-       !current_distributor.ready_for_checkout?
+        current_distributor.respond_to?(:ready_for_checkout?) &&
+        !current_distributor.ready_for_checkout?

      current_order.empty!
      current_order.set_distribution! nil, nil
@@ -112,10 +105,10 @@ class ApplicationController < ActionController::Base
  # Useful for rendering html within a JSON response, particularly if the specified
  # template or partial then goes on to render further partials without specifying
  # their format.
-  def with_format(format)
+  def with_format(format, &block)
    old_formats = formats
    self.formats = [format]
-    yield
+    block.call
    self.formats = old_formats
    nil
  end
@@ -125,4 +118,5 @@ class ApplicationController < ActionController::Base
    response.headers["Pragma"] = "no-cache"
    response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
  end
+
 end
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -32,9 +32,7 @@ class BaseController < ApplicationController
    @order_cycles = OrderCycle.with_distributor(@distributor).active
      .order(@distributor.preferred_shopfront_order_cycle_order)

-    applicator = OpenFoodNetwork::TagRuleApplicator.new(@distributor,
-                                                        "FilterOrderCycles",
-                                                        current_customer.andand.tag_list)
+    applicator = OpenFoodNetwork::TagRuleApplicator.new(@distributor, "FilterOrderCycles", current_customer.andand.tag_list)
    applicator.filter!(@order_cycles)

    # And default to the only order cycle if there's only the one
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -8,6 +8,7 @@ class CheckoutController < Spree::CheckoutController
  prepend_before_filter :require_order_cycle
  prepend_before_filter :require_distributor_chosen

+  skip_before_filter :check_registration
  before_filter :enable_embedded_shopfront

  include OrderCyclesHelper
@@ -39,15 +40,15 @@ class CheckoutController < Spree::CheckoutController

      next if advance_order_state(@order)

-      flash[:error] = if @order.errors.present?
-                        @order.errors.full_messages.to_sentence
-                      else
-                        t(:payment_processing_failed)
-                      end
+      if @order.errors.present?
+        flash[:error] = @order.errors.full_messages.to_sentence
+      else
+        flash[:error] = t(:payment_processing_failed)
+      end
      update_failed
      return
    end
-    return update_failed unless @order.state == "complete" || @order.completed?
+    return update_failed unless @order.state == "complete" ||  @order.completed?

    set_default_bill_address
    set_default_ship_address
@@ -58,10 +59,10 @@ class CheckoutController < Spree::CheckoutController
    flash[:notice] = t(:order_processed_successfully)
    respond_to do |format|
      format.html do
-        respond_with(@order, location: order_path(@order))
+        respond_with(@order, :location => order_path(@order))
      end
      format.json do
-        render json: { path: order_path(@order) }, status: :ok
+        render json: {path: order_path(@order)}, status: 200
      end
    end
  end
@@ -81,14 +82,10 @@ class CheckoutController < Spree::CheckoutController
      new_bill_address = @order.bill_address.clone.attributes

      user_bill_address_id = spree_current_user.bill_address.andand.id
-      spree_current_user.update_attributes(
-        bill_address_attributes: new_bill_address.merge('id' => user_bill_address_id)
-      )
+      spree_current_user.update_attributes(bill_address_attributes: new_bill_address.merge('id' => user_bill_address_id))

      customer_bill_address_id = @order.customer.bill_address.andand.id
-      @order.customer.update_attributes(
-        bill_address_attributes: new_bill_address.merge('id' => customer_bill_address_id)
-      )
+      @order.customer.update_attributes(bill_address_attributes: new_bill_address.merge('id' => customer_bill_address_id))
    end
  end

@@ -97,43 +94,35 @@ class CheckoutController < Spree::CheckoutController
      new_ship_address = @order.ship_address.clone.attributes

      user_ship_address_id = spree_current_user.ship_address.andand.id
-      spree_current_user.update_attributes(
-        ship_address_attributes: new_ship_address.merge('id' => user_ship_address_id)
-      )
+      spree_current_user.update_attributes(ship_address_attributes: new_ship_address.merge('id' => user_ship_address_id))

      customer_ship_address_id = @order.customer.ship_address.andand.id
-      @order.customer.update_attributes(
-        ship_address_attributes: new_ship_address.merge('id' => customer_ship_address_id)
-      )
+      @order.customer.update_attributes(ship_address_attributes: new_ship_address.merge('id' => customer_ship_address_id))
    end
  end

  def check_order_for_phantom_fees
-    phantom_fees = @order.adjustments.
-      joins("LEFT OUTER JOIN spree_line_items"\
-        " ON spree_line_items.id = spree_adjustments.source_id").
-      where("originator_type = 'EnterpriseFee'"\
-        " AND source_type = 'Spree::LineItem' AND spree_line_items.id IS NULL")
+    phantom_fees = @order.adjustments.joins('LEFT OUTER JOIN spree_line_items ON spree_line_items.id = spree_adjustments.source_id').
+      where("originator_type = 'EnterpriseFee' AND source_type = 'Spree::LineItem' AND spree_line_items.id IS NULL")

    if phantom_fees.any?
-      Bugsnag.notify(RuntimeError.new("Phantom Fees"),
-                     phantom_fees: {
-                       phantom_total: phantom_fees.sum(&:amount).to_s,
-                       phantom_fees: phantom_fees.as_json
-                     })
+      Bugsnag.notify(RuntimeError.new("Phantom Fees"), {
+        phantom_fees: {
+          phantom_total: phantom_fees.sum(&:amount).to_s,
+          phantom_fees: phantom_fees.as_json
+        }
+      })
    end
  end

  # Copied and modified from spree. Remove check for order state, since the state machine is
  # progressed all the way in one go with the one page checkout.
  def object_params
-    # For payment step, filter order parameters to produce the expected
-    #   nested attributes for a single payment and its source,
-    #   discarding attributes for payment methods other than the one selected
+    # For payment step, filter order parameters to produce the expected nested attributes for a single payment and its source, discarding attributes for payment methods other than the one selected
    if params[:payment_source].present? && source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].underscore]
      params[:order][:payments_attributes].first[:source_attributes] = source_params
    end
-    if params[:order][:payments_attributes]
+    if (params[:order][:payments_attributes])
      params[:order][:payments_attributes].first[:amount] = @order.total
    end
    if params[:order][:existing_card_id]
@@ -160,13 +149,12 @@ class CheckoutController < Spree::CheckoutController
        render :edit
      end
      format.json do
-        render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
+        render json: {errors: @order.errors, flash: flash.to_hash}.to_json, status: 400
      end
    end
  end

-  # When we have a pickup Shipping Method,
-  #   we clone the distributor address into ship_address before_save
+  # When we have a pickup Shipping Method, we clone the distributor address into ship_address before_save
  # We don't want this data in the form, so we clear it out
  def clear_ship_address
    unless current_order.shipping_method.andand.require_ship_address
@@ -174,11 +162,15 @@ class CheckoutController < Spree::CheckoutController
    end
  end

+  def skip_state_validation?
+    true
+  end
+
  def load_order
    @order = current_order
-    redirect_to(main_app.shop_path) && return unless @order && @order.checkout_allowed?
-    redirect_to_cart_path && return unless valid_order_line_items?
-    redirect_to(main_app.shop_path) && return if @order.completed?
+    redirect_to main_app.shop_path and return unless @order and @order.checkout_allowed?
+    redirect_to_cart_path and return unless valid_order_line_items?
+    redirect_to main_app.shop_path and return if @order.completed?
    before_address
    setup_for_current_state
  end
@@ -193,19 +185,17 @@ class CheckoutController < Spree::CheckoutController
  end

  def valid_order_line_items?
-    @order.insufficient_stock_lines.empty? &&
-      OrderCycleDistributedVariants.new(@order.order_cycle, @order.distributor).
-        distributes_order_variants?(@order)
+    @order.insufficient_stock_lines.empty? && OrderCycleDistributedVariants.new(@order.order_cycle, @order.distributor).distributes_order_variants?(@order)
  end

  def redirect_to_cart_path
    respond_to do |format|
      format.html do
-        redirect_to main_app.cart_path
+        redirect_to cart_path
      end

      format.json do
-        render json: { path: main_app.cart_path }, status: :bad_request
+        render json: {path: cart_path}, status: 400
      end
    end
  end
@@ -213,12 +203,10 @@ class CheckoutController < Spree::CheckoutController
  def redirect_to_paypal_express_form_if_needed
    return unless params[:order][:payments_attributes]

-    payment_method_id = params[:order][:payments_attributes].first[:payment_method_id]
-    payment_method = Spree::PaymentMethod.find(payment_method_id)
-    return unless payment_method.is_a?(Spree::Gateway::PayPalExpress)
+    payment_method = Spree::PaymentMethod.find(params[:order][:payments_attributes].first[:payment_method_id])
+    return unless payment_method.kind_of?(Spree::Gateway::PayPalExpress)

-    render json: { path: spree.paypal_express_path(payment_method_id: payment_method.id) },
-           status: :ok
+    render json: {path: spree.paypal_express_path(payment_method_id: payment_method.id)}, status: 200
    true
  end

@@ -242,7 +230,7 @@ class CheckoutController < Spree::CheckoutController
    flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
    respond_to do |format|
      format.html { render :edit }
-      format.json { render json: { flash: flash.to_hash }, status: :bad_request }
+      format.json { render json: { flash: flash.to_hash }, status: 400 }
    end
  end
 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pau Pérez Fabregat	0f2df6a941	Merge pull request #3891 from openfoodfoundation/2-0-1 Bring changes introduced in v2.0.1 into 2-0-stable	2019-06-03 22:01:22 +02:00
Luis Ramos	278147b81f	Merge pull request #3892 from coopdevs/hide-product-from-shopfront-when-out-of-stock Hide product from shopfront when out of stock	2019-05-31 19:21:47 +01:00
Pau Perez	7ea10f6d98	Refresh the products cache on stock change This ensures the cache is up-to-date when a user accesses the shopfront and we use the appropriate stock levels. Besides, this makes the (very annoying) ProductsCacheIntegrityCheckerJob succeed and thus Bugsnag won't be flooded with failures anymore. As for the implementation of this. I'm not happy at all. It's disgusting to use `class_eval` for this but it's a good trade-off to deliver this fix ASAP. Katuma's been experiencing this error far too long 🙈. I was working on a better implementation that required a bit of refactoring but it was taking too much time. I'll open another PR with it soon.	2019-05-31 10:35:05 +02:00
Pau Perez	545c7c99ed	Move spec to its spec/ folder	2019-05-31 09:30:26 +02:00
Pau Pérez Fabregat	cc3a0877c4	Merge pull request #3849 from luisramos0/pr_3839 Get PR 3839 to 2-0-1	2019-05-13 15:27:04 +02:00
Pau Perez	bb12592a74	Report cache diff to Bugsnag in a new tab This will allow us to see the difference between the cache entry and the actual shopfront. Otherwise, there is no way to see what wasn't refreshed in the cache.	2019-05-10 22:02:11 +01:00
Pau Pérez Fabregat	f951ebe178	Merge pull request #3813 from luisramos0/3803-on-demand-default Make stock locations backorderable_default false	2019-05-07 09:16:34 +02:00
luisramos0	bcc21cdade	Make stock locations backorderable_default false. This is required because when the default stock location is created, the backorderable_default column doesnt exist and when this column is created, the initial default is true. This is why we need to force it to false here. This column is the default value for on_demand which must be false.	2019-05-06 20:56:22 +01:00