Merge pull request #4630 from Matt-Yorkley/product_counts

Show counts including all variants in order cycle exchanges

.rubocop_manual_todo.yml

@@ -39,7 +39,6 @@ Layout/LineLength:
   - app/controllers/admin/variant_overrides_controller.rb
   - app/controllers/api/enterprise_attachment_controller.rb
   - app/controllers/api/product_images_controller.rb
-  - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/adjustments_controller_decorator.rb
   - app/controllers/spree/admin/orders_controller_decorator.rb
   - app/controllers/spree/credit_cards_controller.rb
@@ -354,7 +353,6 @@ Metrics/AbcSize:
   - app/controllers/api/variants_controller.rb
   - app/controllers/base_controller.rb
   - 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
@@ -371,7 +369,6 @@ Metrics/AbcSize:
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/admin/variants_controller.rb
-  - app/controllers/spree/checkout_controller.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/controllers/spree/user_passwords_controller.rb
@@ -493,7 +490,6 @@ Metrics/CyclomaticComplexity:
   Exclude:
   - app/controllers/admin/enterprise_fees_controller.rb
   - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
@@ -523,7 +519,6 @@ Metrics/PerceivedComplexity:
   Exclude:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/api/variants_controller.rb
-  - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
@@ -560,7 +555,6 @@ Metrics/MethodLength:
   - app/controllers/api/variants_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/image_settings_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb

Gemfile

@@ -39,7 +39,7 @@ gem 'activemerchant', '~> 1.78'
 gem 'devise', '~> 2.2.5'
 gem 'devise-encryptable', '0.2.0'
 gem 'jwt', '~> 2.2'
-gem 'oauth2', '~> 1.4.2' # Used for Stripe Connect
+gem 'oauth2', '~> 1.4.3' # Used for Stripe Connect
 
 gem 'daemons'
 gem 'delayed_job_active_record'
@@ -93,7 +93,7 @@ gem 'wkhtmltopdf-binary'
 
 gem 'foreigner'
 gem 'immigrant'
-gem 'roo', '~> 2.8.2'
+gem 'roo', '~> 2.8.3'
 
 gem 'whenever', require: false
 

Gemfile.lock

@@ -261,7 +261,7 @@ GEM
     factory_bot_rails (4.10.0)
       factory_bot (~> 4.10.0)
       railties (>= 3.0.0)
-    faraday (0.17.1)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     ffaker (1.22.1)
     ffi (1.11.3)
@@ -458,7 +458,7 @@ GEM
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.11.2)
+    kgio (2.11.3)
     knapsack (1.18.0)
       rake
     launchy (2.4.3)
@@ -486,7 +486,7 @@ GEM
     newrelic_rpm (3.18.1.330)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    oauth2 (1.4.2)
+    oauth2 (1.4.3)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -559,7 +559,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.19.0)
+    raindrops (0.19.1)
     rake (13.0.0)
     ransack (0.7.2)
       actionpack (~> 3.0)
@@ -584,9 +584,9 @@ GEM
     roadie-rails (1.3.0)
       railties (>= 3.0, < 5.3)
       roadie (~> 3.1)
-    roo (2.8.2)
+    roo (2.8.3)
       nokogiri (~> 1)
-      rubyzip (>= 1.2.1, < 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -676,7 +676,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.1)
-    unicorn (5.5.2)
+    unicorn (5.5.3)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -693,7 +693,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.8.0)
+    webmock (3.8.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -766,7 +766,7 @@ DEPENDENCIES
   momentjs-rails
   newrelic_rpm (~> 3.0)
   nokogiri (>= 1.6.7.1)
-  oauth2 (~> 1.4.2)
+  oauth2 (~> 1.4.3)
   ofn-qz!
   oj
   order_management!
@@ -783,7 +783,7 @@ DEPENDENCIES
   rails_safe_tasks (~> 1.0)
   redcarpet
   roadie-rails (~> 1.3.0)
-  roo (~> 2.8.2)
+  roo (~> 2.8.3)
   rspec-rails (>= 3.5.2)
   rspec-retry
   rubocop

app/assets/javascripts/admin/bulk_product_update.js.coffee

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
@@ -38,6 +38,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.query = ""
   $scope.DisplayProperties = DisplayProperties
 
+  $scope.sortOptions = SortOptions
+
   $scope.initialise = ->
     $scope.fetchProducts()
 
@@ -54,6 +56,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       'q[name_cont]': $scope.query,
       'q[supplier_id_eq]': $scope.producerFilter,
       'q[primary_taxon_id_eq]': $scope.categoryFilter,
+      'q[s]': $scope.sorting,
       import_date: $scope.importDateFilter,
       page: $scope.page,
       per_page: $scope.per_page
@@ -103,9 +106,16 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.categoryFilter = "0"
     $scope.importDateFilter = "0"
 
+  $scope.$watch 'sortOptions', (sort) ->
+    return unless sort && sort.predicate != ""
+
+    $scope.sorting = sort.getSortingExpr()
+    $scope.fetchProducts()
+  , true
+
   confirm_unsaved_changes = () ->
     (DirtyProducts.count() > 0 and confirm(t("unsaved_changes_confirmation"))) or (DirtyProducts.count() == 0)
-  
+
   editProductUrl = (product, variant) ->
     "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
 

app/assets/javascripts/admin/index_utils/services/sort_options.js.coffee

@@ -3,6 +3,11 @@ angular.module("admin.indexUtils").factory 'SortOptions', ->
     predicate: ""
     reverse: true
 
+    getSortingExpr: () ->
+      sortingExpr = this.predicate + ' desc' if this.reverse
+      sortingExpr = this.predicate + ' asc' if !this.reverse
+      sortingExpr
+
     toggle: (predicate) ->
       @reverse = (@predicate == predicate) && !@reverse
       @predicate = predicate

app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee

@@ -48,13 +48,15 @@ angular.module('admin.orderCycles')
 
       return if enterprise.last_page_loaded? && enterprise.last_page_loaded >= page
       enterprise.last_page_loaded = page
+      enterprise.loaded_variants ?= 0
 
       incoming = true if $scope.view == 'incoming'
       params = { exchange_id: exchange.id, enterprise_id: exchange.enterprise_id, order_cycle_id: $scope.order_cycle.id, incoming: incoming, page: page}
-      ExchangeProduct.index params, (products, num_of_pages, num_of_products) ->
+      ExchangeProduct.index params, (products, num_of_pages) ->
         enterprise.num_of_pages = num_of_pages
-        enterprise.num_of_products = num_of_products
         enterprise.supplied_products.push products...
+        angular.forEach products, (product) ->
+          enterprise.loaded_variants += product.variants.length
 
     $scope.loadMoreExchangeProducts = (exchange) ->
       $scope.loadExchangeProducts(exchange, $scope.enterprises[exchange.enterprise_id].last_page_loaded + 1)

app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee

@@ -64,10 +64,10 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
       $scope.selected_orders.push order.id if $scope.select_all
 
   $scope.$watch 'sortOptions', (sort) ->
-    if sort && sort.predicate != ""
-      $scope.sorting = sort.predicate + ' desc' if sort.reverse
-      $scope.sorting = sort.predicate + ' asc' if !sort.reverse
-      $scope.fetchResults()
+    return unless sort && sort.predicate != ""
+
+    $scope.sorting = sort.getSortingExpr()
+    $scope.fetchProducts()
   , true
 
   $scope.capturePayment = (order) ->

app/assets/javascripts/templates/admin/panels/exchange_products_distributed.html.haml

@@ -9,7 +9,7 @@
           'ng-model' => 'exchange.select_all_variants',
           'ng-change' => 'setExchangeVariants(exchange, incomingExchangeVariantsFor(exchange.enterprise_id), exchange.select_all_variants)',
           'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants' }
-        {{ 'js.admin.panels.exchange_products.select_all_products' | t:{ total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
+        {{ 'js.admin.panels.exchange_products.select_all_variants' | t:{ total_number_of_variants: exchangeTotalVariants(exchange) } }}
 
     .exchange-products{ 'ng-hide' => 'productsLoading()' }
       .exchange-product{'ng-repeat' => 'product in enterprises[exchange.enterprise_id].supplied_products | filter:visibleProducts:exchange:order_cycle.visible_variants_for_outgoing_exchanges' }

app/assets/javascripts/templates/admin/panels/exchange_products_panel_footer.html.haml

@@ -1,11 +1,11 @@
 .pagination{ 'ng-show' => 'enterprises[exchange.enterprise_id].last_page_loaded < enterprises[exchange.enterprise_id].num_of_pages && !productsLoading()'}
   .button{ 'ng-click' => 'loadMoreExchangeProducts(exchange)' }
-    {{ 'js.admin.panels.exchange_products.load_more_products' | t }}
+    {{ 'js.admin.panels.exchange_products.load_more_variants' | t }}
   .button{ 'ng-click' => 'loadAllExchangeProducts(exchange)' }
-    {{ 'js.admin.panels.exchange_products.load_all_products' | t }}
+    {{ 'js.admin.panels.exchange_products.load_all_variants' | t }}
 
 .sixteen.columns.alpha#loading{ 'ng-show' => 'productsLoading()' }
   %br
   %img.spinner{ src: "/assets/spinning-circles.svg" }
   %h1
-    {{ 'js.admin.panels.exchange_products.loading_products' | t }}
+    {{ 'js.admin.panels.exchange_products.loading_variants' | t }}

app/assets/javascripts/templates/admin/panels/exchange_products_panel_header.html.haml

@@ -1,5 +1,5 @@
 .exchange-load-all-variants
   %div
-    {{ 'js.admin.panels.exchange_products.products_loaded' | t:{ num_of_products_loaded: enterprises[exchange.enterprise_id].supplied_products.length, total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
+    {{ 'js.admin.panels.exchange_products.variants_loaded' | t:{ num_of_variants_loaded: enterprises[exchange.enterprise_id].loaded_variants, total_number_of_variants: exchangeTotalVariants(exchange) } }}
     %a{ 'ng-click' => 'loadAllExchangeProducts(exchange)', 'ng-show' => 'enterprises[exchange.enterprise_id].last_page_loaded < enterprises[exchange.enterprise_id].num_of_pages' }
-      {{ 'js.admin.panels.exchange_products.load_all_products' | t }}
+      {{ 'js.admin.panels.exchange_products.load_all_variants' | t }}

app/assets/javascripts/templates/admin/panels/exchange_products_supplied.html.haml

@@ -9,7 +9,7 @@
           'ng-model' => 'exchange.select_all_variants',
           'ng-change' => 'selectAllVariants(exchange, exchange.select_all_variants)',
           'id' => 'order_cycle_incoming_exchange_{{ $index }}_select_all_variants' }
-        {{ 'js.admin.panels.exchange_products.select_all_products' | t:{ total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
+        {{ 'js.admin.panels.exchange_products.select_all_variants' | t:{ total_number_of_variants: exchangeTotalVariants(exchange) } }}
 
     %div{ 'ng-include' => "'admin/panels/exchange_products_supplied_list.html'" }
 

app/controllers/api/products_controller.rb

@@ -48,16 +48,22 @@ module Api
     end
 
     def bulk_products
-      product_query = OpenFoodNetwork::Permissions.new(current_api_user).
-        editable_products.merge(product_scope)
+      product_query = OpenFoodNetwork::Permissions.
+        new(current_api_user).
+        editable_products.
+        merge(product_scope)
 
       if params[:import_date].present?
-        product_query = product_query.imported_on(params[:import_date]).group_by_products_id
+        product_query = product_query.
+          imported_on(params[:import_date]).
+          group_by_products_id
       end
 
-      @products = product_query.order('created_at DESC').
-        ransack(params[:q]).result.
-        page(params[:page] || DEFAULT_PAGE).per(params[:per_page] || DEFAULT_PER_PAGE)
+      @products = product_query.
+        ransack(query_params_with_defaults).
+        result.
+        page(params[:page] || DEFAULT_PAGE).
+        per(params[:per_page] || DEFAULT_PER_PAGE)
 
       render_paged_products @products
     end
@@ -136,6 +142,10 @@ module Api
       }.to_json
     end
 
+    def query_params_with_defaults
+      params[:q].to_h.reverse_merge(s: 'created_at desc')
+    end
+
     def pagination_data(results)
       {
         results: results.total_count,

app/controllers/checkout_controller.rb

@@ -1,8 +1,16 @@
+# frozen_string_literal: true
+
 require 'open_food_network/address_finder'
 
-class CheckoutController < Spree::CheckoutController
+class CheckoutController < Spree::StoreController
   layout 'darkswarm'
 
+  include CheckoutHelper
+  include OrderCyclesHelper
+  include EnterprisesHelper
+
+  ssl_required
+
   # We need pessimistic locking to avoid race conditions.
   # Otherwise we fail on duplicate indexes or end up with negative stock.
   prepend_around_filter CurrentOrderLocker, only: :update
@@ -12,10 +20,19 @@ class CheckoutController < Spree::CheckoutController
   prepend_before_filter :require_order_cycle
   prepend_before_filter :require_distributor_chosen
 
+  before_filter :load_order
+
+  before_filter :ensure_order_not_completed
+  before_filter :ensure_checkout_allowed
+  before_filter :ensure_sufficient_stock_lines
+
+  before_filter :associate_user
+  before_filter :check_authorization
   before_filter :enable_embedded_shopfront
 
-  include OrderCyclesHelper
-  include EnterprisesHelper
+  helper 'spree/orders'
+
+  rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
 
   def edit
     # This is only required because of spree_paypal_express. If we implement
@@ -25,54 +42,16 @@ class CheckoutController < Spree::CheckoutController
   end
 
   def update
-    shipping_method_id = object_params.delete(:shipping_method_id)
+    params_adapter = Checkout::FormDataAdapter.new(params, @order, spree_current_user)
+    return update_failed unless @order.update_attributes(params_adapter.order_params)
 
-    return update_failed unless @order.update_attributes(object_params)
-
-    check_order_for_phantom_fees
     fire_event('spree.checkout.update')
 
-    while @order.state != "complete"
-      if @order.state == "payment"
-        return if redirect_to_paypal_express_form_if_needed
-      end
-
-      if @order.state == "delivery"
-        @order.select_shipping_method(shipping_method_id)
-      end
-
-      next if advance_order_state(@order)
-
-      flash[:error] = if @order.errors.present?
-                        @order.errors.full_messages.to_sentence
-                      else
-                        t(:payment_processing_failed)
-                      end
-      update_failed
-      return
-    end
-    return update_failed unless @order.state == "complete" || @order.completed?
-
-    set_default_bill_address
-    set_default_ship_address
-
-    ResetOrderService.new(self, current_order).call
-    session[:access_token] = current_order.token
-
-    flash[:notice] = t(:order_processed_successfully)
-    respond_to do |format|
-      format.html do
-        respond_with(@order, location: order_path(@order))
-      end
-      format.json do
-        render json: { path: order_path(@order) }, status: :ok
-      end
-    end
-  rescue Spree::Core::GatewayError => error
-    # This is done for all actions in the Spree::CheckoutController.
-    rescue_from_spree_gateway_error(error)
-  rescue StandardError => error
-    Bugsnag.notify(error)
+    checkout_workflow(params_adapter.shipping_method_id)
+  rescue Spree::Core::GatewayError => e
+    rescue_from_spree_gateway_error(e)
+  rescue StandardError => e
+    Bugsnag.notify(e)
     flash[:error] = I18n.t("checkout.failed")
     update_failed
   end
@@ -87,111 +66,38 @@ class CheckoutController < Spree::CheckoutController
 
   private
 
-  def set_default_bill_address
-    if params[:order][:default_bill_address]
-      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)
-      )
-
-      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)
-      )
-    end
+  def check_authorization
+    authorize!(:edit, current_order, session[:access_token])
   end
 
-  def set_default_ship_address
-    if params[:order][:default_ship_address]
-      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)
-      )
-
-      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)
-      )
-    end
+  def ensure_checkout_allowed
+    redirect_to main_app.cart_path unless @order.checkout_allowed?
   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")
-
-    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
-                     })
-    end
+  def ensure_order_not_completed
+    redirect_to main_app.cart_path if @order.completed?
   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
-    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]
-      params[:order][:payments_attributes].first[:amount] = @order.total
-    end
-    if params[:order][:existing_card_id]
-      construct_saved_card_attributes
-    end
-    params[:order]
-  end
-
-  # Perform order.next, guarding against StaleObjectErrors
-  def advance_order_state(order)
-    tries ||= 3
-    order.next
-  rescue ActiveRecord::StaleObjectError
-    retry unless (tries -= 1).zero?
-    false
-  end
-
-  def update_failed
-    current_order.updater.shipping_address_from_distributor
-    RestartCheckout.new(@order).call
-
-    respond_to do |format|
-      format.html do
-        render :edit
-      end
-      format.json do
-        render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
-      end
+  def ensure_sufficient_stock_lines
+    if @order.insufficient_stock_lines.present?
+      flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
+      redirect_to main_app.cart_path
     end
   end
 
   def load_order
     @order = current_order
-    redirect_to(main_app.shop_path) && return unless @order && @order.checkout_allowed?
+
+    redirect_to(main_app.shop_path) && return if redirect_to_shop?
     redirect_to_cart_path && return unless valid_order_line_items?
-    redirect_to(main_app.shop_path) && return if @order.completed?
     before_address
     setup_for_current_state
   end
 
-  def before_address
-    associate_user
-
-    finder = OpenFoodNetwork::AddressFinder.new(@order.email, @order.customer, spree_current_user)
-
-    @order.bill_address = finder.bill_address
-    @order.ship_address = finder.ship_address
+  def redirect_to_shop?
+    !@order ||
+      !@order.checkout_allowed? ||
+      @order.completed?
   end
 
   def valid_order_line_items?
@@ -212,32 +118,29 @@ class CheckoutController < Spree::CheckoutController
     end
   end
 
-  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)
-
-    render json: { path: spree.paypal_express_path(payment_method_id: payment_method.id) },
-           status: :ok
-    true
+  def setup_for_current_state
+    method_name = :"before_#{@order.state}"
+    __send__(method_name) if respond_to?(method_name, true)
   end
 
-  def construct_saved_card_attributes
-    existing_card_id = params[:order].delete(:existing_card_id)
-    return if existing_card_id.blank?
+  def before_address
+    associate_user
 
-    credit_card = Spree::CreditCard.find(existing_card_id)
-    if credit_card.try(:user_id).blank? || credit_card.user_id != spree_current_user.try(:id)
-      raise Spree::Core::GatewayError, I18n.t(:invalid_credit_card)
-    end
+    finder = OpenFoodNetwork::AddressFinder.new(@order.email, @order.customer, spree_current_user)
 
-    # Not currently supported but maybe we should add it...?
-    credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
+    @order.bill_address = finder.bill_address
+    @order.ship_address = finder.ship_address
+  end
 
-    params[:order][:payments_attributes].first[:source] = credit_card
-    params[:order][:payments_attributes].first.delete :source_attributes
+  def before_delivery
+    return if params[:order].present?
+
+    packages = @order.shipments.map(&:to_package)
+    @differentiator = Spree::Stock::Differentiator.new(@order, packages)
+  end
+
+  def before_payment
+    current_order.payments.destroy_all if request.put?
   end
 
   def rescue_from_spree_gateway_error(error)
@@ -247,4 +150,91 @@ class CheckoutController < Spree::CheckoutController
       format.json { render json: { flash: flash.to_hash }, status: :bad_request }
     end
   end
+
+  def checkout_workflow(shipping_method_id)
+    while @order.state != "complete"
+      if @order.state == "payment"
+        return if redirect_to_payment_gateway
+      end
+
+      @order.select_shipping_method(shipping_method_id) if @order.state == "delivery"
+
+      next if advance_order_state(@order)
+
+      flash[:error] = order_workflow_error
+      return update_failed
+    end
+
+    update_result
+  end
+
+  def redirect_to_payment_gateway
+    redirect_path = Checkout::PaymentRedirect.new(params).path
+    return if redirect_path.blank?
+
+    render json: { path: redirect_path }, status: :ok
+    true
+  end
+
+  # Perform order.next, guarding against StaleObjectErrors
+  def advance_order_state(order)
+    tries ||= 3
+    order.next
+  rescue ActiveRecord::StaleObjectError
+    retry unless (tries -= 1).zero?
+    false
+  end
+
+  def order_workflow_error
+    if @order.errors.present?
+      @order.errors.full_messages.to_sentence
+    else
+      t(:payment_processing_failed)
+    end
+  end
+
+  def update_result
+    if @order.state == "complete" || @order.completed?
+      save_order_addresses_as_user_default
+      ResetOrderService.new(self, current_order).call
+
+      update_succeeded
+    else
+      update_failed
+    end
+  end
+
+  def save_order_addresses_as_user_default
+    user_default_address_setter = UserDefaultAddressSetter.new(@order, spree_current_user)
+    user_default_address_setter.set_default_bill_address if params[:order][:default_bill_address]
+    user_default_address_setter.set_default_ship_address if params[:order][:default_ship_address]
+  end
+
+  def update_succeeded
+    session[:access_token] = current_order.token
+    flash[:notice] = t(:order_processed_successfully)
+
+    respond_to do |format|
+      format.html do
+        respond_with(@order, location: order_path(@order))
+      end
+      format.json do
+        render json: { path: order_path(@order) }, status: :ok
+      end
+    end
+  end
+
+  def update_failed
+    current_order.updater.shipping_address_from_distributor
+    RestartCheckout.new(@order).call
+
+    respond_to do |format|
+      format.html do
+        render :edit
+      end
+      format.json do
+        render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
+      end
+    end
+  end
 end

app/controllers/spree/checkout_controller.rb

@@ -1,93 +1,16 @@
-require 'open_food_network/address_finder'
+# frozen_string_literal: true
 
+# This controller (and respective route in the Spree engine)
+#   is only needed for the spree_paypal_express gem that redirects here explicitly.
+#
+# According to the rails docs it would be possible to redirect
+#   to CheckoutController directly in the routes
+#   with a slash like "to: '/checkout#edit'", but it does not work in this case.
 module Spree
   class CheckoutController < Spree::StoreController
-    include CheckoutHelper
-
-    ssl_required
-
-    before_filter :load_order
-
-    before_filter :ensure_order_not_completed
-    before_filter :ensure_checkout_allowed
-    before_filter :ensure_sufficient_stock_lines
-
-    before_filter :associate_user
-    before_filter :check_authorization
-    before_filter :enable_embedded_shopfront
-
-    helper 'spree/orders'
-
-    rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
-
     def edit
       flash.keep
       redirect_to main_app.checkout_path
     end
-
-    private
-
-    def load_order
-      @order = current_order
-      redirect_to(main_app.cart_path) && return unless @order
-
-      if params[:state]
-        redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state])
-        @order.state = params[:state]
-      end
-      setup_for_current_state
-    end
-
-    def ensure_checkout_allowed
-      redirect_to main_app.cart_path unless @order.checkout_allowed?
-    end
-
-    def ensure_order_not_completed
-      redirect_to main_app.cart_path if @order.completed?
-    end
-
-    def ensure_sufficient_stock_lines
-      if @order.insufficient_stock_lines.present?
-        flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
-        redirect_to main_app.cart_path
-      end
-    end
-
-    def setup_for_current_state
-      method_name = :"before_#{@order.state}"
-      send(method_name) if respond_to?(method_name, true)
-    end
-
-    # Adapted from spree_last_address gem: https://github.com/TylerRick/spree_last_address
-    # Originally, we used a forked version of this gem, but encountered strange errors where
-    # it worked in dev but only intermittently in staging/prod.
-    def before_address
-      associate_user
-
-      finder = OpenFoodNetwork::AddressFinder.new(@order.email)
-
-      @order.bill_address = finder.bill_address
-      @order.ship_address = finder.ship_address
-    end
-
-    def before_delivery
-      return if params[:order].present?
-
-      packages = @order.shipments.map(&:to_package)
-      @differentiator = Spree::Stock::Differentiator.new(@order, packages)
-    end
-
-    def before_payment
-      current_order.payments.destroy_all if request.put?
-    end
-
-    def rescue_from_spree_gateway_error
-      flash[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
-      render :edit
-    end
-
-    def check_authorization
-      authorize!(:edit, current_order, session[:access_token])
-    end
   end
 end

app/services/checkout/form_data_adapter.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+# Adapts checkout form data (params) so that the order can be directly saved to the database
+module Checkout
+  class FormDataAdapter
+    attr_reader :shipping_method_id
+
+    def initialize(params, order, current_user)
+      @params = params.dup
+      @order = order
+      @current_user = current_user
+
+      move_payment_source_to_payment_attributes!
+
+      set_amount_in_payments_attributes
+
+      construct_saved_card_attributes if @params[:order][:existing_card_id]
+
+      @shipping_method_id = @params[:order].delete(:shipping_method_id)
+    end
+
+    def order_params
+      @params[:order]
+    end
+
+    private
+
+    # 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
+    def move_payment_source_to_payment_attributes!
+      return unless @params[:payment_source].present? &&
+                    payment_source_params = delete_payment_source_params!
+
+      @params[:order][:payments_attributes].first[:source_attributes] = payment_source_params
+    end
+
+    def delete_payment_source_params!
+      @params.delete(:payment_source)[
+        @params[:order][:payments_attributes].first[:payment_method_id].underscore
+      ]
+    end
+
+    def set_amount_in_payments_attributes
+      return unless @params[:order][:payments_attributes]
+
+      @params[:order][:payments_attributes].first[:amount] = @order.total
+    end
+
+    def construct_saved_card_attributes
+      existing_card_id = @params[:order].delete(:existing_card_id)
+      return if existing_card_id.blank?
+
+      add_to_payment_attributes(existing_card_id)
+
+      @params[:order][:payments_attributes].first.delete :source_attributes
+    end
+
+    def add_to_payment_attributes(existing_card_id)
+      credit_card = Spree::CreditCard.find(existing_card_id)
+      if credit_card.try(:user_id).blank? || credit_card.user_id != @current_user.try(:id)
+        raise Spree::Core::GatewayError, I18n.t(:invalid_credit_card)
+      end
+
+      @params[:order][:payments_attributes].first[:source] = credit_card
+    end
+  end
+end

app/services/checkout/payment_redirect.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Provides the redirect path if a redirect to the payment gateway is needed
+module Checkout
+  class PaymentRedirect
+    def initialize(params)
+      @params = params
+    end
+
+    # Returns the path to the Paypal Express form if a redirect is needed
+    def path
+      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)
+
+      spree_routes_helper.paypal_express_path(payment_method_id: payment_method.id)
+    end
+
+    private
+
+    def spree_routes_helper
+      Spree::Core::Engine.routes_url_helpers
+    end
+  end
+end

app/services/user_default_address_setter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Sets the order addresses as the user default addresses
+class UserDefaultAddressSetter
+  def initialize(order, current_user)
+    @order = order
+    @current_user = current_user
+  end
+
+  # Sets the order bill address as the user default bill address
+  def set_default_bill_address
+    new_bill_address = @order.bill_address.clone.attributes
+
+    set_bill_address_attributes(@current_user, new_bill_address)
+    set_bill_address_attributes(@order.customer, new_bill_address)
+  end
+
+  # Sets the order ship address as the user default ship address
+  def set_default_ship_address
+    new_ship_address = @order.ship_address.clone.attributes
+
+    set_ship_address_attributes(@current_user, new_ship_address)
+    set_ship_address_attributes(@order.customer, new_ship_address)
+  end
+
+  private
+
+  def set_bill_address_attributes(object, new_address)
+    object.update_attributes(
+      bill_address_attributes: new_address.merge('id' => object.bill_address.andand.id)
+    )
+  end
+
+  def set_ship_address_attributes(object, new_address)
+    object.update_attributes(
+      ship_address_attributes: new_address.merge('id' => object.ship_address.andand.id)
+    )
+  end
+end

app/views/admin/order_cycles/_exchange_form.html.haml

@@ -31,10 +31,10 @@
 - if type == 'supplier'
   %tr.panel-row{ object: "exchange",
     panels: "{products: 'exchange_products_supplied'}",
-    locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,selectAllVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
+    locals: "$index,exchangeTotalVariants,order_cycle,exchange,enterprises,setExchangeVariants,selectAllVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
     colspan: 4 }
 - if type == 'distributor'
   %tr.panel-row{ object: "exchange",
     panels: "{products: 'exchange_products_distributed', tags: 'exchange_tags'}",
-    locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
+    locals: "$index,exchangeTotalVariants,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
     colspan: 5 }

app/views/spree/admin/orders/_filters.html.haml

@@ -1,5 +1,5 @@
 %div{"data-hook" => "admin_orders_index_search"}
-  = form_tag false, {name: "orders_form", "ng-submit" => "fetchResults()"} do
+  = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do
     .field-block.alpha.four.columns
       .date-range-filter.field
         = label_tag nil, t(:date_range)

app/views/spree/admin/orders/index.html.haml

@@ -43,7 +43,7 @@
 
       - ['number', 'state', 'payment_state', 'shipment_state', 'email', 'total'].each do |column_name|
         %th
-          = render partial: 'sortable_header', locals: {column_name: column_name}
+          = render partial: 'spree/admin/shared/sortable_header', locals: {column_name: column_name}
 
       %th.actions
   %tbody

app/views/spree/admin/products/index/_products_head.html.haml

@@ -26,7 +26,8 @@
     %th.image{ 'ng-show' => 'columns.image.visible' }
     %th.producer{ 'ng-show' => 'columns.producer.visible' }=t('admin.producer')
     %th.sku{ 'ng-show' => 'columns.sku.visible' }=t('admin.sku')
-    %th.name{ 'ng-show' => 'columns.name.visible' }=t('.name')
+    %th.name{ 'ng-show' => 'columns.name.visible' }
+      = render partial: 'spree/admin/shared/sortable_header', locals: {column_name: 'name'}
     %th.unit{ 'ng-show' => 'columns.unit.visible' }=t('.unit')
     %th.display_as{ 'ng-show' => 'columns.unit.visible' }=t('.display_as')
     %th.price{ 'ng-show' => 'columns.price.visible' }=t('admin.price')

config/environments/production.rb

@@ -34,10 +34,14 @@ Openfoodnetwork::Application.configure do
   config.action_mailer.default_url_options = { protocol: 'https' }
 
   # See everything in the log (default is :info)
-  config.log_level = :info
+  # config.log_level = :debug
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Configure logging for Rails 3.2:
+  config.logger = ActiveSupport::TaggedLogging.new(Logger.new(Rails.root.join("log", "#{Rails.env}.log")))
+  config.logger.formatter = Logger::Formatter.new
+  config.logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+  # Once we get to Rails 4.0, we can replace the above with:
+  #config.log_formatter = Logger::Formatter.new.tap { |f| f.datetime_format = "%Y-%m-%d %H:%M:%S" }
 
   # Use a different cache store in production
   memcached_value_max_megabytes = ENV.fetch("MEMCACHED_VALUE_MAX_MEGABYTES", 1).to_i

config/environments/staging.rb

@@ -36,8 +36,12 @@ Openfoodnetwork::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Configure logging for Rails 3.2:
+  config.logger = ActiveSupport::TaggedLogging.new(Logger.new(Rails.root.join("log", "#{Rails.env}.log")))
+  config.logger.formatter = Logger::Formatter.new
+  config.logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+  # Once we get to Rails 4.0, we can replace the above with:
+  #config.log_formatter = Logger::Formatter.new.tap { |f| f.datetime_format = "%Y-%m-%d %H:%M:%S" }
 
   # Use a different cache store in production
   memcached_value_max_megabytes = ENV.fetch("MEMCACHED_VALUE_MAX_MEGABYTES", 1).to_i

config/locales/en.yml

@@ -1364,6 +1364,7 @@ en:
   saving_credit_card: Saving credit card...
   card_has_been_removed: "Your card has been removed (number: %{number})"
   card_could_not_be_removed: Sorry, the card could not be removed
+  invalid_credit_card: "Invalid credit card"
 
   ie_warning_headline: "Your browser is out of date :-("
   ie_warning_text: "For the best Open Food Network experience, we strongly recommend upgrading your browser:"
@@ -2557,11 +2558,11 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           description: Description
           resolve: Resolve
         exchange_products:
-          load_more_products: "Load More Products"
-          load_all_products: "Load All Products"
-          select_all_products: "Select All %{total_number_of_products} Products"
-          products_loaded: "%{num_of_products_loaded} of %{total_number_of_products} Products Loaded"
-          loading_products: "Loading Products"
+          load_more_variants: "Load More Variants"
+          load_all_variants: "Load All Variants"
+          select_all_variants: "Select All %{total_number_of_variants} Variants"
+          variants_loaded: "%{num_of_variants_loaded} of %{total_number_of_variants} Variants Loaded"
+          loading_variants: "Loading Variants"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"

config/locales/en_AU.yml

@@ -782,7 +782,14 @@ en_AU:
         producer_shop_description_text2: A Producer Shop is for your produce only, if you want to sell produce grown/produced off site, select 'Producer Hub'.
         producer_hub: Producer Hub
         producer_hub_text: Sell produce from self and others
-        producer_hub_description_text: Your enterprise is the backbone of your local food system. You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network.
+        producer_hub_description_text: 'You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network.
+
+
+          Free to use for shopfronts with turnover of less than $500 a month. 
+
+          1% of turnover for shopfronts with turnover of more than $500 a month.
+
+          2-3% of turnover for solidarity partners who choose to collaborate on growing a new food system.'
         profile: Profile Only
         get_listing: Get a listing
         profile_description_text: People can find and contact you on the Open Food Network. Your enterprise will be visible on the map, and will be searchable in listings.
@@ -1617,7 +1624,7 @@ en_AU:
   sell_groups_detail: "Set up a tailored directory of enterprises (producers and other food enterprises) for your region or for your organisation."
   sell_user_guide: "Find out more in our user guide."
   sell_listing_price: "Listing on the OFN is free. Opening and running a shop on OFN is free up to $500 of monthly sales. If you sell more you can choose your community contribution between 1% and 3% of sales. For more detail on pricing visit the Software Platform section via the About link in the top menu."
-  sell_embed: "We can also embed an OFN shop in your own customised website or build a customised local food network website for your region."
+  sell_embed: "In addition to the Open Food Network platform, our social enterprise consultancy offers a range of services that help power a better, fairer food system. We can help with customised business and online solutions for your farm or food enterprise, lean enterprise support, regional food system development as well as food systems research and consulting."
   sell_ask_services: "Ask us about OFN services."
   shops_title: Shops
   shops_headline: Shopping, transformed.

config/locales/en_GB.yml

@@ -2188,8 +2188,8 @@ en_GB:
   report_header_temp_controlled: TempControlled?
   report_header_is_producer: Producer?
   report_header_not_confirmed: Not Confirmed
-  report_header_gst_on_income: VAT on Income
-  report_header_gst_free_income: VAT Free Income
+  report_header_gst_on_income: 20%(VAT on Income)
+  report_header_gst_free_income: Zero Rated Income
   report_header_total_untaxable_produce: Total untaxable produce (no tax)
   report_header_total_taxable_produce: Total taxable produce (tax inclusive)
   report_header_total_untaxable_fees: Total untaxable fees (no tax)
@@ -2836,6 +2836,8 @@ en_GB:
     zipcode: Postcode
     weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
+    please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
     actions:
       update: "Update"

config/locales/en_NZ.yml

@@ -2830,6 +2830,8 @@ en_NZ:
     zipcode: Postcode
     weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
+    please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
     actions:
       update: "Update"

spec/controllers/api/products_controller_spec.rb

@@ -207,62 +207,62 @@ describe Api::ProductsController, type: :controller do
         expect(json_response['name']).to eq("COPY OF #{product_with_image.name}")
       end
     end
+  end
 
-    describe '#bulk_products' do
-      context "as an enterprise user" do
-        let!(:taxon) { create(:taxon) }
-        let!(:product2) { create(:product, supplier: supplier, primary_taxon: taxon) }
-        let!(:product3) { create(:product, supplier: supplier2, primary_taxon: taxon) }
-        let!(:product4) { create(:product, supplier: supplier2) }
-        let(:current_api_user) { supplier_enterprise_user(supplier) }
+  describe '#bulk_products' do
+    context "as an enterprise user" do
+      let!(:taxon) { create(:taxon) }
+      let!(:product2) { create(:product, supplier: supplier, primary_taxon: taxon) }
+      let!(:product3) { create(:product, supplier: supplier2, primary_taxon: taxon) }
+      let!(:product4) { create(:product, supplier: supplier2) }
+      let(:current_api_user) { supplier_enterprise_user(supplier) }
 
-        before { current_api_user.enterprise_roles.create(enterprise: supplier2) }
+      before { current_api_user.enterprise_roles.create(enterprise: supplier2) }
 
-        it "returns a list of products" do
-          api_get :bulk_products, { page: 1, per_page: 15 }, format: :json
-          expect(returned_product_ids).to eq [product4.id, product3.id, product2.id, inactive_product.id, product.id]
-        end
+      it "returns a list of products" do
+        api_get :bulk_products, { page: 1, per_page: 15 }, format: :json
+        expect(returned_product_ids).to eq [product4.id, product3.id, product2.id, inactive_product.id, product.id]
+      end
 
-        it "returns pagination data" do
-          api_get :bulk_products, { page: 1, per_page: 15 }, format: :json
-          expect(json_response['pagination']).to eq "results" => 5, "pages" => 1, "page" => 1, "per_page" => 15
-        end
+      it "returns pagination data" do
+        api_get :bulk_products, { page: 1, per_page: 15 }, format: :json
+        expect(json_response['pagination']).to eq "results" => 5, "pages" => 1, "page" => 1, "per_page" => 15
+      end
 
-        it "uses defaults when page and per_page are not supplied" do
-          api_get :bulk_products, format: :json
-          expect(json_response['pagination']).to eq "results" => 5, "pages" => 1, "page" => 1, "per_page" => 15
-        end
+      it "uses defaults when page and per_page are not supplied" do
+        api_get :bulk_products, format: :json
+        expect(json_response['pagination']).to eq "results" => 5, "pages" => 1, "page" => 1, "per_page" => 15
+      end
 
-        it "returns paginated products by page" do
-          api_get :bulk_products, { page: 1, per_page: 2 }, format: :json
-          expect(returned_product_ids).to eq [product4.id, product3.id]
+      it "returns paginated products by page" do
+        api_get :bulk_products, { page: 1, per_page: 2 }, format: :json
+        expect(returned_product_ids).to eq [product4.id, product3.id]
 
-          api_get :bulk_products, { page: 2, per_page: 2 }, format: :json
-          expect(returned_product_ids).to eq [product2.id, inactive_product.id]
-        end
+        api_get :bulk_products, { page: 2, per_page: 2 }, format: :json
+        expect(returned_product_ids).to eq [product2.id, inactive_product.id]
+      end
 
-        it "filters results by supplier" do
-          api_get :bulk_products, { page: 1, per_page: 15, q: { supplier_id_eq: supplier.id } }, format: :json
-          expect(returned_product_ids).to eq [product2.id, inactive_product.id, product.id]
-        end
+      it "filters results by supplier" do
+        api_get :bulk_products, { page: 1, per_page: 15, q: { supplier_id_eq: supplier.id } }, format: :json
+        expect(returned_product_ids).to eq [product2.id, inactive_product.id, product.id]
+      end
 
-        it "filters results by product category" do
-          api_get :bulk_products, { page: 1, per_page: 15, q: { primary_taxon_id_eq: taxon.id } }, format: :json
-          expect(returned_product_ids).to eq [product3.id, product2.id]
-        end
+      it "filters results by product category" do
+        api_get :bulk_products, { page: 1, per_page: 15, q: { primary_taxon_id_eq: taxon.id } }, format: :json
+        expect(returned_product_ids).to eq [product3.id, product2.id]
+      end
 
-        it "filters results by import_date" do
-          product.variants.first.import_date = 1.day.ago
-          product2.variants.first.import_date = 2.days.ago
-          product3.variants.first.import_date = 1.day.ago
+      it "filters results by import_date" do
+        product.variants.first.import_date = 1.day.ago
+        product2.variants.first.import_date = 2.days.ago
+        product3.variants.first.import_date = 1.day.ago
 
-          product.save
-          product2.save
-          product3.save
+        product.save
+        product2.save
+        product3.save
 
-          api_get :bulk_products, { page: 1, per_page: 15, import_date: 1.day.ago.to_date.to_s }, format: :json
-          expect(returned_product_ids).to eq [product3.id, product.id]
-        end
+        api_get :bulk_products, { page: 1, per_page: 15, import_date: 1.day.ago.to_date.to_s }, format: :json
+        expect(returned_product_ids).to eq [product3.id, product.id]
       end
     end
   end

spec/controllers/checkout_controller_concurrency_spec.rb

@@ -30,8 +30,11 @@ describe CheckoutController, concurrency: true, type: :controller do
     # New threads start running straight away. The breakpoint is after loading
     # the order and before advancing the order's state and making payments.
     breakpoint.lock
-    allow(controller).to receive(:check_order_for_phantom_fees) do
+    expect(controller).to receive(:fire_event).with("spree.checkout.update") do
       breakpoint.synchronize {}
+      # This is what fire_event does.
+      # I did not find out how to call the original code otherwise.
+      ActiveSupport::Notifications.instrument("spree.checkout.update")
     end
   end
 

spec/controllers/spree/checkout_controller_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-require 'support/request/authentication_workflow'
-
-describe Spree::CheckoutController, type: :controller do
-  context 'rendering edit from within spree for the current checkout state' do
-    let(:order) { controller.current_order(true) }
-    let(:user) { create(:user) }
-
-    before do
-      create(:line_item, order: order)
-
-      allow(controller).to receive(:spree_current_user) { user }
-    end
-
-    it "redirects to the OFN checkout page" do
-      expect(spree_get(:edit)).to redirect_to checkout_path
-    end
-  end
-end

spec/features/admin/order_cycles_spec.rb

@@ -542,7 +542,7 @@ feature '
       page.find("tr.supplier-#{supplier_enterprise.id} td.products").click
       expect(page).to have_selector ".exchange-product-details"
 
-      expect(page).to have_content "1 of 2 Products Loaded"
+      expect(page).to have_content "1 of 2 Variants Loaded"
       expect(page).to_not have_content new_product.name
     end
 
@@ -562,7 +562,7 @@ feature '
 
     def expect_all_products_loaded
       expect(page).to have_content new_product.name.upcase
-      expect(page).to have_content "2 of 2 Products Loaded"
+      expect(page).to have_content "2 of 2 Variants Loaded"
     end
   end
 

spec/services/checkout/form_data_adapter_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Checkout::FormDataAdapter do
+  describe '#order_params' do
+    let(:params) { { order: { order_id: "123" } } }
+    let(:order) { create(:order) }
+    let(:user) { create(:user) }
+
+    let(:adapter) { Checkout::FormDataAdapter.new(params, order, user) }
+
+    it "returns the :order item in the params provided" do
+      order_params = adapter.order_params
+
+      expect(order_params).to eq params[:order]
+    end
+
+    describe "when payment_attributes are provided" do
+      before { params[:order][:payments_attributes] = [{ payment_method_id: "123" }] }
+
+      describe "and source attributes are provided" do
+        let(:source_attributes) { { payment_method_name: "Pay at the farm" } }
+
+        before { params[:payment_source] = { "123" => source_attributes } }
+
+        it "moves payment source attributes to the order payment attributes" do
+          order_params = adapter.order_params
+
+          expect(order_params[:payments_attributes].
+                   first[:source_attributes]).to eq source_attributes
+        end
+      end
+
+      describe "and order total is not zero" do
+        before { order.total = "50.0" }
+
+        it "sets the payment attributes amount to the order total" do
+          order_params = adapter.order_params
+
+          expect(order_params[:payments_attributes].first[:amount]).to eq order.total
+        end
+      end
+
+      describe "and existing credit card is provided" do
+        before { params[:order][:existing_card_id] = credit_card.id }
+
+        describe "and credit card is owned by current user" do
+          let(:credit_card) { create(:credit_card, user_id: user.id) }
+
+          before { params[:order][:existing_card_id] = credit_card.id }
+
+          it "adds card details to payment attributes" do
+            order_params = adapter.order_params
+
+            expect(order_params[:payments_attributes].first[:source][:id]).to eq credit_card.id
+            expect(order_params[:payments_attributes].
+                     first[:source][:last_digits]).to eq credit_card.last_digits
+          end
+        end
+
+        describe "and credit card is not owned by current user" do
+          let(:credit_card) { create(:credit_card) }
+
+          it "raises exception if credit card provided doesnt belong to the current user" do
+            expect { adapter.order_params }.to raise_error Spree::Core::GatewayError
+          end
+        end
+      end
+    end
+  end
+end

spec/services/checkout/payment_redirect_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Checkout::PaymentRedirect do
+  describe '#order_params' do
+    let(:params) { { order: { order_id: "123" } } }
+
+    let(:redirect) { Checkout::PaymentRedirect.new(params) }
+
+    it "returns nil if payment_attributes are not provided" do
+      expect(redirect.path).to be nil
+    end
+
+    describe "when payment_attributes are provided" do
+      it "raises an error if payment method does not exist" do
+        params[:order][:payments_attributes] = [{ payment_method_id: "123" }]
+
+        expect { redirect.path }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      describe "when payment method provided exists" do
+        before { params[:order][:payments_attributes] = [{ payment_method_id: payment_method.id }] }
+
+        describe "and the payment method is not a paypal payment method" do
+          let(:payment_method) { create(:payment_method) }
+
+          it "returns nil" do
+            expect(redirect.path).to be nil
+          end
+        end
+
+        describe "and the payment method is a paypal method" do
+          let(:distributor) { create(:distributor_enterprise) }
+          let(:payment_method) do
+            Spree::Gateway::PayPalExpress.create!(name: "PayPalExpress",
+                                                  distributor_ids: [distributor.id])
+          end
+
+          it "returns the redirect path" do
+            expect(redirect.path).to include payment_method.id.to_s
+          end
+        end
+      end
+    end
+  end
+end

spec/services/user_default_address_setter_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe UserDefaultAddressSetter do
+  let(:customer_address) { create(:address, address1: "customer road") }
+  let(:order_address) { create(:address, address1: "order road") }
+  let(:customer) do
+    create(:customer, bill_address: customer_address, ship_address: customer_address)
+  end
+  let(:order) do
+    create(:order, customer: customer, bill_address: order_address, ship_address: order_address)
+  end
+  let(:user) { create(:user) }
+
+  let(:setter) { UserDefaultAddressSetter.new(order, user) }
+
+  describe '#set_default_bill_address' do
+    it "sets the user and customer bill address to the order bill address" do
+      setter.set_default_bill_address
+
+      expect(user.bill_address).to eq order.bill_address
+      expect(order.customer.bill_address).to eq order.bill_address
+    end
+  end
+
+  describe '#set_default_ship_address' do
+    it "sets the user and customer ship address to the order ship address" do
+      setter.set_default_ship_address
+
+      expect(user.ship_address).to eq order.ship_address
+      expect(order.customer.ship_address).to eq order.ship_address
+    end
+  end
+end