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

2026-03-13 04:00:21 +00:00 · 2020-04-28 13:40:19 +01:00
parent e1c2b7e105 868929eed3
commit 839b373b5c
631 changed files with 15133 additions and 10891 deletions
--- a/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee
@@ -2,19 +2,24 @@ angular.module("admin.indexUtils").factory "PagedFetcher", (dataFetcher) ->
  new class PagedFetcher
    # Given a URL like http://example.com/foo?page=::page::&per_page=20
    # And the response includes an attribute pages with the number of pages to fetch
-    # Fetch each page async, and call the processData callback with the resulting data
-    fetch: (url, processData, onLastPageComplete) ->
-      dataFetcher(@urlForPage(url, 1)).then (data) =>
-        processData data
+    # Fetch each page async, and call the pageCallback callback with the resulting data
+    # Developer note: this class should not be re-used!
+    page: 1
+    last_page: 1

-        if data.pages > 1
-          for page in [2..data.pages]
-            lastPromise = dataFetcher(@urlForPage(url, page)).then (data) ->
-              processData data
-          onLastPageComplete && lastPromise.then onLastPageComplete
-          return
-        else
-          onLastPageComplete && onLastPageComplete()
+    fetch: (url, pageCallback) ->
+      @fetchPages(url, @page, pageCallback)

    urlForPage: (url, page) ->
      url.replace("::page::", page)
+
+    fetchPages: (url, page, pageCallback) ->
+      dataFetcher(@urlForPage(url, page)).then (data) =>
+        @page++
+        @last_page = data.pages
+
+        pageCallback(data) if pageCallback
+
+        if @page <= @last_page
+          @fetchPages(url, @page, pageCallback)
+
--- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
@@ -67,7 +67,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
    return unless sort && sort.predicate != ""

    $scope.sorting = sort.getSortingExpr()
-    $scope.fetchProducts()
+    $scope.fetchResults()
  , true

  $scope.capturePayment = (order) ->
--- a/app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee
+++ b/app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee
@@ -43,12 +43,11 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",

  $scope.fetchProducts = ->
    url = "/api/products/overridable?page=::page::;per_page=100"
-    PagedFetcher.fetch url, (data) => $scope.addProducts data.products
+    PagedFetcher.fetch url, $scope.addProducts

-
-  $scope.addProducts = (products) ->
-    $scope.products = $scope.products.concat products
-    VariantOverrides.ensureDataFor hubs, products
+  $scope.addProducts = (data) ->
+    $scope.products = $scope.products.concat data.products
+    VariantOverrides.ensureDataFor hubs, data.products

  $scope.displayDirty = ->
    if DirtyVariantOverrides.count() > 0
--- a/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
@@ -9,8 +9,13 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
  $scope.show_closed = false
  $scope.filtersActive = false
  $scope.distanceMatchesShown = false
+  $scope.closed_shops_loading = false
+  $scope.closed_shops_loaded = false

  $scope.$watch "query", (query)->
+    $scope.resetSearch(query)
+
+  $scope.resetSearch = (query) ->
    Enterprises.flagMatching query
    Search.search query
    $rootScope.$broadcast 'enterprisesChanged'
@@ -19,6 +24,7 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
    $timeout ->
      Enterprises.calculateDistance query, $scope.firstNameMatch()
      $rootScope.$broadcast 'enterprisesChanged'
+      $scope.closed_shops_loading = false

  $timeout ->
    if $location.search()['show_closed']?
@@ -73,6 +79,12 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
      undefined

  $scope.showClosedShops = ->
+    unless $scope.closed_shops_loaded
+      $scope.closed_shops_loading = true
+      $scope.closed_shops_loaded = true
+      Enterprises.loadClosedEnterprises().then ->
+        $scope.resetSearch($scope.query)
+
    $scope.show_closed = true
    $location.search('show_closed', '1')

--- a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
@@ -24,7 +24,7 @@ Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, CurrentHub, $http,
    $scope.shopfront_loading = true
    $scope.toggle_tab(event)

-    $http.get("/api/enterprises/" + $scope.hub.id + "/shopfront")
+    $http.get("/api/shops/" + $scope.hub.id)
      .success (data) ->
        $scope.shopfront_loading = false
        $scope.hub = data
--- a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
@@ -24,7 +24,7 @@ Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll,
    $scope.shopfront_loading = true
    $scope.toggle_tab(event)

-    $http.get("/api/enterprises/" + $scope.producer.id + "/shopfront")
+    $http.get("/api/shops/" + $scope.producer.id)
      .success (data) ->
        $scope.shopfront_loading = false
        $scope.producer = data
--- a/app/assets/javascripts/darkswarm/services/checkout.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
@@ -14,15 +14,28 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE

    submit: =>
      Loading.message = t 'submitting_order'
-      $http.put('/checkout.json', {order: @preprocess()}).success (data, status)=>
-        Navigation.go data.path
-      .error (response, status)=>
-        if response.path
-          Navigation.go response.path
-        else
-          Loading.clear()
-          @errors = response.errors
-          RailsFlashLoader.loadFlash(response.flash)
+      $http.put('/checkout.json', {order: @preprocess()})
+      .then (response) =>
+        Navigation.go response.data.path
+      .catch (response) =>
+        try
+          @handle_checkout_error_response(response)
+        catch error
+          @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
+          throw error # generate a BugsnagJS alert
+
+    handle_checkout_error_response: (response) =>
+      if response.data.path
+        Navigation.go response.data.path
+      else
+        throw response unless response.data.flash
+
+        @errors = response.data.errors
+        @loadFlash(response.data.flash)
+
+    loadFlash: (flash) =>
+      Loading.clear()
+      RailsFlashLoader.loadFlash(flash)

    # Rails wants our Spree::Address data to be provided with _attributes
    preprocess: ->
--- a/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee
@@ -5,7 +5,7 @@ Darkswarm.factory "EnterpriseModal", ($modal, $rootScope, $http)->
      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) ->
+      $http.get("/api/shops/" + enterprise.id).success (data) ->
        scope.enterprise = data
        $modal.open(templateUrl: "enterprise_modal.html", scope: scope)
      .error (data) ->
--- a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
@@ -1,27 +1,30 @@
-Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer, Matcher, Geo, $rootScope) ->
+Darkswarm.factory 'Enterprises', (enterprises, ShopsResource, CurrentHub, Taxons, Dereferencer, Matcher, Geo, $rootScope) ->
  new class Enterprises
+    enterprises: []
    enterprises_by_id: {}

    constructor: ->
      # Populate Enterprises.enterprises from json in page.
-      @enterprises = enterprises
+      @initEnterprises(enterprises)

+    initEnterprises: (enterprises) ->
      # Map enterprises to id/object pairs for lookup.
      for enterprise in enterprises
+        @enterprises.push enterprise
        @enterprises_by_id[enterprise.id] = enterprise

      # Replace enterprise and taxons ids with actual objects.
-      @dereferenceEnterprises()
+      @dereferenceEnterprises(enterprises)

      @producers = @enterprises.filter (enterprise)->
        enterprise.category in ["producer_hub", "producer_shop", "producer"]
      @hubs = @enterprises.filter (enterprise)->
        enterprise.category in ["hub", "hub_profile", "producer_hub", "producer_shop"]

-    dereferenceEnterprises: ->
+    dereferenceEnterprises: (enteprises) ->
      if CurrentHub.hub?.id
        CurrentHub.hub = @enterprises_by_id[CurrentHub.hub.id]
-      for enterprise in @enterprises
+      for enterprise in enterprises
        @dereferenceEnterprise enterprise

    dereferenceEnterprise: (enterprise) ->
@@ -42,6 +45,12 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer,
      for enterprise in new_enterprises
        @enterprises_by_id[enterprise.id] = enterprise

+    loadClosedEnterprises: ->
+      request = ShopsResource.closed_shops {}, (data) =>
+        @initEnterprises(data)
+
+      request.$promise
+
    flagMatching: (query) ->
      for enterprise in @enterprises
        enterprise.matches_name_query = if query? && query.length > 0
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,6 +1,6 @@
 Darkswarm.factory 'OrderCycle', ($resource, orderCycleData) ->
  class OrderCycle
-    @order_cycle = orderCycleData # Object or {} due to RABL 
+    @order_cycle = orderCycleData # Object or {}
    @push_order_cycle: (callback) ->
      new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
        OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at
--- a/app/assets/javascripts/darkswarm/services/shops_resource.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/shops_resource.js.coffee
@@ -0,0 +1,7 @@
+Darkswarm.factory 'ShopsResource', ($resource) ->
+  $resource('/api/shops/:id.json', {}, {
+    'closed_shops':
+      method: 'GET'
+      isArray: true
+      url: '/api/shops/closed_shops.json'
+  })
--- a/app/assets/javascripts/templates/admin/columns_dropdown.html.haml
+++ b/app/assets/javascripts/templates/admin/columns_dropdown.html.haml
@@ -8,4 +8,4 @@
    %hr
    %div.menu_item.text-center
      %input.fullwidth.orange{ type: "button", ng: { value: "saved() ? 'Saved': 'Saving'", show: "saved() || saving", disabled: "saved()" } }
-      %input.fullwidth.red{ type: "button", value: 'Save As Default', ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }
+      %input.fullwidth.red{ type: "button", :value => t('admin.column_save_as_default').html_safe, ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }