Merge branch 'master' into 3-0-stable-may13

2026-03-13 04:00:21 +00:00 · 2020-05-13 19:50:32 +01:00
parent 1671184a3c 5f7c1474a2
commit 19da0ba969
182 changed files with 2432 additions and 729 deletions
--- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
@@ -29,7 +29,7 @@ angular.module("admin.enterprises")
    # from a directive "nav-check" in the page - if we pass it here it will be called in the test suite,
    # and on all new uses of this contoller, and we might not want that.
    enterpriseNavCallback = ->
-      if $scope.enterprise_form != undefined && $scope.enterprise_form.$dirty
+      if $scope.enterprise_form?.$dirty
        t('admin.unsaved_confirm_leave')

    # Register the NavigationCheck callback
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -1,5 +1,5 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminEditOrderCycleCtrl', ($scope, $controller, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) ->
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $controller, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, NavigationCheck, ocInstance) ->
    $controller('AdminOrderCycleBasicCtrl', {$scope: $scope, ocInstance: ocInstance})

    order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
@@ -18,5 +18,12 @@ angular.module('admin.orderCycles')

    $scope.submit = ($event, destination) ->
      $event.preventDefault()
+      NavigationCheck.clear()
      StatusMessage.display 'progress', t('js.saving')
      OrderCycle.update(destination, $scope.order_cycle_form)
+
+    warnAboutUnsavedChanges = ->
+      if $scope.order_cycle_form?.$dirty
+        t('admin.unsaved_confirm_leave')
+
+    NavigationCheck.register(warnAboutUnsavedChanges)
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, OrderCycle, OrderCycleResource, FilterSelectorsService, Cart, Dereferencer, Taxons, Properties, currentHub, $timeout) ->
+Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Products, OrderCycle, OrderCycleResource, FilterSelectorsService, Cart, Dereferencer, Taxons, Properties, currentHub, $timeout) ->
  $scope.Products = Products
  $scope.Cart = Cart
  $scope.query = ""
@@ -10,6 +10,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
  $scope.order_cycle = OrderCycle.order_cycle
  $scope.supplied_taxons = null
  $scope.supplied_properties = null
+  $scope.showFilterSidebar = false

  $rootScope.$on "orderCycleSelected", ->
    $scope.update_filters()
@@ -75,15 +76,24 @@ 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($scope.filtersJoinWord()) 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($scope.filtersJoinWord()) if $scope.activeProperties?
+
+  $scope.filtersJoinWord = ->
+    $sce.trustAsHtml(" <span class='join-word'>#{t('products_or')}</span> ")

  $scope.clearAll = ->
+    $scope.clearQuery()
+    $scope.clearFilters()
+
+  $scope.clearQuery = ->
    $scope.query = ""
+
+  $scope.clearFilters = ->
    $scope.taxonSelectors.clearAll()
    $scope.propertySelectors.clearAll()

@@ -94,3 +104,9 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
      $scope.Products.products = []
      $scope.update_filters()
      $scope.loadProducts()
+
+  $scope.filtersCount = () ->
+    $scope.taxonSelectors.totalActive() + $scope.propertySelectors.totalActive()
+
+  $scope.toggleFilterSidebar = ->
+    $scope.showFilterSidebar = !$scope.showFilterSidebar
--- 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,2 @@
-Darkswarm.controller "ProducersTabCtrl", ($scope, Shopfront, EnterpriseModal) ->
+Darkswarm.controller "ProducersTabCtrl", ($scope, Shopfront) ->
  $scope.shopfront = Shopfront.shopfront
--- a/app/assets/javascripts/darkswarm/directives/darker_background.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/darker_background.js.coffee
@@ -0,0 +1,11 @@
+Darkswarm.directive "darkerBackground", ->
+  restrict: "A"
+  link: (scope, elm, attr)->
+    toggleClass = (value) ->
+      elm.closest('.page-view').toggleClass("with-darker-background", value)
+
+    toggleClass(true)
+
+    # if an OrderCycle is selected, disable darker background
+    scope.$watch 'order_cycle.order_cycle_id', (newvalue, oldvalue) ->
+      toggleClass(false) if newvalue
--- a/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee
@@ -7,4 +7,4 @@ Darkswarm.directive "enterpriseModal", (EnterpriseModal) ->
    elem.on "click", (event) =>
      event.stopPropagation()

-      scope.modalInstance = EnterpriseModal.open scope.enterprise
+      scope.modalInstance = EnterpriseModal.open scope.enterprise
--- a/app/assets/javascripts/darkswarm/directives/focus_search.coffee
+++ b/app/assets/javascripts/darkswarm/directives/focus_search.coffee
@@ -0,0 +1,6 @@
+Darkswarm.directive "focusSearch", ->
+  restrict: 'A'
+  link: (scope, element, attr)->
+    element.bind 'click', (event) ->
+      # Focus seach field, ready for typing
+      $(element).siblings('#search').focus()
--- a/app/assets/javascripts/darkswarm/services/cart.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/cart.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService) ->
+Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, RailsFlashLoader) ->
  # Handles syncing of current cart/order state to server
  new class Cart
    dirty: false
@@ -50,7 +50,7 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
        @popQueue() if @update_enqueued

      .error (response, status)=>
-        @scheduleRetry(status)
+        RailsFlashLoader.loadFlash({error: t('js.cart.add_to_cart_failed')})
        @update_running = false

    compareAndNotifyStockLevels: (stockLevels) =>
@@ -87,13 +87,6 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
          max_quantity: li.max_quantity
      {variants: variants}

-    scheduleRetry: (status) =>
-      console.log "Error updating cart: #{status}. Retrying in 3 seconds..."
-      $timeout =>
-        console.log "Retrying cart update"
-        @orderChanged()
-      , 3000
-
    saved: =>
      @dirty = false
      $(window).unbind "beforeunload"
--- a/app/assets/javascripts/darkswarm/services/enterprise_list_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_list_modal.js.coffee
@@ -0,0 +1,10 @@
+Darkswarm.factory "EnterpriseListModal", ($modal, $rootScope, $http, EnterpriseModal)->
+  new class EnterpriseListModal
+    open: (enterprises)->
+      scope = $rootScope.$new(true)
+      scope.enterprises = enterprises
+      scope.openModal = EnterpriseModal.open
+      if Object.keys(enterprises).length > 1
+        $modal.open(templateUrl: "enterprise_list_modal.html", scope: scope)
+      else
+        EnterpriseModal.open enterprises[Object.keys(enterprises)[0]]
--- a/app/assets/javascripts/darkswarm/services/map.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map.js.coffee
@@ -1,21 +1,39 @@
-Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal) ->
+Darkswarm.factory "OfnMap", (Enterprises, EnterpriseListModal, MapConfiguration) ->
  new class OfnMap
    constructor: ->
-      @enterprises = @enterprise_markers(Enterprises.enterprises)
-      @enterprises = @enterprises.filter (enterprise) ->
-        enterprise.latitude != null || enterprise.longitude != null # Remove enterprises w/o lat or long
+      @coordinates = {}
+      @enterprises = Enterprises.enterprises.filter (enterprise) ->
+        # Remove enterprises w/o lat or long
+        enterprise.latitude != null || enterprise.longitude != null
+      @enterprises = @enterprise_markers(@enterprises)

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

+    enterprise_hash: (hash, enterprise) ->
+      hash[enterprise.id] = { id: enterprise.id, name: enterprise.name, icon: enterprise.icon_font }
+      hash
+
+    extend_marker: (marker, enterprise) ->
+      marker.latitude = enterprise.latitude
+      marker.longitude = enterprise.longitude
+      marker.icon = enterprise.icon
+      marker.id = [enterprise.id]
+      marker.enterprises = @enterprise_hash({}, enterprise)
+
    # Adding methods to each enterprise
    extend: (enterprise) ->
-      new class MapMarker
-        # We cherry-pick attributes because GMaps tries to crawl
-        # our data, and our data is cyclic, so it breaks
-        latitude: enterprise.latitude
-        longitude: enterprise.longitude
-        icon: enterprise.icon
-        id: enterprise.id
-        reveal: =>
-          EnterpriseModal.open enterprise
+      marker = @coordinates[[enterprise.latitude, enterprise.longitude]]
+      if marker
+        marker.icon = MapConfiguration.options.cluster_icon
+        @enterprise_hash(marker.enterprises, enterprise)
+        marker.id.push(enterprise.id)
+      else
+        marker = new class MapMarker
+          # We cherry-pick attributes because GMaps tries to crawl
+          # our data, and our data is cyclic, so it breaks
+          reveal: =>
+            EnterpriseListModal.open this.enterprises
+        @extend_marker(marker, enterprise)
+        @coordinates[[enterprise.latitude, enterprise.longitude]] = marker
+      marker
--- a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
@@ -4,6 +4,7 @@ Darkswarm.factory "MapConfiguration", ->
      center:
        latitude: -37.4713077
        longitude: 144.7851531
+      cluster_icon: 'assets/map_009-cluster.svg'
      zoom: 12
      additional_options:
        # mapTypeId: 'satellite'
--- a/app/assets/javascripts/templates/enterprise_list_modal.html.haml
+++ b/app/assets/javascripts/templates/enterprise_list_modal.html.haml
@@ -0,0 +1,2 @@
+%ng-include{src: "'partials/enterprise_listing.html'"}
+%ng-include{src: "'partials/close.html'"}
--- a/app/assets/javascripts/templates/filter_selector.html.haml
+++ b/app/assets/javascripts/templates/filter_selector.html.haml
@@ -1,4 +1,3 @@
 %ul
  %active-selector{ ng: { repeat: "selector in allSelectors", show: "ifDefined(selector.fits, true)" } }
-    %render-svg{path: "{{selector.object.icon}}", ng: { if: "selector.object.icon"} }
    %span{"ng-bind" => "::selector.object.name"}
--- a/app/assets/javascripts/templates/partials/enterprise_listing.html.haml
+++ b/app/assets/javascripts/templates/partials/enterprise_listing.html.haml
@@ -0,0 +1,10 @@
+.modal-list
+  .row{"ng-repeat" => "(id, enterprise) in ::enterprises"}
+    .highlight
+      .highlight-top.row.enterprise
+        .small-12.medium-12.large-12.columns
+          %h4
+            %a.heading{"ng-click" => "::openModal(enterprise)"}
+              %i{"ng-class" => "enterprise.icon"}
+              %span{"ng-bind" => "enterprise.name"}
+      %img.hero-img{"ng-src" => "{{::enterprise.promo_image}}"}
--- a/app/assets/javascripts/templates/price_breakdown_button.html.haml
+++ b/app/assets/javascripts/templates/price_breakdown_button.html.haml
@@ -1,2 +1,2 @@
-%button.graph-button{"ng-class" => "{open: tt_isOpen}"}
+%button.graph-button{"ng-class" => "{open: tt_isOpen}", type: 'button'}
  / %i.ofn-i_058-graph