From 0e711832fdff9f91ac2e70b9c1038d60cb1961e8 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:13:21 +0800
Subject: [PATCH 001/340] Bring Spree::StockItem code from spree_core into the
 app

---
 app/models/spree/stock_item.rb       | 52 +++++++++++++++++++
 spec/models/spree/stock_item_spec.rb | 74 ++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 app/models/spree/stock_item.rb
 create mode 100644 spec/models/spree/stock_item_spec.rb

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
new file mode 100644
index 0000000000..9dc322b447
--- /dev/null
+++ b/app/models/spree/stock_item.rb
@@ -0,0 +1,52 @@
+module Spree
+  class StockItem < ActiveRecord::Base
+    belongs_to :stock_location, class_name: 'Spree::StockLocation'
+    belongs_to :variant, class_name: 'Spree::Variant'
+    has_many :stock_movements, dependent: :destroy
+
+    validates_presence_of :stock_location, :variant
+    validates_uniqueness_of :variant_id, scope: :stock_location_id
+
+    attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
+
+    delegate :weight, to: :variant
+
+    def backordered_inventory_units
+      Spree::InventoryUnit.backordered_for_stock_item(self)
+    end
+
+    def variant_name
+      variant.name
+    end
+
+    def adjust_count_on_hand(value)
+      self.with_lock do
+        self.count_on_hand = self.count_on_hand + value
+        process_backorders if in_stock?
+
+        self.save!
+      end
+    end
+
+    def in_stock?
+      self.count_on_hand > 0
+    end
+
+    # Tells whether it's available to be included in a shipment
+    def available?
+      self.in_stock? || self.backorderable?
+    end
+
+    private
+      def count_on_hand=(value)
+        write_attribute(:count_on_hand, value)
+      end
+
+      def process_backorders
+        backordered_inventory_units.each do |unit|
+          return unless in_stock?
+          unit.fill_backorder
+        end
+      end
+  end
+end
diff --git a/spec/models/spree/stock_item_spec.rb b/spec/models/spree/stock_item_spec.rb
new file mode 100644
index 0000000000..da10d44efa
--- /dev/null
+++ b/spec/models/spree/stock_item_spec.rb
@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Spree::StockItem do
+  let(:stock_location) { create(:stock_location_with_items) }
+
+  subject { stock_location.stock_items.order(:id).first }
+
+  it 'maintains the count on hand for a variant' do
+    subject.count_on_hand.should eq 10
+  end
+
+  it "can return the stock item's variant's name" do
+    subject.variant_name.should == subject.variant.name
+  end
+
+  context "available to be included in shipment" do
+    context "has stock" do
+      it { subject.should be_available }
+    end
+
+    context "backorderable" do
+      before { subject.backorderable = true }
+      it { subject.should be_available }
+    end
+
+    context "no stock and not backorderable" do
+      before do
+        subject.backorderable = false
+        subject.stub(count_on_hand: 0)
+      end
+
+      it { subject.should_not be_available }
+    end
+  end
+
+  context "adjust count_on_hand" do
+    let!(:current_on_hand) { subject.count_on_hand }
+
+    it 'is updated pessimistically' do
+      copy = Spree::StockItem.find(subject.id)
+
+      subject.adjust_count_on_hand(5)
+      subject.count_on_hand.should eq(current_on_hand + 5)
+
+      copy.count_on_hand.should eq(current_on_hand)
+      copy.adjust_count_on_hand(5)
+      copy.count_on_hand.should eq(current_on_hand + 10)
+    end
+
+    context "item out of stock (by two items)" do
+      let(:inventory_unit) { double('InventoryUnit') }
+      let(:inventory_unit_2) { double('InventoryUnit2') }
+
+      before { subject.adjust_count_on_hand(- (current_on_hand + 2)) }
+
+      it "doesn't process backorders" do
+        subject.should_not_receive(:backordered_inventory_units)
+        subject.adjust_count_on_hand(1)
+      end
+
+      context "adds new items" do
+        before { subject.stub(:backordered_inventory_units => [inventory_unit, inventory_unit_2]) }
+
+        it "fills existing backorders" do
+          inventory_unit.should_receive(:fill_backorder)
+          inventory_unit_2.should_receive(:fill_backorder)
+
+          subject.adjust_count_on_hand(3)
+          subject.count_on_hand.should == 1
+        end
+      end
+    end
+  end
+end

From 84d973d383d816b2760a4c0c4bf926875a341cae Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:19:24 +0800
Subject: [PATCH 002/340] Specify RSpec.describe in StockItem spec file

---
 spec/models/spree/stock_item_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/spree/stock_item_spec.rb b/spec/models/spree/stock_item_spec.rb
index da10d44efa..2e6b757a71 100644
--- a/spec/models/spree/stock_item_spec.rb
+++ b/spec/models/spree/stock_item_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::StockItem do
+RSpec.describe Spree::StockItem do
   let(:stock_location) { create(:stock_location_with_items) }
 
   subject { stock_location.stock_items.order(:id).first }

From b78311870065f63246831d30dbf1ad91ea9c292d Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:40:13 +0800
Subject: [PATCH 003/340] Auto-correct violationso of Rubocop
 Style/RedundantSelf

---
 app/models/spree/stock_item.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 9dc322b447..70bb741e8d 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -20,21 +20,21 @@ module Spree
     end
 
     def adjust_count_on_hand(value)
-      self.with_lock do
-        self.count_on_hand = self.count_on_hand + value
+      with_lock do
+        self.count_on_hand = count_on_hand + value
         process_backorders if in_stock?
 
-        self.save!
+        save!
       end
     end
 
     def in_stock?
-      self.count_on_hand > 0
+      count_on_hand > 0
     end
 
     # Tells whether it's available to be included in a shipment
     def available?
-      self.in_stock? || self.backorderable?
+      in_stock? || backorderable?
     end
 
     private

From 0fd66f9a558caccfa639a864c636261bf17a0962 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:44:07 +0800
Subject: [PATCH 004/340] Auto-correct violationso of Rubocop Style/*

---
 app/models/spree/stock_item.rb       | 1 +
 spec/models/spree/stock_item_spec.rb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 70bb741e8d..d1c9faa983 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Spree
   class StockItem < ActiveRecord::Base
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
diff --git a/spec/models/spree/stock_item_spec.rb b/spec/models/spree/stock_item_spec.rb
index 2e6b757a71..f58a0bd09c 100644
--- a/spec/models/spree/stock_item_spec.rb
+++ b/spec/models/spree/stock_item_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Spree::StockItem do
@@ -59,7 +60,7 @@ RSpec.describe Spree::StockItem do
       end
 
       context "adds new items" do
-        before { subject.stub(:backordered_inventory_units => [inventory_unit, inventory_unit_2]) }
+        before { subject.stub(backordered_inventory_units: [inventory_unit, inventory_unit_2]) }
 
         it "fills existing backorders" do
           inventory_unit.should_receive(:fill_backorder)

From d1725014c4495481c83e9dd0b88febbd1b150e4e Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:44:23 +0800
Subject: [PATCH 005/340] Auto-correct violationso of Rubocop Layout/*

---
 app/models/spree/stock_item.rb       | 19 +++++++++++--------
 spec/models/spree/stock_item_spec.rb |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index d1c9faa983..29ec2401fa 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Spree
   class StockItem < ActiveRecord::Base
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
@@ -39,15 +40,17 @@ module Spree
     end
 
     private
-      def count_on_hand=(value)
-        write_attribute(:count_on_hand, value)
-      end
 
-      def process_backorders
-        backordered_inventory_units.each do |unit|
-          return unless in_stock?
-          unit.fill_backorder
-        end
+    def count_on_hand=(value)
+      write_attribute(:count_on_hand, value)
+    end
+
+    def process_backorders
+      backordered_inventory_units.each do |unit|
+        return unless in_stock?
+
+        unit.fill_backorder
       end
+    end
   end
 end
diff --git a/spec/models/spree/stock_item_spec.rb b/spec/models/spree/stock_item_spec.rb
index f58a0bd09c..c59416371d 100644
--- a/spec/models/spree/stock_item_spec.rb
+++ b/spec/models/spree/stock_item_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Spree::StockItem do

From 22c0693bebdf65346f11ab914db87b35a1166fe5 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:45:52 +0800
Subject: [PATCH 006/340] Address violation of Rubocop Style/NumericPredicate

---
 app/models/spree/stock_item.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 29ec2401fa..5c9f390567 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -31,7 +31,7 @@ module Spree
     end
 
     def in_stock?
-      count_on_hand > 0
+      count_on_hand.positive?
     end
 
     # Tells whether it's available to be included in a shipment

From 1e8543dfe7a9a1c420fc0011a1012a064d8daf97 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:50:57 +0800
Subject: [PATCH 007/340] Address violation of Rubocop Rails/ReadWriteAttribute

---
 app/models/spree/stock_item.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 5c9f390567..47bbf14fbd 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -42,7 +42,7 @@ module Spree
     private
 
     def count_on_hand=(value)
-      write_attribute(:count_on_hand, value)
+      self[:count_on_hand] = value
     end
 
     def process_backorders

From 2acf61fd0f08ab8424c3d8422c469d82cc1dc226 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:54:50 +0800
Subject: [PATCH 008/340] Address violation of Rubocop Rails/Delegate

---
 app/models/spree/stock_item.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 47bbf14fbd..44aa72f422 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -17,9 +17,7 @@ module Spree
       Spree::InventoryUnit.backordered_for_stock_item(self)
     end
 
-    def variant_name
-      variant.name
-    end
+    delegate :name, to: :variant, prefix: true
 
     def adjust_count_on_hand(value)
       with_lock do

From bc530b92b540bf2639872f8832633230c35e85eb Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 04:55:42 +0800
Subject: [PATCH 009/340] Address violation of Rubocop Rails/Validation:

---
 app/models/spree/stock_item.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 44aa72f422..47c311b205 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -6,8 +6,8 @@ module Spree
     belongs_to :variant, class_name: 'Spree::Variant'
     has_many :stock_movements, dependent: :destroy
 
-    validates_presence_of :stock_location, :variant
-    validates_uniqueness_of :variant_id, scope: :stock_location_id
+    validates :stock_location, :variant, presence: true
+    validates :variant_id, uniqueness: { scope: :stock_location_id }
 
     attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
 

From 0a1cb71ee4f8b64c52ade2a98d73563e2f524460 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 05:00:52 +0800
Subject: [PATCH 010/340] Ignore Rails/UniqueValidationWithoutIndex for unique
 index of StockItem#stock_location

---
 app/models/spree/stock_item.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 47c311b205..9eca73d0c8 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -7,7 +7,9 @@ module Spree
     has_many :stock_movements, dependent: :destroy
 
     validates :stock_location, :variant, presence: true
+    # rubocop:disable Rails/UniqueValidationWithoutIndex
     validates :variant_id, uniqueness: { scope: :stock_location_id }
+    # rubocop:enable Rails/UniqueValidationWithoutIndex
 
     attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
 

From fb20f220c04f83f938fee31f7023d9c8e01b88e7 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 05:16:58 +0800
Subject: [PATCH 011/340] Use break instead of return in
 StockItem#process_backorders

We are not using the return value of this method anywhere.
---
 app/models/spree/stock_item.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index 9eca73d0c8..b3e14969eb 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -47,7 +47,7 @@ module Spree
 
     def process_backorders
       backordered_inventory_units.each do |unit|
-        return unless in_stock?
+        break unless in_stock?
 
         unit.fill_backorder
       end

From 13ecf0ec73ba49782fe1a92e1c186196c14598fb Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 15:20:20 +0800
Subject: [PATCH 012/340] Update specs for StockItem with transpec

---
 spec/models/spree/stock_item_spec.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/models/spree/stock_item_spec.rb b/spec/models/spree/stock_item_spec.rb
index c59416371d..ce5c7fafd0 100644
--- a/spec/models/spree/stock_item_spec.rb
+++ b/spec/models/spree/stock_item_spec.rb
@@ -8,30 +8,30 @@ RSpec.describe Spree::StockItem do
   subject { stock_location.stock_items.order(:id).first }
 
   it 'maintains the count on hand for a variant' do
-    subject.count_on_hand.should eq 10
+    expect(subject.count_on_hand).to eq 10
   end
 
   it "can return the stock item's variant's name" do
-    subject.variant_name.should == subject.variant.name
+    expect(subject.variant_name).to eq(subject.variant.name)
   end
 
   context "available to be included in shipment" do
     context "has stock" do
-      it { subject.should be_available }
+      it { expect(subject).to be_available }
     end
 
     context "backorderable" do
       before { subject.backorderable = true }
-      it { subject.should be_available }
+      it { expect(subject).to be_available }
     end
 
     context "no stock and not backorderable" do
       before do
         subject.backorderable = false
-        subject.stub(count_on_hand: 0)
+        allow(subject).to receive_messages(count_on_hand: 0)
       end
 
-      it { subject.should_not be_available }
+      it { expect(subject).not_to be_available }
     end
   end
 
@@ -42,11 +42,11 @@ RSpec.describe Spree::StockItem do
       copy = Spree::StockItem.find(subject.id)
 
       subject.adjust_count_on_hand(5)
-      subject.count_on_hand.should eq(current_on_hand + 5)
+      expect(subject.count_on_hand).to eq(current_on_hand + 5)
 
-      copy.count_on_hand.should eq(current_on_hand)
+      expect(copy.count_on_hand).to eq(current_on_hand)
       copy.adjust_count_on_hand(5)
-      copy.count_on_hand.should eq(current_on_hand + 10)
+      expect(copy.count_on_hand).to eq(current_on_hand + 10)
     end
 
     context "item out of stock (by two items)" do
@@ -56,19 +56,19 @@ RSpec.describe Spree::StockItem do
       before { subject.adjust_count_on_hand(- (current_on_hand + 2)) }
 
       it "doesn't process backorders" do
-        subject.should_not_receive(:backordered_inventory_units)
+        expect(subject).not_to receive(:backordered_inventory_units)
         subject.adjust_count_on_hand(1)
       end
 
       context "adds new items" do
-        before { subject.stub(backordered_inventory_units: [inventory_unit, inventory_unit_2]) }
+        before { allow(subject).to receive_messages(backordered_inventory_units: [inventory_unit, inventory_unit_2]) }
 
         it "fills existing backorders" do
-          inventory_unit.should_receive(:fill_backorder)
-          inventory_unit_2.should_receive(:fill_backorder)
+          expect(inventory_unit).to receive(:fill_backorder)
+          expect(inventory_unit_2).to receive(:fill_backorder)
 
           subject.adjust_count_on_hand(3)
-          subject.count_on_hand.should == 1
+          expect(subject.count_on_hand).to eq(1)
         end
       end
     end

From 774b3720d5853a408de6b890add2df54981bec71 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Thu, 14 May 2020 15:23:31 +0800
Subject: [PATCH 013/340] Update stock item count on hand in Spree core specs

---
 spec/models/spree/stock_item_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/spree/stock_item_spec.rb b/spec/models/spree/stock_item_spec.rb
index ce5c7fafd0..679af05f90 100644
--- a/spec/models/spree/stock_item_spec.rb
+++ b/spec/models/spree/stock_item_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Spree::StockItem do
   subject { stock_location.stock_items.order(:id).first }
 
   it 'maintains the count on hand for a variant' do
-    expect(subject.count_on_hand).to eq 10
+    expect(subject.count_on_hand).to eq 15
   end
 
   it "can return the stock item's variant's name" do

From e53913756c17f90d3405af8258c15c8a66fba028 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Tue, 12 May 2020 15:09:53 +0800
Subject: [PATCH 014/340] Add lock_version to Spree::StockItem

---
 db/migrate/20200512070717_add_lock_version_to_stock_items.rb | 5 +++++
 db/schema.rb                                                 | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 db/migrate/20200512070717_add_lock_version_to_stock_items.rb

diff --git a/db/migrate/20200512070717_add_lock_version_to_stock_items.rb b/db/migrate/20200512070717_add_lock_version_to_stock_items.rb
new file mode 100644
index 0000000000..416a43f62e
--- /dev/null
+++ b/db/migrate/20200512070717_add_lock_version_to_stock_items.rb
@@ -0,0 +1,5 @@
+class AddLockVersionToStockItems < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_items, :lock_version, :integer, default: 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d166fdfd3c..d153eec8ef 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -899,6 +899,7 @@ ActiveRecord::Schema.define(version: 20200623140437) do
     t.datetime "updated_at"
     t.boolean  "backorderable",     default: false
     t.datetime "deleted_at"
+    t.integer  "lock_version",      default: 0
   end
 
   add_index "spree_stock_items", ["stock_location_id", "variant_id"], name: "stock_item_by_loc_and_var_id", using: :btree

From 4694f1b21a67467738e83859aa2ed537b4850dac Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Tue, 12 May 2020 15:28:26 +0800
Subject: [PATCH 015/340] Require count on hand in non backorderable StockItem
 to be positive or zero

Fix setting of count on hand in line item specs
---
 app/models/spree/stock_item.rb       |  1 +
 spec/models/spree/line_item_spec.rb  |  4 ++--
 spec/models/spree/stock_item_spec.rb | 32 +++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index b3e14969eb..f71df2b942 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -10,6 +10,7 @@ module Spree
     # rubocop:disable Rails/UniqueValidationWithoutIndex
     validates :variant_id, uniqueness: { scope: :stock_location_id }
     # rubocop:enable Rails/UniqueValidationWithoutIndex
+    validates :count_on_hand, numericality: { greater_than_or_equal_to: 0, unless: :backorderable? }
 
     attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
 
diff --git a/spec/models/spree/line_item_spec.rb b/spec/models/spree/line_item_spec.rb
index ca4a5353d9..ff00240aaf 100644
--- a/spec/models/spree/line_item_spec.rb
+++ b/spec/models/spree/line_item_spec.rb
@@ -97,7 +97,7 @@ module Spree
       end
 
       it "caps at zero when stock is negative" do
-        v.update! on_hand: -2
+        v.__send__(:stock_item).update_column(:count_on_hand, -2)
         li.cap_quantity_at_stock!
         expect(li.reload.quantity).to eq 0
       end
@@ -123,7 +123,7 @@ module Spree
           before { vo.update(count_on_hand: -3) }
 
           it "caps at zero" do
-            v.update(on_hand: -2)
+            v.__send__(:stock_item).update_column(:count_on_hand, -2)
             li.cap_quantity_at_stock!
             expect(li.reload.quantity).to eq 0
           end
diff --git a/spec/models/spree/stock_item_spec.rb b/spec/models/spree/stock_item_spec.rb
index 679af05f90..9c9b233986 100644
--- a/spec/models/spree/stock_item_spec.rb
+++ b/spec/models/spree/stock_item_spec.rb
@@ -7,6 +7,33 @@ RSpec.describe Spree::StockItem do
 
   subject { stock_location.stock_items.order(:id).first }
 
+  describe "validation" do
+    let(:stock_item) { stock_location.stock_items.first }
+
+    it "requires count_on_hand to be positive if not backorderable" do
+      stock_item.backorderable = false
+
+      stock_item.__send__(:count_on_hand=, 1)
+      expect(stock_item.valid?).to eq(true)
+
+      stock_item.__send__(:count_on_hand=, 0)
+      expect(stock_item.valid?).to eq(true)
+
+      stock_item.__send__(:count_on_hand=, -1)
+      expect(stock_item.valid?).to eq(false)
+    end
+
+    it "allows count_on_hand to be negative if backorderable" do
+      stock_item.backorderable = true
+
+      stock_item.__send__(:count_on_hand=, 1)
+      expect(stock_item.valid?).to eq(true)
+
+      stock_item.__send__(:count_on_hand=, -1)
+      expect(stock_item.valid?).to eq(true)
+    end
+  end
+
   it 'maintains the count on hand for a variant' do
     expect(subject.count_on_hand).to eq 15
   end
@@ -53,7 +80,10 @@ RSpec.describe Spree::StockItem do
       let(:inventory_unit) { double('InventoryUnit') }
       let(:inventory_unit_2) { double('InventoryUnit2') }
 
-      before { subject.adjust_count_on_hand(- (current_on_hand + 2)) }
+      before do
+        allow(subject).to receive(:backorderable?).and_return(true)
+        subject.adjust_count_on_hand(- (current_on_hand + 2))
+      end
 
       it "doesn't process backorders" do
         expect(subject).not_to receive(:backordered_inventory_units)

From 20fd3c2642d2abdc262d6dff3d88c1c6c5be6e72 Mon Sep 17 00:00:00 2001
From: Kristina Lim <kristinalim.ph@gmail.com>
Date: Fri, 15 May 2020 01:56:34 +0800
Subject: [PATCH 016/340] Reset negative count on hand in existing non
 backorderable stock items

---
 ...korderable_count_on_hand_in_stock_items.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 db/migrate/20200514174526_reset_negative_nonbackorderable_count_on_hand_in_stock_items.rb

diff --git a/db/migrate/20200514174526_reset_negative_nonbackorderable_count_on_hand_in_stock_items.rb b/db/migrate/20200514174526_reset_negative_nonbackorderable_count_on_hand_in_stock_items.rb
new file mode 100644
index 0000000000..c57730c99a
--- /dev/null
+++ b/db/migrate/20200514174526_reset_negative_nonbackorderable_count_on_hand_in_stock_items.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ResetNegativeNonbackorderableCountOnHandInStockItems < ActiveRecord::Migration
+  module Spree
+    class StockItem < ActiveRecord::Base
+      self.table_name = "spree_stock_items"
+    end
+  end
+
+  def up
+    Spree::StockItem.where(backorderable: false)
+      .where("count_on_hand < 0")
+      .update_all(count_on_hand: 0)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

From e12e50aa84b5621bbb2e71ca06206fc4368402c0 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 22 Jun 2020 17:55:54 +0100
Subject: [PATCH 017/340] Move rubocop exception to rubocop todo

---
 .rubocop_todo.yml              | 7 +++++++
 app/models/spree/stock_item.rb | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 753aaee48e..a0c6a0b30c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -363,6 +363,13 @@ Rails/UniqueValidationWithoutIndex:
     - 'app/models/customer.rb'
     - 'app/models/exchange.rb'
 
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/UniqueValidationWithoutIndex:
+  Exclude:
+    - 'app/models/spree/stock_item.rb'
+
 # Offense count: 1
 # Configuration parameters: Environments.
 # Environments: development, test, production
diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index f71df2b942..cf86103453 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -7,9 +7,7 @@ module Spree
     has_many :stock_movements, dependent: :destroy
 
     validates :stock_location, :variant, presence: true
-    # rubocop:disable Rails/UniqueValidationWithoutIndex
     validates :variant_id, uniqueness: { scope: :stock_location_id }
-    # rubocop:enable Rails/UniqueValidationWithoutIndex
     validates :count_on_hand, numericality: { greater_than_or_equal_to: 0, unless: :backorderable? }
 
     attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id

From 34207fc20ffbd5a5463366e573daf4fd06d4ff3d Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 22 Jun 2020 18:19:05 +0100
Subject: [PATCH 018/340] Bring changes to stock_item from spree 2.1, the
 previous version was from spree 2.0.4

---
 app/models/spree/stock_item.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/models/spree/stock_item.rb b/app/models/spree/stock_item.rb
index cf86103453..e6df19b03a 100644
--- a/app/models/spree/stock_item.rb
+++ b/app/models/spree/stock_item.rb
@@ -2,24 +2,23 @@
 
 module Spree
   class StockItem < ActiveRecord::Base
+    acts_as_paranoid
+
     belongs_to :stock_location, class_name: 'Spree::StockLocation'
     belongs_to :variant, class_name: 'Spree::Variant'
     has_many :stock_movements, dependent: :destroy
 
     validates :stock_location, :variant, presence: true
-    validates :variant_id, uniqueness: { scope: :stock_location_id }
+    validates :variant_id, uniqueness: { scope: [:stock_location_id, :deleted_at] }
     validates :count_on_hand, numericality: { greater_than_or_equal_to: 0, unless: :backorderable? }
 
-    attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
-
     delegate :weight, to: :variant
+    delegate :name, to: :variant, prefix: true
 
     def backordered_inventory_units
       Spree::InventoryUnit.backordered_for_stock_item(self)
     end
 
-    delegate :name, to: :variant, prefix: true
-
     def adjust_count_on_hand(value)
       with_lock do
         self.count_on_hand = count_on_hand + value
@@ -38,6 +37,10 @@ module Spree
       in_stock? || backorderable?
     end
 
+    def variant
+      Spree::Variant.unscoped { super }
+    end
+
     private
 
     def count_on_hand=(value)

From ba50491c6d2e6699368aea68259fc99c3089597a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 22 Jun 2020 19:28:28 +0100
Subject: [PATCH 019/340] Restructure the spec a little

---
 .../checkout_controller_concurrency_spec.rb   | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/spec/controllers/checkout_controller_concurrency_spec.rb b/spec/controllers/checkout_controller_concurrency_spec.rb
index 51eefe98ae..266f9a4fbe 100644
--- a/spec/controllers/checkout_controller_concurrency_spec.rb
+++ b/spec/controllers/checkout_controller_concurrency_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # This is the first example of testing concurrency in the Open Food Network.
@@ -15,6 +17,20 @@ describe CheckoutController, concurrency: true, type: :controller do
   let(:payment_method) { create(:payment_method, distributors: [distributor]) }
   let(:breakpoint) { Mutex.new }
 
+  let(:address_params) { address.attributes.except("id") }
+  let(:order_params) {
+    {
+      "payments_attributes" => [
+        {
+          "payment_method_id" => payment_method.id,
+          "amount" => order.total
+        }
+      ],
+      "bill_address_attributes" => address_params,
+      "ship_address_attributes" => address_params,
+    }
+  }
+
   before do
     # Create a valid order ready for checkout:
     create(:shipping_method, distributors: [distributor])
@@ -26,7 +42,9 @@ describe CheckoutController, concurrency: true, type: :controller do
     allow(controller).to receive(:spree_current_user).and_return(order.user)
     allow(controller).to receive(:current_distributor).and_return(order.distributor)
     allow(controller).to receive(:current_order_cycle).and_return(order.order_cycle)
+  end
 
+  it "handles two concurrent orders successfully" 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
@@ -36,21 +54,6 @@ describe CheckoutController, concurrency: true, type: :controller do
       # I did not find out how to call the original code otherwise.
       ActiveSupport::Notifications.instrument("spree.checkout.update")
     end
-  end
-
-  it "waits for concurrent checkouts" do
-    # Basic data the user submits during checkout:
-    address_params = address.attributes.except("id")
-    order_params = {
-      "payments_attributes" => [
-        {
-          "payment_method_id" => payment_method.id,
-          "amount" => order.total
-        }
-      ],
-      "bill_address_attributes" => address_params,
-      "ship_address_attributes" => address_params,
-    }
 
     # Starting two checkout threads. The controller code will determine if
     # these two threads are synchronised correctly or run into a race condition.

From c40697cf615eb7850a1f8460bfc43d40d9201a11 Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Fri, 26 Jun 2020 15:45:58 +0100
Subject: [PATCH 020/340] If no enterprises have been geocoded yet make sure
 Open Street Map still displays correctly.

Before it would display a gray/blank div instead of map because the map latitude, longitude couldn't be calculated without geocoded enterprises. This adds a setting so the default coordinates can be set even if no geocoded enterprises present.
---
 .../directives/open_street_map.js.coffee      | 41 ++++++++++++++-----
 app/models/content_configuration.rb           |  2 +
 app/models/preference_sections/map_section.rb |  4 +-
 .../api/open_street_map_config_serializer.rb  | 12 +++++-
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
index 7dbdc73669..e9be4acb88 100644
--- a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
@@ -61,28 +61,47 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal,
 
     displayMap = ->
       setMapDimensions()
-      averageLatitude = averageAngle("latitude")
-      averageLongitude = averageAngle("longitude")
       zoomLevel = 6
       map = L.map('open-street-map')
       L.tileLayer.provider(openStreetMapProviderName, openStreetMapProviderOptions).addTo(map)
-      map.setView([averageLatitude, averageLongitude], zoomLevel)
+      map.setView([initialLatitude(), initialLongitude()], zoomLevel)
 
     displayEnterprises = ->
-      for enterprise in Enterprises.enterprises
-        if enterprise.latitude? && enterprise.longitude?
-          marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
-          enterpriseNames.push(enterpriseName(enterprise))
-          markers.push(marker)
+      for enterprise in geocodedEnterprises()
+        marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
+        enterpriseNames.push(enterpriseName(enterprise))
+        markers.push(marker)
+
+    disableSearchField = () =>
+      $('#open-street-map--search input').prop("disabled", true)
 
     displaySearchField = () ->
       new Autocomplete('#open-street-map--search',
         onSubmit: goToEnterprise
         search: searchEnterprises
       )
-      overwriteInlinePositionRelativeToPositionSearchField = ->
-        $('#open-street-map--search').css("position", "absolute")
-      overwriteInlinePositionRelativeToPositionSearchField()
+      overwriteInlinePositionRelativeToAbsoluteOnSearchField()
+      if geocodedEnterprises().length == 0
+        disableSearchField()
+
+    geocodedEnterprises = () ->
+      Enterprises.enterprises.filter (enterprise) ->
+        enterprise.latitude? && enterprise.longitude?
+
+    initialLatitude = () ->
+      if geocodedEnterprises().length > 0
+        averageAngle("latitude")
+      else
+        openStreetMapConfig.open_street_map_default_latitude || -37.4713077
+
+    initialLongitude = () ->
+      if geocodedEnterprises().length > 0
+        averageAngle("longitude")
+      else
+        openStreetMapConfig.open_street_map_default_longitude || 144.7851531
+
+    overwriteInlinePositionRelativeToAbsoluteOnSearchField = ->
+      $('#open-street-map--search').css("position", "absolute")
 
     searchEnterprises = (input) ->
       if input.length < 1
diff --git a/app/models/content_configuration.rb b/app/models/content_configuration.rb
index 29ab8f3308..245140f712 100644
--- a/app/models/content_configuration.rb
+++ b/app/models/content_configuration.rb
@@ -21,6 +21,8 @@ class ContentConfiguration < Spree::Preferences::FileConfiguration
   preference :open_street_map_enabled, :boolean, default: false
   preference :open_street_map_provider_name, :string, default: "OpenStreetMap.Mapnik"
   preference :open_street_map_provider_options, :text, default: "{}"
+  preference :open_street_map_default_latitude, :string, default: "-37.4713077"
+  preference :open_street_map_default_longitude, :string, default: "144.7851531"
 
   # Producer sign-up page
   # All the following defaults using I18n don't work.
diff --git a/app/models/preference_sections/map_section.rb b/app/models/preference_sections/map_section.rb
index cc16939c36..deed329b44 100644
--- a/app/models/preference_sections/map_section.rb
+++ b/app/models/preference_sections/map_section.rb
@@ -10,7 +10,9 @@ module PreferenceSections
       [
         :open_street_map_enabled,
         :open_street_map_provider_name,
-        :open_street_map_provider_options
+        :open_street_map_provider_options,
+        :open_street_map_default_latitude,
+        :open_street_map_default_longitude
       ]
     end
   end
diff --git a/app/serializers/api/open_street_map_config_serializer.rb b/app/serializers/api/open_street_map_config_serializer.rb
index 8c5aec5dbb..b24cdcbd41 100644
--- a/app/serializers/api/open_street_map_config_serializer.rb
+++ b/app/serializers/api/open_street_map_config_serializer.rb
@@ -4,7 +4,9 @@ module Api
   class OpenStreetMapConfigSerializer < ActiveModel::Serializer
     attributes :open_street_map_enabled,
                :open_street_map_provider_name,
-               :open_street_map_provider_options
+               :open_street_map_provider_options,
+               :open_street_map_default_latitude,
+               :open_street_map_default_longitude
 
     def open_street_map_enabled
       ContentConfig.open_street_map_enabled
@@ -17,5 +19,13 @@ module Api
     def open_street_map_provider_options
       ContentConfig.open_street_map_provider_options.to_json
     end
+
+    def open_street_map_default_latitude
+      ContentConfig.open_street_map_default_latitude
+    end
+
+    def open_street_map_default_longitude
+      ContentConfig.open_street_map_default_longitude
+    end
   end
 end

From 1199a356c4fe734b924efa06db9d14d1ad25d376 Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Fri, 26 Jun 2020 22:26:39 +0100
Subject: [PATCH 021/340] Extract out a JS service for calculating where to
 centre the map when given a set of coordinates.

Also removing the hardcoded default latitude/longitude from open_street_map directive because it's probably not very likely that it will be needed.
---
 .../directives/open_street_map.js.coffee      | 38 ++--------
 .../services/map_centre_calculator.js.coffee  | 29 ++++++++
 .../map_centre_calculator_spec.js.coffee      | 70 +++++++++++++++++++
 3 files changed, 104 insertions(+), 33 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
 create mode 100644 spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee

diff --git a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
index e9be4acb88..832878cd50 100644
--- a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal, availableCountries, openStreetMapConfig) ->
+Darkswarm.directive 'ofnOpenStreetMap', ($window, MapCentreCalculator, Enterprises, EnterpriseModal, availableCountries, openStreetMapConfig) ->
   restrict: 'E'
   replace: true
   scope: true
@@ -11,34 +11,6 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal,
     openStreetMapProviderName = openStreetMapConfig.open_street_map_provider_name
     openStreetMapProviderOptions = JSON.parse(openStreetMapConfig.open_street_map_provider_options)
 
-    average = (values) ->
-      total = values.reduce (sum, value) ->
-        sum = sum + value
-      , 0
-      total / values.length
-
-    averageAngle = (angleName) ->
-      positiveAngles = []
-      negativeAngles = []
-      for enterprise in Enterprises.enterprises
-        if enterprise.latitude? && enterprise.longitude?
-          if enterprise[angleName] > 0
-            positiveAngles.push(enterprise[angleName])
-          else
-            negativeAngles.push(enterprise[angleName])
-
-      averageNegativeAngle = average(negativeAngles)
-      averagePositiveAngle = average(positiveAngles)
-
-      if negativeAngles.length == 0
-        averagePositiveAngle
-      else if positiveAngles.length == 0
-        averageNegativeAngle
-      else if averagePositiveAngle > averageNegativeAngle
-        averagePositiveAngle - averageNegativeAngle
-      else
-        averageNegativeAngle - averagePositiveAngle
-
     buildMarker = (enterprise, latlng, title) ->
       icon = L.icon
         iconUrl: enterprise.icon
@@ -90,15 +62,15 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal,
 
     initialLatitude = () ->
       if geocodedEnterprises().length > 0
-        averageAngle("latitude")
+        MapCentreCalculator.calculate_latitude(geocodedEnterprises())
       else
-        openStreetMapConfig.open_street_map_default_latitude || -37.4713077
+        openStreetMapConfig.open_street_map_default_latitude
 
     initialLongitude = () ->
       if geocodedEnterprises().length > 0
-        averageAngle("longitude")
+        MapCentreCalculator.calculate_longitude(geocodedEnterprises())
       else
-        openStreetMapConfig.open_street_map_default_longitude || 144.7851531
+        openStreetMapConfig.open_street_map_default_longitude
 
     overwriteInlinePositionRelativeToAbsoluteOnSearchField = ->
       $('#open-street-map--search').css("position", "absolute")
diff --git a/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
new file mode 100644
index 0000000000..f1023ce2d6
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
@@ -0,0 +1,29 @@
+Darkswarm.factory 'MapCentreCalculator', ->
+  new class MapCentreCalculator
+    calculate_latitude: (coordinates) =>
+      @_calculate("latitude", coordinates)
+
+    calculate_longitude: (coordinates) =>
+      @_calculate("longitude", coordinates)
+
+    _calculate: (angleName, coordinates) =>
+      positiveAngles = []
+      negativeAngles = []
+      angles = []
+
+      for coordinate in coordinates
+        angles.push(coordinate[angleName])
+        if coordinate[angleName] > 0
+          positiveAngles.push(coordinate[angleName])
+        else
+          negativeAngles.push(coordinate[angleName])
+
+      minimumAngle = Math.min.apply(null, angles)
+      maximumAngle = Math.max.apply(null, angles)
+
+      distanceBetweenMinimumAndMaximum = if maximumAngle > minimumAngle
+        maximumAngle - minimumAngle
+      else
+        minimumAngle - maximumAngle
+
+      minimumAngle + (distanceBetweenMinimumAndMaximum / 2)
diff --git a/spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee
new file mode 100644
index 0000000000..00e747a0a8
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee
@@ -0,0 +1,70 @@
+describe 'MapCentreCalculator service', ->
+  MapCentreCalculator = null
+  defaultLongitude = null
+  defaultLatitude = null
+
+  beforeEach ->
+    module 'Darkswarm'
+    defaultLongitude = -6
+    defaultLatitude = 53
+
+    inject (_MapCentreCalculator_)->
+      MapCentreCalculator = _MapCentreCalculator_
+
+  describe "calculate_latitude", ->
+    it "calculates the center latitude", ->
+      coordinates = [
+        { latitude: 53, longitude: defaultLongitude },
+        { latitude: 54, longitude: defaultLongitude }
+      ]
+
+      expect(MapCentreCalculator.calculate_latitude(coordinates)).toEqual 53.5
+
+  describe "calculate_longitude", ->
+    it "calculates the center longitude", ->
+      coordinates = [
+        { latitude: defaultLatitude, longitude: -6 },
+        { latitude: defaultLatitude, longitude: -7 }
+      ]
+
+      expect(MapCentreCalculator.calculate_longitude(coordinates)).toEqual -6.5
+
+  describe "_calculate", ->
+    it "calculates the average angle correctly when given a single angle", ->
+      coordinates = [
+        { latitude: defaultLatitude, longitude: -7 }
+      ]
+
+      expect(MapCentreCalculator._calculate("longitude", coordinates)).toEqual -7
+
+    it "calculates the centre correctly when given a set of positive angles", ->
+      coordinates = [
+        { latitude: 53, longitude: defaultLongitude },
+        { latitude: 54, longitude: defaultLongitude }
+      ]
+
+      expect(MapCentreCalculator._calculate("latitude", coordinates)).toEqual 53.5
+
+    it "calculates the centre correctly when given a set of negative angles", ->
+      coordinates = [
+        { latitude: defaultLatitude, longitude: -6 },
+        { latitude: defaultLatitude, longitude: -7 }
+      ]
+
+      expect(MapCentreCalculator._calculate("longitude", coordinates)).toEqual -6.5
+
+    it "calculates the centre correctly when given a mixture of positive and negative angles and the centre is positive", ->
+      coordinates = [
+        { latitude: defaultLatitude, longitude: 7 },
+        { latitude: defaultLatitude, longitude: -4 }
+      ]
+
+      expect(MapCentreCalculator._calculate("longitude", coordinates)).toEqual 1.5
+
+    it "calculates the centre correctly when given a mixture of positive and negative angles and the centre is negative", ->
+      coordinates = [
+        { latitude: defaultLatitude, longitude: 4 },
+        { latitude: defaultLatitude, longitude: -7 }
+      ]
+
+      expect(MapCentreCalculator._calculate("longitude", coordinates)).toEqual -1.5

From 26c511d47ed59790168c77e089da367308139889 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 1 Jul 2020 11:22:15 +0200
Subject: [PATCH 022/340] Remove taxon icons

These icons are inconsistently used across instances and have already been removed in a few places in the app in the mobile UX redesign.
---
 app/models/spree/taxon_decorator.rb           |  3 ---
 app/serializers/api/taxon_image_serializer.rb | 11 -----------
 app/serializers/api/taxon_serializer.rb       |  6 +-----
 app/views/producers/_fat.html.haml            |  1 -
 app/views/shop/products/_summary.html.haml    |  1 -
 app/views/shops/_fat.html.haml                |  1 -
 app/views/spree/admin/taxons/_form.html.haml  |  5 -----
 7 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 app/serializers/api/taxon_image_serializer.rb

diff --git a/app/models/spree/taxon_decorator.rb b/app/models/spree/taxon_decorator.rb
index ad2a85cfdb..f2c6f1e20a 100644
--- a/app/models/spree/taxon_decorator.rb
+++ b/app/models/spree/taxon_decorator.rb
@@ -1,9 +1,6 @@
 Spree::Taxon.class_eval do
   has_many :classifications, dependent: :destroy
 
-  attachment_definitions[:icon][:path] = 'public/images/spree/taxons/:id/:style/:basename.:extension'
-  attachment_definitions[:icon][:url] = '/images/spree/taxons/:id/:style/:basename.:extension'
-
   # Indicate which filters should be used for this taxon
   def applicable_filters
     fs = []
diff --git a/app/serializers/api/taxon_image_serializer.rb b/app/serializers/api/taxon_image_serializer.rb
deleted file mode 100644
index bc920637cd..0000000000
--- a/app/serializers/api/taxon_image_serializer.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Api::TaxonImageSerializer < ActiveModel::Serializer
-  attributes :id, :alt, :small_url, :large_url
-
-  def small_url
-    object.attachment.url(:small, false)
-  end
-
-  def large_url
-    object.attachment.url(:large, false)
-  end
-end
diff --git a/app/serializers/api/taxon_serializer.rb b/app/serializers/api/taxon_serializer.rb
index 775c069a41..43d3ddefd9 100644
--- a/app/serializers/api/taxon_serializer.rb
+++ b/app/serializers/api/taxon_serializer.rb
@@ -2,9 +2,5 @@ class Api::TaxonSerializer < ActiveModel::Serializer
   cached
   delegate :cache_key, to: :object
 
-  attributes :id, :name, :permalink, :icon, :pretty_name, :position, :parent_id, :taxonomy_id
-
-  def icon
-    object.icon(:original)
-  end
+  attributes :id, :name, :permalink, :pretty_name, :position, :parent_id, :taxonomy_id
 end
diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml
index 9b4e3b68b6..35156e3c51 100644
--- a/app/views/producers/_fat.html.haml
+++ b/app/views/producers/_fat.html.haml
@@ -22,7 +22,6 @@
       %p.trans-sentence
         %div
           %span.fat-taxons{"ng-repeat" => "taxon in producer.supplied_taxons"}
-            %render-svg{path: "{{taxon.icon}}"}
             %span{"ng-bind" => "::taxon.name"}
         %div
           %span.fat-properties{"ng-repeat" => "property in producer.supplied_properties"}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index 628ae5a161..3c12a68db8 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -18,4 +18,3 @@
           %span{"ng-bind" => "::enterprise.name"}
   .small-2.medium-2.large-1.columns.text-center
     .taxon-flag
-      %render-svg{path: "{{::product.primary_taxon.icon}}"}
diff --git a/app/views/shops/_fat.html.haml b/app/views/shops/_fat.html.haml
index 56772bde40..cd5d9c6f45 100644
--- a/app/views/shops/_fat.html.haml
+++ b/app/views/shops/_fat.html.haml
@@ -10,7 +10,6 @@
       .trans-sentence
         %div
           %span.fat-taxons{"ng-repeat" => "taxon in hub.taxons"}
-            %render-svg{path: "{{taxon.icon}}"}
             %span{"ng-bind" => "::taxon.name"}
         %div
           %span.fat-properties{"ng-repeat" => "property in hub.distributed_properties"}
diff --git a/app/views/spree/admin/taxons/_form.html.haml b/app/views/spree/admin/taxons/_form.html.haml
index 72ba498a4d..a23a55be0f 100644
--- a/app/views/spree/admin/taxons/_form.html.haml
+++ b/app/views/spree/admin/taxons/_form.html.haml
@@ -12,11 +12,6 @@
       %br/
       = @taxon.permalink.split("/")[0...-1].join("/") + "/"
       = text_field_tag :permalink_part, @permalink_part
-    = f.field_container :icon do
-      = f.label :icon, t(:icon)
-      %br/
-      = f.file_field :icon
-      %img{src: @taxon.icon(:original)}
     = f.field_container :meta_title do
       = f.label :meta_title, t(:meta_title)
       %br/

From eda929361984c5d07030594aed6caa6a3a65560e Mon Sep 17 00:00:00 2001
From: Steve Roberts <steve@commoncode.io>
Date: Wed, 8 Jul 2020 19:19:46 +1000
Subject: [PATCH 023/340] Change to new directive that prevents enter default
 and blurs the input field

---
 .../directives/disable_enter_with_blur.js.coffee         | 9 +++++++++
 app/views/shop/products/_searchbar.haml                  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee

diff --git a/app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee b/app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee
new file mode 100644
index 0000000000..1704d4c0f9
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee
@@ -0,0 +1,9 @@
+Darkswarm.directive "disableEnterWithBlur", ()->
+  # Stops enter from doing normal enter things, and blurs the input
+  restrict: 'A'
+  link: (scope, element, attrs)->
+    element.bind "keydown keypress", (e)->
+      code = e.keyCode || e.which
+      if code == 13
+        element.blur()
+        e.preventDefault()
diff --git a/app/views/shop/products/_searchbar.haml b/app/views/shop/products/_searchbar.haml
index f18d9b9382..bda087f4c7 100644
--- a/app/views/shop/products/_searchbar.haml
+++ b/app/views/shop/products/_searchbar.haml
@@ -6,7 +6,7 @@
               type: 'search',
               placeholder: t(:products_search),
               "ng-debounce" => "200",
-              "ofn-disable-enter" => true}
+              "disable-enter-with-blur" => true}
         %a.clear{type: 'button', ng: {show: 'query', click: 'clearQuery()'}, 'focus-search' => true}
           = image_tag "icn-close.png"
 

From 2f562809c090ac09394e49b3648151c6ca0e9abb Mon Sep 17 00:00:00 2001
From: Steve Roberts <steve@commoncode.io>
Date: Wed, 8 Jul 2020 21:31:52 +1000
Subject: [PATCH 024/340] Ensure the hero image doesn't attempt to use the full
 height of all page content

Not sure exactly why this happens, but when the mobile nav is opened the hero image at #tagline:before uses the height of the full window - often around 4000px. Adding max-height of 100% to the nearest safe parent prevents this behaviour.
---
 app/assets/stylesheets/darkswarm/layout/offcanvas.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/darkswarm/layout/offcanvas.scss b/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
index de54f0ef54..f6fe7a0455 100644
--- a/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
+++ b/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
@@ -15,3 +15,6 @@
   transform: none;
   margin-left: -15.625rem;
 }
+.off-canvas-wrap .inner-wrap {
+  max-height:100%;
+}
\ No newline at end of file

From 5648b2e281f5bfb753855072ce7c83f0bce95674 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 8 Jul 2020 18:32:40 +0100
Subject: [PATCH 025/340] Add rescue statements to subs jobs so that when an
 order placement or confirmation fails, there's a bugsnag alert for it and the
 job continues processing the rest of the orders

---
 app/jobs/subscription_confirm_job.rb                |  2 ++
 app/jobs/subscription_placement_job.rb              | 13 ++++++++++---
 .../order_management/subscriptions/summarizer.rb    |  7 +++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb
index 9ed8223d0e..8735bf41ca 100644
--- a/app/jobs/subscription_confirm_job.rb
+++ b/app/jobs/subscription_confirm_job.rb
@@ -50,6 +50,8 @@ class SubscriptionConfirmJob
     else
       send_failed_payment_email(order)
     end
+  rescue StandardError => e
+    Bugsnag.notify(e, order: order)
   end
 
   def process_payment!(order)
diff --git a/app/jobs/subscription_placement_job.rb b/app/jobs/subscription_placement_job.rb
index 8b5df2b159..9d68dae2ea 100644
--- a/app/jobs/subscription_placement_job.rb
+++ b/app/jobs/subscription_placement_job.rb
@@ -29,10 +29,16 @@ class SubscriptionPlacementJob
 
   def place_order_for(proxy_order)
     JobLogger.logger.info("Placing Order for Proxy Order #{proxy_order.id}")
-    proxy_order.initialise_order!
+    initialise_order(proxy_order)
     place_order(proxy_order.order)
   end
 
+  def initialise_order(proxy_order)
+    proxy_order.initialise_order!
+  rescue StandardError => e
+    Bugsnag.notify(e, subscription: proxy_order.subscription, proxy_order: proxy_order)
+  end
+
   def place_order(order)
     record_order(order)
     return record_issue(:complete, order) if order.completed?
@@ -42,8 +48,9 @@ class SubscriptionPlacementJob
 
     move_to_completion(order)
     send_placement_email(order, changes)
-  rescue StateMachine::InvalidTransition
-    record_and_log_error(:processing, order)
+  rescue StandardError => e
+    record_and_log_error(:processing, order, e.message)
+    Bugsnag.notify(e, order: order)
   end
 
   def cap_quantity_and_store_changes(order)
diff --git a/engines/order_management/app/services/order_management/subscriptions/summarizer.rb b/engines/order_management/app/services/order_management/subscriptions/summarizer.rb
index 8029716338..f591295d1c 100644
--- a/engines/order_management/app/services/order_management/subscriptions/summarizer.rb
+++ b/engines/order_management/app/services/order_management/subscriptions/summarizer.rb
@@ -22,12 +22,15 @@ module OrderManagement
         summary_for(order).record_issue(type, order, message)
       end
 
-      def record_and_log_error(type, order)
+      def record_and_log_error(type, order, error_message = nil)
         return record_issue(type, order) unless order.errors.any?
 
         error = "Subscription#{type.to_s.camelize}Error"
         line1 = "#{error}: Cannot process order #{order.number} due to errors"
-        line2 = "Errors: #{order.errors.full_messages.join(', ')}"
+
+        error_message ||= order.errors.full_messages.join(', ')
+        line2 = "Errors: #{error_message}"
+
         JobLogger.logger.info("#{line1}\n#{line2}")
         record_issue(type, order, line2)
       end

From e6a2eb8af972d721bf6b8d7feb6a66589688ab93 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Thu, 9 Jul 2020 07:53:34 +1000
Subject: [PATCH 026/340] Updating translations for config/locales/en_CA.yml

---
 config/locales/en_CA.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index a267d6397d..5b3886a906 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -182,6 +182,7 @@ en_CA:
         explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Welcome to"
   site_meta_description: "We begin from the ground up. With farmers and growers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can…"
   search_by_name: Search by name or city
   producers_join: Producers are  welcome to join the Open Food Network.
@@ -1713,6 +1714,7 @@ en_CA:
   remember_me: Remember Me
   are_you_sure: "Are you sure?"
   orders_open: "Orders open"
+  closing: "Closing"
   going_back_to_home_page: "Taking you back to the home page"
   creating: Creating
   updating: Updating
@@ -2070,6 +2072,7 @@ en_CA:
   hub_sidebar_at_least: "At least one hub must be selected"
   hub_sidebar_blue: "blue"
   hub_sidebar_red: "red"
+  order_cycles_closed_for_hub: "The hub you have selected is temporarily closed for orders. Please try again later."
   report_customers_distributor: "Distributor"
   report_customers_supplier: "Supplier"
   report_customers_cycle: "Order Cycle"
@@ -2306,6 +2309,7 @@ en_CA:
   order_cycles_email_to_producers_notice: 'Emails to be sent to producers have been queued for sending.'
   order_cycles_no_permission_to_coordinate_error: "None of your enterprises have permission to coordinate an order cycle"
   order_cycles_no_permission_to_create_error: "You don't have permission to create an order cycle coordinated by that enterprise"
+  order_cycle_closed: "The order cycle you've selected has just closed. Please try again!"
   back_to_orders_list: "Back to order list"
   no_orders_found: "No Orders Found"
   order_information: "Order Information"

From e3980521ea6c5f37775c6ab24d3330e2a00f9258 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Thu, 9 Jul 2020 07:58:41 +1000
Subject: [PATCH 027/340] Updating translations for config/locales/fr_CA.yml

---
 config/locales/fr_CA.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 2e57fa8dd7..7b58f542a8 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -183,6 +183,7 @@ fr_CA:
         explainer: Le traitement automatique de ces commandes a échoué pour une raison inconnue. Cela n'aurait pas dû arriver, veuillez nous contacter si vous lisez ce message.
   home: "OFN"
   title: "Open Food Network "
+  welcome_to: "Bienvenue sur"
   site_meta_description: "Tout commence dans le sol. Avec ces paysans, agriculteurs, producteurs, engagés pour une agriculture durable et régénératrice, et désireux de partager leur histoire et leur passion avec fierté. Avec ces distributeurs souhaitant reconnecter les individus à leurs aliments et aux gens qui les produisent, soutenir les prises de conscience, dans une démarche de transparence, d'honnêteté, en assurant une juste rémunération des producteurs.  Avec ces acheteurs qui croient que de meilleures décisions d'achats peuvent ..."
   search_by_name: Recherche par nom ou ville...
   producers_join: Les producteurs et autres hubs basés au Québec sont invités à rejoindre Open Food Network Canada.
@@ -480,6 +481,7 @@ fr_CA:
         line_number: "Ligne :%{number}"
         encoding_error: "Veuillez vérifier le paramètre de langue de votre code source et vous assurer qu'il est encodé en UTF-8"
         unexpected_error: "L'import de fichier produits à rencontré une erreur inconnue à l'ouverture du fichier : %{error_message}"
+        malformed_csv: "L'outil d'import a rencontré un fichier CSV avec le ou les problèmes suivants :%{error_message}"
       index:
         notice: "Notice"
         beta_notice: "Cette fonctionnalité est en mode bêta : il est possible que vous rencontriez des erreurs en l'utilisant. N'hésitez pas à contacter le support utilisateurs."
@@ -1150,7 +1152,12 @@ fr_CA:
         cart: "Panier"
       cart_sidebar:
         checkout: "Finalisation commande"
+        edit_cart: "Modifier le panier"
+        items_in_cart_singular: "%{num}élément dans le panier"
+        items_in_cart_plural: "%{num}éléments dans le panier"
         close: "Ferme"
+        cart_empty: "Le panier est vide"
+        take_me_shopping: "Continuer mes achats"
       signed_in:
         profile: "Profil"
       mobile_menu:
@@ -1709,6 +1716,7 @@ fr_CA:
   remember_me: Se souvenir de moi
   are_you_sure: "Confirmer?"
   orders_open: "Boutique ouverte"
+  closing: "Fermeture"
   going_back_to_home_page: "Retour à la page d'accueil"
   creating: Création
   updating: Mettre à jour
@@ -2066,6 +2074,7 @@ fr_CA:
   hub_sidebar_at_least: "Sélectionnez un/des hubs"
   hub_sidebar_blue: "bleu"
   hub_sidebar_red: "rouge"
+  order_cycles_closed_for_hub: "La boutique sélectionnée a fermé temporairement ses commandes. Veuillez essayez à nouveau ultérieurement."
   report_customers_distributor: "Distributeur"
   report_customers_supplier: "Fournisseurs"
   report_customers_cycle: "Cycle de vente"
@@ -2304,6 +2313,7 @@ fr_CA:
   order_cycles_email_to_producers_notice: 'Les emails à destination des producteurs ont été mis en file d''attente pour envoi.'
   order_cycles_no_permission_to_coordinate_error: "Aucune de vos entreprises n'a les droits requis pour coordonner un cycle de vente"
   order_cycles_no_permission_to_create_error: "Vous n'avez pas les droits requis pour créer un cycle de vente coordonné par cette entreprise"
+  order_cycle_closed: "Le cycle de vente que vous avez sélectionné a fermé. "
   back_to_orders_list: "Retour à la liste des commandes"
   no_orders_found: "Aucune commande trouvée"
   order_information: "Info commande"

From 06aa56164f3cf9fd34df521d7effaae9e43b64d0 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 12:06:38 +0200
Subject: [PATCH 028/340] Bring in Payment model from Spree

---
 app/models/spree/payment.rb                | 158 +++++
 app/models/spree/payment/processing.rb     | 210 +++++++
 spec/factories.rb                          |  16 +
 spec/models/spree/payment_original_spec.rb | 639 +++++++++++++++++++++
 4 files changed, 1023 insertions(+)
 create mode 100644 app/models/spree/payment.rb
 create mode 100644 app/models/spree/payment/processing.rb
 create mode 100644 spec/models/spree/payment_original_spec.rb

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
new file mode 100644
index 0000000000..ccda57105c
--- /dev/null
+++ b/app/models/spree/payment.rb
@@ -0,0 +1,158 @@
+module Spree
+  class Payment < ActiveRecord::Base
+    include Spree::Payment::Processing
+
+    IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
+
+    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :source, polymorphic: true
+    belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
+
+    has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'") },
+      class_name: "Spree::Payment", foreign_key: :source_id
+    has_many :log_entries, as: :source
+
+    before_validation :validate_source
+    before_save :set_unique_identifier
+
+    after_save :create_payment_profile, if: :profiles_supported?
+
+    # update the order totals, etc.
+    after_save :update_order
+    # invalidate previously entered payments
+    after_create :invalidate_old_payments
+
+    attr_accessor :source_attributes
+    after_initialize :build_source
+
+    scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
+    scope :with_state, ->(s) { where(state: s.to_s) }
+    scope :completed, -> { with_state('completed') }
+    scope :pending, -> { with_state('pending') }
+    scope :failed, -> { with_state('failed') }
+    scope :valid, -> { where('state NOT IN (?)', %w(failed invalid)) }
+
+    after_rollback :persist_invalid
+
+    def persist_invalid
+      return unless ['failed', 'invalid'].include?(state)
+      state_will_change!
+      save 
+    end
+
+    # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
+    state_machine initial: :checkout do
+      # With card payments, happens before purchase or authorization happens
+      event :started_processing do
+        transition from: [:checkout, :pending, :completed, :processing], to: :processing
+      end
+      # When processing during checkout fails
+      event :failure do
+        transition from: [:pending, :processing], to: :failed
+      end
+      # With card payments this represents authorizing the payment
+      event :pend do
+        transition from: [:checkout, :processing], to: :pending
+      end
+      # With card payments this represents completing a purchase or capture transaction
+      event :complete do
+        transition from: [:processing, :pending, :checkout], to: :completed
+      end
+      event :void do
+        transition from: [:pending, :completed, :checkout], to: :void
+      end
+      # when the card brand isnt supported
+      event :invalidate do
+        transition from: [:checkout], to: :invalid
+      end
+    end
+
+    def currency
+      order.currency
+    end
+
+    def money
+      Spree::Money.new(amount, { currency: currency })
+    end
+    alias display_amount money
+
+    def offsets_total
+      offsets.pluck(:amount).sum
+    end
+
+    def credit_allowed
+      amount - offsets_total
+    end
+
+    def can_credit?
+      credit_allowed > 0
+    end
+
+    # see https://github.com/spree/spree/issues/981
+    def build_source
+      return if source_attributes.nil?
+      if payment_method and payment_method.payment_source_class
+        self.source = payment_method.payment_source_class.new(source_attributes)
+      end
+    end
+
+    def actions
+      return [] unless payment_source and payment_source.respond_to? :actions
+      payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") or payment_source.send("can_#{action}?", self) }
+    end
+
+    def payment_source
+      res = source.is_a?(Payment) ? source.source : source
+      res || payment_method
+    end
+
+    private
+
+    def validate_source
+      if source && !source.valid?
+        source.errors.each do |field, error|
+          field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
+          self.errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
+        end
+      end
+      return !errors.present?
+    end
+
+    def profiles_supported?
+      payment_method.respond_to?(:payment_profiles_supported?) && payment_method.payment_profiles_supported?
+    end
+
+    def create_payment_profile
+      return unless source.is_a?(CreditCard) && source.number && !source.has_payment_profile?
+      payment_method.create_profile(self)
+    rescue ActiveMerchant::ConnectionError => e
+      gateway_error e
+    end
+
+    def invalidate_old_payments
+      order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
+        payment.invalidate!
+      end
+    end
+
+    def update_order
+      order.payments.reload
+      order.update!
+    end
+
+    # Necessary because some payment gateways will refuse payments with
+    # duplicate IDs. We *were* using the Order number, but that's set once and
+    # is unchanging. What we need is a unique identifier on a per-payment basis,
+    # and this is it. Related to #1998.
+    # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
+    def set_unique_identifier
+      begin
+        self.identifier = generate_identifier
+      end while self.class.exists?(identifier: self.identifier)
+    end
+
+    def generate_identifier
+      Array.new(8){ IDENTIFIER_CHARS.sample }.join
+    end
+  end
+end
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
new file mode 100644
index 0000000000..98e2cf4c1e
--- /dev/null
+++ b/app/models/spree/payment/processing.rb
@@ -0,0 +1,210 @@
+module Spree
+  class Payment < ActiveRecord::Base
+    module Processing
+      def process!
+        if payment_method && payment_method.source_required?
+          if source
+            if !processing?
+              if payment_method.supports?(source)
+                if payment_method.auto_capture?
+                  purchase!
+                else
+                  authorize!
+                end
+              else
+                invalidate!
+                raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
+              end
+            end
+          else
+            raise Core::GatewayError.new(Spree.t(:payment_processing_failed))
+          end
+        end
+      end
+
+      def authorize!
+        started_processing!
+        gateway_action(source, :authorize, :pend)
+      end
+
+      def purchase!
+        started_processing!
+        gateway_action(source, :purchase, :complete)
+      end
+
+      def capture!
+        return true if completed?
+        started_processing!
+        protect_from_connection_error do
+          check_environment
+
+          if payment_method.payment_profiles_supported?
+            # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
+            # so supply the authorization itself as well as the credit card, rather than just the authorization code
+            response = payment_method.capture(self, source, gateway_options)
+          else
+            # Standard ActiveMerchant capture usage
+            response = payment_method.capture(money.money.cents,
+                                              response_code,
+                                              gateway_options)
+          end
+
+          handle_response(response, :complete, :failure)
+        end
+      end
+
+      def void_transaction!
+        return true if void?
+        protect_from_connection_error do
+          check_environment
+
+          if payment_method.payment_profiles_supported?
+            # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
+            # so supply the authorization itself as well as the credit card, rather than just the authorization code
+            response = payment_method.void(self.response_code, source, gateway_options)
+          else
+            # Standard ActiveMerchant void usage
+            response = payment_method.void(self.response_code, gateway_options)
+          end
+          record_response(response)
+
+          if response.success?
+            self.response_code = response.authorization
+            self.void
+          else
+            gateway_error(response)
+          end
+        end
+      end
+
+      def credit!(credit_amount=nil)
+        protect_from_connection_error do
+          check_environment
+
+          credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
+          credit_amount = credit_amount.to_f
+
+          if payment_method.payment_profiles_supported?
+            response = payment_method.credit((credit_amount * 100).round, source, response_code, gateway_options)
+          else
+            response = payment_method.credit((credit_amount * 100).round, response_code, gateway_options)
+          end
+
+          record_response(response)
+
+          if response.success?
+            self.class.create(
+              :order => order,
+              :source => self,
+              :payment_method => payment_method,
+              :amount => credit_amount.abs * -1,
+              :response_code => response.authorization,
+              :state => 'completed'
+            )
+          else
+            gateway_error(response)
+          end
+        end
+      end
+
+      def partial_credit(amount)
+        return if amount > credit_allowed
+        started_processing!
+        credit!(amount)
+      end
+
+      def gateway_options
+        options = { :email    => order.email,
+                    :customer => order.email,
+                    :ip       => order.last_ip_address,
+                    # Need to pass in a unique identifier here to make some
+                    # payment gateways happy.
+                    #
+                    # For more information, please see Spree::Payment#set_unique_identifier
+                    :order_id => gateway_order_id }
+
+        options.merge!({ :shipping => order.ship_total * 100,
+                         :tax      => order.tax_total * 100,
+                         :subtotal => order.item_total * 100,
+                         :discount => order.promo_total * 100,
+                         :currency => currency })
+
+        options.merge!({ :billing_address  => order.bill_address.try(:active_merchant_hash),
+                        :shipping_address => order.ship_address.try(:active_merchant_hash) })
+
+        options
+      end
+
+      private
+
+      def gateway_action(source, action, success_state)
+        protect_from_connection_error do
+          check_environment
+
+          response = payment_method.send(action, (amount * 100).round,
+                                         source,
+                                         gateway_options)
+          handle_response(response, success_state, :failure)
+        end
+      end
+
+      def handle_response(response, success_state, failure_state)
+        record_response(response)
+
+        if response.success?
+          unless response.authorization.nil?
+            self.response_code = response.authorization
+            self.avs_response = response.avs_result['code']
+
+            if response.cvv_result
+              self.cvv_response_code = response.cvv_result['code']
+              self.cvv_response_message = response.cvv_result['message']
+            end
+          end
+          self.send("#{success_state}!")
+        else
+          self.send(failure_state)
+          gateway_error(response)
+        end
+      end
+
+      def record_response(response)
+        log_entries.create(:details => response.to_yaml)
+      end
+
+      def protect_from_connection_error
+        begin
+          yield
+        rescue ActiveMerchant::ConnectionError => e
+          gateway_error(e)
+        end
+      end
+
+      def gateway_error(error)
+        if error.is_a? ActiveMerchant::Billing::Response
+          text = error.params['message'] || error.params['response_reason_text'] || error.message
+        elsif error.is_a? ActiveMerchant::ConnectionError
+          text = Spree.t(:unable_to_connect_to_gateway)
+        else
+          text = error.to_s
+        end
+        logger.error(Spree.t(:gateway_error))
+        logger.error("  #{error.to_yaml}")
+        raise Core::GatewayError.new(text)
+      end
+
+      # Saftey check to make sure we're not accidentally performing operations on a live gateway.
+      # Ex. When testing in staging environment with a copy of production data.
+      def check_environment
+        return if payment_method.environment == Rails.env
+        message = Spree.t(:gateway_config_unavailable) + " - #{Rails.env}"
+        raise Core::GatewayError.new(message)
+      end
+
+      # The unique identifier to be passed in to the payment gateway
+      def gateway_order_id
+        "#{order.number}-#{self.identifier}"
+      end
+    end
+  end
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index ad3c804c92..327565ea1b 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -15,6 +15,22 @@ require 'spree/testing_support/factories'
 #   * order_with_inventory_unit_shipped
 #   * completed_order_with_totals
 #
+
+# allows credit card info to be saved to the database which is needed for factories to work properly
+class TestCard < Spree::CreditCard
+  def remove_readonly_attributes(attributes) attributes; end
+end
+
+FactoryBot.define do
+  factory :credit_card, class: TestCard do
+    verification_value 123
+    month 12
+    year { Time.now.year + 1 }
+    number '4111111111111111'
+    cc_type 'visa'
+  end
+end
+
 FactoryBot.define do
   factory :classification, class: Spree::Classification do
   end
diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
new file mode 100644
index 0000000000..8f28ac14dd
--- /dev/null
+++ b/spec/models/spree/payment_original_spec.rb
@@ -0,0 +1,639 @@
+require 'spec_helper'
+
+describe Spree::Payment do
+  let(:order) do
+    order = Spree::Order.new(:bill_address => Spree::Address.new,
+                             :ship_address => Spree::Address.new)
+  end
+
+  let(:gateway) do
+    gateway = Spree::Gateway::Bogus.new(:environment => 'test', :active => true)
+    gateway.stub :source_required => true
+    gateway
+  end
+
+  let(:card) do
+    mock_model(Spree::CreditCard, :number => "4111111111111111",
+                                  :has_payment_profile? => true)
+  end
+
+  let(:payment) do
+    payment = Spree::Payment.new
+    payment.source = card
+    payment.order = order
+    payment.payment_method = gateway
+    payment
+  end
+
+  let(:amount_in_cents) { payment.amount.to_f * 100 }
+
+  let!(:success_response) do
+    double('success_response', :success? => true,
+           :authorization => '123',
+           :avs_result => { 'code' => 'avs-code' },
+           :cvv_result => { 'code' => 'cvv-code', 'message' => "CVV Result"})
+  end
+
+  let(:failed_response) { double('gateway_response', :success? => false) }
+
+  before(:each) do
+    # So it doesn't create log entries every time a processing method is called
+    payment.log_entries.stub(:create)
+  end
+
+  context 'validations' do
+    it "returns useful error messages when source is invalid" do
+      payment.source = Spree::CreditCard.new
+      payment.should_not be_valid
+      cc_errors = payment.errors['Credit Card']
+      cc_errors.should include("Number can't be blank")
+      cc_errors.should include("Month is not a number")
+      cc_errors.should include("Year is not a number")
+      cc_errors.should include("Verification Value can't be blank")
+    end
+  end
+
+  # Regression test for https://github.com/spree/spree/pull/2224
+  context 'failure' do
+
+    it 'should transition to failed from pending state' do
+      payment.state = 'pending'
+      payment.failure
+      payment.state.should eql('failed')
+    end
+
+    it 'should transition to failed from processing state' do
+      payment.state = 'processing'
+      payment.failure
+      payment.state.should eql('failed')
+    end
+
+  end
+
+  context 'invalidate' do
+    it 'should transition from checkout to invalid' do
+      payment.state = 'checkout'
+      payment.invalidate
+      payment.state.should eq('invalid')
+    end
+  end
+
+  context "processing" do
+    before do
+      payment.stub(:update_order)
+      payment.stub(:create_payment_profile)
+    end
+
+    context "#process!" do
+      it "should purchase if with auto_capture" do
+        payment.payment_method.should_receive(:auto_capture?).and_return(true)
+        payment.should_receive(:purchase!)
+        payment.process!
+      end
+
+      it "should authorize without auto_capture" do
+        payment.payment_method.should_receive(:auto_capture?).and_return(false)
+        payment.should_receive(:authorize!)
+        payment.process!
+      end
+
+      it "should make the state 'processing'" do
+        payment.should_receive(:started_processing!)
+        payment.process!
+      end
+
+      it "should invalidate if payment method doesnt support source" do
+        payment.payment_method.should_receive(:supports?).with(payment.source).and_return(false)
+        expect { payment.process!}.to raise_error(Spree::Core::GatewayError)
+        payment.state.should eq('invalid')
+      end
+
+    end
+
+    context "#authorize" do
+      it "should call authorize on the gateway with the payment amount" do
+        payment.payment_method.should_receive(:authorize).with(amount_in_cents,
+                                                               card,
+                                                               anything).and_return(success_response)
+        payment.authorize!
+      end
+
+      it "should call authorize on the gateway with the currency code" do
+        payment.stub :currency => 'GBP'
+        payment.payment_method.should_receive(:authorize).with(amount_in_cents,
+                                                               card,
+                                                               hash_including({:currency => "GBP"})).and_return(success_response)
+        payment.authorize!
+      end
+
+      it "should log the response" do
+        payment.log_entries.should_receive(:create).with(:details => anything)
+        payment.authorize!
+      end
+
+      context "when gateway does not match the environment" do
+        it "should raise an exception" do
+          gateway.stub :environment => "foo"
+          expect { payment.authorize! }.to raise_error(Spree::Core::GatewayError)
+        end
+      end
+
+      context "if successful" do
+        before do
+          payment.payment_method.should_receive(:authorize).with(amount_in_cents,
+                                                                 card,
+                                                                 anything).and_return(success_response)
+        end
+
+        it "should store the response_code, avs_response and cvv_response fields" do
+          payment.authorize!
+          payment.response_code.should == '123'
+          payment.avs_response.should == 'avs-code'
+          payment.cvv_response_code.should == 'cvv-code'
+          payment.cvv_response_message.should == 'CVV Result'
+        end
+
+        it "should make payment pending" do
+          payment.should_receive(:pend!)
+          payment.authorize!
+        end
+      end
+
+      context "if unsuccessful" do
+        it "should mark payment as failed" do
+          gateway.stub(:authorize).and_return(failed_response)
+          payment.should_receive(:failure)
+          payment.should_not_receive(:pend)
+          lambda {
+            payment.authorize!
+          }.should raise_error(Spree::Core::GatewayError)
+        end
+      end
+    end
+
+    context "purchase" do
+      it "should call purchase on the gateway with the payment amount" do
+        gateway.should_receive(:purchase).with(amount_in_cents, card, anything).and_return(success_response)
+        payment.purchase!
+      end
+
+      it "should log the response" do
+        payment.log_entries.should_receive(:create).with(:details => anything)
+        payment.purchase!
+      end
+
+      context "when gateway does not match the environment" do
+        it "should raise an exception" do
+          gateway.stub :environment => "foo"
+          expect { payment.purchase!  }.to raise_error(Spree::Core::GatewayError)
+        end
+      end
+
+      context "if successful" do
+        before do
+          payment.payment_method.should_receive(:purchase).with(amount_in_cents,
+                                                                card,
+                                                                anything).and_return(success_response)
+        end
+
+        it "should store the response_code and avs_response" do
+          payment.purchase!
+          payment.response_code.should == '123'
+          payment.avs_response.should == 'avs-code'
+        end
+
+        it "should make payment complete" do
+          payment.should_receive(:complete!)
+          payment.purchase!
+        end
+      end
+
+      context "if unsuccessful" do
+        it "should make payment failed" do
+          gateway.stub(:purchase).and_return(failed_response)
+          payment.should_receive(:failure)
+          payment.should_not_receive(:pend)
+          expect { payment.purchase! }.to raise_error(Spree::Core::GatewayError)
+        end
+      end
+    end
+
+    context "#capture" do
+      before do
+        payment.stub(:complete).and_return(true)
+      end
+
+      context "when payment is pending" do
+        before do
+          payment.state = 'pending'
+        end
+
+        context "if successful" do
+          before do
+            payment.payment_method.should_receive(:capture).with(payment, card, anything).and_return(success_response)
+          end
+
+          it "should make payment complete" do
+            payment.should_receive(:complete)
+            payment.capture!
+          end
+
+          it "should store the response_code" do
+            gateway.stub :capture => success_response
+            payment.capture!
+            payment.response_code.should == '123'
+          end
+        end
+
+        context "if unsuccessful" do
+          it "should not make payment complete" do
+            gateway.stub :capture => failed_response
+            payment.should_receive(:failure)
+            payment.should_not_receive(:complete)
+            expect { payment.capture! }.to raise_error(Spree::Core::GatewayError)
+          end
+        end
+      end
+
+      # Regression test for #2119
+      context "when payment is completed" do
+        before do
+          payment.state = 'completed'
+        end
+
+        it "should do nothing" do
+          payment.should_not_receive(:complete)
+          payment.payment_method.should_not_receive(:capture)
+          payment.log_entries.should_not_receive(:create)
+          payment.capture!
+        end
+      end
+    end
+
+    context "#void" do
+      before do
+        payment.response_code = '123'
+        payment.state = 'pending'
+      end
+
+      context "when profiles are supported" do
+        it "should call payment_gateway.void with the payment's response_code" do
+          gateway.stub :payment_profiles_supported? => true
+          gateway.should_receive(:void).with('123', card, anything).and_return(success_response)
+          payment.void_transaction!
+        end
+      end
+
+      context "when profiles are not supported" do
+        it "should call payment_gateway.void with the payment's response_code" do
+          gateway.stub :payment_profiles_supported? => false
+          gateway.should_receive(:void).with('123', anything).and_return(success_response)
+          payment.void_transaction!
+        end
+      end
+
+      it "should log the response" do
+        payment.log_entries.should_receive(:create).with(:details => anything)
+        payment.void_transaction!
+      end
+
+      context "when gateway does not match the environment" do
+        it "should raise an exception" do
+          gateway.stub :environment => "foo"
+          expect { payment.void_transaction! }.to raise_error(Spree::Core::GatewayError)
+        end
+      end
+
+      context "if successful" do
+        it "should update the response_code with the authorization from the gateway" do
+          # Change it to something different
+          payment.response_code = 'abc'
+          payment.void_transaction!
+          payment.response_code.should == '12345'
+        end
+      end
+
+      context "if unsuccessful" do
+        it "should not void the payment" do
+          gateway.stub :void => failed_response
+          payment.should_not_receive(:void)
+          expect { payment.void_transaction! }.to raise_error(Spree::Core::GatewayError)
+        end
+      end
+
+      # Regression test for #2119
+      context "if payment is already voided" do
+        before do
+          payment.state = 'void'
+        end
+
+        it "should not void the payment" do
+          payment.payment_method.should_not_receive(:void)
+          payment.void_transaction!
+        end
+      end
+    end
+
+    context "#credit" do
+      before do
+        payment.state = 'complete'
+        payment.response_code = '123'
+      end
+
+      context "when outstanding_balance is less than payment amount" do
+        before do
+          payment.order.stub :outstanding_balance => 10
+          payment.stub :credit_allowed => 1000
+        end
+
+        it "should call credit on the gateway with the credit amount and response_code" do
+          gateway.should_receive(:credit).with(1000, card, '123', anything).and_return(success_response)
+          payment.credit!
+        end
+      end
+
+      context "when outstanding_balance is equal to payment amount" do
+        before do
+          payment.order.stub :outstanding_balance => payment.amount
+        end
+
+        it "should call credit on the gateway with the credit amount and response_code" do
+          gateway.should_receive(:credit).with(amount_in_cents, card, '123', anything).and_return(success_response)
+          payment.credit!
+        end
+      end
+
+      context "when outstanding_balance is greater than payment amount" do
+        before do
+          payment.order.stub :outstanding_balance => 101
+        end
+
+        it "should call credit on the gateway with the original payment amount and response_code" do
+          gateway.should_receive(:credit).with(amount_in_cents.to_f, card, '123', anything).and_return(success_response)
+          payment.credit!
+        end
+      end
+
+      it "should log the response" do
+        payment.log_entries.should_receive(:create).with(:details => anything)
+        payment.credit!
+      end
+
+      context "when gateway does not match the environment" do
+        it "should raise an exception" do
+          gateway.stub :environment => "foo"
+          lambda { payment.credit! }.should raise_error(Spree::Core::GatewayError)
+        end
+      end
+
+      context "when response is successful" do
+        it "should create an offsetting payment" do
+          Spree::Payment.should_receive(:create)
+          payment.credit!
+        end
+
+        it "resulting payment should have correct values" do
+          payment.order.stub :outstanding_balance => 100
+          payment.stub :credit_allowed => 10
+
+          offsetting_payment = payment.credit!
+          offsetting_payment.amount.to_f.should == -10
+          offsetting_payment.should be_completed
+          offsetting_payment.response_code.should == '12345'
+          offsetting_payment.source.should == payment
+        end
+      end
+    end
+  end
+
+  context "when response is unsuccessful" do
+    it "should not create a payment" do
+      gateway.stub :credit => failed_response
+      Spree::Payment.should_not_receive(:create)
+      expect { payment.credit! }.to raise_error(Spree::Core::GatewayError)
+    end
+  end
+
+  context "when already processing" do
+    it "should return nil without trying to process the source" do
+      payment.state = 'processing'
+
+      payment.should_not_receive(:authorize!)
+      payment.should_not_receive(:purchase!)
+      payment.process!.should be_nil
+    end
+  end
+
+  context "with source required" do
+    context "raises an error if no source is specified" do
+      before do
+        payment.source = nil
+      end
+
+      specify do
+        expect { payment.process! }.to raise_error(Spree::Core::GatewayError, Spree.t(:payment_processing_failed))
+      end
+    end
+  end
+
+  context "with source optional" do
+    context "raises no error if source is not specified" do
+      before do
+        payment.source = nil
+        payment.payment_method.stub(:source_required? => false)
+      end
+
+      specify do
+        expect { payment.process! }.not_to raise_error
+      end
+    end
+  end
+
+  context "#credit_allowed" do
+    it "is the difference between offsets total and payment amount" do
+      payment.amount = 100
+      payment.stub(:offsets_total).and_return(0)
+      payment.credit_allowed.should == 100
+      payment.stub(:offsets_total).and_return(80)
+      payment.credit_allowed.should == 20
+    end
+  end
+
+  context "#can_credit?" do
+    it "is true if credit_allowed > 0" do
+      payment.stub(:credit_allowed).and_return(100)
+      payment.can_credit?.should be_true
+    end
+    it "is false if credit_allowed is 0" do
+      payment.stub(:credit_allowed).and_return(0)
+      payment.can_credit?.should be_false
+    end
+  end
+
+  context "#credit" do
+    context "when amount <= credit_allowed" do
+      it "makes the state processing" do
+        payment.state = 'completed'
+        payment.stub(:credit_allowed).and_return(10)
+        payment.partial_credit(10)
+        payment.should be_processing
+      end
+      it "calls credit on the source with the payment and amount" do
+        payment.state = 'completed'
+        payment.stub(:credit_allowed).and_return(10)
+        payment.should_receive(:credit!).with(10)
+        payment.partial_credit(10)
+      end
+    end
+    context "when amount > credit_allowed" do
+      it "should not call credit on the source" do
+        payment.state = 'completed'
+        payment.stub(:credit_allowed).and_return(10)
+        payment.partial_credit(20)
+        payment.should be_completed
+      end
+    end
+  end
+
+  context "#save" do
+    it "should call order#update!" do
+      payment = Spree::Payment.create(:amount => 100, :order => order)
+      order.should_receive(:update!)
+      payment.save
+    end
+
+    context "when profiles are supported" do
+      before do
+        gateway.stub :payment_profiles_supported? => true
+        payment.source.stub :has_payment_profile? => false
+      end
+
+
+      context "when there is an error connecting to the gateway" do
+        it "should call gateway_error " do
+          pending '[Spree build] Failing spec'
+          message = double("gateway_error")
+          connection_error = ActiveMerchant::ConnectionError.new(message, nil)
+          expect(gateway).to receive(:create_profile).and_raise(connection_error)
+          lambda do
+            Spree::Payment.create(
+              :amount => 100,
+              :order => order,
+              :source => card,
+              :payment_method => gateway
+            )
+          end.should raise_error(Spree::Core::GatewayError)
+        end
+      end
+
+      context "when successfully connecting to the gateway" do
+        it "should create a payment profile" do
+          payment.payment_method.should_receive :create_profile
+          payment = Spree::Payment.create(
+            :amount => 100,
+            :order => order,
+            :source => card,
+            :payment_method => gateway
+          )
+        end
+      end
+
+
+    end
+
+    context "when profiles are not supported" do
+      before { gateway.stub :payment_profiles_supported? => false }
+
+      it "should not create a payment profile" do
+        gateway.should_not_receive :create_profile
+        payment = Spree::Payment.create(
+          :amount => 100,
+          :order => order,
+          :source => card,
+          :payment_method => gateway
+        )
+      end
+    end
+  end
+
+  context "#build_source" do
+    it "should build the payment's source" do
+      params = { :amount => 100, :payment_method => gateway,
+                 :source_attributes => {
+        :expiry =>"1 / 99",
+        :number => '1234567890123',
+        :verification_value => '123'
+      }
+      }
+
+      payment = Spree::Payment.new(params)
+      payment.should be_valid
+      payment.source.should_not be_nil
+    end
+
+    it "errors when payment source not valid" do
+      params = { :amount => 100, :payment_method => gateway,
+                 :source_attributes => {:expiry => "1 / 12" }}
+
+      payment = Spree::Payment.new(params)
+      payment.should_not be_valid
+      payment.source.should_not be_nil
+      payment.source.should have(1).error_on(:number)
+      payment.source.should have(1).error_on(:verification_value)
+    end
+  end
+
+  context "#currency" do
+    before { order.stub(:currency) { "ABC" } }
+    it "returns the order currency" do
+      payment.currency.should == "ABC"
+    end
+  end
+
+  context "#display_amount" do
+    it "returns a Spree::Money for this amount" do
+      payment.display_amount.should == Spree::Money.new(payment.amount)
+    end
+  end
+
+  # Regression test for #2216
+  context "#gateway_options" do
+    before { order.stub(:last_ip_address => "192.168.1.1") }
+
+    it "contains an IP" do
+      payment.gateway_options[:ip].should == order.last_ip_address
+    end
+  end
+
+  context "#set_unique_identifier" do
+    # Regression test for #1998
+    it "sets a unique identifier on create" do
+      payment.run_callbacks(:save)
+      payment.identifier.should_not be_blank
+      payment.identifier.size.should == 8
+      payment.identifier.should be_a(String)
+    end
+
+    context "other payment exists" do
+      let(:other_payment) {
+        payment = Spree::Payment.new
+        payment.source = card
+        payment.order = order
+        payment.payment_method = gateway
+        payment
+      }
+
+      before { other_payment.save! }
+
+      it "doesn't set duplicate identifier" do
+        payment.should_receive(:generate_identifier).and_return(other_payment.identifier)
+        payment.should_receive(:generate_identifier).and_call_original
+
+        payment.run_callbacks(:save)
+
+        payment.identifier.should_not be_blank
+        payment.identifier.should_not == other_payment.identifier
+      end
+    end
+  end
+end

From abacd06f6ba004e0dfacca994118e98cb9f492a1 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 12:10:21 +0200
Subject: [PATCH 029/340] Fix credit card instance in specs

---
 spec/factories.rb                          | 4 ----
 spec/models/spree/payment_original_spec.rb | 7 +++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/spec/factories.rb b/spec/factories.rb
index 327565ea1b..edfe1d257b 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -198,10 +198,6 @@ FactoryBot.modify do
     country { Spree::Country.find_by name: 'Australia' || Spree::Country.first }
   end
 
-  factory :credit_card do
-    cc_type 'visa'
-  end
-
   factory :payment do
     transient do
       distributor {
diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 8f28ac14dd..3a228c5ee9 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -13,8 +13,11 @@ describe Spree::Payment do
   end
 
   let(:card) do
-    mock_model(Spree::CreditCard, :number => "4111111111111111",
-                                  :has_payment_profile? => true)
+    create(:credit_card, :number => "4111111111111111")
+  end
+
+  before do
+    allow(card).to receive(:has_payment_profile?).and_return(true)
   end
 
   let(:payment) do

From e1ea5dbcb35c8b568a16502ddbaa8c5d74a1dfd4 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 12:32:32 +0200
Subject: [PATCH 030/340] Fix all but the 7 last payment specs

---
 spec/models/spree/payment_original_spec.rb | 102 ++++++++++-----------
 1 file changed, 49 insertions(+), 53 deletions(-)

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 3a228c5ee9..89bd9afdb4 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -12,13 +12,9 @@ describe Spree::Payment do
     gateway
   end
 
-  let(:card) do
-    create(:credit_card, :number => "4111111111111111")
-  end
+  let(:card) { create(:credit_card) }
 
-  before do
-    allow(card).to receive(:has_payment_profile?).and_return(true)
-  end
+  before { allow(card).to receive(:has_payment_profile?).and_return(true) }
 
   let(:payment) do
     payment = Spree::Payment.new
@@ -41,18 +37,18 @@ describe Spree::Payment do
 
   before(:each) do
     # So it doesn't create log entries every time a processing method is called
-    payment.log_entries.stub(:create)
+    allow(payment.log_entries).to receive(:create)
   end
 
   context 'validations' do
     it "returns useful error messages when source is invalid" do
       payment.source = Spree::CreditCard.new
-      payment.should_not be_valid
+      expect(payment).not_to be_valid
       cc_errors = payment.errors['Credit Card']
-      cc_errors.should include("Number can't be blank")
-      cc_errors.should include("Month is not a number")
-      cc_errors.should include("Year is not a number")
-      cc_errors.should include("Verification Value can't be blank")
+      expect(cc_errors).to include("Number can't be blank")
+      expect(cc_errors).to include("Month is not a number")
+      expect(cc_errors).to include("Year is not a number")
+      expect(cc_errors).to include("Verification Value can't be blank")
     end
   end
 
@@ -62,13 +58,13 @@ describe Spree::Payment do
     it 'should transition to failed from pending state' do
       payment.state = 'pending'
       payment.failure
-      payment.state.should eql('failed')
+      expect(payment.state).to eql('failed')
     end
 
     it 'should transition to failed from processing state' do
       payment.state = 'processing'
       payment.failure
-      payment.state.should eql('failed')
+      expect(payment.state).to eql('failed')
     end
 
   end
@@ -77,7 +73,7 @@ describe Spree::Payment do
     it 'should transition from checkout to invalid' do
       payment.state = 'checkout'
       payment.invalidate
-      payment.state.should eq('invalid')
+      expect(payment.state).to eq('invalid')
     end
   end
 
@@ -108,7 +104,7 @@ describe Spree::Payment do
       it "should invalidate if payment method doesnt support source" do
         payment.payment_method.should_receive(:supports?).with(payment.source).and_return(false)
         expect { payment.process!}.to raise_error(Spree::Core::GatewayError)
-        payment.state.should eq('invalid')
+        expect(payment.state).to eq('invalid')
       end
 
     end
@@ -130,7 +126,7 @@ describe Spree::Payment do
       end
 
       it "should log the response" do
-        payment.log_entries.should_receive(:create).with(:details => anything)
+        expect(payment.log_entries).to receive(:create).with(:details => anything)
         payment.authorize!
       end
 
@@ -150,10 +146,10 @@ describe Spree::Payment do
 
         it "should store the response_code, avs_response and cvv_response fields" do
           payment.authorize!
-          payment.response_code.should == '123'
-          payment.avs_response.should == 'avs-code'
-          payment.cvv_response_code.should == 'cvv-code'
-          payment.cvv_response_message.should == 'CVV Result'
+          expect(payment.response_code).to eq('123')
+          expect(payment.avs_response).to eq('avs-code')
+          expect(payment.cvv_response_code).to eq('cvv-code')
+          expect(payment.cvv_response_message).to eq('CVV Result')
         end
 
         it "should make payment pending" do
@@ -167,9 +163,9 @@ describe Spree::Payment do
           gateway.stub(:authorize).and_return(failed_response)
           payment.should_receive(:failure)
           payment.should_not_receive(:pend)
-          lambda {
+          expect {
             payment.authorize!
-          }.should raise_error(Spree::Core::GatewayError)
+          }.to raise_error(Spree::Core::GatewayError)
         end
       end
     end
@@ -201,8 +197,8 @@ describe Spree::Payment do
 
         it "should store the response_code and avs_response" do
           payment.purchase!
-          payment.response_code.should == '123'
-          payment.avs_response.should == 'avs-code'
+          expect(payment.response_code).to eq('123')
+          expect(payment.avs_response).to eq('avs-code')
         end
 
         it "should make payment complete" do
@@ -244,7 +240,7 @@ describe Spree::Payment do
           it "should store the response_code" do
             gateway.stub :capture => success_response
             payment.capture!
-            payment.response_code.should == '123'
+            expect(payment.response_code).to eq('123')
           end
         end
 
@@ -312,7 +308,7 @@ describe Spree::Payment do
           # Change it to something different
           payment.response_code = 'abc'
           payment.void_transaction!
-          payment.response_code.should == '12345'
+          expect(payment.response_code).to eq('12345')
         end
       end
 
@@ -385,7 +381,7 @@ describe Spree::Payment do
       context "when gateway does not match the environment" do
         it "should raise an exception" do
           gateway.stub :environment => "foo"
-          lambda { payment.credit! }.should raise_error(Spree::Core::GatewayError)
+          expect { payment.credit! }.to raise_error(Spree::Core::GatewayError)
         end
       end
 
@@ -401,9 +397,9 @@ describe Spree::Payment do
 
           offsetting_payment = payment.credit!
           offsetting_payment.amount.to_f.should == -10
-          offsetting_payment.should be_completed
-          offsetting_payment.response_code.should == '12345'
-          offsetting_payment.source.should == payment
+          expect(offsetting_payment).to be_completed
+          expect(offsetting_payment.response_code).to eq('12345')
+          expect(offsetting_payment.source).to eq(payment)
         end
       end
     end
@@ -423,7 +419,7 @@ describe Spree::Payment do
 
       payment.should_not_receive(:authorize!)
       payment.should_not_receive(:purchase!)
-      payment.process!.should be_nil
+      expect(payment.process!).to be_nil
     end
   end
 
@@ -456,20 +452,20 @@ describe Spree::Payment do
     it "is the difference between offsets total and payment amount" do
       payment.amount = 100
       payment.stub(:offsets_total).and_return(0)
-      payment.credit_allowed.should == 100
+      expect(payment.credit_allowed).to eq(100)
       payment.stub(:offsets_total).and_return(80)
-      payment.credit_allowed.should == 20
+      expect(payment.credit_allowed).to eq(20)
     end
   end
 
   context "#can_credit?" do
     it "is true if credit_allowed > 0" do
       payment.stub(:credit_allowed).and_return(100)
-      payment.can_credit?.should be_true
+      expect(payment.can_credit?).to be true
     end
     it "is false if credit_allowed is 0" do
       payment.stub(:credit_allowed).and_return(0)
-      payment.can_credit?.should be_false
+      expect(payment.can_credit?).to be false
     end
   end
 
@@ -479,7 +475,7 @@ describe Spree::Payment do
         payment.state = 'completed'
         payment.stub(:credit_allowed).and_return(10)
         payment.partial_credit(10)
-        payment.should be_processing
+        expect(payment).to be_processing
       end
       it "calls credit on the source with the payment and amount" do
         payment.state = 'completed'
@@ -493,7 +489,7 @@ describe Spree::Payment do
         payment.state = 'completed'
         payment.stub(:credit_allowed).and_return(10)
         payment.partial_credit(20)
-        payment.should be_completed
+        expect(payment).to be_completed
       end
     end
   end
@@ -518,7 +514,7 @@ describe Spree::Payment do
           message = double("gateway_error")
           connection_error = ActiveMerchant::ConnectionError.new(message, nil)
           expect(gateway).to receive(:create_profile).and_raise(connection_error)
-          lambda do
+          expect do
             Spree::Payment.create(
               :amount => 100,
               :order => order,
@@ -570,8 +566,8 @@ describe Spree::Payment do
       }
 
       payment = Spree::Payment.new(params)
-      payment.should be_valid
-      payment.source.should_not be_nil
+      expect(payment).to be_valid
+      expect(payment.source).not_to be_nil
     end
 
     it "errors when payment source not valid" do
@@ -579,23 +575,23 @@ describe Spree::Payment do
                  :source_attributes => {:expiry => "1 / 12" }}
 
       payment = Spree::Payment.new(params)
-      payment.should_not be_valid
-      payment.source.should_not be_nil
-      payment.source.should have(1).error_on(:number)
-      payment.source.should have(1).error_on(:verification_value)
+      expect(payment).not_to be_valid
+      expect(payment.source).not_to be_nil
+      expect(payment.source.errors[:number]).not_to be_empty
+      expect(payment.source.errors[:verification_value]).not_to be_empty
     end
   end
 
   context "#currency" do
     before { order.stub(:currency) { "ABC" } }
     it "returns the order currency" do
-      payment.currency.should == "ABC"
+      expect(payment.currency).to eq("ABC")
     end
   end
 
   context "#display_amount" do
     it "returns a Spree::Money for this amount" do
-      payment.display_amount.should == Spree::Money.new(payment.amount)
+      expect(payment.display_amount).to eq(Spree::Money.new(payment.amount))
     end
   end
 
@@ -604,7 +600,7 @@ describe Spree::Payment do
     before { order.stub(:last_ip_address => "192.168.1.1") }
 
     it "contains an IP" do
-      payment.gateway_options[:ip].should == order.last_ip_address
+      expect(payment.gateway_options[:ip]).to eq(order.last_ip_address)
     end
   end
 
@@ -612,9 +608,9 @@ describe Spree::Payment do
     # Regression test for #1998
     it "sets a unique identifier on create" do
       payment.run_callbacks(:save)
-      payment.identifier.should_not be_blank
-      payment.identifier.size.should == 8
-      payment.identifier.should be_a(String)
+      expect(payment.identifier).not_to be_blank
+      expect(payment.identifier.size).to eq(8)
+      expect(payment.identifier).to be_a(String)
     end
 
     context "other payment exists" do
@@ -634,8 +630,8 @@ describe Spree::Payment do
 
         payment.run_callbacks(:save)
 
-        payment.identifier.should_not be_blank
-        payment.identifier.should_not == other_payment.identifier
+        expect(payment.identifier).not_to be_blank
+        expect(payment.identifier).not_to eq(other_payment.identifier)
       end
     end
   end

From 34de219233c9fc9d2dd884e2b07fa24eb0bdda91 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 12:36:51 +0200
Subject: [PATCH 031/340] Bring in missing translation

---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3726167337..2975120a53 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,6 +34,7 @@ en:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"

From a01f601363301137af9e348477c83ec6ceeaf8ce Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 13:06:11 +0200
Subject: [PATCH 032/340] Fix yet another spec

---
 spec/models/spree/payment_original_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 89bd9afdb4..2ca0089d9d 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -396,7 +396,7 @@ describe Spree::Payment do
           payment.stub :credit_allowed => 10
 
           offsetting_payment = payment.credit!
-          offsetting_payment.amount.to_f.should == -10
+          expect(offsetting_payment.amount.to_f).to eq(-10)
           expect(offsetting_payment).to be_completed
           expect(offsetting_payment.response_code).to eq('12345')
           expect(offsetting_payment.source).to eq(payment)

From 0ad8dcc2c5d067ec5983566e40c94f71bc0f9052 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 13:06:35 +0200
Subject: [PATCH 033/340] Fix payment log entries specs

The tight coupling between doesn't give other option but to check the
private method is called. The specs successfully stub
`log_entries#create` but for some reason the model instance that gets
evaluated it's not the stubbed one.
---
 spec/models/spree/payment_original_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 2ca0089d9d..7a0367c9b8 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -37,7 +37,7 @@ describe Spree::Payment do
 
   before(:each) do
     # So it doesn't create log entries every time a processing method is called
-    allow(payment.log_entries).to receive(:create)
+    allow(payment).to receive(:record_response)
   end
 
   context 'validations' do
@@ -126,8 +126,8 @@ describe Spree::Payment do
       end
 
       it "should log the response" do
-        expect(payment.log_entries).to receive(:create).with(:details => anything)
         payment.authorize!
+        expect(payment).to have_received(:record_response)
       end
 
       context "when gateway does not match the environment" do
@@ -177,8 +177,8 @@ describe Spree::Payment do
       end
 
       it "should log the response" do
-        payment.log_entries.should_receive(:create).with(:details => anything)
         payment.purchase!
+        expect(payment).to have_received(:record_response)
       end
 
       context "when gateway does not match the environment" do
@@ -292,8 +292,8 @@ describe Spree::Payment do
       end
 
       it "should log the response" do
-        payment.log_entries.should_receive(:create).with(:details => anything)
         payment.void_transaction!
+        expect(payment).to have_received(:record_response)
       end
 
       context "when gateway does not match the environment" do
@@ -374,8 +374,8 @@ describe Spree::Payment do
       end
 
       it "should log the response" do
-        payment.log_entries.should_receive(:create).with(:details => anything)
         payment.credit!
+        expect(payment).to have_received(:record_response)
       end
 
       context "when gateway does not match the environment" do

From 9935df9f2d590996210613a2061e14e332ed8f25 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 17:11:18 +0200
Subject: [PATCH 034/340] Move Pin payment method from decorator into model

---
 app/models/spree/payment.rb                | 12 ++++++
 app/models/spree/payment_decorator.rb      | 12 ------
 spec/models/spree/payment_original_spec.rb | 43 ++++++++++++++++++++++
 spec/models/spree/payment_spec.rb          | 42 ---------------------
 4 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index ccda57105c..404a6759ee 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -101,6 +101,18 @@ module Spree
       payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") or payment_source.send("can_#{action}?", self) }
     end
 
+    # Pin payments lacks void and credit methods, but it does have refund
+    # Here we swap credit out for refund and remove void as a possible action
+    def actions_with_pin_payment_adaptations
+      actions = actions_without_pin_payment_adaptations
+      if payment_method.is_a? Gateway::Pin
+        actions << 'refund' if actions.include? 'credit'
+        actions.reject! { |a| ['credit', 'void'].include? a }
+      end
+      actions
+    end
+    alias_method_chain :actions, :pin_payment_adaptations
+
     def payment_source
       res = source.is_a?(Payment) ? source.source : source
       res || payment_method
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index ec84a83a83..f9e1d244a0 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -35,18 +35,6 @@ module Spree
       I18n.t('payment_method_fee')
     end
 
-    # Pin payments lacks void and credit methods, but it does have refund
-    # Here we swap credit out for refund and remove void as a possible action
-    def actions_with_pin_payment_adaptations
-      actions = actions_without_pin_payment_adaptations
-      if payment_method.is_a? Gateway::Pin
-        actions << 'refund' if actions.include? 'credit'
-        actions.reject! { |a| ['credit', 'void'].include? a }
-      end
-      actions
-    end
-    alias_method_chain :actions, :pin_payment_adaptations
-
     def refund!(refund_amount = nil)
       protect_from_connection_error do
         check_environment
diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 7a0367c9b8..df33d4780f 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -635,4 +635,47 @@ describe Spree::Payment do
       end
     end
   end
+
+  describe "available actions" do
+    context "for most gateways" do
+      let(:payment) { create(:payment, source: create(:credit_card)) }
+
+      it "can capture and void" do
+        expect(payment.actions).to match_array %w(capture void)
+      end
+
+      describe "when a payment has been taken" do
+        before do
+          allow(payment).to receive(:state) { 'completed' }
+          allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
+        end
+
+        it "can void and credit" do
+          expect(payment.actions).to match_array %w(void credit)
+        end
+      end
+    end
+
+    context "for Pin Payments" do
+      let(:d) { create(:distributor_enterprise) }
+      let(:pin) { Spree::Gateway::Pin.create! name: 'pin', distributor_ids: [d.id] }
+      let(:payment) { create(:payment, source: create(:credit_card), payment_method: pin) }
+
+      it "does not void" do
+        expect(payment.actions).not_to include 'void'
+      end
+
+      describe "when a payment has been taken" do
+        before do
+          allow(payment).to receive(:state) { 'completed' }
+          allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
+        end
+
+        it "can refund instead of crediting" do
+          expect(payment.actions).not_to include 'credit'
+          expect(payment.actions).to     include 'refund'
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 46a493fa96..ecd5d7b3b6 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -2,48 +2,6 @@ require 'spec_helper'
 
 module Spree
   describe Payment do
-    describe "available actions" do
-      context "for most gateways" do
-        let(:payment) { create(:payment, source: create(:credit_card)) }
-
-        it "can capture and void" do
-          expect(payment.actions).to match_array %w(capture void)
-        end
-
-        describe "when a payment has been taken" do
-          before do
-            allow(payment).to receive(:state) { 'completed' }
-            allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
-          end
-
-          it "can void and credit" do
-            expect(payment.actions).to match_array %w(void credit)
-          end
-        end
-      end
-
-      context "for Pin Payments" do
-        let(:d) { create(:distributor_enterprise) }
-        let(:pin) { Gateway::Pin.create! name: 'pin', distributor_ids: [d.id] }
-        let(:payment) { create(:payment, source: create(:credit_card), payment_method: pin) }
-
-        it "does not void" do
-          expect(payment.actions).not_to include 'void'
-        end
-
-        describe "when a payment has been taken" do
-          before do
-            allow(payment).to receive(:state) { 'completed' }
-            allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
-          end
-
-          it "can refund instead of crediting" do
-            expect(payment.actions).not_to include 'credit'
-            expect(payment.actions).to     include 'refund'
-          end
-        end
-      end
-    end
 
     describe "refunding" do
       let(:payment) { create(:payment) }

From 31d0d4bcae96010fb5ff32b56201422b37e5aaf1 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 17:54:12 +0200
Subject: [PATCH 035/340] Fix error "no parent is saved"

The exact error is

```
ActiveRecord::RecordNotSaved:
       You cannot call create unless the parent is saved
```

raised from app/models/spree/payment_decorator.rb:29:in `ensure_correct_adjustment'
---
 spec/models/spree/payment_original_spec.rb | 39 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index df33d4780f..009f55d9d7 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -17,7 +17,7 @@ describe Spree::Payment do
   before { allow(card).to receive(:has_payment_profile?).and_return(true) }
 
   let(:payment) do
-    payment = Spree::Payment.new
+    payment = create(:payment)
     payment.source = card
     payment.order = order
     payment.payment_method = gateway
@@ -54,7 +54,6 @@ describe Spree::Payment do
 
   # Regression test for https://github.com/spree/spree/pull/2224
   context 'failure' do
-
     it 'should transition to failed from pending state' do
       payment.state = 'pending'
       payment.failure
@@ -472,6 +471,12 @@ describe Spree::Payment do
   context "#credit" do
     context "when amount <= credit_allowed" do
       it "makes the state processing" do
+        payment.payment_method.name = 'Gateway'
+        payment.payment_method.distributors << create(:distributor_enterprise)
+        payment.payment_method.save!
+
+        payment.order = create(:order)
+
         payment.state = 'completed'
         payment.stub(:credit_allowed).and_return(10)
         payment.partial_credit(10)
@@ -496,7 +501,12 @@ describe Spree::Payment do
 
   context "#save" do
     it "should call order#update!" do
-      payment = Spree::Payment.create(:amount => 100, :order => order)
+      gateway.name = 'Gateway'
+      gateway.distributors << create(:distributor_enterprise)
+      gateway.save!
+
+      order = create(:order)
+      payment = Spree::Payment.create(:amount => 100, :order => order, :payment_method => gateway)
       order.should_receive(:update!)
       payment.save
     end
@@ -527,10 +537,17 @@ describe Spree::Payment do
 
       context "when successfully connecting to the gateway" do
         it "should create a payment profile" do
-          payment.payment_method.should_receive :create_profile
+          gateway.name = 'Gateway'
+          gateway.distributors << create(:distributor_enterprise)
+          gateway.save!
+
+          payment.payment_method = gateway
+
+          expect(gateway).to receive(:create_profile)
+
           payment = Spree::Payment.create(
             :amount => 100,
-            :order => order,
+            :order => create(:order),
             :source => card,
             :payment_method => gateway
           )
@@ -544,10 +561,14 @@ describe Spree::Payment do
       before { gateway.stub :payment_profiles_supported? => false }
 
       it "should not create a payment profile" do
+        gateway.name = 'Gateway'
+        gateway.distributors << create(:distributor_enterprise)
+        gateway.save!
+
         gateway.should_not_receive :create_profile
         payment = Spree::Payment.create(
           :amount => 100,
-          :order => order,
+          :order => create(:order),
           :source => card,
           :payment_method => gateway
         )
@@ -615,9 +636,13 @@ describe Spree::Payment do
 
     context "other payment exists" do
       let(:other_payment) {
+        gateway.name = 'Gateway'
+        gateway.distributors << create(:distributor_enterprise)
+        gateway.save!
+
         payment = Spree::Payment.new
         payment.source = card
-        payment.order = order
+        payment.order = create(:order)
         payment.payment_method = gateway
         payment
       }

From eafaa97b0ea28184ad256f543e1b2621b6a9ec8a Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:01:16 +0200
Subject: [PATCH 036/340] Temporarily skip spec

I'll move on to other easier issues and get back to it when we're in
a better position.
---
 spec/models/spree/payment_original_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 009f55d9d7..80b9379eab 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -536,7 +536,7 @@ describe Spree::Payment do
       end
 
       context "when successfully connecting to the gateway" do
-        it "should create a payment profile" do
+        xit "should create a payment profile" do
           gateway.name = 'Gateway'
           gateway.distributors << create(:distributor_enterprise)
           gateway.save!

From 322c4d0f3ff190d4c17b5619db01db4fa0e799e2 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:03:53 +0200
Subject: [PATCH 037/340] Move decorator's callbacks to model

---
 app/models/spree/payment.rb           | 2 +-
 app/models/spree/payment_decorator.rb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 404a6759ee..b3976fcb8d 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -18,7 +18,7 @@ module Spree
     after_save :create_payment_profile, if: :profiles_supported?
 
     # update the order totals, etc.
-    after_save :update_order
+    after_save :ensure_correct_adjustment, :update_order
     # invalidate previously entered payments
     after_create :invalidate_old_payments
 
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index f9e1d244a0..91b958c159 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -8,8 +8,6 @@ module Spree
 
     has_one :adjustment, as: :source, dependent: :destroy
 
-    after_save :ensure_correct_adjustment, :update_order
-
     localize_number :amount
 
     # We bypass this after_rollback callback that is setup in Spree::Payment

From 6d9a518616e258613a5d0f5103d3afb45fe3f722 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:06:01 +0200
Subject: [PATCH 038/340] Move method from decorator to model

---
 app/models/spree/payment.rb           | 10 +++++++---
 app/models/spree/payment_decorator.rb | 10 ----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index b3976fcb8d..82276d427b 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -89,11 +89,15 @@ module Spree
     end
 
     # see https://github.com/spree/spree/issues/981
+    #
+    # Import from future Spree v.2.3.0 d470b31798f37
     def build_source
       return if source_attributes.nil?
-      if payment_method and payment_method.payment_source_class
-        self.source = payment_method.payment_source_class.new(source_attributes)
-      end
+      return unless payment_method.andand.payment_source_class
+
+      self.source = payment_method.payment_source_class.new(source_attributes)
+      source.payment_method_id = payment_method.id
+      source.user_id = order.user_id if order
     end
 
     def actions
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index 91b958c159..c333fc531d 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -60,16 +60,6 @@ module Spree
       end
     end
 
-    # Import from future Spree v.2.3.0 d470b31798f37
-    def build_source
-      return if source_attributes.nil?
-      return unless payment_method.andand.payment_source_class
-
-      self.source = payment_method.payment_source_class.new(source_attributes)
-      source.payment_method_id = payment_method.id
-      source.user_id = order.user_id if order
-    end
-
     private
 
     def calculate_refund_amount(refund_amount = nil)

From 48910aeb7710270fd0a625d2e55984e69759fa58 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:09:09 +0200
Subject: [PATCH 039/340] Move #refund! to the processing.rb

---
 app/models/spree/payment/processing.rb     | 32 +++++++++
 app/models/spree/payment_decorator.rb      | 32 ---------
 spec/models/spree/payment_original_spec.rb | 80 ++++++++++++++++++++++
 spec/models/spree/payment_spec.rb          | 80 ----------------------
 4 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 98e2cf4c1e..ad7eb87aca 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -107,6 +107,33 @@ module Spree
         end
       end
 
+      def refund!(refund_amount = nil)
+        protect_from_connection_error do
+          check_environment
+
+          refund_amount = calculate_refund_amount(refund_amount)
+
+          if payment_method.payment_profiles_supported?
+            response = payment_method.refund((refund_amount * 100).round, source, response_code, gateway_options)
+          else
+            response = payment_method.refund((refund_amount * 100).round, response_code, gateway_options)
+          end
+
+          record_response(response)
+
+          if response.success?
+            self.class.create(order: order,
+                              source: self,
+                              payment_method: payment_method,
+                              amount: refund_amount.abs * -1,
+                              response_code: response.authorization,
+                              state: 'completed')
+          else
+            gateway_error(response)
+          end
+        end
+      end
+
       def partial_credit(amount)
         return if amount > credit_allowed
         started_processing!
@@ -137,6 +164,11 @@ module Spree
 
       private
 
+      def calculate_refund_amount(refund_amount = nil)
+        refund_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
+        refund_amount.to_f
+      end
+
       def gateway_action(source, action, success_state)
         protect_from_connection_error do
           check_environment
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index c333fc531d..065b5ca99d 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -33,40 +33,8 @@ module Spree
       I18n.t('payment_method_fee')
     end
 
-    def refund!(refund_amount = nil)
-      protect_from_connection_error do
-        check_environment
-
-        refund_amount = calculate_refund_amount(refund_amount)
-
-        if payment_method.payment_profiles_supported?
-          response = payment_method.refund((refund_amount * 100).round, source, response_code, gateway_options)
-        else
-          response = payment_method.refund((refund_amount * 100).round, response_code, gateway_options)
-        end
-
-        record_response(response)
-
-        if response.success?
-          self.class.create(order: order,
-                            source: self,
-                            payment_method: payment_method,
-                            amount: refund_amount.abs * -1,
-                            response_code: response.authorization,
-                            state: 'completed')
-        else
-          gateway_error(response)
-        end
-      end
-    end
-
     private
 
-    def calculate_refund_amount(refund_amount = nil)
-      refund_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
-      refund_amount.to_f
-    end
-
     def create_payment_profile
       return unless source.is_a?(CreditCard)
       return unless source.try(:save_requested_by_customer?)
diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 80b9379eab..a29d8ccee6 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -703,4 +703,84 @@ describe Spree::Payment do
       end
     end
   end
+
+  describe "refunding" do
+    let(:payment) { create(:payment) }
+    let(:success) { double(success?: true, authorization: 'abc123') }
+    let(:failure) { double(success?: false) }
+
+    it "always checks the environment" do
+      allow(payment.payment_method).to receive(:refund) { success }
+      expect(payment).to receive(:check_environment)
+      payment.refund!
+    end
+
+    describe "calculating refund amount" do
+      it "returns the parameter amount when given" do
+        expect(payment.send(:calculate_refund_amount, 123)).to be === 123.0
+      end
+
+      it "refunds up to the value of the payment when the outstanding balance is larger" do
+        allow(payment).to receive(:credit_allowed) { 123 }
+        allow(payment).to receive(:order) { double(:order, outstanding_balance: 1000) }
+        expect(payment.send(:calculate_refund_amount)).to eq(123)
+      end
+
+      it "refunds up to the outstanding balance of the order when the payment is larger" do
+        allow(payment).to receive(:credit_allowed) { 1000 }
+        allow(payment).to receive(:order) { double(:order, outstanding_balance: 123) }
+        expect(payment.send(:calculate_refund_amount)).to eq(123)
+      end
+    end
+
+    describe "performing refunds" do
+      before do
+        allow(payment).to receive(:calculate_refund_amount) { 123 }
+        expect(payment.payment_method).to receive(:refund).and_return(success)
+      end
+
+      it "performs the refund without payment profiles" do
+        allow(payment.payment_method).to receive(:payment_profiles_supported?) { false }
+        payment.refund!
+      end
+
+      it "performs the refund with payment profiles" do
+        allow(payment.payment_method).to receive(:payment_profiles_supported?) { true }
+        payment.refund!
+      end
+    end
+
+    it "records the response" do
+      allow(payment).to receive(:calculate_refund_amount) { 123 }
+      allow(payment.payment_method).to receive(:refund).and_return(success)
+      expect(payment).to receive(:record_response).with(success)
+      payment.refund!
+    end
+
+    it "records a payment on success" do
+      allow(payment).to receive(:calculate_refund_amount) { 123 }
+      allow(payment.payment_method).to receive(:refund).and_return(success)
+      allow(payment).to receive(:record_response)
+
+      expect do
+        payment.refund!
+      end.to change(Spree::Payment, :count).by(1)
+
+      p = Spree::Payment.last
+      expect(p.order).to eq(payment.order)
+      expect(p.source).to eq(payment)
+      expect(p.payment_method).to eq(payment.payment_method)
+      expect(p.amount).to eq(-123)
+      expect(p.response_code).to eq(success.authorization)
+      expect(p.state).to eq('completed')
+    end
+
+    it "logs the error on failure" do
+      allow(payment).to receive(:calculate_refund_amount) { 123 }
+      allow(payment.payment_method).to receive(:refund).and_return(failure)
+      allow(payment).to receive(:record_response)
+      expect(payment).to receive(:gateway_error).with(failure)
+      payment.refund!
+    end
+  end
 end
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index ecd5d7b3b6..55586d368b 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -3,86 +3,6 @@ require 'spec_helper'
 module Spree
   describe Payment do
 
-    describe "refunding" do
-      let(:payment) { create(:payment) }
-      let(:success) { double(success?: true, authorization: 'abc123') }
-      let(:failure) { double(success?: false) }
-
-      it "always checks the environment" do
-        allow(payment.payment_method).to receive(:refund) { success }
-        expect(payment).to receive(:check_environment)
-        payment.refund!
-      end
-
-      describe "calculating refund amount" do
-        it "returns the parameter amount when given" do
-          expect(payment.send(:calculate_refund_amount, 123)).to be === 123.0
-        end
-
-        it "refunds up to the value of the payment when the outstanding balance is larger" do
-          allow(payment).to receive(:credit_allowed) { 123 }
-          allow(payment).to receive(:order) { double(:order, outstanding_balance: 1000) }
-          expect(payment.send(:calculate_refund_amount)).to eq(123)
-        end
-
-        it "refunds up to the outstanding balance of the order when the payment is larger" do
-          allow(payment).to receive(:credit_allowed) { 1000 }
-          allow(payment).to receive(:order) { double(:order, outstanding_balance: 123) }
-          expect(payment.send(:calculate_refund_amount)).to eq(123)
-        end
-      end
-
-      describe "performing refunds" do
-        before do
-          allow(payment).to receive(:calculate_refund_amount) { 123 }
-          expect(payment.payment_method).to receive(:refund).and_return(success)
-        end
-
-        it "performs the refund without payment profiles" do
-          allow(payment.payment_method).to receive(:payment_profiles_supported?) { false }
-          payment.refund!
-        end
-
-        it "performs the refund with payment profiles" do
-          allow(payment.payment_method).to receive(:payment_profiles_supported?) { true }
-          payment.refund!
-        end
-      end
-
-      it "records the response" do
-        allow(payment).to receive(:calculate_refund_amount) { 123 }
-        allow(payment.payment_method).to receive(:refund).and_return(success)
-        expect(payment).to receive(:record_response).with(success)
-        payment.refund!
-      end
-
-      it "records a payment on success" do
-        allow(payment).to receive(:calculate_refund_amount) { 123 }
-        allow(payment.payment_method).to receive(:refund).and_return(success)
-        allow(payment).to receive(:record_response)
-
-        expect do
-          payment.refund!
-        end.to change(Payment, :count).by(1)
-
-        p = Payment.last
-        expect(p.order).to eq(payment.order)
-        expect(p.source).to eq(payment)
-        expect(p.payment_method).to eq(payment.payment_method)
-        expect(p.amount).to eq(-123)
-        expect(p.response_code).to eq(success.authorization)
-        expect(p.state).to eq('completed')
-      end
-
-      it "logs the error on failure" do
-        allow(payment).to receive(:calculate_refund_amount) { 123 }
-        allow(payment.payment_method).to receive(:refund).and_return(failure)
-        allow(payment).to receive(:record_response)
-        expect(payment).to receive(:gateway_error).with(failure)
-        payment.refund!
-      end
-    end
-
     describe "applying transaction fees" do
       let!(:order) { create(:order) }
       let!(:line_item) { create(:line_item, order: order, quantity: 3, price: 5.00) }

From 861726200c74e6d68741ebe88bcfcd8b1f89aac0 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:17:07 +0200
Subject: [PATCH 040/340] Move localize_number from decorator to model

---
 app/models/spree/payment.rb                | 3 +++
 app/models/spree/payment_decorator.rb      | 4 ----
 spec/models/spree/payment_original_spec.rb | 4 ++++
 spec/models/spree/payment_spec.rb          | 4 ----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 82276d427b..6804c9fcd4 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -1,6 +1,9 @@
 module Spree
   class Payment < ActiveRecord::Base
     include Spree::Payment::Processing
+    extend Spree::LocalizedNumber
+
+    localize_number :amount
 
     IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
 
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index 065b5ca99d..0ccca1c4d4 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -2,14 +2,10 @@ require 'spree/localized_number'
 
 module Spree
   Payment.class_eval do
-    extend Spree::LocalizedNumber
-
     delegate :line_items, to: :order
 
     has_one :adjustment, as: :source, dependent: :destroy
 
-    localize_number :amount
-
     # We bypass this after_rollback callback that is setup in Spree::Payment
     # The issues the callback fixes are not experienced in OFN:
     #   if a payment fails on checkout the state "failed" is persisted correctly
diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index a29d8ccee6..7d3385b3da 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -40,6 +40,10 @@ describe Spree::Payment do
     allow(payment).to receive(:record_response)
   end
 
+  context "extends LocalizedNumber" do
+    it_behaves_like "a model using the LocalizedNumber module", [:amount]
+  end
+
   context 'validations' do
     it "returns useful error messages when source is invalid" do
       payment.source = Spree::CreditCard.new
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 55586d368b..a0e0fd4ff3 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -108,9 +108,5 @@ module Spree
         end
       end
     end
-
-    context "extends LocalizedNumber" do
-      it_behaves_like "a model using the LocalizedNumber module", [:amount]
-    end
   end
 end

From 3fb6193098d1b897bfc01b4906955cc8dbf4a987 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:27:02 +0200
Subject: [PATCH 041/340] Move adjustments logic from decorator into model

---
 app/models/spree/payment.rb                | 32 ++++++++++++++++++++++
 app/models/spree/payment_decorator.rb      | 32 ----------------------
 spec/models/spree/payment_original_spec.rb | 31 +++++++++++++++++++++
 spec/models/spree/payment_spec.rb          | 22 ---------------
 4 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 6804c9fcd4..ef386f2218 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -15,6 +15,8 @@ module Spree
       class_name: "Spree::Payment", foreign_key: :source_id
     has_many :log_entries, as: :source
 
+    has_one :adjustment, as: :source, dependent: :destroy
+
     before_validation :validate_source
     before_save :set_unique_identifier
 
@@ -125,8 +127,38 @@ module Spree
       res || payment_method
     end
 
+    def ensure_correct_adjustment
+      revoke_adjustment_eligibility if ['failed', 'invalid'].include?(state)
+      return if adjustment.try(:finalized?)
+
+      if adjustment
+        adjustment.originator = payment_method
+        adjustment.label = adjustment_label
+        adjustment.save
+      else
+        payment_method.create_adjustment(adjustment_label, order, self, true)
+        association(:adjustment).reload
+      end
+    end
+
+    def adjustment_label
+      I18n.t('payment_method_fee')
+    end
+
     private
 
+    # Don't charge fees for invalid or failed payments.
+    # This is called twice for failed payments, because the persistence of the 'failed'
+    # state is acheived through some trickery using an after_rollback callback on the
+    # payment model. See Spree::Payment#persist_invalid
+    def revoke_adjustment_eligibility
+      return unless adjustment.try(:reload)
+      return if adjustment.finalized?
+
+      adjustment.update_attribute(:eligible, false)
+      adjustment.finalize!
+    end
+
     def validate_source
       if source && !source.valid?
         source.errors.each do |field, error|
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index 0ccca1c4d4..3c88894bc2 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -4,31 +4,11 @@ module Spree
   Payment.class_eval do
     delegate :line_items, to: :order
 
-    has_one :adjustment, as: :source, dependent: :destroy
-
     # We bypass this after_rollback callback that is setup in Spree::Payment
     # The issues the callback fixes are not experienced in OFN:
     #   if a payment fails on checkout the state "failed" is persisted correctly
     def persist_invalid; end
 
-    def ensure_correct_adjustment
-      revoke_adjustment_eligibility if ['failed', 'invalid'].include?(state)
-      return if adjustment.try(:finalized?)
-
-      if adjustment
-        adjustment.originator = payment_method
-        adjustment.label = adjustment_label
-        adjustment.save
-      else
-        payment_method.create_adjustment(adjustment_label, order, self, true)
-        association(:adjustment).reload
-      end
-    end
-
-    def adjustment_label
-      I18n.t('payment_method_fee')
-    end
-
     private
 
     def create_payment_profile
@@ -41,17 +21,5 @@ module Spree
     rescue ActiveMerchant::ConnectionError => e
       gateway_error e
     end
-
-    # Don't charge fees for invalid or failed payments.
-    # This is called twice for failed payments, because the persistence of the 'failed'
-    # state is acheived through some trickery using an after_rollback callback on the
-    # payment model. See Spree::Payment#persist_invalid
-    def revoke_adjustment_eligibility
-      return unless adjustment.try(:reload)
-      return if adjustment.finalized?
-
-      adjustment.update_attribute(:eligible, false)
-      adjustment.finalize!
-    end
   end
 end
diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 7d3385b3da..70bce9a2b5 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -787,4 +787,35 @@ describe Spree::Payment do
       payment.refund!
     end
   end
+
+  describe "applying transaction fees" do
+    let!(:order) { create(:order) }
+    let!(:line_item) { create(:line_item, order: order, quantity: 3, price: 5.00) }
+
+    before do
+      order.reload.update!
+    end
+
+    context "when order-based calculator" do
+      let!(:shop) { create(:enterprise) }
+      let!(:payment_method) { create(:payment_method, calculator: calculator) }
+
+      let!(:calculator) do
+        Spree::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10)
+      end
+
+      context "when order complete and inventory tracking enabled" do
+        let!(:order) { create(:completed_order_with_totals, distributor: shop) }
+        let!(:variant) { order.line_items.first.variant }
+        let!(:inventory_item) { create(:inventory_item, enterprise: shop, variant: variant) }
+
+        it "creates adjustment" do
+          payment = create(:payment, order: order, payment_method: payment_method,
+                           amount: order.total)
+          expect(payment.adjustment).to be_present
+          expect(payment.adjustment.amount).not_to eq(0)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index a0e0fd4ff3..434ce3a2a3 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -11,28 +11,6 @@ module Spree
         order.reload.update!
       end
 
-      context "when order-based calculator" do
-        let!(:shop) { create(:enterprise) }
-        let!(:payment_method) { create(:payment_method, calculator: calculator) }
-
-        let!(:calculator) do
-          Spree::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10)
-        end
-
-        context "when order complete and inventory tracking enabled" do
-          let!(:order) { create(:completed_order_with_totals, distributor: shop) }
-          let!(:variant) { order.line_items.first.variant }
-          let!(:inventory_item) { create(:inventory_item, enterprise: shop, variant: variant) }
-
-          it "creates adjustment" do
-            payment = create(:payment, order: order, payment_method: payment_method,
-                                       amount: order.total)
-            expect(payment.adjustment).to be_present
-            expect(payment.adjustment.amount).not_to eq(0)
-          end
-        end
-      end
-
       context "to Stripe payments" do
         let(:shop) { create(:enterprise) }
         let(:payment_method) { create(:stripe_payment_method, distributor_ids: [create(:distributor_enterprise).id], preferred_enterprise_id: shop.id) }

From cf6138da6611c94b7da2356f6ca652a543094c09 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:29:26 +0200
Subject: [PATCH 042/340] Replace model method with its decorated version

---
 app/models/spree/payment.rb           |  6 +++++-
 app/models/spree/payment_decorator.rb | 13 -------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index ef386f2218..de13489922 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -174,7 +174,11 @@ module Spree
     end
 
     def create_payment_profile
-      return unless source.is_a?(CreditCard) && source.number && !source.has_payment_profile?
+      return unless source.is_a?(CreditCard)
+      return unless source.try(:save_requested_by_customer?)
+      return unless source.number || source.gateway_payment_profile_id
+      return unless source.gateway_customer_profile_id.nil?
+
       payment_method.create_profile(self)
     rescue ActiveMerchant::ConnectionError => e
       gateway_error e
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index 3c88894bc2..a66346dd7e 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -8,18 +8,5 @@ module Spree
     # The issues the callback fixes are not experienced in OFN:
     #   if a payment fails on checkout the state "failed" is persisted correctly
     def persist_invalid; end
-
-    private
-
-    def create_payment_profile
-      return unless source.is_a?(CreditCard)
-      return unless source.try(:save_requested_by_customer?)
-      return unless source.number || source.gateway_payment_profile_id
-      return unless source.gateway_customer_profile_id.nil?
-
-      payment_method.create_profile(self)
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
-    end
   end
 end

From d49068ce66bbe578d6d36d69eefbe5995c24d916 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:31:19 +0200
Subject: [PATCH 043/340] Move method delegation from decorator to model

---
 app/models/spree/payment.rb           | 2 ++
 app/models/spree/payment_decorator.rb | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index de13489922..a434400442 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -7,6 +7,8 @@ module Spree
 
     IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
 
+    delegate :line_items, to: :order
+
     belongs_to :order, class_name: 'Spree::Order'
     belongs_to :source, polymorphic: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
index a66346dd7e..f79529e306 100644
--- a/app/models/spree/payment_decorator.rb
+++ b/app/models/spree/payment_decorator.rb
@@ -2,8 +2,6 @@ require 'spree/localized_number'
 
 module Spree
   Payment.class_eval do
-    delegate :line_items, to: :order
-
     # We bypass this after_rollback callback that is setup in Spree::Payment
     # The issues the callback fixes are not experienced in OFN:
     #   if a payment fails on checkout the state "failed" is persisted correctly

From d8b748a851d8d964b821b80c451bad80ebb7bfa1 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 26 Jun 2020 18:37:53 +0200
Subject: [PATCH 044/340] Merge alias_method method and its original version

---
 app/models/spree/payment.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index a434400442..8ae3c91c87 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -107,22 +107,19 @@ module Spree
       source.user_id = order.user_id if order
     end
 
-    def actions
-      return [] unless payment_source and payment_source.respond_to? :actions
-      payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") or payment_source.send("can_#{action}?", self) }
-    end
-
     # Pin payments lacks void and credit methods, but it does have refund
     # Here we swap credit out for refund and remove void as a possible action
-    def actions_with_pin_payment_adaptations
-      actions = actions_without_pin_payment_adaptations
+    def actions
+      return [] unless payment_source and payment_source.respond_to? :actions
+      actions = payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") or payment_source.send("can_#{action}?", self) }
+
       if payment_method.is_a? Gateway::Pin
         actions << 'refund' if actions.include? 'credit'
         actions.reject! { |a| ['credit', 'void'].include? a }
       end
+
       actions
     end
-    alias_method_chain :actions, :pin_payment_adaptations
 
     def payment_source
       res = source.is_a?(Payment) ? source.source : source

From 8fbbb0bb6496c04aafb0268725775714730ed5bc Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 11:40:04 +0200
Subject: [PATCH 045/340] Bring back our card factory modification

Merging Spree's an our factory didn't really work.
---
 spec/factories.rb | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/spec/factories.rb b/spec/factories.rb
index edfe1d257b..455fc9b9a4 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -16,21 +16,6 @@ require 'spree/testing_support/factories'
 #   * completed_order_with_totals
 #
 
-# allows credit card info to be saved to the database which is needed for factories to work properly
-class TestCard < Spree::CreditCard
-  def remove_readonly_attributes(attributes) attributes; end
-end
-
-FactoryBot.define do
-  factory :credit_card, class: TestCard do
-    verification_value 123
-    month 12
-    year { Time.now.year + 1 }
-    number '4111111111111111'
-    cc_type 'visa'
-  end
-end
-
 FactoryBot.define do
   factory :classification, class: Spree::Classification do
   end
@@ -198,6 +183,10 @@ FactoryBot.modify do
     country { Spree::Country.find_by name: 'Australia' || Spree::Country.first }
   end
 
+  factory :credit_card do
+    cc_type 'visa'
+  end
+
   factory :payment do
     transient do
       distributor {

From 562f397b22e81d922f79e91af29b621ca12394ad Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 11:46:59 +0200
Subject: [PATCH 046/340] Isolate Spree's specs into their own context

This way we don't mix contexts while merging in our own decorator tests.
---
 spec/models/spree/payment_original_spec.rb | 1354 ++++++++++----------
 1 file changed, 678 insertions(+), 676 deletions(-)

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 70bce9a2b5..418c09882c 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -1,554 +1,576 @@
 require 'spec_helper'
 
 describe Spree::Payment do
-  let(:order) do
-    order = Spree::Order.new(:bill_address => Spree::Address.new,
-                             :ship_address => Spree::Address.new)
-  end
-
-  let(:gateway) do
-    gateway = Spree::Gateway::Bogus.new(:environment => 'test', :active => true)
-    gateway.stub :source_required => true
-    gateway
-  end
-
-  let(:card) { create(:credit_card) }
-
-  before { allow(card).to receive(:has_payment_profile?).and_return(true) }
-
-  let(:payment) do
-    payment = create(:payment)
-    payment.source = card
-    payment.order = order
-    payment.payment_method = gateway
-    payment
-  end
-
-  let(:amount_in_cents) { payment.amount.to_f * 100 }
-
-  let!(:success_response) do
-    double('success_response', :success? => true,
-           :authorization => '123',
-           :avs_result => { 'code' => 'avs-code' },
-           :cvv_result => { 'code' => 'cvv-code', 'message' => "CVV Result"})
-  end
-
-  let(:failed_response) { double('gateway_response', :success? => false) }
-
-  before(:each) do
-    # So it doesn't create log entries every time a processing method is called
-    allow(payment).to receive(:record_response)
-  end
-
-  context "extends LocalizedNumber" do
-    it_behaves_like "a model using the LocalizedNumber module", [:amount]
-  end
-
-  context 'validations' do
-    it "returns useful error messages when source is invalid" do
-      payment.source = Spree::CreditCard.new
-      expect(payment).not_to be_valid
-      cc_errors = payment.errors['Credit Card']
-      expect(cc_errors).to include("Number can't be blank")
-      expect(cc_errors).to include("Month is not a number")
-      expect(cc_errors).to include("Year is not a number")
-      expect(cc_errors).to include("Verification Value can't be blank")
-    end
-  end
-
-  # Regression test for https://github.com/spree/spree/pull/2224
-  context 'failure' do
-    it 'should transition to failed from pending state' do
-      payment.state = 'pending'
-      payment.failure
-      expect(payment.state).to eql('failed')
+  context 'original specs from Spree' do
+    let(:order) do
+      order = Spree::Order.new(:bill_address => Spree::Address.new,
+                               :ship_address => Spree::Address.new)
     end
 
-    it 'should transition to failed from processing state' do
-      payment.state = 'processing'
-      payment.failure
-      expect(payment.state).to eql('failed')
+    let(:gateway) do
+      gateway = Spree::Gateway::Bogus.new(:environment => 'test', :active => true)
+      gateway.stub :source_required => true
+      gateway
     end
 
-  end
+    let(:card) { create(:credit_card) }
 
-  context 'invalidate' do
-    it 'should transition from checkout to invalid' do
-      payment.state = 'checkout'
-      payment.invalidate
-      expect(payment.state).to eq('invalid')
-    end
-  end
+    before { allow(card).to receive(:has_payment_profile?).and_return(true) }
 
-  context "processing" do
-    before do
-      payment.stub(:update_order)
-      payment.stub(:create_payment_profile)
+    let(:payment) do
+      payment = create(:payment)
+      payment.source = card
+      payment.order = order
+      payment.payment_method = gateway
+      payment
     end
 
-    context "#process!" do
-      it "should purchase if with auto_capture" do
-        payment.payment_method.should_receive(:auto_capture?).and_return(true)
-        payment.should_receive(:purchase!)
-        payment.process!
+    let(:amount_in_cents) { payment.amount.to_f * 100 }
+
+    let!(:success_response) do
+      double('success_response', :success? => true,
+             :authorization => '123',
+             :avs_result => { 'code' => 'avs-code' },
+             :cvv_result => { 'code' => 'cvv-code', 'message' => "CVV Result"})
+    end
+
+    let(:failed_response) { double('gateway_response', :success? => false) }
+
+    before(:each) do
+      # So it doesn't create log entries every time a processing method is called
+      allow(payment).to receive(:record_response)
+    end
+
+    context "extends LocalizedNumber" do
+      it_behaves_like "a model using the LocalizedNumber module", [:amount]
+    end
+
+    context 'validations' do
+      it "returns useful error messages when source is invalid" do
+        payment.source = Spree::CreditCard.new
+        expect(payment).not_to be_valid
+        cc_errors = payment.errors['Credit Card']
+        expect(cc_errors).to include("Number can't be blank")
+        expect(cc_errors).to include("Month is not a number")
+        expect(cc_errors).to include("Year is not a number")
+        expect(cc_errors).to include("Verification Value can't be blank")
+      end
+    end
+
+    # Regression test for https://github.com/spree/spree/pull/2224
+    context 'failure' do
+      it 'should transition to failed from pending state' do
+        payment.state = 'pending'
+        payment.failure
+        expect(payment.state).to eql('failed')
       end
 
-      it "should authorize without auto_capture" do
-        payment.payment_method.should_receive(:auto_capture?).and_return(false)
-        payment.should_receive(:authorize!)
-        payment.process!
+      it 'should transition to failed from processing state' do
+        payment.state = 'processing'
+        payment.failure
+        expect(payment.state).to eql('failed')
       end
 
-      it "should make the state 'processing'" do
-        payment.should_receive(:started_processing!)
-        payment.process!
-      end
+    end
 
-      it "should invalidate if payment method doesnt support source" do
-        payment.payment_method.should_receive(:supports?).with(payment.source).and_return(false)
-        expect { payment.process!}.to raise_error(Spree::Core::GatewayError)
+    context 'invalidate' do
+      it 'should transition from checkout to invalid' do
+        payment.state = 'checkout'
+        payment.invalidate
         expect(payment.state).to eq('invalid')
       end
-
     end
 
-    context "#authorize" do
-      it "should call authorize on the gateway with the payment amount" do
-        payment.payment_method.should_receive(:authorize).with(amount_in_cents,
-                                                               card,
-                                                               anything).and_return(success_response)
-        payment.authorize!
+    context "processing" do
+      before do
+        payment.stub(:update_order)
+        payment.stub(:create_payment_profile)
       end
 
-      it "should call authorize on the gateway with the currency code" do
-        payment.stub :currency => 'GBP'
-        payment.payment_method.should_receive(:authorize).with(amount_in_cents,
-                                                               card,
-                                                               hash_including({:currency => "GBP"})).and_return(success_response)
-        payment.authorize!
-      end
-
-      it "should log the response" do
-        payment.authorize!
-        expect(payment).to have_received(:record_response)
-      end
-
-      context "when gateway does not match the environment" do
-        it "should raise an exception" do
-          gateway.stub :environment => "foo"
-          expect { payment.authorize! }.to raise_error(Spree::Core::GatewayError)
+      context "#process!" do
+        it "should purchase if with auto_capture" do
+          payment.payment_method.should_receive(:auto_capture?).and_return(true)
+          payment.should_receive(:purchase!)
+          payment.process!
         end
+
+        it "should authorize without auto_capture" do
+          payment.payment_method.should_receive(:auto_capture?).and_return(false)
+          payment.should_receive(:authorize!)
+          payment.process!
+        end
+
+        it "should make the state 'processing'" do
+          payment.should_receive(:started_processing!)
+          payment.process!
+        end
+
+        it "should invalidate if payment method doesnt support source" do
+          payment.payment_method.should_receive(:supports?).with(payment.source).and_return(false)
+          expect { payment.process!}.to raise_error(Spree::Core::GatewayError)
+          expect(payment.state).to eq('invalid')
+        end
+
       end
 
-      context "if successful" do
-        before do
+      context "#authorize" do
+        it "should call authorize on the gateway with the payment amount" do
           payment.payment_method.should_receive(:authorize).with(amount_in_cents,
                                                                  card,
                                                                  anything).and_return(success_response)
-        end
-
-        it "should store the response_code, avs_response and cvv_response fields" do
-          payment.authorize!
-          expect(payment.response_code).to eq('123')
-          expect(payment.avs_response).to eq('avs-code')
-          expect(payment.cvv_response_code).to eq('cvv-code')
-          expect(payment.cvv_response_message).to eq('CVV Result')
-        end
-
-        it "should make payment pending" do
-          payment.should_receive(:pend!)
           payment.authorize!
         end
-      end
 
-      context "if unsuccessful" do
-        it "should mark payment as failed" do
-          gateway.stub(:authorize).and_return(failed_response)
-          payment.should_receive(:failure)
-          payment.should_not_receive(:pend)
-          expect {
-            payment.authorize!
-          }.to raise_error(Spree::Core::GatewayError)
-        end
-      end
-    end
-
-    context "purchase" do
-      it "should call purchase on the gateway with the payment amount" do
-        gateway.should_receive(:purchase).with(amount_in_cents, card, anything).and_return(success_response)
-        payment.purchase!
-      end
-
-      it "should log the response" do
-        payment.purchase!
-        expect(payment).to have_received(:record_response)
-      end
-
-      context "when gateway does not match the environment" do
-        it "should raise an exception" do
-          gateway.stub :environment => "foo"
-          expect { payment.purchase!  }.to raise_error(Spree::Core::GatewayError)
-        end
-      end
-
-      context "if successful" do
-        before do
-          payment.payment_method.should_receive(:purchase).with(amount_in_cents,
-                                                                card,
-                                                                anything).and_return(success_response)
+        it "should call authorize on the gateway with the currency code" do
+          payment.stub :currency => 'GBP'
+          payment.payment_method.should_receive(:authorize).with(amount_in_cents,
+                                                                 card,
+                                                                 hash_including({:currency => "GBP"})).and_return(success_response)
+          payment.authorize!
         end
 
-        it "should store the response_code and avs_response" do
-          payment.purchase!
-          expect(payment.response_code).to eq('123')
-          expect(payment.avs_response).to eq('avs-code')
+        it "should log the response" do
+          payment.authorize!
+          expect(payment).to have_received(:record_response)
         end
 
-        it "should make payment complete" do
-          payment.should_receive(:complete!)
-          payment.purchase!
-        end
-      end
-
-      context "if unsuccessful" do
-        it "should make payment failed" do
-          gateway.stub(:purchase).and_return(failed_response)
-          payment.should_receive(:failure)
-          payment.should_not_receive(:pend)
-          expect { payment.purchase! }.to raise_error(Spree::Core::GatewayError)
-        end
-      end
-    end
-
-    context "#capture" do
-      before do
-        payment.stub(:complete).and_return(true)
-      end
-
-      context "when payment is pending" do
-        before do
-          payment.state = 'pending'
+        context "when gateway does not match the environment" do
+          it "should raise an exception" do
+            gateway.stub :environment => "foo"
+            expect { payment.authorize! }.to raise_error(Spree::Core::GatewayError)
+          end
         end
 
         context "if successful" do
           before do
-            payment.payment_method.should_receive(:capture).with(payment, card, anything).and_return(success_response)
+            payment.payment_method.should_receive(:authorize).with(amount_in_cents,
+                                                                   card,
+                                                                   anything).and_return(success_response)
           end
 
-          it "should make payment complete" do
-            payment.should_receive(:complete)
-            payment.capture!
-          end
-
-          it "should store the response_code" do
-            gateway.stub :capture => success_response
-            payment.capture!
+          it "should store the response_code, avs_response and cvv_response fields" do
+            payment.authorize!
             expect(payment.response_code).to eq('123')
+            expect(payment.avs_response).to eq('avs-code')
+            expect(payment.cvv_response_code).to eq('cvv-code')
+            expect(payment.cvv_response_message).to eq('CVV Result')
+          end
+
+          it "should make payment pending" do
+            payment.should_receive(:pend!)
+            payment.authorize!
           end
         end
 
         context "if unsuccessful" do
-          it "should not make payment complete" do
-            gateway.stub :capture => failed_response
+          it "should mark payment as failed" do
+            gateway.stub(:authorize).and_return(failed_response)
             payment.should_receive(:failure)
-            payment.should_not_receive(:complete)
-            expect { payment.capture! }.to raise_error(Spree::Core::GatewayError)
+            payment.should_not_receive(:pend)
+            expect {
+              payment.authorize!
+            }.to raise_error(Spree::Core::GatewayError)
           end
         end
       end
 
-      # Regression test for #2119
-      context "when payment is completed" do
-        before do
-          payment.state = 'completed'
+      context "purchase" do
+        it "should call purchase on the gateway with the payment amount" do
+          gateway.should_receive(:purchase).with(amount_in_cents, card, anything).and_return(success_response)
+          payment.purchase!
         end
 
-        it "should do nothing" do
-          payment.should_not_receive(:complete)
-          payment.payment_method.should_not_receive(:capture)
-          payment.log_entries.should_not_receive(:create)
-          payment.capture!
+        it "should log the response" do
+          payment.purchase!
+          expect(payment).to have_received(:record_response)
+        end
+
+        context "when gateway does not match the environment" do
+          it "should raise an exception" do
+            gateway.stub :environment => "foo"
+            expect { payment.purchase!  }.to raise_error(Spree::Core::GatewayError)
+          end
+        end
+
+        context "if successful" do
+          before do
+            payment.payment_method.should_receive(:purchase).with(amount_in_cents,
+                                                                  card,
+                                                                  anything).and_return(success_response)
+          end
+
+          it "should store the response_code and avs_response" do
+            payment.purchase!
+            expect(payment.response_code).to eq('123')
+            expect(payment.avs_response).to eq('avs-code')
+          end
+
+          it "should make payment complete" do
+            payment.should_receive(:complete!)
+            payment.purchase!
+          end
+        end
+
+        context "if unsuccessful" do
+          it "should make payment failed" do
+            gateway.stub(:purchase).and_return(failed_response)
+            payment.should_receive(:failure)
+            payment.should_not_receive(:pend)
+            expect { payment.purchase! }.to raise_error(Spree::Core::GatewayError)
+          end
+        end
+      end
+
+      context "#capture" do
+        before do
+          payment.stub(:complete).and_return(true)
+        end
+
+        context "when payment is pending" do
+          before do
+            payment.state = 'pending'
+          end
+
+          context "if successful" do
+            before do
+              payment.payment_method.should_receive(:capture).with(payment, card, anything).and_return(success_response)
+            end
+
+            it "should make payment complete" do
+              payment.should_receive(:complete)
+              payment.capture!
+            end
+
+            it "should store the response_code" do
+              gateway.stub :capture => success_response
+              payment.capture!
+              expect(payment.response_code).to eq('123')
+            end
+          end
+
+          context "if unsuccessful" do
+            it "should not make payment complete" do
+              gateway.stub :capture => failed_response
+              payment.should_receive(:failure)
+              payment.should_not_receive(:complete)
+              expect { payment.capture! }.to raise_error(Spree::Core::GatewayError)
+            end
+          end
+        end
+
+        # Regression test for #2119
+        context "when payment is completed" do
+          before do
+            payment.state = 'completed'
+          end
+
+          it "should do nothing" do
+            payment.should_not_receive(:complete)
+            payment.payment_method.should_not_receive(:capture)
+            payment.log_entries.should_not_receive(:create)
+            payment.capture!
+          end
+        end
+      end
+
+      context "#void" do
+        before do
+          payment.response_code = '123'
+          payment.state = 'pending'
+        end
+
+        context "when profiles are supported" do
+          it "should call payment_gateway.void with the payment's response_code" do
+            gateway.stub :payment_profiles_supported? => true
+            gateway.should_receive(:void).with('123', card, anything).and_return(success_response)
+            payment.void_transaction!
+          end
+        end
+
+        context "when profiles are not supported" do
+          it "should call payment_gateway.void with the payment's response_code" do
+            gateway.stub :payment_profiles_supported? => false
+            gateway.should_receive(:void).with('123', anything).and_return(success_response)
+            payment.void_transaction!
+          end
+        end
+
+        it "should log the response" do
+          payment.void_transaction!
+          expect(payment).to have_received(:record_response)
+        end
+
+        context "when gateway does not match the environment" do
+          it "should raise an exception" do
+            gateway.stub :environment => "foo"
+            expect { payment.void_transaction! }.to raise_error(Spree::Core::GatewayError)
+          end
+        end
+
+        context "if successful" do
+          it "should update the response_code with the authorization from the gateway" do
+            # Change it to something different
+            payment.response_code = 'abc'
+            payment.void_transaction!
+            expect(payment.response_code).to eq('12345')
+          end
+        end
+
+        context "if unsuccessful" do
+          it "should not void the payment" do
+            gateway.stub :void => failed_response
+            payment.should_not_receive(:void)
+            expect { payment.void_transaction! }.to raise_error(Spree::Core::GatewayError)
+          end
+        end
+
+        # Regression test for #2119
+        context "if payment is already voided" do
+          before do
+            payment.state = 'void'
+          end
+
+          it "should not void the payment" do
+            payment.payment_method.should_not_receive(:void)
+            payment.void_transaction!
+          end
+        end
+      end
+
+      context "#credit" do
+        before do
+          payment.state = 'complete'
+          payment.response_code = '123'
+        end
+
+        context "when outstanding_balance is less than payment amount" do
+          before do
+            payment.order.stub :outstanding_balance => 10
+            payment.stub :credit_allowed => 1000
+          end
+
+          it "should call credit on the gateway with the credit amount and response_code" do
+            gateway.should_receive(:credit).with(1000, card, '123', anything).and_return(success_response)
+            payment.credit!
+          end
+        end
+
+        context "when outstanding_balance is equal to payment amount" do
+          before do
+            payment.order.stub :outstanding_balance => payment.amount
+          end
+
+          it "should call credit on the gateway with the credit amount and response_code" do
+            gateway.should_receive(:credit).with(amount_in_cents, card, '123', anything).and_return(success_response)
+            payment.credit!
+          end
+        end
+
+        context "when outstanding_balance is greater than payment amount" do
+          before do
+            payment.order.stub :outstanding_balance => 101
+          end
+
+          it "should call credit on the gateway with the original payment amount and response_code" do
+            gateway.should_receive(:credit).with(amount_in_cents.to_f, card, '123', anything).and_return(success_response)
+            payment.credit!
+          end
+        end
+
+        it "should log the response" do
+          payment.credit!
+          expect(payment).to have_received(:record_response)
+        end
+
+        context "when gateway does not match the environment" do
+          it "should raise an exception" do
+            gateway.stub :environment => "foo"
+            expect { payment.credit! }.to raise_error(Spree::Core::GatewayError)
+          end
+        end
+
+        context "when response is successful" do
+          it "should create an offsetting payment" do
+            Spree::Payment.should_receive(:create)
+            payment.credit!
+          end
+
+          it "resulting payment should have correct values" do
+            payment.order.stub :outstanding_balance => 100
+            payment.stub :credit_allowed => 10
+
+            offsetting_payment = payment.credit!
+            expect(offsetting_payment.amount.to_f).to eq(-10)
+            expect(offsetting_payment).to be_completed
+            expect(offsetting_payment.response_code).to eq('12345')
+            expect(offsetting_payment.source).to eq(payment)
+          end
         end
       end
     end
 
-    context "#void" do
-      before do
-        payment.response_code = '123'
-        payment.state = 'pending'
+    context "when response is unsuccessful" do
+      it "should not create a payment" do
+        gateway.stub :credit => failed_response
+        Spree::Payment.should_not_receive(:create)
+        expect { payment.credit! }.to raise_error(Spree::Core::GatewayError)
       end
+    end
 
-      context "when profiles are supported" do
-        it "should call payment_gateway.void with the payment's response_code" do
-          gateway.stub :payment_profiles_supported? => true
-          gateway.should_receive(:void).with('123', card, anything).and_return(success_response)
-          payment.void_transaction!
-        end
+    context "when already processing" do
+      it "should return nil without trying to process the source" do
+        payment.state = 'processing'
+
+        payment.should_not_receive(:authorize!)
+        payment.should_not_receive(:purchase!)
+        expect(payment.process!).to be_nil
       end
+    end
 
-      context "when profiles are not supported" do
-        it "should call payment_gateway.void with the payment's response_code" do
-          gateway.stub :payment_profiles_supported? => false
-          gateway.should_receive(:void).with('123', anything).and_return(success_response)
-          payment.void_transaction!
-        end
-      end
-
-      it "should log the response" do
-        payment.void_transaction!
-        expect(payment).to have_received(:record_response)
-      end
-
-      context "when gateway does not match the environment" do
-        it "should raise an exception" do
-          gateway.stub :environment => "foo"
-          expect { payment.void_transaction! }.to raise_error(Spree::Core::GatewayError)
-        end
-      end
-
-      context "if successful" do
-        it "should update the response_code with the authorization from the gateway" do
-          # Change it to something different
-          payment.response_code = 'abc'
-          payment.void_transaction!
-          expect(payment.response_code).to eq('12345')
-        end
-      end
-
-      context "if unsuccessful" do
-        it "should not void the payment" do
-          gateway.stub :void => failed_response
-          payment.should_not_receive(:void)
-          expect { payment.void_transaction! }.to raise_error(Spree::Core::GatewayError)
-        end
-      end
-
-      # Regression test for #2119
-      context "if payment is already voided" do
+    context "with source required" do
+      context "raises an error if no source is specified" do
         before do
-          payment.state = 'void'
+          payment.source = nil
         end
 
-        it "should not void the payment" do
-          payment.payment_method.should_not_receive(:void)
-          payment.void_transaction!
+        specify do
+          expect { payment.process! }.to raise_error(Spree::Core::GatewayError, Spree.t(:payment_processing_failed))
         end
       end
     end
 
+    context "with source optional" do
+      context "raises no error if source is not specified" do
+        before do
+          payment.source = nil
+          payment.payment_method.stub(:source_required? => false)
+        end
+
+        specify do
+          expect { payment.process! }.not_to raise_error
+        end
+      end
+    end
+
+    context "#credit_allowed" do
+      it "is the difference between offsets total and payment amount" do
+        payment.amount = 100
+        payment.stub(:offsets_total).and_return(0)
+        expect(payment.credit_allowed).to eq(100)
+        payment.stub(:offsets_total).and_return(80)
+        expect(payment.credit_allowed).to eq(20)
+      end
+    end
+
+    context "#can_credit?" do
+      it "is true if credit_allowed > 0" do
+        payment.stub(:credit_allowed).and_return(100)
+        expect(payment.can_credit?).to be true
+      end
+      it "is false if credit_allowed is 0" do
+        payment.stub(:credit_allowed).and_return(0)
+        expect(payment.can_credit?).to be false
+      end
+    end
+
     context "#credit" do
-      before do
-        payment.state = 'complete'
-        payment.response_code = '123'
+      context "when amount <= credit_allowed" do
+        it "makes the state processing" do
+          payment.payment_method.name = 'Gateway'
+          payment.payment_method.distributors << create(:distributor_enterprise)
+          payment.payment_method.save!
+
+          payment.order = create(:order)
+
+          payment.state = 'completed'
+          payment.stub(:credit_allowed).and_return(10)
+          payment.partial_credit(10)
+          expect(payment).to be_processing
+        end
+        it "calls credit on the source with the payment and amount" do
+          payment.state = 'completed'
+          payment.stub(:credit_allowed).and_return(10)
+          payment.should_receive(:credit!).with(10)
+          payment.partial_credit(10)
+        end
+      end
+      context "when amount > credit_allowed" do
+        it "should not call credit on the source" do
+          payment.state = 'completed'
+          payment.stub(:credit_allowed).and_return(10)
+          payment.partial_credit(20)
+          expect(payment).to be_completed
+        end
+      end
+    end
+
+    context "#save" do
+      it "should call order#update!" do
+        gateway.name = 'Gateway'
+        gateway.distributors << create(:distributor_enterprise)
+        gateway.save!
+
+        order = create(:order)
+        payment = Spree::Payment.create(:amount => 100, :order => order, :payment_method => gateway)
+        order.should_receive(:update!)
+        payment.save
       end
 
-      context "when outstanding_balance is less than payment amount" do
+      context "when profiles are supported" do
         before do
-          payment.order.stub :outstanding_balance => 10
-          payment.stub :credit_allowed => 1000
+          gateway.stub :payment_profiles_supported? => true
+          payment.source.stub :has_payment_profile? => false
         end
 
-        it "should call credit on the gateway with the credit amount and response_code" do
-          gateway.should_receive(:credit).with(1000, card, '123', anything).and_return(success_response)
-          payment.credit!
-        end
-      end
 
-      context "when outstanding_balance is equal to payment amount" do
-        before do
-          payment.order.stub :outstanding_balance => payment.amount
+        context "when there is an error connecting to the gateway" do
+          it "should call gateway_error " do
+            pending '[Spree build] Failing spec'
+            message = double("gateway_error")
+            connection_error = ActiveMerchant::ConnectionError.new(message, nil)
+            expect(gateway).to receive(:create_profile).and_raise(connection_error)
+            expect do
+              Spree::Payment.create(
+                :amount => 100,
+                :order => order,
+                :source => card,
+                :payment_method => gateway
+              )
+            end.should raise_error(Spree::Core::GatewayError)
+          end
         end
 
-        it "should call credit on the gateway with the credit amount and response_code" do
-          gateway.should_receive(:credit).with(amount_in_cents, card, '123', anything).and_return(success_response)
-          payment.credit!
-        end
-      end
+        context "when successfully connecting to the gateway" do
+          xit "should create a payment profile" do
+            gateway.name = 'Gateway'
+            gateway.distributors << create(:distributor_enterprise)
+            gateway.save!
 
-      context "when outstanding_balance is greater than payment amount" do
-        before do
-          payment.order.stub :outstanding_balance => 101
-        end
+            payment.payment_method = gateway
 
-        it "should call credit on the gateway with the original payment amount and response_code" do
-          gateway.should_receive(:credit).with(amount_in_cents.to_f, card, '123', anything).and_return(success_response)
-          payment.credit!
-        end
-      end
+            expect(gateway).to receive(:create_profile)
 
-      it "should log the response" do
-        payment.credit!
-        expect(payment).to have_received(:record_response)
-      end
-
-      context "when gateway does not match the environment" do
-        it "should raise an exception" do
-          gateway.stub :environment => "foo"
-          expect { payment.credit! }.to raise_error(Spree::Core::GatewayError)
-        end
-      end
-
-      context "when response is successful" do
-        it "should create an offsetting payment" do
-          Spree::Payment.should_receive(:create)
-          payment.credit!
-        end
-
-        it "resulting payment should have correct values" do
-          payment.order.stub :outstanding_balance => 100
-          payment.stub :credit_allowed => 10
-
-          offsetting_payment = payment.credit!
-          expect(offsetting_payment.amount.to_f).to eq(-10)
-          expect(offsetting_payment).to be_completed
-          expect(offsetting_payment.response_code).to eq('12345')
-          expect(offsetting_payment.source).to eq(payment)
-        end
-      end
-    end
-  end
-
-  context "when response is unsuccessful" do
-    it "should not create a payment" do
-      gateway.stub :credit => failed_response
-      Spree::Payment.should_not_receive(:create)
-      expect { payment.credit! }.to raise_error(Spree::Core::GatewayError)
-    end
-  end
-
-  context "when already processing" do
-    it "should return nil without trying to process the source" do
-      payment.state = 'processing'
-
-      payment.should_not_receive(:authorize!)
-      payment.should_not_receive(:purchase!)
-      expect(payment.process!).to be_nil
-    end
-  end
-
-  context "with source required" do
-    context "raises an error if no source is specified" do
-      before do
-        payment.source = nil
-      end
-
-      specify do
-        expect { payment.process! }.to raise_error(Spree::Core::GatewayError, Spree.t(:payment_processing_failed))
-      end
-    end
-  end
-
-  context "with source optional" do
-    context "raises no error if source is not specified" do
-      before do
-        payment.source = nil
-        payment.payment_method.stub(:source_required? => false)
-      end
-
-      specify do
-        expect { payment.process! }.not_to raise_error
-      end
-    end
-  end
-
-  context "#credit_allowed" do
-    it "is the difference between offsets total and payment amount" do
-      payment.amount = 100
-      payment.stub(:offsets_total).and_return(0)
-      expect(payment.credit_allowed).to eq(100)
-      payment.stub(:offsets_total).and_return(80)
-      expect(payment.credit_allowed).to eq(20)
-    end
-  end
-
-  context "#can_credit?" do
-    it "is true if credit_allowed > 0" do
-      payment.stub(:credit_allowed).and_return(100)
-      expect(payment.can_credit?).to be true
-    end
-    it "is false if credit_allowed is 0" do
-      payment.stub(:credit_allowed).and_return(0)
-      expect(payment.can_credit?).to be false
-    end
-  end
-
-  context "#credit" do
-    context "when amount <= credit_allowed" do
-      it "makes the state processing" do
-        payment.payment_method.name = 'Gateway'
-        payment.payment_method.distributors << create(:distributor_enterprise)
-        payment.payment_method.save!
-
-        payment.order = create(:order)
-
-        payment.state = 'completed'
-        payment.stub(:credit_allowed).and_return(10)
-        payment.partial_credit(10)
-        expect(payment).to be_processing
-      end
-      it "calls credit on the source with the payment and amount" do
-        payment.state = 'completed'
-        payment.stub(:credit_allowed).and_return(10)
-        payment.should_receive(:credit!).with(10)
-        payment.partial_credit(10)
-      end
-    end
-    context "when amount > credit_allowed" do
-      it "should not call credit on the source" do
-        payment.state = 'completed'
-        payment.stub(:credit_allowed).and_return(10)
-        payment.partial_credit(20)
-        expect(payment).to be_completed
-      end
-    end
-  end
-
-  context "#save" do
-    it "should call order#update!" do
-      gateway.name = 'Gateway'
-      gateway.distributors << create(:distributor_enterprise)
-      gateway.save!
-
-      order = create(:order)
-      payment = Spree::Payment.create(:amount => 100, :order => order, :payment_method => gateway)
-      order.should_receive(:update!)
-      payment.save
-    end
-
-    context "when profiles are supported" do
-      before do
-        gateway.stub :payment_profiles_supported? => true
-        payment.source.stub :has_payment_profile? => false
-      end
-
-
-      context "when there is an error connecting to the gateway" do
-        it "should call gateway_error " do
-          pending '[Spree build] Failing spec'
-          message = double("gateway_error")
-          connection_error = ActiveMerchant::ConnectionError.new(message, nil)
-          expect(gateway).to receive(:create_profile).and_raise(connection_error)
-          expect do
-            Spree::Payment.create(
+            payment = Spree::Payment.create(
               :amount => 100,
-              :order => order,
+              :order => create(:order),
               :source => card,
               :payment_method => gateway
             )
-          end.should raise_error(Spree::Core::GatewayError)
+          end
         end
+
+
       end
 
-      context "when successfully connecting to the gateway" do
-        xit "should create a payment profile" do
+      context "when profiles are not supported" do
+        before { gateway.stub :payment_profiles_supported? => false }
+
+        it "should not create a payment profile" do
           gateway.name = 'Gateway'
           gateway.distributors << create(:distributor_enterprise)
           gateway.save!
 
-          payment.payment_method = gateway
-
-          expect(gateway).to receive(:create_profile)
-
+          gateway.should_not_receive :create_profile
           payment = Spree::Payment.create(
             :amount => 100,
             :order => create(:order),
@@ -557,263 +579,243 @@ describe Spree::Payment do
           )
         end
       end
-
-
     end
 
-    context "when profiles are not supported" do
-      before { gateway.stub :payment_profiles_supported? => false }
+    context "#build_source" do
+      it "should build the payment's source" do
+        params = { :amount => 100, :payment_method => gateway,
+                   :source_attributes => {
+          :expiry =>"1 / 99",
+          :number => '1234567890123',
+          :verification_value => '123'
+        }
+        }
 
-      it "should not create a payment profile" do
-        gateway.name = 'Gateway'
-        gateway.distributors << create(:distributor_enterprise)
-        gateway.save!
+        payment = Spree::Payment.new(params)
+        expect(payment).to be_valid
+        expect(payment.source).not_to be_nil
+      end
 
-        gateway.should_not_receive :create_profile
-        payment = Spree::Payment.create(
-          :amount => 100,
-          :order => create(:order),
-          :source => card,
-          :payment_method => gateway
-        )
+      it "errors when payment source not valid" do
+        params = { :amount => 100, :payment_method => gateway,
+                   :source_attributes => {:expiry => "1 / 12" }}
+
+        payment = Spree::Payment.new(params)
+        expect(payment).not_to be_valid
+        expect(payment.source).not_to be_nil
+        expect(payment.source.errors[:number]).not_to be_empty
+        expect(payment.source.errors[:verification_value]).not_to be_empty
       end
     end
-  end
 
-  context "#build_source" do
-    it "should build the payment's source" do
-      params = { :amount => 100, :payment_method => gateway,
-                 :source_attributes => {
-        :expiry =>"1 / 99",
-        :number => '1234567890123',
-        :verification_value => '123'
-      }
-      }
-
-      payment = Spree::Payment.new(params)
-      expect(payment).to be_valid
-      expect(payment.source).not_to be_nil
+    context "#currency" do
+      before { order.stub(:currency) { "ABC" } }
+      it "returns the order currency" do
+        expect(payment.currency).to eq("ABC")
+      end
     end
 
-    it "errors when payment source not valid" do
-      params = { :amount => 100, :payment_method => gateway,
-                 :source_attributes => {:expiry => "1 / 12" }}
-
-      payment = Spree::Payment.new(params)
-      expect(payment).not_to be_valid
-      expect(payment.source).not_to be_nil
-      expect(payment.source.errors[:number]).not_to be_empty
-      expect(payment.source.errors[:verification_value]).not_to be_empty
-    end
-  end
-
-  context "#currency" do
-    before { order.stub(:currency) { "ABC" } }
-    it "returns the order currency" do
-      expect(payment.currency).to eq("ABC")
-    end
-  end
-
-  context "#display_amount" do
-    it "returns a Spree::Money for this amount" do
-      expect(payment.display_amount).to eq(Spree::Money.new(payment.amount))
-    end
-  end
-
-  # Regression test for #2216
-  context "#gateway_options" do
-    before { order.stub(:last_ip_address => "192.168.1.1") }
-
-    it "contains an IP" do
-      expect(payment.gateway_options[:ip]).to eq(order.last_ip_address)
-    end
-  end
-
-  context "#set_unique_identifier" do
-    # Regression test for #1998
-    it "sets a unique identifier on create" do
-      payment.run_callbacks(:save)
-      expect(payment.identifier).not_to be_blank
-      expect(payment.identifier.size).to eq(8)
-      expect(payment.identifier).to be_a(String)
+    context "#display_amount" do
+      it "returns a Spree::Money for this amount" do
+        expect(payment.display_amount).to eq(Spree::Money.new(payment.amount))
+      end
     end
 
-    context "other payment exists" do
-      let(:other_payment) {
-        gateway.name = 'Gateway'
-        gateway.distributors << create(:distributor_enterprise)
-        gateway.save!
+    # Regression test for #2216
+    context "#gateway_options" do
+      before { order.stub(:last_ip_address => "192.168.1.1") }
 
-        payment = Spree::Payment.new
-        payment.source = card
-        payment.order = create(:order)
-        payment.payment_method = gateway
-        payment
-      }
-
-      before { other_payment.save! }
-
-      it "doesn't set duplicate identifier" do
-        payment.should_receive(:generate_identifier).and_return(other_payment.identifier)
-        payment.should_receive(:generate_identifier).and_call_original
+      it "contains an IP" do
+        expect(payment.gateway_options[:ip]).to eq(order.last_ip_address)
+      end
+    end
 
+    context "#set_unique_identifier" do
+      # Regression test for #1998
+      it "sets a unique identifier on create" do
         payment.run_callbacks(:save)
-
         expect(payment.identifier).not_to be_blank
-        expect(payment.identifier).not_to eq(other_payment.identifier)
+        expect(payment.identifier.size).to eq(8)
+        expect(payment.identifier).to be_a(String)
+      end
+
+      context "other payment exists" do
+        let(:other_payment) {
+          gateway.name = 'Gateway'
+          gateway.distributors << create(:distributor_enterprise)
+          gateway.save!
+
+          payment = Spree::Payment.new
+          payment.source = card
+          payment.order = create(:order)
+          payment.payment_method = gateway
+          payment
+        }
+
+        before { other_payment.save! }
+
+        it "doesn't set duplicate identifier" do
+          payment.should_receive(:generate_identifier).and_return(other_payment.identifier)
+          payment.should_receive(:generate_identifier).and_call_original
+
+          payment.run_callbacks(:save)
+
+          expect(payment.identifier).not_to be_blank
+          expect(payment.identifier).not_to eq(other_payment.identifier)
+        end
       end
     end
-  end
 
-  describe "available actions" do
-    context "for most gateways" do
-      let(:payment) { create(:payment, source: create(:credit_card)) }
+    describe "available actions" do
+      context "for most gateways" do
+        let(:payment) { create(:payment, source: create(:credit_card)) }
 
-      it "can capture and void" do
-        expect(payment.actions).to match_array %w(capture void)
+        it "can capture and void" do
+          expect(payment.actions).to match_array %w(capture void)
+        end
+
+        describe "when a payment has been taken" do
+          before do
+            allow(payment).to receive(:state) { 'completed' }
+            allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
+          end
+
+          it "can void and credit" do
+            expect(payment.actions).to match_array %w(void credit)
+          end
+        end
       end
 
-      describe "when a payment has been taken" do
+      context "for Pin Payments" do
+        let(:d) { create(:distributor_enterprise) }
+        let(:pin) { Spree::Gateway::Pin.create! name: 'pin', distributor_ids: [d.id] }
+        let(:payment) { create(:payment, source: create(:credit_card), payment_method: pin) }
+
+        it "does not void" do
+          expect(payment.actions).not_to include 'void'
+        end
+
+        describe "when a payment has been taken" do
+          before do
+            allow(payment).to receive(:state) { 'completed' }
+            allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
+          end
+
+          it "can refund instead of crediting" do
+            expect(payment.actions).not_to include 'credit'
+            expect(payment.actions).to     include 'refund'
+          end
+        end
+      end
+    end
+
+    describe "refunding" do
+      let(:payment) { create(:payment) }
+      let(:success) { double(success?: true, authorization: 'abc123') }
+      let(:failure) { double(success?: false) }
+
+      it "always checks the environment" do
+        allow(payment.payment_method).to receive(:refund) { success }
+        expect(payment).to receive(:check_environment)
+        payment.refund!
+      end
+
+      describe "calculating refund amount" do
+        it "returns the parameter amount when given" do
+          expect(payment.send(:calculate_refund_amount, 123)).to be === 123.0
+        end
+
+        it "refunds up to the value of the payment when the outstanding balance is larger" do
+          allow(payment).to receive(:credit_allowed) { 123 }
+          allow(payment).to receive(:order) { double(:order, outstanding_balance: 1000) }
+          expect(payment.send(:calculate_refund_amount)).to eq(123)
+        end
+
+        it "refunds up to the outstanding balance of the order when the payment is larger" do
+          allow(payment).to receive(:credit_allowed) { 1000 }
+          allow(payment).to receive(:order) { double(:order, outstanding_balance: 123) }
+          expect(payment.send(:calculate_refund_amount)).to eq(123)
+        end
+      end
+
+      describe "performing refunds" do
         before do
-          allow(payment).to receive(:state) { 'completed' }
-          allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
+          allow(payment).to receive(:calculate_refund_amount) { 123 }
+          expect(payment.payment_method).to receive(:refund).and_return(success)
         end
 
-        it "can void and credit" do
-          expect(payment.actions).to match_array %w(void credit)
-        end
-      end
-    end
-
-    context "for Pin Payments" do
-      let(:d) { create(:distributor_enterprise) }
-      let(:pin) { Spree::Gateway::Pin.create! name: 'pin', distributor_ids: [d.id] }
-      let(:payment) { create(:payment, source: create(:credit_card), payment_method: pin) }
-
-      it "does not void" do
-        expect(payment.actions).not_to include 'void'
-      end
-
-      describe "when a payment has been taken" do
-        before do
-          allow(payment).to receive(:state) { 'completed' }
-          allow(payment).to receive(:order) { double(:order, payment_state: 'credit_owed') }
+        it "performs the refund without payment profiles" do
+          allow(payment.payment_method).to receive(:payment_profiles_supported?) { false }
+          payment.refund!
         end
 
-        it "can refund instead of crediting" do
-          expect(payment.actions).not_to include 'credit'
-          expect(payment.actions).to     include 'refund'
+        it "performs the refund with payment profiles" do
+          allow(payment.payment_method).to receive(:payment_profiles_supported?) { true }
+          payment.refund!
         end
       end
-    end
-  end
 
-  describe "refunding" do
-    let(:payment) { create(:payment) }
-    let(:success) { double(success?: true, authorization: 'abc123') }
-    let(:failure) { double(success?: false) }
-
-    it "always checks the environment" do
-      allow(payment.payment_method).to receive(:refund) { success }
-      expect(payment).to receive(:check_environment)
-      payment.refund!
-    end
-
-    describe "calculating refund amount" do
-      it "returns the parameter amount when given" do
-        expect(payment.send(:calculate_refund_amount, 123)).to be === 123.0
-      end
-
-      it "refunds up to the value of the payment when the outstanding balance is larger" do
-        allow(payment).to receive(:credit_allowed) { 123 }
-        allow(payment).to receive(:order) { double(:order, outstanding_balance: 1000) }
-        expect(payment.send(:calculate_refund_amount)).to eq(123)
-      end
-
-      it "refunds up to the outstanding balance of the order when the payment is larger" do
-        allow(payment).to receive(:credit_allowed) { 1000 }
-        allow(payment).to receive(:order) { double(:order, outstanding_balance: 123) }
-        expect(payment.send(:calculate_refund_amount)).to eq(123)
-      end
-    end
-
-    describe "performing refunds" do
-      before do
+      it "records the response" do
         allow(payment).to receive(:calculate_refund_amount) { 123 }
-        expect(payment.payment_method).to receive(:refund).and_return(success)
-      end
-
-      it "performs the refund without payment profiles" do
-        allow(payment.payment_method).to receive(:payment_profiles_supported?) { false }
+        allow(payment.payment_method).to receive(:refund).and_return(success)
+        expect(payment).to receive(:record_response).with(success)
         payment.refund!
       end
 
-      it "performs the refund with payment profiles" do
-        allow(payment.payment_method).to receive(:payment_profiles_supported?) { true }
+      it "records a payment on success" do
+        allow(payment).to receive(:calculate_refund_amount) { 123 }
+        allow(payment.payment_method).to receive(:refund).and_return(success)
+        allow(payment).to receive(:record_response)
+
+        expect do
+          payment.refund!
+        end.to change(Spree::Payment, :count).by(1)
+
+        p = Spree::Payment.last
+        expect(p.order).to eq(payment.order)
+        expect(p.source).to eq(payment)
+        expect(p.payment_method).to eq(payment.payment_method)
+        expect(p.amount).to eq(-123)
+        expect(p.response_code).to eq(success.authorization)
+        expect(p.state).to eq('completed')
+      end
+
+      it "logs the error on failure" do
+        allow(payment).to receive(:calculate_refund_amount) { 123 }
+        allow(payment.payment_method).to receive(:refund).and_return(failure)
+        allow(payment).to receive(:record_response)
+        expect(payment).to receive(:gateway_error).with(failure)
         payment.refund!
       end
     end
 
-    it "records the response" do
-      allow(payment).to receive(:calculate_refund_amount) { 123 }
-      allow(payment.payment_method).to receive(:refund).and_return(success)
-      expect(payment).to receive(:record_response).with(success)
-      payment.refund!
-    end
+    describe "applying transaction fees" do
+      let!(:order) { create(:order) }
+      let!(:line_item) { create(:line_item, order: order, quantity: 3, price: 5.00) }
 
-    it "records a payment on success" do
-      allow(payment).to receive(:calculate_refund_amount) { 123 }
-      allow(payment.payment_method).to receive(:refund).and_return(success)
-      allow(payment).to receive(:record_response)
-
-      expect do
-        payment.refund!
-      end.to change(Spree::Payment, :count).by(1)
-
-      p = Spree::Payment.last
-      expect(p.order).to eq(payment.order)
-      expect(p.source).to eq(payment)
-      expect(p.payment_method).to eq(payment.payment_method)
-      expect(p.amount).to eq(-123)
-      expect(p.response_code).to eq(success.authorization)
-      expect(p.state).to eq('completed')
-    end
-
-    it "logs the error on failure" do
-      allow(payment).to receive(:calculate_refund_amount) { 123 }
-      allow(payment.payment_method).to receive(:refund).and_return(failure)
-      allow(payment).to receive(:record_response)
-      expect(payment).to receive(:gateway_error).with(failure)
-      payment.refund!
-    end
-  end
-
-  describe "applying transaction fees" do
-    let!(:order) { create(:order) }
-    let!(:line_item) { create(:line_item, order: order, quantity: 3, price: 5.00) }
-
-    before do
-      order.reload.update!
-    end
-
-    context "when order-based calculator" do
-      let!(:shop) { create(:enterprise) }
-      let!(:payment_method) { create(:payment_method, calculator: calculator) }
-
-      let!(:calculator) do
-        Spree::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10)
+      before do
+        order.reload.update!
       end
 
-      context "when order complete and inventory tracking enabled" do
-        let!(:order) { create(:completed_order_with_totals, distributor: shop) }
-        let!(:variant) { order.line_items.first.variant }
-        let!(:inventory_item) { create(:inventory_item, enterprise: shop, variant: variant) }
+      context "when order-based calculator" do
+        let!(:shop) { create(:enterprise) }
+        let!(:payment_method) { create(:payment_method, calculator: calculator) }
 
-        it "creates adjustment" do
-          payment = create(:payment, order: order, payment_method: payment_method,
-                           amount: order.total)
-          expect(payment.adjustment).to be_present
-          expect(payment.adjustment.amount).not_to eq(0)
+        let!(:calculator) do
+          Spree::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10)
+        end
+
+        context "when order complete and inventory tracking enabled" do
+          let!(:order) { create(:completed_order_with_totals, distributor: shop) }
+          let!(:variant) { order.line_items.first.variant }
+          let!(:inventory_item) { create(:inventory_item, enterprise: shop, variant: variant) }
+
+          it "creates adjustment" do
+            payment = create(:payment, order: order, payment_method: payment_method,
+                             amount: order.total)
+            expect(payment.adjustment).to be_present
+            expect(payment.adjustment.amount).not_to eq(0)
+          end
         end
       end
     end

From 2f4648342fdf291ba5c32cd30e692f2c95a1f444 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 11:50:20 +0200
Subject: [PATCH 047/340] Merge decorator specs with Spree's ones

They are now isolated from each other.
---
 spec/models/spree/payment_original_spec.rb | 86 +++++++++++++++++++++
 spec/models/spree/payment_spec.rb          | 90 ----------------------
 2 files changed, 86 insertions(+), 90 deletions(-)
 delete mode 100644 spec/models/spree/payment_spec.rb

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_original_spec.rb
index 418c09882c..07559f5314 100644
--- a/spec/models/spree/payment_original_spec.rb
+++ b/spec/models/spree/payment_original_spec.rb
@@ -820,4 +820,90 @@ describe Spree::Payment do
       end
     end
   end
+
+  context 'OFN specs from previously decorated model' do
+    describe "applying transaction fees" do
+      let!(:order) { create(:order) }
+      let!(:line_item) { create(:line_item, order: order, quantity: 3, price: 5.00) }
+
+      before do
+        order.reload.update!
+      end
+
+      context "to Stripe payments" do
+        let(:shop) { create(:enterprise) }
+        let(:payment_method) { create(:stripe_payment_method, distributor_ids: [create(:distributor_enterprise).id], preferred_enterprise_id: shop.id) }
+        let(:payment) { create(:payment, order: order, payment_method: payment_method, amount: order.total) }
+        let(:calculator) { Spree::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) }
+
+        before do
+          payment_method.calculator = calculator
+          payment_method.save!
+
+          allow(order).to receive(:pending_payments) { [payment] }
+        end
+
+        context "when the payment fails" do
+          let(:failed_response) { ActiveMerchant::Billing::Response.new(false, "This is an error message") }
+
+          before do
+            allow(payment_method).to receive(:purchase) { failed_response }
+          end
+
+          it "makes the transaction fee ineligible and finalizes it" do
+            # Decided to wrap the save process in order.process_payments!
+            # since that is the context it is usually performed in
+            order.process_payments!
+            expect(order.payments.count).to eq 1
+            expect(order.payments).to include payment
+            expect(payment.state).to eq "failed"
+            expect(payment.adjustment.eligible?).to be false
+            expect(payment.adjustment.finalized?).to be true
+            expect(order.adjustments.payment_fee.count).to eq 1
+            expect(order.adjustments.payment_fee.eligible).to_not include payment.adjustment
+          end
+        end
+
+        context "when the payment information is invalid" do
+          before do
+            allow(payment_method).to receive(:supports?) { false }
+          end
+
+          it "makes the transaction fee ineligible and finalizes it" do
+            # Decided to wrap the save process in order.process_payments!
+            # since that is the context it is usually performed in
+            order.process_payments!
+            expect(order.payments.count).to eq 1
+            expect(order.payments).to include payment
+            expect(payment.state).to eq "invalid"
+            expect(payment.adjustment.eligible?).to be false
+            expect(payment.adjustment.finalized?).to be true
+            expect(order.adjustments.payment_fee.count).to eq 1
+            expect(order.adjustments.payment_fee.eligible).to_not include payment.adjustment
+          end
+        end
+
+        context "when the payment is processed successfully" do
+          let(:successful_response) { ActiveMerchant::Billing::Response.new(true, "Yay!") }
+
+          before do
+            allow(payment_method).to receive(:purchase) { successful_response }
+          end
+
+          it "creates an appropriate adjustment" do
+            # Decided to wrap the save process in order.process_payments!
+            # since that is the context it is usually performed in
+            order.process_payments!
+            expect(order.payments.count).to eq 1
+            expect(order.payments).to include payment
+            expect(payment.state).to eq "completed"
+            expect(payment.adjustment.eligible?).to be true
+            expect(order.adjustments.payment_fee.count).to eq 1
+            expect(order.adjustments.payment_fee.eligible).to include payment.adjustment
+            expect(payment.adjustment.amount).to eq 1.5
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
deleted file mode 100644
index 434ce3a2a3..0000000000
--- a/spec/models/spree/payment_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  describe Payment do
-
-    describe "applying transaction fees" do
-      let!(:order) { create(:order) }
-      let!(:line_item) { create(:line_item, order: order, quantity: 3, price: 5.00) }
-
-      before do
-        order.reload.update!
-      end
-
-      context "to Stripe payments" do
-        let(:shop) { create(:enterprise) }
-        let(:payment_method) { create(:stripe_payment_method, distributor_ids: [create(:distributor_enterprise).id], preferred_enterprise_id: shop.id) }
-        let(:payment) { create(:payment, order: order, payment_method: payment_method, amount: order.total) }
-        let(:calculator) { Spree::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) }
-
-        before do
-          payment_method.calculator = calculator
-          payment_method.save!
-
-          allow(order).to receive(:pending_payments) { [payment] }
-        end
-
-        context "when the payment fails" do
-          let(:failed_response) { ActiveMerchant::Billing::Response.new(false, "This is an error message") }
-
-          before do
-            allow(payment_method).to receive(:purchase) { failed_response }
-          end
-
-          it "makes the transaction fee ineligible and finalizes it" do
-            # Decided to wrap the save process in order.process_payments!
-            # since that is the context it is usually performed in
-            order.process_payments!
-            expect(order.payments.count).to eq 1
-            expect(order.payments).to include payment
-            expect(payment.state).to eq "failed"
-            expect(payment.adjustment.eligible?).to be false
-            expect(payment.adjustment.finalized?).to be true
-            expect(order.adjustments.payment_fee.count).to eq 1
-            expect(order.adjustments.payment_fee.eligible).to_not include payment.adjustment
-          end
-        end
-
-        context "when the payment information is invalid" do
-          before do
-            allow(payment_method).to receive(:supports?) { false }
-          end
-
-          it "makes the transaction fee ineligible and finalizes it" do
-            # Decided to wrap the save process in order.process_payments!
-            # since that is the context it is usually performed in
-            order.process_payments!
-            expect(order.payments.count).to eq 1
-            expect(order.payments).to include payment
-            expect(payment.state).to eq "invalid"
-            expect(payment.adjustment.eligible?).to be false
-            expect(payment.adjustment.finalized?).to be true
-            expect(order.adjustments.payment_fee.count).to eq 1
-            expect(order.adjustments.payment_fee.eligible).to_not include payment.adjustment
-          end
-        end
-
-        context "when the payment is processed successfully" do
-          let(:successful_response) { ActiveMerchant::Billing::Response.new(true, "Yay!") }
-
-          before do
-            allow(payment_method).to receive(:purchase) { successful_response }
-          end
-
-          it "creates an appropriate adjustment" do
-            # Decided to wrap the save process in order.process_payments!
-            # since that is the context it is usually performed in
-            order.process_payments!
-            expect(order.payments.count).to eq 1
-            expect(order.payments).to include payment
-            expect(payment.state).to eq "completed"
-            expect(payment.adjustment.eligible?).to be true
-            expect(order.adjustments.payment_fee.count).to eq 1
-            expect(order.adjustments.payment_fee.eligible).to include payment.adjustment
-            expect(payment.adjustment.amount).to eq 1.5
-          end
-        end
-      end
-    end
-  end
-end

From 683794636bdbbd7709162b04f3548cfbd1406c88 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 11:51:46 +0200
Subject: [PATCH 048/340] Rename spec file

---
 spec/models/spree/{payment_original_spec.rb => payment_spec.rb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spec/models/spree/{payment_original_spec.rb => payment_spec.rb} (100%)

diff --git a/spec/models/spree/payment_original_spec.rb b/spec/models/spree/payment_spec.rb
similarity index 100%
rename from spec/models/spree/payment_original_spec.rb
rename to spec/models/spree/payment_spec.rb

From 50427472c41ae4e338641844279f8dd619b5525a Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 10 Jul 2020 20:25:20 +1000
Subject: [PATCH 049/340] Updating translations for config/locales/en_NZ.yml

---
 config/locales/en_NZ.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index 226b98a5f6..e45ca43439 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -182,6 +182,7 @@ en_NZ:
         explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Welcome to"
   site_meta_description: "We begin from the ground up. With farmers, growers, and producers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can…"
   search_by_name: Search by name or suburb...
   producers_join: New Zealand producers are now welcome to join the Open Food Network.
@@ -1160,7 +1161,7 @@ en_NZ:
       mobile_menu:
         cart: "Cart"
     register_call:
-      selling_on_ofn: "Interested in getting on the Open Food Network?"
+      selling_on_ofn: "Want to set up a shop on the Open Food Network?"
       register: "Register here"
     footer:
       footer_secure: "Secure and trusted."
@@ -1713,6 +1714,7 @@ en_NZ:
   remember_me: Remember Me
   are_you_sure: "Are you sure?"
   orders_open: "Orders open"
+  closing: "Closing"
   going_back_to_home_page: "Taking you back to the home page"
   creating: Creating
   updating: Updating

From 7a9f9a562489988d2a1ab31da0a48076d3abe501 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 9 Jul 2020 20:08:38 +0100
Subject: [PATCH 050/340] Log bugsnag and still send failed payment email when
 any exception is caught during the confirmation process

---
 app/jobs/subscription_confirm_job.rb       | 5 +++--
 spec/jobs/subscription_confirm_job_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb
index 8735bf41ca..ef2fd30ca8 100644
--- a/app/jobs/subscription_confirm_job.rb
+++ b/app/jobs/subscription_confirm_job.rb
@@ -52,6 +52,7 @@ class SubscriptionConfirmJob
     end
   rescue StandardError => e
     Bugsnag.notify(e, order: order)
+    send_failed_payment_email(order, e.message)
   end
 
   def process_payment!(order)
@@ -89,9 +90,9 @@ class SubscriptionConfirmJob
     SubscriptionMailer.confirmation_email(order).deliver
   end
 
-  def send_failed_payment_email(order)
+  def send_failed_payment_email(order, error_message = nil)
     order.update!
-    record_and_log_error(:failed_payment, order)
+    record_and_log_error(:failed_payment, order, error_message)
     SubscriptionMailer.failed_payment_email(order).deliver
   end
 end
diff --git a/spec/jobs/subscription_confirm_job_spec.rb b/spec/jobs/subscription_confirm_job_spec.rb
index 603da10a10..b6384ac099 100644
--- a/spec/jobs/subscription_confirm_job_spec.rb
+++ b/spec/jobs/subscription_confirm_job_spec.rb
@@ -216,7 +216,7 @@ describe SubscriptionConfirmJob do
 
     it "records and logs an error and sends the email" do
       expect(order).to receive(:update!)
-      expect(job).to receive(:record_and_log_error).with(:failed_payment, order).once
+      expect(job).to receive(:record_and_log_error).with(:failed_payment, order, nil).once
       job.send(:send_failed_payment_email, order)
       expect(SubscriptionMailer).to have_received(:failed_payment_email).with(order)
       expect(mail_mock).to have_received(:deliver)

From 01ab974a3ba9f055c4c2506e0ae0a1c955c547b8 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 10:16:20 +0100
Subject: [PATCH 051/340] Add rescue statment to failed payment email so that
 the processing of other orders continues if there is a problem while sending
 the email

---
 app/jobs/subscription_confirm_job.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb
index ef2fd30ca8..be43bc32ec 100644
--- a/app/jobs/subscription_confirm_job.rb
+++ b/app/jobs/subscription_confirm_job.rb
@@ -94,5 +94,7 @@ class SubscriptionConfirmJob
     order.update!
     record_and_log_error(:failed_payment, order, error_message)
     SubscriptionMailer.failed_payment_email(order).deliver
+  rescue StandardError => e
+    Bugsnag.notify(e, order: order, error_message: error_message)
   end
 end

From 6389fdb16e00b0a0bf2c3059a39a9a16a55749a9 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 12:40:36 +0200
Subject: [PATCH 052/340] Simplify code related to error handling

---
 app/jobs/subscription_confirm_job.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb
index be43bc32ec..c7275f00d6 100644
--- a/app/jobs/subscription_confirm_job.rb
+++ b/app/jobs/subscription_confirm_job.rb
@@ -45,30 +45,30 @@ class SubscriptionConfirmJob
   def confirm_order!(order)
     record_order(order)
 
-    if process_payment!(order)
-      send_confirmation_email(order)
-    else
-      send_failed_payment_email(order)
-    end
+    process_payment!(order)
+    send_confirmation_email(order)
   rescue StandardError => e
-    Bugsnag.notify(e, order: order)
-    send_failed_payment_email(order, e.message)
+    if order.errors.any?
+      send_failed_payment_email(order)
+    else
+      Bugsnag.notify(e, order: order)
+      send_failed_payment_email(order, e.message)
+    end
   end
 
+  # Process the order payment and raise if it's not successful
   def process_payment!(order)
-    return false if order.errors.present?
-    return true unless order.payment_required?
+    raise if order.errors.present?
+    return unless order.payment_required?
 
     setup_payment!(order)
-    return false if order.errors.any?
+    raise if order.errors.any?
 
     authorize_payment!(order)
-    return false if order.errors.any?
+    raise if order.errors.any?
 
     order.process_payments!
-    return false if order.errors.any?
-
-    true
+    raise if order.errors.any?
   end
 
   def setup_payment!(order)

From 5afb862ce174fa2eb6819650b3436116fcec5d57 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 12:44:55 +0100
Subject: [PATCH 053/340] Extract setup and authorize to a new method called
 prepare_for_payment to fix rubocop ABCsize issue

It looks like this rubocop rule weights a raise over a return...
---
 app/jobs/subscription_confirm_job.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb
index c7275f00d6..acf241e4e0 100644
--- a/app/jobs/subscription_confirm_job.rb
+++ b/app/jobs/subscription_confirm_job.rb
@@ -61,14 +61,17 @@ class SubscriptionConfirmJob
     raise if order.errors.present?
     return unless order.payment_required?
 
+    prepare_for_payment!(order)
+    order.process_payments!
+    raise if order.errors.any?
+  end
+
+  def prepare_for_payment!(order)
     setup_payment!(order)
     raise if order.errors.any?
 
     authorize_payment!(order)
     raise if order.errors.any?
-
-    order.process_payments!
-    raise if order.errors.any?
   end
 
   def setup_payment!(order)

From 55d52b875f51603df574e9a9a49274459a97b3d3 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 15:04:29 +0200
Subject: [PATCH 054/340] Run rubocop autocorrect on payment model

---
 app/models/spree/payment.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 8ae3c91c87..9b3c961e78 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class Payment < ActiveRecord::Base
     include Spree::Payment::Processing
@@ -14,7 +16,7 @@ module Spree
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
 
     has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'") },
-      class_name: "Spree::Payment", foreign_key: :source_id
+             class_name: "Spree::Payment", foreign_key: :source_id
     has_many :log_entries, as: :source
 
     has_one :adjustment, as: :source, dependent: :destroy
@@ -43,8 +45,9 @@ module Spree
 
     def persist_invalid
       return unless ['failed', 'invalid'].include?(state)
+
       state_will_change!
-      save 
+      save
     end
 
     # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
@@ -74,9 +77,7 @@ module Spree
       end
     end
 
-    def currency
-      order.currency
-    end
+    delegate :currency, to: :order
 
     def money
       Spree::Money.new(amount, { currency: currency })
@@ -110,8 +111,9 @@ module Spree
     # Pin payments lacks void and credit methods, but it does have refund
     # Here we swap credit out for refund and remove void as a possible action
     def actions
-      return [] unless payment_source and payment_source.respond_to? :actions
-      actions = payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") or payment_source.send("can_#{action}?", self) }
+      return [] unless payment_source&.respond_to?(:actions)
+
+      actions = payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") || payment_source.send("can_#{action}?", self) }
 
       if payment_method.is_a? Gateway::Pin
         actions << 'refund' if actions.include? 'credit'
@@ -162,10 +164,10 @@ module Spree
       if source && !source.valid?
         source.errors.each do |field, error|
           field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
-          self.errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
+          errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
         end
       end
-      return !errors.present?
+      errors.blank?
     end
 
     def profiles_supported?
@@ -184,9 +186,7 @@ module Spree
     end
 
     def invalidate_old_payments
-      order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
-        payment.invalidate!
-      end
+      order.payments.with_state('checkout').where("id != ?", id).each(&:invalidate!)
     end
 
     def update_order
@@ -202,7 +202,7 @@ module Spree
     def set_unique_identifier
       begin
         self.identifier = generate_identifier
-      end while self.class.exists?(identifier: self.identifier)
+      end while self.class.exists?(identifier: identifier)
     end
 
     def generate_identifier

From cf64d3a290ce9f43c21e2846155742ad08dac9eb Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 15:07:12 +0200
Subject: [PATCH 055/340] Merge skipped callback from decorator into model

If we don't want that callback we can just as well remove it now that we
own that code.
---
 app/models/spree/payment.rb           |  9 ---------
 app/models/spree/payment_decorator.rb | 10 ----------
 2 files changed, 19 deletions(-)
 delete mode 100644 app/models/spree/payment_decorator.rb

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 9b3c961e78..46a9d924b3 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -41,15 +41,6 @@ module Spree
     scope :failed, -> { with_state('failed') }
     scope :valid, -> { where('state NOT IN (?)', %w(failed invalid)) }
 
-    after_rollback :persist_invalid
-
-    def persist_invalid
-      return unless ['failed', 'invalid'].include?(state)
-
-      state_will_change!
-      save
-    end
-
     # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :checkout do
       # With card payments, happens before purchase or authorization happens
diff --git a/app/models/spree/payment_decorator.rb b/app/models/spree/payment_decorator.rb
deleted file mode 100644
index f79529e306..0000000000
--- a/app/models/spree/payment_decorator.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spree/localized_number'
-
-module Spree
-  Payment.class_eval do
-    # We bypass this after_rollback callback that is setup in Spree::Payment
-    # The issues the callback fixes are not experienced in OFN:
-    #   if a payment fails on checkout the state "failed" is persisted correctly
-    def persist_invalid; end
-  end
-end

From ab67a4f80c8bc4ebae1325d5e9181201f44c063f Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 14:45:04 +0100
Subject: [PATCH 056/340] Bring base controller from spree

---
 app/controllers/spree/base_controller.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 app/controllers/spree/base_controller.rb

diff --git a/app/controllers/spree/base_controller.rb b/app/controllers/spree/base_controller.rb
new file mode 100644
index 0000000000..6ce3e456ac
--- /dev/null
+++ b/app/controllers/spree/base_controller.rb
@@ -0,0 +1,16 @@
+require 'cancan'
+require_dependency 'spree/core/controller_helpers/strong_parameters'
+
+class Spree::BaseController < ApplicationController
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::RespondWith
+  include Spree::Core::ControllerHelpers::SSL
+  include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Search
+  include Spree::Core::ControllerHelpers::StrongParameters
+  include Spree::Core::ControllerHelpers::Search
+
+  respond_to :html
+end
+
+require 'spree/i18n/initializer'

From fdd21d7d7d9480161662c991accdbff6b08b0bb8 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 14:46:04 +0100
Subject: [PATCH 057/340] Fix easy rubocop issues

---
 app/controllers/spree/base_controller.rb | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/controllers/spree/base_controller.rb b/app/controllers/spree/base_controller.rb
index 6ce3e456ac..b660bf0672 100644
--- a/app/controllers/spree/base_controller.rb
+++ b/app/controllers/spree/base_controller.rb
@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
 require 'cancan'
 require_dependency 'spree/core/controller_helpers/strong_parameters'
 
-class Spree::BaseController < ApplicationController
-  include Spree::Core::ControllerHelpers::Auth
-  include Spree::Core::ControllerHelpers::RespondWith
-  include Spree::Core::ControllerHelpers::SSL
-  include Spree::Core::ControllerHelpers::Common
-  include Spree::Core::ControllerHelpers::Search
-  include Spree::Core::ControllerHelpers::StrongParameters
-  include Spree::Core::ControllerHelpers::Search
+module Spree
+  class BaseController < ApplicationController
+    include Spree::Core::ControllerHelpers::Auth
+    include Spree::Core::ControllerHelpers::RespondWith
+    include Spree::Core::ControllerHelpers::SSL
+    include Spree::Core::ControllerHelpers::Common
+    include Spree::Core::ControllerHelpers::Search
+    include Spree::Core::ControllerHelpers::StrongParameters
+    include Spree::Core::ControllerHelpers::Search
 
-  respond_to :html
+    respond_to :html
+  end
 end
 
 require 'spree/i18n/initializer'

From 388d575cc8a742c439220585c2c3a0e37b1f9681 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 14:49:07 +0100
Subject: [PATCH 058/340] Remove strong parameters and search helpers, they are
 not used in OFN

---
 app/controllers/spree/base_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controllers/spree/base_controller.rb b/app/controllers/spree/base_controller.rb
index b660bf0672..4d20570e20 100644
--- a/app/controllers/spree/base_controller.rb
+++ b/app/controllers/spree/base_controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'cancan'
-require_dependency 'spree/core/controller_helpers/strong_parameters'
 
 module Spree
   class BaseController < ApplicationController
@@ -9,9 +8,6 @@ module Spree
     include Spree::Core::ControllerHelpers::RespondWith
     include Spree::Core::ControllerHelpers::SSL
     include Spree::Core::ControllerHelpers::Common
-    include Spree::Core::ControllerHelpers::Search
-    include Spree::Core::ControllerHelpers::StrongParameters
-    include Spree::Core::ControllerHelpers::Search
 
     respond_to :html
   end

From 84d7538b1b5964fc26f852daad3231cd1c5663b8 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:09:08 +0100
Subject: [PATCH 059/340] Bring i18n code from spree

---
 lib/spree/i18n/base.rb        | 17 +++++++++++++++++
 lib/spree/i18n/initializer.rb |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 lib/spree/i18n/base.rb
 create mode 100644 lib/spree/i18n/initializer.rb

diff --git a/lib/spree/i18n/base.rb b/lib/spree/i18n/base.rb
new file mode 100644
index 0000000000..765c8ad169
--- /dev/null
+++ b/lib/spree/i18n/base.rb
@@ -0,0 +1,17 @@
+module Spree
+  module ViewContext
+    def self.context=(context)
+      @context = context
+    end
+
+    def self.context
+      @context
+    end
+
+    def view_context
+      super.tap do |context|
+        Spree::ViewContext.context = context
+      end
+    end
+  end
+end
diff --git a/lib/spree/i18n/initializer.rb b/lib/spree/i18n/initializer.rb
new file mode 100644
index 0000000000..79f5917cb2
--- /dev/null
+++ b/lib/spree/i18n/initializer.rb
@@ -0,0 +1 @@
+Spree::BaseController.send(:include, Spree::ViewContext)

From c75341838e10752cf5db51e6ab5d40b4819e1172 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:13:16 +0100
Subject: [PATCH 060/340] Bring core.rb from spree_core

---
 lib/spree/core.rb | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 lib/spree/core.rb

diff --git a/lib/spree/core.rb b/lib/spree/core.rb
new file mode 100644
index 0000000000..2ae848cf18
--- /dev/null
+++ b/lib/spree/core.rb
@@ -0,0 +1,56 @@
+require 'rails/all'
+require 'active_merchant'
+require 'acts_as_list'
+require 'awesome_nested_set'
+require 'cancan'
+require 'kaminari'
+require 'mail'
+require 'paperclip'
+require 'paranoia'
+require 'ransack'
+require 'state_machine'
+
+module Spree
+
+  mattr_accessor :user_class
+
+  def self.user_class
+    if @@user_class.is_a?(Class)
+      raise "Spree.user_class MUST be a String object, not a Class object."
+    elsif @@user_class.is_a?(String)
+      @@user_class.constantize
+    end
+  end
+
+  # Used to configure Spree.
+  #
+  # Example:
+  #
+  #   Spree.config do |config|
+  #     config.site_name = "An awesome Spree site"
+  #   end
+  #
+  # This method is defined within the core gem on purpose.
+  # Some people may only wish to use the Core part of Spree.
+  def self.config(&block)
+    yield(Spree::Config)
+  end
+end
+
+require 'spree/core/version'
+require 'spree/core/engine'
+
+require 'spree/i18n'
+require 'spree/money'
+require 'spree/promo/coupon_applicator'
+
+require 'spree/core/delegate_belongs_to'
+require 'spree/core/ext/active_record'
+require 'spree/core/permalinks'
+require 'spree/core/token_resource'
+require 'spree/core/calculated_adjustments'
+require 'spree/core/product_duplicator'
+
+ActiveRecord::Base.class_eval do
+  include CollectiveIdea::Acts::NestedSet
+end

From 89e5221dc5d54fd35e60922499eb91b6781ced8a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:17:10 +0100
Subject: [PATCH 061/340] Fix easy rubocop issues

---
 lib/spree/core.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/spree/core.rb b/lib/spree/core.rb
index 2ae848cf18..a99db5ac9d 100644
--- a/lib/spree/core.rb
+++ b/lib/spree/core.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/all'
 require 'active_merchant'
 require 'acts_as_list'
@@ -11,15 +13,16 @@ require 'ransack'
 require 'state_machine'
 
 module Spree
-
   mattr_accessor :user_class
 
   def self.user_class
     if @@user_class.is_a?(Class)
       raise "Spree.user_class MUST be a String object, not a Class object."
-    elsif @@user_class.is_a?(String)
-      @@user_class.constantize
     end
+
+    return unless @@user_class.is_a?(String)
+
+    @@user_class.constantize
   end
 
   # Used to configure Spree.

From 38c5a9e105be09276f1c6162f779418eb87d6d6b Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:20:25 +0100
Subject: [PATCH 062/340] Remove coupon applicator, it's not used in ofn

---
 lib/spree/core.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/spree/core.rb b/lib/spree/core.rb
index a99db5ac9d..a72bd8b5f8 100644
--- a/lib/spree/core.rb
+++ b/lib/spree/core.rb
@@ -45,7 +45,6 @@ require 'spree/core/engine'
 
 require 'spree/i18n'
 require 'spree/money'
-require 'spree/promo/coupon_applicator'
 
 require 'spree/core/delegate_belongs_to'
 require 'spree/core/ext/active_record'

From efeda61e4026591e6db6de2595209c307f28e3c3 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:21:16 +0100
Subject: [PATCH 063/340] Bring i18n.rb from spree

---
 lib/spree/i18n.rb | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 lib/spree/i18n.rb

diff --git a/lib/spree/i18n.rb b/lib/spree/i18n.rb
new file mode 100644
index 0000000000..12cd95a2fb
--- /dev/null
+++ b/lib/spree/i18n.rb
@@ -0,0 +1,36 @@
+require 'i18n'
+require 'active_support/core_ext/array/extract_options'
+require 'spree/i18n/base'
+
+module Spree
+  extend ActionView::Helpers::TranslationHelper
+
+  class << self
+    # Add spree namespace and delegate to Rails TranslationHelper for some nice
+    # extra functionality. e.g return reasonable strings for missing translations
+    def translate(*args)
+      @virtual_path = virtual_path
+
+      options = args.extract_options!
+      options[:scope] = [*options[:scope]].unshift(:spree)
+      args << options
+      super(*args)
+    end
+
+    alias_method :t, :translate
+
+    def context
+      Spree::ViewContext.context
+    end
+
+    def virtual_path
+      if context
+        path = context.instance_variable_get("@virtual_path")
+
+        if path
+          path.gsub(/spree/, '')
+        end
+      end
+    end
+  end
+end

From 12a5a266fd66e21c0d3ba366668e478f7886d60b Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:22:35 +0100
Subject: [PATCH 064/340] Fix easy rubocop issues

---
 lib/spree/i18n.rb           |  14 ++--
 spec/lib/spree/i18n_spec.rb | 123 ++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 6 deletions(-)
 create mode 100644 spec/lib/spree/i18n_spec.rb

diff --git a/lib/spree/i18n.rb b/lib/spree/i18n.rb
index 12cd95a2fb..7780bc3ad7 100644
--- a/lib/spree/i18n.rb
+++ b/lib/spree/i18n.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
 require 'spree/i18n/base'
@@ -24,13 +26,13 @@ module Spree
     end
 
     def virtual_path
-      if context
-        path = context.instance_variable_get("@virtual_path")
+      return unless context
 
-        if path
-          path.gsub(/spree/, '')
-        end
-      end
+      path = context.instance_variable_get("@virtual_path")
+
+      return unless path
+
+      path.gsub(/spree/, '')
     end
   end
 end
diff --git a/spec/lib/spree/i18n_spec.rb b/spec/lib/spree/i18n_spec.rb
new file mode 100644
index 0000000000..b4373cb4a5
--- /dev/null
+++ b/spec/lib/spree/i18n_spec.rb
@@ -0,0 +1,123 @@
+require 'rspec/expectations'
+require 'spree/i18n'
+require 'spree/testing_support/i18n'
+
+describe "i18n" do
+  before do
+    I18n.backend.store_translations(:en,
+    {
+      :spree => {
+        :foo => "bar",
+        :bar => {
+          :foo => "bar within bar scope",
+          :invalid => nil,
+          :legacy_translation => "back in the day..."
+        },
+        :invalid => nil,
+        :legacy_translation => "back in the day..."
+      }
+    })
+  end
+
+  it "translates within the spree scope" do
+    Spree.normal_t(:foo).should eql("bar")
+    Spree.translate(:foo).should eql("bar")
+  end
+
+  it "translates within the spree scope using a path" do
+    Spree.stub(:virtual_path).and_return('bar')
+
+    Spree.normal_t('.legacy_translation').should eql("back in the day...")
+    Spree.translate('.legacy_translation').should eql("back in the day...")
+  end
+
+  it "raise error without any context when using a path" do
+    expect {
+      Spree.normal_t('.legacy_translation')
+    }.to raise_error
+
+    expect {
+      Spree.translate('.legacy_translation')
+    }.to raise_error
+  end
+
+  it "prepends a string scope" do
+    Spree.normal_t(:foo, :scope => "bar").should eql("bar within bar scope")
+  end
+
+  it "prepends to an array scope" do
+    Spree.normal_t(:foo, :scope => ["bar"]).should eql("bar within bar scope")
+  end
+
+  it "returns two translations" do
+    Spree.normal_t([:foo, 'bar.foo']).should eql(["bar", "bar within bar scope"])
+  end
+
+  it "returns reasonable string for missing translations" do
+    Spree.t(:missing_entry).should include("<span")
+  end
+
+  context "missed + unused translations" do
+    def key_with_locale(key)
+      "#{key} (#{I18n.locale})"
+    end
+
+    before do
+      Spree.used_translations = []
+    end
+
+    context "missed translations" do
+      def assert_missing_translation(key)
+        key = key_with_locale(key)
+        message = Spree.missing_translation_messages.detect { |m| m == key }
+        message.should_not(be_nil, "expected '#{key}' to be missing, but it wasn't.")
+      end
+
+      it "logs missing translations" do
+        Spree.t(:missing, :scope => [:else, :where])
+        Spree.check_missing_translations
+        assert_missing_translation("else")
+        assert_missing_translation("else.where")
+        assert_missing_translation("else.where.missing")
+      end
+
+      it "does not log present translations" do
+        Spree.t(:foo)
+        Spree.check_missing_translations
+        Spree.missing_translation_messages.should be_empty
+      end
+
+      it "does not break when asked for multiple translations" do
+        Spree.t [:foo, 'bar.foo']
+        Spree.check_missing_translations
+        Spree.missing_translation_messages.should be_empty
+      end
+    end
+
+    context "unused translations" do
+      def assert_unused_translation(key)
+        key = key_with_locale(key)
+        message = Spree.unused_translation_messages.detect { |m| m == key }
+        message.should_not(be_nil, "expected '#{key}' to be unused, but it was used.")
+      end
+
+      def assert_used_translation(key)
+        key = key_with_locale(key)
+        message = Spree.unused_translation_messages.detect { |m| m == key }
+        message.should(be_nil, "expected '#{key}' to be used, but it wasn't.")
+      end
+
+      it "logs translations that aren't used" do
+        Spree.check_unused_translations
+        assert_unused_translation("bar.legacy_translation")
+        assert_unused_translation("legacy_translation")
+      end
+
+      it "does not log used translations" do
+        Spree.t(:foo)
+        Spree.check_unused_translations
+        assert_used_translation("foo")
+      end
+    end
+  end
+end

From 9a09f420c1f00c6a1f2a1ac27850635ab2691578 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:26:59 +0100
Subject: [PATCH 065/340] Modernize spec

---
 spec/lib/spree/i18n_spec.rb | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/spec/lib/spree/i18n_spec.rb b/spec/lib/spree/i18n_spec.rb
index b4373cb4a5..b79a5e705f 100644
--- a/spec/lib/spree/i18n_spec.rb
+++ b/spec/lib/spree/i18n_spec.rb
@@ -1,22 +1,26 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
 require 'spree/i18n'
 require 'spree/testing_support/i18n'
 
 describe "i18n" do
   before do
-    I18n.backend.store_translations(:en,
-    {
-      :spree => {
-        :foo => "bar",
-        :bar => {
-          :foo => "bar within bar scope",
-          :invalid => nil,
-          :legacy_translation => "back in the day..."
-        },
-        :invalid => nil,
-        :legacy_translation => "back in the day..."
+    I18n.backend.store_translations(
+      :en,
+      {
+        spree: {
+          foo: "bar",
+          bar: {
+            foo: "bar within bar scope",
+            invalid: nil,
+            legacy_translation: "back in the day..."
+          },
+          invalid: nil,
+          legacy_translation: "back in the day..."
+        }
       }
-    })
+    )
   end
 
   it "translates within the spree scope" do
@@ -42,11 +46,11 @@ describe "i18n" do
   end
 
   it "prepends a string scope" do
-    Spree.normal_t(:foo, :scope => "bar").should eql("bar within bar scope")
+    Spree.normal_t(:foo, scope: "bar").should eql("bar within bar scope")
   end
 
   it "prepends to an array scope" do
-    Spree.normal_t(:foo, :scope => ["bar"]).should eql("bar within bar scope")
+    Spree.normal_t(:foo, scope: ["bar"]).should eql("bar within bar scope")
   end
 
   it "returns two translations" do
@@ -74,7 +78,7 @@ describe "i18n" do
       end
 
       it "logs missing translations" do
-        Spree.t(:missing, :scope => [:else, :where])
+        Spree.t(:missing, scope: [:else, :where])
         Spree.check_missing_translations
         assert_missing_translation("else")
         assert_missing_translation("else.where")

From 724a88344e74091cba5d620b6072f4485ce0a189 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:27:37 +0100
Subject: [PATCH 066/340] Run transpec

---
 spec/lib/spree/i18n_spec.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/lib/spree/i18n_spec.rb b/spec/lib/spree/i18n_spec.rb
index b79a5e705f..386dd9d2ec 100644
--- a/spec/lib/spree/i18n_spec.rb
+++ b/spec/lib/spree/i18n_spec.rb
@@ -24,15 +24,15 @@ describe "i18n" do
   end
 
   it "translates within the spree scope" do
-    Spree.normal_t(:foo).should eql("bar")
-    Spree.translate(:foo).should eql("bar")
+    expect(Spree.normal_t(:foo)).to eql("bar")
+    expect(Spree.translate(:foo)).to eql("bar")
   end
 
   it "translates within the spree scope using a path" do
-    Spree.stub(:virtual_path).and_return('bar')
+    allow(Spree).to receive(:virtual_path).and_return('bar')
 
-    Spree.normal_t('.legacy_translation').should eql("back in the day...")
-    Spree.translate('.legacy_translation').should eql("back in the day...")
+    expect(Spree.normal_t('.legacy_translation')).to eql("back in the day...")
+    expect(Spree.translate('.legacy_translation')).to eql("back in the day...")
   end
 
   it "raise error without any context when using a path" do
@@ -46,19 +46,19 @@ describe "i18n" do
   end
 
   it "prepends a string scope" do
-    Spree.normal_t(:foo, scope: "bar").should eql("bar within bar scope")
+    expect(Spree.normal_t(:foo, scope: "bar")).to eql("bar within bar scope")
   end
 
   it "prepends to an array scope" do
-    Spree.normal_t(:foo, scope: ["bar"]).should eql("bar within bar scope")
+    expect(Spree.normal_t(:foo, scope: ["bar"])).to eql("bar within bar scope")
   end
 
   it "returns two translations" do
-    Spree.normal_t([:foo, 'bar.foo']).should eql(["bar", "bar within bar scope"])
+    expect(Spree.normal_t([:foo, 'bar.foo'])).to eql(["bar", "bar within bar scope"])
   end
 
   it "returns reasonable string for missing translations" do
-    Spree.t(:missing_entry).should include("<span")
+    expect(Spree.t(:missing_entry)).to include("<span")
   end
 
   context "missed + unused translations" do
@@ -74,7 +74,7 @@ describe "i18n" do
       def assert_missing_translation(key)
         key = key_with_locale(key)
         message = Spree.missing_translation_messages.detect { |m| m == key }
-        message.should_not(be_nil, "expected '#{key}' to be missing, but it wasn't.")
+        expect(message).not_to(be_nil, "expected '#{key}' to be missing, but it wasn't.")
       end
 
       it "logs missing translations" do
@@ -88,13 +88,13 @@ describe "i18n" do
       it "does not log present translations" do
         Spree.t(:foo)
         Spree.check_missing_translations
-        Spree.missing_translation_messages.should be_empty
+        expect(Spree.missing_translation_messages).to be_empty
       end
 
       it "does not break when asked for multiple translations" do
         Spree.t [:foo, 'bar.foo']
         Spree.check_missing_translations
-        Spree.missing_translation_messages.should be_empty
+        expect(Spree.missing_translation_messages).to be_empty
       end
     end
 
@@ -102,13 +102,13 @@ describe "i18n" do
       def assert_unused_translation(key)
         key = key_with_locale(key)
         message = Spree.unused_translation_messages.detect { |m| m == key }
-        message.should_not(be_nil, "expected '#{key}' to be unused, but it was used.")
+        expect(message).not_to(be_nil, "expected '#{key}' to be unused, but it was used.")
       end
 
       def assert_used_translation(key)
         key = key_with_locale(key)
         message = Spree.unused_translation_messages.detect { |m| m == key }
-        message.should(be_nil, "expected '#{key}' to be used, but it wasn't.")
+        expect(message).to(be_nil, "expected '#{key}' to be used, but it wasn't.")
       end
 
       it "logs translations that aren't used" do

From cd8355ea663a49ac60f650dad14030d41133307f Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:28:41 +0100
Subject: [PATCH 067/340] Bring money.rb from spree

---
 lib/spree/money.rb | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 lib/spree/money.rb

diff --git a/lib/spree/money.rb b/lib/spree/money.rb
new file mode 100644
index 0000000000..a98d36deac
--- /dev/null
+++ b/lib/spree/money.rb
@@ -0,0 +1,40 @@
+require 'money'
+
+module Spree
+  class Money
+    attr_reader :money
+
+    delegate :cents, :to => :money
+
+    def initialize(amount, options={})
+      @money = ::Money.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
+      @options = {}
+      @options[:with_currency] = Spree::Config[:display_currency]
+      @options[:symbol_position] = Spree::Config[:currency_symbol_position].to_sym
+      @options[:no_cents] = Spree::Config[:hide_cents]
+      @options[:decimal_mark] = Spree::Config[:currency_decimal_mark]
+      @options[:thousands_separator] = Spree::Config[:currency_thousands_separator]
+      @options.merge!(options)
+      # Must be a symbol because the Money gem doesn't do the conversion
+      @options[:symbol_position] = @options[:symbol_position].to_sym
+    end
+
+    def to_s
+      @money.format(@options)
+    end
+
+    def to_html(options = { :html => true })
+      output = @money.format(@options.merge(options))
+      if options[:html]
+        # 1) prevent blank, breaking spaces
+        # 2) prevent escaping of HTML character entities
+        output = output.gsub(" ", "&nbsp;").html_safe
+      end
+      output
+    end
+
+    def ==(obj)
+      @money == obj.money
+    end
+  end
+end

From a78d615936b9fa9ce131cc1d422f7924cf01f5f0 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:30:06 +0100
Subject: [PATCH 068/340] Bring money_spec from spree_core

---
 spec/lib/spree/money_spec.rb | 136 +++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 spec/lib/spree/money_spec.rb

diff --git a/spec/lib/spree/money_spec.rb b/spec/lib/spree/money_spec.rb
new file mode 100644
index 0000000000..c90b648ab0
--- /dev/null
+++ b/spec/lib/spree/money_spec.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: false
+
+# coding: utf-8
+require 'spec_helper'
+
+describe Spree::Money do
+  before do
+    configure_spree_preferences do |config|
+      config.currency = "USD"
+      config.currency_symbol_position = :before
+      config.display_currency = false
+    end
+  end
+
+  it "formats correctly" do
+    money = Spree::Money.new(10)
+    money.to_s.should == "$10.00"
+  end
+
+  it "can get cents" do
+    money = Spree::Money.new(10)
+    money.cents.should == 1000
+  end
+
+  context "with currency" do
+    it "passed in option" do
+      money = Spree::Money.new(10, :with_currency => true, :html => false)
+      money.to_s.should == "$10.00 USD"
+    end
+
+    it "config option" do
+      Spree::Config[:display_currency] = true
+      money = Spree::Money.new(10, :html => false)
+      money.to_s.should == "$10.00 USD"
+    end
+  end
+
+  context "hide cents" do
+    it "hides cents suffix" do
+      Spree::Config[:hide_cents] = true
+      money = Spree::Money.new(10)
+      money.to_s.should == "$10"
+    end
+
+    it "shows cents suffix" do
+      Spree::Config[:hide_cents] = false
+      money = Spree::Money.new(10)
+      money.to_s.should == "$10.00"
+    end
+  end
+
+  context "currency parameter" do
+    context "when currency is specified in Canadian Dollars" do
+      it "uses the currency param over the global configuration" do
+        money = Spree::Money.new(10, :currency => 'CAD', :with_currency => true, :html => false)
+        money.to_s.should == "$10.00 CAD"
+      end
+    end
+
+    context "when currency is specified in Japanese Yen" do
+      it "uses the currency param over the global configuration" do
+        money = Spree::Money.new(100, :currency => 'JPY', :html => false)
+        money.to_s.should == "¥100"
+      end
+    end
+  end
+
+  context "symbol positioning" do
+    it "passed in option" do
+      money = Spree::Money.new(10, :symbol_position => :after, :html => false)
+      money.to_s.should == "10.00 $"
+    end
+
+    it "passed in option string" do
+      money = Spree::Money.new(10, :symbol_position => "after", :html => false)
+      money.to_s.should == "10.00 $"
+    end
+
+    it "config option" do
+      Spree::Config[:currency_symbol_position] = :after
+      money = Spree::Money.new(10, :html => false)
+      money.to_s.should == "10.00 $"
+    end
+  end
+
+  context "JPY" do
+    before do
+      configure_spree_preferences do |config|
+        config.currency = "JPY"
+        config.currency_symbol_position = :before
+        config.display_currency = false
+      end
+    end
+
+    it "formats correctly" do
+      money = Spree::Money.new(1000, :html => false)
+      money.to_s.should == "¥1,000"
+    end
+  end
+
+  context "EUR" do
+    before do
+      configure_spree_preferences do |config|
+        config.currency = "EUR"
+        config.currency_symbol_position = :after
+        config.display_currency = false
+      end
+    end
+
+    # Regression test for #2634
+    it "formats as plain by default" do
+      money = Spree::Money.new(10)
+      money.to_s.should == "10.00 €"
+    end
+
+    # Regression test for #2632
+    it "acknowledges decimal mark option" do
+      Spree::Config[:currency_decimal_mark] = ","
+      money = Spree::Money.new(10)
+      money.to_s.should == "10,00 €"
+    end
+
+    # Regression test for #2632
+    it "acknowledges thousands separator option" do
+      Spree::Config[:currency_thousands_separator] = "."
+      money = Spree::Money.new(1000)
+      money.to_s.should == "1.000.00 €"
+    end
+
+    it "formats as HTML if asked (nicely) to" do
+      money = Spree::Money.new(10)
+      # The HTML'ified version of "10.00 €"
+      money.to_html.should == "10.00&nbsp;&#x20AC;"
+    end
+  end
+end

From 50e6ce92b3581c73720dbf9b9514f4adc5092662 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:34:03 +0100
Subject: [PATCH 069/340] Fix easy rubocop issues

---
 lib/spree/money.rb           | 12 +++++++-----
 spec/lib/spree/money_spec.rb | 19 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/spree/money.rb b/lib/spree/money.rb
index a98d36deac..413c2f0e8c 100644
--- a/lib/spree/money.rb
+++ b/lib/spree/money.rb
@@ -1,12 +1,14 @@
+# frozen_string_literal: false
+
 require 'money'
 
 module Spree
   class Money
     attr_reader :money
 
-    delegate :cents, :to => :money
+    delegate :cents, to: :money
 
-    def initialize(amount, options={})
+    def initialize(amount, options = {})
       @money = ::Money.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = {}
       @options[:with_currency] = Spree::Config[:display_currency]
@@ -23,7 +25,7 @@ module Spree
       @money.format(@options)
     end
 
-    def to_html(options = { :html => true })
+    def to_html(options = { html: true })
       output = @money.format(@options.merge(options))
       if options[:html]
         # 1) prevent blank, breaking spaces
@@ -33,8 +35,8 @@ module Spree
       output
     end
 
-    def ==(obj)
-      @money == obj.money
+    def ==(other)
+      @money == other.money
     end
   end
 end
diff --git a/spec/lib/spree/money_spec.rb b/spec/lib/spree/money_spec.rb
index c90b648ab0..f4fb0948d3 100644
--- a/spec/lib/spree/money_spec.rb
+++ b/spec/lib/spree/money_spec.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-# coding: utf-8
 require 'spec_helper'
 
 describe Spree::Money do
@@ -24,13 +23,13 @@ describe Spree::Money do
 
   context "with currency" do
     it "passed in option" do
-      money = Spree::Money.new(10, :with_currency => true, :html => false)
+      money = Spree::Money.new(10, with_currency: true, html: false)
       money.to_s.should == "$10.00 USD"
     end
 
     it "config option" do
       Spree::Config[:display_currency] = true
-      money = Spree::Money.new(10, :html => false)
+      money = Spree::Money.new(10, html: false)
       money.to_s.should == "$10.00 USD"
     end
   end
@@ -52,14 +51,14 @@ describe Spree::Money do
   context "currency parameter" do
     context "when currency is specified in Canadian Dollars" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(10, :currency => 'CAD', :with_currency => true, :html => false)
+        money = Spree::Money.new(10, currency: 'CAD', with_currency: true, html: false)
         money.to_s.should == "$10.00 CAD"
       end
     end
 
     context "when currency is specified in Japanese Yen" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(100, :currency => 'JPY', :html => false)
+        money = Spree::Money.new(100, currency: 'JPY', html: false)
         money.to_s.should == "¥100"
       end
     end
@@ -67,18 +66,18 @@ describe Spree::Money do
 
   context "symbol positioning" do
     it "passed in option" do
-      money = Spree::Money.new(10, :symbol_position => :after, :html => false)
+      money = Spree::Money.new(10, symbol_position: :after, html: false)
       money.to_s.should == "10.00 $"
     end
 
     it "passed in option string" do
-      money = Spree::Money.new(10, :symbol_position => "after", :html => false)
+      money = Spree::Money.new(10, symbol_position: "after", html: false)
       money.to_s.should == "10.00 $"
     end
 
     it "config option" do
       Spree::Config[:currency_symbol_position] = :after
-      money = Spree::Money.new(10, :html => false)
+      money = Spree::Money.new(10, html: false)
       money.to_s.should == "10.00 $"
     end
   end
@@ -93,7 +92,7 @@ describe Spree::Money do
     end
 
     it "formats correctly" do
-      money = Spree::Money.new(1000, :html => false)
+      money = Spree::Money.new(1000, html: false)
       money.to_s.should == "¥1,000"
     end
   end
@@ -129,7 +128,7 @@ describe Spree::Money do
 
     it "formats as HTML if asked (nicely) to" do
       money = Spree::Money.new(10)
-      # The HTML'ified version of "10.00 €"
+      # The HTMLified version of the euro sign
       money.to_html.should == "10.00&nbsp;&#x20AC;"
     end
   end

From 7b30008e8b0346a62a30e6a2ea94589c3eff8dd5 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:34:51 +0100
Subject: [PATCH 070/340] Run transpec

---
 spec/lib/spree/money_spec.rb | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/spec/lib/spree/money_spec.rb b/spec/lib/spree/money_spec.rb
index f4fb0948d3..139806137c 100644
--- a/spec/lib/spree/money_spec.rb
+++ b/spec/lib/spree/money_spec.rb
@@ -13,24 +13,24 @@ describe Spree::Money do
 
   it "formats correctly" do
     money = Spree::Money.new(10)
-    money.to_s.should == "$10.00"
+    expect(money.to_s).to eq("$10.00")
   end
 
   it "can get cents" do
     money = Spree::Money.new(10)
-    money.cents.should == 1000
+    expect(money.cents).to eq(1000)
   end
 
   context "with currency" do
     it "passed in option" do
       money = Spree::Money.new(10, with_currency: true, html: false)
-      money.to_s.should == "$10.00 USD"
+      expect(money.to_s).to eq("$10.00 USD")
     end
 
     it "config option" do
       Spree::Config[:display_currency] = true
       money = Spree::Money.new(10, html: false)
-      money.to_s.should == "$10.00 USD"
+      expect(money.to_s).to eq("$10.00 USD")
     end
   end
 
@@ -38,13 +38,13 @@ describe Spree::Money do
     it "hides cents suffix" do
       Spree::Config[:hide_cents] = true
       money = Spree::Money.new(10)
-      money.to_s.should == "$10"
+      expect(money.to_s).to eq("$10")
     end
 
     it "shows cents suffix" do
       Spree::Config[:hide_cents] = false
       money = Spree::Money.new(10)
-      money.to_s.should == "$10.00"
+      expect(money.to_s).to eq("$10.00")
     end
   end
 
@@ -52,14 +52,14 @@ describe Spree::Money do
     context "when currency is specified in Canadian Dollars" do
       it "uses the currency param over the global configuration" do
         money = Spree::Money.new(10, currency: 'CAD', with_currency: true, html: false)
-        money.to_s.should == "$10.00 CAD"
+        expect(money.to_s).to eq("$10.00 CAD")
       end
     end
 
     context "when currency is specified in Japanese Yen" do
       it "uses the currency param over the global configuration" do
         money = Spree::Money.new(100, currency: 'JPY', html: false)
-        money.to_s.should == "¥100"
+        expect(money.to_s).to eq("¥100")
       end
     end
   end
@@ -67,18 +67,18 @@ describe Spree::Money do
   context "symbol positioning" do
     it "passed in option" do
       money = Spree::Money.new(10, symbol_position: :after, html: false)
-      money.to_s.should == "10.00 $"
+      expect(money.to_s).to eq("10.00 $")
     end
 
     it "passed in option string" do
       money = Spree::Money.new(10, symbol_position: "after", html: false)
-      money.to_s.should == "10.00 $"
+      expect(money.to_s).to eq("10.00 $")
     end
 
     it "config option" do
       Spree::Config[:currency_symbol_position] = :after
       money = Spree::Money.new(10, html: false)
-      money.to_s.should == "10.00 $"
+      expect(money.to_s).to eq("10.00 $")
     end
   end
 
@@ -93,7 +93,7 @@ describe Spree::Money do
 
     it "formats correctly" do
       money = Spree::Money.new(1000, html: false)
-      money.to_s.should == "¥1,000"
+      expect(money.to_s).to eq("¥1,000")
     end
   end
 
@@ -106,30 +106,30 @@ describe Spree::Money do
       end
     end
 
-    # Regression test for #2634
+    # Regression test for Spree #2634
     it "formats as plain by default" do
       money = Spree::Money.new(10)
-      money.to_s.should == "10.00 €"
+      expect(money.to_s).to eq("10.00 €")
     end
 
-    # Regression test for #2632
+    # Regression test for Spree #2632
     it "acknowledges decimal mark option" do
       Spree::Config[:currency_decimal_mark] = ","
       money = Spree::Money.new(10)
-      money.to_s.should == "10,00 €"
+      expect(money.to_s).to eq("10,00 €")
     end
 
-    # Regression test for #2632
+    # Regression test for Spree #2632
     it "acknowledges thousands separator option" do
       Spree::Config[:currency_thousands_separator] = "."
       money = Spree::Money.new(1000)
-      money.to_s.should == "1.000.00 €"
+      expect(money.to_s).to eq("1.000.00 €")
     end
 
     it "formats as HTML if asked (nicely) to" do
       money = Spree::Money.new(10)
       # The HTMLified version of the euro sign
-      money.to_html.should == "10.00&nbsp;&#x20AC;"
+      expect(money.to_html).to eq("10.00&nbsp;&#x20AC;")
     end
   end
 end

From 95698fac37efb03ed6083550cb0d1e21d60740ab Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:36:13 +0100
Subject: [PATCH 071/340] Bring responder from spree_core

---
 lib/spree/responder.rb | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 lib/spree/responder.rb

diff --git a/lib/spree/responder.rb b/lib/spree/responder.rb
new file mode 100644
index 0000000000..b87d0f0daa
--- /dev/null
+++ b/lib/spree/responder.rb
@@ -0,0 +1,45 @@
+module Spree
+  class Responder < ::ActionController::Responder #:nodoc:
+
+    attr_accessor :on_success, :on_failure
+
+    def initialize(controller, resources, options={})
+      super
+
+      class_name = controller.class.name.to_sym
+      action_name = options.delete(:action_name)
+
+      if result = Spree::BaseController.spree_responders[class_name].try(:[], action_name).try(:[], self.format.to_sym)
+        self.on_success = handler(controller, result, :success)
+        self.on_failure = handler(controller, result, :failure)
+      end
+    end
+
+    def to_html
+      super and return if !(on_success || on_failure)
+      has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
+    end
+
+    def to_format
+      super and return if !(on_success || on_failure)
+      has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
+    end
+
+    private
+
+    def handler(controller, result, status)
+      return result if result.respond_to? :call
+
+      case result
+      when Hash
+        if result[status].is_a? Symbol
+          controller.method(result[status])
+        else
+          result[status]
+        end
+      when Symbol
+        controller.method(result)
+      end
+    end
+  end
+end

From 2c65cea911b33ce8b16bb5eee2d8a3d501a5989a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 15:40:10 +0100
Subject: [PATCH 072/340] Fix easy rubocop issues

---
 lib/spree/responder.rb | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/spree/responder.rb b/lib/spree/responder.rb
index b87d0f0daa..3c0e60aa5b 100644
--- a/lib/spree/responder.rb
+++ b/lib/spree/responder.rb
@@ -1,27 +1,39 @@
+# frozen_string_literal: true
+
 module Spree
   class Responder < ::ActionController::Responder #:nodoc:
-
     attr_accessor :on_success, :on_failure
 
-    def initialize(controller, resources, options={})
+    def initialize(controller, resources, options = {})
       super
 
       class_name = controller.class.name.to_sym
       action_name = options.delete(:action_name)
 
-      if result = Spree::BaseController.spree_responders[class_name].try(:[], action_name).try(:[], self.format.to_sym)
-        self.on_success = handler(controller, result, :success)
-        self.on_failure = handler(controller, result, :failure)
-      end
+      result = Spree::BaseController.spree_responders[class_name].
+        try(:[], action_name).
+        try(:[], self.format.to_sym)
+      return unless result
+
+      self.on_success = handler(controller, result, :success)
+      self.on_failure = handler(controller, result, :failure)
     end
 
     def to_html
-      super and return if !(on_success || on_failure)
+      if !(on_success || on_failure)
+        super
+        return
+      end
+
       has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
     end
 
     def to_format
-      super and return if !(on_success || on_failure)
+      if !(on_success || on_failure)
+        super
+        return
+      end
+
       has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
     end
 

From 58da11fde760769c1d75fcd27c65eaca0c11b80e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:16:52 +0100
Subject: [PATCH 073/340] Bring Environment Calculators and Environment
 Extension from spree_core

---
 lib/spree/core/environment/calculators.rb | 12 +++++++++++
 lib/spree/core/environment_extension.rb   | 25 +++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 lib/spree/core/environment/calculators.rb
 create mode 100644 lib/spree/core/environment_extension.rb

diff --git a/lib/spree/core/environment/calculators.rb b/lib/spree/core/environment/calculators.rb
new file mode 100644
index 0000000000..ae86072c19
--- /dev/null
+++ b/lib/spree/core/environment/calculators.rb
@@ -0,0 +1,12 @@
+module Spree
+  module Core
+    class Environment
+      class Calculators
+        include EnvironmentExtension
+
+        attr_accessor :shipping_methods, :tax_rates
+      end
+    end
+  end
+end
+
diff --git a/lib/spree/core/environment_extension.rb b/lib/spree/core/environment_extension.rb
new file mode 100644
index 0000000000..ecbd31a9a3
--- /dev/null
+++ b/lib/spree/core/environment_extension.rb
@@ -0,0 +1,25 @@
+module Spree
+  module Core
+    module EnvironmentExtension
+      extend ActiveSupport::Concern
+
+      def add_class(name)
+        self.instance_variable_set "@#{name}", Set.new
+
+        create_method( "#{name}=".to_sym ) { |val|
+          instance_variable_set( "@" + name, val)
+        }
+
+        create_method(name.to_sym) do
+          instance_variable_get( "@" + name )
+        end
+      end
+
+      private
+
+        def create_method(name, &block)
+          self.class.send(:define_method, name, &block)
+        end
+    end
+  end
+end

From 7218bb0c7d59adf056bebab253136d78b471d152 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:24:55 +0100
Subject: [PATCH 074/340] Bring Spree::OrderUpdater from spree

---
 app/models/spree/order_updater.rb | 159 ++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 app/models/spree/order_updater.rb

diff --git a/app/models/spree/order_updater.rb b/app/models/spree/order_updater.rb
new file mode 100644
index 0000000000..547f8e46c7
--- /dev/null
+++ b/app/models/spree/order_updater.rb
@@ -0,0 +1,159 @@
+module Spree
+  class OrderUpdater
+    attr_reader :order
+    delegate :payments, :line_items, :adjustments, :shipments, :update_hooks, to: :order
+
+    def initialize(order)
+      @order = order
+    end
+
+    # This is a multi-purpose method for processing logic related to changes in the Order.
+    # It is meant to be called from various observers so that the Order is aware of changes
+    # that affect totals and other values stored in the Order.
+    #
+    # This method should never do anything to the Order that results in a save call on the
+    # object with callbacks (otherwise you will end up in an infinite recursion as the
+    # associations try to save and then in turn try to call +update!+ again.)
+    def update
+      update_totals
+
+      if order.completed?
+        update_payment_state
+
+        # give each of the shipments a chance to update themselves
+        shipments.each { |shipment| shipment.update!(order) }
+        update_shipment_state
+      end
+      
+      update_promotion_adjustments
+      update_shipping_adjustments
+      # update totals a second time in case updated adjustments have an effect on the total
+      update_totals
+
+      order.update_attributes_without_callbacks({
+        payment_state: order.payment_state,
+        shipment_state: order.shipment_state,
+        item_total: order.item_total,
+        adjustment_total: order.adjustment_total,
+        payment_total: order.payment_total,
+        total: order.total
+      })
+
+      run_hooks
+    end
+
+    def run_hooks
+      update_hooks.each { |hook| order.send hook }
+    end
+
+    # Updates the following Order total values:
+    #
+    # +payment_total+      The total value of all finalized Payments (NOTE: non-finalized Payments are excluded)
+    # +item_total+         The total value of all LineItems
+    # +adjustment_total+   The total value of all adjustments (promotions, credits, etc.)
+    # +total+              The so-called "order total."  This is equivalent to +item_total+ plus +adjustment_total+.
+    def update_totals
+      order.payment_total = payments.completed.map(&:amount).sum
+      order.item_total = line_items.map(&:amount).sum
+      order.adjustment_total = adjustments.eligible.map(&:amount).sum
+      order.total = order.item_total + order.adjustment_total
+    end
+
+    # Updates the +shipment_state+ attribute according to the following logic:
+    #
+    # shipped   when all Shipments are in the "shipped" state
+    # partial   when at least one Shipment has a state of "shipped" and there is another Shipment with a state other than "shipped"
+    #           or there are InventoryUnits associated with the order that have a state of "sold" but are not associated with a Shipment.
+    # ready     when all Shipments are in the "ready" state
+    # backorder when there is backordered inventory associated with an order
+    # pending   when all Shipments are in the "pending" state
+    #
+    # The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
+    def update_shipment_state
+      if order.backordered?
+        order.shipment_state = 'backorder'
+      else
+        # get all the shipment states for this order
+        shipment_states = shipments.states
+        if shipment_states.size > 1
+          # multiple shiment states means it's most likely partially shipped
+          order.shipment_state = 'partial'
+        else
+          # will return nil if no shipments are found
+          order.shipment_state = shipment_states.first
+          # TODO inventory unit states?
+          # if order.shipment_state && order.inventory_units.where(:shipment_id => nil).exists?
+          #   shipments exist but there are unassigned inventory units
+          #   order.shipment_state = 'partial'
+          # end
+        end
+      end
+
+      order.state_changed('shipment')
+    end
+
+    # Updates the +payment_state+ attribute according to the following logic:
+    #
+    # paid          when +payment_total+ is equal to +total+
+    # balance_due   when +payment_total+ is less than +total+
+    # credit_owed   when +payment_total+ is greater than +total+
+    # failed        when most recent payment is in the failed state
+    #
+    # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
+    def update_payment_state
+
+      #line_item are empty when user empties cart
+      if line_items.empty? || round_money(order.payment_total) < round_money(order.total)
+        if payments.present? && payments.last.state == 'failed'
+          order.payment_state = 'failed'
+        else
+          order.payment_state = 'balance_due'
+        end
+      elsif round_money(order.payment_total) > round_money(order.total)
+        order.payment_state = 'credit_owed'
+      else
+        order.payment_state = 'paid'
+      end
+
+      order.state_changed('payment')
+    end
+
+    # Updates each of the Order adjustments.
+    #
+    # This is intended to be called from an Observer so that the Order can
+    # respond to external changes to LineItem, Shipment, other Adjustments, etc.
+    #
+    # Adjustments will check if they are still eligible. Ineligible adjustments
+    # are preserved but not counted towards adjustment_total.
+    def update_promotion_adjustments
+      order.adjustments.reload.promotion.each { |adjustment| adjustment.update!(order) }
+      choose_best_promotion_adjustment
+    end
+
+    # Shipping adjustments don't receive order on update! because they calculated
+    # over a shipping / package object rather than an order object
+    def update_shipping_adjustments
+      order.adjustments.reload.shipping.each { |adjustment| adjustment.update! }
+    end
+
+    def before_save_hook
+      # no op
+    end
+
+    private
+
+      # Picks one (and only one) promotion to be eligible for this order
+      # This promotion provides the most discount, and if two promotions
+      # have the same amount, then it will pick the latest one.
+      def choose_best_promotion_adjustment
+        if best_promotion_adjustment = order.adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
+          other_promotions = order.adjustments.promotion.where("id NOT IN (?)", best_promotion_adjustment.id)
+          other_promotions.update_all(eligible: false)
+        end
+      end
+
+      def round_money(n)
+        (n * 100).round / 100.0
+      end
+  end
+end

From d2f0d961745bcf85454324b9d12fcf03d3c8a35d Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:25:44 +0100
Subject: [PATCH 075/340] Bring Spree::OrderUpdater spec

---
 spec/models/spree/order_updater_spec.rb | 254 ++++++++++++++++++++++++
 1 file changed, 254 insertions(+)
 create mode 100644 spec/models/spree/order_updater_spec.rb

diff --git a/spec/models/spree/order_updater_spec.rb b/spec/models/spree/order_updater_spec.rb
new file mode 100644
index 0000000000..f71c4bfb65
--- /dev/null
+++ b/spec/models/spree/order_updater_spec.rb
@@ -0,0 +1,254 @@
+require 'spec_helper'
+
+module Spree
+  describe OrderUpdater do
+    let(:order) { stub_model(Spree::Order, :backordered? => false) }
+    let(:updater) { Spree::OrderUpdater.new(order) }
+
+    it "updates totals" do
+      payments = [double(:amount => 5), double(:amount => 5)]
+      order.stub_chain(:payments, :completed).and_return(payments)
+
+      line_items = [double(:amount => 10), double(:amount => 20)]
+      order.stub :line_items => line_items
+
+      adjustments = [double(:amount => 10), double(:amount => -20)]
+      order.stub_chain(:adjustments, :eligible).and_return(adjustments)
+
+      updater.update_totals
+      order.payment_total.should == 10
+      order.item_total.should == 30
+      order.adjustment_total.should == -10
+      order.total.should == 20
+    end
+
+    context "updating shipment state" do
+      before do
+        order.stub_chain(:shipments, :shipped, :count).and_return(0)
+        order.stub_chain(:shipments, :ready, :count).and_return(0)
+        order.stub_chain(:shipments, :pending, :count).and_return(0)
+      end
+
+      it "is backordered" do
+        order.stub :backordered? => true
+        updater.update_shipment_state
+
+        order.shipment_state.should == 'backorder'
+      end
+
+      it "is nil" do
+        order.stub_chain(:shipments, :states).and_return([])
+        order.stub_chain(:shipments, :count).and_return(0)
+
+        updater.update_shipment_state
+        order.shipment_state.should be_nil
+      end
+
+
+      ["shipped", "ready", "pending"].each do |state|
+        it "is #{state}" do
+          order.stub_chain(:shipments, :states).and_return([state])
+          updater.update_shipment_state
+          order.shipment_state.should == state.to_s
+        end
+      end
+
+      it "is partial" do
+        order.stub_chain(:shipments, :states).and_return(["pending", "ready"])
+        updater.update_shipment_state
+        order.shipment_state.should == 'partial'
+      end
+    end
+
+    context "updating payment state" do
+      it "is failed if last payment failed" do
+        order.stub_chain(:payments, :last, :state).and_return('failed')
+
+        updater.update_payment_state
+        order.payment_state.should == 'failed'
+      end
+
+      it "is balance due with no line items" do
+        order.stub_chain(:line_items, :empty?).and_return(true)
+
+        updater.update_payment_state
+        order.payment_state.should == 'balance_due'
+      end
+
+      it "is credit owed if payment is above total" do
+        order.stub_chain(:line_items, :empty?).and_return(false)
+        order.stub :payment_total => 31
+        order.stub :total => 30
+
+        updater.update_payment_state
+        order.payment_state.should == 'credit_owed'
+      end
+
+      it "is paid if order is paid in full" do
+        order.stub_chain(:line_items, :empty?).and_return(false)
+        order.stub :payment_total => 30
+        order.stub :total => 30
+
+        updater.update_payment_state
+        order.payment_state.should == 'paid'
+      end
+    end
+
+    it "state change" do
+      order.shipment_state = 'shipped'
+      state_changes = double
+      order.stub :state_changes => state_changes
+      state_changes.should_receive(:create).with(
+        :previous_state => nil,
+        :next_state => 'shipped',
+        :name => 'shipment',
+        :user_id => nil
+      )
+
+      order.state_changed('shipment')
+    end
+
+    context "completed order" do
+      before { order.stub completed?: true }
+
+      it "updates payment state" do
+        expect(updater).to receive(:update_payment_state)
+        updater.update
+      end
+
+      it "updates shipment state" do
+        expect(updater).to receive(:update_shipment_state)
+        updater.update
+      end
+
+      it "updates each shipment" do
+        shipment = stub_model(Spree::Shipment)
+        shipments = [shipment]
+        order.stub :shipments => shipments
+        shipments.stub :states => []
+        shipments.stub :ready => []
+        shipments.stub :pending => []
+        shipments.stub :shipped => []
+
+        shipment.should_receive(:update!).with(order)
+        updater.update
+      end
+    end
+
+    context "incompleted order" do
+      before { order.stub completed?: false }
+
+      it "doesnt update payment state" do
+        expect(updater).not_to receive(:update_payment_state)
+        updater.update
+      end
+
+      it "doesnt update shipment state" do
+        expect(updater).not_to receive(:update_shipment_state)
+        updater.update
+      end
+
+      it "doesnt update each shipment" do
+        shipment = stub_model(Spree::Shipment)
+        shipments = [shipment]
+        order.stub :shipments => shipments
+        shipments.stub :states => []
+        shipments.stub :ready => []
+        shipments.stub :pending => []
+        shipments.stub :shipped => []
+
+        expect(shipment).not_to receive(:update!).with(order)
+        updater.update
+      end
+    end
+
+    it "updates totals twice" do
+      updater.should_receive(:update_totals).twice
+      updater.update
+    end
+
+    context "update adjustments" do
+      context "shipments" do
+        it "updates" do
+          expect(updater).to receive(:update_shipping_adjustments)
+          updater.update
+        end
+      end
+
+      context "promotions" do
+        let(:originator) do
+          originator = Spree::Promotion::Actions::CreateAdjustment.create
+          calculator = Spree::Calculator::PerItem.create(:calculable => originator)
+          originator.calculator = calculator
+          originator.save
+          originator
+        end
+
+        def create_adjustment(label, amount)
+          create(:adjustment, :adjustable => order,
+                              :originator => originator,
+                              :amount     => amount,
+                              :state      => "closed",
+                              :label      => label,
+                              :mandatory  => false)
+        end
+
+        it "should make all but the most valuable promotion adjustment ineligible, leaving non promotion adjustments alone" do
+          create_adjustment("Promotion A", -100)
+          create_adjustment("Promotion B", -200)
+          create_adjustment("Promotion C", -300)
+          create(:adjustment, :adjustable => order,
+                              :originator => nil,
+                              :amount => -500,
+                              :state => "closed",
+                              :label => "Some other credit")
+          order.adjustments.each {|a| a.update_column(:eligible, true)}
+
+          updater.update_promotion_adjustments
+
+          order.adjustments.eligible.promotion.count.should == 1
+          order.adjustments.eligible.promotion.first.label.should == 'Promotion C'
+        end
+
+        context "multiple adjustments and the best one is not eligible" do
+          let!(:promo_a) { create_adjustment("Promotion A", -100) }
+          let!(:promo_c) { create_adjustment("Promotion C", -300) }
+
+          before do
+            promo_a.update_column(:eligible, true)
+            promo_c.update_column(:eligible, false)
+          end
+
+          # regression for #3274
+          it "still makes the previous best eligible adjustment valid" do
+            updater.update_promotion_adjustments
+            order.adjustments.eligible.promotion.first.label.should == 'Promotion A'
+          end
+        end
+
+        it "should only leave one adjustment even if 2 have the same amount" do
+          create_adjustment("Promotion A", -100)
+          create_adjustment("Promotion B", -200)
+          create_adjustment("Promotion C", -200)
+
+          updater.update_promotion_adjustments
+
+          order.adjustments.eligible.promotion.count.should == 1
+          order.adjustments.eligible.promotion.first.amount.to_i.should == -200
+        end
+
+        it "should only include eligible adjustments in promo_total" do
+          create_adjustment("Promotion A", -100)
+          create(:adjustment, :adjustable => order,
+                              :originator => nil,
+                              :amount     => -1000,
+                              :state      => "closed",
+                              :eligible   => false,
+                              :label      => 'Bad promo')
+
+          order.promo_total.to_f.should == -100.to_f
+        end
+      end
+    end
+  end
+end

From 1f3973106863387261ec9e3b32042f12dbd2f3cf Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:36:06 +0100
Subject: [PATCH 076/340] Modernize and fix spec brought from spree

---
 spec/models/spree/order_updater_spec.rb | 59 +++++++++++++------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/spec/models/spree/order_updater_spec.rb b/spec/models/spree/order_updater_spec.rb
index f71c4bfb65..b399466b18 100644
--- a/spec/models/spree/order_updater_spec.rb
+++ b/spec/models/spree/order_updater_spec.rb
@@ -2,9 +2,11 @@ require 'spec_helper'
 
 module Spree
   describe OrderUpdater do
-    let(:order) { stub_model(Spree::Order, :backordered? => false) }
+    let(:order) { build(:order) }
     let(:updater) { Spree::OrderUpdater.new(order) }
 
+    before { allow(order).to receive(:backordered?) { false } }
+
     it "updates totals" do
       payments = [double(:amount => 5), double(:amount => 5)]
       order.stub_chain(:payments, :completed).and_return(payments)
@@ -16,10 +18,10 @@ module Spree
       order.stub_chain(:adjustments, :eligible).and_return(adjustments)
 
       updater.update_totals
-      order.payment_total.should == 10
-      order.item_total.should == 30
-      order.adjustment_total.should == -10
-      order.total.should == 20
+      expect(order.payment_total).to eq 10
+      expect(order.item_total).to eq 30
+      expect(order.adjustment_total).to eq -10
+      expect(order.total).to eq 20
     end
 
     context "updating shipment state" do
@@ -30,10 +32,10 @@ module Spree
       end
 
       it "is backordered" do
-        order.stub :backordered? => true
+        allow(order).to receive(:backordered?) { true }
         updater.update_shipment_state
 
-        order.shipment_state.should == 'backorder'
+        expect(order.shipment_state).to eq 'backorder'
       end
 
       it "is nil" do
@@ -41,7 +43,7 @@ module Spree
         order.stub_chain(:shipments, :count).and_return(0)
 
         updater.update_shipment_state
-        order.shipment_state.should be_nil
+        expect(order.shipment_state).to be_nil
       end
 
 
@@ -49,14 +51,14 @@ module Spree
         it "is #{state}" do
           order.stub_chain(:shipments, :states).and_return([state])
           updater.update_shipment_state
-          order.shipment_state.should == state.to_s
+          expect(order.shipment_state).to eq state.to_s
         end
       end
 
       it "is partial" do
         order.stub_chain(:shipments, :states).and_return(["pending", "ready"])
         updater.update_shipment_state
-        order.shipment_state.should == 'partial'
+        expect(order.shipment_state).to eq 'partial'
       end
     end
 
@@ -65,14 +67,14 @@ module Spree
         order.stub_chain(:payments, :last, :state).and_return('failed')
 
         updater.update_payment_state
-        order.payment_state.should == 'failed'
+        expect(order.payment_state).to eq 'failed'
       end
 
       it "is balance due with no line items" do
         order.stub_chain(:line_items, :empty?).and_return(true)
 
         updater.update_payment_state
-        order.payment_state.should == 'balance_due'
+        expect(order.payment_state).to eq 'balance_due'
       end
 
       it "is credit owed if payment is above total" do
@@ -81,7 +83,7 @@ module Spree
         order.stub :total => 30
 
         updater.update_payment_state
-        order.payment_state.should == 'credit_owed'
+        expect(order.payment_state).to eq 'credit_owed'
       end
 
       it "is paid if order is paid in full" do
@@ -90,26 +92,27 @@ module Spree
         order.stub :total => 30
 
         updater.update_payment_state
-        order.payment_state.should == 'paid'
+        expect(order.payment_state).to eq 'paid'
       end
     end
 
     it "state change" do
+      order = create(:order)
       order.shipment_state = 'shipped'
       state_changes = double
-      order.stub :state_changes => state_changes
-      state_changes.should_receive(:create).with(
+      allow(order).to receive(:state_changes) { state_changes }
+      expect(state_changes).to receive(:create).with(
         :previous_state => nil,
         :next_state => 'shipped',
         :name => 'shipment',
-        :user_id => nil
+        :user_id => order.user_id
       )
 
       order.state_changed('shipment')
     end
 
     context "completed order" do
-      before { order.stub completed?: true }
+      before { allow(order).to receive(:completed?) { true } }
 
       it "updates payment state" do
         expect(updater).to receive(:update_payment_state)
@@ -122,7 +125,7 @@ module Spree
       end
 
       it "updates each shipment" do
-        shipment = stub_model(Spree::Shipment)
+        shipment = build(:shipment)
         shipments = [shipment]
         order.stub :shipments => shipments
         shipments.stub :states => []
@@ -130,7 +133,7 @@ module Spree
         shipments.stub :pending => []
         shipments.stub :shipped => []
 
-        shipment.should_receive(:update!).with(order)
+        expect(shipment).to receive(:update!).with(order)
         updater.update
       end
     end
@@ -149,7 +152,7 @@ module Spree
       end
 
       it "doesnt update each shipment" do
-        shipment = stub_model(Spree::Shipment)
+        shipment = build(:shipment)
         shipments = [shipment]
         order.stub :shipments => shipments
         shipments.stub :states => []
@@ -163,7 +166,7 @@ module Spree
     end
 
     it "updates totals twice" do
-      updater.should_receive(:update_totals).twice
+      expect(updater).to receive(:update_totals).twice
       updater.update
     end
 
@@ -206,8 +209,8 @@ module Spree
 
           updater.update_promotion_adjustments
 
-          order.adjustments.eligible.promotion.count.should == 1
-          order.adjustments.eligible.promotion.first.label.should == 'Promotion C'
+          expect(order.adjustments.eligible.promotion.count).to eq 1
+          expect(order.adjustments.eligible.promotion.first.label).to eq 'Promotion C'
         end
 
         context "multiple adjustments and the best one is not eligible" do
@@ -222,7 +225,7 @@ module Spree
           # regression for #3274
           it "still makes the previous best eligible adjustment valid" do
             updater.update_promotion_adjustments
-            order.adjustments.eligible.promotion.first.label.should == 'Promotion A'
+            expect(order.adjustments.eligible.promotion.first.label).to eq 'Promotion A'
           end
         end
 
@@ -233,8 +236,8 @@ module Spree
 
           updater.update_promotion_adjustments
 
-          order.adjustments.eligible.promotion.count.should == 1
-          order.adjustments.eligible.promotion.first.amount.to_i.should == -200
+          expect(order.adjustments.eligible.promotion.count).to eq 1
+          expect(order.adjustments.eligible.promotion.first.amount.to_i).to eq -200
         end
 
         it "should only include eligible adjustments in promo_total" do
@@ -246,7 +249,7 @@ module Spree
                               :eligible   => false,
                               :label      => 'Bad promo')
 
-          order.promo_total.to_f.should == -100.to_f
+          expect(order.promo_total.to_f).to eq -100.to_f
         end
       end
     end

From a929d82580da354760e8eb060974522d8478b1fa Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:36:47 +0100
Subject: [PATCH 077/340] Transpec order_updater_spec

---
 spec/models/spree/order_updater_spec.rb | 58 ++++++++++++-------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/spec/models/spree/order_updater_spec.rb b/spec/models/spree/order_updater_spec.rb
index b399466b18..ff0d023d5d 100644
--- a/spec/models/spree/order_updater_spec.rb
+++ b/spec/models/spree/order_updater_spec.rb
@@ -9,13 +9,13 @@ module Spree
 
     it "updates totals" do
       payments = [double(:amount => 5), double(:amount => 5)]
-      order.stub_chain(:payments, :completed).and_return(payments)
+      allow(order).to receive_message_chain(:payments, :completed).and_return(payments)
 
       line_items = [double(:amount => 10), double(:amount => 20)]
-      order.stub :line_items => line_items
+      allow(order).to receive_messages :line_items => line_items
 
       adjustments = [double(:amount => 10), double(:amount => -20)]
-      order.stub_chain(:adjustments, :eligible).and_return(adjustments)
+      allow(order).to receive_message_chain(:adjustments, :eligible).and_return(adjustments)
 
       updater.update_totals
       expect(order.payment_total).to eq 10
@@ -26,9 +26,9 @@ module Spree
 
     context "updating shipment state" do
       before do
-        order.stub_chain(:shipments, :shipped, :count).and_return(0)
-        order.stub_chain(:shipments, :ready, :count).and_return(0)
-        order.stub_chain(:shipments, :pending, :count).and_return(0)
+        allow(order).to receive_message_chain(:shipments, :shipped, :count).and_return(0)
+        allow(order).to receive_message_chain(:shipments, :ready, :count).and_return(0)
+        allow(order).to receive_message_chain(:shipments, :pending, :count).and_return(0)
       end
 
       it "is backordered" do
@@ -39,8 +39,8 @@ module Spree
       end
 
       it "is nil" do
-        order.stub_chain(:shipments, :states).and_return([])
-        order.stub_chain(:shipments, :count).and_return(0)
+        allow(order).to receive_message_chain(:shipments, :states).and_return([])
+        allow(order).to receive_message_chain(:shipments, :count).and_return(0)
 
         updater.update_shipment_state
         expect(order.shipment_state).to be_nil
@@ -49,14 +49,14 @@ module Spree
 
       ["shipped", "ready", "pending"].each do |state|
         it "is #{state}" do
-          order.stub_chain(:shipments, :states).and_return([state])
+          allow(order).to receive_message_chain(:shipments, :states).and_return([state])
           updater.update_shipment_state
           expect(order.shipment_state).to eq state.to_s
         end
       end
 
       it "is partial" do
-        order.stub_chain(:shipments, :states).and_return(["pending", "ready"])
+        allow(order).to receive_message_chain(:shipments, :states).and_return(["pending", "ready"])
         updater.update_shipment_state
         expect(order.shipment_state).to eq 'partial'
       end
@@ -64,32 +64,32 @@ module Spree
 
     context "updating payment state" do
       it "is failed if last payment failed" do
-        order.stub_chain(:payments, :last, :state).and_return('failed')
+        allow(order).to receive_message_chain(:payments, :last, :state).and_return('failed')
 
         updater.update_payment_state
         expect(order.payment_state).to eq 'failed'
       end
 
       it "is balance due with no line items" do
-        order.stub_chain(:line_items, :empty?).and_return(true)
+        allow(order).to receive_message_chain(:line_items, :empty?).and_return(true)
 
         updater.update_payment_state
         expect(order.payment_state).to eq 'balance_due'
       end
 
       it "is credit owed if payment is above total" do
-        order.stub_chain(:line_items, :empty?).and_return(false)
-        order.stub :payment_total => 31
-        order.stub :total => 30
+        allow(order).to receive_message_chain(:line_items, :empty?).and_return(false)
+        allow(order).to receive_messages :payment_total => 31
+        allow(order).to receive_messages :total => 30
 
         updater.update_payment_state
         expect(order.payment_state).to eq 'credit_owed'
       end
 
       it "is paid if order is paid in full" do
-        order.stub_chain(:line_items, :empty?).and_return(false)
-        order.stub :payment_total => 30
-        order.stub :total => 30
+        allow(order).to receive_message_chain(:line_items, :empty?).and_return(false)
+        allow(order).to receive_messages :payment_total => 30
+        allow(order).to receive_messages :total => 30
 
         updater.update_payment_state
         expect(order.payment_state).to eq 'paid'
@@ -127,11 +127,11 @@ module Spree
       it "updates each shipment" do
         shipment = build(:shipment)
         shipments = [shipment]
-        order.stub :shipments => shipments
-        shipments.stub :states => []
-        shipments.stub :ready => []
-        shipments.stub :pending => []
-        shipments.stub :shipped => []
+        allow(order).to receive_messages :shipments => shipments
+        allow(shipments).to receive_messages :states => []
+        allow(shipments).to receive_messages :ready => []
+        allow(shipments).to receive_messages :pending => []
+        allow(shipments).to receive_messages :shipped => []
 
         expect(shipment).to receive(:update!).with(order)
         updater.update
@@ -139,7 +139,7 @@ module Spree
     end
 
     context "incompleted order" do
-      before { order.stub completed?: false }
+      before { allow(order).to receive_messages completed?: false }
 
       it "doesnt update payment state" do
         expect(updater).not_to receive(:update_payment_state)
@@ -154,11 +154,11 @@ module Spree
       it "doesnt update each shipment" do
         shipment = build(:shipment)
         shipments = [shipment]
-        order.stub :shipments => shipments
-        shipments.stub :states => []
-        shipments.stub :ready => []
-        shipments.stub :pending => []
-        shipments.stub :shipped => []
+        allow(order).to receive_messages :shipments => shipments
+        allow(shipments).to receive_messages :states => []
+        allow(shipments).to receive_messages :ready => []
+        allow(shipments).to receive_messages :pending => []
+        allow(shipments).to receive_messages :shipped => []
 
         expect(shipment).not_to receive(:update!).with(order)
         updater.update

From ebeeeb7ed325ee0b5a82e4b4e930aeb29bb50c81 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:46:54 +0100
Subject: [PATCH 078/340] Fix easy rubocop issues

---
 app/models/spree/order_updater.rb | 99 +++++++++++++++++--------------
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/app/models/spree/order_updater.rb b/app/models/spree/order_updater.rb
index 547f8e46c7..ec70ebbbe6 100644
--- a/app/models/spree/order_updater.rb
+++ b/app/models/spree/order_updater.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class OrderUpdater
     attr_reader :order
@@ -24,34 +26,36 @@ module Spree
         shipments.each { |shipment| shipment.update!(order) }
         update_shipment_state
       end
-      
+
       update_promotion_adjustments
       update_shipping_adjustments
       # update totals a second time in case updated adjustments have an effect on the total
       update_totals
 
-      order.update_attributes_without_callbacks({
-        payment_state: order.payment_state,
-        shipment_state: order.shipment_state,
-        item_total: order.item_total,
-        adjustment_total: order.adjustment_total,
-        payment_total: order.payment_total,
-        total: order.total
-      })
+      order.update_attributes_without_callbacks(
+        {
+          payment_state: order.payment_state,
+          shipment_state: order.shipment_state,
+          item_total: order.item_total,
+          adjustment_total: order.adjustment_total,
+          payment_total: order.payment_total,
+          total: order.total
+        }
+      )
 
       run_hooks
     end
 
     def run_hooks
-      update_hooks.each { |hook| order.send hook }
+      update_hooks.each { |hook| order.__send__(hook) }
     end
 
     # Updates the following Order total values:
     #
-    # +payment_total+      The total value of all finalized Payments (NOTE: non-finalized Payments are excluded)
-    # +item_total+         The total value of all LineItems
-    # +adjustment_total+   The total value of all adjustments (promotions, credits, etc.)
-    # +total+              The so-called "order total."  This is equivalent to +item_total+ plus +adjustment_total+.
+    # - payment_total - the total value of all finalized Payments (excluding non-finalized Payments)
+    # - item_total - the total value of all LineItems
+    # - adjustment_total - the total value of all adjustments
+    # - total - the "order total". This is equivalent to item_total plus adjustment_total
     def update_totals
       order.payment_total = payments.completed.map(&:amount).sum
       order.item_total = line_items.map(&:amount).sum
@@ -61,14 +65,17 @@ module Spree
 
     # Updates the +shipment_state+ attribute according to the following logic:
     #
-    # shipped   when all Shipments are in the "shipped" state
-    # partial   when at least one Shipment has a state of "shipped" and there is another Shipment with a state other than "shipped"
-    #           or there are InventoryUnits associated with the order that have a state of "sold" but are not associated with a Shipment.
-    # ready     when all Shipments are in the "ready" state
-    # backorder when there is backordered inventory associated with an order
-    # pending   when all Shipments are in the "pending" state
+    # - shipped - when all Shipments are in the "shipped" state
+    # - partial - when 1. at least one Shipment has a state of "shipped"
+    #                       and there is another Shipment with a state other than "shipped"
+    #                  or 2. there are InventoryUnits associated with the order that
+    #                          have a state of "sold" but are not associated with a Shipment
+    # - ready - when all Shipments are in the "ready" state
+    # - backorder - when there is backordered inventory associated with an order
+    # - pending - when all Shipments are in the "pending" state
     #
-    # The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
+    # The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way
+    #   to locate Orders needing attention.
     def update_shipment_state
       if order.backordered?
         order.shipment_state = 'backorder'
@@ -94,21 +101,21 @@ module Spree
 
     # Updates the +payment_state+ attribute according to the following logic:
     #
-    # paid          when +payment_total+ is equal to +total+
-    # balance_due   when +payment_total+ is less than +total+
-    # credit_owed   when +payment_total+ is greater than +total+
-    # failed        when most recent payment is in the failed state
+    # - paid - when +payment_total+ is equal to +total+
+    # - balance_due - when +payment_total+ is less than +total+
+    # - credit_owed - when +payment_total+ is greater than +total+
+    # - failed - when most recent payment is in the failed state
     #
-    # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
+    # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way
+    #   to locate Orders needing attention.
     def update_payment_state
-
-      #line_item are empty when user empties cart
+      # line_items are empty when user empties cart
       if line_items.empty? || round_money(order.payment_total) < round_money(order.total)
-        if payments.present? && payments.last.state == 'failed'
-          order.payment_state = 'failed'
-        else
-          order.payment_state = 'balance_due'
-        end
+        order.payment_state = if payments.present? && payments.last.state == 'failed'
+                                'failed'
+                              else
+                                'balance_due'
+                              end
       elsif round_money(order.payment_total) > round_money(order.total)
         order.payment_state = 'credit_owed'
       else
@@ -133,7 +140,7 @@ module Spree
     # Shipping adjustments don't receive order on update! because they calculated
     # over a shipping / package object rather than an order object
     def update_shipping_adjustments
-      order.adjustments.reload.shipping.each { |adjustment| adjustment.update! }
+      order.adjustments.reload.shipping.each(&:update!)
     end
 
     def before_save_hook
@@ -142,18 +149,18 @@ module Spree
 
     private
 
-      # Picks one (and only one) promotion to be eligible for this order
-      # This promotion provides the most discount, and if two promotions
-      # have the same amount, then it will pick the latest one.
-      def choose_best_promotion_adjustment
-        if best_promotion_adjustment = order.adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
-          other_promotions = order.adjustments.promotion.where("id NOT IN (?)", best_promotion_adjustment.id)
-          other_promotions.update_all(eligible: false)
-        end
-      end
+    # Picks one (and only one) promotion to be eligible for this order
+    # This promotion provides the most discount, and if two promotions
+    # have the same amount, then it will pick the latest one.
+    def choose_best_promotion_adjustment
+      return unless best_promotion_adjustment = order.adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
 
-      def round_money(n)
-        (n * 100).round / 100.0
-      end
+      other_promotions = order.adjustments.promotion.where("id NOT IN (?)", best_promotion_adjustment.id)
+      other_promotions.update_all(eligible: false)
+    end
+
+    def round_money(value)
+      (value * 100).round / 100.0
+    end
   end
 end

From 5b3fbe0aedb4b8d5c47974242d049b388c9952fa Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:49:11 +0100
Subject: [PATCH 079/340] Merge decorator OrderUpdater

---
 app/models/spree/order_updater.rb           | 8 +++-----
 app/models/spree/order_updater_decorator.rb | 8 --------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 app/models/spree/order_updater_decorator.rb

diff --git a/app/models/spree/order_updater.rb b/app/models/spree/order_updater.rb
index ec70ebbbe6..3c1622d336 100644
--- a/app/models/spree/order_updater.rb
+++ b/app/models/spree/order_updater.rb
@@ -28,7 +28,7 @@ module Spree
       end
 
       update_promotion_adjustments
-      update_shipping_adjustments
+      update_all_adjustments
       # update totals a second time in case updated adjustments have an effect on the total
       update_totals
 
@@ -137,10 +137,8 @@ module Spree
       choose_best_promotion_adjustment
     end
 
-    # Shipping adjustments don't receive order on update! because they calculated
-    # over a shipping / package object rather than an order object
-    def update_shipping_adjustments
-      order.adjustments.reload.shipping.each(&:update!)
+    def update_all_adjustments
+      order.adjustments.reload.each(&:update!)
     end
 
     def before_save_hook
diff --git a/app/models/spree/order_updater_decorator.rb b/app/models/spree/order_updater_decorator.rb
deleted file mode 100644
index b227444c8b..0000000000
--- a/app/models/spree/order_updater_decorator.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-Spree::OrderUpdater.class_eval do
-  # Override spree method to make it update all adjustments as in Spree v2.0.4
-  def update_shipping_adjustments
-    order.adjustments.reload.each(&:update!)
-  end
-end

From 872cfcfc5889a01dd58cf40200fc94de8c7ea630 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:50:13 +0100
Subject: [PATCH 080/340] Remove unused promotions code

---
 app/models/spree/order_updater.rb | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/app/models/spree/order_updater.rb b/app/models/spree/order_updater.rb
index 3c1622d336..3e0a67b714 100644
--- a/app/models/spree/order_updater.rb
+++ b/app/models/spree/order_updater.rb
@@ -27,7 +27,6 @@ module Spree
         update_shipment_state
       end
 
-      update_promotion_adjustments
       update_all_adjustments
       # update totals a second time in case updated adjustments have an effect on the total
       update_totals
@@ -125,18 +124,6 @@ module Spree
       order.state_changed('payment')
     end
 
-    # Updates each of the Order adjustments.
-    #
-    # This is intended to be called from an Observer so that the Order can
-    # respond to external changes to LineItem, Shipment, other Adjustments, etc.
-    #
-    # Adjustments will check if they are still eligible. Ineligible adjustments
-    # are preserved but not counted towards adjustment_total.
-    def update_promotion_adjustments
-      order.adjustments.reload.promotion.each { |adjustment| adjustment.update!(order) }
-      choose_best_promotion_adjustment
-    end
-
     def update_all_adjustments
       order.adjustments.reload.each(&:update!)
     end
@@ -147,16 +134,6 @@ module Spree
 
     private
 
-    # Picks one (and only one) promotion to be eligible for this order
-    # This promotion provides the most discount, and if two promotions
-    # have the same amount, then it will pick the latest one.
-    def choose_best_promotion_adjustment
-      return unless best_promotion_adjustment = order.adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
-
-      other_promotions = order.adjustments.promotion.where("id NOT IN (?)", best_promotion_adjustment.id)
-      other_promotions.update_all(eligible: false)
-    end
-
     def round_money(value)
       (value * 100).round / 100.0
     end

From d4c48e2b94ecede238690834f8ed7862df320536 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:05:49 +0100
Subject: [PATCH 081/340] Merge OrderUpdate Delegator into Spree::OrderUpdater

---
 app/models/order_updater.rb         | 92 -----------------------------
 app/models/spree/order_decorator.rb |  4 ++
 app/models/spree/order_updater.rb   | 87 ++++++++++++++++++++++-----
 config/initializers/spree.rb        |  2 -
 4 files changed, 77 insertions(+), 108 deletions(-)
 delete mode 100644 app/models/order_updater.rb

diff --git a/app/models/order_updater.rb b/app/models/order_updater.rb
deleted file mode 100644
index 20fa94e5b4..0000000000
--- a/app/models/order_updater.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'delegate'
-
-class OrderUpdater < SimpleDelegator
-  # TODO: This logic adapted from Spree 2.4, remove when we get there
-  # Handles state updating in a much more logical way than < 2.4
-  # Specifically, doesn't depend on payments.last to determine payment state
-  # Also swapped: == 0 for .zero?, .size == 0 for empty? and .size > 0 for !empty?
-  # See:
-  # https://github.com/spree/spree/commit/38b8456183d11fc1e00e395e7c9154c76ef65b85
-  # https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a
-  def update_payment_state
-    last_payment_state = order.payment_state
-
-    order.payment_state = infer_payment_state
-    track_payment_state_change(last_payment_state)
-
-    order.payment_state
-  end
-
-  def before_save_hook
-    shipping_address_from_distributor
-  end
-
-  # Sets the distributor's address as shipping address of the order for those
-  # shipments using a shipping method that doesn't require address, such us
-  # a pickup.
-  def shipping_address_from_distributor
-    return if order.shipping_method.blank? || order.shipping_method.require_ship_address
-
-    order.ship_address = order.address_from_distributor
-  end
-
-  private
-
-  def infer_payment_state
-    if failed_payments?
-      'failed'
-    elsif canceled_and_not_paid_for?
-      'void'
-    else
-      infer_payment_state_from_balance
-    end
-  end
-
-  def infer_payment_state_from_balance
-    # This part added so that we don't need to override
-    # order.outstanding_balance
-    balance = order.outstanding_balance
-    balance = -1 * order.payment_total if canceled_and_paid_for?
-
-    infer_state(balance)
-  end
-
-  def infer_state(balance)
-    if balance > 0
-      'balance_due'
-    elsif balance < 0
-      'credit_owed'
-    elsif balance.zero?
-      'paid'
-    end
-  end
-
-  # Tracks the state transition through a state_change for this order. It
-  # does so until the last state is reached. That is, when the infered next
-  # state is the same as the order has now.
-  #
-  # @param last_payment_state [String]
-  def track_payment_state_change(last_payment_state)
-    return if last_payment_state == order.payment_state
-
-    order.state_changed('payment')
-  end
-
-  # Taken from order.outstanding_balance in Spree 2.4
-  # See: https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a
-  def canceled_and_paid_for?
-    order.canceled? && paid?
-  end
-
-  def canceled_and_not_paid_for?
-    order.state == 'canceled' && order.payment_total.zero?
-  end
-
-  def paid?
-    payments.present? && !payments.completed.empty?
-  end
-
-  def failed_payments?
-    payments.present? && payments.valid.empty?
-  end
-end
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 71574359a7..a3f750e620 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -89,6 +89,10 @@ Spree::Order.class_eval do
     where("state != ?", state)
   }
 
+  def updater
+    @updater ||= Spree::OrderUpdater.new(self)
+  end
+
   def create_proposed_shipments
     adjustments.shipping.delete_all
     shipments.destroy_all
diff --git a/app/models/spree/order_updater.rb b/app/models/spree/order_updater.rb
index 3e0a67b714..f8cecc0f21 100644
--- a/app/models/spree/order_updater.rb
+++ b/app/models/spree/order_updater.rb
@@ -108,20 +108,12 @@ module Spree
     # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way
     #   to locate Orders needing attention.
     def update_payment_state
-      # line_items are empty when user empties cart
-      if line_items.empty? || round_money(order.payment_total) < round_money(order.total)
-        order.payment_state = if payments.present? && payments.last.state == 'failed'
-                                'failed'
-                              else
-                                'balance_due'
-                              end
-      elsif round_money(order.payment_total) > round_money(order.total)
-        order.payment_state = 'credit_owed'
-      else
-        order.payment_state = 'paid'
-      end
+      last_payment_state = order.payment_state
 
-      order.state_changed('payment')
+      order.payment_state = infer_payment_state
+      track_payment_state_change(last_payment_state)
+
+      order.payment_state
     end
 
     def update_all_adjustments
@@ -129,7 +121,16 @@ module Spree
     end
 
     def before_save_hook
-      # no op
+      shipping_address_from_distributor
+    end
+
+    # Sets the distributor's address as shipping address of the order for those
+    # shipments using a shipping method that doesn't require address, such us
+    # a pickup.
+    def shipping_address_from_distributor
+      return if order.shipping_method.blank? || order.shipping_method.require_ship_address
+
+      order.ship_address = order.address_from_distributor
     end
 
     private
@@ -137,5 +138,63 @@ module Spree
     def round_money(value)
       (value * 100).round / 100.0
     end
+
+    def infer_payment_state
+      if failed_payments?
+        'failed'
+      elsif canceled_and_not_paid_for?
+        'void'
+      else
+        infer_payment_state_from_balance
+      end
+    end
+
+    def infer_payment_state_from_balance
+      # This part added so that we don't need to override
+      # order.outstanding_balance
+      balance = order.outstanding_balance
+      balance = -1 * order.payment_total if canceled_and_paid_for?
+
+      infer_state(balance)
+    end
+
+    def infer_state(balance)
+      if balance > 0
+        'balance_due'
+      elsif balance < 0
+        'credit_owed'
+      elsif balance.zero?
+        'paid'
+      end
+    end
+
+    # Tracks the state transition through a state_change for this order. It
+    # does so until the last state is reached. That is, when the infered next
+    # state is the same as the order has now.
+    #
+    # @param last_payment_state [String]
+    def track_payment_state_change(last_payment_state)
+      return if last_payment_state == order.payment_state
+
+      order.state_changed('payment')
+    end
+
+    # Taken from order.outstanding_balance in Spree 2.4
+    # See: https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a
+    def canceled_and_paid_for?
+      order.canceled? && paid?
+    end
+
+    def canceled_and_not_paid_for?
+      order.state == 'canceled' && order.payment_total.zero?
+    end
+
+    def paid?
+      payments.present? && !payments.completed.empty?
+    end
+
+    def failed_payments?
+      payments.present? && payments.valid.empty?
+    end
   end
 end
diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 6ff230c5f5..30e46ffc55 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -30,8 +30,6 @@ Spree.config do |config|
   config.auto_capture = true
   #config.override_actionmailer_config = false
 
-  config.order_updater_decorator = OrderUpdater
-
   # S3 settings
   config.s3_bucket = ENV['S3_BUCKET'] if ENV['S3_BUCKET']
   config.s3_access_key = ENV['S3_ACCESS_KEY'] if ENV['S3_ACCESS_KEY']

From a8a81f8023a204d2fb0c4c0c0e3e74eb3927242f Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:10:50 +0100
Subject: [PATCH 082/340] Merge and fix OrderUpdater spec with
 Spree::OrderUpdater spec

---
 spec/models/order_updater_spec.rb       | 149 ----------------
 spec/models/spree/order_updater_spec.rb | 222 ++++++++++++++----------
 2 files changed, 129 insertions(+), 242 deletions(-)
 delete mode 100644 spec/models/order_updater_spec.rb

diff --git a/spec/models/order_updater_spec.rb b/spec/models/order_updater_spec.rb
deleted file mode 100644
index ac21b555f1..0000000000
--- a/spec/models/order_updater_spec.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-require 'spec_helper'
-
-describe OrderUpdater do
-  let(:order) { build(:order) }
-  let(:order_updater) { described_class.new(Spree::OrderUpdater.new(order)) }
-
-  it "is failed if no valid payments" do
-    allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(true)
-
-    order_updater.update_payment_state
-    expect(order.payment_state).to eq('failed')
-  end
-
-  context "payment total is greater than order total" do
-    it "is credit_owed" do
-      order.payment_total = 2
-      order.total = 1
-
-      expect {
-        order_updater.update_payment_state
-      }.to change { order.payment_state }.to 'credit_owed'
-    end
-  end
-
-  context "order total is greater than payment total" do
-    it "is credit_owed" do
-      order.payment_total = 1
-      order.total = 2
-
-      expect {
-        order_updater.update_payment_state
-      }.to change { order.payment_state }.to 'balance_due'
-    end
-  end
-
-  context "order total equals payment total" do
-    it "is paid" do
-      order.payment_total = 30
-      order.total = 30
-
-      expect {
-        order_updater.update_payment_state
-      }.to change { order.payment_state }.to 'paid'
-    end
-  end
-
-  context "order is canceled" do
-    before do
-      order.state = 'canceled'
-    end
-
-    context "and is still unpaid" do
-      it "is void" do
-        order.payment_total = 0
-        order.total = 30
-        expect {
-          order_updater.update_payment_state
-        }.to change { order.payment_state }.to 'void'
-      end
-    end
-
-    context "and is paid" do
-      it "is credit_owed" do
-        order.payment_total = 30
-        order.total = 30
-        allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
-        allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
-        expect {
-          order_updater.update_payment_state
-        }.to change { order.payment_state }.to 'credit_owed'
-      end
-    end
-
-    context "and payment is refunded" do
-      it "is void" do
-        order.payment_total = 0
-        order.total = 30
-        allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
-        allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
-        expect {
-          order_updater.update_payment_state
-        }.to change { order.payment_state }.to 'void'
-      end
-    end
-  end
-
-  context 'when the set payment_state does not match the last payment_state' do
-    before { order.payment_state = 'previous_to_paid' }
-
-    context 'and the order is being updated' do
-      before { allow(order).to receive(:persisted?) { true } }
-
-      it 'creates a new state_change for the order' do
-        expect { order_updater.update_payment_state }
-          .to change { order.state_changes.size }.by(1)
-      end
-    end
-
-    context 'and the order is being created' do
-      before { allow(order).to receive(:persisted?) { false } }
-
-      it 'creates a new state_change for the order' do
-        expect { order_updater.update_payment_state }
-          .not_to change { order.state_changes.size }
-      end
-    end
-  end
-
-  context 'when the set payment_state matches the last payment_state' do
-    before { order.payment_state = 'paid' }
-
-    it 'does not create any state_change' do
-      expect { order_updater.update_payment_state }
-        .not_to change { order.state_changes.size }
-    end
-  end
-
-  context '#before_save_hook' do
-    let(:distributor) { build(:distributor_enterprise) }
-    let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
-
-    before do
-      order.distributor = distributor
-      order.shipments = [shipment]
-    end
-
-    context 'when shipping method is pickup' do
-      let(:shipping_method) { create(:shipping_method_with, :pickup) }
-      let(:address) { build(:address, firstname: 'joe') }
-      before { distributor.address = address }
-
-      it "populates the shipping address from distributor" do
-        order_updater.before_save_hook
-        expect(order.ship_address.address1).to eq(distributor.address.address1)
-      end
-    end
-
-    context 'when shipping_method is delivery' do
-      let(:shipping_method) { create(:shipping_method_with, :delivery) }
-      let(:address) { build(:address, firstname: 'will') }
-      before { order.ship_address = address }
-
-      it "does not populate the shipping address from distributor" do
-        order_updater.before_save_hook
-        expect(order.ship_address.firstname).to eq("will")
-      end
-    end
-  end
-end
diff --git a/spec/models/spree/order_updater_spec.rb b/spec/models/spree/order_updater_spec.rb
index ff0d023d5d..133ac00d73 100644
--- a/spec/models/spree/order_updater_spec.rb
+++ b/spec/models/spree/order_updater_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree
@@ -62,40 +64,6 @@ module Spree
       end
     end
 
-    context "updating payment state" do
-      it "is failed if last payment failed" do
-        allow(order).to receive_message_chain(:payments, :last, :state).and_return('failed')
-
-        updater.update_payment_state
-        expect(order.payment_state).to eq 'failed'
-      end
-
-      it "is balance due with no line items" do
-        allow(order).to receive_message_chain(:line_items, :empty?).and_return(true)
-
-        updater.update_payment_state
-        expect(order.payment_state).to eq 'balance_due'
-      end
-
-      it "is credit owed if payment is above total" do
-        allow(order).to receive_message_chain(:line_items, :empty?).and_return(false)
-        allow(order).to receive_messages :payment_total => 31
-        allow(order).to receive_messages :total => 30
-
-        updater.update_payment_state
-        expect(order.payment_state).to eq 'credit_owed'
-      end
-
-      it "is paid if order is paid in full" do
-        allow(order).to receive_message_chain(:line_items, :empty?).and_return(false)
-        allow(order).to receive_messages :payment_total => 30
-        allow(order).to receive_messages :total => 30
-
-        updater.update_payment_state
-        expect(order.payment_state).to eq 'paid'
-      end
-    end
-
     it "state change" do
       order = create(:order)
       order.shipment_state = 'shipped'
@@ -173,83 +141,151 @@ module Spree
     context "update adjustments" do
       context "shipments" do
         it "updates" do
-          expect(updater).to receive(:update_shipping_adjustments)
+          expect(updater).to receive(:update_all_adjustments)
           updater.update
         end
       end
+    end
 
-      context "promotions" do
-        let(:originator) do
-          originator = Spree::Promotion::Actions::CreateAdjustment.create
-          calculator = Spree::Calculator::PerItem.create(:calculable => originator)
-          originator.calculator = calculator
-          originator.save
-          originator
+    it "is failed if no valid payments" do
+      allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(true)
+
+      updater.update_payment_state
+      expect(order.payment_state).to eq('failed')
+    end
+
+    context "payment total is greater than order total" do
+      it "is credit_owed" do
+        order.payment_total = 2
+        order.total = 1
+
+        expect {
+          updater.update_payment_state
+        }.to change { order.payment_state }.to 'credit_owed'
+      end
+    end
+
+    context "order total is greater than payment total" do
+      it "is credit_owed" do
+        order.payment_total = 1
+        order.total = 2
+
+        expect {
+          updater.update_payment_state
+        }.to change { order.payment_state }.to 'balance_due'
+      end
+    end
+
+    context "order total equals payment total" do
+      it "is paid" do
+        order.payment_total = 30
+        order.total = 30
+
+        expect {
+          updater.update_payment_state
+        }.to change { order.payment_state }.to 'paid'
+      end
+    end
+
+    context "order is canceled" do
+      before do
+        order.state = 'canceled'
+      end
+
+      context "and is still unpaid" do
+        it "is void" do
+          order.payment_total = 0
+          order.total = 30
+          expect {
+            updater.update_payment_state
+          }.to change { order.payment_state }.to 'void'
         end
+      end
 
-        def create_adjustment(label, amount)
-          create(:adjustment, :adjustable => order,
-                              :originator => originator,
-                              :amount     => amount,
-                              :state      => "closed",
-                              :label      => label,
-                              :mandatory  => false)
+      context "and is paid" do
+        it "is credit_owed" do
+          order.payment_total = 30
+          order.total = 30
+          allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
+          allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
+          expect {
+            updater.update_payment_state
+          }.to change { order.payment_state }.to 'credit_owed'
         end
+      end
 
-        it "should make all but the most valuable promotion adjustment ineligible, leaving non promotion adjustments alone" do
-          create_adjustment("Promotion A", -100)
-          create_adjustment("Promotion B", -200)
-          create_adjustment("Promotion C", -300)
-          create(:adjustment, :adjustable => order,
-                              :originator => nil,
-                              :amount => -500,
-                              :state => "closed",
-                              :label => "Some other credit")
-          order.adjustments.each {|a| a.update_column(:eligible, true)}
-
-          updater.update_promotion_adjustments
-
-          expect(order.adjustments.eligible.promotion.count).to eq 1
-          expect(order.adjustments.eligible.promotion.first.label).to eq 'Promotion C'
+      context "and payment is refunded" do
+        it "is void" do
+          order.payment_total = 0
+          order.total = 30
+          allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
+          allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
+          expect {
+            updater.update_payment_state
+          }.to change { order.payment_state }.to 'void'
         end
+      end
+    end
 
-        context "multiple adjustments and the best one is not eligible" do
-          let!(:promo_a) { create_adjustment("Promotion A", -100) }
-          let!(:promo_c) { create_adjustment("Promotion C", -300) }
+    context 'when the set payment_state does not match the last payment_state' do
+      before { order.payment_state = 'previous_to_paid' }
 
-          before do
-            promo_a.update_column(:eligible, true)
-            promo_c.update_column(:eligible, false)
-          end
+      context 'and the order is being updated' do
+        before { allow(order).to receive(:persisted?) { true } }
 
-          # regression for #3274
-          it "still makes the previous best eligible adjustment valid" do
-            updater.update_promotion_adjustments
-            expect(order.adjustments.eligible.promotion.first.label).to eq 'Promotion A'
-          end
+        it 'creates a new state_change for the order' do
+          expect { updater.update_payment_state }
+            .to change { order.state_changes.size }.by(1)
         end
+      end
 
-        it "should only leave one adjustment even if 2 have the same amount" do
-          create_adjustment("Promotion A", -100)
-          create_adjustment("Promotion B", -200)
-          create_adjustment("Promotion C", -200)
+      context 'and the order is being created' do
+        before { allow(order).to receive(:persisted?) { false } }
 
-          updater.update_promotion_adjustments
-
-          expect(order.adjustments.eligible.promotion.count).to eq 1
-          expect(order.adjustments.eligible.promotion.first.amount.to_i).to eq -200
+        it 'creates a new state_change for the order' do
+          expect { updater.update_payment_state }
+            .not_to change { order.state_changes.size }
         end
+      end
+    end
 
-        it "should only include eligible adjustments in promo_total" do
-          create_adjustment("Promotion A", -100)
-          create(:adjustment, :adjustable => order,
-                              :originator => nil,
-                              :amount     => -1000,
-                              :state      => "closed",
-                              :eligible   => false,
-                              :label      => 'Bad promo')
+    context 'when the set payment_state matches the last payment_state' do
+      before { order.payment_state = 'paid' }
 
-          expect(order.promo_total.to_f).to eq -100.to_f
+      it 'does not create any state_change' do
+        expect { updater.update_payment_state }
+          .not_to change { order.state_changes.size }
+      end
+    end
+
+    context '#before_save_hook' do
+      let(:distributor) { build(:distributor_enterprise) }
+      let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
+
+      before do
+        order.distributor = distributor
+        order.shipments = [shipment]
+      end
+
+      context 'when shipping method is pickup' do
+        let(:shipping_method) { create(:shipping_method_with, :pickup) }
+        let(:address) { build(:address, firstname: 'joe') }
+        before { distributor.address = address }
+
+        it "populates the shipping address from distributor" do
+          updater.before_save_hook
+          expect(order.ship_address.address1).to eq(distributor.address.address1)
+        end
+      end
+
+      context 'when shipping_method is delivery' do
+        let(:shipping_method) { create(:shipping_method_with, :delivery) }
+        let(:address) { build(:address, firstname: 'will') }
+        before { order.ship_address = address }
+
+        it "does not populate the shipping address from distributor" do
+          updater.before_save_hook
+          expect(order.ship_address.firstname).to eq("will")
         end
       end
     end

From 7e355a324874c4d7bf5c3e9e0514afde5f31e740 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:18:28 +0100
Subject: [PATCH 083/340] Remove hash rockets

---
 spec/models/spree/order_updater_spec.rb | 39 ++++++++++++-------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/spec/models/spree/order_updater_spec.rb b/spec/models/spree/order_updater_spec.rb
index 133ac00d73..68419ca109 100644
--- a/spec/models/spree/order_updater_spec.rb
+++ b/spec/models/spree/order_updater_spec.rb
@@ -10,19 +10,19 @@ module Spree
     before { allow(order).to receive(:backordered?) { false } }
 
     it "updates totals" do
-      payments = [double(:amount => 5), double(:amount => 5)]
+      payments = [double(amount: 5), double(amount: 5)]
       allow(order).to receive_message_chain(:payments, :completed).and_return(payments)
 
-      line_items = [double(:amount => 10), double(:amount => 20)]
-      allow(order).to receive_messages :line_items => line_items
+      line_items = [double(amount: 10), double(amount: 20)]
+      allow(order).to receive_messages line_items: line_items
 
-      adjustments = [double(:amount => 10), double(:amount => -20)]
+      adjustments = [double(amount: 10), double(amount: -20)]
       allow(order).to receive_message_chain(:adjustments, :eligible).and_return(adjustments)
 
       updater.update_totals
       expect(order.payment_total).to eq 10
       expect(order.item_total).to eq 30
-      expect(order.adjustment_total).to eq -10
+      expect(order.adjustment_total).to eq(-10)
       expect(order.total).to eq 20
     end
 
@@ -48,7 +48,6 @@ module Spree
         expect(order.shipment_state).to be_nil
       end
 
-
       ["shipped", "ready", "pending"].each do |state|
         it "is #{state}" do
           allow(order).to receive_message_chain(:shipments, :states).and_return([state])
@@ -70,10 +69,10 @@ module Spree
       state_changes = double
       allow(order).to receive(:state_changes) { state_changes }
       expect(state_changes).to receive(:create).with(
-        :previous_state => nil,
-        :next_state => 'shipped',
-        :name => 'shipment',
-        :user_id => order.user_id
+        previous_state: nil,
+        next_state: 'shipped',
+        name: 'shipment',
+        user_id: order.user_id
       )
 
       order.state_changed('shipment')
@@ -95,11 +94,11 @@ module Spree
       it "updates each shipment" do
         shipment = build(:shipment)
         shipments = [shipment]
-        allow(order).to receive_messages :shipments => shipments
-        allow(shipments).to receive_messages :states => []
-        allow(shipments).to receive_messages :ready => []
-        allow(shipments).to receive_messages :pending => []
-        allow(shipments).to receive_messages :shipped => []
+        allow(order).to receive_messages shipments: shipments
+        allow(shipments).to receive_messages states: []
+        allow(shipments).to receive_messages ready: []
+        allow(shipments).to receive_messages pending: []
+        allow(shipments).to receive_messages shipped: []
 
         expect(shipment).to receive(:update!).with(order)
         updater.update
@@ -122,11 +121,11 @@ module Spree
       it "doesnt update each shipment" do
         shipment = build(:shipment)
         shipments = [shipment]
-        allow(order).to receive_messages :shipments => shipments
-        allow(shipments).to receive_messages :states => []
-        allow(shipments).to receive_messages :ready => []
-        allow(shipments).to receive_messages :pending => []
-        allow(shipments).to receive_messages :shipped => []
+        allow(order).to receive_messages shipments: shipments
+        allow(shipments).to receive_messages states: []
+        allow(shipments).to receive_messages ready: []
+        allow(shipments).to receive_messages pending: []
+        allow(shipments).to receive_messages shipped: []
 
         expect(shipment).not_to receive(:update!).with(order)
         updater.update

From e453b130e4368fe4614b1f791503c9c3b4cd9f32 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:21:35 +0100
Subject: [PATCH 084/340] Bring core/lib/spree/core/ext/active_record.rb to OFN
 and add it to Spree::Order, the only place where it is used

---
 app/models/spree/order_decorator.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index a3f750e620..15bcf6151c 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -378,6 +378,13 @@ Spree::Order.class_eval do
     address
   end
 
+  # Update attributes of a record in the database without callbacks, validations etc.
+  #   This was originally a ext to ActiveRecord in Spree but only used for Spree::Order
+  def update_attributes_without_callbacks(attributes)
+    assign_attributes(attributes)
+    Spree::Order.where(id: id).update_all(attributes)
+  end
+
   private
 
   def adjustments_fetcher

From aed384183b1f25771d595e1c6ba0a67271feda43 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:29:19 +0100
Subject: [PATCH 085/340] Move Spree::OrderUpdater to OrderManagement engine

---
 app/models/spree/order_decorator.rb                         | 2 +-
 .../app/services/order_management/order/updater.rb          | 4 ++--
 .../spec/services/order_management/order/updater_spec.rb    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename app/models/spree/order_updater.rb => engines/order_management/app/services/order_management/order/updater.rb (99%)
 rename spec/models/spree/order_updater_spec.rb => engines/order_management/spec/services/order_management/order/updater_spec.rb (98%)

diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 15bcf6151c..4910eb90b1 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -90,7 +90,7 @@ Spree::Order.class_eval do
   }
 
   def updater
-    @updater ||= Spree::OrderUpdater.new(self)
+    @updater ||= OrderManagement::Order::Updater.new(self)
   end
 
   def create_proposed_shipments
diff --git a/app/models/spree/order_updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
similarity index 99%
rename from app/models/spree/order_updater.rb
rename to engines/order_management/app/services/order_management/order/updater.rb
index f8cecc0f21..5b0ea833c6 100644
--- a/app/models/spree/order_updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  class OrderUpdater
+module OrderManagement::Order
+  class Updater
     attr_reader :order
     delegate :payments, :line_items, :adjustments, :shipments, :update_hooks, to: :order
 
diff --git a/spec/models/spree/order_updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb
similarity index 98%
rename from spec/models/spree/order_updater_spec.rb
rename to engines/order_management/spec/services/order_management/order/updater_spec.rb
index 68419ca109..05dcc1002a 100644
--- a/spec/models/spree/order_updater_spec.rb
+++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb
@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-module Spree
-  describe OrderUpdater do
+module OrderManagement::Order
+  describe Updater do
     let(:order) { build(:order) }
-    let(:updater) { Spree::OrderUpdater.new(order) }
+    let(:updater) { OrderManagement::Order::Updater.new(order) }
 
     before { allow(order).to receive(:backordered?) { false } }
 

From 8001e63f7769c029201af706e7de2ee3dfbc2065 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:31:13 +0100
Subject: [PATCH 086/340] Unnest OrderManagement::Order declaration in two
 module declaration

---
 .../order_management/order/updater.rb         | 348 ++++++-------
 .../order_management/order/updater_spec.rb    | 464 +++++++++---------
 2 files changed, 408 insertions(+), 404 deletions(-)

diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
index 5b0ea833c6..30b4e27458 100644
--- a/engines/order_management/app/services/order_management/order/updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -1,200 +1,202 @@
 # frozen_string_literal: true
 
-module OrderManagement::Order
-  class Updater
-    attr_reader :order
-    delegate :payments, :line_items, :adjustments, :shipments, :update_hooks, to: :order
+module OrderManagement
+  module Order
+    class Updater
+      attr_reader :order
+      delegate :payments, :line_items, :adjustments, :shipments, :update_hooks, to: :order
 
-    def initialize(order)
-      @order = order
-    end
-
-    # This is a multi-purpose method for processing logic related to changes in the Order.
-    # It is meant to be called from various observers so that the Order is aware of changes
-    # that affect totals and other values stored in the Order.
-    #
-    # This method should never do anything to the Order that results in a save call on the
-    # object with callbacks (otherwise you will end up in an infinite recursion as the
-    # associations try to save and then in turn try to call +update!+ again.)
-    def update
-      update_totals
-
-      if order.completed?
-        update_payment_state
-
-        # give each of the shipments a chance to update themselves
-        shipments.each { |shipment| shipment.update!(order) }
-        update_shipment_state
+      def initialize(order)
+        @order = order
       end
 
-      update_all_adjustments
-      # update totals a second time in case updated adjustments have an effect on the total
-      update_totals
+      # This is a multi-purpose method for processing logic related to changes in the Order.
+      # It is meant to be called from various observers so that the Order is aware of changes
+      # that affect totals and other values stored in the Order.
+      #
+      # This method should never do anything to the Order that results in a save call on the
+      # object with callbacks (otherwise you will end up in an infinite recursion as the
+      # associations try to save and then in turn try to call +update!+ again.)
+      def update
+        update_totals
 
-      order.update_attributes_without_callbacks(
-        {
-          payment_state: order.payment_state,
-          shipment_state: order.shipment_state,
-          item_total: order.item_total,
-          adjustment_total: order.adjustment_total,
-          payment_total: order.payment_total,
-          total: order.total
-        }
-      )
+        if order.completed?
+          update_payment_state
 
-      run_hooks
-    end
+          # give each of the shipments a chance to update themselves
+          shipments.each { |shipment| shipment.update!(order) }
+          update_shipment_state
+        end
 
-    def run_hooks
-      update_hooks.each { |hook| order.__send__(hook) }
-    end
+        update_all_adjustments
+        # update totals a second time in case updated adjustments have an effect on the total
+        update_totals
 
-    # Updates the following Order total values:
-    #
-    # - payment_total - the total value of all finalized Payments (excluding non-finalized Payments)
-    # - item_total - the total value of all LineItems
-    # - adjustment_total - the total value of all adjustments
-    # - total - the "order total". This is equivalent to item_total plus adjustment_total
-    def update_totals
-      order.payment_total = payments.completed.map(&:amount).sum
-      order.item_total = line_items.map(&:amount).sum
-      order.adjustment_total = adjustments.eligible.map(&:amount).sum
-      order.total = order.item_total + order.adjustment_total
-    end
+        order.update_attributes_without_callbacks(
+          {
+            payment_state: order.payment_state,
+            shipment_state: order.shipment_state,
+            item_total: order.item_total,
+            adjustment_total: order.adjustment_total,
+            payment_total: order.payment_total,
+            total: order.total
+          }
+        )
 
-    # Updates the +shipment_state+ attribute according to the following logic:
-    #
-    # - shipped - when all Shipments are in the "shipped" state
-    # - partial - when 1. at least one Shipment has a state of "shipped"
-    #                       and there is another Shipment with a state other than "shipped"
-    #                  or 2. there are InventoryUnits associated with the order that
-    #                          have a state of "sold" but are not associated with a Shipment
-    # - ready - when all Shipments are in the "ready" state
-    # - backorder - when there is backordered inventory associated with an order
-    # - pending - when all Shipments are in the "pending" state
-    #
-    # The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way
-    #   to locate Orders needing attention.
-    def update_shipment_state
-      if order.backordered?
-        order.shipment_state = 'backorder'
-      else
-        # get all the shipment states for this order
-        shipment_states = shipments.states
-        if shipment_states.size > 1
-          # multiple shiment states means it's most likely partially shipped
-          order.shipment_state = 'partial'
+        run_hooks
+      end
+
+      def run_hooks
+        update_hooks.each { |hook| order.__send__(hook) }
+      end
+
+      # Updates the following Order total values:
+      #
+      # - payment_total - the total value of all finalized Payments (excluding non-finalized Payments)
+      # - item_total - the total value of all LineItems
+      # - adjustment_total - the total value of all adjustments
+      # - total - the "order total". This is equivalent to item_total plus adjustment_total
+      def update_totals
+        order.payment_total = payments.completed.map(&:amount).sum
+        order.item_total = line_items.map(&:amount).sum
+        order.adjustment_total = adjustments.eligible.map(&:amount).sum
+        order.total = order.item_total + order.adjustment_total
+      end
+
+      # Updates the +shipment_state+ attribute according to the following logic:
+      #
+      # - shipped - when all Shipments are in the "shipped" state
+      # - partial - when 1. at least one Shipment has a state of "shipped"
+      #                       and there is another Shipment with a state other than "shipped"
+      #                  or 2. there are InventoryUnits associated with the order that
+      #                          have a state of "sold" but are not associated with a Shipment
+      # - ready - when all Shipments are in the "ready" state
+      # - backorder - when there is backordered inventory associated with an order
+      # - pending - when all Shipments are in the "pending" state
+      #
+      # The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way
+      #   to locate Orders needing attention.
+      def update_shipment_state
+        if order.backordered?
+          order.shipment_state = 'backorder'
         else
-          # will return nil if no shipments are found
-          order.shipment_state = shipment_states.first
-          # TODO inventory unit states?
-          # if order.shipment_state && order.inventory_units.where(:shipment_id => nil).exists?
-          #   shipments exist but there are unassigned inventory units
-          #   order.shipment_state = 'partial'
-          # end
+          # get all the shipment states for this order
+          shipment_states = shipments.states
+          if shipment_states.size > 1
+            # multiple shiment states means it's most likely partially shipped
+            order.shipment_state = 'partial'
+          else
+            # will return nil if no shipments are found
+            order.shipment_state = shipment_states.first
+            # TODO inventory unit states?
+            # if order.shipment_state && order.inventory_units.where(:shipment_id => nil).exists?
+            #   shipments exist but there are unassigned inventory units
+            #   order.shipment_state = 'partial'
+            # end
+          end
+        end
+
+        order.state_changed('shipment')
+      end
+
+      # Updates the +payment_state+ attribute according to the following logic:
+      #
+      # - paid - when +payment_total+ is equal to +total+
+      # - balance_due - when +payment_total+ is less than +total+
+      # - credit_owed - when +payment_total+ is greater than +total+
+      # - failed - when most recent payment is in the failed state
+      #
+      # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way
+      #   to locate Orders needing attention.
+      def update_payment_state
+        last_payment_state = order.payment_state
+
+        order.payment_state = infer_payment_state
+        track_payment_state_change(last_payment_state)
+
+        order.payment_state
+      end
+
+      def update_all_adjustments
+        order.adjustments.reload.each(&:update!)
+      end
+
+      def before_save_hook
+        shipping_address_from_distributor
+      end
+
+      # Sets the distributor's address as shipping address of the order for those
+      # shipments using a shipping method that doesn't require address, such us
+      # a pickup.
+      def shipping_address_from_distributor
+        return if order.shipping_method.blank? || order.shipping_method.require_ship_address
+
+        order.ship_address = order.address_from_distributor
+      end
+
+      private
+
+      def round_money(value)
+        (value * 100).round / 100.0
+      end
+
+      def infer_payment_state
+        if failed_payments?
+          'failed'
+        elsif canceled_and_not_paid_for?
+          'void'
+        else
+          infer_payment_state_from_balance
         end
       end
 
-      order.state_changed('shipment')
-    end
+      def infer_payment_state_from_balance
+        # This part added so that we don't need to override
+        # order.outstanding_balance
+        balance = order.outstanding_balance
+        balance = -1 * order.payment_total if canceled_and_paid_for?
 
-    # Updates the +payment_state+ attribute according to the following logic:
-    #
-    # - paid - when +payment_total+ is equal to +total+
-    # - balance_due - when +payment_total+ is less than +total+
-    # - credit_owed - when +payment_total+ is greater than +total+
-    # - failed - when most recent payment is in the failed state
-    #
-    # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way
-    #   to locate Orders needing attention.
-    def update_payment_state
-      last_payment_state = order.payment_state
-
-      order.payment_state = infer_payment_state
-      track_payment_state_change(last_payment_state)
-
-      order.payment_state
-    end
-
-    def update_all_adjustments
-      order.adjustments.reload.each(&:update!)
-    end
-
-    def before_save_hook
-      shipping_address_from_distributor
-    end
-
-    # Sets the distributor's address as shipping address of the order for those
-    # shipments using a shipping method that doesn't require address, such us
-    # a pickup.
-    def shipping_address_from_distributor
-      return if order.shipping_method.blank? || order.shipping_method.require_ship_address
-
-      order.ship_address = order.address_from_distributor
-    end
-
-    private
-
-    def round_money(value)
-      (value * 100).round / 100.0
-    end
-
-    def infer_payment_state
-      if failed_payments?
-        'failed'
-      elsif canceled_and_not_paid_for?
-        'void'
-      else
-        infer_payment_state_from_balance
+        infer_state(balance)
       end
-    end
 
-    def infer_payment_state_from_balance
-      # This part added so that we don't need to override
-      # order.outstanding_balance
-      balance = order.outstanding_balance
-      balance = -1 * order.payment_total if canceled_and_paid_for?
-
-      infer_state(balance)
-    end
-
-    def infer_state(balance)
-      if balance > 0
-        'balance_due'
-      elsif balance < 0
-        'credit_owed'
-      elsif balance.zero?
-        'paid'
+      def infer_state(balance)
+        if balance > 0
+          'balance_due'
+        elsif balance < 0
+          'credit_owed'
+        elsif balance.zero?
+          'paid'
+        end
       end
-    end
 
-    # Tracks the state transition through a state_change for this order. It
-    # does so until the last state is reached. That is, when the infered next
-    # state is the same as the order has now.
-    #
-    # @param last_payment_state [String]
-    def track_payment_state_change(last_payment_state)
-      return if last_payment_state == order.payment_state
+      # Tracks the state transition through a state_change for this order. It
+      # does so until the last state is reached. That is, when the infered next
+      # state is the same as the order has now.
+      #
+      # @param last_payment_state [String]
+      def track_payment_state_change(last_payment_state)
+        return if last_payment_state == order.payment_state
 
-      order.state_changed('payment')
-    end
+        order.state_changed('payment')
+      end
 
-    # Taken from order.outstanding_balance in Spree 2.4
-    # See: https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a
-    def canceled_and_paid_for?
-      order.canceled? && paid?
-    end
+      # Taken from order.outstanding_balance in Spree 2.4
+      # See: https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a
+      def canceled_and_paid_for?
+        order.canceled? && paid?
+      end
 
-    def canceled_and_not_paid_for?
-      order.state == 'canceled' && order.payment_total.zero?
-    end
+      def canceled_and_not_paid_for?
+        order.state == 'canceled' && order.payment_total.zero?
+      end
 
-    def paid?
-      payments.present? && !payments.completed.empty?
-    end
+      def paid?
+        payments.present? && !payments.completed.empty?
+      end
 
-    def failed_payments?
-      payments.present? && payments.valid.empty?
+      def failed_payments?
+        payments.present? && payments.valid.empty?
+      end
     end
   end
 end
diff --git a/engines/order_management/spec/services/order_management/order/updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb
index 05dcc1002a..51e4d59d85 100644
--- a/engines/order_management/spec/services/order_management/order/updater_spec.rb
+++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb
@@ -2,289 +2,291 @@
 
 require 'spec_helper'
 
-module OrderManagement::Order
-  describe Updater do
-    let(:order) { build(:order) }
-    let(:updater) { OrderManagement::Order::Updater.new(order) }
+module OrderManagement
+  module Order
+    describe Updater do
+      let(:order) { build(:order) }
+      let(:updater) { OrderManagement::Order::Updater.new(order) }
 
-    before { allow(order).to receive(:backordered?) { false } }
+      before { allow(order).to receive(:backordered?) { false } }
 
-    it "updates totals" do
-      payments = [double(amount: 5), double(amount: 5)]
-      allow(order).to receive_message_chain(:payments, :completed).and_return(payments)
+      it "updates totals" do
+        payments = [double(amount: 5), double(amount: 5)]
+        allow(order).to receive_message_chain(:payments, :completed).and_return(payments)
 
-      line_items = [double(amount: 10), double(amount: 20)]
-      allow(order).to receive_messages line_items: line_items
+        line_items = [double(amount: 10), double(amount: 20)]
+        allow(order).to receive_messages line_items: line_items
 
-      adjustments = [double(amount: 10), double(amount: -20)]
-      allow(order).to receive_message_chain(:adjustments, :eligible).and_return(adjustments)
+        adjustments = [double(amount: 10), double(amount: -20)]
+        allow(order).to receive_message_chain(:adjustments, :eligible).and_return(adjustments)
 
-      updater.update_totals
-      expect(order.payment_total).to eq 10
-      expect(order.item_total).to eq 30
-      expect(order.adjustment_total).to eq(-10)
-      expect(order.total).to eq 20
-    end
-
-    context "updating shipment state" do
-      before do
-        allow(order).to receive_message_chain(:shipments, :shipped, :count).and_return(0)
-        allow(order).to receive_message_chain(:shipments, :ready, :count).and_return(0)
-        allow(order).to receive_message_chain(:shipments, :pending, :count).and_return(0)
+        updater.update_totals
+        expect(order.payment_total).to eq 10
+        expect(order.item_total).to eq 30
+        expect(order.adjustment_total).to eq(-10)
+        expect(order.total).to eq 20
       end
 
-      it "is backordered" do
-        allow(order).to receive(:backordered?) { true }
-        updater.update_shipment_state
+      context "updating shipment state" do
+        before do
+          allow(order).to receive_message_chain(:shipments, :shipped, :count).and_return(0)
+          allow(order).to receive_message_chain(:shipments, :ready, :count).and_return(0)
+          allow(order).to receive_message_chain(:shipments, :pending, :count).and_return(0)
+        end
 
-        expect(order.shipment_state).to eq 'backorder'
-      end
-
-      it "is nil" do
-        allow(order).to receive_message_chain(:shipments, :states).and_return([])
-        allow(order).to receive_message_chain(:shipments, :count).and_return(0)
-
-        updater.update_shipment_state
-        expect(order.shipment_state).to be_nil
-      end
-
-      ["shipped", "ready", "pending"].each do |state|
-        it "is #{state}" do
-          allow(order).to receive_message_chain(:shipments, :states).and_return([state])
+        it "is backordered" do
+          allow(order).to receive(:backordered?) { true }
           updater.update_shipment_state
-          expect(order.shipment_state).to eq state.to_s
+
+          expect(order.shipment_state).to eq 'backorder'
+        end
+
+        it "is nil" do
+          allow(order).to receive_message_chain(:shipments, :states).and_return([])
+          allow(order).to receive_message_chain(:shipments, :count).and_return(0)
+
+          updater.update_shipment_state
+          expect(order.shipment_state).to be_nil
+        end
+
+        ["shipped", "ready", "pending"].each do |state|
+          it "is #{state}" do
+            allow(order).to receive_message_chain(:shipments, :states).and_return([state])
+            updater.update_shipment_state
+            expect(order.shipment_state).to eq state.to_s
+          end
+        end
+
+        it "is partial" do
+          allow(order).to receive_message_chain(:shipments, :states).and_return(["pending", "ready"])
+          updater.update_shipment_state
+          expect(order.shipment_state).to eq 'partial'
         end
       end
 
-      it "is partial" do
-        allow(order).to receive_message_chain(:shipments, :states).and_return(["pending", "ready"])
-        updater.update_shipment_state
-        expect(order.shipment_state).to eq 'partial'
-      end
-    end
+      it "state change" do
+        order = create(:order)
+        order.shipment_state = 'shipped'
+        state_changes = double
+        allow(order).to receive(:state_changes) { state_changes }
+        expect(state_changes).to receive(:create).with(
+          previous_state: nil,
+          next_state: 'shipped',
+          name: 'shipment',
+          user_id: order.user_id
+        )
 
-    it "state change" do
-      order = create(:order)
-      order.shipment_state = 'shipped'
-      state_changes = double
-      allow(order).to receive(:state_changes) { state_changes }
-      expect(state_changes).to receive(:create).with(
-        previous_state: nil,
-        next_state: 'shipped',
-        name: 'shipment',
-        user_id: order.user_id
-      )
-
-      order.state_changed('shipment')
-    end
-
-    context "completed order" do
-      before { allow(order).to receive(:completed?) { true } }
-
-      it "updates payment state" do
-        expect(updater).to receive(:update_payment_state)
-        updater.update
+        order.state_changed('shipment')
       end
 
-      it "updates shipment state" do
-        expect(updater).to receive(:update_shipment_state)
-        updater.update
-      end
+      context "completed order" do
+        before { allow(order).to receive(:completed?) { true } }
 
-      it "updates each shipment" do
-        shipment = build(:shipment)
-        shipments = [shipment]
-        allow(order).to receive_messages shipments: shipments
-        allow(shipments).to receive_messages states: []
-        allow(shipments).to receive_messages ready: []
-        allow(shipments).to receive_messages pending: []
-        allow(shipments).to receive_messages shipped: []
+        it "updates payment state" do
+          expect(updater).to receive(:update_payment_state)
+          updater.update
+        end
 
-        expect(shipment).to receive(:update!).with(order)
-        updater.update
-      end
-    end
+        it "updates shipment state" do
+          expect(updater).to receive(:update_shipment_state)
+          updater.update
+        end
 
-    context "incompleted order" do
-      before { allow(order).to receive_messages completed?: false }
+        it "updates each shipment" do
+          shipment = build(:shipment)
+          shipments = [shipment]
+          allow(order).to receive_messages shipments: shipments
+          allow(shipments).to receive_messages states: []
+          allow(shipments).to receive_messages ready: []
+          allow(shipments).to receive_messages pending: []
+          allow(shipments).to receive_messages shipped: []
 
-      it "doesnt update payment state" do
-        expect(updater).not_to receive(:update_payment_state)
-        updater.update
-      end
-
-      it "doesnt update shipment state" do
-        expect(updater).not_to receive(:update_shipment_state)
-        updater.update
-      end
-
-      it "doesnt update each shipment" do
-        shipment = build(:shipment)
-        shipments = [shipment]
-        allow(order).to receive_messages shipments: shipments
-        allow(shipments).to receive_messages states: []
-        allow(shipments).to receive_messages ready: []
-        allow(shipments).to receive_messages pending: []
-        allow(shipments).to receive_messages shipped: []
-
-        expect(shipment).not_to receive(:update!).with(order)
-        updater.update
-      end
-    end
-
-    it "updates totals twice" do
-      expect(updater).to receive(:update_totals).twice
-      updater.update
-    end
-
-    context "update adjustments" do
-      context "shipments" do
-        it "updates" do
-          expect(updater).to receive(:update_all_adjustments)
+          expect(shipment).to receive(:update!).with(order)
           updater.update
         end
       end
-    end
 
-    it "is failed if no valid payments" do
-      allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(true)
+      context "incompleted order" do
+        before { allow(order).to receive_messages completed?: false }
 
-      updater.update_payment_state
-      expect(order.payment_state).to eq('failed')
-    end
+        it "doesnt update payment state" do
+          expect(updater).not_to receive(:update_payment_state)
+          updater.update
+        end
 
-    context "payment total is greater than order total" do
-      it "is credit_owed" do
-        order.payment_total = 2
-        order.total = 1
+        it "doesnt update shipment state" do
+          expect(updater).not_to receive(:update_shipment_state)
+          updater.update
+        end
 
-        expect {
-          updater.update_payment_state
-        }.to change { order.payment_state }.to 'credit_owed'
-      end
-    end
+        it "doesnt update each shipment" do
+          shipment = build(:shipment)
+          shipments = [shipment]
+          allow(order).to receive_messages shipments: shipments
+          allow(shipments).to receive_messages states: []
+          allow(shipments).to receive_messages ready: []
+          allow(shipments).to receive_messages pending: []
+          allow(shipments).to receive_messages shipped: []
 
-    context "order total is greater than payment total" do
-      it "is credit_owed" do
-        order.payment_total = 1
-        order.total = 2
-
-        expect {
-          updater.update_payment_state
-        }.to change { order.payment_state }.to 'balance_due'
-      end
-    end
-
-    context "order total equals payment total" do
-      it "is paid" do
-        order.payment_total = 30
-        order.total = 30
-
-        expect {
-          updater.update_payment_state
-        }.to change { order.payment_state }.to 'paid'
-      end
-    end
-
-    context "order is canceled" do
-      before do
-        order.state = 'canceled'
-      end
-
-      context "and is still unpaid" do
-        it "is void" do
-          order.payment_total = 0
-          order.total = 30
-          expect {
-            updater.update_payment_state
-          }.to change { order.payment_state }.to 'void'
+          expect(shipment).not_to receive(:update!).with(order)
+          updater.update
         end
       end
 
-      context "and is paid" do
+      it "updates totals twice" do
+        expect(updater).to receive(:update_totals).twice
+        updater.update
+      end
+
+      context "update adjustments" do
+        context "shipments" do
+          it "updates" do
+            expect(updater).to receive(:update_all_adjustments)
+            updater.update
+          end
+        end
+      end
+
+      it "is failed if no valid payments" do
+        allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(true)
+
+        updater.update_payment_state
+        expect(order.payment_state).to eq('failed')
+      end
+
+      context "payment total is greater than order total" do
         it "is credit_owed" do
-          order.payment_total = 30
-          order.total = 30
-          allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
-          allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
+          order.payment_total = 2
+          order.total = 1
+
           expect {
             updater.update_payment_state
           }.to change { order.payment_state }.to 'credit_owed'
         end
       end
 
-      context "and payment is refunded" do
-        it "is void" do
-          order.payment_total = 0
-          order.total = 30
-          allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
-          allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
+      context "order total is greater than payment total" do
+        it "is credit_owed" do
+          order.payment_total = 1
+          order.total = 2
+
           expect {
             updater.update_payment_state
-          }.to change { order.payment_state }.to 'void'
-        end
-      end
-    end
-
-    context 'when the set payment_state does not match the last payment_state' do
-      before { order.payment_state = 'previous_to_paid' }
-
-      context 'and the order is being updated' do
-        before { allow(order).to receive(:persisted?) { true } }
-
-        it 'creates a new state_change for the order' do
-          expect { updater.update_payment_state }
-            .to change { order.state_changes.size }.by(1)
+          }.to change { order.payment_state }.to 'balance_due'
         end
       end
 
-      context 'and the order is being created' do
-        before { allow(order).to receive(:persisted?) { false } }
+      context "order total equals payment total" do
+        it "is paid" do
+          order.payment_total = 30
+          order.total = 30
 
-        it 'creates a new state_change for the order' do
+          expect {
+            updater.update_payment_state
+          }.to change { order.payment_state }.to 'paid'
+        end
+      end
+
+      context "order is canceled" do
+        before do
+          order.state = 'canceled'
+        end
+
+        context "and is still unpaid" do
+          it "is void" do
+            order.payment_total = 0
+            order.total = 30
+            expect {
+              updater.update_payment_state
+            }.to change { order.payment_state }.to 'void'
+          end
+        end
+
+        context "and is paid" do
+          it "is credit_owed" do
+            order.payment_total = 30
+            order.total = 30
+            allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
+            allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
+            expect {
+              updater.update_payment_state
+            }.to change { order.payment_state }.to 'credit_owed'
+          end
+        end
+
+        context "and payment is refunded" do
+          it "is void" do
+            order.payment_total = 0
+            order.total = 30
+            allow(order).to receive_message_chain(:payments, :valid, :empty?).and_return(false)
+            allow(order).to receive_message_chain(:payments, :completed, :empty?).and_return(false)
+            expect {
+              updater.update_payment_state
+            }.to change { order.payment_state }.to 'void'
+          end
+        end
+      end
+
+      context 'when the set payment_state does not match the last payment_state' do
+        before { order.payment_state = 'previous_to_paid' }
+
+        context 'and the order is being updated' do
+          before { allow(order).to receive(:persisted?) { true } }
+
+          it 'creates a new state_change for the order' do
+            expect { updater.update_payment_state }
+              .to change { order.state_changes.size }.by(1)
+          end
+        end
+
+        context 'and the order is being created' do
+          before { allow(order).to receive(:persisted?) { false } }
+
+          it 'creates a new state_change for the order' do
+            expect { updater.update_payment_state }
+              .not_to change { order.state_changes.size }
+          end
+        end
+      end
+
+      context 'when the set payment_state matches the last payment_state' do
+        before { order.payment_state = 'paid' }
+
+        it 'does not create any state_change' do
           expect { updater.update_payment_state }
             .not_to change { order.state_changes.size }
         end
       end
-    end
 
-    context 'when the set payment_state matches the last payment_state' do
-      before { order.payment_state = 'paid' }
+      context '#before_save_hook' do
+        let(:distributor) { build(:distributor_enterprise) }
+        let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
 
-      it 'does not create any state_change' do
-        expect { updater.update_payment_state }
-          .not_to change { order.state_changes.size }
-      end
-    end
-
-    context '#before_save_hook' do
-      let(:distributor) { build(:distributor_enterprise) }
-      let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
-
-      before do
-        order.distributor = distributor
-        order.shipments = [shipment]
-      end
-
-      context 'when shipping method is pickup' do
-        let(:shipping_method) { create(:shipping_method_with, :pickup) }
-        let(:address) { build(:address, firstname: 'joe') }
-        before { distributor.address = address }
-
-        it "populates the shipping address from distributor" do
-          updater.before_save_hook
-          expect(order.ship_address.address1).to eq(distributor.address.address1)
+        before do
+          order.distributor = distributor
+          order.shipments = [shipment]
         end
-      end
 
-      context 'when shipping_method is delivery' do
-        let(:shipping_method) { create(:shipping_method_with, :delivery) }
-        let(:address) { build(:address, firstname: 'will') }
-        before { order.ship_address = address }
+        context 'when shipping method is pickup' do
+          let(:shipping_method) { create(:shipping_method_with, :pickup) }
+          let(:address) { build(:address, firstname: 'joe') }
+          before { distributor.address = address }
 
-        it "does not populate the shipping address from distributor" do
-          updater.before_save_hook
-          expect(order.ship_address.firstname).to eq("will")
+          it "populates the shipping address from distributor" do
+            updater.before_save_hook
+            expect(order.ship_address.address1).to eq(distributor.address.address1)
+          end
+        end
+
+        context 'when shipping_method is delivery' do
+          let(:shipping_method) { create(:shipping_method_with, :delivery) }
+          let(:address) { build(:address, firstname: 'will') }
+          before { order.ship_address = address }
+
+          it "does not populate the shipping address from distributor" do
+            updater.before_save_hook
+            expect(order.ship_address.firstname).to eq("will")
+          end
         end
       end
     end

From 2070cfd5bb51e194f20dccbbe91414a3269e83ed Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:33:25 +0100
Subject: [PATCH 087/340] Fix easy rubocop issues

---
 app/models/spree/order_decorator.rb                  |  2 +-
 .../app/services/order_management/order/updater.rb   | 12 ++++++------
 .../services/order_management/order/updater_spec.rb  |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 4910eb90b1..49e899e28f 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -379,7 +379,7 @@ Spree::Order.class_eval do
   end
 
   # Update attributes of a record in the database without callbacks, validations etc.
-  #   This was originally a ext to ActiveRecord in Spree but only used for Spree::Order
+  #   This was originally an extension to ActiveRecord in Spree but only used for Spree::Order
   def update_attributes_without_callbacks(attributes)
     assign_attributes(attributes)
     Spree::Order.where(id: id).update_all(attributes)
diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
index 30b4e27458..d3c496d4e2 100644
--- a/engines/order_management/app/services/order_management/order/updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -52,10 +52,10 @@ module OrderManagement
 
       # Updates the following Order total values:
       #
-      # - payment_total - the total value of all finalized Payments (excluding non-finalized Payments)
-      # - item_total - the total value of all LineItems
-      # - adjustment_total - the total value of all adjustments
-      # - total - the "order total". This is equivalent to item_total plus adjustment_total
+      # - payment_total - total value of all finalized Payments (excludes non-finalized Payments)
+      # - item_total - total value of all LineItems
+      # - adjustment_total - total value of all adjustments
+      # - total - order total, it's the equivalent to item_total plus adjustment_total
       def update_totals
         order.payment_total = payments.completed.map(&:amount).sum
         order.item_total = line_items.map(&:amount).sum
@@ -160,9 +160,9 @@ module OrderManagement
       end
 
       def infer_state(balance)
-        if balance > 0
+        if balance.positive?
           'balance_due'
-        elsif balance < 0
+        elsif balance.negative?
           'credit_owed'
         elsif balance.zero?
           'paid'
diff --git a/engines/order_management/spec/services/order_management/order/updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb
index 51e4d59d85..009176eed2 100644
--- a/engines/order_management/spec/services/order_management/order/updater_spec.rb
+++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb
@@ -58,7 +58,8 @@ module OrderManagement
         end
 
         it "is partial" do
-          allow(order).to receive_message_chain(:shipments, :states).and_return(["pending", "ready"])
+          allow(order).
+            to receive_message_chain(:shipments, :states).and_return(["pending", "ready"])
           updater.update_shipment_state
           expect(order.shipment_state).to eq 'partial'
         end
@@ -260,7 +261,9 @@ module OrderManagement
 
       context '#before_save_hook' do
         let(:distributor) { build(:distributor_enterprise) }
-        let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
+        let(:shipment) {
+          create(:shipment_with, :shipping_method, shipping_method: shipping_method)
+        }
 
         before do
           order.distributor = distributor

From bdf9c1e40573cceedf7002b795c61ad90373979c Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 17:45:49 +0100
Subject: [PATCH 088/340] Simplify update_shipment_state based on the fact
 there's only one shipment per order in OFN

---
 .../order_management/order/updater.rb         | 34 ++++---------
 .../order_management/order/updater_spec.rb    | 48 +++++--------------
 2 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
index d3c496d4e2..2e4f1c6c4b 100644
--- a/engines/order_management/app/services/order_management/order/updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -65,36 +65,20 @@ module OrderManagement
 
       # Updates the +shipment_state+ attribute according to the following logic:
       #
-      # - shipped - when all Shipments are in the "shipped" state
-      # - partial - when 1. at least one Shipment has a state of "shipped"
-      #                       and there is another Shipment with a state other than "shipped"
-      #                  or 2. there are InventoryUnits associated with the order that
-      #                          have a state of "sold" but are not associated with a Shipment
-      # - ready - when all Shipments are in the "ready" state
+      # - shipped - when the order shipment is in the "shipped" state
+      # - ready - when the order shipment is in the "ready" state
       # - backorder - when there is backordered inventory associated with an order
-      # - pending - when all Shipments are in the "pending" state
+      # - pending - when the shipment is in the "pending" state
       #
       # The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way
       #   to locate Orders needing attention.
       def update_shipment_state
-        if order.backordered?
-          order.shipment_state = 'backorder'
-        else
-          # get all the shipment states for this order
-          shipment_states = shipments.states
-          if shipment_states.size > 1
-            # multiple shiment states means it's most likely partially shipped
-            order.shipment_state = 'partial'
-          else
-            # will return nil if no shipments are found
-            order.shipment_state = shipment_states.first
-            # TODO inventory unit states?
-            # if order.shipment_state && order.inventory_units.where(:shipment_id => nil).exists?
-            #   shipments exist but there are unassigned inventory units
-            #   order.shipment_state = 'partial'
-            # end
-          end
-        end
+        order.shipment_state = if order.shipment&.backordered?
+                                 'backorder'
+                               else
+                                 # It returns nil if there is no shipment
+                                 order.shipment&.state
+                               end
 
         order.state_changed('shipment')
       end
diff --git a/engines/order_management/spec/services/order_management/order/updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb
index 009176eed2..1bd901d37c 100644
--- a/engines/order_management/spec/services/order_management/order/updater_spec.rb
+++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb
@@ -28,22 +28,21 @@ module OrderManagement
       end
 
       context "updating shipment state" do
+        let(:shipment) { build(:shipment) }
+
         before do
-          allow(order).to receive_message_chain(:shipments, :shipped, :count).and_return(0)
-          allow(order).to receive_message_chain(:shipments, :ready, :count).and_return(0)
-          allow(order).to receive_message_chain(:shipments, :pending, :count).and_return(0)
+          allow(order).to receive(:shipments).and_return([shipment])
         end
 
         it "is backordered" do
-          allow(order).to receive(:backordered?) { true }
+          allow(shipment).to receive(:backordered?) { true }
           updater.update_shipment_state
 
           expect(order.shipment_state).to eq 'backorder'
         end
 
         it "is nil" do
-          allow(order).to receive_message_chain(:shipments, :states).and_return([])
-          allow(order).to receive_message_chain(:shipments, :count).and_return(0)
+          allow(shipment).to receive(:state).and_return(nil)
 
           updater.update_shipment_state
           expect(order.shipment_state).to be_nil
@@ -51,18 +50,11 @@ module OrderManagement
 
         ["shipped", "ready", "pending"].each do |state|
           it "is #{state}" do
-            allow(order).to receive_message_chain(:shipments, :states).and_return([state])
+            allow(shipment).to receive(:state).and_return(state)
             updater.update_shipment_state
             expect(order.shipment_state).to eq state.to_s
           end
         end
-
-        it "is partial" do
-          allow(order).
-            to receive_message_chain(:shipments, :states).and_return(["pending", "ready"])
-          updater.update_shipment_state
-          expect(order.shipment_state).to eq 'partial'
-        end
       end
 
       it "state change" do
@@ -93,14 +85,9 @@ module OrderManagement
           updater.update
         end
 
-        it "updates each shipment" do
+        it "updates the order shipment" do
           shipment = build(:shipment)
-          shipments = [shipment]
-          allow(order).to receive_messages shipments: shipments
-          allow(shipments).to receive_messages states: []
-          allow(shipments).to receive_messages ready: []
-          allow(shipments).to receive_messages pending: []
-          allow(shipments).to receive_messages shipped: []
+          allow(order).to receive_messages shipments: [shipment]
 
           expect(shipment).to receive(:update!).with(order)
           updater.update
@@ -120,14 +107,9 @@ module OrderManagement
           updater.update
         end
 
-        it "doesnt update each shipment" do
+        it "doesnt update the order shipment" do
           shipment = build(:shipment)
-          shipments = [shipment]
-          allow(order).to receive_messages shipments: shipments
-          allow(shipments).to receive_messages states: []
-          allow(shipments).to receive_messages ready: []
-          allow(shipments).to receive_messages pending: []
-          allow(shipments).to receive_messages shipped: []
+          allow(order).to receive_messages shipments: [shipment]
 
           expect(shipment).not_to receive(:update!).with(order)
           updater.update
@@ -139,13 +121,9 @@ module OrderManagement
         updater.update
       end
 
-      context "update adjustments" do
-        context "shipments" do
-          it "updates" do
-            expect(updater).to receive(:update_all_adjustments)
-            updater.update
-          end
-        end
+      it "updates all adjustments" do
+        expect(updater).to receive(:update_all_adjustments)
+        updater.update
       end
 
       it "is failed if no valid payments" do

From e367cbd1e61172bb40fc26e78633656bb72c8825 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 18:18:18 +0100
Subject: [PATCH 089/340] Fix one rubocop issues and add the remaining to the
 manual todo

---
 .rubocop_manual_todo.yml                           |  4 ++++
 .../app/services/order_management/order/updater.rb | 14 ++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index c5b16934f0..3179846501 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -401,6 +401,7 @@ Metrics/AbcSize:
   - app/services/create_order_cycle.rb
   - app/services/order_cycle_form.rb
   - app/services/order_syncer.rb
+  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
   - engines/order_management/app/services/order_management/stock/packer.rb
@@ -597,6 +598,7 @@ Metrics/MethodLength:
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/services/order_cycle_form.rb
   - app/services/permitted_attributes/checkout.rb
+  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
@@ -667,6 +669,7 @@ Metrics/ClassLength:
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/serializers/api/enterprise_shopfront_serializer.rb
   - app/services/cart_service.rb
+  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/open_food_network/bulk_coop_report.rb
@@ -687,6 +690,7 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
+  - engines/order_management/spec/services/order_management/order/updater_spec.rb
   - engines/order_management/spec/services/order_management/stock/package_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
index 2e4f1c6c4b..e7cb051a4f 100644
--- a/engines/order_management/app/services/order_management/order/updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -33,14 +33,12 @@ module OrderManagement
         update_totals
 
         order.update_attributes_without_callbacks(
-          {
-            payment_state: order.payment_state,
-            shipment_state: order.shipment_state,
-            item_total: order.item_total,
-            adjustment_total: order.adjustment_total,
-            payment_total: order.payment_total,
-            total: order.total
-          }
+          payment_state: order.payment_state,
+          shipment_state: order.shipment_state,
+          item_total: order.item_total,
+          adjustment_total: order.adjustment_total,
+          payment_total: order.payment_total,
+          total: order.total
         )
 
         run_hooks

From 56b83b6bb54b93c4aca20037e3e8f82b5a523aa2 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 10 Jul 2020 16:18:44 +0100
Subject: [PATCH 090/340] Fix easy rubocop issues

---
 lib/spree/core/environment/calculators.rb |  3 ++-
 lib/spree/core/environment_extension.rb   | 10 ++++++----
 lib/spree/i18n/base.rb                    |  2 ++
 lib/spree/i18n/initializer.rb             |  4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/spree/core/environment/calculators.rb b/lib/spree/core/environment/calculators.rb
index ae86072c19..a5f60555f7 100644
--- a/lib/spree/core/environment/calculators.rb
+++ b/lib/spree/core/environment/calculators.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     class Environment
@@ -9,4 +11,3 @@ module Spree
     end
   end
 end
-
diff --git a/lib/spree/core/environment_extension.rb b/lib/spree/core/environment_extension.rb
index ecbd31a9a3..7b05908752 100644
--- a/lib/spree/core/environment_extension.rb
+++ b/lib/spree/core/environment_extension.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module EnvironmentExtension
       extend ActiveSupport::Concern
 
       def add_class(name)
-        self.instance_variable_set "@#{name}", Set.new
+        instance_variable_set "@#{name}", Set.new
 
         create_method( "#{name}=".to_sym ) { |val|
           instance_variable_set( "@" + name, val)
@@ -17,9 +19,9 @@ module Spree
 
       private
 
-        def create_method(name, &block)
-          self.class.send(:define_method, name, &block)
-        end
+      def create_method(name, &block)
+        self.class.__send__(:define_method, name, &block)
+      end
     end
   end
 end
diff --git a/lib/spree/i18n/base.rb b/lib/spree/i18n/base.rb
index 765c8ad169..88c2d3106d 100644
--- a/lib/spree/i18n/base.rb
+++ b/lib/spree/i18n/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module ViewContext
     def self.context=(context)
diff --git a/lib/spree/i18n/initializer.rb b/lib/spree/i18n/initializer.rb
index 79f5917cb2..85757681fe 100644
--- a/lib/spree/i18n/initializer.rb
+++ b/lib/spree/i18n/initializer.rb
@@ -1 +1,3 @@
-Spree::BaseController.send(:include, Spree::ViewContext)
+# frozen_string_literal: true
+
+Spree::BaseController.__send__(:include, Spree::ViewContext)

From 2e3702550dd8905a03a67ce394ab0efcf82fe54e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 11 Jul 2020 16:04:10 +0100
Subject: [PATCH 091/340] Bring a number of files from spree_core needed in OFN

---
 lib/spree/core/calculated_adjustments.rb      | 75 ++++++++++++++++
 lib/spree/core/delegate_belongs_to.rb         | 89 +++++++++++++++++++
 lib/spree/core/gateway_error.rb               |  5 ++
 lib/spree/core/mail_interceptor.rb            | 22 +++++
 lib/spree/core/mail_settings.rb               | 60 +++++++++++++
 lib/spree/core/permalinks.rb                  | 71 +++++++++++++++
 lib/spree/core/s3_support.rb                  | 25 ++++++
 lib/spree/core/token_resource.rb              | 27 ++++++
 lib/spree/product_duplicator.rb               | 61 +++++++++++++
 .../spree/core/calculated_adjustments_spec.rb | 69 ++++++++++++++
 spec/lib/spree/core/mail_interceptor_spec.rb  | 78 ++++++++++++++++
 spec/lib/spree/core/mail_settings_spec.rb     | 89 +++++++++++++++++++
 spec/lib/spree/core/token_resource_spec.rb    | 32 +++++++
 spec/lib/spree/product_duplicator_spec.rb     | 87 ++++++++++++++++++
 14 files changed, 790 insertions(+)
 create mode 100644 lib/spree/core/calculated_adjustments.rb
 create mode 100644 lib/spree/core/delegate_belongs_to.rb
 create mode 100644 lib/spree/core/gateway_error.rb
 create mode 100644 lib/spree/core/mail_interceptor.rb
 create mode 100644 lib/spree/core/mail_settings.rb
 create mode 100644 lib/spree/core/permalinks.rb
 create mode 100644 lib/spree/core/s3_support.rb
 create mode 100644 lib/spree/core/token_resource.rb
 create mode 100644 lib/spree/product_duplicator.rb
 create mode 100644 spec/lib/spree/core/calculated_adjustments_spec.rb
 create mode 100644 spec/lib/spree/core/mail_interceptor_spec.rb
 create mode 100644 spec/lib/spree/core/mail_settings_spec.rb
 create mode 100644 spec/lib/spree/core/token_resource_spec.rb
 create mode 100644 spec/lib/spree/product_duplicator_spec.rb

diff --git a/lib/spree/core/calculated_adjustments.rb b/lib/spree/core/calculated_adjustments.rb
new file mode 100644
index 0000000000..221a9926f0
--- /dev/null
+++ b/lib/spree/core/calculated_adjustments.rb
@@ -0,0 +1,75 @@
+module Spree
+  module Core
+    module CalculatedAdjustments
+      def self.included(klass)
+        klass.class_eval do
+          has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
+          accepts_nested_attributes_for :calculator
+          validates :calculator, :presence => true
+
+          def self.calculators
+            spree_calculators.send model_name_without_spree_namespace
+          end
+
+          def calculator_type
+            calculator.class.to_s if calculator
+          end
+
+          def calculator_type=(calculator_type)
+            klass = calculator_type.constantize if calculator_type
+            self.calculator = klass.new if klass && !self.calculator.is_a?(klass)
+          end
+
+          # Creates a new adjustment for the target object (which is any class that has_many :adjustments) and
+          # sets amount based on the calculator as applied to the calculable argument (Order, LineItems[], Shipment, etc.)
+          # By default the adjustment will not be considered mandatory
+          def create_adjustment(label, target, calculable, mandatory=false, state="closed")
+            # Adjustment calculations done on Spree::Shipment objects MUST
+            # be done on their to_package'd variants instead
+            # It's only the package that contains the correct information.
+            # See https://github.com/spree/spree_active_shipping/pull/96 et. al
+            old_calculable = calculable
+            calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
+            amount = compute_amount(calculable)
+            return if amount == 0 && !mandatory
+            target.adjustments.create(
+              :amount => amount,
+              :source => old_calculable,
+              :originator => self,
+              :label => label,
+              :mandatory => mandatory,
+              :state => state
+            )
+          end
+
+          # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+
+          # referenced passed to the method.
+          def update_adjustment(adjustment, calculable)
+            # Adjustment calculations done on Spree::Shipment objects MUST
+            # be done on their to_package'd variants instead
+            # It's only the package that contains the correct information.
+            # See https://github.com/spree/spree_active_shipping/pull/96 et. al
+            calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
+            adjustment.update_column(:amount, compute_amount(calculable))
+          end
+
+          # Calculate the amount to be used when creating an adjustment
+          # NOTE: May be overriden by classes where this module is included into.
+          # Such as Spree::Promotion::Action::CreateAdjustment.
+          def compute_amount(calculable)
+            self.calculator.compute(calculable)
+          end
+
+          private
+          def self.model_name_without_spree_namespace
+            self.to_s.tableize.gsub('/', '_').sub('spree_', '')
+          end
+
+          def self.spree_calculators
+            Rails.application.config.spree.calculators
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/spree/core/delegate_belongs_to.rb b/lib/spree/core/delegate_belongs_to.rb
new file mode 100644
index 0000000000..2adb978557
--- /dev/null
+++ b/lib/spree/core/delegate_belongs_to.rb
@@ -0,0 +1,89 @@
+##
+# Creates methods on object which delegate to an association proxy.
+# see delegate_belongs_to for two uses
+#
+# Todo - integrate with ActiveRecord::Dirty to make sure changes to delegate object are noticed
+# Should do
+# class User < ActiveRecord::Base; delegate_belongs_to :contact, :firstname; end
+# class Contact < ActiveRecord::Base; end
+# u = User.first
+# u.changed? # => false
+# u.firstname = 'Bobby'
+# u.changed? # => true
+#
+# Right now the second call to changed? would return false
+#
+# Todo - add has_one support. fairly straightforward addition
+##
+module DelegateBelongsTo
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+
+    @@default_rejected_delegate_columns = ['created_at','created_on','updated_at','updated_on','lock_version','type','id','position','parent_id','lft','rgt']
+    mattr_accessor :default_rejected_delegate_columns
+
+    ##
+    # Creates methods for accessing and setting attributes on an association.  Uses same
+    # default list of attributes as delegates_to_association.
+    # @todo Integrate this with ActiveRecord::Dirty, so if you set a property through one of these setters and then call save on this object, it will save the associated object automatically.
+    # delegate_belongs_to :contact
+    # delegate_belongs_to :contact, [:defaults]  ## same as above, and useless
+    # delegate_belongs_to :contact, [:defaults, :address, :fullname], :class_name => 'VCard'
+    ##
+    def delegate_belongs_to(association, *attrs)
+      opts = attrs.extract_options!
+      initialize_association :belongs_to, association, opts
+      attrs = get_association_column_names(association) if attrs.empty?
+      attrs.concat get_association_column_names(association) if attrs.delete :defaults
+      attrs.each do |attr|
+        class_def attr do |*args|
+          if args.empty?
+            send(:delegator_for, association).send(attr)
+          else
+            send(:delegator_for, association).send(attr, *args)
+          end
+        end
+        class_def "#{attr}=" do |val|
+          send(:delegator_for, association).send("#{attr}=", val)
+        end
+      end
+    end
+
+    protected
+
+      def get_association_column_names(association, without_default_rejected_delegate_columns=true)
+        begin
+          association_klass = reflect_on_association(association).klass
+          methods = association_klass.column_names
+          methods.reject!{|x|default_rejected_delegate_columns.include?(x.to_s)} if without_default_rejected_delegate_columns
+          return methods
+        rescue
+          return []
+        end
+      end
+
+      ##
+      # initialize_association :belongs_to, :contact
+      def initialize_association(type, association, opts={})
+        raise 'Illegal or unimplemented association type.' unless [:belongs_to].include?(type.to_s.to_sym)
+        send type, association, opts if reflect_on_association(association).nil?
+      end
+
+    private
+
+      def class_def(name, method=nil, &blk)
+        class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
+      end
+
+  end
+
+  def delegator_for(association)
+    send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
+    send(association)
+  end
+  protected :delegator_for
+
+end
+
+ActiveRecord::Base.send :include, DelegateBelongsTo
diff --git a/lib/spree/core/gateway_error.rb b/lib/spree/core/gateway_error.rb
new file mode 100644
index 0000000000..5a6ddda30b
--- /dev/null
+++ b/lib/spree/core/gateway_error.rb
@@ -0,0 +1,5 @@
+module Spree
+  module Core
+    class GatewayError < RuntimeError; end
+  end
+end
diff --git a/lib/spree/core/mail_interceptor.rb b/lib/spree/core/mail_interceptor.rb
new file mode 100644
index 0000000000..e0a1400ab8
--- /dev/null
+++ b/lib/spree/core/mail_interceptor.rb
@@ -0,0 +1,22 @@
+# Allows us to intercept any outbound mail message and make last minute changes
+# (such as specifying a "from" address or sending to a test email account)
+#
+# See http://railscasts.com/episodes/206-action-mailer-in-rails-3 for more details.
+module Spree
+  module Core
+    class MailInterceptor
+      def self.delivering_email(message)
+        return unless MailSettings.override?
+
+        if Config[:intercept_email].present?
+          message.subject = "#{message.to} #{message.subject}"
+          message.to = Config[:intercept_email]
+        end
+
+        if Config[:mail_bcc].present?
+          message.bcc ||= Config[:mail_bcc]
+        end
+      end
+    end
+  end
+end
diff --git a/lib/spree/core/mail_settings.rb b/lib/spree/core/mail_settings.rb
new file mode 100644
index 0000000000..757144af8e
--- /dev/null
+++ b/lib/spree/core/mail_settings.rb
@@ -0,0 +1,60 @@
+module Spree
+  module Core
+    class MailSettings
+      MAIL_AUTH = ['None', 'plain', 'login', 'cram_md5']
+      SECURE_CONNECTION_TYPES = ['None','SSL','TLS']
+
+      # Override the Rails application mail settings based on preferences
+      # This makes it possible to configure the mail settings through an admin
+      # interface instead of requiring changes to the Rails envrionment file
+      def self.init
+        self.new.override! if override?
+      end
+
+      def self.override?
+        Config.override_actionmailer_config
+      end
+
+      def override!
+        if Config.enable_mail_delivery
+          ActionMailer::Base.default_url_options[:host] ||= Config.site_url
+          ActionMailer::Base.smtp_settings = mail_server_settings
+          ActionMailer::Base.perform_deliveries = true
+        else
+          ActionMailer::Base.perform_deliveries = false
+        end
+      end
+
+      private
+        def mail_server_settings
+          settings = if need_authentication?
+            basic_settings.merge(user_credentials)
+          else
+            basic_settings
+          end
+
+          settings.merge :enable_starttls_auto => secure_connection?
+        end
+
+        def user_credentials
+          { :user_name => Config.smtp_username,
+            :password => Config.smtp_password }
+        end
+
+        def basic_settings
+          { :address => Config.mail_host,
+            :domain => Config.mail_domain,
+            :port => Config.mail_port,
+            :authentication => Config.mail_auth_type }
+        end
+
+        def need_authentication?
+          Config.mail_auth_type != 'None'
+        end
+
+        def secure_connection?
+          Config.secure_connection_type == 'TLS'
+        end
+    end
+  end
+end
diff --git a/lib/spree/core/permalinks.rb b/lib/spree/core/permalinks.rb
new file mode 100644
index 0000000000..6e0fcc8735
--- /dev/null
+++ b/lib/spree/core/permalinks.rb
@@ -0,0 +1,71 @@
+require 'stringex'
+
+module Spree
+  module Core
+    module Permalinks
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :permalink_options
+      end
+
+      module ClassMethods
+        def make_permalink(options={})
+          options[:field] ||= :permalink
+          self.permalink_options = options
+
+          if self.connected?
+            if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
+              before_validation(:on => :create) { save_permalink }
+            end
+          end
+        end
+
+        def find_by_param(value, *args)
+          self.send("find_by_#{permalink_field}", value, *args)
+        end
+
+        def find_by_param!(value, *args)
+          self.send("find_by_#{permalink_field}!", value, *args)
+        end
+
+        def permalink_field
+          permalink_options[:field]
+        end
+
+        def permalink_prefix
+          permalink_options[:prefix] || ""
+        end
+
+        def permalink_order
+          order = permalink_options[:order]
+          "#{order} ASC," if order
+        end
+      end
+
+      def generate_permalink
+        "#{self.class.permalink_prefix}#{Array.new(9){rand(9)}.join}"
+      end
+
+      def save_permalink(permalink_value=self.to_param)
+        self.with_lock do
+          permalink_value ||= generate_permalink
+
+          field = self.class.permalink_field
+            # Do other links exist with this permalink?
+            other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
+            if other.any?
+              # Find the existing permalink with the highest number, and increment that number.
+              # (If none of the existing permalinks have a number, this will evaluate to 1.)
+              number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
+              permalink_value += "-#{number.to_s}"
+            end
+          write_attribute(field, permalink_value)
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Spree::Core::Permalinks
+ActiveRecord::Relation.send :include, Spree::Core::Permalinks
diff --git a/lib/spree/core/s3_support.rb b/lib/spree/core/s3_support.rb
new file mode 100644
index 0000000000..8ae8354391
--- /dev/null
+++ b/lib/spree/core/s3_support.rb
@@ -0,0 +1,25 @@
+module Spree
+  module Core
+    # This module exists to reduce duplication in S3 settings between
+    # the Image and Taxon models in Spree
+    module S3Support
+      extend ActiveSupport::Concern
+
+      included do
+        def self.supports_s3(field)
+          # Load user defined paperclip settings
+          config = Spree::Config
+          if config[:use_s3]
+            s3_creds = { :access_key_id => config[:s3_access_key], :secret_access_key => config[:s3_secret], :bucket => config[:s3_bucket] }
+            self.attachment_definitions[field][:storage] = :s3
+            self.attachment_definitions[field][:s3_credentials] = s3_creds
+            self.attachment_definitions[field][:s3_headers] = ActiveSupport::JSON.decode(config[:s3_headers])
+            self.attachment_definitions[field][:bucket] = config[:s3_bucket]
+            self.attachment_definitions[field][:s3_protocol] = config[:s3_protocol].downcase unless config[:s3_protocol].blank?
+            self.attachment_definitions[field][:s3_host_alias] = config[:s3_host_alias] unless config[:s3_host_alias].blank?
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/spree/core/token_resource.rb b/lib/spree/core/token_resource.rb
new file mode 100644
index 0000000000..48697f29b2
--- /dev/null
+++ b/lib/spree/core/token_resource.rb
@@ -0,0 +1,27 @@
+module Spree
+  module Core
+    module TokenResource
+      module ClassMethods
+        def token_resource
+          has_one :tokenized_permission, :as => :permissable
+          delegate :token, :to => :tokenized_permission, :allow_nil => true
+          after_create :create_token
+        end
+      end
+
+      def create_token
+        permission = build_tokenized_permission
+        permission.token = token = ::SecureRandom::hex(8)
+        permission.save!
+        token
+      end
+
+      def self.included(receiver)
+        receiver.extend ClassMethods
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.class_eval { include Spree::Core::TokenResource }
+
diff --git a/lib/spree/product_duplicator.rb b/lib/spree/product_duplicator.rb
new file mode 100644
index 0000000000..f563223f70
--- /dev/null
+++ b/lib/spree/product_duplicator.rb
@@ -0,0 +1,61 @@
+module Spree
+  class ProductDuplicator
+    attr_accessor :product
+
+    def initialize(product)
+      @product = product
+    end
+
+    def duplicate
+      new_product = duplicate_product
+
+      # don't dup the actual variants, just the characterising types
+      new_product.option_types = product.option_types if product.has_variants?
+
+      # allow site to do some customization
+      new_product.send(:duplicate_extra, product) if new_product.respond_to?(:duplicate_extra)
+      new_product.save!
+      new_product
+    end
+
+    protected
+
+    def duplicate_product
+      product.dup.tap do |new_product|
+        new_product.name = "COPY OF #{product.name}"
+        new_product.taxons = product.taxons
+        new_product.created_at = nil
+        new_product.deleted_at = nil
+        new_product.updated_at = nil
+        new_product.product_properties = reset_properties
+        new_product.master = duplicate_master
+      end
+    end
+
+    def duplicate_master
+      master = product.master
+      master.dup.tap do |new_master|
+        new_master.sku = "COPY OF #{master.sku}"
+        new_master.deleted_at = nil
+        new_master.images = master.images.map { |image| duplicate_image image }
+        new_master.price = master.price
+        new_master.currency = master.currency
+      end
+    end
+
+    def duplicate_image(image)
+      new_image = image.dup
+      new_image.assign_attributes(:attachment => image.attachment.clone)
+      new_image
+    end
+
+    def reset_properties
+      product.product_properties.map do |prop|
+        prop.dup.tap do |new_prop|
+          new_prop.created_at = nil
+          new_prop.updated_at = nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/spree/core/calculated_adjustments_spec.rb b/spec/lib/spree/core/calculated_adjustments_spec.rb
new file mode 100644
index 0000000000..eecfee445f
--- /dev/null
+++ b/spec/lib/spree/core/calculated_adjustments_spec.rb
@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+# Its pretty difficult to test this module in isolation b/c it needs to work in conjunction with an actual class that
+# extends ActiveRecord::Base and has a corresponding table in the database.  So we'll just test it using Order and
+# ShippingMethod instead since those classes are including the module.
+describe Spree::Core::CalculatedAdjustments do
+
+  let(:calculator) { mock_model(Spree::Calculator, :compute => 10, :[]= => nil) }
+
+  it "should add has_one :calculator relationship" do
+    assert Spree::ShippingMethod.reflect_on_all_associations(:has_one).map(&:name).include?(:calculator)
+  end
+
+  let(:tax_rate) { Spree::TaxRate.new(:calculator => calculator) }
+
+  context "#create_adjustment and its resulting adjustment" do
+    let(:order) { Spree::Order.create }
+    let(:target) { order }
+
+    it "should be associated with the target" do
+      target.adjustments.should_receive(:create)
+      tax_rate.create_adjustment("foo", target, order)
+    end
+
+    it "should have the correct originator and an amount derived from the calculator and supplied calculable" do
+      adjustment = tax_rate.create_adjustment("foo", target, order)
+      adjustment.should_not be_nil
+      adjustment.amount.should == 10
+      adjustment.source.should == order
+      adjustment.originator.should == tax_rate
+    end
+
+    it "should be mandatory if true is supplied for that parameter" do
+      adjustment = tax_rate.create_adjustment("foo", target, order, true)
+      adjustment.should be_mandatory
+    end
+
+    context "when the calculator returns 0" do
+      before { calculator.stub :compute => 0 }
+
+      context "when adjustment is mandatory" do
+        before { tax_rate.create_adjustment("foo", target, order, true) }
+
+        it "should create an adjustment" do
+          Spree::Adjustment.count.should == 1
+        end
+      end
+
+      context "when adjustment is not mandatory" do
+        before { tax_rate.create_adjustment("foo", target, order, false) }
+
+        it "should not create an adjustment" do
+          Spree::Adjustment.count.should == 0
+        end
+      end
+    end
+
+  end
+
+  context "#update_adjustment" do
+    it "should update the adjustment using its calculator (and the specified source)" do
+      adjustment = double(:adjustment).as_null_object
+      calculable = double :calculable
+      adjustment.should_receive(:update_column).with(:amount, 10)
+      tax_rate.update_adjustment(adjustment, calculable)
+    end
+  end
+
+end
diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
new file mode 100644
index 0000000000..9375a0471c
--- /dev/null
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+# We'll use the OrderMailer as a quick and easy way to test. IF it works here
+# it works for all email (in theory.)
+describe Spree::OrderMailer do
+  let(:order) { Spree::Order.new(:email => "customer@example.com") }
+  let(:message) { Spree::OrderMailer.confirm_email(order) }
+
+  before(:all) do
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries.clear
+  end
+
+  context "#deliver" do
+    before do
+      ActionMailer::Base.delivery_method = :test
+    end
+
+    after { ActionMailer::Base.deliveries.clear }
+
+    it "should use the from address specified in the preference" do
+      Spree::Config[:mails_from] = "no-reply@foobar.com"
+      message.deliver
+      @email = ActionMailer::Base.deliveries.first
+      @email.from.should == ["no-reply@foobar.com"]
+    end
+
+    it "should use the provided from address" do
+      Spree::Config[:mails_from] = "preference@foobar.com"
+      message.from = "override@foobar.com"
+      message.to = "test@test.com"
+      message.deliver
+      email = ActionMailer::Base.deliveries.first
+      email.from.should == ["override@foobar.com"]
+      email.to.should == ["test@test.com"]
+    end
+
+    it "should add the bcc email when provided" do
+      Spree::Config[:mail_bcc] = "bcc-foo@foobar.com"
+      message.deliver
+      @email = ActionMailer::Base.deliveries.first
+      @email.bcc.should == ["bcc-foo@foobar.com"]
+    end
+
+    context "when intercept_email is provided" do
+      it "should strip the bcc recipients" do
+        message.bcc.should be_blank
+      end
+
+      it "should strip the cc recipients" do
+        message.cc.should be_blank
+      end
+
+      it "should replace the receipient with the specified address" do
+        Spree::Config[:intercept_email] = "intercept@foobar.com"
+        message.deliver
+        @email = ActionMailer::Base.deliveries.first
+        @email.to.should == ["intercept@foobar.com"]
+      end
+
+      it "should modify the subject to include the original email" do
+        Spree::Config[:intercept_email] = "intercept@foobar.com"
+        message.deliver
+        @email = ActionMailer::Base.deliveries.first
+        @email.subject.match(/customer@example\.com/).should be_true
+      end
+    end
+
+    context "when intercept_mode is not provided" do
+      it "should not modify the recipient" do
+        Spree::Config[:intercept_email] = ""
+        message.deliver
+        @email = ActionMailer::Base.deliveries.first
+        @email.to.should == ["customer@example.com"]
+      end
+    end
+  end
+end
diff --git a/spec/lib/spree/core/mail_settings_spec.rb b/spec/lib/spree/core/mail_settings_spec.rb
new file mode 100644
index 0000000000..8528a6226d
--- /dev/null
+++ b/spec/lib/spree/core/mail_settings_spec.rb
@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+module Spree
+  module Core
+    describe MailSettings do
+      let!(:subject) { MailSettings.new }
+
+      context "override option is true" do
+        before { Config.override_actionmailer_config = true }
+
+        context "init" do
+          it "calls override!" do
+            MailSettings.should_receive(:new).and_return(subject)
+            subject.should_receive(:override!)
+            MailSettings.init
+          end
+        end
+
+        context "enable delivery" do
+          before { Config.enable_mail_delivery = true }
+
+          context "overrides appplication defaults" do
+
+            context "authentication method is none" do
+              before do
+                Config.mail_host = "smtp.example.com"
+                Config.mail_domain = "example.com"
+                Config.mail_port = 123
+                Config.mail_auth_type = MailSettings::SECURE_CONNECTION_TYPES[0]
+                Config.smtp_username = "schof"
+                Config.smtp_password = "hellospree!"
+                Config.secure_connection_type = "TLS"
+                subject.override!
+              end
+
+              it { ActionMailer::Base.smtp_settings[:address].should == "smtp.example.com" }
+              it { ActionMailer::Base.smtp_settings[:domain].should == "example.com" }
+              it { ActionMailer::Base.smtp_settings[:port].should == 123 }
+              it { ActionMailer::Base.smtp_settings[:authentication].should == "None" }
+              it { ActionMailer::Base.smtp_settings[:enable_starttls_auto].should be_true }
+
+              it "doesnt touch user name config" do
+                ActionMailer::Base.smtp_settings[:user_name].should == nil
+              end
+
+              it "doesnt touch password config" do
+                ActionMailer::Base.smtp_settings[:password].should == nil
+              end
+            end
+          end
+
+          context "when mail_auth_type is other than none" do
+            before do
+              Config.mail_auth_type = "login"
+              Config.smtp_username = "schof"
+              Config.smtp_password = "hellospree!"
+              subject.override!
+            end
+
+            context "overrides user credentials" do
+              it { ActionMailer::Base.smtp_settings[:user_name].should == "schof" }
+              it { ActionMailer::Base.smtp_settings[:password].should == "hellospree!" }
+            end
+          end
+        end
+
+        context "do not enable delivery" do
+          before do
+            Config.enable_mail_delivery = false
+            subject.override!
+          end
+
+          it { ActionMailer::Base.perform_deliveries.should be_false }
+        end
+      end
+
+      context "override option is false" do
+        before { Config.override_actionmailer_config = false }
+
+        context "init" do
+          it "doesnt calls override!" do
+            subject.should_not_receive(:override!)
+            MailSettings.init
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/spree/core/token_resource_spec.rb b/spec/lib/spree/core/token_resource_spec.rb
new file mode 100644
index 0000000000..40ac8f838a
--- /dev/null
+++ b/spec/lib/spree/core/token_resource_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+# Its pretty difficult to test this module in isolation b/c it needs to work in conjunction with an actual class that
+# extends ActiveRecord::Base and has a corresponding table in the database.  So we'll just test it using Order instead
+# since those classes are including the module.
+describe Spree::Core::TokenResource do
+  let(:order) { Spree::Order.new }
+  let(:permission) { mock_model(Spree::TokenizedPermission) }
+
+  it 'should add has_one :tokenized_permission relationship' do
+    assert Spree::Order.reflect_on_all_associations(:has_one).map(&:name).include?(:tokenized_permission)
+  end
+
+  context '#token' do
+    it 'should return the token of the associated permission' do
+      order.stub :tokenized_permission => permission
+      permission.stub :token => 'foo'
+      order.token.should == 'foo'
+    end
+
+    it 'should return nil if there is no associated permission' do
+      order.token.should be_nil
+    end
+  end
+
+  context '#create_token' do
+    it 'should create a randomized 16 character token' do
+      token = order.create_token
+      token.size.should == 16
+    end
+  end
+end
diff --git a/spec/lib/spree/product_duplicator_spec.rb b/spec/lib/spree/product_duplicator_spec.rb
new file mode 100644
index 0000000000..e9fef3ae07
--- /dev/null
+++ b/spec/lib/spree/product_duplicator_spec.rb
@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+module Spree
+  describe Spree::ProductDuplicator do
+    let(:product) do
+      double 'Product',
+        :name => "foo",
+        :taxons => [],
+        :product_properties => [property],
+        :master => variant,
+        :has_variants? => false
+    end
+
+    let(:new_product) do
+      double 'New Product',
+        :save! => true
+    end
+
+    let(:property) do
+      double 'Property'
+    end
+
+    let(:new_property) do
+      double 'New Property'
+    end
+
+    let(:variant) do
+      double 'Variant',
+        :sku => "12345",
+        :price => 19.99,
+        :currency => "AUD",
+        :images => [image]
+    end
+
+    let(:new_variant) do
+      double 'New Variant',
+        :sku => "12345"
+    end
+
+    let(:image) do
+      double 'Image',
+        :attachment => double('Attachment')
+    end
+
+    let(:new_image) do
+      double 'New Image'
+    end
+
+
+    before do
+      product.should_receive(:dup).and_return(new_product)
+      variant.should_receive(:dup).and_return(new_variant)
+      image.should_receive(:dup).and_return(new_image)
+      property.should_receive(:dup).and_return(new_property)
+    end
+
+    it "can duplicate a product" do
+      duplicator = Spree::ProductDuplicator.new(product)
+      new_product.should_receive(:name=).with("COPY OF foo")
+      new_product.should_receive(:taxons=).with([])
+      new_product.should_receive(:product_properties=).with([new_property])
+      new_product.should_receive(:created_at=).with(nil)
+      new_product.should_receive(:updated_at=).with(nil)
+      new_product.should_receive(:deleted_at=).with(nil)
+      new_product.should_receive(:master=).with(new_variant)
+
+      new_variant.should_receive(:sku=).with("COPY OF 12345")
+      new_variant.should_receive(:deleted_at=).with(nil)
+      new_variant.should_receive(:images=).with([new_image])
+      new_variant.should_receive(:price=).with(variant.price)
+      new_variant.should_receive(:currency=).with(variant.currency)
+
+      image.attachment.should_receive(:clone).and_return(image.attachment)
+
+      new_image.should_receive(:assign_attributes).
+        with(:attachment => image.attachment).
+        and_return(new_image)
+
+      new_property.should_receive(:created_at=).with(nil)
+      new_property.should_receive(:updated_at=).with(nil)
+
+      duplicator.duplicate
+    end
+
+  end
+end
+

From 03bb1f053a25140a3b186b22099729a7e22553a5 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 11 Jul 2020 16:43:42 +0100
Subject: [PATCH 092/340] Fix easy rubocop issues

---
 lib/spree/core/calculated_adjustments.rb      | 42 +++++++------
 lib/spree/core/delegate_belongs_to.rb         | 63 ++++++++++---------
 lib/spree/core/gateway_error.rb               |  2 +
 lib/spree/core/mail_interceptor.rb            |  8 ++-
 lib/spree/core/mail_settings.rb               | 57 +++++++++--------
 lib/spree/core/permalinks.rb                  | 46 +++++++-------
 lib/spree/core/s3_support.rb                  | 26 +++++---
 lib/spree/core/token_resource.rb              |  9 +--
 lib/spree/product_duplicator.rb               |  6 +-
 .../spree/core/calculated_adjustments_spec.rb | 28 ++++-----
 spec/lib/spree/core/mail_interceptor_spec.rb  | 18 +++---
 spec/lib/spree/core/mail_settings_spec.rb     |  7 ++-
 spec/lib/spree/core/token_resource_spec.rb    | 15 +++--
 spec/lib/spree/product_duplicator_spec.rb     | 31 +++++----
 14 files changed, 199 insertions(+), 159 deletions(-)

diff --git a/lib/spree/core/calculated_adjustments.rb b/lib/spree/core/calculated_adjustments.rb
index 221a9926f0..e735ec4993 100644
--- a/lib/spree/core/calculated_adjustments.rb
+++ b/lib/spree/core/calculated_adjustments.rb
@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module CalculatedAdjustments
       def self.included(klass)
         klass.class_eval do
-          has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
+          has_one :calculator, class_name: "Spree::Calculator", as: :calculable, dependent: :destroy
           accepts_nested_attributes_for :calculator
-          validates :calculator, :presence => true
+          validates :calculator, presence: true
 
           def self.calculators
-            spree_calculators.send model_name_without_spree_namespace
+            spree_calculators.__send__(model_name_without_spree_namespace)
           end
 
           def calculator_type
@@ -17,13 +19,14 @@ module Spree
 
           def calculator_type=(calculator_type)
             klass = calculator_type.constantize if calculator_type
-            self.calculator = klass.new if klass && !self.calculator.is_a?(klass)
+            self.calculator = klass.new if klass && !calculator.is_a?(klass)
           end
 
-          # Creates a new adjustment for the target object (which is any class that has_many :adjustments) and
-          # sets amount based on the calculator as applied to the calculable argument (Order, LineItems[], Shipment, etc.)
+          # Creates a new adjustment for the target object
+          #   (which is any class that has_many :adjustments) and sets amount based on the
+          #   calculator as applied to the given calculable (Order, LineItems[], Shipment, etc.)
           # By default the adjustment will not be considered mandatory
-          def create_adjustment(label, target, calculable, mandatory=false, state="closed")
+          def create_adjustment(label, target, calculable, mandatory = false, state = "closed")
             # Adjustment calculations done on Spree::Shipment objects MUST
             # be done on their to_package'd variants instead
             # It's only the package that contains the correct information.
@@ -31,19 +34,21 @@ module Spree
             old_calculable = calculable
             calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
             amount = compute_amount(calculable)
-            return if amount == 0 && !mandatory
+            return if amount.zero? && !mandatory
+
             target.adjustments.create(
-              :amount => amount,
-              :source => old_calculable,
-              :originator => self,
-              :label => label,
-              :mandatory => mandatory,
-              :state => state
+              amount: amount,
+              source: old_calculable,
+              originator: self,
+              label: label,
+              mandatory: mandatory,
+              state: state
             )
           end
 
-          # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+
-          # referenced passed to the method.
+          # Updates the amount of the adjustment using our Calculator and
+          #   calling the +compute+ method with the +calculable+
+          #   referenced passed to the method.
           def update_adjustment(adjustment, calculable)
             # Adjustment calculations done on Spree::Shipment objects MUST
             # be done on their to_package'd variants instead
@@ -57,12 +62,13 @@ module Spree
           # NOTE: May be overriden by classes where this module is included into.
           # Such as Spree::Promotion::Action::CreateAdjustment.
           def compute_amount(calculable)
-            self.calculator.compute(calculable)
+            calculator.compute(calculable)
           end
 
           private
+
           def self.model_name_without_spree_namespace
-            self.to_s.tableize.gsub('/', '_').sub('spree_', '')
+            to_s.tableize.gsub('/', '_').sub('spree_', '')
           end
 
           def self.spree_calculators
diff --git a/lib/spree/core/delegate_belongs_to.rb b/lib/spree/core/delegate_belongs_to.rb
index 2adb978557..cf471ebb74 100644
--- a/lib/spree/core/delegate_belongs_to.rb
+++ b/lib/spree/core/delegate_belongs_to.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # Creates methods on object which delegate to an association proxy.
 # see delegate_belongs_to for two uses
@@ -19,14 +21,14 @@ module DelegateBelongsTo
   extend ActiveSupport::Concern
 
   module ClassMethods
-
-    @@default_rejected_delegate_columns = ['created_at','created_on','updated_at','updated_on','lock_version','type','id','position','parent_id','lft','rgt']
+    @@default_rejected_delegate_columns = ['created_at', 'created_on', 'updated_at',
+                                           'updated_on', 'lock_version', 'type', 'id',
+                                           'position', 'parent_id', 'lft', 'rgt']
     mattr_accessor :default_rejected_delegate_columns
 
     ##
     # Creates methods for accessing and setting attributes on an association.  Uses same
     # default list of attributes as delegates_to_association.
-    # @todo Integrate this with ActiveRecord::Dirty, so if you set a property through one of these setters and then call save on this object, it will save the associated object automatically.
     # delegate_belongs_to :contact
     # delegate_belongs_to :contact, [:defaults]  ## same as above, and useless
     # delegate_belongs_to :contact, [:defaults, :address, :fullname], :class_name => 'VCard'
@@ -39,51 +41,54 @@ module DelegateBelongsTo
       attrs.each do |attr|
         class_def attr do |*args|
           if args.empty?
-            send(:delegator_for, association).send(attr)
+            __send__(:delegator_for, association).__send__(attr)
           else
-            send(:delegator_for, association).send(attr, *args)
+            __send__(:delegator_for, association).__send__(attr, *args)
           end
         end
         class_def "#{attr}=" do |val|
-          send(:delegator_for, association).send("#{attr}=", val)
+          __send__(:delegator_for, association).__send__("#{attr}=", val)
         end
       end
     end
 
     protected
 
-      def get_association_column_names(association, without_default_rejected_delegate_columns=true)
-        begin
-          association_klass = reflect_on_association(association).klass
-          methods = association_klass.column_names
-          methods.reject!{|x|default_rejected_delegate_columns.include?(x.to_s)} if without_default_rejected_delegate_columns
-          return methods
-        rescue
-          return []
-        end
+    def get_association_column_names(association, without_default_rejected_delegate_columns = true)
+      association_klass = reflect_on_association(association).klass
+      methods = association_klass.column_names
+      if without_default_rejected_delegate_columns
+        methods.reject!{ |x| default_rejected_delegate_columns.include?(x.to_s) }
+      end
+      methods
+    rescue
+      []
+    end
+
+    ##
+    # initialize_association :belongs_to, :contact
+    def initialize_association(type, association, opts = {})
+      unless [:belongs_to].include?(type.to_s.to_sym)
+        raise 'Illegal or unimplemented association type.'
       end
 
-      ##
-      # initialize_association :belongs_to, :contact
-      def initialize_association(type, association, opts={})
-        raise 'Illegal or unimplemented association type.' unless [:belongs_to].include?(type.to_s.to_sym)
-        send type, association, opts if reflect_on_association(association).nil?
-      end
+      __send__(type, association, opts) if reflect_on_association(association).nil?
+    end
 
     private
 
-      def class_def(name, method=nil, &blk)
-        class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
-      end
-
+    def class_def(name, method = nil, &blk)
+      class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
+    end
   end
 
   def delegator_for(association)
-    send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
-    send(association)
+    if __send__(association).nil?
+      __send__("#{association}=", self.class.reflect_on_association(association).klass.new)
+    end
+    __send__(association)
   end
   protected :delegator_for
-
 end
 
-ActiveRecord::Base.send :include, DelegateBelongsTo
+ActiveRecord::Base.__send__(:include, DelegateBelongsTo)
diff --git a/lib/spree/core/gateway_error.rb b/lib/spree/core/gateway_error.rb
index 5a6ddda30b..f90310bc54 100644
--- a/lib/spree/core/gateway_error.rb
+++ b/lib/spree/core/gateway_error.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     class GatewayError < RuntimeError; end
diff --git a/lib/spree/core/mail_interceptor.rb b/lib/spree/core/mail_interceptor.rb
index e0a1400ab8..87ae2e33ab 100644
--- a/lib/spree/core/mail_interceptor.rb
+++ b/lib/spree/core/mail_interceptor.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Allows us to intercept any outbound mail message and make last minute changes
 # (such as specifying a "from" address or sending to a test email account)
 #
@@ -13,9 +15,9 @@ module Spree
           message.to = Config[:intercept_email]
         end
 
-        if Config[:mail_bcc].present?
-          message.bcc ||= Config[:mail_bcc]
-        end
+        return if Config[:mail_bcc].blank?
+
+        message.bcc ||= Config[:mail_bcc]
       end
     end
   end
diff --git a/lib/spree/core/mail_settings.rb b/lib/spree/core/mail_settings.rb
index 757144af8e..80664d1c64 100644
--- a/lib/spree/core/mail_settings.rb
+++ b/lib/spree/core/mail_settings.rb
@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     class MailSettings
-      MAIL_AUTH = ['None', 'plain', 'login', 'cram_md5']
-      SECURE_CONNECTION_TYPES = ['None','SSL','TLS']
+      MAIL_AUTH = ['None', 'plain', 'login', 'cram_md5'].freeze
+      SECURE_CONNECTION_TYPES = ['None', 'SSL', 'TLS'].freeze
 
       # Override the Rails application mail settings based on preferences
       # This makes it possible to configure the mail settings through an admin
       # interface instead of requiring changes to the Rails envrionment file
       def self.init
-        self.new.override! if override?
+        new.override! if override?
       end
 
       def self.override?
@@ -26,35 +28,36 @@ module Spree
       end
 
       private
-        def mail_server_settings
-          settings = if need_authentication?
-            basic_settings.merge(user_credentials)
-          else
-            basic_settings
-          end
 
-          settings.merge :enable_starttls_auto => secure_connection?
-        end
+      def mail_server_settings
+        settings = if need_authentication?
+                     basic_settings.merge(user_credentials)
+                   else
+                     basic_settings
+                   end
 
-        def user_credentials
-          { :user_name => Config.smtp_username,
-            :password => Config.smtp_password }
-        end
+        settings.merge(enable_starttls_auto: secure_connection?)
+      end
 
-        def basic_settings
-          { :address => Config.mail_host,
-            :domain => Config.mail_domain,
-            :port => Config.mail_port,
-            :authentication => Config.mail_auth_type }
-        end
+      def user_credentials
+        { user_name: Config.smtp_username,
+          password: Config.smtp_password }
+      end
 
-        def need_authentication?
-          Config.mail_auth_type != 'None'
-        end
+      def basic_settings
+        { address: Config.mail_host,
+          domain: Config.mail_domain,
+          port: Config.mail_port,
+          authentication: Config.mail_auth_type }
+      end
 
-        def secure_connection?
-          Config.secure_connection_type == 'TLS'
-        end
+      def need_authentication?
+        Config.mail_auth_type != 'None'
+      end
+
+      def secure_connection?
+        Config.secure_connection_type == 'TLS'
+      end
     end
   end
 end
diff --git a/lib/spree/core/permalinks.rb b/lib/spree/core/permalinks.rb
index 6e0fcc8735..6dc1fb9c6a 100644
--- a/lib/spree/core/permalinks.rb
+++ b/lib/spree/core/permalinks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringex'
 
 module Spree
@@ -10,23 +12,23 @@ module Spree
       end
 
       module ClassMethods
-        def make_permalink(options={})
+        def make_permalink(options = {})
           options[:field] ||= :permalink
           self.permalink_options = options
 
-          if self.connected?
-            if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
-              before_validation(:on => :create) { save_permalink }
-            end
-          end
+          return unless connected? &&
+                        table_exists? &&
+                        column_names.include?(permalink_options[:field].to_s)
+
+          before_validation(on: :create) { save_permalink }
         end
 
         def find_by_param(value, *args)
-          self.send("find_by_#{permalink_field}", value, *args)
+          __send__("find_by_#{permalink_field}", value, *args)
         end
 
         def find_by_param!(value, *args)
-          self.send("find_by_#{permalink_field}!", value, *args)
+          __send__("find_by_#{permalink_field}!", value, *args)
         end
 
         def permalink_field
@@ -44,22 +46,24 @@ module Spree
       end
 
       def generate_permalink
-        "#{self.class.permalink_prefix}#{Array.new(9){rand(9)}.join}"
+        "#{self.class.permalink_prefix}#{Array.new(9) { rand(9) }.join}"
       end
 
-      def save_permalink(permalink_value=self.to_param)
-        self.with_lock do
+      def save_permalink(permalink_value = to_param)
+        with_lock do
           permalink_value ||= generate_permalink
 
           field = self.class.permalink_field
-            # Do other links exist with this permalink?
-            other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
-            if other.any?
-              # Find the existing permalink with the highest number, and increment that number.
-              # (If none of the existing permalinks have a number, this will evaluate to 1.)
-              number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
-              permalink_value += "-#{number.to_s}"
-            end
+
+          # Do other links exist with this permalink?
+          other = self.class.
+            where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
+          if other.any?
+            # Find the existing permalink with the highest number, and increment that number.
+            # (If none of the existing permalinks have a number, this will evaluate to 1.)
+            number = other.map { |o| o.__send__(field)[/-(\d+)$/, 1].to_i }.max + 1
+            permalink_value += "-#{number}"
+          end
           write_attribute(field, permalink_value)
         end
       end
@@ -67,5 +71,5 @@ module Spree
   end
 end
 
-ActiveRecord::Base.send :include, Spree::Core::Permalinks
-ActiveRecord::Relation.send :include, Spree::Core::Permalinks
+ActiveRecord::Base.__send__ :include, Spree::Core::Permalinks
+ActiveRecord::Relation.__send__ :include, Spree::Core::Permalinks
diff --git a/lib/spree/core/s3_support.rb b/lib/spree/core/s3_support.rb
index 8ae8354391..92229c15f5 100644
--- a/lib/spree/core/s3_support.rb
+++ b/lib/spree/core/s3_support.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     # This module exists to reduce duplication in S3 settings between
@@ -9,15 +11,23 @@ module Spree
         def self.supports_s3(field)
           # Load user defined paperclip settings
           config = Spree::Config
-          if config[:use_s3]
-            s3_creds = { :access_key_id => config[:s3_access_key], :secret_access_key => config[:s3_secret], :bucket => config[:s3_bucket] }
-            self.attachment_definitions[field][:storage] = :s3
-            self.attachment_definitions[field][:s3_credentials] = s3_creds
-            self.attachment_definitions[field][:s3_headers] = ActiveSupport::JSON.decode(config[:s3_headers])
-            self.attachment_definitions[field][:bucket] = config[:s3_bucket]
-            self.attachment_definitions[field][:s3_protocol] = config[:s3_protocol].downcase unless config[:s3_protocol].blank?
-            self.attachment_definitions[field][:s3_host_alias] = config[:s3_host_alias] unless config[:s3_host_alias].blank?
+          return unless config[:use_s3]
+
+          s3_creds = { access_key_id: config[:s3_access_key],
+                       secret_access_key: config[:s3_secret],
+                       bucket: config[:s3_bucket] }
+          attachment_definitions[field][:storage] = :s3
+          attachment_definitions[field][:s3_credentials] = s3_creds
+          attachment_definitions[field][:s3_headers] = ActiveSupport::JSON.
+            decode(config[:s3_headers])
+          attachment_definitions[field][:bucket] = config[:s3_bucket]
+          if config[:s3_protocol].present?
+            attachment_definitions[field][:s3_protocol] = config[:s3_protocol].downcase
           end
+
+          return if config[:s3_host_alias].blank?
+
+          attachment_definitions[field][:s3_host_alias] = config[:s3_host_alias]
         end
       end
     end
diff --git a/lib/spree/core/token_resource.rb b/lib/spree/core/token_resource.rb
index 48697f29b2..8d4173d11b 100644
--- a/lib/spree/core/token_resource.rb
+++ b/lib/spree/core/token_resource.rb
@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module TokenResource
       module ClassMethods
         def token_resource
-          has_one :tokenized_permission, :as => :permissable
-          delegate :token, :to => :tokenized_permission, :allow_nil => true
+          has_one :tokenized_permission, as: :permissable
+          delegate :token, to: :tokenized_permission, allow_nil: true
           after_create :create_token
         end
       end
 
       def create_token
         permission = build_tokenized_permission
-        permission.token = token = ::SecureRandom::hex(8)
+        permission.token = token = ::SecureRandom.hex(8)
         permission.save!
         token
       end
@@ -24,4 +26,3 @@ module Spree
 end
 
 ActiveRecord::Base.class_eval { include Spree::Core::TokenResource }
-
diff --git a/lib/spree/product_duplicator.rb b/lib/spree/product_duplicator.rb
index f563223f70..8866f85fa5 100644
--- a/lib/spree/product_duplicator.rb
+++ b/lib/spree/product_duplicator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class ProductDuplicator
     attr_accessor :product
@@ -13,7 +15,7 @@ module Spree
       new_product.option_types = product.option_types if product.has_variants?
 
       # allow site to do some customization
-      new_product.send(:duplicate_extra, product) if new_product.respond_to?(:duplicate_extra)
+      new_product.__send__(:duplicate_extra, product) if new_product.respond_to?(:duplicate_extra)
       new_product.save!
       new_product
     end
@@ -45,7 +47,7 @@ module Spree
 
     def duplicate_image(image)
       new_image = image.dup
-      new_image.assign_attributes(:attachment => image.attachment.clone)
+      new_image.assign_attributes(attachment: image.attachment.clone)
       new_image
     end
 
diff --git a/spec/lib/spree/core/calculated_adjustments_spec.rb b/spec/lib/spree/core/calculated_adjustments_spec.rb
index eecfee445f..63cd46e4e7 100644
--- a/spec/lib/spree/core/calculated_adjustments_spec.rb
+++ b/spec/lib/spree/core/calculated_adjustments_spec.rb
@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-# Its pretty difficult to test this module in isolation b/c it needs to work in conjunction with an actual class that
-# extends ActiveRecord::Base and has a corresponding table in the database.  So we'll just test it using Order and
-# ShippingMethod instead since those classes are including the module.
+# Its pretty difficult to test this module in isolation b/c it needs to work in conjunction
+#   with an actual class that extends ActiveRecord::Base and has a corresponding table in the DB.
+#   So we'll just test it using Order and ShippingMethod. These classes are including the module.
 describe Spree::Core::CalculatedAdjustments do
-
   let(:calculator) { mock_model(Spree::Calculator, :compute => 10, :[]= => nil) }
 
   it "should add has_one :calculator relationship" do
-    assert Spree::ShippingMethod.reflect_on_all_associations(:has_one).map(&:name).include?(:calculator)
+    assert Spree::ShippingMethod.
+      reflect_on_all_associations(:has_one).map(&:name).include?(:calculator)
   end
 
-  let(:tax_rate) { Spree::TaxRate.new(:calculator => calculator) }
+  let(:tax_rate) { Spree::TaxRate.new(calculator: calculator) }
 
   context "#create_adjustment and its resulting adjustment" do
     let(:order) { Spree::Order.create }
@@ -25,9 +27,9 @@ describe Spree::Core::CalculatedAdjustments do
     it "should have the correct originator and an amount derived from the calculator and supplied calculable" do
       adjustment = tax_rate.create_adjustment("foo", target, order)
       adjustment.should_not be_nil
-      adjustment.amount.should == 10
-      adjustment.source.should == order
-      adjustment.originator.should == tax_rate
+      expect(adjustment.amount).to eq 10
+      expect(adjustment.source).to eq order
+      expect(adjustment.originator).to eq tax_rate
     end
 
     it "should be mandatory if true is supplied for that parameter" do
@@ -36,13 +38,13 @@ describe Spree::Core::CalculatedAdjustments do
     end
 
     context "when the calculator returns 0" do
-      before { calculator.stub :compute => 0 }
+      before { calculator.stub(compute: 0) }
 
       context "when adjustment is mandatory" do
         before { tax_rate.create_adjustment("foo", target, order, true) }
 
         it "should create an adjustment" do
-          Spree::Adjustment.count.should == 1
+          expect(Spree::Adjustment.count).to eq 1
         end
       end
 
@@ -50,11 +52,10 @@ describe Spree::Core::CalculatedAdjustments do
         before { tax_rate.create_adjustment("foo", target, order, false) }
 
         it "should not create an adjustment" do
-          Spree::Adjustment.count.should == 0
+          expect(Spree::Adjustment.count).to eq 0
         end
       end
     end
-
   end
 
   context "#update_adjustment" do
@@ -65,5 +66,4 @@ describe Spree::Core::CalculatedAdjustments do
       tax_rate.update_adjustment(adjustment, calculable)
     end
   end
-
 end
diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
index 9375a0471c..e60275c1b9 100644
--- a/spec/lib/spree/core/mail_interceptor_spec.rb
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # We'll use the OrderMailer as a quick and easy way to test. IF it works here
 # it works for all email (in theory.)
 describe Spree::OrderMailer do
-  let(:order) { Spree::Order.new(:email => "customer@example.com") }
+  let(:order) { Spree::Order.new(email: "customer@example.com") }
   let(:message) { Spree::OrderMailer.confirm_email(order) }
 
   before(:all) do
@@ -22,7 +24,7 @@ describe Spree::OrderMailer do
       Spree::Config[:mails_from] = "no-reply@foobar.com"
       message.deliver
       @email = ActionMailer::Base.deliveries.first
-      @email.from.should == ["no-reply@foobar.com"]
+      expect(@email.from).to eq ["no-reply@foobar.com"]
     end
 
     it "should use the provided from address" do
@@ -31,15 +33,15 @@ describe Spree::OrderMailer do
       message.to = "test@test.com"
       message.deliver
       email = ActionMailer::Base.deliveries.first
-      email.from.should == ["override@foobar.com"]
-      email.to.should == ["test@test.com"]
+      expect(email.from).to eq ["override@foobar.com"]
+      expect(email.to).to eq ["test@test.com"]
     end
 
     it "should add the bcc email when provided" do
       Spree::Config[:mail_bcc] = "bcc-foo@foobar.com"
       message.deliver
       @email = ActionMailer::Base.deliveries.first
-      @email.bcc.should == ["bcc-foo@foobar.com"]
+      expect(@email.bcc).to eq ["bcc-foo@foobar.com"]
     end
 
     context "when intercept_email is provided" do
@@ -55,14 +57,14 @@ describe Spree::OrderMailer do
         Spree::Config[:intercept_email] = "intercept@foobar.com"
         message.deliver
         @email = ActionMailer::Base.deliveries.first
-        @email.to.should == ["intercept@foobar.com"]
+        expect(@email.to).to eq ["intercept@foobar.com"]
       end
 
       it "should modify the subject to include the original email" do
         Spree::Config[:intercept_email] = "intercept@foobar.com"
         message.deliver
         @email = ActionMailer::Base.deliveries.first
-        @email.subject.match(/customer@example\.com/).should be_true
+        expect(@email.subject.match(/customer@example\.com/)).to be_true
       end
     end
 
@@ -71,7 +73,7 @@ describe Spree::OrderMailer do
         Spree::Config[:intercept_email] = ""
         message.deliver
         @email = ActionMailer::Base.deliveries.first
-        @email.to.should == ["customer@example.com"]
+        expect(@email.to).to eq ["customer@example.com"]
       end
     end
   end
diff --git a/spec/lib/spree/core/mail_settings_spec.rb b/spec/lib/spree/core/mail_settings_spec.rb
index 8528a6226d..58ea85153f 100644
--- a/spec/lib/spree/core/mail_settings_spec.rb
+++ b/spec/lib/spree/core/mail_settings_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree
@@ -20,7 +22,6 @@ module Spree
           before { Config.enable_mail_delivery = true }
 
           context "overrides appplication defaults" do
-
             context "authentication method is none" do
               before do
                 Config.mail_host = "smtp.example.com"
@@ -40,11 +41,11 @@ module Spree
               it { ActionMailer::Base.smtp_settings[:enable_starttls_auto].should be_true }
 
               it "doesnt touch user name config" do
-                ActionMailer::Base.smtp_settings[:user_name].should == nil
+                expect(ActionMailer::Base.smtp_settings[:user_name]).to be_nil
               end
 
               it "doesnt touch password config" do
-                ActionMailer::Base.smtp_settings[:password].should == nil
+                expect(ActionMailer::Base.smtp_settings[:password]).to be_nil
               end
             end
           end
diff --git a/spec/lib/spree/core/token_resource_spec.rb b/spec/lib/spree/core/token_resource_spec.rb
index 40ac8f838a..a434b94d7b 100644
--- a/spec/lib/spree/core/token_resource_spec.rb
+++ b/spec/lib/spree/core/token_resource_spec.rb
@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-# Its pretty difficult to test this module in isolation b/c it needs to work in conjunction with an actual class that
-# extends ActiveRecord::Base and has a corresponding table in the database.  So we'll just test it using Order instead
-# since those classes are including the module.
+# Its pretty difficult to test this module in isolation b/c it needs to work in conjunction
+#   with an actual class that extends ActiveRecord::Base and has a corresponding table in the DB.
+#   So we'll just test it using Order instead since it included the module.
 describe Spree::Core::TokenResource do
   let(:order) { Spree::Order.new }
   let(:permission) { mock_model(Spree::TokenizedPermission) }
 
   it 'should add has_one :tokenized_permission relationship' do
-    assert Spree::Order.reflect_on_all_associations(:has_one).map(&:name).include?(:tokenized_permission)
+    assert Spree::Order.
+      reflect_on_all_associations(:has_one).map(&:name).include?(:tokenized_permission)
   end
 
   context '#token' do
     it 'should return the token of the associated permission' do
-      order.stub :tokenized_permission => permission
-      permission.stub :token => 'foo'
+      order.stub tokenized_permission: permission
+      permission.stub token: 'foo'
       order.token.should == 'foo'
     end
 
diff --git a/spec/lib/spree/product_duplicator_spec.rb b/spec/lib/spree/product_duplicator_spec.rb
index e9fef3ae07..0a9a702eed 100644
--- a/spec/lib/spree/product_duplicator_spec.rb
+++ b/spec/lib/spree/product_duplicator_spec.rb
@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree
   describe Spree::ProductDuplicator do
     let(:product) do
       double 'Product',
-        :name => "foo",
-        :taxons => [],
-        :product_properties => [property],
-        :master => variant,
-        :has_variants? => false
+             name: "foo",
+             taxons: [],
+             product_properties: [property],
+             master: variant,
+             has_variants?: false
     end
 
     let(:new_product) do
       double 'New Product',
-        :save! => true
+             save!: true
     end
 
     let(:property) do
@@ -26,27 +28,26 @@ module Spree
 
     let(:variant) do
       double 'Variant',
-        :sku => "12345",
-        :price => 19.99,
-        :currency => "AUD",
-        :images => [image]
+             sku: "12345",
+             price: 19.99,
+             currency: "AUD",
+             images: [image]
     end
 
     let(:new_variant) do
       double 'New Variant',
-        :sku => "12345"
+             sku: "12345"
     end
 
     let(:image) do
       double 'Image',
-        :attachment => double('Attachment')
+             attachment: double('Attachment')
     end
 
     let(:new_image) do
       double 'New Image'
     end
 
-
     before do
       product.should_receive(:dup).and_return(new_product)
       variant.should_receive(:dup).and_return(new_variant)
@@ -73,7 +74,7 @@ module Spree
       image.attachment.should_receive(:clone).and_return(image.attachment)
 
       new_image.should_receive(:assign_attributes).
-        with(:attachment => image.attachment).
+        with(attachment: image.attachment).
         and_return(new_image)
 
       new_property.should_receive(:created_at=).with(nil)
@@ -81,7 +82,5 @@ module Spree
 
       duplicator.duplicate
     end
-
   end
 end
-

From 95ffff50872268e120940d3ee446b902ba530812 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 11 Jul 2020 16:59:35 +0100
Subject: [PATCH 093/340] Fix specs brought from spree

---
 .../spree/core/calculated_adjustments_spec.rb    | 14 +++++++++-----
 spec/lib/spree/core/mail_interceptor_spec.rb     |  6 +++---
 spec/lib/spree/core/mail_settings_spec.rb        | 16 ++++++++--------
 spec/lib/spree/core/token_resource_spec.rb       |  8 ++++----
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/spec/lib/spree/core/calculated_adjustments_spec.rb b/spec/lib/spree/core/calculated_adjustments_spec.rb
index 63cd46e4e7..b701fff3e0 100644
--- a/spec/lib/spree/core/calculated_adjustments_spec.rb
+++ b/spec/lib/spree/core/calculated_adjustments_spec.rb
@@ -6,15 +6,19 @@ require 'spec_helper'
 #   with an actual class that extends ActiveRecord::Base and has a corresponding table in the DB.
 #   So we'll just test it using Order and ShippingMethod. These classes are including the module.
 describe Spree::Core::CalculatedAdjustments do
-  let(:calculator) { mock_model(Spree::Calculator, :compute => 10, :[]= => nil) }
+  let(:calculator) { build(:calculator) }
+  let(:tax_rate) { Spree::TaxRate.new(calculator: calculator) }
+
+  before do
+    allow(calculator).to receive(:compute) { 10 }
+    allow(calculator).to receive(:[]) { nil }
+  end
 
   it "should add has_one :calculator relationship" do
     assert Spree::ShippingMethod.
       reflect_on_all_associations(:has_one).map(&:name).include?(:calculator)
   end
 
-  let(:tax_rate) { Spree::TaxRate.new(calculator: calculator) }
-
   context "#create_adjustment and its resulting adjustment" do
     let(:order) { Spree::Order.create }
     let(:target) { order }
@@ -26,7 +30,7 @@ describe Spree::Core::CalculatedAdjustments do
 
     it "should have the correct originator and an amount derived from the calculator and supplied calculable" do
       adjustment = tax_rate.create_adjustment("foo", target, order)
-      adjustment.should_not be_nil
+      expect(adjustment).not_to be_nil
       expect(adjustment.amount).to eq 10
       expect(adjustment.source).to eq order
       expect(adjustment.originator).to eq tax_rate
@@ -34,7 +38,7 @@ describe Spree::Core::CalculatedAdjustments do
 
     it "should be mandatory if true is supplied for that parameter" do
       adjustment = tax_rate.create_adjustment("foo", target, order, true)
-      adjustment.should be_mandatory
+      expect(adjustment).to be_mandatory
     end
 
     context "when the calculator returns 0" do
diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
index e60275c1b9..d47538cb3c 100644
--- a/spec/lib/spree/core/mail_interceptor_spec.rb
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -46,11 +46,11 @@ describe Spree::OrderMailer do
 
     context "when intercept_email is provided" do
       it "should strip the bcc recipients" do
-        message.bcc.should be_blank
+        expect(message.bcc).to be_blank
       end
 
       it "should strip the cc recipients" do
-        message.cc.should be_blank
+        expect(message.cc).to be_blank
       end
 
       it "should replace the receipient with the specified address" do
@@ -64,7 +64,7 @@ describe Spree::OrderMailer do
         Spree::Config[:intercept_email] = "intercept@foobar.com"
         message.deliver
         @email = ActionMailer::Base.deliveries.first
-        expect(@email.subject.match(/customer@example\.com/)).to be_true
+        expect(@email.subject.match(/customer@example\.com/)).to be_truthy
       end
     end
 
diff --git a/spec/lib/spree/core/mail_settings_spec.rb b/spec/lib/spree/core/mail_settings_spec.rb
index 58ea85153f..753f8465ee 100644
--- a/spec/lib/spree/core/mail_settings_spec.rb
+++ b/spec/lib/spree/core/mail_settings_spec.rb
@@ -34,11 +34,11 @@ module Spree
                 subject.override!
               end
 
-              it { ActionMailer::Base.smtp_settings[:address].should == "smtp.example.com" }
-              it { ActionMailer::Base.smtp_settings[:domain].should == "example.com" }
-              it { ActionMailer::Base.smtp_settings[:port].should == 123 }
-              it { ActionMailer::Base.smtp_settings[:authentication].should == "None" }
-              it { ActionMailer::Base.smtp_settings[:enable_starttls_auto].should be_true }
+              it { expect(ActionMailer::Base.smtp_settings[:address]).to eq "smtp.example.com" }
+              it { expect(ActionMailer::Base.smtp_settings[:domain]).to eq "example.com" }
+              it { expect(ActionMailer::Base.smtp_settings[:port]).to eq 123 }
+              it { expect(ActionMailer::Base.smtp_settings[:authentication]).to eq "None" }
+              it { expect(ActionMailer::Base.smtp_settings[:enable_starttls_auto]).to be_truthy }
 
               it "doesnt touch user name config" do
                 expect(ActionMailer::Base.smtp_settings[:user_name]).to be_nil
@@ -59,8 +59,8 @@ module Spree
             end
 
             context "overrides user credentials" do
-              it { ActionMailer::Base.smtp_settings[:user_name].should == "schof" }
-              it { ActionMailer::Base.smtp_settings[:password].should == "hellospree!" }
+              it { expect(ActionMailer::Base.smtp_settings[:user_name]).to eq "schof" }
+              it { expect(ActionMailer::Base.smtp_settings[:password]).to eq "hellospree!" }
             end
           end
         end
@@ -71,7 +71,7 @@ module Spree
             subject.override!
           end
 
-          it { ActionMailer::Base.perform_deliveries.should be_false }
+          it { expect(ActionMailer::Base.perform_deliveries).to be_falsy }
         end
       end
 
diff --git a/spec/lib/spree/core/token_resource_spec.rb b/spec/lib/spree/core/token_resource_spec.rb
index a434b94d7b..b5be7195c0 100644
--- a/spec/lib/spree/core/token_resource_spec.rb
+++ b/spec/lib/spree/core/token_resource_spec.rb
@@ -7,7 +7,7 @@ require 'spec_helper'
 #   So we'll just test it using Order instead since it included the module.
 describe Spree::Core::TokenResource do
   let(:order) { Spree::Order.new }
-  let(:permission) { mock_model(Spree::TokenizedPermission) }
+  let(:permission) { double(Spree::TokenizedPermission) }
 
   it 'should add has_one :tokenized_permission relationship' do
     assert Spree::Order.
@@ -18,18 +18,18 @@ describe Spree::Core::TokenResource do
     it 'should return the token of the associated permission' do
       order.stub tokenized_permission: permission
       permission.stub token: 'foo'
-      order.token.should == 'foo'
+      expect(order.token).to eq 'foo'
     end
 
     it 'should return nil if there is no associated permission' do
-      order.token.should be_nil
+      expect(order.token).to be_nil
     end
   end
 
   context '#create_token' do
     it 'should create a randomized 16 character token' do
       token = order.create_token
-      token.size.should == 16
+      expect(token.size).to eq 16
     end
   end
 end

From ebf9be41bbe7ff2bd8a7d780aa0fd459cf89c7bf Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 11 Jul 2020 17:02:03 +0100
Subject: [PATCH 094/340] Transpec specs

---
 .../spree/core/calculated_adjustments_spec.rb |  6 +--
 spec/lib/spree/core/mail_settings_spec.rb     |  6 +--
 spec/lib/spree/core/token_resource_spec.rb    |  4 +-
 spec/lib/spree/product_duplicator_spec.rb     | 40 +++++++++----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/spec/lib/spree/core/calculated_adjustments_spec.rb b/spec/lib/spree/core/calculated_adjustments_spec.rb
index b701fff3e0..b9210c4f29 100644
--- a/spec/lib/spree/core/calculated_adjustments_spec.rb
+++ b/spec/lib/spree/core/calculated_adjustments_spec.rb
@@ -24,7 +24,7 @@ describe Spree::Core::CalculatedAdjustments do
     let(:target) { order }
 
     it "should be associated with the target" do
-      target.adjustments.should_receive(:create)
+      expect(target.adjustments).to receive(:create)
       tax_rate.create_adjustment("foo", target, order)
     end
 
@@ -42,7 +42,7 @@ describe Spree::Core::CalculatedAdjustments do
     end
 
     context "when the calculator returns 0" do
-      before { calculator.stub(compute: 0) }
+      before { allow(calculator).to receive_messages(compute: 0) }
 
       context "when adjustment is mandatory" do
         before { tax_rate.create_adjustment("foo", target, order, true) }
@@ -66,7 +66,7 @@ describe Spree::Core::CalculatedAdjustments do
     it "should update the adjustment using its calculator (and the specified source)" do
       adjustment = double(:adjustment).as_null_object
       calculable = double :calculable
-      adjustment.should_receive(:update_column).with(:amount, 10)
+      expect(adjustment).to receive(:update_column).with(:amount, 10)
       tax_rate.update_adjustment(adjustment, calculable)
     end
   end
diff --git a/spec/lib/spree/core/mail_settings_spec.rb b/spec/lib/spree/core/mail_settings_spec.rb
index 753f8465ee..a8db4d5eed 100644
--- a/spec/lib/spree/core/mail_settings_spec.rb
+++ b/spec/lib/spree/core/mail_settings_spec.rb
@@ -12,8 +12,8 @@ module Spree
 
         context "init" do
           it "calls override!" do
-            MailSettings.should_receive(:new).and_return(subject)
-            subject.should_receive(:override!)
+            expect(MailSettings).to receive(:new).and_return(subject)
+            expect(subject).to receive(:override!)
             MailSettings.init
           end
         end
@@ -80,7 +80,7 @@ module Spree
 
         context "init" do
           it "doesnt calls override!" do
-            subject.should_not_receive(:override!)
+            expect(subject).not_to receive(:override!)
             MailSettings.init
           end
         end
diff --git a/spec/lib/spree/core/token_resource_spec.rb b/spec/lib/spree/core/token_resource_spec.rb
index b5be7195c0..087c5b9350 100644
--- a/spec/lib/spree/core/token_resource_spec.rb
+++ b/spec/lib/spree/core/token_resource_spec.rb
@@ -16,8 +16,8 @@ describe Spree::Core::TokenResource do
 
   context '#token' do
     it 'should return the token of the associated permission' do
-      order.stub tokenized_permission: permission
-      permission.stub token: 'foo'
+      allow(order).to receive_messages tokenized_permission: permission
+      allow(permission).to receive_messages token: 'foo'
       expect(order.token).to eq 'foo'
     end
 
diff --git a/spec/lib/spree/product_duplicator_spec.rb b/spec/lib/spree/product_duplicator_spec.rb
index 0a9a702eed..7978465a5e 100644
--- a/spec/lib/spree/product_duplicator_spec.rb
+++ b/spec/lib/spree/product_duplicator_spec.rb
@@ -49,36 +49,36 @@ module Spree
     end
 
     before do
-      product.should_receive(:dup).and_return(new_product)
-      variant.should_receive(:dup).and_return(new_variant)
-      image.should_receive(:dup).and_return(new_image)
-      property.should_receive(:dup).and_return(new_property)
+      expect(product).to receive(:dup).and_return(new_product)
+      expect(variant).to receive(:dup).and_return(new_variant)
+      expect(image).to receive(:dup).and_return(new_image)
+      expect(property).to receive(:dup).and_return(new_property)
     end
 
     it "can duplicate a product" do
       duplicator = Spree::ProductDuplicator.new(product)
-      new_product.should_receive(:name=).with("COPY OF foo")
-      new_product.should_receive(:taxons=).with([])
-      new_product.should_receive(:product_properties=).with([new_property])
-      new_product.should_receive(:created_at=).with(nil)
-      new_product.should_receive(:updated_at=).with(nil)
-      new_product.should_receive(:deleted_at=).with(nil)
-      new_product.should_receive(:master=).with(new_variant)
+      expect(new_product).to receive(:name=).with("COPY OF foo")
+      expect(new_product).to receive(:taxons=).with([])
+      expect(new_product).to receive(:product_properties=).with([new_property])
+      expect(new_product).to receive(:created_at=).with(nil)
+      expect(new_product).to receive(:updated_at=).with(nil)
+      expect(new_product).to receive(:deleted_at=).with(nil)
+      expect(new_product).to receive(:master=).with(new_variant)
 
-      new_variant.should_receive(:sku=).with("COPY OF 12345")
-      new_variant.should_receive(:deleted_at=).with(nil)
-      new_variant.should_receive(:images=).with([new_image])
-      new_variant.should_receive(:price=).with(variant.price)
-      new_variant.should_receive(:currency=).with(variant.currency)
+      expect(new_variant).to receive(:sku=).with("COPY OF 12345")
+      expect(new_variant).to receive(:deleted_at=).with(nil)
+      expect(new_variant).to receive(:images=).with([new_image])
+      expect(new_variant).to receive(:price=).with(variant.price)
+      expect(new_variant).to receive(:currency=).with(variant.currency)
 
-      image.attachment.should_receive(:clone).and_return(image.attachment)
+      expect(image.attachment).to receive(:clone).and_return(image.attachment)
 
-      new_image.should_receive(:assign_attributes).
+      expect(new_image).to receive(:assign_attributes).
         with(attachment: image.attachment).
         and_return(new_image)
 
-      new_property.should_receive(:created_at=).with(nil)
-      new_property.should_receive(:updated_at=).with(nil)
+      expect(new_property).to receive(:created_at=).with(nil)
+      expect(new_property).to receive(:updated_at=).with(nil)
 
       duplicator.duplicate
     end

From f4cb14ab1a1847809003a17c1c14ec5086d7ba0d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 14 Jul 2020 00:10:40 +0000
Subject: [PATCH 095/340] Bump oj from 3.10.6 to 3.10.7

Bumps [oj](https://github.com/ohler55/oj) from 3.10.6 to 3.10.7.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.6...v3.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b627cb940..537c4f330d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -478,7 +478,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.6)
+    oj (3.10.7)
     optimist (3.0.0)
     orm_adapter (0.5.0)
     paper_trail (5.2.3)

From 60870a1215af3abb5d093ef873035403a1c6fb7a Mon Sep 17 00:00:00 2001
From: Steve Roberts <steve@commoncode.io>
Date: Tue, 14 Jul 2020 12:58:48 +1000
Subject: [PATCH 096/340] Fix linting errors

---
 app/assets/stylesheets/darkswarm/layout/offcanvas.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/layout/offcanvas.scss b/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
index f6fe7a0455..83c488afab 100644
--- a/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
+++ b/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
@@ -15,6 +15,7 @@
   transform: none;
   margin-left: -15.625rem;
 }
+
 .off-canvas-wrap .inner-wrap {
-  max-height:100%;
-}
\ No newline at end of file
+  max-height: 100%;
+}

From f79269e96bdb00ba31917be5b49a5184525909be Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 14 Jul 2020 17:46:12 +1000
Subject: [PATCH 097/340] Updating translations for config/locales/ca.yml

---
 config/locales/ca.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index a71b762573..2bc956f2ba 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -182,6 +182,7 @@ ca:
         explainer: El processament automàtic d'aquestes comandes va fallar per un motiu desconegut. Això no hauria de passar, si us plau, contacteu amb nosaltres si esteu veient això.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Benvingut a "
   site_meta_description: "Comencem des de baix. Amb agricultors i productors disposats a explicar les seves històries amb orgull i sinceritat. Amb distribuïdors connectant persones i productes de manera justa i honesta. Amb compradors que creuen que millors decisions de compra setmanal poden ..."
   search_by_name: Cercar per nom o barri ...
   producers_join: Els productors australians son ara benvinguts a unir-se a Open Food Network.
@@ -1716,6 +1717,7 @@ ca:
   remember_me: Recorda'm
   are_you_sure: "Estàs segur?"
   orders_open: "Comandes obertes"
+  closing: "Tancant"
   going_back_to_home_page: "Tornant a la pàgina d'inici"
   creating: Creant
   updating: Actualitzant
@@ -2073,6 +2075,7 @@ ca:
   hub_sidebar_at_least: "Cal seleccionar almenys un grup "
   hub_sidebar_blue: "blau"
   hub_sidebar_red: "vermell"
+  order_cycles_closed_for_hub: "La botiga que has triat està temporalment tancada per a fer comandes. Sisplau, prova una mica més tard"
   report_customers_distributor: "Distribuïdora"
   report_customers_supplier: "Proveïdora"
   report_customers_cycle: "Cicle de Comanda"
@@ -2309,6 +2312,7 @@ ca:
   order_cycles_email_to_producers_notice: 'Els correus electrònics per enviar a les productores estan en cua.'
   order_cycles_no_permission_to_coordinate_error: "Cap de les vostres organitzacions té permís per coordinar un cicle de comanda"
   order_cycles_no_permission_to_create_error: "No teniu permís per crear un cicle de comandes coordinat per aquesta organització"
+  order_cycle_closed: "El cicle de comandes que has triat acaba de tancar. Sisplau prova en un altre moment."
   back_to_orders_list: "Torna a la llista de comandes"
   no_orders_found: "No s'han trobat comandes"
   order_information: "Informació de la comanda"

From c4d7899a99c5607a0ec3d05acd815e17529b9a8e Mon Sep 17 00:00:00 2001
From: Steve Roberts <steve@commoncode.io>
Date: Tue, 14 Jul 2020 19:26:12 +1000
Subject: [PATCH 098/340] Use vh units for new browsers and align tagline bg to
 top.

---
 app/assets/stylesheets/darkswarm/home_tagline.scss     | 3 ++-
 app/assets/stylesheets/darkswarm/layout/offcanvas.scss | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/home_tagline.scss b/app/assets/stylesheets/darkswarm/home_tagline.scss
index c6cc15c9e8..ac187c38f5 100644
--- a/app/assets/stylesheets/darkswarm/home_tagline.scss
+++ b/app/assets/stylesheets/darkswarm/home_tagline.scss
@@ -17,10 +17,11 @@
     position: fixed;
     left: 0;
     right: 0;
-    bottom: 0;
+    top: 0;
     z-index: -1;
     width: 100%;
     height: 100%;
+    height: 100vh;
   }
 
   h1 {
diff --git a/app/assets/stylesheets/darkswarm/layout/offcanvas.scss b/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
index 83c488afab..de54f0ef54 100644
--- a/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
+++ b/app/assets/stylesheets/darkswarm/layout/offcanvas.scss
@@ -15,7 +15,3 @@
   transform: none;
   margin-left: -15.625rem;
 }
-
-.off-canvas-wrap .inner-wrap {
-  max-height: 100%;
-}

From c6cd695b3c901f66bf4194521c5599caaf659736 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 13:28:11 +0100
Subject: [PATCH 099/340] Bring remaing mailers from spree_core

---
 app/mailers/spree/base_mailer.rb             |  12 ++
 app/mailers/spree/order_mailer.rb            |  17 +++
 app/mailers/spree/shipment_mailer.rb         |  10 ++
 app/mailers/spree/test_mailer.rb             |   9 ++
 spec/mailers/order_mailer_from_spree_spec.rb | 120 +++++++++++++++++++
 spec/mailers/shipment_mailer_spec.rb         |  59 +++++++++
 spec/mailers/test_mailer_spec.rb             |  23 ++++
 7 files changed, 250 insertions(+)
 create mode 100644 app/mailers/spree/base_mailer.rb
 create mode 100644 app/mailers/spree/order_mailer.rb
 create mode 100644 app/mailers/spree/shipment_mailer.rb
 create mode 100644 app/mailers/spree/test_mailer.rb
 create mode 100644 spec/mailers/order_mailer_from_spree_spec.rb
 create mode 100644 spec/mailers/shipment_mailer_spec.rb
 create mode 100644 spec/mailers/test_mailer_spec.rb

diff --git a/app/mailers/spree/base_mailer.rb b/app/mailers/spree/base_mailer.rb
new file mode 100644
index 0000000000..7d35ecdd43
--- /dev/null
+++ b/app/mailers/spree/base_mailer.rb
@@ -0,0 +1,12 @@
+module Spree
+  class BaseMailer < ActionMailer::Base
+    def from_address
+      Spree::Config[:mails_from]
+    end
+
+    def money(amount)
+      Spree::Money.new(amount).to_s
+    end
+    helper_method :money
+  end
+end
diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb
new file mode 100644
index 0000000000..1af6b31cb4
--- /dev/null
+++ b/app/mailers/spree/order_mailer.rb
@@ -0,0 +1,17 @@
+module Spree
+  class OrderMailer < BaseMailer
+    def confirm_email(order, resend = false)
+      @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
+      mail(to: @order.email, from: from_address, subject: subject)
+    end
+
+    def cancel_email(order, resend = false)
+      @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
+      mail(to: @order.email, from: from_address, subject: subject)
+    end
+  end
+end
diff --git a/app/mailers/spree/shipment_mailer.rb b/app/mailers/spree/shipment_mailer.rb
new file mode 100644
index 0000000000..d9f00671a1
--- /dev/null
+++ b/app/mailers/spree/shipment_mailer.rb
@@ -0,0 +1,10 @@
+module Spree
+  class ShipmentMailer < BaseMailer
+    def shipped_email(shipment, resend = false)
+      @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
+      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      subject += "#{Spree::Config[:site_name]} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
+      mail(to: @shipment.order.email, from: from_address, subject: subject)
+    end
+  end
+end
diff --git a/app/mailers/spree/test_mailer.rb b/app/mailers/spree/test_mailer.rb
new file mode 100644
index 0000000000..8a54742722
--- /dev/null
+++ b/app/mailers/spree/test_mailer.rb
@@ -0,0 +1,9 @@
+module Spree
+  class TestMailer < BaseMailer
+    def test_email(user)
+      recipient = user.respond_to?(:id) ? user : Spree.user_class.find(user)
+      subject = "#{Spree::Config[:site_name]} #{Spree.t('test_mailer.test_email.subject')}"
+      mail(to: recipient.email, from: from_address, subject: subject)
+    end
+  end
+end
diff --git a/spec/mailers/order_mailer_from_spree_spec.rb b/spec/mailers/order_mailer_from_spree_spec.rb
new file mode 100644
index 0000000000..399c097fd4
--- /dev/null
+++ b/spec/mailers/order_mailer_from_spree_spec.rb
@@ -0,0 +1,120 @@
+require 'spec_helper'
+require 'email_spec'
+
+describe Spree::OrderMailer do
+  include EmailSpec::Helpers
+  include EmailSpec::Matchers
+
+  let(:order) do
+    order = stub_model(Spree::Order)
+    product = stub_model(Spree::Product, :name => %Q{The "BEST" product})
+    variant = stub_model(Spree::Variant, :product => product)
+    price = stub_model(Spree::Price, :variant => variant, :amount => 5.00)
+    line_item = stub_model(Spree::LineItem, :variant => variant, :order => order, :quantity => 1, :price => 4.99)
+    variant.stub(:default_price => price)
+    order.stub(:line_items => [line_item])
+    order
+  end
+
+  context ":from not set explicitly" do
+    it "falls back to spree config" do
+      message = Spree::OrderMailer.confirm_email(order)
+      message.from.should == [Spree::Config[:mails_from]]
+    end
+  end
+
+  it "doesn't aggressively escape double quotes in confirmation body" do
+    confirmation_email = Spree::OrderMailer.confirm_email(order)
+    confirmation_email.body.should_not include("&quot;")
+  end
+
+  it "confirm_email accepts an order id as an alternative to an Order object" do
+    Spree::Order.should_receive(:find).with(order.id).and_return(order)
+    lambda {
+      confirmation_email = Spree::OrderMailer.confirm_email(order.id)
+    }.should_not raise_error
+  end
+
+  it "cancel_email accepts an order id as an alternative to an Order object" do
+    Spree::Order.should_receive(:find).with(order.id).and_return(order)
+    lambda {
+      cancel_email = Spree::OrderMailer.cancel_email(order.id)
+    }.should_not raise_error
+  end
+
+  context "only shows eligible adjustments in emails" do
+    before do
+      order.adjustments.create(
+        :label    => "Eligible Adjustment",
+        :amount   => 10,
+        :eligible => true
+      )
+
+      order.adjustments.create!(
+        :label    => "Ineligible Adjustment",
+        :amount   => -10,
+        :eligible => false
+      )
+    end
+
+    let!(:confirmation_email) { Spree::OrderMailer.confirm_email(order) }
+    let!(:cancel_email) { Spree::OrderMailer.cancel_email(order) }
+
+    specify do
+      confirmation_email.body.should_not include("Ineligible Adjustment")
+    end
+
+    specify do
+      cancel_email.body.should_not include("Ineligible Adjustment")
+    end
+  end
+
+  context "displays unit costs from line item" do
+    # Regression test for #2772
+
+    # Tests mailer view spree/order_mailer/confirm_email.text.erb
+    specify do
+      confirmation_email = Spree::OrderMailer.confirm_email(order)
+      confirmation_email.body.should include("4.99")
+      confirmation_email.body.should_not include("5.00")
+    end
+
+    # Tests mailer view spree/order_mailer/cancel_email.text.erb
+    specify do
+      cancel_email = Spree::OrderMailer.cancel_email(order)
+      cancel_email.body.should include("4.99")
+      cancel_email.body.should_not include("5.00")
+    end
+  end
+
+  context "emails must be translatable" do
+
+    context "pt-BR locale" do
+      before do
+        pt_br_confirm_mail = { :spree => { :order_mailer => { :confirm_email => { :dear_customer => 'Caro Cliente,' } } } }
+        pt_br_cancel_mail = { :spree => { :order_mailer => { :cancel_email => { :order_summary_canceled => 'Resumo da Pedido [CANCELADA]' } } } }
+        I18n.backend.store_translations :'pt-BR', pt_br_confirm_mail
+        I18n.backend.store_translations :'pt-BR', pt_br_cancel_mail
+        I18n.locale = :'pt-BR'
+      end
+
+      after do
+        I18n.locale = I18n.default_locale
+      end
+
+      context "confirm_email" do
+        specify do
+          confirmation_email = Spree::OrderMailer.confirm_email(order)
+          confirmation_email.body.should include("Caro Cliente,")
+        end
+      end
+
+      context "cancel_email" do
+        specify do
+          cancel_email = Spree::OrderMailer.cancel_email(order)
+          cancel_email.body.should include("Resumo da Pedido [CANCELADA]")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/mailers/shipment_mailer_spec.rb b/spec/mailers/shipment_mailer_spec.rb
new file mode 100644
index 0000000000..c7a0da6172
--- /dev/null
+++ b/spec/mailers/shipment_mailer_spec.rb
@@ -0,0 +1,59 @@
+require 'spec_helper'
+require 'email_spec'
+
+describe Spree::ShipmentMailer do
+  include EmailSpec::Helpers
+  include EmailSpec::Matchers
+
+  let(:shipment) do
+    order = stub_model(Spree::Order)
+    product = stub_model(Spree::Product, :name => %Q{The "BEST" product})
+    variant = stub_model(Spree::Variant, :product => product)
+    line_item = stub_model(Spree::LineItem, :variant => variant, :order => order, :quantity => 1, :price => 5)
+    shipment = stub_model(Spree::Shipment)
+    shipment.stub(:line_items => [line_item], :order => order)
+    shipment.stub(:tracking_url => "TRACK_ME")
+    shipment
+  end
+
+  context ":from not set explicitly" do
+    it "falls back to spree config" do
+      message = Spree::ShipmentMailer.shipped_email(shipment)
+      message.from.should == [Spree::Config[:mails_from]]
+    end
+  end
+
+  # Regression test for #2196
+  it "doesn't include out of stock in the email body" do
+    shipment_email = Spree::ShipmentMailer.shipped_email(shipment)
+    shipment_email.body.should_not include(%Q{Out of Stock})
+  end
+
+  it "shipment_email accepts an shipment id as an alternative to an Shipment object" do
+    Spree::Shipment.should_receive(:find).with(shipment.id).and_return(shipment)
+    lambda {
+      shipped_email = Spree::ShipmentMailer.shipped_email(shipment.id)
+    }.should_not raise_error
+  end
+
+  context "emails must be translatable" do
+    context "shipped_email" do
+      context "pt-BR locale" do
+        before do
+          pt_br_shipped_email = { :spree => { :shipment_mailer => { :shipped_email => { :dear_customer => 'Caro Cliente,' } } } }
+          I18n.backend.store_translations :'pt-BR', pt_br_shipped_email
+          I18n.locale = :'pt-BR'
+        end
+
+        after do
+          I18n.locale = I18n.default_locale
+        end
+
+        specify do
+          shipped_email = Spree::ShipmentMailer.shipped_email(shipment)
+          shipped_email.body.should include("Caro Cliente,")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb
new file mode 100644
index 0000000000..6ed147ad10
--- /dev/null
+++ b/spec/mailers/test_mailer_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'email_spec'
+
+describe Spree::TestMailer do
+  include EmailSpec::Helpers
+  include EmailSpec::Matchers
+
+  let(:user) { create(:user) }
+
+  context ":from not set explicitly" do
+    it "falls back to spree config" do
+      message = Spree::TestMailer.test_email(user)
+      message.from.should == [Spree::Config[:mails_from]]
+    end
+  end
+
+  it "confirm_email accepts a user id as an alternative to a User object" do
+    Spree.user_class.should_receive(:find).with(user.id).and_return(user)
+    lambda {
+      test_email = Spree::TestMailer.test_email(user.id)
+    }.should_not raise_error
+  end
+end
\ No newline at end of file

From d12495f3db05ba7ba824cdda411ffeee675bb136 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 13:38:11 +0100
Subject: [PATCH 100/340] Merge decorators with original classes brought from
 spree and merge order_mailer specs

---
 app/mailers/spree/base_mailer.rb             |  13 ++
 app/mailers/spree/base_mailer_decorator.rb   |  14 ---
 app/mailers/spree/order_mailer.rb            |  69 +++++++++--
 app/mailers/spree/order_mailer_decorator.rb  |  64 ----------
 spec/mailers/order_mailer_from_spree_spec.rb | 120 -------------------
 spec/mailers/order_mailer_spec.rb            | 110 +++++++++++++++++
 6 files changed, 182 insertions(+), 208 deletions(-)
 delete mode 100644 app/mailers/spree/base_mailer_decorator.rb
 delete mode 100644 app/mailers/spree/order_mailer_decorator.rb
 delete mode 100644 spec/mailers/order_mailer_from_spree_spec.rb

diff --git a/app/mailers/spree/base_mailer.rb b/app/mailers/spree/base_mailer.rb
index 7d35ecdd43..5d6e616b1f 100644
--- a/app/mailers/spree/base_mailer.rb
+++ b/app/mailers/spree/base_mailer.rb
@@ -1,5 +1,11 @@
 module Spree
   class BaseMailer < ActionMailer::Base
+    # Inline stylesheets
+    include Roadie::Rails::Automatic
+
+    # Define layout
+    layout 'mailer'
+
     def from_address
       Spree::Config[:mails_from]
     end
@@ -8,5 +14,12 @@ module Spree
       Spree::Money.new(amount).to_s
     end
     helper_method :money
+
+    protected
+
+    def roadie_options
+      # This lets us specify assets using relative paths in email templates
+      super.merge(url_options: { host: URI(main_app.root_url).host })
+    end
   end
 end
diff --git a/app/mailers/spree/base_mailer_decorator.rb b/app/mailers/spree/base_mailer_decorator.rb
deleted file mode 100644
index 4c15268676..0000000000
--- a/app/mailers/spree/base_mailer_decorator.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-Spree::BaseMailer.class_eval do
-  # Inline stylesheets
-  include Roadie::Rails::Automatic
-
-  # Define layout
-  layout 'mailer'
-
-  protected
-
-  def roadie_options
-    # This lets us specify assets using relative paths in email templates
-    super.merge(url_options: { host: URI(main_app.root_url).host })
-  end
-end
diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb
index 1af6b31cb4..cb90f25b68 100644
--- a/app/mailers/spree/order_mailer.rb
+++ b/app/mailers/spree/order_mailer.rb
@@ -1,17 +1,66 @@
 module Spree
   class OrderMailer < BaseMailer
-    def confirm_email(order, resend = false)
-      @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+    helper HtmlHelper
+    helper CheckoutHelper
+    helper SpreeCurrencyHelper
+    helper OrderHelper
+    include I18nHelper
+
+    def cancel_email(order_or_order_id, resend = false)
+      @order = find_order(order_or_order_id)
+      I18n.with_locale valid_locale(@order.user) do
+        mail(to: @order.email,
+             from: from_address,
+             subject: mail_subject(t('spree.order_mailer.cancel_email.subject'), resend))
+      end
     end
 
-    def cancel_email(order, resend = false)
-      @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+    def confirm_email_for_customer(order_or_order_id, resend = false)
+      @order = find_order(order_or_order_id)
+      I18n.with_locale valid_locale(@order.user) do
+        subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
+        mail(to: @order.email,
+             from: from_address,
+             subject: subject,
+             reply_to: @order.distributor.contact.email)
+      end
+    end
+
+    def confirm_email_for_shop(order_or_order_id, resend = false)
+      @order = find_order(order_or_order_id)
+      I18n.with_locale valid_locale(@order.user) do
+        subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
+        mail(to: @order.distributor.contact.email,
+             from: from_address,
+             subject: subject)
+      end
+    end
+
+    def invoice_email(order_or_order_id, pdf)
+      @order = find_order(order_or_order_id)
+      attach_file("invoice-#{@order.number}.pdf", pdf)
+      I18n.with_locale valid_locale(@order.user) do
+        mail(to: @order.email,
+             from: from_address,
+             subject: mail_subject(t(:invoice), false),
+             reply_to: @order.distributor.contact.email)
+      end
+    end
+
+    private
+
+    # Finds an order instance from an order or from an order id
+    def find_order(order_or_order_id)
+      order_or_order_id.respond_to?(:id) ? order_or_order_id : Spree::Order.find(order_or_order_id)
+    end
+
+    def mail_subject(base_subject, resend)
+      resend_prefix = (resend ? "[#{t(:resend).upcase}] " : '')
+      "#{resend_prefix}#{Spree::Config[:site_name]} #{base_subject} ##{@order.number}"
+    end
+
+    def attach_file(filename, file)
+      attachments[filename] = file if file.present?
     end
   end
 end
diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb
deleted file mode 100644
index fbf17013b8..0000000000
--- a/app/mailers/spree/order_mailer_decorator.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-Spree::OrderMailer.class_eval do
-  helper HtmlHelper
-  helper CheckoutHelper
-  helper SpreeCurrencyHelper
-  helper OrderHelper
-  include I18nHelper
-
-  def cancel_email(order_or_order_id, resend = false)
-    @order = find_order(order_or_order_id)
-    I18n.with_locale valid_locale(@order.user) do
-      mail(to: @order.email,
-           from: from_address,
-           subject: mail_subject(t('spree.order_mailer.cancel_email.subject'), resend))
-    end
-  end
-
-  def confirm_email_for_customer(order_or_order_id, resend = false)
-    @order = find_order(order_or_order_id)
-    I18n.with_locale valid_locale(@order.user) do
-      subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
-      mail(to: @order.email,
-           from: from_address,
-           subject: subject,
-           reply_to: @order.distributor.contact.email)
-    end
-  end
-
-  def confirm_email_for_shop(order_or_order_id, resend = false)
-    @order = find_order(order_or_order_id)
-    I18n.with_locale valid_locale(@order.user) do
-      subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
-      mail(to: @order.distributor.contact.email,
-           from: from_address,
-           subject: subject)
-    end
-  end
-
-  def invoice_email(order_or_order_id, pdf)
-    @order = find_order(order_or_order_id)
-    attach_file("invoice-#{@order.number}.pdf", pdf)
-    I18n.with_locale valid_locale(@order.user) do
-      mail(to: @order.email,
-           from: from_address,
-           subject: mail_subject(t(:invoice), false),
-           reply_to: @order.distributor.contact.email)
-    end
-  end
-
-  private
-
-  # Finds an order instance from an order or from an order id
-  def find_order(order_or_order_id)
-    order_or_order_id.respond_to?(:id) ? order_or_order_id : Spree::Order.find(order_or_order_id)
-  end
-
-  def mail_subject(base_subject, resend)
-    resend_prefix = (resend ? "[#{t(:resend).upcase}] " : '')
-    "#{resend_prefix}#{Spree::Config[:site_name]} #{base_subject} ##{@order.number}"
-  end
-
-  def attach_file(filename, file)
-    attachments[filename] = file if file.present?
-  end
-end
diff --git a/spec/mailers/order_mailer_from_spree_spec.rb b/spec/mailers/order_mailer_from_spree_spec.rb
deleted file mode 100644
index 399c097fd4..0000000000
--- a/spec/mailers/order_mailer_from_spree_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper'
-require 'email_spec'
-
-describe Spree::OrderMailer do
-  include EmailSpec::Helpers
-  include EmailSpec::Matchers
-
-  let(:order) do
-    order = stub_model(Spree::Order)
-    product = stub_model(Spree::Product, :name => %Q{The "BEST" product})
-    variant = stub_model(Spree::Variant, :product => product)
-    price = stub_model(Spree::Price, :variant => variant, :amount => 5.00)
-    line_item = stub_model(Spree::LineItem, :variant => variant, :order => order, :quantity => 1, :price => 4.99)
-    variant.stub(:default_price => price)
-    order.stub(:line_items => [line_item])
-    order
-  end
-
-  context ":from not set explicitly" do
-    it "falls back to spree config" do
-      message = Spree::OrderMailer.confirm_email(order)
-      message.from.should == [Spree::Config[:mails_from]]
-    end
-  end
-
-  it "doesn't aggressively escape double quotes in confirmation body" do
-    confirmation_email = Spree::OrderMailer.confirm_email(order)
-    confirmation_email.body.should_not include("&quot;")
-  end
-
-  it "confirm_email accepts an order id as an alternative to an Order object" do
-    Spree::Order.should_receive(:find).with(order.id).and_return(order)
-    lambda {
-      confirmation_email = Spree::OrderMailer.confirm_email(order.id)
-    }.should_not raise_error
-  end
-
-  it "cancel_email accepts an order id as an alternative to an Order object" do
-    Spree::Order.should_receive(:find).with(order.id).and_return(order)
-    lambda {
-      cancel_email = Spree::OrderMailer.cancel_email(order.id)
-    }.should_not raise_error
-  end
-
-  context "only shows eligible adjustments in emails" do
-    before do
-      order.adjustments.create(
-        :label    => "Eligible Adjustment",
-        :amount   => 10,
-        :eligible => true
-      )
-
-      order.adjustments.create!(
-        :label    => "Ineligible Adjustment",
-        :amount   => -10,
-        :eligible => false
-      )
-    end
-
-    let!(:confirmation_email) { Spree::OrderMailer.confirm_email(order) }
-    let!(:cancel_email) { Spree::OrderMailer.cancel_email(order) }
-
-    specify do
-      confirmation_email.body.should_not include("Ineligible Adjustment")
-    end
-
-    specify do
-      cancel_email.body.should_not include("Ineligible Adjustment")
-    end
-  end
-
-  context "displays unit costs from line item" do
-    # Regression test for #2772
-
-    # Tests mailer view spree/order_mailer/confirm_email.text.erb
-    specify do
-      confirmation_email = Spree::OrderMailer.confirm_email(order)
-      confirmation_email.body.should include("4.99")
-      confirmation_email.body.should_not include("5.00")
-    end
-
-    # Tests mailer view spree/order_mailer/cancel_email.text.erb
-    specify do
-      cancel_email = Spree::OrderMailer.cancel_email(order)
-      cancel_email.body.should include("4.99")
-      cancel_email.body.should_not include("5.00")
-    end
-  end
-
-  context "emails must be translatable" do
-
-    context "pt-BR locale" do
-      before do
-        pt_br_confirm_mail = { :spree => { :order_mailer => { :confirm_email => { :dear_customer => 'Caro Cliente,' } } } }
-        pt_br_cancel_mail = { :spree => { :order_mailer => { :cancel_email => { :order_summary_canceled => 'Resumo da Pedido [CANCELADA]' } } } }
-        I18n.backend.store_translations :'pt-BR', pt_br_confirm_mail
-        I18n.backend.store_translations :'pt-BR', pt_br_cancel_mail
-        I18n.locale = :'pt-BR'
-      end
-
-      after do
-        I18n.locale = I18n.default_locale
-      end
-
-      context "confirm_email" do
-        specify do
-          confirmation_email = Spree::OrderMailer.confirm_email(order)
-          confirmation_email.body.should include("Caro Cliente,")
-        end
-      end
-
-      context "cancel_email" do
-        specify do
-          cancel_email = Spree::OrderMailer.cancel_email(order)
-          cancel_email.body.should include("Resumo da Pedido [CANCELADA]")
-        end
-      end
-    end
-  end
-end
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index deb5230f81..3af2b50339 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -3,6 +3,116 @@ require 'spec_helper'
 describe Spree::OrderMailer do
   include OpenFoodNetwork::EmailHelper
 
+  contect "original spree specs" do
+    let(:order) do
+      order = stub_model(Spree::Order)
+      product = stub_model(Spree::Product, :name => %Q{The "BEST" product})
+      variant = stub_model(Spree::Variant, :product => product)
+      price = stub_model(Spree::Price, :variant => variant, :amount => 5.00)
+      line_item = stub_model(Spree::LineItem, :variant => variant, :order => order, :quantity => 1, :price => 4.99)
+      variant.stub(:default_price => price)
+      order.stub(:line_items => [line_item])
+      order
+    end
+
+    context ":from not set explicitly" do
+      it "falls back to spree config" do
+        message = Spree::OrderMailer.confirm_email_for_customer(order)
+        message.from.should == [Spree::Config[:mails_from]]
+      end
+    end
+
+    it "doesn't aggressively escape double quotes in confirmation body" do
+      confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order)
+      confirmation_email.body.should_not include("&quot;")
+    end
+
+    it "confirm_email_for_customer accepts an order id as an alternative to an Order object" do
+      Spree::Order.should_receive(:find).with(order.id).and_return(order)
+      lambda {
+        confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order.id)
+      }.should_not raise_error
+    end
+
+    it "cancel_email accepts an order id as an alternative to an Order object" do
+      Spree::Order.should_receive(:find).with(order.id).and_return(order)
+      lambda {
+        cancel_email = Spree::OrderMailer.cancel_email(order.id)
+      }.should_not raise_error
+    end
+
+    context "only shows eligible adjustments in emails" do
+      before do
+        order.adjustments.create(
+          :label    => "Eligible Adjustment",
+          :amount   => 10,
+          :eligible => true
+        )
+
+        order.adjustments.create!(
+          :label    => "Ineligible Adjustment",
+          :amount   => -10,
+          :eligible => false
+        )
+      end
+
+      let!(:confirmation_email) { Spree::OrderMailer.confirm_email(order) }
+      let!(:cancel_email) { Spree::OrderMailer.cancel_email(order) }
+
+      specify do
+        confirmation_email.body.should_not include("Ineligible Adjustment")
+      end
+
+      specify do
+        cancel_email.body.should_not include("Ineligible Adjustment")
+      end
+    end
+
+    context "displays unit costs from line item" do
+      specify do
+        confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order)
+        confirmation_email.body.should include("4.99")
+        confirmation_email.body.should_not include("5.00")
+      end
+
+      specify do
+        cancel_email = Spree::OrderMailer.cancel_email(order)
+        cancel_email.body.should include("4.99")
+        cancel_email.body.should_not include("5.00")
+      end
+    end
+
+    context "emails must be translatable" do
+      context "pt-BR locale" do
+        before do
+          pt_br_confirm_mail = { :spree => { :order_mailer => { :confirm_email => { :dear_customer => 'Caro Cliente,' } } } }
+          pt_br_cancel_mail = { :spree => { :order_mailer => { :cancel_email => { :order_summary_canceled => 'Resumo da Pedido [CANCELADA]' } } } }
+          I18n.backend.store_translations :'pt-BR', pt_br_confirm_mail
+          I18n.backend.store_translations :'pt-BR', pt_br_cancel_mail
+          I18n.locale = :'pt-BR'
+        end
+
+        after do
+          I18n.locale = I18n.default_locale
+        end
+
+        context "confirm_email" do
+          specify do
+            confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order)
+            confirmation_email.body.should include("Caro Cliente,")
+          end
+        end
+
+        context "cancel_email" do
+          specify do
+            cancel_email = Spree::OrderMailer.cancel_email(order)
+            cancel_email.body.should include("Resumo da Pedido [CANCELADA]")
+          end
+        end
+      end
+    end
+  end
+
   describe "order confimation" do
     let(:bill_address) { create(:address) }
     let(:distributor_address) { create(:address, address1: "distributor address", city: 'The Shire', zipcode: "1234") }

From 5162964936781fe4a49cc060333795cd6715fd25 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 13:46:01 +0100
Subject: [PATCH 101/340] Fix easy rubocop issues

---
 app/mailers/spree/base_mailer.rb     |  2 ++
 app/mailers/spree/order_mailer.rb    |  2 ++
 app/mailers/spree/shipment_mailer.rb |  5 ++++-
 app/mailers/spree/test_mailer.rb     |  2 ++
 spec/mailers/order_mailer_spec.rb    | 30 +++++++++++++++-------------
 spec/mailers/shipment_mailer_spec.rb | 18 ++++++++++-------
 spec/mailers/test_mailer_spec.rb     |  4 +++-
 7 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/app/mailers/spree/base_mailer.rb b/app/mailers/spree/base_mailer.rb
index 5d6e616b1f..d0f86d8ace 100644
--- a/app/mailers/spree/base_mailer.rb
+++ b/app/mailers/spree/base_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class BaseMailer < ActionMailer::Base
     # Inline stylesheets
diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb
index cb90f25b68..4cd6676c59 100644
--- a/app/mailers/spree/order_mailer.rb
+++ b/app/mailers/spree/order_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class OrderMailer < BaseMailer
     helper HtmlHelper
diff --git a/app/mailers/spree/shipment_mailer.rb b/app/mailers/spree/shipment_mailer.rb
index d9f00671a1..ccbac24efe 100644
--- a/app/mailers/spree/shipment_mailer.rb
+++ b/app/mailers/spree/shipment_mailer.rb
@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Spree
   class ShipmentMailer < BaseMailer
     def shipped_email(shipment, resend = false)
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
+      base_subject = Spree.t('shipment_mailer.shipped_email.subject')
+      subject += "#{Spree::Config[:site_name]} #{base_subject} ##{@shipment.order.number}"
       mail(to: @shipment.order.email, from: from_address, subject: subject)
     end
   end
diff --git a/app/mailers/spree/test_mailer.rb b/app/mailers/spree/test_mailer.rb
index 8a54742722..1f41f55a52 100644
--- a/app/mailers/spree/test_mailer.rb
+++ b/app/mailers/spree/test_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class TestMailer < BaseMailer
     def test_email(user)
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index 3af2b50339..2261edc802 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::OrderMailer do
@@ -6,12 +8,12 @@ describe Spree::OrderMailer do
   contect "original spree specs" do
     let(:order) do
       order = stub_model(Spree::Order)
-      product = stub_model(Spree::Product, :name => %Q{The "BEST" product})
-      variant = stub_model(Spree::Variant, :product => product)
-      price = stub_model(Spree::Price, :variant => variant, :amount => 5.00)
-      line_item = stub_model(Spree::LineItem, :variant => variant, :order => order, :quantity => 1, :price => 4.99)
-      variant.stub(:default_price => price)
-      order.stub(:line_items => [line_item])
+      product = stub_model(Spree::Product, name: %{The "BEST" product})
+      variant = stub_model(Spree::Variant, product: product)
+      price = stub_model(Spree::Price, variant: variant, amount: 5.00)
+      line_item = stub_model(Spree::LineItem, variant: variant, order: order, quantity: 1, price: 4.99)
+      variant.stub(default_price: price)
+      order.stub(line_items: [line_item])
       order
     end
 
@@ -44,15 +46,15 @@ describe Spree::OrderMailer do
     context "only shows eligible adjustments in emails" do
       before do
         order.adjustments.create(
-          :label    => "Eligible Adjustment",
-          :amount   => 10,
-          :eligible => true
+          label: "Eligible Adjustment",
+          amount: 10,
+          eligible: true
         )
 
         order.adjustments.create!(
-          :label    => "Ineligible Adjustment",
-          :amount   => -10,
-          :eligible => false
+          label: "Ineligible Adjustment",
+          amount: -10,
+          eligible: false
         )
       end
 
@@ -85,8 +87,8 @@ describe Spree::OrderMailer do
     context "emails must be translatable" do
       context "pt-BR locale" do
         before do
-          pt_br_confirm_mail = { :spree => { :order_mailer => { :confirm_email => { :dear_customer => 'Caro Cliente,' } } } }
-          pt_br_cancel_mail = { :spree => { :order_mailer => { :cancel_email => { :order_summary_canceled => 'Resumo da Pedido [CANCELADA]' } } } }
+          pt_br_confirm_mail = { spree: { order_mailer: { confirm_email: { dear_customer: 'Caro Cliente,' } } } }
+          pt_br_cancel_mail = { spree: { order_mailer: { cancel_email: { order_summary_canceled: 'Resumo da Pedido [CANCELADA]' } } } }
           I18n.backend.store_translations :'pt-BR', pt_br_confirm_mail
           I18n.backend.store_translations :'pt-BR', pt_br_cancel_mail
           I18n.locale = :'pt-BR'
diff --git a/spec/mailers/shipment_mailer_spec.rb b/spec/mailers/shipment_mailer_spec.rb
index c7a0da6172..994ec0b871 100644
--- a/spec/mailers/shipment_mailer_spec.rb
+++ b/spec/mailers/shipment_mailer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'email_spec'
 
@@ -7,12 +9,12 @@ describe Spree::ShipmentMailer do
 
   let(:shipment) do
     order = stub_model(Spree::Order)
-    product = stub_model(Spree::Product, :name => %Q{The "BEST" product})
-    variant = stub_model(Spree::Variant, :product => product)
-    line_item = stub_model(Spree::LineItem, :variant => variant, :order => order, :quantity => 1, :price => 5)
+    product = stub_model(Spree::Product, name: %{The "BEST" product})
+    variant = stub_model(Spree::Variant, product: product)
+    line_item = stub_model(Spree::LineItem, variant: variant, order: order, quantity: 1, price: 5)
     shipment = stub_model(Spree::Shipment)
-    shipment.stub(:line_items => [line_item], :order => order)
-    shipment.stub(:tracking_url => "TRACK_ME")
+    shipment.stub(line_items: [line_item], order: order)
+    shipment.stub(tracking_url: "TRACK_ME")
     shipment
   end
 
@@ -26,7 +28,7 @@ describe Spree::ShipmentMailer do
   # Regression test for #2196
   it "doesn't include out of stock in the email body" do
     shipment_email = Spree::ShipmentMailer.shipped_email(shipment)
-    shipment_email.body.should_not include(%Q{Out of Stock})
+    shipment_email.body.should_not include(%{Out of Stock})
   end
 
   it "shipment_email accepts an shipment id as an alternative to an Shipment object" do
@@ -40,7 +42,9 @@ describe Spree::ShipmentMailer do
     context "shipped_email" do
       context "pt-BR locale" do
         before do
-          pt_br_shipped_email = { :spree => { :shipment_mailer => { :shipped_email => { :dear_customer => 'Caro Cliente,' } } } }
+          pt_br_shipped_email = {
+            spree: { shipment_mailer: { shipped_email: { dear_customer: 'Caro Cliente,' } } }
+          }
           I18n.backend.store_translations :'pt-BR', pt_br_shipped_email
           I18n.locale = :'pt-BR'
         end
diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb
index 6ed147ad10..b758040547 100644
--- a/spec/mailers/test_mailer_spec.rb
+++ b/spec/mailers/test_mailer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'email_spec'
 
@@ -20,4 +22,4 @@ describe Spree::TestMailer do
       test_email = Spree::TestMailer.test_email(user.id)
     }.should_not raise_error
   end
-end
\ No newline at end of file
+end

From e96d9c1f45498b922e695b5ef11be63e7de9a660 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 14:19:19 +0100
Subject: [PATCH 102/340] Fix mailer specs brought from spree_core

---
 spec/mailers/order_mailer_spec.rb    | 122 +++++++++------------------
 spec/mailers/shipment_mailer_spec.rb |  45 ++--------
 spec/mailers/test_mailer_spec.rb     |  10 +--
 3 files changed, 54 insertions(+), 123 deletions(-)

diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index 2261edc802..ffa6f9433b 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -5,113 +5,75 @@ require 'spec_helper'
 describe Spree::OrderMailer do
   include OpenFoodNetwork::EmailHelper
 
-  contect "original spree specs" do
-    let(:order) do
-      order = stub_model(Spree::Order)
-      product = stub_model(Spree::Product, name: %{The "BEST" product})
-      variant = stub_model(Spree::Variant, product: product)
-      price = stub_model(Spree::Price, variant: variant, amount: 5.00)
-      line_item = stub_model(Spree::LineItem, variant: variant, order: order, quantity: 1, price: 4.99)
-      variant.stub(default_price: price)
-      order.stub(line_items: [line_item])
-      order
-    end
+  context "basic behaviour" do
+    let(:order) { build(:order_with_totals_and_distribution) }
 
     context ":from not set explicitly" do
       it "falls back to spree config" do
         message = Spree::OrderMailer.confirm_email_for_customer(order)
-        message.from.should == [Spree::Config[:mails_from]]
+        expect(message.from).to eq [Spree::Config[:mails_from]]
       end
     end
 
     it "doesn't aggressively escape double quotes in confirmation body" do
       confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order)
-      confirmation_email.body.should_not include("&quot;")
+      expect(confirmation_email.body).to_not include("&quot;")
     end
 
     it "confirm_email_for_customer accepts an order id as an alternative to an Order object" do
       Spree::Order.should_receive(:find).with(order.id).and_return(order)
-      lambda {
+      expect {
         confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order.id)
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "cancel_email accepts an order id as an alternative to an Order object" do
       Spree::Order.should_receive(:find).with(order.id).and_return(order)
-      lambda {
+      expect {
         cancel_email = Spree::OrderMailer.cancel_email(order.id)
-      }.should_not raise_error
+      }.to_not raise_error
+    end
+  end
+
+  context "only shows eligible adjustments in emails" do
+    let(:order) { create(:order_with_totals_and_distribution) }
+
+    before do
+      order.adjustments.create(
+        label: "Eligible Adjustment",
+        amount: 10,
+        eligible: true
+      )
+
+      order.adjustments.create!(
+        label: "Ineligible Adjustment",
+        amount: 0,
+      )
     end
 
-    context "only shows eligible adjustments in emails" do
-      before do
-        order.adjustments.create(
-          label: "Eligible Adjustment",
-          amount: 10,
-          eligible: true
-        )
+    let!(:confirmation_email) { Spree::OrderMailer.confirm_email_for_customer(order) }
+    let!(:cancel_email) { Spree::OrderMailer.cancel_email(order) }
 
-        order.adjustments.create!(
-          label: "Ineligible Adjustment",
-          amount: -10,
-          eligible: false
-        )
-      end
-
-      let!(:confirmation_email) { Spree::OrderMailer.confirm_email(order) }
-      let!(:cancel_email) { Spree::OrderMailer.cancel_email(order) }
-
-      specify do
-        confirmation_email.body.should_not include("Ineligible Adjustment")
-      end
-
-      specify do
-        cancel_email.body.should_not include("Ineligible Adjustment")
-      end
+    specify do
+      expect(confirmation_email.body).to_not include("Ineligible Adjustment")
     end
 
-    context "displays unit costs from line item" do
-      specify do
-        confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order)
-        confirmation_email.body.should include("4.99")
-        confirmation_email.body.should_not include("5.00")
-      end
+    specify do
+      expect(cancel_email.body).to_not include("Ineligible Adjustment")
+    end
+  end
 
-      specify do
-        cancel_email = Spree::OrderMailer.cancel_email(order)
-        cancel_email.body.should include("4.99")
-        cancel_email.body.should_not include("5.00")
-      end
+  context "displays line item price" do
+    let(:order) { create(:order_with_totals_and_distribution) }
+
+    specify do
+      confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order)
+      expect(confirmation_email.body).to include("3.00")
     end
 
-    context "emails must be translatable" do
-      context "pt-BR locale" do
-        before do
-          pt_br_confirm_mail = { spree: { order_mailer: { confirm_email: { dear_customer: 'Caro Cliente,' } } } }
-          pt_br_cancel_mail = { spree: { order_mailer: { cancel_email: { order_summary_canceled: 'Resumo da Pedido [CANCELADA]' } } } }
-          I18n.backend.store_translations :'pt-BR', pt_br_confirm_mail
-          I18n.backend.store_translations :'pt-BR', pt_br_cancel_mail
-          I18n.locale = :'pt-BR'
-        end
-
-        after do
-          I18n.locale = I18n.default_locale
-        end
-
-        context "confirm_email" do
-          specify do
-            confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order)
-            confirmation_email.body.should include("Caro Cliente,")
-          end
-        end
-
-        context "cancel_email" do
-          specify do
-            cancel_email = Spree::OrderMailer.cancel_email(order)
-            cancel_email.body.should include("Resumo da Pedido [CANCELADA]")
-          end
-        end
-      end
+    specify do
+      cancel_email = Spree::OrderMailer.cancel_email(order)
+      expect(cancel_email.body).to include("3.00")
     end
   end
 
diff --git a/spec/mailers/shipment_mailer_spec.rb b/spec/mailers/shipment_mailer_spec.rb
index 994ec0b871..8a3fadb0f6 100644
--- a/spec/mailers/shipment_mailer_spec.rb
+++ b/spec/mailers/shipment_mailer_spec.rb
@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'email_spec'
 
 describe Spree::ShipmentMailer do
-  include EmailSpec::Helpers
-  include EmailSpec::Matchers
-
   let(:shipment) do
-    order = stub_model(Spree::Order)
-    product = stub_model(Spree::Product, name: %{The "BEST" product})
-    variant = stub_model(Spree::Variant, product: product)
-    line_item = stub_model(Spree::LineItem, variant: variant, order: order, quantity: 1, price: 5)
-    shipment = stub_model(Spree::Shipment)
+    order = build(:order)
+    product = build(:product, name: %{The "BEST" product})
+    variant = build(:variant, product: product)
+    line_item = build(:line_item, variant: variant, order: order, quantity: 1, price: 5)
+    shipment = build(:shipment)
     shipment.stub(line_items: [line_item], order: order)
     shipment.stub(tracking_url: "TRACK_ME")
     shipment
@@ -21,43 +17,20 @@ describe Spree::ShipmentMailer do
   context ":from not set explicitly" do
     it "falls back to spree config" do
       message = Spree::ShipmentMailer.shipped_email(shipment)
-      message.from.should == [Spree::Config[:mails_from]]
+      expect(message.from).to eq [Spree::Config[:mails_from]]
     end
   end
 
   # Regression test for #2196
   it "doesn't include out of stock in the email body" do
     shipment_email = Spree::ShipmentMailer.shipped_email(shipment)
-    shipment_email.body.should_not include(%{Out of Stock})
+    expect(shipment_email.body).to_not include(%{Out of Stock})
   end
 
   it "shipment_email accepts an shipment id as an alternative to an Shipment object" do
     Spree::Shipment.should_receive(:find).with(shipment.id).and_return(shipment)
-    lambda {
+    expect {
       shipped_email = Spree::ShipmentMailer.shipped_email(shipment.id)
-    }.should_not raise_error
-  end
-
-  context "emails must be translatable" do
-    context "shipped_email" do
-      context "pt-BR locale" do
-        before do
-          pt_br_shipped_email = {
-            spree: { shipment_mailer: { shipped_email: { dear_customer: 'Caro Cliente,' } } }
-          }
-          I18n.backend.store_translations :'pt-BR', pt_br_shipped_email
-          I18n.locale = :'pt-BR'
-        end
-
-        after do
-          I18n.locale = I18n.default_locale
-        end
-
-        specify do
-          shipped_email = Spree::ShipmentMailer.shipped_email(shipment)
-          shipped_email.body.should include("Caro Cliente,")
-        end
-      end
-    end
+    }.to_not raise_error
   end
 end
diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb
index b758040547..a7c58937c4 100644
--- a/spec/mailers/test_mailer_spec.rb
+++ b/spec/mailers/test_mailer_spec.rb
@@ -1,25 +1,21 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'email_spec'
 
 describe Spree::TestMailer do
-  include EmailSpec::Helpers
-  include EmailSpec::Matchers
-
   let(:user) { create(:user) }
 
   context ":from not set explicitly" do
     it "falls back to spree config" do
       message = Spree::TestMailer.test_email(user)
-      message.from.should == [Spree::Config[:mails_from]]
+      expect(message.from).to eq [Spree::Config[:mails_from]]
     end
   end
 
   it "confirm_email accepts a user id as an alternative to a User object" do
     Spree.user_class.should_receive(:find).with(user.id).and_return(user)
-    lambda {
+    expect {
       test_email = Spree::TestMailer.test_email(user.id)
-    }.should_not raise_error
+    }.to_not raise_error
   end
 end

From 5835a0ee3abede108fe64af7cbbced947c84699e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 14:20:30 +0100
Subject: [PATCH 103/340] Transpec mailer specs

---
 spec/mailers/order_mailer_spec.rb    | 4 ++--
 spec/mailers/shipment_mailer_spec.rb | 6 +++---
 spec/mailers/test_mailer_spec.rb     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index ffa6f9433b..516c7f1d12 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -21,14 +21,14 @@ describe Spree::OrderMailer do
     end
 
     it "confirm_email_for_customer accepts an order id as an alternative to an Order object" do
-      Spree::Order.should_receive(:find).with(order.id).and_return(order)
+      expect(Spree::Order).to receive(:find).with(order.id).and_return(order)
       expect {
         confirmation_email = Spree::OrderMailer.confirm_email_for_customer(order.id)
       }.to_not raise_error
     end
 
     it "cancel_email accepts an order id as an alternative to an Order object" do
-      Spree::Order.should_receive(:find).with(order.id).and_return(order)
+      expect(Spree::Order).to receive(:find).with(order.id).and_return(order)
       expect {
         cancel_email = Spree::OrderMailer.cancel_email(order.id)
       }.to_not raise_error
diff --git a/spec/mailers/shipment_mailer_spec.rb b/spec/mailers/shipment_mailer_spec.rb
index 8a3fadb0f6..e952536130 100644
--- a/spec/mailers/shipment_mailer_spec.rb
+++ b/spec/mailers/shipment_mailer_spec.rb
@@ -9,8 +9,8 @@ describe Spree::ShipmentMailer do
     variant = build(:variant, product: product)
     line_item = build(:line_item, variant: variant, order: order, quantity: 1, price: 5)
     shipment = build(:shipment)
-    shipment.stub(line_items: [line_item], order: order)
-    shipment.stub(tracking_url: "TRACK_ME")
+    allow(shipment).to receive_messages(line_items: [line_item], order: order)
+    allow(shipment).to receive_messages(tracking_url: "TRACK_ME")
     shipment
   end
 
@@ -28,7 +28,7 @@ describe Spree::ShipmentMailer do
   end
 
   it "shipment_email accepts an shipment id as an alternative to an Shipment object" do
-    Spree::Shipment.should_receive(:find).with(shipment.id).and_return(shipment)
+    expect(Spree::Shipment).to receive(:find).with(shipment.id).and_return(shipment)
     expect {
       shipped_email = Spree::ShipmentMailer.shipped_email(shipment.id)
     }.to_not raise_error
diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb
index a7c58937c4..71087a9f36 100644
--- a/spec/mailers/test_mailer_spec.rb
+++ b/spec/mailers/test_mailer_spec.rb
@@ -13,7 +13,7 @@ describe Spree::TestMailer do
   end
 
   it "confirm_email accepts a user id as an alternative to a User object" do
-    Spree.user_class.should_receive(:find).with(user.id).and_return(user)
+    expect(Spree.user_class).to receive(:find).with(user.id).and_return(user)
     expect {
       test_email = Spree::TestMailer.test_email(user.id)
     }.to_not raise_error

From 55f160c309ca9518abaf7857d1c27514600e5f83 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 14:23:09 +0100
Subject: [PATCH 104/340] Bring test and shipment email templates from
 spree_core

---
 .../spree/shipment_mailer/shipped_email.text.erb | 16 ++++++++++++++++
 app/views/spree/test_mailer/test_email.text.erb  |  4 ++++
 2 files changed, 20 insertions(+)
 create mode 100644 app/views/spree/shipment_mailer/shipped_email.text.erb
 create mode 100644 app/views/spree/test_mailer/test_email.text.erb

diff --git a/app/views/spree/shipment_mailer/shipped_email.text.erb b/app/views/spree/shipment_mailer/shipped_email.text.erb
new file mode 100644
index 0000000000..425df7aef2
--- /dev/null
+++ b/app/views/spree/shipment_mailer/shipped_email.text.erb
@@ -0,0 +1,16 @@
+<%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
+
+<%= Spree.t('shipment_mailer.shipped_email.instructions') %>
+
+============================================================
+<%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
+============================================================
+<% @shipment.manifest.each do |item| %>
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
+<% end %>
+============================================================
+
+<%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
+<%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
+
+<%= Spree.t('shipment_mailer.shipped_email.thanks') %>
diff --git a/app/views/spree/test_mailer/test_email.text.erb b/app/views/spree/test_mailer/test_email.text.erb
new file mode 100644
index 0000000000..9944b6faef
--- /dev/null
+++ b/app/views/spree/test_mailer/test_email.text.erb
@@ -0,0 +1,4 @@
+<%= t('test_mailer.test_email.greeting') %>
+================
+
+<%= t('test_mailer.test_email.message') %>

From f66538d2cb584d176aa009cadcfd36cf408bcbc9 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 14:26:05 +0100
Subject: [PATCH 105/340] Convert test and shipment email templates to haml

---
 .../shipment_mailer/shipped_email.html.haml   | 19 +++++++++++++++++++
 .../shipment_mailer/shipped_email.text.erb    | 16 ----------------
 .../spree/test_mailer/test_email.html.haml    |  4 ++++
 .../spree/test_mailer/test_email.text.erb     |  4 ----
 4 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 app/views/spree/shipment_mailer/shipped_email.html.haml
 delete mode 100644 app/views/spree/shipment_mailer/shipped_email.text.erb
 create mode 100644 app/views/spree/test_mailer/test_email.html.haml
 delete mode 100644 app/views/spree/test_mailer/test_email.text.erb

diff --git a/app/views/spree/shipment_mailer/shipped_email.html.haml b/app/views/spree/shipment_mailer/shipped_email.html.haml
new file mode 100644
index 0000000000..96aa8403db
--- /dev/null
+++ b/app/views/spree/shipment_mailer/shipped_email.html.haml
@@ -0,0 +1,19 @@
+= Spree.t('shipment_mailer.shipped_email.dear_customer')
+
+= Spree.t('shipment_mailer.shipped_email.instructions')
+
+= "============================================================"
+= Spree.t('shipment_mailer.shipped_email.shipment_summary')
+= "============================================================"
+- @shipment.manifest.each do |item|
+  = item.variant.sku
+  = item.variant.product.name
+  = item.variant.options_text
+= "============================================================"
+
+- if @shipment.tracking
+  = Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking)
+- if @shipment.tracking_url
+  = Spree.t('shipment_mailer.shipped_email.track_link', url: @shipment.tracking_url)
+
+= Spree.t('shipment_mailer.shipped_email.thanks')
diff --git a/app/views/spree/shipment_mailer/shipped_email.text.erb b/app/views/spree/shipment_mailer/shipped_email.text.erb
deleted file mode 100644
index 425df7aef2..0000000000
--- a/app/views/spree/shipment_mailer/shipped_email.text.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
-
-<%= Spree.t('shipment_mailer.shipped_email.instructions') %>
-
-============================================================
-<%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
-============================================================
-<% @shipment.manifest.each do |item| %>
-  <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
-<% end %>
-============================================================
-
-<%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
-<%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
-
-<%= Spree.t('shipment_mailer.shipped_email.thanks') %>
diff --git a/app/views/spree/test_mailer/test_email.html.haml b/app/views/spree/test_mailer/test_email.html.haml
new file mode 100644
index 0000000000..024e6cab4c
--- /dev/null
+++ b/app/views/spree/test_mailer/test_email.html.haml
@@ -0,0 +1,4 @@
+= t('test_mailer.test_email.greeting')
+= "================"
+
+= t('test_mailer.test_email.message')
diff --git a/app/views/spree/test_mailer/test_email.text.erb b/app/views/spree/test_mailer/test_email.text.erb
deleted file mode 100644
index 9944b6faef..0000000000
--- a/app/views/spree/test_mailer/test_email.text.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= t('test_mailer.test_email.greeting') %>
-================
-
-<%= t('test_mailer.test_email.message') %>

From 646f48f0afa32aa58b8e9bc32716e5c504a0fcc5 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 14 Jul 2020 14:32:47 +0100
Subject: [PATCH 106/340] Add translation keys for test and shipment emails and
 make them lazy lookups

---
 app/mailers/spree/base_mailer.rb              |  1 -
 app/mailers/spree/shipment_mailer.rb          |  2 +-
 app/mailers/spree/test_mailer.rb              |  2 +-
 .../shipment_mailer/shipped_email.html.haml   | 12 +++---
 .../spree/test_mailer/test_email.html.haml    |  4 +-
 config/locales/en.yml                         | 38 +++++++++++++------
 6 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/app/mailers/spree/base_mailer.rb b/app/mailers/spree/base_mailer.rb
index d0f86d8ace..fb46bf54bc 100644
--- a/app/mailers/spree/base_mailer.rb
+++ b/app/mailers/spree/base_mailer.rb
@@ -5,7 +5,6 @@ module Spree
     # Inline stylesheets
     include Roadie::Rails::Automatic
 
-    # Define layout
     layout 'mailer'
 
     def from_address
diff --git a/app/mailers/spree/shipment_mailer.rb b/app/mailers/spree/shipment_mailer.rb
index ccbac24efe..3b25885f81 100644
--- a/app/mailers/spree/shipment_mailer.rb
+++ b/app/mailers/spree/shipment_mailer.rb
@@ -5,7 +5,7 @@ module Spree
     def shipped_email(shipment, resend = false)
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      base_subject = Spree.t('shipment_mailer.shipped_email.subject')
+      base_subject = t('spree.shipment_mailer.shipped_email.subject')
       subject += "#{Spree::Config[:site_name]} #{base_subject} ##{@shipment.order.number}"
       mail(to: @shipment.order.email, from: from_address, subject: subject)
     end
diff --git a/app/mailers/spree/test_mailer.rb b/app/mailers/spree/test_mailer.rb
index 1f41f55a52..316de40341 100644
--- a/app/mailers/spree/test_mailer.rb
+++ b/app/mailers/spree/test_mailer.rb
@@ -4,7 +4,7 @@ module Spree
   class TestMailer < BaseMailer
     def test_email(user)
       recipient = user.respond_to?(:id) ? user : Spree.user_class.find(user)
-      subject = "#{Spree::Config[:site_name]} #{Spree.t('test_mailer.test_email.subject')}"
+      subject = "#{Spree::Config[:site_name]} #{t('spree.test_mailer.test_email.subject')}"
       mail(to: recipient.email, from: from_address, subject: subject)
     end
   end
diff --git a/app/views/spree/shipment_mailer/shipped_email.html.haml b/app/views/spree/shipment_mailer/shipped_email.html.haml
index 96aa8403db..04c8368787 100644
--- a/app/views/spree/shipment_mailer/shipped_email.html.haml
+++ b/app/views/spree/shipment_mailer/shipped_email.html.haml
@@ -1,9 +1,9 @@
-= Spree.t('shipment_mailer.shipped_email.dear_customer')
+= t('.dear_customer')
 
-= Spree.t('shipment_mailer.shipped_email.instructions')
+= t('.instructions')
 
 = "============================================================"
-= Spree.t('shipment_mailer.shipped_email.shipment_summary')
+= t('.shipment_summary')
 = "============================================================"
 - @shipment.manifest.each do |item|
   = item.variant.sku
@@ -12,8 +12,8 @@
 = "============================================================"
 
 - if @shipment.tracking
-  = Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking)
+  = t('.track_information', tracking: @shipment.tracking)
 - if @shipment.tracking_url
-  = Spree.t('shipment_mailer.shipped_email.track_link', url: @shipment.tracking_url)
+  = t('.track_link', url: @shipment.tracking_url)
 
-= Spree.t('shipment_mailer.shipped_email.thanks')
+= t('.thanks')
diff --git a/app/views/spree/test_mailer/test_email.html.haml b/app/views/spree/test_mailer/test_email.html.haml
index 024e6cab4c..6f9e2e771c 100644
--- a/app/views/spree/test_mailer/test_email.html.haml
+++ b/app/views/spree/test_mailer/test_email.html.haml
@@ -1,4 +1,4 @@
-= t('test_mailer.test_email.greeting')
+= t('.greeting')
 = "================"
 
-= t('test_mailer.test_email.message')
+= t('.message')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3726167337..7cd051f0fb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3508,6 +3508,32 @@ See the %{link} to find out more about %{sitename}'s features and to start using
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+          A request to reset your password has been made.
+          If you did not make this request, simply ignore this email.
+        link_text: >
+          If you did make this request just click the link below:
+        issue_text: |
+          If the above URL does not work try copying and pasting it into your browser.
+          If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: ! "Tracking Information: %{tracking}"
+        track_link: ! "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulations!"
+        message: "If you have received this email, then your email settings are correct."
+        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments
@@ -3529,18 +3555,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-          A request to reset your password has been made.
-          If you did not make this request, simply ignore this email.
-        link_text: >
-          If you did make this request just click the link below:
-        issue_text: |
-          If the above URL does not work try copying and pasting it into your browser.
-          If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

From dbc7632c4ed2277ed1194100337367fbaeb4052a Mon Sep 17 00:00:00 2001
From: Steve Roberts <steve@commoncode.io>
Date: Wed, 15 Jul 2020 09:52:04 +1000
Subject: [PATCH 107/340] Add inline comment to explain two height properties

---
 app/assets/stylesheets/darkswarm/home_tagline.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/darkswarm/home_tagline.scss b/app/assets/stylesheets/darkswarm/home_tagline.scss
index ac187c38f5..7ad1ea0241 100644
--- a/app/assets/stylesheets/darkswarm/home_tagline.scss
+++ b/app/assets/stylesheets/darkswarm/home_tagline.scss
@@ -21,6 +21,7 @@
     z-index: -1;
     width: 100%;
     height: 100%;
+    // Use vh units for new browsers - fixed issue 1253
     height: 100vh;
   }
 

From 25155cab188ebf1c593ffc4c27f8ed0d516f177b Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 15 Jul 2020 17:13:46 +1000
Subject: [PATCH 108/340] Provide credit card brand to Pin Payments

Spree replaced the Ruby code providing the credit card brand with a
jquery plugin providing it on the checkout screen.

I re-added Ruby code because it's easier and more robust than updating
the user interface with new Javascript.
---
 app/services/checkout/form_data_adapter.rb    | 14 +++++++++++++
 .../checkout/form_data_adapter_spec.rb        | 20 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/app/services/checkout/form_data_adapter.rb b/app/services/checkout/form_data_adapter.rb
index a374444637..60bb9257c5 100644
--- a/app/services/checkout/form_data_adapter.rb
+++ b/app/services/checkout/form_data_adapter.rb
@@ -12,6 +12,8 @@ module Checkout
 
       move_payment_source_to_payment_attributes!
 
+      fill_in_card_type
+
       set_amount_in_payments_attributes
 
       construct_saved_card_attributes if @params[:order][:existing_card_id]
@@ -31,6 +33,18 @@ module Checkout
       @params[:order][:payments_attributes].first[:source_attributes] = payment_source_params
     end
 
+    def fill_in_card_type
+      payment = params[:order][:payments_attributes]&.first&.dig(:source_attributes)
+
+      return if payment&.dig(:number).blank?
+
+      payment[:cc_type] ||= card_brand(payment[:number])
+    end
+
+    def card_brand(number)
+      ActiveMerchant::Billing::CreditCard.brand?(number)
+    end
+
     def delete_payment_source_params!
       @params.delete(:payment_source)[
         @params[:order][:payments_attributes].first[:payment_method_id].underscore
diff --git a/spec/services/checkout/form_data_adapter_spec.rb b/spec/services/checkout/form_data_adapter_spec.rb
index be248a2af0..e2b3c38a94 100644
--- a/spec/services/checkout/form_data_adapter_spec.rb
+++ b/spec/services/checkout/form_data_adapter_spec.rb
@@ -36,6 +36,26 @@ describe Checkout::FormDataAdapter do
         end
       end
 
+      describe "and a credit card is provided" do
+        before do
+          params[:order][:payments_attributes].first[:source_attributes] = {number: "4444333322221111"}
+        end
+
+        it "fills in missing credit card brand" do
+          expect(adapter.params[:order][:payments_attributes].first[:source_attributes][:cc_type]).to eq "visa"
+        end
+
+        it "leaves an existing credit card brand" do
+          params[:order][:payments_attributes].first[:source_attributes][:cc_type] = "test"
+          expect(adapter.params[:order][:payments_attributes].first[:source_attributes][:cc_type]).to eq "test"
+        end
+
+        it "doesn't touch the credit card brand without a number" do
+          params[:order][:payments_attributes].first[:source_attributes][:number] = ""
+          expect(adapter.params[:order][:payments_attributes].first[:source_attributes].key?(:cc_type)).to eq false
+        end
+      end
+
       describe "and existing credit card is provided" do
         before { params[:order][:existing_card_id] = credit_card.id }
 

From 5fae2c08c8a120251532030d205877a40ad25c0d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2020 08:13:42 +0000
Subject: [PATCH 109/340] Bump i18n-js from 3.7.0 to 3.7.1

Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index eb91b2c147..0c442ca2c6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby "2.3.7"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.7.0'
+gem 'i18n-js', '~> 3.7.1'
 gem 'rails', '~> 4.0.13'
 gem 'rails-i18n', '~> 4.0'
 gem 'rails_safe_tasks', '~> 1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b627cb940..8f5d43d0eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -420,7 +420,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (0.6.11)
-    i18n-js (3.7.0)
+    i18n-js (3.7.1)
       i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -753,7 +753,7 @@ DEPENDENCIES
   highline (= 1.6.18)
   httparty (~> 0.18)
   i18n (~> 0.6.11)
-  i18n-js (~> 3.7.0)
+  i18n-js (~> 3.7.1)
   immigrant
   jquery-migrate-rails
   jquery-rails (= 3.1.5)

From c009fed6be5fe8a3fe6d5db99d0411779c0a537d Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 15 Jul 2020 14:00:19 +0200
Subject: [PATCH 110/340] Update StrongParams for Pin Payments

---
 .../spree/admin/payment_methods_controller.rb      |  2 +-
 .../spree/admin/payment_methods_controller_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/controllers/spree/admin/payment_methods_controller.rb b/app/controllers/spree/admin/payment_methods_controller.rb
index 8825e4ea69..950b97340b 100644
--- a/app/controllers/spree/admin/payment_methods_controller.rb
+++ b/app/controllers/spree/admin/payment_methods_controller.rb
@@ -97,7 +97,7 @@ module Spree
           :name, :description, :type, :active,
           :environment, :display_on, :tag_list,
           :preferred_enterprise_id, :preferred_server, :preferred_login, :preferred_password,
-          :calculator_type,
+          :calculator_type, :preferred_api_key,
           :preferred_signature, :preferred_solution, :preferred_landing_page, :preferred_logourl,
           :preferred_test_mode, distributor_ids: []
         )
diff --git a/spec/controllers/spree/admin/payment_methods_controller_spec.rb b/spec/controllers/spree/admin/payment_methods_controller_spec.rb
index dfc7dd307e..3e752170c7 100644
--- a/spec/controllers/spree/admin/payment_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/payment_methods_controller_spec.rb
@@ -39,6 +39,20 @@ module Spree
         expect(response).to redirect_to spree.edit_admin_payment_method_path(assigns(:payment_method))
       end
 
+      it "can save Pin Payment payment method details" do
+        expect {
+          spree_post :create, payment_method: {
+            name: "Test Method", type: "Spree::Gateway::Pin", distributor_ids: [enterprise.id],
+            preferred_server: "test", preferred_api_key: "apikey123", preferred_test_mode: "1"
+          }
+        }.to change(Spree::PaymentMethod, :count).by(1)
+
+        payment_method = Spree::PaymentMethod.last
+        expect(payment_method.preferences[:server]).to eq "test"
+        expect(payment_method.preferences[:api_key]).to eq "apikey123"
+        expect(payment_method.preferences[:test_mode]).to eq true
+      end
+
       it "can not create a payment method of an invalid type" do
         expect {
           spree_post :create, payment_method: { name: "Invalid Payment Method", type: "Spree::InvalidType", distributor_ids: [enterprise.id] }

From 3435d5ac979487064095ad995b60288032d83a16 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 15:18:10 +0200
Subject: [PATCH 111/340] Fix Rubocop non-metrics issues in payment model

---
 app/models/spree/payment.rb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 46a9d924b3..a9e0b6b460 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -15,9 +15,9 @@ module Spree
     belongs_to :source, polymorphic: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
 
-    has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'") },
+    has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0").completed },
              class_name: "Spree::Payment", foreign_key: :source_id
-    has_many :log_entries, as: :source
+    has_many :log_entries, as: :source, dependent: :destroy
 
     has_one :adjustment, as: :source, dependent: :destroy
 
@@ -71,7 +71,7 @@ module Spree
     delegate :currency, to: :order
 
     def money
-      Spree::Money.new(amount, { currency: currency })
+      Spree::Money.new(amount, currency: currency)
     end
     alias display_amount money
 
@@ -84,7 +84,7 @@ module Spree
     end
 
     def can_credit?
-      credit_allowed > 0
+      credit_allowed.positive?
     end
 
     # see https://github.com/spree/spree/issues/981
@@ -104,7 +104,10 @@ module Spree
     def actions
       return [] unless payment_source&.respond_to?(:actions)
 
-      actions = payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") || payment_source.send("can_#{action}?", self) }
+      actions = payment_source.actions.select do |action|
+        !payment_source.respond_to?("can_#{action}?") ||
+          payment_source.__send__("can_#{action}?", self)
+      end
 
       if payment_method.is_a? Gateway::Pin
         actions << 'refund' if actions.include? 'credit'
@@ -162,7 +165,8 @@ module Spree
     end
 
     def profiles_supported?
-      payment_method.respond_to?(:payment_profiles_supported?) && payment_method.payment_profiles_supported?
+      payment_method.respond_to?(:payment_profiles_supported?) &&
+        payment_method.payment_profiles_supported?
     end
 
     def create_payment_profile
@@ -191,9 +195,7 @@ module Spree
     # and this is it. Related to #1998.
     # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
     def set_unique_identifier
-      begin
-        self.identifier = generate_identifier
-      end while self.class.exists?(identifier: identifier)
+      self.identifier = generate_identifier while self.class.exists?(identifier: identifier)
     end
 
     def generate_identifier

From 66dbd85eb401b5b47cfc0475219ee026339c5b01 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 10 Jul 2020 15:43:41 +0200
Subject: [PATCH 112/340] Run rubocop autocorrect on payment/processing.rb

---
 app/models/spree/payment/processing.rb | 88 ++++++++++++++------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index ad7eb87aca..22ff948283 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Spree
   class Payment < ActiveRecord::Base
     module Processing
       def process!
-        if payment_method && payment_method.source_required?
+        if payment_method&.source_required?
           if source
             if !processing?
               if payment_method.supports?(source)
@@ -13,11 +15,11 @@ module Spree
                 end
               else
                 invalidate!
-                raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
+                raise Core::GatewayError, Spree.t(:payment_method_not_supported)
               end
             end
           else
-            raise Core::GatewayError.new(Spree.t(:payment_processing_failed))
+            raise Core::GatewayError, Spree.t(:payment_processing_failed)
           end
         end
       end
@@ -34,6 +36,7 @@ module Spree
 
       def capture!
         return true if completed?
+
         started_processing!
         protect_from_connection_error do
           check_environment
@@ -55,29 +58,30 @@ module Spree
 
       def void_transaction!
         return true if void?
+
         protect_from_connection_error do
           check_environment
 
           if payment_method.payment_profiles_supported?
             # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
             # so supply the authorization itself as well as the credit card, rather than just the authorization code
-            response = payment_method.void(self.response_code, source, gateway_options)
+            response = payment_method.void(response_code, source, gateway_options)
           else
             # Standard ActiveMerchant void usage
-            response = payment_method.void(self.response_code, gateway_options)
+            response = payment_method.void(response_code, gateway_options)
           end
           record_response(response)
 
           if response.success?
             self.response_code = response.authorization
-            self.void
+            void
           else
             gateway_error(response)
           end
         end
       end
 
-      def credit!(credit_amount=nil)
+      def credit!(credit_amount = nil)
         protect_from_connection_error do
           check_environment
 
@@ -94,12 +98,12 @@ module Spree
 
           if response.success?
             self.class.create(
-              :order => order,
-              :source => self,
-              :payment_method => payment_method,
-              :amount => credit_amount.abs * -1,
-              :response_code => response.authorization,
-              :state => 'completed'
+              order: order,
+              source: self,
+              payment_method: payment_method,
+              amount: credit_amount.abs * -1,
+              response_code: response.authorization,
+              state: 'completed'
             )
           else
             gateway_error(response)
@@ -136,28 +140,29 @@ module Spree
 
       def partial_credit(amount)
         return if amount > credit_allowed
+
         started_processing!
         credit!(amount)
       end
 
       def gateway_options
-        options = { :email    => order.email,
-                    :customer => order.email,
-                    :ip       => order.last_ip_address,
+        options = { email: order.email,
+                    customer: order.email,
+                    ip: order.last_ip_address,
                     # Need to pass in a unique identifier here to make some
                     # payment gateways happy.
                     #
                     # For more information, please see Spree::Payment#set_unique_identifier
-                    :order_id => gateway_order_id }
+                    order_id: gateway_order_id }
 
-        options.merge!({ :shipping => order.ship_total * 100,
-                         :tax      => order.tax_total * 100,
-                         :subtotal => order.item_total * 100,
-                         :discount => order.promo_total * 100,
-                         :currency => currency })
+        options.merge!({ shipping: order.ship_total * 100,
+                         tax: order.tax_total * 100,
+                         subtotal: order.item_total * 100,
+                         discount: order.promo_total * 100,
+                         currency: currency })
 
-        options.merge!({ :billing_address  => order.bill_address.try(:active_merchant_hash),
-                        :shipping_address => order.ship_address.try(:active_merchant_hash) })
+        options.merge!({ billing_address: order.bill_address.try(:active_merchant_hash),
+                         shipping_address: order.ship_address.try(:active_merchant_hash) })
 
         options
       end
@@ -193,49 +198,48 @@ module Spree
               self.cvv_response_message = response.cvv_result['message']
             end
           end
-          self.send("#{success_state}!")
+          send("#{success_state}!")
         else
-          self.send(failure_state)
+          send(failure_state)
           gateway_error(response)
         end
       end
 
       def record_response(response)
-        log_entries.create(:details => response.to_yaml)
+        log_entries.create(details: response.to_yaml)
       end
 
       def protect_from_connection_error
-        begin
-          yield
-        rescue ActiveMerchant::ConnectionError => e
-          gateway_error(e)
-        end
+        yield
+      rescue ActiveMerchant::ConnectionError => e
+        gateway_error(e)
       end
 
       def gateway_error(error)
-        if error.is_a? ActiveMerchant::Billing::Response
-          text = error.params['message'] || error.params['response_reason_text'] || error.message
-        elsif error.is_a? ActiveMerchant::ConnectionError
-          text = Spree.t(:unable_to_connect_to_gateway)
-        else
-          text = error.to_s
-        end
+        text = if error.is_a? ActiveMerchant::Billing::Response
+                 error.params['message'] || error.params['response_reason_text'] || error.message
+               elsif error.is_a? ActiveMerchant::ConnectionError
+                 Spree.t(:unable_to_connect_to_gateway)
+               else
+                 error.to_s
+               end
         logger.error(Spree.t(:gateway_error))
         logger.error("  #{error.to_yaml}")
-        raise Core::GatewayError.new(text)
+        raise Core::GatewayError, text
       end
 
       # Saftey check to make sure we're not accidentally performing operations on a live gateway.
       # Ex. When testing in staging environment with a copy of production data.
       def check_environment
         return if payment_method.environment == Rails.env
+
         message = Spree.t(:gateway_config_unavailable) + " - #{Rails.env}"
-        raise Core::GatewayError.new(message)
+        raise Core::GatewayError, message
       end
 
       # The unique identifier to be passed in to the payment gateway
       def gateway_order_id
-        "#{order.number}-#{self.identifier}"
+        "#{order.number}-#{identifier}"
       end
     end
   end

From 42658b5255ee8200b94a671bd6c7d44cfb0ca863 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Mon, 13 Jul 2020 09:43:18 +0200
Subject: [PATCH 113/340] Refactor `#process!` nested ifs to guard clauses

Following Rubocop's indications.
---
 app/models/spree/payment/processing.rb | 32 ++++++++++++--------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 22ff948283..b2421d5c8a 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -4,23 +4,21 @@ module Spree
   class Payment < ActiveRecord::Base
     module Processing
       def process!
-        if payment_method&.source_required?
-          if source
-            if !processing?
-              if payment_method.supports?(source)
-                if payment_method.auto_capture?
-                  purchase!
-                else
-                  authorize!
-                end
-              else
-                invalidate!
-                raise Core::GatewayError, Spree.t(:payment_method_not_supported)
-              end
-            end
-          else
-            raise Core::GatewayError, Spree.t(:payment_processing_failed)
-          end
+        return unless payment_method&.source_required?
+
+        raise Core::GatewayError, Spree.t(:payment_processing_failed) unless source
+
+        return if processing?
+
+        unless payment_method.supports?(source)
+          invalidate!
+          raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
+        end
+
+        if payment_method.auto_capture?
+          purchase!
+        else
+          authorize!
         end
       end
 

From a8af3a27b18ce26d1ce274903cb7ee7f9e25f5ee Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Mon, 13 Jul 2020 09:56:05 +0200
Subject: [PATCH 114/340] Fix all but Metrics Rubocop cops in processing.rb

---
 app/models/spree/payment/processing.rb | 101 +++++++++++++++++--------
 1 file changed, 68 insertions(+), 33 deletions(-)

diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index b2421d5c8a..08a6ebd069 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -39,16 +39,18 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          if payment_method.payment_profiles_supported?
-            # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
-            # so supply the authorization itself as well as the credit card, rather than just the authorization code
-            response = payment_method.capture(self, source, gateway_options)
-          else
-            # Standard ActiveMerchant capture usage
-            response = payment_method.capture(money.money.cents,
+          response = if payment_method.payment_profiles_supported?
+                       # Gateways supporting payment profiles will need access to credit
+                       # card object because this stores the payment profile information
+                       # so supply the authorization itself as well as the credit card,
+                       # rather than just the authorization code
+                       payment_method.capture(self, source, gateway_options)
+                     else
+                       # Standard ActiveMerchant capture usage
+                       payment_method.capture(money.money.cents,
                                               response_code,
                                               gateway_options)
-          end
+                     end
 
           handle_response(response, :complete, :failure)
         end
@@ -60,14 +62,17 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          if payment_method.payment_profiles_supported?
-            # Gateways supporting payment profiles will need access to credit card object because this stores the payment profile information
-            # so supply the authorization itself as well as the credit card, rather than just the authorization code
-            response = payment_method.void(response_code, source, gateway_options)
-          else
-            # Standard ActiveMerchant void usage
-            response = payment_method.void(response_code, gateway_options)
-          end
+          response = if payment_method.payment_profiles_supported?
+                       # Gateways supporting payment profiles will need access to credit
+                       # card object because this stores the payment profile information
+                       # so supply the authorization itself as well as the credit card,
+                       # rather than just the authorization code
+                       payment_method.void(response_code, source, gateway_options)
+                     else
+                       # Standard ActiveMerchant void usage
+                       payment_method.void(response_code, gateway_options)
+                     end
+
           record_response(response)
 
           if response.success?
@@ -83,14 +88,28 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
+          credit_amount ||= if credit_allowed >= order.outstanding_balance.abs
+                              order.outstanding_balance.abs
+                            else
+                              credit_allowed.abs
+                            end
+
           credit_amount = credit_amount.to_f
 
-          if payment_method.payment_profiles_supported?
-            response = payment_method.credit((credit_amount * 100).round, source, response_code, gateway_options)
-          else
-            response = payment_method.credit((credit_amount * 100).round, response_code, gateway_options)
-          end
+          response = if payment_method.payment_profiles_supported?
+                       payment_method.credit(
+                         (credit_amount * 100).round,
+                         source,
+                         response_code,
+                         gateway_options
+                       )
+                     else
+                       payment_method.credit(
+                         (credit_amount * 100).round,
+                         response_code,
+                         gateway_options
+                       )
+                     end
 
           record_response(response)
 
@@ -115,11 +134,20 @@ module Spree
 
           refund_amount = calculate_refund_amount(refund_amount)
 
-          if payment_method.payment_profiles_supported?
-            response = payment_method.refund((refund_amount * 100).round, source, response_code, gateway_options)
-          else
-            response = payment_method.refund((refund_amount * 100).round, response_code, gateway_options)
-          end
+          response = if payment_method.payment_profiles_supported?
+                       payment_method.refund(
+                         (refund_amount * 100).round,
+                         source,
+                         response_code,
+                         gateway_options
+                       )
+                     else
+                       payment_method.refund(
+                         (refund_amount * 100).round,
+                         response_code,
+                         gateway_options
+                       )
+                     end
 
           record_response(response)
 
@@ -168,7 +196,11 @@ module Spree
       private
 
       def calculate_refund_amount(refund_amount = nil)
-        refund_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
+        refund_amount ||= if credit_allowed >= order.outstanding_balance.abs
+                            order.outstanding_balance.abs
+                          else
+                            credit_allowed.abs
+                          end
         refund_amount.to_f
       end
 
@@ -176,9 +208,12 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          response = payment_method.send(action, (amount * 100).round,
-                                         source,
-                                         gateway_options)
+          response = payment_method.public_send(
+            action,
+            (amount * 100).round,
+            source,
+            gateway_options
+          )
           handle_response(response, success_state, :failure)
         end
       end
@@ -196,9 +231,9 @@ module Spree
               self.cvv_response_message = response.cvv_result['message']
             end
           end
-          send("#{success_state}!")
+          __send__("#{success_state}!")
         else
-          send(failure_state)
+          __send__(failure_state)
           gateway_error(response)
         end
       end

From 3a64cc426adce209cfcf064fe7d9dd34e9df6532 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Mon, 13 Jul 2020 09:58:10 +0200
Subject: [PATCH 115/340] Reuse #calculate_refund_amount method

---
 app/models/spree/payment/processing.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 08a6ebd069..3d77de36fe 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -88,13 +88,7 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          credit_amount ||= if credit_allowed >= order.outstanding_balance.abs
-                              order.outstanding_balance.abs
-                            else
-                              credit_allowed.abs
-                            end
-
-          credit_amount = credit_amount.to_f
+          credit_amount = calculate_refund_amount(credit_amount)
 
           response = if payment_method.payment_profiles_supported?
                        payment_method.credit(

From 70afcee3fc29ae81f5712ec45c5acda013ac50ec Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 15 Jul 2020 14:18:36 +0200
Subject: [PATCH 116/340] Fix Spree's spec clashing with a customization

`#save_requested_by_customer` is an accessor we added and thus, the
Spree's spec didn't consider.
---
 spec/models/spree/payment_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 07559f5314..ee4c0bc93d 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -541,16 +541,17 @@ describe Spree::Payment do
         end
 
         context "when successfully connecting to the gateway" do
-          xit "should create a payment profile" do
+          it "should create a payment profile" do
             gateway.name = 'Gateway'
             gateway.distributors << create(:distributor_enterprise)
             gateway.save!
 
             payment.payment_method = gateway
+            payment.source.save_requested_by_customer = true
 
             expect(gateway).to receive(:create_profile)
 
-            payment = Spree::Payment.create(
+            Spree::Payment.create(
               :amount => 100,
               :order => create(:order),
               :source => card,

From 2ea026ea31c648a5306bc7459486429427374e99 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 26 Jun 2020 09:54:44 +0100
Subject: [PATCH 117/340] Bring controller helper auth from spree

---
 lib/spree/core/controller_helpers/auth.rb | 73 +++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 lib/spree/core/controller_helpers/auth.rb

diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
new file mode 100644
index 0000000000..762e1b910c
--- /dev/null
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -0,0 +1,73 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Auth
+        extend ActiveSupport::Concern
+
+        included do
+          before_filter :ensure_api_key
+          helper_method :try_spree_current_user
+
+          rescue_from CanCan::AccessDenied do |exception|
+            unauthorized
+          end
+        end
+
+        # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
+        def current_ability
+          @current_ability ||= Spree::Ability.new(try_spree_current_user)
+        end
+
+        # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
+        # Override this method in your controllers if you want to have special behavior in case the user is not authorized
+        # to access the requested action.  For example, a popup window might simply close itself.
+        def unauthorized
+          if try_spree_current_user
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to '/unauthorized'
+          else
+            store_location
+            redirect_to respond_to?(:spree_login_path) ? spree_login_path : spree.root_path
+          end
+        end
+
+        def store_location
+          # disallow return to login, logout, signup pages
+          authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]
+          disallowed_urls = []
+          authentication_routes.each do |route|
+            if respond_to?(route)
+              disallowed_urls << send(route)
+            end
+          end
+
+          disallowed_urls.map!{ |url| url[/\/\w+$/] }
+          unless disallowed_urls.include?(request.fullpath)
+            session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
+          end
+        end
+
+        # proxy method to *possible* spree_current_user method
+        # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
+        def try_spree_current_user
+          respond_to?(:spree_current_user) ? spree_current_user : nil
+        end
+
+        def redirect_back_or_default(default)
+          redirect_to(session["spree_user_return_to"] || default)
+          session["spree_user_return_to"] = nil
+        end
+
+        # Need to generate an API key for a user due to some actions potentially
+        # requiring authentication to the Spree API
+        def ensure_api_key
+          if user = try_spree_current_user
+            if user.respond_to?(:spree_api_key) && user.spree_api_key.blank?
+              user.generate_spree_api_key!
+            end
+          end
+        end
+      end
+    end
+  end
+end

From c8dd841c48f6c6df1f2a067c87e25bc8fc8c114c Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 26 Jun 2020 10:00:21 +0100
Subject: [PATCH 118/340] Fix some rubocop issues

---
 lib/spree/core/controller_helpers/auth.rb | 32 ++++++++++++-----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index 762e1b910c..408415141a 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ControllerHelpers
@@ -8,7 +10,7 @@ module Spree
           before_filter :ensure_api_key
           helper_method :try_spree_current_user
 
-          rescue_from CanCan::AccessDenied do |exception|
+          rescue_from CanCan::AccessDenied do
             unauthorized
           end
         end
@@ -18,9 +20,10 @@ module Spree
           @current_ability ||= Spree::Ability.new(try_spree_current_user)
         end
 
-        # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
-        # Override this method in your controllers if you want to have special behavior in case the user is not authorized
-        # to access the requested action.  For example, a popup window might simply close itself.
+        # Redirect as appropriate when an access request fails.  The default action is to redirect
+        #   to the login screen. Override this method in your controllers if you want to have
+        #   special behavior in case the user is not authorized to access the requested action.
+        # For example, a popup window might simply close itself.
         def unauthorized
           if try_spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
@@ -37,18 +40,17 @@ module Spree
           disallowed_urls = []
           authentication_routes.each do |route|
             if respond_to?(route)
-              disallowed_urls << send(route)
+              disallowed_urls << __send__(route)
             end
           end
 
           disallowed_urls.map!{ |url| url[/\/\w+$/] }
-          unless disallowed_urls.include?(request.fullpath)
-            session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
-          end
+          return if disallowed_urls.include?(request.fullpath)
+
+          session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
         end
 
-        # proxy method to *possible* spree_current_user method
-        # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
+        # This was a proxy method in spree, in OFN this just redirects to spree_current_user
         def try_spree_current_user
           respond_to?(:spree_current_user) ? spree_current_user : nil
         end
@@ -61,11 +63,11 @@ module Spree
         # Need to generate an API key for a user due to some actions potentially
         # requiring authentication to the Spree API
         def ensure_api_key
-          if user = try_spree_current_user
-            if user.respond_to?(:spree_api_key) && user.spree_api_key.blank?
-              user.generate_spree_api_key!
-            end
-          end
+          return unless (user = try_spree_current_user)
+
+          return unless user.respond_to?(:spree_api_key) && user.spree_api_key.blank?
+
+          user.generate_spree_api_key!
         end
       end
     end

From 7e75581da6ee22e0f907a86d8d89a25222811898 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 26 Jun 2020 10:01:12 +0100
Subject: [PATCH 119/340] Merge class brought from spree with decorator

---
 lib/spree/core/controller_helpers/auth.rb           | 4 ++++
 lib/spree/core/controller_helpers/auth_decorator.rb | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 lib/spree/core/controller_helpers/auth_decorator.rb

diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index 408415141a..8f28c27cb1 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -69,6 +69,10 @@ module Spree
 
           user.generate_spree_api_key!
         end
+
+        def require_login_then_redirect_to(url)
+          redirect_to main_app.root_path(anchor: "login?after_login=#{url}")
+        end
       end
     end
   end
diff --git a/lib/spree/core/controller_helpers/auth_decorator.rb b/lib/spree/core/controller_helpers/auth_decorator.rb
deleted file mode 100644
index 7342450c74..0000000000
--- a/lib/spree/core/controller_helpers/auth_decorator.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Spree::Core::ControllerHelpers::Auth.class_eval do
-  def require_login_then_redirect_to(url)
-    redirect_to main_app.root_path(anchor: "login?after_login=#{url}")
-  end
-end

From 4ee30d7cac0bf2ed5dc9005cefad1ae52b7cb6b2 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 26 Jun 2020 10:05:26 +0100
Subject: [PATCH 120/340] Remove spree.root route and respective controller.
 Also move unauthorized route to main app.

This route is no longer used in OFN
---
 app/controllers/spree/home_controller.rb  | 7 -------
 config/routes.rb                          | 1 +
 config/routes/spree.rb                    | 4 ----
 lib/spree/core/controller_helpers/auth.rb | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 app/controllers/spree/home_controller.rb

diff --git a/app/controllers/spree/home_controller.rb b/app/controllers/spree/home_controller.rb
deleted file mode 100644
index 9fbdabe940..0000000000
--- a/app/controllers/spree/home_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Spree
-  class HomeController < Spree::StoreController
-    respond_to :html
-
-    def index; end
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index ef3380ea79..a657f7f234 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,6 +9,7 @@ Openfoodnetwork::Application.routes.draw do
   get "/about_us", to: redirect(ContentConfig.footer_about_url)
 
   get "/login", to: redirect("/#/login")
+  get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
 
   get "/discourse/login", to: "discourse_sso#login"
   get "/discourse/sso", to: "discourse_sso#sso"
diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index ca5993aca5..3d29f74486 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -1,7 +1,5 @@
 # Overriding Devise routes to use our own controller
 Spree::Core::Engine.routes.draw do
-  root to: 'home#index'
-
   devise_for :spree_user,
              :class_name => 'Spree::User',
              :controllers => { :sessions => 'spree/user_sessions',
@@ -174,8 +172,6 @@ Spree::Core::Engine.routes.draw do
 
   # Used by spree_paypal_express
   get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-
-  get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
   get '/content/cvv', :to => 'content#cvv', :as => :cvv
   get '/content/*path', :to => 'content#show', :as => :content
 end
diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index 8f28c27cb1..7fb5672eff 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -30,7 +30,7 @@ module Spree
             redirect_to '/unauthorized'
           else
             store_location
-            redirect_to respond_to?(:spree_login_path) ? spree_login_path : spree.root_path
+            redirect_to(respond_to?(:spree_login_path) ? spree_login_path : main_app.root_path)
           end
         end
 

From 96839a03aa3f0a9cfccc42ffa1fbafc6baf696cb Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:23:21 +0100
Subject: [PATCH 121/340] Move lib/spree/core/controller_helpers.rb from spree

---
 lib/spree/core/controller_helpers.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 lib/spree/core/controller_helpers.rb

diff --git a/lib/spree/core/controller_helpers.rb b/lib/spree/core/controller_helpers.rb
new file mode 100644
index 0000000000..3df5251c9a
--- /dev/null
+++ b/lib/spree/core/controller_helpers.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Spree
+  module Core
+    module ControllerHelpers
+      def self.included(klass)
+        klass.class_eval do
+          include Spree::Core::ControllerHelpers::Common
+          include Spree::Core::ControllerHelpers::Auth
+          include Spree::Core::ControllerHelpers::RespondWith
+          include Spree::Core::ControllerHelpers::Order
+        end
+      end
+    end
+  end
+end

From 2452202e92d2770eccf4e96ceda5bdc6be656205 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:24:12 +0100
Subject: [PATCH 122/340] Move lib/spree/core/controller_helpers/common.rb from
 spree

---
 lib/spree/core/controller_helpers/common.rb | 86 +++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 lib/spree/core/controller_helpers/common.rb

diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb
new file mode 100644
index 0000000000..93fbb3b8c0
--- /dev/null
+++ b/lib/spree/core/controller_helpers/common.rb
@@ -0,0 +1,86 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Common
+        extend ActiveSupport::Concern
+        included do
+          helper_method :title
+          helper_method :title=
+          helper_method :accurate_title
+
+          layout :get_layout
+
+          before_filter :set_user_language
+
+          protected
+
+          # Convenience method for firing instrumentation events with the default payload hash
+          def fire_event(name, extra_payload = {})
+            ActiveSupport::Notifications.instrument(name, default_notification_payload.merge(extra_payload))
+          end
+
+          # Creates the hash that is sent as the payload for all notifications. Specific notifications will
+          # add additional keys as appropriate. Override this method if you need additional data when
+          # responding to a notification
+          def default_notification_payload
+            {:user => try_spree_current_user, :order => current_order}
+          end
+
+          # can be used in views as well as controllers.
+          # e.g. <% self.title = 'This is a custom title for this view' %>
+          attr_writer :title
+
+          def title
+            title_string = @title.present? ? @title : accurate_title
+            if title_string.present?
+              if Spree::Config[:always_put_site_name_in_title]
+                [title_string, default_title].join(' - ')
+              else
+                title_string
+              end
+            else
+              default_title
+            end
+          end
+
+          def default_title
+            Spree::Config[:site_name]
+          end
+
+          # this is a hook for subclasses to provide title
+          def accurate_title
+            Spree::Config[:default_seo_title]
+          end
+
+          def render_404(exception = nil)
+            respond_to do |type|
+              type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
+              type.all  { render :status => :not_found, :nothing => true }
+            end
+          end
+
+          private
+
+          def set_user_language
+            locale = session[:locale]
+            locale ||= config_locale if respond_to?(:config_locale, true)
+            locale ||= Rails.application.config.i18n.default_locale
+            locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
+            I18n.locale = locale
+          end
+
+          # Returns which layout to render.
+          # 
+          # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
+          # 
+          # Default layout is: +app/views/spree/layouts/spree_application+
+          # 
+          def get_layout
+            layout ||= Spree::Config[:layout]
+          end
+
+        end
+      end
+    end
+  end
+end

From 10849504c300416290d1b1751494a0ec69c25021 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:31:20 +0100
Subject: [PATCH 123/340] Fix easy rubocop issues

---
 lib/spree/core/controller_helpers/common.rb | 39 ++++++++++++---------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb
index 93fbb3b8c0..ca95fe79da 100644
--- a/lib/spree/core/controller_helpers/common.rb
+++ b/lib/spree/core/controller_helpers/common.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ControllerHelpers
@@ -16,22 +18,24 @@ module Spree
 
           # Convenience method for firing instrumentation events with the default payload hash
           def fire_event(name, extra_payload = {})
-            ActiveSupport::Notifications.instrument(name, default_notification_payload.merge(extra_payload))
+            ActiveSupport::Notifications.instrument(name, default_notification_payload.
+                                                            merge(extra_payload))
           end
 
-          # Creates the hash that is sent as the payload for all notifications. Specific notifications will
-          # add additional keys as appropriate. Override this method if you need additional data when
+          # Creates the hash that is sent as the payload for all notifications.
+          #   Specific notifications will add additional keys as appropriate.
+          #   This method can be overriden to provide additional data when
           # responding to a notification
           def default_notification_payload
-            {:user => try_spree_current_user, :order => current_order}
+            { user: try_spree_current_user, order: current_order }
           end
 
-          # can be used in views as well as controllers.
+          # This can be used in views as well as controllers.
           # e.g. <% self.title = 'This is a custom title for this view' %>
           attr_writer :title
 
           def title
-            title_string = @title.present? ? @title : accurate_title
+            title_string = @title.presence || accurate_title
             if title_string.present?
               if Spree::Config[:always_put_site_name_in_title]
                 [title_string, default_title].join(' - ')
@@ -47,15 +51,20 @@ module Spree
             Spree::Config[:site_name]
           end
 
-          # this is a hook for subclasses to provide title
+          # This is a hook for subclasses to provide title
           def accurate_title
             Spree::Config[:default_seo_title]
           end
 
-          def render_404(exception = nil)
+          def render_404(_exception = nil)
             respond_to do |type|
-              type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
-              type.all  { render :status => :not_found, :nothing => true }
+              type.html {
+                render status: :not_found,
+                       file: "#{::Rails.root}/public/404",
+                       formats: [:html],
+                       layout: nil
+              }
+              type.all { render status: :not_found, nothing: true }
             end
           end
 
@@ -65,20 +74,18 @@ module Spree
             locale = session[:locale]
             locale ||= config_locale if respond_to?(:config_locale, true)
             locale ||= Rails.application.config.i18n.default_locale
-            locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
+            unless I18n.available_locales.map(&:to_s).include?(locale)
+              locale ||= I18n.default_locale
+            end
             I18n.locale = locale
           end
 
           # Returns which layout to render.
-          # 
-          # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
-          # 
+          #   The layout to render can be set inside Spree configuration with the +:layout+ option.
           # Default layout is: +app/views/spree/layouts/spree_application+
-          # 
           def get_layout
             layout ||= Spree::Config[:layout]
           end
-
         end
       end
     end

From 23ff9d6fbb7c51b8bd418aba5fc53010f03aa6fb Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:32:12 +0100
Subject: [PATCH 124/340] Bring controller_helpers/order to OFN

---
 lib/spree/core/controller_helpers/order.rb | 77 ++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 lib/spree/core/controller_helpers/order.rb

diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
new file mode 100644
index 0000000000..1501aa9c93
--- /dev/null
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -0,0 +1,77 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Order
+        def self.included(base)
+          base.class_eval do
+            helper_method :current_order
+            helper_method :current_currency
+            before_filter :set_current_order
+          end
+        end
+
+        # The current incomplete order from the session for use in cart and during checkout
+        def current_order(create_order_if_necessary = false)
+          return @current_order if @current_order
+          if session[:order_id]
+            current_order = Spree::Order.includes(:adjustments).find_by(id: session[:order_id], currency: current_currency)
+            @current_order = current_order unless current_order.try(:completed?)
+          end
+          if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
+            @current_order = Spree::Order.new(currency: current_currency)
+            @current_order.user ||= try_spree_current_user
+            # See issue #3346 for reasons why this line is here
+            @current_order.created_by ||= try_spree_current_user
+            @current_order.save!
+
+            # make sure the user has permission to access the order (if they are a guest)
+            if try_spree_current_user.nil?
+              session[:access_token] = @current_order.token
+            end
+          end
+          if @current_order
+            @current_order.last_ip_address = ip_address
+            session[:order_id] = @current_order.id
+            return @current_order
+          end
+        end
+
+        def associate_user
+          @order ||= current_order
+          if try_spree_current_user && @order
+            @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?
+          end
+
+          # This will trigger any "first order" promotions to be triggered
+          # Assuming of course that this session variable was set correctly in
+          # the authentication provider's registrations controller
+          if session[:spree_user_signup] && @order
+            fire_event('spree.user.signup', user: try_spree_current_user, order: @order)
+            session[:spree_user_signup] = nil
+          end
+
+          session[:guest_token] = nil
+        end
+
+        def set_current_order
+          if user = try_spree_current_user
+            last_incomplete_order = user.last_incomplete_spree_order
+            if session[:order_id].nil? && last_incomplete_order
+              session[:order_id] = last_incomplete_order.id
+            elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
+              current_order.merge!(last_incomplete_order)
+            end
+          end
+        end
+
+        def current_currency
+          Spree::Config[:currency]
+        end
+
+        def ip_address
+          request.env['HTTP_X_REAL_IP'] || request.env['REMOTE_ADDR']
+        end
+      end
+    end
+  end
+end

From d5744572f7a02a93966b8e0c2ec1c6e677e297a3 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:39:09 +0100
Subject: [PATCH 125/340] Fix easy rubocop issues

---
 lib/spree/core/controller_helpers/order.rb | 49 +++++++++++++---------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index 1501aa9c93..2e4da0c5cd 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ControllerHelpers
@@ -10,43 +12,50 @@ module Spree
           end
         end
 
-        # The current incomplete order from the session for use in cart and during checkout
+        # The current incomplete session order used in cart and checkout
         def current_order(create_order_if_necessary = false)
           return @current_order if @current_order
+
           if session[:order_id]
-            current_order = Spree::Order.includes(:adjustments).find_by(id: session[:order_id], currency: current_currency)
+            current_order = Spree::Order.includes(:adjustments)
+              .find_by(id: session[:order_id], currency: current_currency)
             @current_order = current_order unless current_order.try(:completed?)
           end
-          if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
+
+          if create_order_if_necessary && (@current_order.nil? || @current_order.completed?)
             @current_order = Spree::Order.new(currency: current_currency)
             @current_order.user ||= try_spree_current_user
-            # See issue #3346 for reasons why this line is here
+            # See https://github.com/spree/spree/issues/3346 for reasons why this line is here
             @current_order.created_by ||= try_spree_current_user
             @current_order.save!
 
-            # make sure the user has permission to access the order (if they are a guest)
+            # Verify that the user has access to the order (if they are a guest)
             if try_spree_current_user.nil?
               session[:access_token] = @current_order.token
             end
           end
-          if @current_order
-            @current_order.last_ip_address = ip_address
-            session[:order_id] = @current_order.id
-            return @current_order
-          end
+
+          return unless @current_order
+
+          @current_order.last_ip_address = ip_address
+          session[:order_id] = @current_order.id
+          @current_order
         end
 
         def associate_user
           @order ||= current_order
           if try_spree_current_user && @order
-            @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?
+            if @order.user.blank? || @order.email.blank?
+              @order.associate_user!(try_spree_current_user)
+            end
           end
 
           # This will trigger any "first order" promotions to be triggered
           # Assuming of course that this session variable was set correctly in
           # the authentication provider's registrations controller
           if session[:spree_user_signup] && @order
-            fire_event('spree.user.signup', user: try_spree_current_user, order: @order)
+            fire_event('spree.user.signup', user: try_spree_current_user,
+                                            order: @order)
             session[:spree_user_signup] = nil
           end
 
@@ -54,13 +63,15 @@ module Spree
         end
 
         def set_current_order
-          if user = try_spree_current_user
-            last_incomplete_order = user.last_incomplete_spree_order
-            if session[:order_id].nil? && last_incomplete_order
-              session[:order_id] = last_incomplete_order.id
-            elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
-              current_order.merge!(last_incomplete_order)
-            end
+          return unless (user = try_spree_current_user)
+
+          last_incomplete_order = user.last_incomplete_spree_order
+          if session[:order_id].nil? && last_incomplete_order
+            session[:order_id] = last_incomplete_order.id
+          elsif current_order(true) &&
+                last_incomplete_order &&
+                current_order != last_incomplete_order
+            current_order.merge!(last_incomplete_order)
           end
         end
 

From 20f610fbee4f6a9e22bb77e3baa7fc6cb684a628 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:46:03 +0100
Subject: [PATCH 126/340] Merge controller_helpers/order with decorator

---
 lib/spree/core/controller_helpers/order.rb    | 22 +++++++++++--
 .../controller_helpers/order_decorator.rb     | 32 -------------------
 2 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 lib/spree/core/controller_helpers/order_decorator.rb

diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index 2e4da0c5cd..cfdce6b9b5 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open_food_network/scope_variant_to_hub'
+
 module Spree
   module Core
     module ControllerHelpers
@@ -12,8 +14,21 @@ module Spree
           end
         end
 
-        # The current incomplete session order used in cart and checkout
         def current_order(create_order_if_necessary = false)
+          order = spree_current_order(create_order_if_necessary)
+
+          if order
+            scoper = OpenFoodNetwork::ScopeVariantToHub.new(order.distributor)
+            order.line_items.each do |li|
+              scoper.scope(li.variant)
+            end
+          end
+
+          order
+        end
+
+        # The current incomplete session order used in cart and checkout
+        def spree_current_order(create_order_if_necessary = false)
           return @current_order if @current_order
 
           if session[:order_id]
@@ -62,16 +77,19 @@ module Spree
           session[:guest_token] = nil
         end
 
+        # Do not attempt to merge incomplete and current orders.
+        #   Instead, destroy the incomplete orders.
         def set_current_order
           return unless (user = try_spree_current_user)
 
           last_incomplete_order = user.last_incomplete_spree_order
+
           if session[:order_id].nil? && last_incomplete_order
             session[:order_id] = last_incomplete_order.id
           elsif current_order(true) &&
                 last_incomplete_order &&
                 current_order != last_incomplete_order
-            current_order.merge!(last_incomplete_order)
+            last_incomplete_order.destroy
           end
         end
 
diff --git a/lib/spree/core/controller_helpers/order_decorator.rb b/lib/spree/core/controller_helpers/order_decorator.rb
deleted file mode 100644
index 6da1b42ee6..0000000000
--- a/lib/spree/core/controller_helpers/order_decorator.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'open_food_network/scope_variant_to_hub'
-
-Spree::Core::ControllerHelpers::Order.class_eval do
-  def current_order_with_scoped_variants(create_order_if_necessary = false)
-    order = current_order_without_scoped_variants(create_order_if_necessary)
-
-    if order
-      scoper = OpenFoodNetwork::ScopeVariantToHub.new(order.distributor)
-      order.line_items.each do |li|
-        scoper.scope(li.variant)
-      end
-    end
-
-    order
-  end
-  alias_method_chain :current_order, :scoped_variants
-
-  # Override definition in Spree::Core::ControllerHelpers::Order
-  # Do not attempt to merge incomplete and current orders. Instead, destroy the incomplete orders.
-  def set_current_order
-    if user = try_spree_current_user
-      last_incomplete_order = user.last_incomplete_spree_order
-
-      if session[:order_id].nil? && last_incomplete_order
-        session[:order_id] = last_incomplete_order.id
-
-      elsif current_order && last_incomplete_order && current_order != last_incomplete_order
-        last_incomplete_order.destroy
-      end
-    end
-  end
-end

From 1167a1a9bb5a78cfe04deaa5b3eccf90b79b2618 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:46:52 +0100
Subject: [PATCH 127/340] Bring ControllerHelpers respond_with from spree

---
 .../core/controller_helpers/respond_with.rb   | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 lib/spree/core/controller_helpers/respond_with.rb

diff --git a/lib/spree/core/controller_helpers/respond_with.rb b/lib/spree/core/controller_helpers/respond_with.rb
new file mode 100644
index 0000000000..e85777cb74
--- /dev/null
+++ b/lib/spree/core/controller_helpers/respond_with.rb
@@ -0,0 +1,70 @@
+module ActionController
+  class Base
+    def respond_with(*resources, &block)
+      raise "In order to use respond_with, first you need to declare the formats your " <<
+            "controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
+
+      if collector = retrieve_collector_from_mimes(&block)
+        options = resources.size == 1 ? {} : resources.extract_options!
+
+        if defined_response = collector.response and !Spree::BaseController.spree_responders.keys.include?(self.class.to_s.to_sym)
+          if action = options.delete(:action)
+            render :action => action
+          else
+            defined_response.call
+          end
+        else
+          # The action name is needed for processing
+          options.merge!(:action_name => action_name.to_sym)
+          # If responder is not specified then pass in Spree::Responder
+          (options.delete(:responder) || Spree::Responder).call(self, resources, options)
+        end
+      end
+    end
+  end
+end
+
+module Spree
+  module Core
+    module ControllerHelpers
+      module RespondWith
+        extend ActiveSupport::Concern
+
+        included do
+          cattr_accessor :spree_responders
+          self.spree_responders = {}
+        end
+
+        module ClassMethods
+          def clear_overrides!
+            self.spree_responders = {}
+          end
+
+          def respond_override(options={})
+            unless options.blank?
+              action_name = options.keys.first
+              action_value = options.values.first
+
+              if action_name.blank? || action_value.blank?
+                raise ArgumentError, "invalid values supplied #{options.inspect}"
+              end
+
+              format_name = action_value.keys.first
+              format_value = action_value.values.first
+
+              if format_name.blank? || format_value.blank?
+                raise ArgumentError, "invalid values supplied #{options.inspect}"
+              end
+
+              if format_value.is_a?(Proc)
+                options = {action_name.to_sym => {format_name.to_sym => {:success => format_value}}}
+              end
+
+              self.spree_responders.deep_merge!(self.name.to_sym => options)
+            end
+          end
+        end
+      end
+    end
+  end
+end

From a3ea4b757d7d6fc3016f769d537ee1f6e93b30c2 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:48:12 +0100
Subject: [PATCH 128/340] Merge decorator into the class brought from spree

---
 .../core/controller_helpers/respond_with.rb   | 13 +++++----
 .../respond_with_decorator.rb                 | 28 -------------------
 2 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 lib/spree/core/controller_helpers/respond_with_decorator.rb

diff --git a/lib/spree/core/controller_helpers/respond_with.rb b/lib/spree/core/controller_helpers/respond_with.rb
index e85777cb74..5e83391d78 100644
--- a/lib/spree/core/controller_helpers/respond_with.rb
+++ b/lib/spree/core/controller_helpers/respond_with.rb
@@ -1,21 +1,24 @@
 module ActionController
   class Base
     def respond_with(*resources, &block)
-      raise "In order to use respond_with, first you need to declare the formats your " <<
-            "controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
+      if self.class.mimes_for_respond_to.empty?
+        raise "In order to use respond_with, first you need to declare the formats your " \
+              "controller responds to in the class level"
+      end
 
       if collector = retrieve_collector_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
 
-        if defined_response = collector.response and !Spree::BaseController.spree_responders.keys.include?(self.class.to_s.to_sym)
+        # Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
+        if (defined_response = collector.response) && !Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[], action_name.to_sym)
           if action = options.delete(:action)
-            render :action => action
+            render action: action
           else
             defined_response.call
           end
         else
           # The action name is needed for processing
-          options.merge!(:action_name => action_name.to_sym)
+          options[:action_name] = action_name.to_sym
           # If responder is not specified then pass in Spree::Responder
           (options.delete(:responder) || Spree::Responder).call(self, resources, options)
         end
diff --git a/lib/spree/core/controller_helpers/respond_with_decorator.rb b/lib/spree/core/controller_helpers/respond_with_decorator.rb
deleted file mode 100644
index 522247ea01..0000000000
--- a/lib/spree/core/controller_helpers/respond_with_decorator.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module ActionController
-  class Base
-    def respond_with(*resources, &block)
-      if self.class.mimes_for_respond_to.empty?
-        raise "In order to use respond_with, first you need to declare the formats your " \
-              "controller responds to in the class level"
-      end
-
-      if collector = retrieve_collector_from_mimes(&block)
-        options = resources.size == 1 ? {} : resources.extract_options!
-
-        # Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
-        if (defined_response = collector.response) && !Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[], action_name.to_sym)
-          if action = options.delete(:action)
-            render action: action
-          else
-            defined_response.call
-          end
-        else
-          # The action name is needed for processing
-          options[:action_name] = action_name.to_sym
-          # If responder is not specified then pass in Spree::Responder
-          (options.delete(:responder) || Spree::Responder).call(self, resources, options)
-        end
-      end
-    end
-  end
-end

From 643a82c73c672d66721d573979340b2cc4f4912b Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:52:18 +0100
Subject: [PATCH 129/340] Fix easy rubocop issues, some early returns make the
 indentation changes

---
 .../core/controller_helpers/respond_with.rb   | 70 ++++++++++---------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/lib/spree/core/controller_helpers/respond_with.rb b/lib/spree/core/controller_helpers/respond_with.rb
index 5e83391d78..6b3e7129ca 100644
--- a/lib/spree/core/controller_helpers/respond_with.rb
+++ b/lib/spree/core/controller_helpers/respond_with.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionController
   class Base
     def respond_with(*resources, &block)
@@ -6,22 +8,24 @@ module ActionController
               "controller responds to in the class level"
       end
 
-      if collector = retrieve_collector_from_mimes(&block)
-        options = resources.size == 1 ? {} : resources.extract_options!
+      return unless (collector = retrieve_collector_from_mimes(&block))
 
-        # Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
-        if (defined_response = collector.response) && !Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[], action_name.to_sym)
-          if action = options.delete(:action)
-            render action: action
-          else
-            defined_response.call
-          end
+      options = resources.size == 1 ? {} : resources.extract_options!
+
+      # Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
+      if (defined_response = collector.response) &&
+         !Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[],
+                                                                             action_name.to_sym)
+        if action = options.delete(:action)
+          render action: action
         else
-          # The action name is needed for processing
-          options[:action_name] = action_name.to_sym
-          # If responder is not specified then pass in Spree::Responder
-          (options.delete(:responder) || Spree::Responder).call(self, resources, options)
+          defined_response.call
         end
+      else
+        # The action name is needed for processing
+        options[:action_name] = action_name.to_sym
+        # If responder is not specified then pass in Spree::Responder
+        (options.delete(:responder) || Spree::Responder).call(self, resources, options)
       end
     end
   end
@@ -43,28 +47,30 @@ module Spree
             self.spree_responders = {}
           end
 
-          def respond_override(options={})
-            unless options.blank?
-              action_name = options.keys.first
-              action_value = options.values.first
+          def respond_override(options = {})
+            return if options.blank?
 
-              if action_name.blank? || action_value.blank?
-                raise ArgumentError, "invalid values supplied #{options.inspect}"
-              end
+            action_name = options.keys.first
+            action_value = options.values.first
 
-              format_name = action_value.keys.first
-              format_value = action_value.values.first
-
-              if format_name.blank? || format_value.blank?
-                raise ArgumentError, "invalid values supplied #{options.inspect}"
-              end
-
-              if format_value.is_a?(Proc)
-                options = {action_name.to_sym => {format_name.to_sym => {:success => format_value}}}
-              end
-
-              self.spree_responders.deep_merge!(self.name.to_sym => options)
+            if action_name.blank? || action_value.blank?
+              raise ArgumentError, "invalid values supplied #{options.inspect}"
             end
+
+            format_name = action_value.keys.first
+            format_value = action_value.values.first
+
+            if format_name.blank? || format_value.blank?
+              raise ArgumentError, "invalid values supplied #{options.inspect}"
+            end
+
+            if format_value.is_a?(Proc)
+              options = {
+                action_name.to_sym => { format_name.to_sym => { success: format_value } }
+              }
+            end
+
+            spree_responders.deep_merge!(name.to_sym => options)
           end
         end
       end

From 97f00153ad94a16ed9167d8c7f425c1fe8d0c362 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 12:55:33 +0100
Subject: [PATCH 130/340] Bring controller_helpers/ssl.rb from spree

---
 lib/spree/core/controller_helpers/ssl.rb | 53 ++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 lib/spree/core/controller_helpers/ssl.rb

diff --git a/lib/spree/core/controller_helpers/ssl.rb b/lib/spree/core/controller_helpers/ssl.rb
new file mode 100644
index 0000000000..feb0487377
--- /dev/null
+++ b/lib/spree/core/controller_helpers/ssl.rb
@@ -0,0 +1,53 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module SSL
+        extend ActiveSupport::Concern
+
+        included do
+          before_filter :force_non_ssl_redirect, :if => Proc.new { Spree::Config[:redirect_https_to_http] }
+
+          def self.ssl_allowed(*actions)
+            class_attribute :ssl_allowed_actions
+            self.ssl_allowed_actions = actions
+          end
+
+          def self.ssl_required(*actions)
+            class_attribute :ssl_required_actions
+            self.ssl_required_actions = actions
+            if ssl_supported?
+              if ssl_required_actions.empty? or Rails.application.config.force_ssl
+                force_ssl
+              else
+                force_ssl :only => ssl_required_actions
+              end
+            end
+          end
+
+          def self.ssl_supported?
+            return Spree::Config[:allow_ssl_in_production] if Rails.env.production?
+            return Spree::Config[:allow_ssl_in_staging] if Rails.env.staging?
+            return Spree::Config[:allow_ssl_in_development_and_test] if (Rails.env.development? or Rails.env.test?)
+          end
+
+          private
+
+            # Redirect the existing request to use the HTTP protocol.
+            #
+            # ==== Parameters
+            # * <tt>host</tt> - Redirect to a different host name
+            def force_non_ssl_redirect(host = nil)
+              return true if defined?(ssl_allowed_actions) and ssl_allowed_actions.include?(action_name.to_sym)
+              if request.ssl? and (!defined?(ssl_required_actions) or !ssl_required_actions.include?(action_name.to_sym))
+                redirect_options = {:protocol => 'http://', :status => :moved_permanently}
+                redirect_options.merge!(:host => host) if host
+                redirect_options.merge!(:params => request.query_parameters)
+                flash.keep if respond_to?(:flash)
+                redirect_to redirect_options
+              end
+            end
+        end
+      end
+    end
+  end
+end

From 046c5f65852685d4db9c577a2f297856e62dd6b6 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 13:00:32 +0100
Subject: [PATCH 131/340] Fix easy rubocop issues

---
 lib/spree/core/controller_helpers/ssl.rb | 52 ++++++++++++++----------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/lib/spree/core/controller_helpers/ssl.rb b/lib/spree/core/controller_helpers/ssl.rb
index feb0487377..6c923e4977 100644
--- a/lib/spree/core/controller_helpers/ssl.rb
+++ b/lib/spree/core/controller_helpers/ssl.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ControllerHelpers
@@ -5,7 +7,7 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          before_filter :force_non_ssl_redirect, :if => Proc.new { Spree::Config[:redirect_https_to_http] }
+          before_filter :force_non_ssl_redirect, if: proc { Spree::Config[:redirect_https_to_http] }
 
           def self.ssl_allowed(*actions)
             class_attribute :ssl_allowed_actions
@@ -15,37 +17,43 @@ module Spree
           def self.ssl_required(*actions)
             class_attribute :ssl_required_actions
             self.ssl_required_actions = actions
-            if ssl_supported?
-              if ssl_required_actions.empty? or Rails.application.config.force_ssl
-                force_ssl
-              else
-                force_ssl :only => ssl_required_actions
-              end
+            return unless ssl_supported?
+
+            if ssl_required_actions.empty? || Rails.application.config.force_ssl
+              force_ssl
+            else
+              force_ssl only: ssl_required_actions
             end
           end
 
           def self.ssl_supported?
             return Spree::Config[:allow_ssl_in_production] if Rails.env.production?
             return Spree::Config[:allow_ssl_in_staging] if Rails.env.staging?
-            return Spree::Config[:allow_ssl_in_development_and_test] if (Rails.env.development? or Rails.env.test?)
+            return unless Rails.env.development? || Rails.env.test?
+
+            Spree::Config[:allow_ssl_in_development_and_test]
           end
 
           private
 
-            # Redirect the existing request to use the HTTP protocol.
-            #
-            # ==== Parameters
-            # * <tt>host</tt> - Redirect to a different host name
-            def force_non_ssl_redirect(host = nil)
-              return true if defined?(ssl_allowed_actions) and ssl_allowed_actions.include?(action_name.to_sym)
-              if request.ssl? and (!defined?(ssl_required_actions) or !ssl_required_actions.include?(action_name.to_sym))
-                redirect_options = {:protocol => 'http://', :status => :moved_permanently}
-                redirect_options.merge!(:host => host) if host
-                redirect_options.merge!(:params => request.query_parameters)
-                flash.keep if respond_to?(:flash)
-                redirect_to redirect_options
-              end
-            end
+          # Redirect the existing request to use the HTTP protocol.
+          #
+          # ==== Parameters
+          # * <tt>host</tt> - Redirect to a different host name
+          def force_non_ssl_redirect(host = nil)
+            return true if defined?(ssl_allowed_actions) &&
+                           ssl_allowed_actions.include?(action_name.to_sym)
+
+            return unless request.ssl? &&
+                          (!defined?(ssl_required_actions) ||
+                           !ssl_required_actions.include?(action_name.to_sym))
+
+            redirect_options = { protocol: 'http://', status: :moved_permanently }
+            redirect_options.merge!(host: host) if host
+            redirect_options.merge!(params: request.query_parameters)
+            flash.keep if respond_to?(:flash)
+            redirect_to redirect_options
+          end
         end
       end
     end

From d2e52f3136c078b6159c96d226e9ca7eb804bed5 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 13:51:02 +0100
Subject: [PATCH 132/340] Update rubocop manual todo

---
 .rubocop_manual_todo.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index e4eea50ed8..446be30aec 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -108,7 +108,6 @@ Layout/LineLength:
   - lib/open_food_network/scope_variants_for_search.rb
   - lib/open_food_network/variant_and_line_item_naming.rb
   - lib/open_food_network/xero_invoices_report.rb
-  - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
   - lib/spree/product_filters.rb
   - lib/tasks/data.rake
@@ -427,7 +426,9 @@ Metrics/AbcSize:
   - lib/open_food_network/variant_and_line_item_naming.rb
   - lib/open_food_network/xero_invoices_report.rb
   - lib/spree/api/controller_setup.rb
-  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/core/controller_helpers/order.rb
+  - lib/spree/core/controller_helpers/respond_with.rb
+  - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - lib/stripe/account_connector.rb
   - lib/tasks/enterprises.rake
@@ -461,6 +462,8 @@ Metrics/BlockLength:
   ]
   Exclude:
   - app/models/spree/shipment.rb
+  - lib/spree/core/controller_helpers/common.rb
+  - lib/spree/core/controller_helpers/ssl.rb
   - lib/tasks/data.rake
   - spec/controllers/spree/admin/invoices_controller_spec.rb
   - spec/factories/enterprise_factory.rb
@@ -505,8 +508,9 @@ Metrics/CyclomaticComplexity:
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/controller_helpers/order_decorator.rb
-  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/core/controller_helpers/order.rb
+  - lib/spree/core/controller_helpers/respond_with.rb
+  - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
 
@@ -530,8 +534,9 @@ Metrics/PerceivedComplexity:
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/controller_helpers/order_decorator.rb
-  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/core/controller_helpers/order.rb
+  - lib/spree/core/controller_helpers/respond_with.rb
+  - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
 
@@ -626,7 +631,10 @@ Metrics/MethodLength:
   - lib/open_food_network/users_and_enterprises_report.rb
   - lib/open_food_network/xero_invoices_report.rb
   - lib/spree/api/controller_setup.rb
-  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/core/controller_helpers/auth.rb
+  - lib/spree/core/controller_helpers/order.rb
+  - lib/spree/core/controller_helpers/respond_with.rb
+  - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - lib/stripe/profile_storer.rb
   - lib/tasks/data/truncate_data.rb

From 144811268ebe411191e9a1a87d1153c56ccd03c0 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 13:52:53 +0100
Subject: [PATCH 133/340] Adapt require statements to new undecorated classes

---
 app/controllers/base_controller.rb         | 2 +-
 app/controllers/cart_controller.rb         | 2 +-
 app/controllers/spree/orders_controller.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
index 6cf878a077..8fcdac8fe4 100644
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,4 +1,4 @@
-require 'spree/core/controller_helpers/respond_with_decorator'
+require 'spree/core/controller_helpers/respond_with'
 require 'open_food_network/tag_rule_applicator'
 
 class BaseController < ApplicationController
diff --git a/app/controllers/cart_controller.rb b/app/controllers/cart_controller.rb
index 997573899c..1fbf1b2b94 100644
--- a/app/controllers/cart_controller.rb
+++ b/app/controllers/cart_controller.rb
@@ -1,4 +1,4 @@
-require 'spree/core/controller_helpers/order_decorator'
+require 'spree/core/controller_helpers/order'
 
 class CartController < BaseController
   before_action :check_authorization
diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb
index 545ae1ce60..102cca2520 100644
--- a/app/controllers/spree/orders_controller.rb
+++ b/app/controllers/spree/orders_controller.rb
@@ -1,5 +1,5 @@
-require 'spree/core/controller_helpers/order_decorator'
-require 'spree/core/controller_helpers/auth_decorator'
+require 'spree/core/controller_helpers/order'
+require 'spree/core/controller_helpers/auth'
 
 module Spree
   class OrdersController < Spree::StoreController

From 1666ffb191c30e2fe673991daadf0d58c92aebdd Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 16:08:52 +0100
Subject: [PATCH 134/340] Remove try_spree_current_user

This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers
---
 app/controllers/api/base_controller.rb             |  2 +-
 app/controllers/enterprises_controller.rb          |  2 +-
 app/controllers/spree/admin/base_controller.rb     |  2 +-
 .../spree/admin/mail_methods_controller.rb         |  2 +-
 app/controllers/spree/admin/orders_controller.rb   |  2 +-
 app/views/spree/layouts/_admin_body.html.haml      |  2 +-
 lib/spree/core/controller_helpers/auth.rb          | 12 +++---------
 lib/spree/core/controller_helpers/common.rb        |  2 +-
 lib/spree/core/controller_helpers/order.rb         | 14 +++++++-------
 spec/controllers/api/base_controller_spec.rb       |  2 +-
 .../spree/admin/mail_methods_controller_spec.rb    |  6 ++++--
 11 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 344dd89174..423a4fb104 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -53,7 +53,7 @@ module Api
 
     # Use logged in user (spree_current_user) for API authentication (current_api_user)
     def authenticate_user
-      return if @current_api_user = try_spree_current_user
+      return if @current_api_user = spree_current_user
 
       if api_key.blank?
         # An anonymous user
diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb
index 6d640b5d7b..7488fa8c4d 100644
--- a/app/controllers/enterprises_controller.rb
+++ b/app/controllers/enterprises_controller.rb
@@ -68,7 +68,7 @@ class EnterprisesController < BaseController
     # reset_distributor must be called before any call to current_customer or current_distributor
     order_cart_reset = OrderCartReset.new(order, params[:id])
     order_cart_reset.reset_distributor
-    order_cart_reset.reset_other!(try_spree_current_user, current_customer)
+    order_cart_reset.reset_other!(spree_current_user, current_customer)
   rescue ActiveRecord::RecordNotFound
     flash[:error] = I18n.t(:enterprise_shop_show_error)
     redirect_to shops_path
diff --git a/app/controllers/spree/admin/base_controller.rb b/app/controllers/spree/admin/base_controller.rb
index 7ce02d4a38..4f9cdbb4d0 100644
--- a/app/controllers/spree/admin/base_controller.rb
+++ b/app/controllers/spree/admin/base_controller.rb
@@ -24,7 +24,7 @@ module Spree
       # This is in Spree::Core::ControllerHelpers::Auth
       # But you can't easily reopen modules in Ruby
       def unauthorized
-        if try_spree_current_user
+        if spree_current_user
           flash[:error] = t(:authorization_failure)
           redirect_to '/unauthorized'
         else
diff --git a/app/controllers/spree/admin/mail_methods_controller.rb b/app/controllers/spree/admin/mail_methods_controller.rb
index aba6ad239f..70d573f319 100644
--- a/app/controllers/spree/admin/mail_methods_controller.rb
+++ b/app/controllers/spree/admin/mail_methods_controller.rb
@@ -15,7 +15,7 @@ module Spree
       end
 
       def testmail
-        if TestMailer.test_email(try_spree_current_user).deliver
+        if TestMailer.test_email(spree_current_user).deliver
           flash[:success] = Spree.t('admin.mail_methods.testmail.delivery_success')
         else
           flash[:error] = Spree.t('admin.mail_methods.testmail.delivery_error')
diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb
index 22715108e9..8cde99be81 100644
--- a/app/controllers/spree/admin/orders_controller.rb
+++ b/app/controllers/spree/admin/orders_controller.rb
@@ -27,7 +27,7 @@ module Spree
 
       def new
         @order = Order.create
-        @order.created_by = try_spree_current_user
+        @order.created_by = spree_current_user
         @order.save
         redirect_to edit_admin_order_url(@order)
       end
diff --git a/app/views/spree/layouts/_admin_body.html.haml b/app/views/spree/layouts/_admin_body.html.haml
index d5aa05dbee..7b1d643dee 100644
--- a/app/views/spree/layouts/_admin_body.html.haml
+++ b/app/views/spree/layouts/_admin_body.html.haml
@@ -66,4 +66,4 @@
 %div{"data-hook" => "admin_footer_scripts"}
 
 %script
-  = raw "Spree.api_key = \"#{try_spree_current_user.try(:spree_api_key).to_s}\";"
+  = raw "Spree.api_key = \"#{spree_current_user.try(:spree_api_key).to_s}\";"
diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index 7fb5672eff..494d45eaa9 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -8,7 +8,6 @@ module Spree
 
         included do
           before_filter :ensure_api_key
-          helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do
             unauthorized
@@ -17,7 +16,7 @@ module Spree
 
         # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Ability.new(try_spree_current_user)
+          @current_ability ||= Spree::Ability.new(spree_current_user)
         end
 
         # Redirect as appropriate when an access request fails.  The default action is to redirect
@@ -25,7 +24,7 @@ module Spree
         #   special behavior in case the user is not authorized to access the requested action.
         # For example, a popup window might simply close itself.
         def unauthorized
-          if try_spree_current_user
+          if spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
             redirect_to '/unauthorized'
           else
@@ -50,11 +49,6 @@ module Spree
           session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
         end
 
-        # This was a proxy method in spree, in OFN this just redirects to spree_current_user
-        def try_spree_current_user
-          respond_to?(:spree_current_user) ? spree_current_user : nil
-        end
-
         def redirect_back_or_default(default)
           redirect_to(session["spree_user_return_to"] || default)
           session["spree_user_return_to"] = nil
@@ -63,7 +57,7 @@ module Spree
         # Need to generate an API key for a user due to some actions potentially
         # requiring authentication to the Spree API
         def ensure_api_key
-          return unless (user = try_spree_current_user)
+          return unless (user = spree_current_user)
 
           return unless user.respond_to?(:spree_api_key) && user.spree_api_key.blank?
 
diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb
index ca95fe79da..e88920eaf6 100644
--- a/lib/spree/core/controller_helpers/common.rb
+++ b/lib/spree/core/controller_helpers/common.rb
@@ -27,7 +27,7 @@ module Spree
           #   This method can be overriden to provide additional data when
           # responding to a notification
           def default_notification_payload
-            { user: try_spree_current_user, order: current_order }
+            { user: spree_current_user, order: current_order }
           end
 
           # This can be used in views as well as controllers.
diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index cfdce6b9b5..0d979b33d6 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -39,13 +39,13 @@ module Spree
 
           if create_order_if_necessary && (@current_order.nil? || @current_order.completed?)
             @current_order = Spree::Order.new(currency: current_currency)
-            @current_order.user ||= try_spree_current_user
+            @current_order.user ||= spree_current_user
             # See https://github.com/spree/spree/issues/3346 for reasons why this line is here
-            @current_order.created_by ||= try_spree_current_user
+            @current_order.created_by ||= spree_current_user
             @current_order.save!
 
             # Verify that the user has access to the order (if they are a guest)
-            if try_spree_current_user.nil?
+            if spree_current_user.nil?
               session[:access_token] = @current_order.token
             end
           end
@@ -59,9 +59,9 @@ module Spree
 
         def associate_user
           @order ||= current_order
-          if try_spree_current_user && @order
+          if spree_current_user && @order
             if @order.user.blank? || @order.email.blank?
-              @order.associate_user!(try_spree_current_user)
+              @order.associate_user!(spree_current_user)
             end
           end
 
@@ -69,7 +69,7 @@ module Spree
           # Assuming of course that this session variable was set correctly in
           # the authentication provider's registrations controller
           if session[:spree_user_signup] && @order
-            fire_event('spree.user.signup', user: try_spree_current_user,
+            fire_event('spree.user.signup', user: spree_current_user,
                                             order: @order)
             session[:spree_user_signup] = nil
           end
@@ -80,7 +80,7 @@ module Spree
         # Do not attempt to merge incomplete and current orders.
         #   Instead, destroy the incomplete orders.
         def set_current_order
-          return unless (user = try_spree_current_user)
+          return unless (user = spree_current_user)
 
           last_incomplete_order = user.last_incomplete_spree_order
 
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index d501aa98fb..1ebd3eca15 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -14,7 +14,7 @@ describe Api::BaseController do
 
   context "signed in as a user using an authentication extension" do
     before do
-      allow(controller).to receive_messages try_spree_current_user:
+      allow(controller).to receive_messages spree_current_user:
                                               double(email: "ofn@example.com")
     end
 
diff --git a/spec/controllers/spree/admin/mail_methods_controller_spec.rb b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
index 422491660e..1a706462a7 100644
--- a/spec/controllers/spree/admin/mail_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
@@ -18,8 +18,10 @@ describe Spree::Admin::MailMethodsController do
                           spree_api_key: 'fake',
                           id: nil,
                           owned_groups: nil)
-    allow(user).to receive_messages(enterprises: [create(:enterprise)], has_spree_role?: true)
-    allow(controller).to receive_messages(try_spree_current_user: user)
+    allow(user).to receive_messages(enterprises: [create(:enterprise)],
+                                    has_spree_role?: true,
+                                    locale: nil)
+    allow(controller).to receive_messages(spree_current_user: user)
     Spree::Config[:enable_mail_delivery] = "1"
     ActionMailer::Base.perform_deliveries = true
 

From bf3150ddc8e105910973cc48b7148f10b8acca1d Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 16:44:46 +0100
Subject: [PATCH 135/340] Delete spree_user_signup which is from spree
 promotions code that we dont use

---
 app/controllers/spree/user_registrations_controller.rb | 1 -
 app/controllers/user_registrations_controller.rb       | 1 -
 lib/spree/core/controller_helpers/order.rb             | 9 ---------
 3 files changed, 11 deletions(-)

diff --git a/app/controllers/spree/user_registrations_controller.rb b/app/controllers/spree/user_registrations_controller.rb
index a55d327ae2..98ad3c8d1c 100644
--- a/app/controllers/spree/user_registrations_controller.rb
+++ b/app/controllers/spree/user_registrations_controller.rb
@@ -23,7 +23,6 @@ module Spree
       if resource.save
         set_flash_message(:notice, :signed_up)
         sign_in(:spree_user, @user)
-        session[:spree_user_signup] = true
         associate_user
         respond_with resource, location: after_sign_up_path_for(resource)
       else
diff --git a/app/controllers/user_registrations_controller.rb b/app/controllers/user_registrations_controller.rb
index d6fdf5ac76..f02309bf71 100644
--- a/app/controllers/user_registrations_controller.rb
+++ b/app/controllers/user_registrations_controller.rb
@@ -16,7 +16,6 @@ class UserRegistrationsController < Spree::UserRegistrationsController
       return render_error(@user.errors)
     end
 
-    session[:spree_user_signup] = true
     session[:confirmation_return_url] = params[:return_url]
     associate_user
 
diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index 0d979b33d6..1df01e286a 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -65,15 +65,6 @@ module Spree
             end
           end
 
-          # This will trigger any "first order" promotions to be triggered
-          # Assuming of course that this session variable was set correctly in
-          # the authentication provider's registrations controller
-          if session[:spree_user_signup] && @order
-            fire_event('spree.user.signup', user: spree_current_user,
-                                            order: @order)
-            session[:spree_user_signup] = nil
-          end
-
           session[:guest_token] = nil
         end
 

From 7f1797de5833e7ee241c503b7a912e618cc0d9d9 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 17:43:57 +0100
Subject: [PATCH 136/340] Adapt specs to the move of unauthorized route from
 the spree routes to the main app routes

---
 .../admin/bulk_line_items_controller_spec.rb  |  6 +++---
 .../admin/customers_controller_spec.rb        |  4 ++--
 .../admin/enterprises_controller_spec.rb      |  4 ++--
 .../admin/inventory_items_controller_spec.rb  |  8 ++++----
 .../admin/proxy_orders_controller_spec.rb     |  8 ++++----
 .../admin/schedules_controller_spec.rb        |  2 +-
 .../admin/stripe_accounts_controller_spec.rb  |  4 ++--
 ...stripe_connect_settings_controller_spec.rb |  4 ++--
 .../admin/subscriptions_controller_spec.rb    | 20 +++++++++----------
 .../admin/tag_rules_controller_spec.rb        |  2 +-
 .../variant_overrides_controller_spec.rb      | 10 +++++-----
 .../spree/admin/orders_controller_spec.rb     | 10 +++++-----
 .../spree/admin/products_controller_spec.rb   |  2 +-
 .../spree/credit_cards_controller_spec.rb     |  4 ++--
 .../stripe/callbacks_controller_spec.rb       |  2 +-
 15 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/spec/controllers/admin/bulk_line_items_controller_spec.rb b/spec/controllers/admin/bulk_line_items_controller_spec.rb
index 941b44eb0c..553e796558 100644
--- a/spec/controllers/admin/bulk_line_items_controller_spec.rb
+++ b/spec/controllers/admin/bulk_line_items_controller_spec.rb
@@ -21,7 +21,7 @@ describe Admin::BulkLineItemsController, type: :controller do
 
       it "should deny me access to the index action" do
         spree_get :index, format: :json
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -94,7 +94,7 @@ describe Admin::BulkLineItemsController, type: :controller do
         end
 
         it "does not display line items for which my enterprise is a supplier" do
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -172,7 +172,7 @@ describe Admin::BulkLineItemsController, type: :controller do
         end
 
         it "does not allow access" do
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
diff --git a/spec/controllers/admin/customers_controller_spec.rb b/spec/controllers/admin/customers_controller_spec.rb
index b1503d89f7..8e344879a2 100644
--- a/spec/controllers/admin/customers_controller_spec.rb
+++ b/spec/controllers/admin/customers_controller_spec.rb
@@ -90,7 +90,7 @@ describe Admin::CustomersController, type: :controller do
 
         it "prevents me from updating the customer" do
           spree_put :update, format: :json, id: customer.id, customer: { email: 'new.email@gmail.com' }
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
           expect(assigns(:customer)).to eq nil
           expect(customer.email).to_not eq 'new.email@gmail.com'
         end
@@ -166,7 +166,7 @@ describe Admin::CustomersController, type: :controller do
 
         it "prevents me from updating the customer" do
           spree_get :show, format: :json, id: customer.id
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
     end
diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb
index 78678e03e2..c8a0a9ac29 100644
--- a/spec/controllers/admin/enterprises_controller_spec.rb
+++ b/spec/controllers/admin/enterprises_controller_spec.rb
@@ -294,7 +294,7 @@ describe Admin::EnterprisesController, type: :controller do
 
       it "does not allow access" do
         spree_post :register, id: enterprise.id, sells: 'none'
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -306,7 +306,7 @@ describe Admin::EnterprisesController, type: :controller do
 
       it "does not allow access" do
         spree_post :register, id: enterprise.id, sells: 'none'
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
diff --git a/spec/controllers/admin/inventory_items_controller_spec.rb b/spec/controllers/admin/inventory_items_controller_spec.rb
index 741f329663..9fce5711a6 100644
--- a/spec/controllers/admin/inventory_items_controller_spec.rb
+++ b/spec/controllers/admin/inventory_items_controller_spec.rb
@@ -21,7 +21,7 @@ describe Admin::InventoryItemsController, type: :controller do
 
         it "redirects to unauthorized" do
           spree_post :create, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -33,7 +33,7 @@ describe Admin::InventoryItemsController, type: :controller do
         context "but the producer has not granted VO permission" do
           it "redirects to unauthorized" do
             spree_post :create, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
@@ -84,7 +84,7 @@ describe Admin::InventoryItemsController, type: :controller do
 
         it "redirects to unauthorized" do
           spree_put :update, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -96,7 +96,7 @@ describe Admin::InventoryItemsController, type: :controller do
         context "but the producer has not granted VO permission" do
           it "redirects to unauthorized" do
             spree_put :update, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb
index 1d612e2c57..0bc63e3cb8 100644
--- a/spec/controllers/admin/proxy_orders_controller_spec.rb
+++ b/spec/controllers/admin/proxy_orders_controller_spec.rb
@@ -20,7 +20,7 @@ describe Admin::ProxyOrdersController, type: :controller do
       context 'as a regular user' do
         it 'redirects to unauthorized' do
           spree_put :cancel, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -31,7 +31,7 @@ describe Admin::ProxyOrdersController, type: :controller do
 
           it 'redirects to unauthorized' do
             spree_put :cancel, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
@@ -89,7 +89,7 @@ describe Admin::ProxyOrdersController, type: :controller do
       context 'as a regular user' do
         it 'redirects to unauthorized' do
           spree_put :resume, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -100,7 +100,7 @@ describe Admin::ProxyOrdersController, type: :controller do
 
           it 'redirects to unauthorized' do
             spree_put :resume, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
diff --git a/spec/controllers/admin/schedules_controller_spec.rb b/spec/controllers/admin/schedules_controller_spec.rb
index 99b73f4e03..8a0ac86c78 100644
--- a/spec/controllers/admin/schedules_controller_spec.rb
+++ b/spec/controllers/admin/schedules_controller_spec.rb
@@ -106,7 +106,7 @@ describe Admin::SchedulesController, type: :controller do
 
         it "prevents me from updating the schedule" do
           spree_put :update, format: :json, id: coordinated_schedule.id, schedule: { name: "my awesome schedule" }
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
           expect(assigns(:schedule)).to eq nil
           expect(coordinated_schedule.name).to_not eq "my awesome schedule"
         end
diff --git a/spec/controllers/admin/stripe_accounts_controller_spec.rb b/spec/controllers/admin/stripe_accounts_controller_spec.rb
index 9a6854ae85..c1b0890316 100644
--- a/spec/controllers/admin/stripe_accounts_controller_spec.rb
+++ b/spec/controllers/admin/stripe_accounts_controller_spec.rb
@@ -46,7 +46,7 @@ describe Admin::StripeAccountsController, type: :controller do
 
         it "redirects to unauthorized" do
           spree_delete :destroy, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -93,7 +93,7 @@ describe Admin::StripeAccountsController, type: :controller do
 
       it "redirects to unauthorized" do
         spree_get :status, params
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
diff --git a/spec/controllers/admin/stripe_connect_settings_controller_spec.rb b/spec/controllers/admin/stripe_connect_settings_controller_spec.rb
index 11cebea66e..73331a151a 100644
--- a/spec/controllers/admin/stripe_connect_settings_controller_spec.rb
+++ b/spec/controllers/admin/stripe_connect_settings_controller_spec.rb
@@ -14,7 +14,7 @@ describe Admin::StripeConnectSettingsController, type: :controller do
 
       it "does not allow access" do
         spree_get :edit
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -76,7 +76,7 @@ describe Admin::StripeConnectSettingsController, type: :controller do
 
       it "does not allow access" do
         spree_get :update, params
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
diff --git a/spec/controllers/admin/subscriptions_controller_spec.rb b/spec/controllers/admin/subscriptions_controller_spec.rb
index c7f0e207a4..7eb11807bf 100644
--- a/spec/controllers/admin/subscriptions_controller_spec.rb
+++ b/spec/controllers/admin/subscriptions_controller_spec.rb
@@ -18,7 +18,7 @@ describe Admin::SubscriptionsController, type: :controller do
       context 'as a regular user' do
         it 'redirects to unauthorized' do
           spree_get :index, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -55,7 +55,7 @@ describe Admin::SubscriptionsController, type: :controller do
       context 'as a regular user' do
         it 'redirects to unauthorized' do
           spree_get :index, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -120,7 +120,7 @@ describe Admin::SubscriptionsController, type: :controller do
 
       it 'redirects to unauthorized' do
         spree_post :create, params
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -272,7 +272,7 @@ describe Admin::SubscriptionsController, type: :controller do
 
       it 'redirects to unauthorized' do
         spree_post :update, params
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -390,7 +390,7 @@ describe Admin::SubscriptionsController, type: :controller do
       context 'as a regular user' do
         it 'redirects to unauthorized' do
           spree_put :cancel, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -401,7 +401,7 @@ describe Admin::SubscriptionsController, type: :controller do
 
           it 'redirects to unauthorized' do
             spree_put :cancel, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
@@ -489,7 +489,7 @@ describe Admin::SubscriptionsController, type: :controller do
       context 'as a regular user' do
         it 'redirects to unauthorized' do
           spree_put :pause, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -500,7 +500,7 @@ describe Admin::SubscriptionsController, type: :controller do
 
           it 'redirects to unauthorized' do
             spree_put :pause, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
@@ -588,7 +588,7 @@ describe Admin::SubscriptionsController, type: :controller do
       context 'as a regular user' do
         it 'redirects to unauthorized' do
           spree_put :unpause, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -599,7 +599,7 @@ describe Admin::SubscriptionsController, type: :controller do
 
           it 'redirects to unauthorized' do
             spree_put :unpause, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
diff --git a/spec/controllers/admin/tag_rules_controller_spec.rb b/spec/controllers/admin/tag_rules_controller_spec.rb
index b4da011923..5d654958a4 100644
--- a/spec/controllers/admin/tag_rules_controller_spec.rb
+++ b/spec/controllers/admin/tag_rules_controller_spec.rb
@@ -19,7 +19,7 @@ describe Admin::TagRulesController, type: :controller do
 
         it "redirects to unauthorized" do
           spree_delete :destroy, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
diff --git a/spec/controllers/admin/variant_overrides_controller_spec.rb b/spec/controllers/admin/variant_overrides_controller_spec.rb
index c75a265cd1..4690dba35b 100644
--- a/spec/controllers/admin/variant_overrides_controller_spec.rb
+++ b/spec/controllers/admin/variant_overrides_controller_spec.rb
@@ -22,7 +22,7 @@ describe Admin::VariantOverridesController, type: :controller do
 
         it "redirects to unauthorized" do
           spree_put :bulk_update, format: format, variant_overrides: variant_override_params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -34,7 +34,7 @@ describe Admin::VariantOverridesController, type: :controller do
         context "but the producer has not granted VO permission" do
           it "redirects to unauthorized" do
             spree_put :bulk_update, format: format, variant_overrides: variant_override_params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
@@ -78,7 +78,7 @@ describe Admin::VariantOverridesController, type: :controller do
             it "allows to update other variant overrides" do
               spree_put :bulk_update, format: format, variant_overrides: variant_override_params
 
-              expect(response).to_not redirect_to spree.unauthorized_path
+              expect(response).to_not redirect_to unauthorized_path
               variant_override.reload
               expect(variant_override.price).to eq 123.45
             end
@@ -111,7 +111,7 @@ describe Admin::VariantOverridesController, type: :controller do
 
         it "redirects to unauthorized" do
           spree_put :bulk_reset, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -123,7 +123,7 @@ describe Admin::VariantOverridesController, type: :controller do
         context "where the producer has not granted create_variant_overrides permission to the hub" do
           it "restricts access" do
             spree_put :bulk_reset, params
-            expect(response).to redirect_to spree.unauthorized_path
+            expect(response).to redirect_to unauthorized_path
           end
         end
 
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index 8ab20c385a..5d0401c6cc 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -113,7 +113,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
       it "should deny me access to the index action" do
         spree_get :index
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -140,7 +140,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
       it "should prevent me from sending order invoices" do
         spree_get :invoice, params
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -150,7 +150,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
         it "should prevent me from sending order invoices" do
           spree_get :invoice, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -198,7 +198,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
       it "should prevent me from sending order invoices" do
         spree_get :print, params
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -207,7 +207,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
         it "should prevent me from sending order invoices" do
           spree_get :print, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb
index e8ae658e9e..efc6ce9b5b 100644
--- a/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/spec/controllers/spree/admin/products_controller_spec.rb
@@ -16,7 +16,7 @@ describe Spree::Admin::ProductsController, type: :controller do
       end
 
       it "denies access" do
-        expect(response).to redirect_to spree.unauthorized_url
+        expect(response).to redirect_to unauthorized_path
       end
 
       it "does not update any product" do
diff --git a/spec/controllers/spree/credit_cards_controller_spec.rb b/spec/controllers/spree/credit_cards_controller_spec.rb
index e8996433f3..2c4f6a3a15 100644
--- a/spec/controllers/spree/credit_cards_controller_spec.rb
+++ b/spec/controllers/spree/credit_cards_controller_spec.rb
@@ -88,7 +88,7 @@ describe Spree::CreditCardsController, type: :controller do
       context "but the card is not owned by the user" do
         it "redirects to unauthorized" do
           spree_put :update, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
@@ -135,7 +135,7 @@ describe Spree::CreditCardsController, type: :controller do
       context "but the card is not owned by the user" do
         it "redirects to unauthorized" do
           spree_delete :destroy, params
-          expect(response).to redirect_to spree.unauthorized_path
+          expect(response).to redirect_to unauthorized_path
         end
       end
 
diff --git a/spec/controllers/stripe/callbacks_controller_spec.rb b/spec/controllers/stripe/callbacks_controller_spec.rb
index 33f7bd5b76..50c5433767 100644
--- a/spec/controllers/stripe/callbacks_controller_spec.rb
+++ b/spec/controllers/stripe/callbacks_controller_spec.rb
@@ -30,7 +30,7 @@ describe Stripe::CallbacksController, type: :controller do
 
       it "redirects to unauthorized" do
         spree_get :index, params
-        expect(response).to redirect_to spree.unauthorized_path
+        expect(response).to redirect_to unauthorized_path
       end
     end
 

From 8fac1bc9cadddaf1c4b3316b119053fd53a5ac55 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 19:17:33 +0100
Subject: [PATCH 137/340] Move unauthorized view to HomeController only, all
 other calls to unauthorized will go through Auth which will redirect to the
 home controller IF the user is logged in or to login if user is not logged in

---
 app/controllers/home_controller.rb              |  4 ++++
 app/controllers/spree/store_controller.rb       |  4 ----
 spec/controllers/spree/store_controller_spec.rb | 14 --------------
 spec/requests/home_controller_spec.rb           | 14 ++++++++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 spec/controllers/spree/store_controller_spec.rb
 create mode 100644 spec/requests/home_controller_spec.rb

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index c585b63839..c7612d3997 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -16,6 +16,10 @@ class HomeController < BaseController
 
   def sell; end
 
+  def unauthorized
+    render 'shared/unauthorized', status: :unauthorized
+  end
+
   private
 
   # Cache the value of the query count
diff --git a/app/controllers/spree/store_controller.rb b/app/controllers/spree/store_controller.rb
index cc4dd9d537..5486912bd3 100644
--- a/app/controllers/spree/store_controller.rb
+++ b/app/controllers/spree/store_controller.rb
@@ -6,9 +6,5 @@ module Spree
 
     include I18nHelper
     before_action :set_locale
-
-    def unauthorized
-      render 'shared/unauthorized', status: :unauthorized
-    end
   end
 end
diff --git a/spec/controllers/spree/store_controller_spec.rb b/spec/controllers/spree/store_controller_spec.rb
deleted file mode 100644
index b04ac0167e..0000000000
--- a/spec/controllers/spree/store_controller_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe Spree::StoreController, type: :controller do
-  controller(Spree::StoreController) do
-    before_filter :unauthorized
-    def index
-      render text: ""
-    end
-  end
-  it "redirects to home when unauthorized" do
-    get :index
-    expect(response).to render_template("shared/unauthorized", layout: 'darkswarm')
-  end
-end
diff --git a/spec/requests/home_controller_spec.rb b/spec/requests/home_controller_spec.rb
new file mode 100644
index 0000000000..9400fedcd9
--- /dev/null
+++ b/spec/requests/home_controller_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe HomeController, type: :request do
+  context "#unauthorized" do
+    it "renders the unauthorized template" do
+      get "/unauthorized"
+
+      expect(response.status).to eq 401
+      expect(response).to render_template("shared/unauthorized", layout: 'darkswarm')
+    end
+  end
+end

From 3599cb2047c892f3a9d5e164e3c70ad7f544816b Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 19:11:35 +0100
Subject: [PATCH 138/340] Make unauthorized in ControllerHelpers::Auth the same
 as in Spree::Admin::BaseController

It adapts the method in ControllerHelpers::Auth to also use the after_login mechanism.

Ideally we would remove one of the two after_login mechanisms after_login and spree_user_return_to but they might still be in use.
---
 lib/spree/core/controller_helpers/auth.rb        | 2 +-
 spec/controllers/spree/orders_controller_spec.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index 494d45eaa9..89980ccfe2 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -29,7 +29,7 @@ module Spree
             redirect_to '/unauthorized'
           else
             store_location
-            redirect_to(respond_to?(:spree_login_path) ? spree_login_path : main_app.root_path)
+            redirect_to main_app.root_path(anchor: "login?after_login=#{request.env['PATH_INFO']}")
           end
         end
 
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index cee76bdc39..1f74a3915f 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -58,7 +58,7 @@ describe Spree::OrdersController, type: :controller do
 
       it "redirects to unauthorized" do
         spree_get :show, id: order.number
-        expect(response.status).to eq(401)
+        expect(response).to redirect_to unauthorized_path
       end
     end
 
@@ -415,9 +415,11 @@ describe Spree::OrdersController, type: :controller do
     let(:params) { { id: order.number } }
 
     context "when the user does not have permission to cancel the order" do
+      before { allow(controller).to receive(:spree_current_user) { create(:user) } }
+
       it "responds with unauthorized" do
         spree_put :cancel, params
-        expect(response).to render_template 'shared/unauthorized'
+        expect(response).to redirect_to unauthorized_path
       end
     end
 

From 2605c4249b7e78d93b0b4321853570c1c54c4797 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 27 Jun 2020 20:18:34 +0100
Subject: [PATCH 139/340] Simplify spec, the 2 minutes wait is not necessary
 anylonger

---
 spec/features/admin/authentication_spec.rb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/spec/features/admin/authentication_spec.rb b/spec/features/admin/authentication_spec.rb
index 6ff46d15a4..a7add975f2 100644
--- a/spec/features/admin/authentication_spec.rb
+++ b/spec/features/admin/authentication_spec.rb
@@ -9,17 +9,14 @@ feature "Authentication", js: true do
   let!(:enterprise) { create(:enterprise, owner: user) } # Required for access to admin
 
   scenario "logging into admin redirects home, then back to admin" do
-    # This is the first admin spec, so give a little extra load time for slow systems
-    Capybara.using_wait_time(120) do
-      visit spree.admin_dashboard_path
+    visit spree.admin_dashboard_path
 
-      fill_in "Email", with: user.email
-      fill_in "Password", with: user.password
-      click_login_button
-      expect(page).to have_content "DASHBOARD"
-      expect(page).to have_current_path spree.admin_dashboard_path
-      expect(page).to have_no_content "CONFIGURATION"
-    end
+    fill_in "Email", with: user.email
+    fill_in "Password", with: user.password
+    click_login_button
+    expect(page).to have_content "DASHBOARD"
+    expect(page).to have_current_path spree.admin_dashboard_path
+    expect(page).to have_no_content "CONFIGURATION"
   end
 
   scenario "viewing my account" do

From 31e072179b5cfaf90744af929fe202326b689faa Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 15 Jul 2020 15:19:16 +0100
Subject: [PATCH 140/340] Make method a little simple by extracting method

---
 app/services/checkout/form_data_adapter.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/services/checkout/form_data_adapter.rb b/app/services/checkout/form_data_adapter.rb
index 60bb9257c5..273a978a55 100644
--- a/app/services/checkout/form_data_adapter.rb
+++ b/app/services/checkout/form_data_adapter.rb
@@ -34,11 +34,16 @@ module Checkout
     end
 
     def fill_in_card_type
-      payment = params[:order][:payments_attributes]&.first&.dig(:source_attributes)
+      return unless payment_source_attributes
 
-      return if payment&.dig(:number).blank?
+      return if payment_source_attributes.dig(:number).blank?
 
-      payment[:cc_type] ||= card_brand(payment[:number])
+      payment_source_attributes[:cc_type] ||= card_brand(payment_source_attributes[:number])
+    end
+
+    def payment_source_attributes
+      @payment_source_attributes ||=
+        params[:order][:payments_attributes]&.first&.dig(:source_attributes)
     end
 
     def card_brand(number)

From efacca62926f443e8bdc0a87fbe4946844bbf6fa Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 15 Jul 2020 15:33:03 +0100
Subject: [PATCH 141/340] Revert "Enhancement/5454 make links to shops under
 Groups > Producers open in new tab"

---
 app/views/producers/_fat.html.haml    | 4 ++--
 app/views/producers/_skinny.html.haml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml
index 7712d43629..9b4e3b68b6 100644
--- a/app/views/producers/_fat.html.haml
+++ b/app/views/producers/_fat.html.haml
@@ -79,8 +79,8 @@
     .row.cta-container
       .columns.small-12
         %a.cta-hub{"ng-repeat" => "hub in producer.hubs | orderBy:'-active'",
-        "ng-href" => "{{::hub.path}}", "ng-attr-target" => "_blank",
-        "ng-class" => "::{primary: hub.active, secondary: !hub.active}", "target" => "_blank"}
+        "ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined }}",
+        "ng-class" => "::{primary: hub.active, secondary: !hub.active}"}
           %i.ofn-i_068-shop-reversed{"ng-if" => "::hub.active"}
           %i.ofn-i_068-shop-reversed{"ng-if" => "::!hub.active"}
           .hub-name{"ng-bind" => "::hub.name"}
diff --git a/app/views/producers/_skinny.html.haml b/app/views/producers/_skinny.html.haml
index 8664537362..6e05619d07 100644
--- a/app/views/producers/_skinny.html.haml
+++ b/app/views/producers/_skinny.html.haml
@@ -3,7 +3,7 @@
     %span{"ng-if" => "::producer.is_distributor" }
       .row.vertical-align-middle
         .columns.small-12
-          %a.is_distributor{"ng-href" => "{{::producer.path}}", "ng-attr-target" => "_blank", "data-is-link" => "true", "target" => "_blank"}
+          %a.is_distributor{"ng-href" => "{{::producer.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "data-is-link" => "true"}
             %i{ng: {class: "::producer.producer_icon_font"}}
             %span.margin-top
               %strong{"ng-bind" => "::producer.name"}

From 4e00c45782ac9ffee3bb0e3d8a7e3df5bf74d99b Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 15 Jul 2020 16:46:09 +0200
Subject: [PATCH 142/340] Doc defensive coding needed by pin payments

[skip ci]
---
 app/services/checkout/form_data_adapter.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/services/checkout/form_data_adapter.rb b/app/services/checkout/form_data_adapter.rb
index 273a978a55..1333ed5dbd 100644
--- a/app/services/checkout/form_data_adapter.rb
+++ b/app/services/checkout/form_data_adapter.rb
@@ -33,6 +33,11 @@ module Checkout
       @params[:order][:payments_attributes].first[:source_attributes] = payment_source_params
     end
 
+    # Ensures cc_type is always passed to the model by inferring the type when
+    # the frontend didn't provide it. This fixes Pin Payments specifically
+    # although it might be useful for future payment gateways.
+    #
+    # More details:  app/assets/javascripts/darkswarm/services/checkout.js.coffee#L70-L98
     def fill_in_card_type
       return unless payment_source_attributes
 

From dd5e679f6961e3543d5ed6aef3c557c3f86b6bda Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Thu, 16 Jul 2020 15:30:28 +0200
Subject: [PATCH 143/340] Address code review comments

Mostly styling issues.
---
 app/models/spree/payment.rb            | 6 +-----
 app/models/spree/payment/processing.rb | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index a9e0b6b460..66c401cd8a 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -10,6 +10,7 @@ module Spree
     IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
 
     delegate :line_items, to: :order
+    delegate :currency, to: :order
 
     belongs_to :order, class_name: 'Spree::Order'
     belongs_to :source, polymorphic: true
@@ -68,8 +69,6 @@ module Spree
       end
     end
 
-    delegate :currency, to: :order
-
     def money
       Spree::Money.new(amount, currency: currency)
     end
@@ -87,9 +86,6 @@ module Spree
       credit_allowed.positive?
     end
 
-    # see https://github.com/spree/spree/issues/981
-    #
-    # Import from future Spree v.2.3.0 d470b31798f37
     def build_source
       return if source_attributes.nil?
       return unless payment_method.andand.payment_source_class
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 3d77de36fe..14caece4af 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -12,7 +12,7 @@ module Spree
 
         unless payment_method.supports?(source)
           invalidate!
-          raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
+          raise Core::GatewayError, Spree.t(:payment_method_not_supported)
         end
 
         if payment_method.auto_capture?

From 2fe37b52375662d29afd2ee6b99cf3bc9a385e5e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 16 Jul 2020 18:07:40 +0100
Subject: [PATCH 144/340] Update all locales with the latest Transifex
 translations

---
 config/locales/ca.yml    |  4 ++--
 config/locales/en_CA.yml |  2 +-
 config/locales/en_NZ.yml |  4 ++--
 config/locales/fr.yml    |  2 +-
 config/locales/tr.yml    | 40 ++++++++++++++++++++--------------------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2bc956f2ba..2194636d75 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -43,7 +43,7 @@ ca:
               after_orders_open_at: s'ha de fer amb el termini obert
         variant_override:
           count_on_hand:
-            using_producer_stock_settings_but_count_on_hand_set: "ha d'estar en blanc perquè s'utilitza la configuració de l'inventari de la productora"
+            using_producer_stock_settings_but_count_on_hand_set: "ha d'estar en blanc perquè s'utilitza la configuració d'estoc de la productora"
             on_demand_but_count_on_hand_set: "ha d'estar en blanc si és sota demanda"
             limited_stock_but_no_count_on_hand: "cal especificar-se perquè força existències limitades"
   activemodel:
@@ -2568,7 +2568,7 @@ ca:
         'yes': "Sota demanda"
     variant_overrides:
       on_demand:
-        use_producer_settings: "Utilitzeu la configuració d'inventari de la productora"
+        use_producer_settings: "Utilitzeu la configuració d'estoc de la productora"
         'yes': "Sí"
         'no': "No"
       inventory_products: "Productes de l'inventari"
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index 5b3886a906..3750932c8e 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -2811,7 +2811,7 @@ en_CA:
     city: "City"
     zip: "Postal Code"
     country: "Country"
-    state: "Province"
+    state: "State"
     phone: "Phone"
     update: "Update"
     use_billing_address: "Use Billing Address"
diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index e45ca43439..97f7ccf95b 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -1170,7 +1170,7 @@ en_NZ:
       footer_contact_email: "Email us"
       footer_nav_headline: "Navigate"
       footer_join_headline: "Join us"
-      footer_join_body: "Create a listing, shop or group directory on the Open Food Network."
+      footer_join_body: "Create a listing, build a shop or group directory on the Open Food Network."
       footer_join_cta: "Tell me more!"
       footer_legal_call: "Read our"
       footer_legal_tos: "Terms and conditions"
@@ -1378,7 +1378,7 @@ en_NZ:
   system_step1: "1. Search"
   system_step1_text: "Search our diverse, independent shops for seasonal local food. Search by neighbourhood and food category, or whether you prefer delivery or pickup."
   system_step2: "2. Shop"
-  system_step2_text: "Transform your transactions with affordable local food from diverse producers and hubs. Know the stories behind your food and the people who make it!"
+  system_step2_text: "Choose what you want, checkout as guest or make an account, you are good to go. Its that simple. If you'd like a box every week then ask for a subscription."
   system_step3: "3. Pick-up / Delivery"
   system_step3_text: "Hang on for your delivery, or visit your producer or hub for a more personal connection with your food. Food shopping as diverse as nature intended it."
   cta_headline: "Shopping that makes the world a better place."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index eb8d4e055d..50b821e721 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3139,7 +3139,7 @@ fr:
           zones: "Zones"
           both: "Vu par l'acheteur sur la boutique"
           back_end: "Visible pour l'administration uniquement"
-          deactivation_warning: "Désactiver une méthode de livraison peut engendre sa disparition de la liste ici. Si vous souhaitez uniquement ne plus l'afficher pour l'acheteur, modifiez-là et utilisez l'option d'affichage \"visible pour l'administrateur uniquement\"."
+          deactivation_warning: "Désactiver une méthode de livraison peut engendrer sa disparition de la liste ici. Si vous souhaitez uniquement ne plus l'afficher pour l'acheteur, modifiez-là et utilisez l'option d'affichage \"visible pour l'administrateur uniquement\"."
       payment_methods:
         index:
           payment_methods: "Méthodes de paiement"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index dae3555bb1..1bcf7af309 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -221,7 +221,7 @@ tr:
   edit: Düzenle
   clone: Kopyala
   distributors: Dağıtımcılar
-  bulk_order_management: Toplu Sipariş Yönetimi
+  bulk_order_management: TOPLU SİPARİŞ YÖNETİMİ
   enterprises: İşletmeler
   enterprise_groups: AĞLAR
   reports: Raporlar
@@ -256,7 +256,7 @@ tr:
   processing_payment: "Ödeme İşlemi Gerçekleştiriliyor.."
   no_pending_payments: "Bekleyen ödeme yok"
   invalid_payment_state: "Geçersiz ödeme durumu"
-  filter_results: Sonuçları Filtrele
+  filter_results: SONUÇLARI FİLTRELE
   quantity: Miktar
   pick_up: Teslim Alma
   copy: Kopyala
@@ -593,7 +593,7 @@ tr:
         product_unit: "Ürün: Birim"
         weight_volume: "Ağırlık / Hacim"
         ask: "Sor?"
-        page_title: "Toplu Sipariş Yönetimi"
+        page_title: "TOPLU SİPARİŞ YÖNETİMİ"
         actions_delete: "Seçilenleri Sil"
         loading: "Siparişler yükleniyor"
         no_results: "Sipariş bulunamadı."
@@ -730,8 +730,8 @@ tr:
               sizi ziyaret edenler tarafından görülecek. (örn. neden kapalı olduğunu
               ve ne zaman açılacağını belirtebilirsiniz)
           shopfront_category_ordering: "DÜKKAN KATEGORİ SIRALAMASI"
-          open_date: "Açılış Tarihi"
-          close_date: "Kapanış Tarih"
+          open_date: "AÇILIŞ TARİHİ"
+          close_date: "KAPANIŞ TARİHİ"
         social:
           twitter_placeholder: "Örneğin. @the_usta"
           instagram_placeholder: "Örneğin. the_usta"
@@ -795,21 +795,21 @@ tr:
         producer: ÜRETİCİ
       change_type_form:
         producer_profile: ÜRETİCİ PROFİLİ
-        connect_ofn: AGA üzerinden bağlan
+        connect_ofn: AGA PLATFORMUNA KATIL
         always_free: HER ZAMAN ÜCRETSİZ
         producer_description_text: Ürünlerinizi Açık Gıda Ağı'na yükleyin. Böylece ürünleriniz pazar hesapları üzerinden satışa sunulabilir.
         producer_shop: ÜRETİCİ DÜKKANI
-        sell_your_produce: Kendi ürününü sat
+        sell_your_produce: KENDİ ÜRÜNÜNÜ SAT
         producer_shop_description_text: Açık Gıda Ağı üzerinden açtığınız bireysel dükkanınız ile ürünlerinizi doğrudan müşterilere ulaştırabilirsiniz.
         producer_shop_description_text2: Üretici Dükkanı sadece sizin ürünleriniz içindir.  Üretiminiz haricindeki ürünleri satabilmek için lütfen 'Üretici Pazarı' seçeneğini seçin.
         producer_hub: ÜRETİCİ PAZARI
-        producer_hub_text: Kendi ürünleriniz ile beraber başkalarının ürünlerini de satın
+        producer_hub_text: KENDİ ÜRÜNLERİNİZ İLE BERABER BAŞKALARININ ÜRÜNLERİNİ DE SATIN
         producer_hub_description_text: İşletmeniz, yerel gıda sisteminizin bel kemiğidir. Açık Gıda Ağı'ndaki mağazanız aracılığıyla kendi ürünlerinizi ve çevrenizdeki diğer üreticilerin ürünlerini beraber satabilirsiniz.
         profile: Yalnızca Profil
         get_listing: Görünür ol
         profile_description_text: İnsanlar Açık Gıda Ağı üzerinden sizi bulabilir ve sizinle iletişim kurabilir. İşletmeniz haritada ve listelerde görünür olacak.
         hub_shop: Türetici Pazarı
-        hub_shop_text: Başkalarının ürünlerini satın
+        hub_shop_text: BAŞKALARININ ÜRÜNLERİNİ SATIN
         hub_shop_description_text: İşletmeniz yerel gıda sisteminizin belkemiğidir. Diğer işletmelerin ürünlerini bir araya getirebilir, Açık Gıda Ağı'na kayıtlı dükkanınız üzerinden alıcılara ulaştırabilirsiniz.
         choose_option: Lütfen yukarıdaki seçeneklerden birini seçin.
         change_now: Değiştir
@@ -897,10 +897,10 @@ tr:
         outgoing: "3. GİDEN ÜRÜNLER"
       exchange_form:
         pickup_time_tip: Bu sipariş dönemine ait siparişlerin müşteriler için hazır olma tarihi
-        pickup_instructions_placeholder: "Teslimat Talimatları"
+        pickup_instructions_placeholder: "TESLİMAT DETAYLARI"
         pickup_instructions_tip: Bu talimatlar, siparişi tamamladıktan sonra müşterilere iletilir
         pickup_time_placeholder: "Teslimat (örn. Tarih / Saat)"
-        receival_instructions_placeholder: "Teslim Alma talimatları"
+        receival_instructions_placeholder: "TESLİM ALMA TALİMATLARI"
         add_fee: 'Ücret ekle'
         remove: 'Kaldır'
         selected: 'seçildi'
@@ -1581,7 +1581,7 @@ tr:
   components_filters_clearfilters: "TÜM FİLTRELERİ TEMİZLE"
   groups_title: Gruplar
   groups_headline: Gruplar
-  groups_text: "Her üretici özeldir ve her işletmenin ortaya koyabileceği farklı bir değer vardır. Üyelerimiz, ürünlerini, emeklerini ve gıdanın ortak değerleri paylaşan üretici, türetici ve dağıtımcı kolektifleridir. Bu bileşenler, adil ve temiz gıdaya ulaşım yollarını kolaylaştırır ve bozulmuş gıda sistemini hep beraber düzeltmemize yardımcı olur."
+  groups_text: "Her üretici özeldir ve her işletmenin ortaya koyabileceği farklı bir değer vardır. Üyelerimiz, ürünlerini, emeklerini ve gıdanın ortak değerlerini paylaşan üretici, türetici ve dağıtımcı kolektifleridir. Bu bileşenler, adil ve temiz gıdaya ulaşım yollarını kolaylaştırır ve bozulmuş gıda sistemini düzeltmemize öncülük ederler."
   groups_search: "İsim veya anahtar kelime ile ara"
   groups_no_groups: "Ağ bulunamadı"
   groups_about: "Hakkımızda"
@@ -1615,7 +1615,7 @@ tr:
   producers_about: Hakkımızda
   producers_buy: Alışveriş ürünleri
   producers_contact: İLETİŞİM
-  producers_contact_phone: Ara
+  producers_contact_phone: 'Tel:'
   producers_contact_social: Takip et
   producers_buy_at_html: "%{enterprise} ürünleri için buradan alışveriş yapın:"
   producers_filter: Filtrele
@@ -1918,7 +1918,7 @@ tr:
   ok: tamam
   not_visible: görünmez
   you_have_no_orders_yet: "Henüz siparişiniz yok"
-  show_only_complete_orders: "Yalnızca tamamlanan siparişleri göster"
+  show_only_complete_orders: "YALNIZCA TAMAMLANAN SİPARİŞLERİ GÖSTER"
   successfully_created: '%{resource} BAŞARIYLA OLUŞTURULDU!'
   successfully_removed: '%{resource} BAŞARIYLA KALDIRILDI!'
   successfully_updated: '%{resource} BAŞARIYLA GÜNCELLENDİ!'
@@ -2025,8 +2025,8 @@ tr:
   spree_admin_product_category: Ürün Kategorisi
   spree_admin_variant_unit_name: Varyant Birimi Adı
   unit_name: "Birim adı"
-  change_package: "Hesap Türünü Değiştir"
-  spree_admin_single_enterprise_hint: "İpucu: İnsanların sizi bulmasına izin vermek için, alttaki görünürlük kısmını açın."
+  change_package: "HESAP TÜRÜNÜ DEĞİŞTİR"
+  spree_admin_single_enterprise_hint: "İpucu: İnsanların sizi bulmasına izin vermek için 'Görünür' olmayı ayarlamayı unutmayın:"
   spree_admin_eg_pickup_from_school: "Örn. 'Teslimat noktası: Moda İlkokulu Bahçesi'"
   spree_admin_eg_collect_your_order: "Örn. Lütfen siparişinizi Moda Cad. No:17 Temiz Dükkan'dan teslim alınız."
   spree_classification_primary_taxon_error: "%{taxon} cinsi, %{product}ürününün birincil cinsidir ve silinemez"
@@ -2129,7 +2129,7 @@ tr:
   report_header_incoming_transport: Gelen Nakliye
   report_header_special_instructions: Özel Talimatlar
   report_header_order_number: Sipariş numarası
-  report_header_date: tarih
+  report_header_date: Tarih
   report_header_confirmation_date: Onay tarihi
   report_header_tags: ETİKETLER
   report_header_items: Kalemler
@@ -2429,8 +2429,8 @@ tr:
               en iyi şekilde yönetmeniz için tüm imkanları ve araçları sağlamaya hazırız.
           get_listing: Görünür Olun
           always_free: HER ZAMAN ÜCRETSİZ
-          sell_produce_others: Başkalarının ürünlerini sat
-          sell_own_produce: Kendi ürününü sat
+          sell_produce_others: BAŞKALARININ ÜRÜNLERİNİ SAT
+          sell_own_produce: KENDİ ÜRÜNÜNÜ SAT
           sell_both: Kendi ürünlerini ve başkalarının ürünlerini sat
         enterprise_producer:
           producer: Üretici
@@ -2966,7 +2966,7 @@ tr:
       tab:
         dashboard: "KONTROL PANELİ"
         orders: "SİPARİŞLER"
-        bulk_order_management: "Toplu Sipariş Yönetimi"
+        bulk_order_management: "TOPLU SİPARİŞ YÖNETİMİ"
         subscriptions: "Üyelikler"
         products: "Ürünler"
         option_types: "Seçenek Türleri"

From f31a1ff59c9caadb7ebad0330d574cce84881765 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 17 Jul 2020 04:10:57 +1000
Subject: [PATCH 145/340] Updating translations for config/locales/en_GB.yml

---
 config/locales/en_GB.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 2250c91bb5..35a9dc1a31 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -182,6 +182,7 @@ en_GB:
         explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Welcome to"
   site_meta_description: "The Open Food Network software platform allows farmers to sell produce online, at a price that works for them. It has been built specifically for selling food so it can handle tricky measures or stock levels that only food has - a dozen eggs, a bunch of parsley, a whole chicken that varies in weight…"
   search_by_name: Search by name, town, county or postcode...
   producers_join: UK producers are now welcome to join Open Food Network UK.
@@ -1713,6 +1714,7 @@ en_GB:
   remember_me: Remember Me
   are_you_sure: "Are you sure?"
   orders_open: "Orders open"
+  closing: "Closing"
   going_back_to_home_page: "Taking you back to the home page"
   creating: Creating
   updating: Updating

From b0ac1884302813bb7aba015747d5037e1e2d3ab5 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 10 Jul 2020 15:33:20 +1000
Subject: [PATCH 146/340] Make broken spec fail reliably and set it pending

This spec has been broken for a long time, at least eight months. But it
regularly passed because the search filter is applied with a delay and
in that time the content matches. And once the filter is applied, no
products are shown and the negative matchers pass.
---
 spec/features/consumer/shopping/shopping_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index cf825ca475..b28dcbefec 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -194,14 +194,16 @@ feature "As a consumer I want to shop with a distributor", js: true do
       end
 
       it "returns search results for products where the search term matches one of the product's variant names" do
+        pending "has been broken for a while"
+
         visit shop_path
         fill_in "search", with: "Badg"           # For variant with display_name "Badgers"
 
         within('div.pad-top') do
-          expect(page).to have_content product.name
-          expect(page).to have_content variant2.display_name
           expect(page).not_to have_content product2.name
           expect(page).not_to have_content variant3.display_name
+          expect(page).to have_content product.name
+          expect(page).to have_content variant2.display_name
         end
       end
 

From 001d40d691814f0ba6b8b94222b364dc7b8d475e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 17 Jul 2020 14:35:42 +0100
Subject: [PATCH 147/340] Move require_login_then_redirect_to to the only place
 where it is called

This fixes a class loading issue where orders controllers was getting a undefined method require_login_then_redirect_to
---
 app/controllers/spree/orders_controller.rb | 2 +-
 lib/spree/core/controller_helpers/auth.rb  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb
index 102cca2520..898ec93f99 100644
--- a/app/controllers/spree/orders_controller.rb
+++ b/app/controllers/spree/orders_controller.rb
@@ -194,7 +194,7 @@ module Spree
       return if session[:access_token] || params[:token] || spree_current_user
 
       flash[:error] = I18n.t("spree.orders.edit.login_to_view_order")
-      require_login_then_redirect_to request.env['PATH_INFO']
+      redirect_to main_app.root_path(anchor: "login?after_login=#{request.env['PATH_INFO']}")
     end
 
     def order_to_update
diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index 89980ccfe2..c6c18b9be1 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -63,10 +63,6 @@ module Spree
 
           user.generate_spree_api_key!
         end
-
-        def require_login_then_redirect_to(url)
-          redirect_to main_app.root_path(anchor: "login?after_login=#{url}")
-        end
       end
     end
   end

From eb2e894802b431f8d7a11b49e8fcb4462e0f6924 Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Sun, 19 Jul 2020 21:55:37 +0300
Subject: [PATCH 148/340] Missing translation key for shipping_method

admin/orders
---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3726167337..be623ba3aa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2184,6 +2184,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  shipping_method: "Shipping method"
 
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "

From 19c7d11df5a049a4b82f7c3553b66680984a11b5 Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Sun, 19 Jul 2020 22:06:07 +0300
Subject: [PATCH 149/340] Missing translation key for new_order

admin/orders/new
---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index be623ba3aa..10d88b3bbc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2185,6 +2185,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
   shipping_method: "Shipping method"
+  new_order: "New Order"
 
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "

From d43a3ac65e5458178a2e60f28e1f0be8da225da3 Mon Sep 17 00:00:00 2001
From: Robin Klaus <rmklaus12@gmail.com>
Date: Mon, 20 Jul 2020 13:06:20 +1000
Subject: [PATCH 150/340] Added translation key to locale/en.yml for backoffice
 admin payment and added lazy loading

---
 app/views/spree/admin/payments/source_forms/_paypal.html.haml | 2 +-
 config/locales/en.yml                                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/spree/admin/payments/source_forms/_paypal.html.haml b/app/views/spree/admin/payments/source_forms/_paypal.html.haml
index e26db66846..124139dae0 100644
--- a/app/views/spree/admin/payments/source_forms/_paypal.html.haml
+++ b/app/views/spree/admin/payments/source_forms/_paypal.html.haml
@@ -5,4 +5,4 @@
 -# of the views we are using, so the warning below wasn't displaying without this override.
 
 #paypal-warning
-  %strong= t('no_payment_via_admin_backend', :scope => 'paypal')
+  %strong= t('.no_payment_via_admin_backend', :scope => 'paypal')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3726167337..668d94322d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3331,6 +3331,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           stripe:
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
+          paypal:
+            no_payment_via_admin_backend: No Payment Via Admin Backend
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:

From 21227d7482a20f722f4c005bb3fa862e46705634 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 20 Jul 2020 18:18:00 +0100
Subject: [PATCH 151/340] Make charges update method update the first pending
 payment

Updating the first overall payment could select a failed payment and ignore the pending payment that is about to be processed
---
 app/models/spree/order_decorator.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 71574359a7..377b72a0f6 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -432,8 +432,8 @@ Spree::Order.class_eval do
   # amount here.
   def charge_shipping_and_payment_fees!
     update_totals
-    return unless payments.any?
+    return unless pending_payments.any?
 
-    payments.first.update_attribute :amount, total
+    pending_payments.first.update_attribute :amount, total
   end
 end

From bb178c71b2f298c29729bb4ccb02e2df24540af1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Jul 2020 23:35:34 +0000
Subject: [PATCH 152/340] Bump bugsnag from 6.13.1 to 6.14.0

Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.13.1 to 6.14.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.13.1...v6.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b0713aa7f9..17bd93a6a4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,7 +150,7 @@ GEM
     bcrypt (3.1.13)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    bugsnag (6.13.1)
+    bugsnag (6.14.0)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
     byebug (11.0.1)

From d43e9b5716b0c030e143691cc957a38a6d14867a Mon Sep 17 00:00:00 2001
From: Eduardo <jeduardo824@gmail.com>
Date: Sun, 28 Jun 2020 23:06:06 -0300
Subject: [PATCH 153/340] add Actions dropdown to all pages of order details
 menu

---
 app/views/spree/admin/adjustments/index.html.haml            | 1 +
 app/views/spree/admin/orders/customer_details/edit.html.haml | 1 +
 app/views/spree/admin/orders/edit.html.haml                  | 2 +-
 app/views/spree/admin/payments/index.html.haml               | 1 +
 app/views/spree/admin/return_authorizations/index.html.haml  | 1 +
 app/views/spree/admin/shared/_order_links.html.haml          | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 app/views/spree/admin/shared/_order_links.html.haml

diff --git a/app/views/spree/admin/adjustments/index.html.haml b/app/views/spree/admin/adjustments/index.html.haml
index 02433a6e5c..4aa8de7967 100644
--- a/app/views/spree/admin/adjustments/index.html.haml
+++ b/app/views/spree/admin/adjustments/index.html.haml
@@ -7,6 +7,7 @@
 
 - content_for :page_actions do
   %li= button_link_to t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'icon-plus'
+  = render partial: 'spree/admin/shared/order_links'
   %li= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
 
 = render :partial => 'adjustments_table'
diff --git a/app/views/spree/admin/orders/customer_details/edit.html.haml b/app/views/spree/admin/orders/customer_details/edit.html.haml
index 584c3350b9..765224d247 100644
--- a/app/views/spree/admin/orders/customer_details/edit.html.haml
+++ b/app/views/spree/admin/orders/customer_details/edit.html.haml
@@ -8,6 +8,7 @@
   = Spree.t(:customer_details)
 
 - content_for :page_actions do
+  = render partial: 'spree/admin/shared/order_links'
   %li= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
 
 - if @order.cart? || @order.address?
diff --git a/app/views/spree/admin/orders/edit.html.haml b/app/views/spree/admin/orders/edit.html.haml
index d2047e6bf4..8d5d26eecc 100644
--- a/app/views/spree/admin/orders/edit.html.haml
+++ b/app/views/spree/admin/orders/edit.html.haml
@@ -4,7 +4,7 @@
     %li= event_links
   - if can?(:resend, @order)
     %li= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'icon-email'
-  %li.links-dropdown#links-dropdown{ links: order_links(@order).to_json }
+  = render partial: 'spree/admin/shared/order_links'
   - if can?(:admin, Spree::Order)
     %li= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
 
diff --git a/app/views/spree/admin/payments/index.html.haml b/app/views/spree/admin/payments/index.html.haml
index 7fbe76429f..c06a473479 100644
--- a/app/views/spree/admin/payments/index.html.haml
+++ b/app/views/spree/admin/payments/index.html.haml
@@ -5,6 +5,7 @@
   - if @order.outstanding_balance?
     %li#new_payment_section
       = button_link_to t(:new_payment), new_admin_order_payment_url(@order), icon: 'icon-plus'
+  = render partial: 'spree/admin/shared/order_links'
   %li= button_link_to t(:back_to_orders_list), admin_orders_path, icon: 'icon-arrow-left'
 
 - content_for :page_title do
diff --git a/app/views/spree/admin/return_authorizations/index.html.haml b/app/views/spree/admin/return_authorizations/index.html.haml
index bc8ed9dd80..390551307c 100644
--- a/app/views/spree/admin/return_authorizations/index.html.haml
+++ b/app/views/spree/admin/return_authorizations/index.html.haml
@@ -5,6 +5,7 @@
   - if @order.shipments.any? &:shipped?
     %li
       = button_link_to t('.new_return_authorization'), new_admin_order_return_authorization_url(@order), icon: 'icon-plus'
+  = render partial: 'spree/admin/shared/order_links'
   %li= button_link_to t('.back_to_orders_list'), spree.admin_orders_path, icon: 'icon-arrow-left'
 
 - content_for :page_title do
diff --git a/app/views/spree/admin/shared/_order_links.html.haml b/app/views/spree/admin/shared/_order_links.html.haml
new file mode 100644
index 0000000000..7db3d968be
--- /dev/null
+++ b/app/views/spree/admin/shared/_order_links.html.haml
@@ -0,0 +1 @@
+%li.links-dropdown#links-dropdown{ links: order_links(@order).to_json }

From bda47d97ee9b4c712988cb2d8708c8289427580d Mon Sep 17 00:00:00 2001
From: Eduardo <jeduardo824@gmail.com>
Date: Mon, 20 Jul 2020 21:08:04 -0300
Subject: [PATCH 154/340] add view specs to admin edit page

---
 spec/views/spree/admin/orders/edit.html.haml_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spec/views/spree/admin/orders/edit.html.haml_spec.rb b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
index b33cd187ef..6e099d27c7 100644
--- a/spec/views/spree/admin/orders/edit.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
@@ -35,4 +35,15 @@ describe "spree/admin/orders/edit.html.haml" do
       expect(rendered).to have_content("Order Total $36.00")
     end
   end
+
+  describe "actions dropwdown" do
+    it "contains all the actions buttons" do
+      render
+
+      expect(rendered).to have_content("Resend Confirmation")
+      expect(rendered).to have_content("Send Invoice")
+      expect(rendered).to have_content("Print Invoices")
+      expect(rendered).to have_content("Cancel Order")
+    end
+  end
 end

From 9be199a6cc4af930a0d5376b85a109cb0f6cbbaf Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Tue, 21 Jul 2020 11:55:53 +0200
Subject: [PATCH 155/340] Remove conflicting and duplicate route

This Spree route conflicts with the one we define:

```
get "/login", to: redirect("/#/login")
```

for whatever reason there are 7 users that managed to hit the Spree one
instead of ours when confirming their signup email. It's not clear to me
though when this `/login?validation=confirmed` is really hit. The
confirmation email link passes a token in the query params and this is
not the case.

The idea is that `GET /login` makes the login modal to show up instead
of Devise's default behaviour (through inheritance) of showing a login
form page. OFN was never prepared to handle this as this bug proofs.
---
 app/controllers/spree/users_controller.rb    | 2 +-
 app/controllers/user_passwords_controller.rb | 2 +-
 config/routes/spree.rb                       | 1 -
 lib/spree/authentication_helpers.rb          | 4 +++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/spree/users_controller.rb b/app/controllers/spree/users_controller.rb
index f524f8d465..c6ce064b57 100644
--- a/app/controllers/spree/users_controller.rb
+++ b/app/controllers/spree/users_controller.rb
@@ -59,7 +59,7 @@ module Spree
       if @user
         authorize! params[:action].to_sym, @user
       else
-        redirect_to spree.login_path
+        redirect_to main_app.login_path
       end
     end
 
diff --git a/app/controllers/user_passwords_controller.rb b/app/controllers/user_passwords_controller.rb
index e467e915e2..9200b9b6ef 100644
--- a/app/controllers/user_passwords_controller.rb
+++ b/app/controllers/user_passwords_controller.rb
@@ -10,7 +10,7 @@ class UserPasswordsController < Spree::UserPasswordsController
 
     if resource.errors.empty?
       set_flash_message(:success, :send_instructions) if is_navigational_format?
-      respond_with resource, location: spree.login_path
+      respond_with resource, location: main_app.login_path
     else
       respond_to do |format|
         format.html do
diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index ca5993aca5..4d3fde45d6 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -15,7 +15,6 @@ Spree::Core::Engine.routes.draw do
   resources :users, :only => [:edit, :update]
 
   devise_scope :spree_user do
-    get '/login' => 'user_sessions#new', :as => :login
     post '/login' => 'user_sessions#create', :as => :create_new_session
     get '/logout' => 'user_sessions#destroy', :as => :logout
     get '/signup' => 'user_registrations#new', :as => :signup
diff --git a/lib/spree/authentication_helpers.rb b/lib/spree/authentication_helpers.rb
index 49bd97542a..1f26c65f2c 100644
--- a/lib/spree/authentication_helpers.rb
+++ b/lib/spree/authentication_helpers.rb
@@ -11,7 +11,9 @@ module Spree
       current_spree_user
     end
 
-    delegate :login_path, to: :spree, prefix: true
+    def spree_login_path
+      main_app.login_path
+    end
 
     delegate :signup_path, to: :spree, prefix: true
 

From 4d6920bd92fde9f088534ce2f12a7f94601f2646 Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Tue, 21 Jul 2020 18:49:24 +0300
Subject: [PATCH 156/340] Missing translation key for "permalink" and
 "shipping_categories"

When edit product in path admin/products/PRODUCT_NAME/edit
---
 config/locales/en.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3726167337..c6dad5893e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2088,6 +2088,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  permalink: "Permalink"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"

From 7ba8c5ace1303dacdec5bfc21c498780c5554e2c Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 16 Jul 2020 16:31:13 +0100
Subject: [PATCH 157/340] Make OC advanced settings work by permitting the
 extra parameter

---
 app/services/permitted_attributes/order_cycle.rb     |  1 +
 .../admin/order_cycles_controller_spec.rb            | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/services/permitted_attributes/order_cycle.rb b/app/services/permitted_attributes/order_cycle.rb
index 41fd82bead..b81dccef0f 100644
--- a/app/services/permitted_attributes/order_cycle.rb
+++ b/app/services/permitted_attributes/order_cycle.rb
@@ -11,6 +11,7 @@ module PermittedAttributes
 
       @params.require(:order_cycle).permit(
         :name, :orders_open_at, :orders_close_at, :coordinator_id,
+        :preferred_product_selection_from_coordinator_inventory_only,
         incoming_exchanges: permitted_exchange_attributes,
         outgoing_exchanges: permitted_exchange_attributes,
         schedule_ids: [], coordinator_fee_ids: []
diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb
index 2ba98c9f8e..0175cc1d28 100644
--- a/spec/controllers/admin/order_cycles_controller_spec.rb
+++ b/spec/controllers/admin/order_cycles_controller_spec.rb
@@ -178,10 +178,22 @@ module Admin
 
           it "returns an error message" do
             spree_put :update, params
+
             json_response = JSON.parse(response.body)
             expect(json_response['errors']).to be
           end
         end
+
+        it "can update preference product_selection_from_coordinator_inventory_only" do
+          expect(OrderCycleForm).to receive(:new).
+            with(order_cycle,
+                 { "preferred_product_selection_from_coordinator_inventory_only" => true },
+                 anything) { form_mock }
+          allow(form_mock).to receive(:save) { true }
+
+          spree_put :update, params.
+            merge(order_cycle: { preferred_product_selection_from_coordinator_inventory_only: true })
+        end
       end
     end
 

From 9b5875a7d12566a93d055e2327fd86d4f104b235 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 21 Jul 2020 19:12:50 +0100
Subject: [PATCH 158/340] Move select out of scope visible_for because it is
 breaking exchange_product queries and it's just not needed there. The only
 other use of this product's scope visible_for is the enterprise serializer so
 we add the select to it.

---
 app/models/spree/product_decorator.rb                         | 3 +--
 .../api/admin/for_order_cycle/enterprise_serializer.rb        | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index 602329b5c1..554309f687 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -63,8 +63,7 @@ Spree::Product.class_eval do
   scope :visible_for, lambda { |enterprise|
     joins('LEFT OUTER JOIN spree_variants AS o_spree_variants ON (o_spree_variants.product_id = spree_products.id)').
       joins('LEFT OUTER JOIN inventory_items AS o_inventory_items ON (o_spree_variants.id = o_inventory_items.variant_id)').
-      where('o_inventory_items.enterprise_id = (?) AND visible = (?)', enterprise, true).
-      select('DISTINCT spree_products.*')
+      where('o_inventory_items.enterprise_id = (?) AND visible = (?)', enterprise, true)
   }
 
   # -- Scopes
diff --git a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
index 360f135680..66ed62b7f8 100644
--- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
+++ b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
@@ -30,7 +30,9 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer
   def products_scope
     products_relation = object.supplied_products
     if order_cycle.prefers_product_selection_from_coordinator_inventory_only?
-      products_relation = products_relation.visible_for(order_cycle.coordinator)
+      products_relation = products_relation.
+        visible_for(order_cycle.coordinator).
+        select('DISTINCT spree_products.*')
     end
     products_relation.order(:name)
   end

From aadbc9ed5d2133021a2abbabd8382f7483059f7d Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 21 Jul 2020 19:20:08 +0100
Subject: [PATCH 159/340] Remove unnecessary order statement, the relation will
 only be used for counting products

---
 .../api/admin/for_order_cycle/enterprise_serializer.rb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
index 66ed62b7f8..7e6fed44f7 100644
--- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
+++ b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
@@ -34,7 +34,7 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer
         visible_for(order_cycle.coordinator).
         select('DISTINCT spree_products.*')
     end
-    products_relation.order(:name)
+    products_relation
   end
 
   def products

From e445fc33a1aae7912a1a22b9691fa85117036aa7 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 21 Jul 2020 20:48:16 +0100
Subject: [PATCH 160/340] Add spec to cover SQL query issue with OCs where the
 only products from the coordinator inventory are renderer

---
 .../exchange_products_renderer_spec.rb        | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/spec/services/exchange_products_renderer_spec.rb b/spec/services/exchange_products_renderer_spec.rb
index 67233906ad..b2eba1c6c3 100644
--- a/spec/services/exchange_products_renderer_spec.rb
+++ b/spec/services/exchange_products_renderer_spec.rb
@@ -7,8 +7,9 @@ describe ExchangeProductsRenderer do
 
   describe "#exchange_products" do
     describe "for an incoming exchange" do
+      let(:exchange) { order_cycle.exchanges.incoming.first }
+
       it "loads products" do
-        exchange = order_cycle.exchanges.incoming.first
         products = renderer.exchange_products(true, exchange.sender)
 
         expect(products.first.supplier.name).to eq exchange.variants.first.product.supplier.name
@@ -16,14 +17,34 @@ describe ExchangeProductsRenderer do
     end
 
     describe "for an outgoing exchange" do
+      let(:exchange) { order_cycle.exchanges.outgoing.first }
+
       it "loads products" do
-        exchange = order_cycle.exchanges.outgoing.first
         products = renderer.exchange_products(false, exchange.receiver)
 
         suppliers = [exchange.variants[0].product.supplier.name, exchange.variants[1].product.supplier.name]
         expect(suppliers).to include products.first.supplier.name
         expect(suppliers).to include products.second.supplier.name
       end
+
+      context "showing products from coordinator inventory only" do
+        before { order_cycle.update prefers_product_selection_from_coordinator_inventory_only: true }
+
+        it "loads no products if there are no products from the coordinator inventory" do
+          products = renderer.exchange_products(false, exchange.receiver)
+
+          expect(products).to be_empty
+        end
+
+        it "loads products from the coordinator inventory" do
+          # Add variant already in the exchange to the coordinator's inventory
+          exchange.variants.first.inventory_items = [create(:inventory_item, enterprise: order_cycle.coordinator)]
+
+          products = renderer.exchange_products(false, exchange.receiver)
+
+          expect(products).to eq [exchange.variants.first.product]
+        end
+      end
     end
   end
 

From 48efb42b1a9ec93b76777c66c0a6adb66c0f602a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 21 Jul 2020 21:27:14 +0000
Subject: [PATCH 161/340] Bump ddtrace from 0.37.0 to 0.38.0

Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.37.0 to 0.38.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.37.0...v0.38.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 17bd93a6a4..422ecd984c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -206,7 +206,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.37.0)
+    ddtrace (0.38.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)

From 77c920daabbc9459a46a7bdef085ff26f7585cf4 Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Wed, 22 Jul 2020 20:29:15 +0300
Subject: [PATCH 162/340] Update all.js

---
 app/assets/javascripts/admin/all.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index eee8a874c9..1acc26c66f 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -80,6 +80,7 @@
 //= require moment/nb.js
 //= require moment/pt-br.js
 //= require moment/pt.js
+//= require moment/ru.js
 //= require moment/sv.js
 
 // foundation

From daa3f00302147a68aa1eec052ad1a51236eab2e9 Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Wed, 22 Jul 2020 20:30:21 +0300
Subject: [PATCH 163/340] Update all.js.coffee

---
 app/assets/javascripts/darkswarm/all.js.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 605eeb3b07..953bbe645f 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -37,6 +37,7 @@
 #= require moment/nb.js
 #= require moment/pt-br.js
 #= require moment/pt.js
+#= require moment/ru.js
 #= require moment/sv.js
 #
 #= require modernizr

From 6419036a266699ffc855c979a8996dc8bcd4685b Mon Sep 17 00:00:00 2001
From: Joanne Yeung <jttyeung@gmail.com>
Date: Wed, 22 Jul 2020 15:53:44 -0600
Subject: [PATCH 164/340] Fix content header overlap with long product names

---
 app/assets/stylesheets/admin/shared/layout.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/admin/shared/layout.scss b/app/assets/stylesheets/admin/shared/layout.scss
index 804e32b3a8..4091406ef2 100644
--- a/app/assets/stylesheets/admin/shared/layout.scss
+++ b/app/assets/stylesheets/admin/shared/layout.scss
@@ -20,9 +20,11 @@
 
     &:first-child {
       padding-left: 0;
+      width: 70%;
     }
     &:last-child {
       padding-right: 0;
+      width: 30%    
     }
   }
 }

From c8b738cbd551fb241b329cfb1b51868cbf1e5c95 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Thu, 23 Jul 2020 12:28:07 +0200
Subject: [PATCH 165/340] Eager load spree_option_values_line_items

For the BulkCoop report to speed up. We move from an output like

```
web_1     |   CACHE (0.3ms)  SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 4]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 6]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 8]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 5]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 7]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 4]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 5]]
web_1     |   Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (158.5ms)
web_1     |   Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (187.3ms)
```

to

```
web_1     |   CACHE (0.0ms)  SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1     |   CACHE (0.0ms)  SELECT "spree_option_types".* FROM "spree_option_types" WHERE "spree_option_types"."id" = $1 ORDER BY spree_option_types.position LIMIT 1  [["id", 1]]
web_1     |   Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (101.1ms)
web_1     |   Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (107.9ms)
```
---
 .../reports/bulk_coop/bulk_coop_report.rb                | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb b/engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
index 8adaef7f33..bc44c2b857 100644
--- a/engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+++ b/engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
@@ -138,8 +138,13 @@ module OrderManagement
         private
 
         def line_item_includes
-          [{ order: [:bill_address],
-             variant: [{ option_values: :option_type }, { product: :supplier }] }]
+          [
+            {
+              order: [:bill_address],
+              variant: [{ option_values: :option_type }, { product: :supplier }]
+            },
+            :option_values
+          ]
         end
 
         def order_permissions

From b16f486dcc352d2718041a207a9209d66bd40ca5 Mon Sep 17 00:00:00 2001
From: Joanne Yeung <jttyeung@gmail.com>
Date: Thu, 23 Jul 2020 09:25:56 -0600
Subject: [PATCH 166/340] Address missing semi-colon

---
 app/assets/stylesheets/admin/shared/layout.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/shared/layout.scss b/app/assets/stylesheets/admin/shared/layout.scss
index 4091406ef2..3c5646be6b 100644
--- a/app/assets/stylesheets/admin/shared/layout.scss
+++ b/app/assets/stylesheets/admin/shared/layout.scss
@@ -24,7 +24,7 @@
     }
     &:last-child {
       padding-right: 0;
-      width: 30%    
+      width: 30%;    
     }
   }
 }

From abc132d3dbd1713b6a2fc2237151e060655b74ad Mon Sep 17 00:00:00 2001
From: Joanne Yeung <jttyeung@gmail.com>
Date: Thu, 23 Jul 2020 09:37:10 -0600
Subject: [PATCH 167/340] Remove trailing whitespace

---
 app/assets/stylesheets/admin/shared/layout.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/shared/layout.scss b/app/assets/stylesheets/admin/shared/layout.scss
index 3c5646be6b..71d5fbabed 100644
--- a/app/assets/stylesheets/admin/shared/layout.scss
+++ b/app/assets/stylesheets/admin/shared/layout.scss
@@ -24,7 +24,7 @@
     }
     &:last-child {
       padding-right: 0;
-      width: 30%;    
+      width: 30%;
     }
   }
 }

From 26ed601996dd360903ec5acf33b20c41d472e1e0 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 15 Jul 2020 19:14:46 +0200
Subject: [PATCH 168/340] Test the payment controller handles GatewayError

After that, we can TDD a second one that also handles validation errors.
---
 config/locales/en.yml                         |  1 +
 .../payments/payments_controller_spec.rb      | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2975120a53..b9612340a1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -35,6 +35,7 @@ en:
       spree/payment:
         amount: Amount
         state: State
+        source: Source
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index 6932efa236..2acc3da19c 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -10,7 +10,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
     allow(controller).to receive(:spree_current_user) { user }
   end
 
-  context "#create" do
+  describe "#create" do
     let!(:payment_method) { create(:payment_method, distributors: [shop]) }
     let(:params) { { amount: order.total, payment_method_id: payment_method.id } }
 
@@ -138,4 +138,26 @@ describe Spree::Admin::PaymentsController, type: :controller do
       end
     end
   end
+
+  describe '#fire' do
+    context 'on credit event' do
+      let(:shop) { create(:enterprise) }
+      let(:payment_method) { create(:stripe_sca_payment_method, distributor_ids: [create(:distributor_enterprise).id], preferred_enterprise_id: shop.id) }
+      let(:order) { create(:order, state: 'complete') }
+      let(:payment) { create(:payment, order: order, payment_method: payment_method, amount: order.total) }
+
+      let(:params) { { e: 'credit', order_id: order.number, id: payment.id } }
+
+      it 'handles gateway errors' do
+        allow(request).to receive(:referer) { 'http://foo.com' }
+        allow_any_instance_of(payment_method.class)
+          .to receive(:credit).and_raise(Spree::Core::GatewayError, 'error message')
+
+        spree_put :fire, params
+
+        expect(flash[:error]).to eq('error message')
+        expect(response).to redirect_to('http://foo.com')
+      end
+    end
+  end
 end

From 59da07de66953c04c65bbb57b62a1741daaaa450 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 17 Jul 2020 14:06:55 +0200
Subject: [PATCH 169/340] Handle all errors when dealing with payment event

This basically catches ActiveRecord::RecordInvalid caused by an invalid
credit record, for instance, but also other situations we haven't
forseen.
---
 app/controllers/spree/admin/payments_controller.rb  |  2 +-
 app/models/spree/payment/processing.rb              |  2 +-
 .../orders/payments/payments_controller_spec.rb     | 13 ++++++++++++-
 spec/models/spree/payment_spec.rb                   |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb
index 215f69972a..408e6e5c81 100644
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -61,7 +61,7 @@ module Spree
         else
           flash[:error] = t(:cannot_perform_operation)
         end
-      rescue Spree::Core::GatewayError => e
+      rescue StandardError => e
         flash[:error] = e.message
       ensure
         redirect_to request.referer
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 14caece4af..2d01a91aea 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -108,7 +108,7 @@ module Spree
           record_response(response)
 
           if response.success?
-            self.class.create(
+            self.class.create!(
               order: order,
               source: self,
               payment_method: payment_method,
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index 2acc3da19c..3a04e932d6 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -148,8 +148,9 @@ describe Spree::Admin::PaymentsController, type: :controller do
 
       let(:params) { { e: 'credit', order_id: order.number, id: payment.id } }
 
+      before { allow(request).to receive(:referer) { 'http://foo.com' } }
+
       it 'handles gateway errors' do
-        allow(request).to receive(:referer) { 'http://foo.com' }
         allow_any_instance_of(payment_method.class)
           .to receive(:credit).and_raise(Spree::Core::GatewayError, 'error message')
 
@@ -158,6 +159,16 @@ describe Spree::Admin::PaymentsController, type: :controller do
         expect(flash[:error]).to eq('error message')
         expect(response).to redirect_to('http://foo.com')
       end
+
+      it 'handles validation errors' do
+        allow(Spree::Payment).to receive(:find).with(payment.id.to_s) { payment }
+        allow(payment).to receive(:credit!).and_raise(StandardError, 'validation error')
+
+        spree_put :fire, params
+
+        expect(flash[:error]).to eq('validation error')
+        expect(response).to redirect_to('http://foo.com')
+      end
     end
   end
 end
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 77f09e2ef3..a9027d8d34 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -391,7 +391,7 @@ describe Spree::Payment do
 
         context "when response is successful" do
           it "should create an offsetting payment" do
-            Spree::Payment.should_receive(:create)
+            Spree::Payment.should_receive(:create!)
             payment.credit!
           end
 

From 73b1b1f172881351104025c80d5fe67550f30041 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 17 Jul 2020 13:32:31 +0200
Subject: [PATCH 170/340] DRY specs and fix rubocop failures

---
 .../payments/payments_controller_spec.rb      | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index 3a04e932d6..4f6a36f592 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::Admin::PaymentsController, type: :controller do
@@ -141,17 +143,27 @@ describe Spree::Admin::PaymentsController, type: :controller do
 
   describe '#fire' do
     context 'on credit event' do
-      let(:shop) { create(:enterprise) }
-      let(:payment_method) { create(:stripe_sca_payment_method, distributor_ids: [create(:distributor_enterprise).id], preferred_enterprise_id: shop.id) }
+      let(:payment_method) do
+        create(
+          :stripe_sca_payment_method,
+          distributor_ids: [create(:distributor_enterprise).id],
+          preferred_enterprise_id: create(:enterprise).id
+        )
+      end
       let(:order) { create(:order, state: 'complete') }
-      let(:payment) { create(:payment, order: order, payment_method: payment_method, amount: order.total) }
+      let(:payment) do
+        create(:payment, order: order, payment_method: payment_method, amount: order.total)
+      end
 
       let(:params) { { e: 'credit', order_id: order.number, id: payment.id } }
 
-      before { allow(request).to receive(:referer) { 'http://foo.com' } }
+      before do
+        allow(request).to receive(:referer) { 'http://foo.com' }
+        allow(Spree::Payment).to receive(:find).with(payment.id.to_s) { payment }
+      end
 
       it 'handles gateway errors' do
-        allow_any_instance_of(payment_method.class)
+        allow(payment.payment_method)
           .to receive(:credit).and_raise(Spree::Core::GatewayError, 'error message')
 
         spree_put :fire, params
@@ -161,7 +173,6 @@ describe Spree::Admin::PaymentsController, type: :controller do
       end
 
       it 'handles validation errors' do
-        allow(Spree::Payment).to receive(:find).with(payment.id.to_s) { payment }
         allow(payment).to receive(:credit!).and_raise(StandardError, 'validation error')
 
         spree_put :fire, params

From 1c026479f55e780aefb295234a02c6aa01e735c8 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 22 Jul 2020 11:08:34 +0200
Subject: [PATCH 171/340] Replace spec's syntax to RSpec 3

---
 spec/models/spree/payment_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index a9027d8d34..9ee488a4c7 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -391,13 +391,13 @@ describe Spree::Payment do
 
         context "when response is successful" do
           it "should create an offsetting payment" do
-            Spree::Payment.should_receive(:create!)
+            expect(Spree::Payment).to receive(:create!)
             payment.credit!
           end
 
           it "resulting payment should have correct values" do
-            payment.order.stub :outstanding_balance => 100
-            payment.stub :credit_allowed => 10
+            allow(payment.order).to receive(:outstanding_balance) { 100 }
+            allow(payment).to receive(:credit_allowed) { 10 }
 
             offsetting_payment = payment.credit!
             expect(offsetting_payment.amount.to_f).to eq(-10)

From f2fd426c4ad73f49df3c6493a28545c553ce12ac Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 17 Jul 2020 16:23:23 +0200
Subject: [PATCH 172/340] Fix old Spree specs

Given the importance of this code, it doesn't bring me much confidence.
Apparently, this specs where using a non-existent state by mistake and
this went unnoticed because the payment creation was failing silently in
payment/processing.rb.

This unearthed the fact that our `#ensure_correct_adjustment` needs the
order to be persisted to succeed.
---
 spec/models/spree/payment_spec.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 9ee488a4c7..43a0a05127 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -2,11 +2,7 @@ require 'spec_helper'
 
 describe Spree::Payment do
   context 'original specs from Spree' do
-    let(:order) do
-      order = Spree::Order.new(:bill_address => Spree::Address.new,
-                               :ship_address => Spree::Address.new)
-    end
-
+    let(:order) { create(:order) }
     let(:gateway) do
       gateway = Spree::Gateway::Bogus.new(:environment => 'test', :active => true)
       gateway.stub :source_required => true
@@ -339,7 +335,7 @@ describe Spree::Payment do
 
       context "#credit" do
         before do
-          payment.state = 'complete'
+          payment.state = 'completed'
           payment.response_code = '123'
         end
 

From f2b28a198d3c386d93337f49fa61c7a6a6fedb8a Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 22 Jul 2020 14:44:58 +0200
Subject: [PATCH 173/340] Replace before_validation with custom validation

No reason to use a callback when custom validation methods can be
defined.
---
 app/models/spree/payment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 66c401cd8a..8126ad851c 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -22,7 +22,7 @@ module Spree
 
     has_one :adjustment, as: :source, dependent: :destroy
 
-    before_validation :validate_source
+    validate :validate_source
     before_save :set_unique_identifier
 
     after_save :create_payment_profile, if: :profiles_supported?

From 0f0a7041471450379f0fa72c5d64148b5683d77e Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 17 Jul 2020 14:07:05 +0200
Subject: [PATCH 174/340] Skip source validation when applying credit

The original payment may not be valid because its credit card may be
expired. Stripe gives this as a valid scenario returning a success and
we should do too.

When creating the credit payment we end up validating all sources in
a chain as follows.

```
Payment being persisted -> source payment -> original credit card.
```

The source payment was valid when created (It would not be persisted
otherwise) but its source card may now be expired, and that's legit.

There was also an issue with the `#invalidate_old_payments` callback. It
was causing the original payment to be validated again and thus the
credit payment failed to be persisted due to the original credit card
being expired. Switching this callback to use `#update_column` skips
validations and so we don't validate the source payment. We only care
about the state there, so it should be fine.
---
 app/models/spree/payment.rb                   | 20 +++++++++++++++++--
 app/models/spree/payment/processing.rb        |  3 ++-
 .../payments/payments_controller_spec.rb      | 10 ++++++++++
 spec/models/spree/payment_spec.rb             | 19 ++++++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 8126ad851c..f940db551f 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -32,7 +32,19 @@ module Spree
     # invalidate previously entered payments
     after_create :invalidate_old_payments
 
+    # Prevents #validate_source to end up in a chain of validations, from
+    # payment to payment up until the original credit card record.
+    #
+    # All payments are validated before saving thus, we get nothing by checking
+    # they are valid in the future. Quite the opposite. Stripe is accepting
+    # refunds whose source are cards that were valid when the payment was
+    # placed but are now expired, and we consider them invalid.
+    #
+    # Skipping the source validation when applying a refund avoids this
+    # situation. We trust the payment gateway.
+    attr_accessor :skip_source_validation
     attr_accessor :source_attributes
+
     after_initialize :build_source
 
     scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
@@ -151,7 +163,7 @@ module Spree
     end
 
     def validate_source
-      if source && !source.valid?
+      if source && !skip_source_validation && !source.valid?
         source.errors.each do |field, error|
           field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
           errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
@@ -176,8 +188,12 @@ module Spree
       gateway_error e
     end
 
+    # Inherited from Spree, makes newly entered payments invalidate previously
+    # entered payments so the most recent payment is used by the gateway.
     def invalidate_old_payments
-      order.payments.with_state('checkout').where("id != ?", id).each(&:invalidate!)
+      order.payments.with_state('checkout').where("id != ?", id).each do |payment|
+        payment.update_column(:state, 'invalid')
+      end
     end
 
     def update_order
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 2d01a91aea..ec7d154f66 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -114,7 +114,8 @@ module Spree
               payment_method: payment_method,
               amount: credit_amount.abs * -1,
               response_code: response.authorization,
-              state: 'completed'
+              state: 'completed',
+              skip_source_validation: true
             )
           else
             gateway_error(response)
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index 4f6a36f592..27ea7dac50 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -157,6 +157,8 @@ describe Spree::Admin::PaymentsController, type: :controller do
 
       let(:params) { { e: 'credit', order_id: order.number, id: payment.id } }
 
+      let(:successful_response) { ActiveMerchant::Billing::Response.new(true, "Yay!") }
+
       before do
         allow(request).to receive(:referer) { 'http://foo.com' }
         allow(Spree::Payment).to receive(:find).with(payment.id.to_s) { payment }
@@ -180,6 +182,14 @@ describe Spree::Admin::PaymentsController, type: :controller do
         expect(flash[:error]).to eq('validation error')
         expect(response).to redirect_to('http://foo.com')
       end
+
+      it 'displays a success message and redirects to the referer' do
+        allow(payment_method).to receive(:credit) { successful_response }
+
+        spree_put :fire, params
+
+        expect(flash[:success]).to eq(I18n.t(:payment_updated))
+      end
     end
   end
 end
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 43a0a05127..144122631b 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -401,6 +401,25 @@ describe Spree::Payment do
             expect(offsetting_payment.response_code).to eq('12345')
             expect(offsetting_payment.source).to eq(payment)
           end
+
+          context 'and the source payment card is expired' do
+            let(:card) do
+              Spree::CreditCard.new(month: 12, year: 1995, number: '4111111111111111')
+            end
+
+            let(:successful_response) do
+              ActiveMerchant::Billing::Response.new(true, "Yay!")
+            end
+
+            it 'lets the new payment to be saved' do
+              allow(payment.order).to receive(:outstanding_balance) { 100 }
+              allow(payment).to receive(:credit_allowed) { 10 }
+
+              offsetting_payment = payment.credit!
+
+              expect(offsetting_payment).to be_valid
+            end
+          end
         end
       end
     end

From c0f72f89f2daa7f97609682f0a26c4133e5da1b9 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 22 Jul 2020 16:52:31 +0200
Subject: [PATCH 175/340] Handle #refund! as we do with #credit!

---
 app/models/spree/payment/processing.rb        |  2 +-
 .../payments/payments_controller_spec.rb      | 64 +++++++++++++++----
 spec/models/spree/payment_spec.rb             |  2 +-
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index ec7d154f66..f50a23ccb0 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -147,7 +147,7 @@ module Spree
           record_response(response)
 
           if response.success?
-            self.class.create(order: order,
+            self.class.create!(order: order,
                               source: self,
                               payment_method: payment_method,
                               amount: refund_amount.abs * -1,
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index 27ea7dac50..8e78be69d8 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -142,23 +142,23 @@ describe Spree::Admin::PaymentsController, type: :controller do
   end
 
   describe '#fire' do
+    let(:payment_method) do
+      create(
+        :stripe_sca_payment_method,
+        distributor_ids: [create(:distributor_enterprise).id],
+        preferred_enterprise_id: create(:enterprise).id
+      )
+    end
+    let(:order) { create(:order, state: 'complete') }
+    let(:payment) do
+      create(:payment, order: order, payment_method: payment_method, amount: order.total)
+    end
+
+    let(:successful_response) { ActiveMerchant::Billing::Response.new(true, "Yay!") }
+
     context 'on credit event' do
-      let(:payment_method) do
-        create(
-          :stripe_sca_payment_method,
-          distributor_ids: [create(:distributor_enterprise).id],
-          preferred_enterprise_id: create(:enterprise).id
-        )
-      end
-      let(:order) { create(:order, state: 'complete') }
-      let(:payment) do
-        create(:payment, order: order, payment_method: payment_method, amount: order.total)
-      end
-
       let(:params) { { e: 'credit', order_id: order.number, id: payment.id } }
 
-      let(:successful_response) { ActiveMerchant::Billing::Response.new(true, "Yay!") }
-
       before do
         allow(request).to receive(:referer) { 'http://foo.com' }
         allow(Spree::Payment).to receive(:find).with(payment.id.to_s) { payment }
@@ -191,5 +191,41 @@ describe Spree::Admin::PaymentsController, type: :controller do
         expect(flash[:success]).to eq(I18n.t(:payment_updated))
       end
     end
+
+    context 'on refund event' do
+      let(:params) { { e: 'refund', order_id: order.number, id: payment.id } }
+
+      before do
+        allow(request).to receive(:referer) { 'http://foo.com' }
+        allow(Spree::Payment).to receive(:find).with(payment.id.to_s) { payment }
+      end
+
+      it 'handles gateway errors' do
+        allow(payment.payment_method)
+          .to receive(:refund).and_raise(Spree::Core::GatewayError, 'error message')
+
+        spree_put :fire, params
+
+        expect(flash[:error]).to eq('error message')
+        expect(response).to redirect_to('http://foo.com')
+      end
+
+      it 'handles validation errors' do
+        allow(payment).to receive(:refund!).and_raise(StandardError, 'validation error')
+
+        spree_put :fire, params
+
+        expect(flash[:error]).to eq('validation error')
+        expect(response).to redirect_to('http://foo.com')
+      end
+
+      it 'displays a success message and redirects to the referer' do
+        allow(payment_method).to receive(:refund) { successful_response }
+
+        spree_put :fire, params
+
+        expect(flash[:success]).to eq(I18n.t(:payment_updated))
+      end
+    end
   end
 end
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 144122631b..200efab868 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -725,7 +725,7 @@ describe Spree::Payment do
       end
     end
 
-    describe "refunding" do
+    describe "refund!" do
       let(:payment) { create(:payment) }
       let(:success) { double(success?: true, authorization: 'abc123') }
       let(:failure) { double(success?: false) }

From 813459ee384b711d1141c0790f32caa956cb0a07 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 22 Jul 2020 17:05:45 +0200
Subject: [PATCH 176/340] Clarify method documentation

---
 app/models/spree/payment.rb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index f940db551f..13fc27c6aa 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -32,16 +32,12 @@ module Spree
     # invalidate previously entered payments
     after_create :invalidate_old_payments
 
-    # Prevents #validate_source to end up in a chain of validations, from
-    # payment to payment up until the original credit card record.
+    # Skips the validation of the source (for example, credit card) of the payment.
     #
-    # All payments are validated before saving thus, we get nothing by checking
-    # they are valid in the future. Quite the opposite. Stripe is accepting
-    # refunds whose source are cards that were valid when the payment was
-    # placed but are now expired, and we consider them invalid.
-    #
-    # Skipping the source validation when applying a refund avoids this
-    # situation. We trust the payment gateway.
+    # This is used in refunds as the validation of the card can fail but the refund can go through,
+    #    we trust the payment gateway in these cases. For example, Stripe is accepting refunds with
+    #    source cards that were valid when the payment was placed but are now expired, and we
+    #    consider them invalid.
     attr_accessor :skip_source_validation
     attr_accessor :source_attributes
 
@@ -188,10 +184,13 @@ module Spree
       gateway_error e
     end
 
-    # Inherited from Spree, makes newly entered payments invalidate previously
-    # entered payments so the most recent payment is used by the gateway.
+    # Makes newly entered payments invalidate previously entered payments so the most recent payment
+    # is used by the gateway.
     def invalidate_old_payments
       order.payments.with_state('checkout').where("id != ?", id).each do |payment|
+
+        # Using update_column skips validations and so it skips validate_source. As we are just
+        # invalidating past payments here, we don't want to validate all of them at this stage.
         payment.update_column(:state, 'invalid')
       end
     end

From 4d9fbb68d6cc5f538c067546f780d8ad7194096a Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 22 Jul 2020 17:10:14 +0200
Subject: [PATCH 177/340] Add missing attribute to skip source validation

---
 app/models/spree/payment/processing.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index f50a23ccb0..724df22d87 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -152,7 +152,8 @@ module Spree
                               payment_method: payment_method,
                               amount: refund_amount.abs * -1,
                               response_code: response.authorization,
-                              state: 'completed')
+                              state: 'completed',
+                              skip_source_validation: true)
           else
             gateway_error(response)
           end

From e6943ce554e38cb4593ad081a1f67b9638fee914 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 22 Jul 2020 17:11:32 +0200
Subject: [PATCH 178/340] Fix simple Rubocop issues

---
 app/models/spree/payment.rb            |  1 -
 app/models/spree/payment/processing.rb | 16 +++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 13fc27c6aa..9ca91809dc 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -188,7 +188,6 @@ module Spree
     # is used by the gateway.
     def invalidate_old_payments
       order.payments.with_state('checkout').where("id != ?", id).each do |payment|
-
         # Using update_column skips validations and so it skips validate_source. As we are just
         # invalidating past payments here, we don't want to validate all of them at this stage.
         payment.update_column(:state, 'invalid')
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 724df22d87..2579f76de7 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -147,13 +147,15 @@ module Spree
           record_response(response)
 
           if response.success?
-            self.class.create!(order: order,
-                              source: self,
-                              payment_method: payment_method,
-                              amount: refund_amount.abs * -1,
-                              response_code: response.authorization,
-                              state: 'completed',
-                              skip_source_validation: true)
+            self.class.create!(
+              order: order,
+              source: self,
+              payment_method: payment_method,
+              amount: refund_amount.abs * -1,
+              response_code: response.authorization,
+              state: 'completed',
+              skip_source_validation: true
+            )
           else
             gateway_error(response)
           end

From 357037e429d983d34dc5e87b1b8ab3818615c198 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Thu, 23 Jul 2020 17:31:34 +0200
Subject: [PATCH 179/340] Recalculate adjustments when invalidating payments

Switching from `#invalidate` to `#update_column` skipped both
validations and callbacks and thus, `#ensure_correct_adjustments` was no
longer called for older payments.
---
 app/models/spree/payment.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 9ca91809dc..8b54e5c760 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -191,6 +191,7 @@ module Spree
         # Using update_column skips validations and so it skips validate_source. As we are just
         # invalidating past payments here, we don't want to validate all of them at this stage.
         payment.update_column(:state, 'invalid')
+        payment.ensure_correct_adjustment
       end
     end
 

From 97f551a2dd21e5fcd64f0fb74004525c4625d93d Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Thu, 23 Jul 2020 17:37:50 +0200
Subject: [PATCH 180/340] Replace literal with AR's 4 `#not`

---
 app/models/spree/payment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 8b54e5c760..754119034a 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -187,7 +187,7 @@ module Spree
     # Makes newly entered payments invalidate previously entered payments so the most recent payment
     # is used by the gateway.
     def invalidate_old_payments
-      order.payments.with_state('checkout').where("id != ?", id).each do |payment|
+      order.payments.with_state('checkout').where.not(id: id).each do |payment|
         # Using update_column skips validations and so it skips validate_source. As we are just
         # invalidating past payments here, we don't want to validate all of them at this stage.
         payment.update_column(:state, 'invalid')

From 1b31b727c7ce64fc85e9ffcda63511415b72c630 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 21 Jul 2020 15:37:16 +0100
Subject: [PATCH 181/340] Add migration to fix calculator preferences

---
 ...ors_preferences_outside_spree_namespace.rb | 23 +++++++++++++++++++
 db/schema.rb                                  |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb

diff --git a/db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb b/db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb
new file mode 100644
index 0000000000..82f5094273
--- /dev/null
+++ b/db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb
@@ -0,0 +1,23 @@
+# As we moved the calculators outside the Spree namespace in migration MoveAllCalculatorsOutsideTheSpreeNamespace
+#   We need to move their preferences too (currency, value, etc), otherwise they are not used
+class MoveCalculatorsPreferencesOutsideSpreeNamespace < ActiveRecord::Migration
+  def up
+    replace_preferences_key("/spree/calculator", "/calculator")
+  end
+
+  def down
+    replace_preferences_key("/calculator", "/spree/calculator")
+  end
+
+  private
+
+  def replace_preferences_key(from_pattern, to_pattern)
+    updated_pref_key = "replace( pref.key, '" + from_pattern + "', '" + to_pattern + "')"
+    Spree::Preference.connection.execute(
+      "UPDATE spree_preferences pref SET key = " + updated_pref_key + "
+        WHERE pref.key like '" + from_pattern + "%'
+          AND NOT EXISTS (SELECT 1 FROM spree_preferences existing_pref
+                           WHERE existing_pref.key = " + updated_pref_key + ")"
+    )
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8df4304ca2..f56c95f405 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20200702112157) do
+ActiveRecord::Schema.define(version: 20200721135726) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

From 8f4395a6ea2a9c7f1f5f7841a2bcde891b48d9f5 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 24 Jul 2020 13:17:20 +0100
Subject: [PATCH 182/340] We need to clear Rails cache after updating
 preferences so that the app picks the new values immediately

---
 ...5726_move_calculators_preferences_outside_spree_namespace.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb b/db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb
index 82f5094273..2591550dd1 100644
--- a/db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb
+++ b/db/migrate/20200721135726_move_calculators_preferences_outside_spree_namespace.rb
@@ -19,5 +19,7 @@ class MoveCalculatorsPreferencesOutsideSpreeNamespace < ActiveRecord::Migration
           AND NOT EXISTS (SELECT 1 FROM spree_preferences existing_pref
                            WHERE existing_pref.key = " + updated_pref_key + ")"
     )
+
+    Rails.cache.clear
   end
 end

From cc317bc8c970266344490cbad8626d7a235ecef6 Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Fri, 24 Jul 2020 16:00:30 +0100
Subject: [PATCH 183/340] Move the :initialLatitude and :initialLongitude
 methods from the OpenStreetMap service to the MapCenterCalculator service.

---
 .../directives/open_street_map.js.coffee      | 22 ++----------
 .../darkswarm/services/enterprises.js.coffee  |  5 +++
 .../darkswarm/services/map.js.coffee          |  4 +--
 .../services/map_centre_calculator.js.coffee  | 17 +++++++---
 .../services/enterprise_spec.js.coffee        |  8 +++--
 .../map_centre_calculator_spec.js.coffee      | 34 ++++++++++++++-----
 6 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
index 832878cd50..32f0d921b0 100644
--- a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
@@ -36,10 +36,10 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, MapCentreCalculator, Enterpris
       zoomLevel = 6
       map = L.map('open-street-map')
       L.tileLayer.provider(openStreetMapProviderName, openStreetMapProviderOptions).addTo(map)
-      map.setView([initialLatitude(), initialLongitude()], zoomLevel)
+      map.setView([MapCentreCalculator.initialLatitude(), MapCentreCalculator.initialLongitude()], zoomLevel)
 
     displayEnterprises = ->
-      for enterprise in geocodedEnterprises()
+      for enterprise in Enterprises.geocodedEnterprises()
         marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
         enterpriseNames.push(enterpriseName(enterprise))
         markers.push(marker)
@@ -53,25 +53,9 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, MapCentreCalculator, Enterpris
         search: searchEnterprises
       )
       overwriteInlinePositionRelativeToAbsoluteOnSearchField()
-      if geocodedEnterprises().length == 0
+      if Enterprises.geocodedEnterprises().length == 0
         disableSearchField()
 
-    geocodedEnterprises = () ->
-      Enterprises.enterprises.filter (enterprise) ->
-        enterprise.latitude? && enterprise.longitude?
-
-    initialLatitude = () ->
-      if geocodedEnterprises().length > 0
-        MapCentreCalculator.calculate_latitude(geocodedEnterprises())
-      else
-        openStreetMapConfig.open_street_map_default_latitude
-
-    initialLongitude = () ->
-      if geocodedEnterprises().length > 0
-        MapCentreCalculator.calculate_longitude(geocodedEnterprises())
-      else
-        openStreetMapConfig.open_street_map_default_longitude
-
     overwriteInlinePositionRelativeToAbsoluteOnSearchField = ->
       $('#open-street-map--search').css("position", "absolute")
 
diff --git a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
index 843749c2e6..d8347c7e41 100644
--- a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
@@ -84,3 +84,8 @@ Darkswarm.factory 'Enterprises', (enterprises, ShopsResource, CurrentHub, Taxons
 
     resetDistance: ->
       enterprise.distance = null for enterprise in @enterprises
+
+    geocodedEnterprises: =>
+      @enterprises.filter (enterprise) ->
+        enterprise.latitude? && enterprise.longitude?
+
diff --git a/app/assets/javascripts/darkswarm/services/map.js.coffee b/app/assets/javascripts/darkswarm/services/map.js.coffee
index 2758f299f8..9aa23a7155 100644
--- a/app/assets/javascripts/darkswarm/services/map.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map.js.coffee
@@ -2,9 +2,7 @@ Darkswarm.factory "OfnMap", (Enterprises, EnterpriseListModal, MapConfiguration)
   new class OfnMap
     constructor: ->
       @coordinates = {}
-      @enterprises = Enterprises.enterprises.filter (enterprise) ->
-        # Remove enterprises w/o lat or long
-        enterprise.latitude != null || enterprise.longitude != null
+      @enterprises = Enterprises.geocodedEnterprises()
       @enterprises = @enterprise_markers(@enterprises)
 
     enterprise_markers: (enterprises) ->
diff --git a/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
index f1023ce2d6..85ca34ff54 100644
--- a/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
@@ -1,10 +1,17 @@
-Darkswarm.factory 'MapCentreCalculator', ->
+Darkswarm.factory 'MapCentreCalculator', (Enterprises, openStreetMapConfig) ->
   new class MapCentreCalculator
-    calculate_latitude: (coordinates) =>
-      @_calculate("latitude", coordinates)
 
-    calculate_longitude: (coordinates) =>
-      @_calculate("longitude", coordinates)
+    initialLatitude: =>
+      if Enterprises.geocodedEnterprises().length > 0
+        @_calculate("latitude", Enterprises.geocodedEnterprises())
+      else
+        openStreetMapConfig.open_street_map_default_latitude
+
+    initialLongitude: =>
+      if Enterprises.geocodedEnterprises().length > 0
+        @_calculate("longitude", Enterprises.geocodedEnterprises())
+      else
+        openStreetMapConfig.open_street_map_default_longitude
 
     _calculate: (angleName, coordinates) =>
       positiveAngles = []
diff --git a/spec/javascripts/unit/darkswarm/services/enterprise_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/enterprise_spec.js.coffee
index c95fbdf81b..088ea359e0 100644
--- a/spec/javascripts/unit/darkswarm/services/enterprise_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/enterprise_spec.js.coffee
@@ -24,7 +24,7 @@ describe "Enterprises service", ->
     {id: 5, visible: true, name: 'e', category: "producer_hub", hubs: [{id: 1}]},
     {id: 6, visible: true, name: 'f', category: "producer_shop", hubs: [{id: 2}]},
     {id: 7, visible: true, name: 'g', category: "producer", hubs: [{id: 2}]}
-    {id: 8, visible: true, name: 'h', category: "producer", hubs: [{id: 2}]}
+    {id: 8, visible: true, name: 'h', category: "producer", hubs: [{id: 2}], latitude: 76.26, longitude: -42.66 }
   ]
   H1: 0
   beforeEach ->
@@ -142,4 +142,8 @@ describe "Enterprises service", ->
     it "resets the distance", ->
       Enterprises.resetDistance()
       for e in Enterprises.enterprises
-        expect(e.distance).toBeNull()
\ No newline at end of file
+        expect(e.distance).toBeNull()
+
+  describe "geocodedEnterprises", ->
+    it "only returns enterprises which have a latitude and longitude", ->
+      expect(Enterprises.geocodedEnterprises()).toEqual [Enterprises.enterprises[7]]
diff --git a/spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee
index 00e747a0a8..0d18541442 100644
--- a/spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/map_centre_calculator_spec.js.coffee
@@ -1,5 +1,6 @@
 describe 'MapCentreCalculator service', ->
   MapCentreCalculator = null
+  Enterprises = null
   defaultLongitude = null
   defaultLatitude = null
 
@@ -7,27 +8,42 @@ describe 'MapCentreCalculator service', ->
     module 'Darkswarm'
     defaultLongitude = -6
     defaultLatitude = 53
+    angular.module('Darkswarm').value 'openStreetMapConfig', {
+      open_street_map_default_latitude: 76.26,
+      open_street_map_default_longitude: -42.66
+    }
 
-    inject (_MapCentreCalculator_)->
+    inject (_MapCentreCalculator_, _Enterprises_)->
       MapCentreCalculator = _MapCentreCalculator_
+      Enterprises = _Enterprises_
 
-  describe "calculate_latitude", ->
-    it "calculates the center latitude", ->
-      coordinates = [
+  describe "initialLatitude", ->
+    it "calculates the center latitude of any present geocoded enterprises", ->
+      Enterprises.geocodedEnterprises = -> [
         { latitude: 53, longitude: defaultLongitude },
         { latitude: 54, longitude: defaultLongitude }
       ]
 
-      expect(MapCentreCalculator.calculate_latitude(coordinates)).toEqual 53.5
+      expect(MapCentreCalculator.initialLatitude()).toEqual 53.5
 
-  describe "calculate_longitude", ->
-    it "calculates the center longitude", ->
-      coordinates = [
+    it "returns the default configured latitude when there are no geocoded enterprises present", ->
+      Enterprises.geocodedEnterprises = -> []
+
+      expect(MapCentreCalculator.initialLatitude()).toEqual 76.26
+
+  describe "initialLongitude", ->
+    it "calculates the center longitude of any present geocoded enterprises", ->
+      Enterprises.geocodedEnterprises = -> [
         { latitude: defaultLatitude, longitude: -6 },
         { latitude: defaultLatitude, longitude: -7 }
       ]
 
-      expect(MapCentreCalculator.calculate_longitude(coordinates)).toEqual -6.5
+      expect(MapCentreCalculator.initialLongitude()).toEqual -6.5
+
+    it "returns the default configured longitude when there are no geocoded enterprises present", ->
+      Enterprises.geocodedEnterprises = -> []
+
+      expect(MapCentreCalculator.initialLongitude()).toEqual -42.66
 
   describe "_calculate", ->
     it "calculates the average angle correctly when given a single angle", ->

From add7bb489f52e73b6763ad32c033cf401c57fac7 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 25 Jul 2020 13:13:35 +0100
Subject: [PATCH 184/340] Update all locales with the latest Transifex
 translations

---
 config/locales/ar.yml     |  1 +
 config/locales/ca.yml     |  1 +
 config/locales/de_DE.yml  |  1 +
 config/locales/en_AU.yml  |  1 +
 config/locales/en_BE.yml  |  1 +
 config/locales/en_CA.yml  |  3 ++-
 config/locales/en_DE.yml  |  1 +
 config/locales/en_FR.yml  |  1 +
 config/locales/en_GB.yml  |  1 +
 config/locales/en_IE.yml  |  1 +
 config/locales/en_IN.yml  |  1 +
 config/locales/en_NZ.yml  |  3 ++-
 config/locales/en_PH.yml  |  1 +
 config/locales/en_US.yml  |  1 +
 config/locales/en_ZA.yml  |  1 +
 config/locales/es.yml     |  1 +
 config/locales/es_CR.yml  |  1 +
 config/locales/fil_PH.yml | 21 +++++++++++----------
 config/locales/fr.yml     |  7 ++++---
 config/locales/fr_BE.yml  |  1 +
 config/locales/fr_CA.yml  |  1 +
 config/locales/it.yml     |  1 +
 config/locales/nb.yml     |  1 +
 config/locales/nl_BE.yml  |  1 +
 config/locales/pt.yml     |  1 +
 config/locales/pt_BR.yml  |  1 +
 config/locales/sv.yml     |  2 ++
 config/locales/tr.yml     | 33 +++++++++++++++++----------------
 28 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index a2dc262509..e532c0e451 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -13,6 +13,7 @@ ar:
         email: الايميل الالكتروني للعميل
       spree/payment:
         amount: القيمة
+        state: ولاية
       spree/product:
         primary_taxon: "نوع المنتج "
         supplier: "المورد"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2194636d75..0cbf60323f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -13,6 +13,7 @@ ca:
         email: Correu electrònic de la consumidora
       spree/payment:
         amount: Import
+        state: Estat
       spree/product:
         primary_taxon: "Categoria del producte"
         supplier: "Proveïdora"
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index de1588cf38..f363ab3a6c 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -13,6 +13,7 @@ de_DE:
         email: E-Mail des Kunden
       spree/payment:
         amount: Betrag
+        state: Status
       spree/product:
         primary_taxon: "Produktkategorie"
         supplier: "Anbieter"
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
index 528ee44b6d..b29d8ba4d6 100644
--- a/config/locales/en_AU.yml
+++ b/config/locales/en_AU.yml
@@ -13,6 +13,7 @@ en_AU:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml
index ff1dc8bbc1..c7814a9c5b 100644
--- a/config/locales/en_BE.yml
+++ b/config/locales/en_BE.yml
@@ -13,6 +13,7 @@ en_BE:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index 3750932c8e..530fd92e97 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -13,6 +13,7 @@ en_CA:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
@@ -1161,7 +1162,7 @@ en_CA:
       mobile_menu:
         cart: "Cart"
     register_call:
-      selling_on_ofn: "Interested in getting on the Open Food Network?"
+      selling_on_ofn: "Interested in selling on the Open Food Network?"
       register: "Register here"
     footer:
       footer_secure: "Secure and trusted."
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index 62e613451c..8ac88a1c22 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -13,6 +13,7 @@ en_DE:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index c514500eff..226b76073b 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -13,6 +13,7 @@ en_FR:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 35a9dc1a31..f0eb4a9725 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -13,6 +13,7 @@ en_GB:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_IE.yml b/config/locales/en_IE.yml
index c9112cfb88..2d46fa0f80 100644
--- a/config/locales/en_IE.yml
+++ b/config/locales/en_IE.yml
@@ -13,6 +13,7 @@ en_IE:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: County
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_IN.yml b/config/locales/en_IN.yml
index e3ea0153f7..024c3eee41 100644
--- a/config/locales/en_IN.yml
+++ b/config/locales/en_IN.yml
@@ -13,6 +13,7 @@ en_IN:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index 97f7ccf95b..1ce3017028 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -13,6 +13,7 @@ en_NZ:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
@@ -1766,7 +1767,7 @@ en_NZ:
     steps:
       introduction:
         registration_greeting: "Hi there!"
-        registration_intro: "You can now create a profile for your Producer or Hub"
+        registration_intro: "Producer or Hub? You can create a profile"
         registration_checklist: "What do I need?"
         registration_time: "5-10 minutes"
         registration_enterprise_address: "Enterprise address"
diff --git a/config/locales/en_PH.yml b/config/locales/en_PH.yml
index 7ac90cfc1b..a687445c8e 100644
--- a/config/locales/en_PH.yml
+++ b/config/locales/en_PH.yml
@@ -13,6 +13,7 @@ en_PH:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: Province
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index f8c377e354..da39b9874a 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -13,6 +13,7 @@ en_US:
         email: Customer E-mail
       spree/payment:
         amount: Amount
+        state: State
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml
index aa488086cc..ad18d61c0d 100644
--- a/config/locales/en_ZA.yml
+++ b/config/locales/en_ZA.yml
@@ -13,6 +13,7 @@ en_ZA:
         email: Customer E-Mail
       spree/payment:
         amount: Amount
+        state: Province
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 75eed08b9d..1c9d3f32f0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -13,6 +13,7 @@ es:
         email: E-mail del consumidor
       spree/payment:
         amount: Cantidad
+        state: Provincia
       spree/product:
         primary_taxon: "categoría del producto"
         supplier: "Proveedora"
diff --git a/config/locales/es_CR.yml b/config/locales/es_CR.yml
index d22b5cdff1..02d9bfe609 100644
--- a/config/locales/es_CR.yml
+++ b/config/locales/es_CR.yml
@@ -13,6 +13,7 @@ es_CR:
         email: Correo electrónico del cliente
       spree/payment:
         amount: Cantidad
+        state: Provincia
       spree/product:
         primary_taxon: "Categoría del producto"
         supplier: "Proveedor"
diff --git a/config/locales/fil_PH.yml b/config/locales/fil_PH.yml
index 94f2cac702..a69c602532 100644
--- a/config/locales/fil_PH.yml
+++ b/config/locales/fil_PH.yml
@@ -13,6 +13,7 @@ fil_PH:
         email: Email ng Parokyano
       spree/payment:
         amount: Halaga
+        state: province
       spree/product:
         primary_taxon: "Kategorya ng Produkto"
         supplier: "Supplier"
@@ -315,7 +316,7 @@ fil_PH:
     clear_all: alisin lahat
     start_date: "Petsa ng Pagsimula"
     end_date: "Petsa ng Pagtatapos"
-    form_invalid: "ang form ay may nawawala o hindi valid na sagot sa mga patlang"
+    form_invalid: "ang form ay may kulang o hindi valid na mga sagot"
     clear_filters: alisin ang mga filter
     clear: alisin
     save: i-save
@@ -355,7 +356,7 @@ fil_PH:
         settings: "settings"
         stripe_connect_enabled: paganahin ang pagtanggap ng mga bayad gamit ang Stripe Connect sa mga Shop?
         no_api_key_msg: walang Stripe account para sa enterprise na ito
-        configuration_explanation_html: para sa detalyadong panuto sa pag-configure ng pagsasama ng Stripe Connect, maaari lamang na<a href='https://github.com/openfoodfoundation/openfoodnetwork/wiki/Setting-up-Stripe-on-an-OFN-instance' target='_blank'>kumonsulta sa gabay</a>.
+        configuration_explanation_html: para sa detalyadong panuto sa pag-configure upang magamit ang Stripe Connect, maaari lamang na<a href='https://github.com/openfoodfoundation/openfoodnetwork/wiki/Setting-up-Stripe-on-an-OFN-instance' target='_blank'>kumonsulta sa gabay</a>.
         status: Status
         ok: Ok
         instance_secret_key: Instance Secret Key
@@ -387,11 +388,11 @@ fil_PH:
         select_state: 'pumili ng Lalawigan'
         edit: 'i-edit'
         update_address: 'i-update ang address'
-        confirm_delete: 'siguradong tatanggalin?'
+        confirm_delete: 'siguradong tatanggalin na?'
         search_by_email: "hanapin gamit ang email/code..."
         guest_label: 'Guest checkout'
       destroy:
-        has_associated_orders: 'hindi tagumpay ang pagtanggal: ang customer ay may mga iniugnay na order sa kaniyang shop'
+        has_associated_orders: 'hindi tagumpay ang pagtanggal: ang customer ay may iniugnay na mga order sa kaniyang shop'
     contents:
       edit:
         title: nilalaman
@@ -423,7 +424,7 @@ fil_PH:
       form:
         manages: namamahala
       enterprise_role:
-        manages: namamahala
+        manages: pinamamahalaan
     products:
       unit_name_placeholder: 'hal. mga kumpol'
       index:
@@ -541,7 +542,7 @@ fil_PH:
         products_created: ang mga produkto ay nagawa na
         products_updated: in-update ang mga produkto
         inventory_created: ang mga imbentaryo ng item ay nagawa na
-        inventory_updated: inupdate ang mga inimbentaryong item
+        inventory_updated: inupdate ang mga naka-imbentaryong item
         products_reset: na-reset sa zero ang lebel ng stock ng mga produkto
         inventory_reset: na-reset sa zero ang lebel ng stock ng mga imbentaryo ng item
         all_saved: "lahat ng mga item ay matagumpay na na-save"
@@ -1107,7 +1108,7 @@ fil_PH:
       yes_cancel_them: kanselahin
       no_keep_them: ituloy
       yes_i_am_sure: oo, sigurado ako
-      order_update_issues_msg: ang ibang mga order ay hindi awtomatikong ma-update, sapagkat ito ay manwal na inayos. Tignan ang mga isyu na nakalista sa baba at gawin ang nararapat na pag-aayos sa bawat order kung kinakailangan.
+      order_update_issues_msg: "ang ibang mga order ay hindi awtomatikong ma-update, sapagkat ito ay manwal na inayos. Tignan ang mga isyu na nakalista sa baba at gawin ang nararapat na pag-aayos sa bawat indibiduwal na \norder kung kinakailangan."
       no_results:
         no_subscriptions: wala pang mga subscription....
         why_dont_you_add_one: nais mo bang magdagdag ng isa? :)
@@ -1165,7 +1166,7 @@ fil_PH:
       footer_legal_call: "basahin ang aming"
       footer_legal_tos: "mga tuntunin at kondisyon"
       footer_legal_visit: "Hanapin kami sa"
-      footer_legal_text_html: "ang Open Food Network ay isang libre at bukas ang pinagkukuhanang platform. ang mga nilalaman nito ay lisensiyado ng%{content_license}at ang aming mga code ng %{code_license}."
+      footer_legal_text_html: "ang Open Food Network ay isang libre at open source software platform. ang mga nilalaman nito ay lisensiyado ng%{content_license}at ang aming mga code ng %{code_license}."
       footer_data_text_with_privacy_policy_html: "Pinangangalagaan namin ang inyong impormasyon. Basahin ang aming%{privacy_policy}at%{cookies_policy}"
       footer_data_text_without_privacy_policy_html: "Pinangangalagaan namin ang inyong impormasyon. Basahin ang aming%{cookies_policy}"
       footer_data_privacy_policy: "patakaran ng privacy"
@@ -1280,8 +1281,8 @@ fil_PH:
   label_administration: "administrasyon"
   label_admin: "admin"
   label_account: "Account"
-  label_more: "ipakita lahat"
-  label_less: "ipakita ang mas kaunti"
+  label_more: "ipakita ang iba pa"
+  label_less: "huwag ipakita ang lahat"
   label_notices: "mga abiso"
   cart_items: "mga item"
   cart_headline: "Ang iyong shopping cart"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 50b821e721..4f3102e9d1 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -13,6 +13,7 @@ fr:
         email: Email acheteur
       spree/payment:
         amount: Montant
+        state: Statut
       spree/product:
         primary_taxon: "Catégorie Produit"
         supplier: "Fournisseur"
@@ -1400,7 +1401,7 @@ fr:
   checkout_details: "Vos informations"
   checkout_billing: "Informations de facturation"
   checkout_default_bill_address: "Sauvegarder comme adresse de facturation par défaut"
-  checkout_shipping: Informations de livraison
+  checkout_shipping: Informations de livraison ou de retrait
   checkout_default_ship_address: "Sauvegarder comme adresse de livraison par défaut"
   checkout_method_free: Pas de frais supplémentaires
   checkout_address_same: Adresse de livraison identique à l'adresse de facturation?
@@ -3144,7 +3145,7 @@ fr:
         index:
           payment_methods: "Méthodes de paiement"
           new_payment_method: "Nouvelle méthode de paiement"
-          name: "Produit/Variante"
+          name: "Nom"
           products_distributor: "Distributeur"
           provider: "Fournisseur"
           environment: "Environnement"
@@ -3177,7 +3178,7 @@ fr:
           business_name: Nom de l'entreprise
           charges_enabled: Frais activés
         form:
-          name: "Produit/Variante"
+          name: "Nom"
           description: "Description"
           environment: "Environnement"
           display: "Afficher"
diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml
index a8822f7337..cb8f260e97 100644
--- a/config/locales/fr_BE.yml
+++ b/config/locales/fr_BE.yml
@@ -13,6 +13,7 @@ fr_BE:
         email: Adresse électronique acheteur
       spree/payment:
         amount: Montant
+        state: Statut de la commande
       spree/product:
         primary_taxon: "Catégorie de Produit"
         supplier: "Fournisseur"
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 7b58f542a8..20e5e4c0f5 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -13,6 +13,7 @@ fr_CA:
         email: Email acheteur
       spree/payment:
         amount: Montant
+        state: Département
       spree/product:
         primary_taxon: "Catégorie Produit"
         supplier: "Fournisseur"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index ebbf8932d0..607b854f1f 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -13,6 +13,7 @@ it:
         email: E-Mail Cliente
       spree/payment:
         amount: Quantità
+        state: Stato
       spree/product:
         primary_taxon: "Categoria Prodotto"
         supplier: "Fornitore"
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index c47ad93636..e2125ed1dc 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -13,6 +13,7 @@ nb:
         email: Epost Kunde
       spree/payment:
         amount: Beløp
+        state: Tilstand
       spree/product:
         primary_taxon: "Produktkategori"
         supplier: "Leverandør"
diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml
index 61e9b4a7d9..2df7deb5ec 100644
--- a/config/locales/nl_BE.yml
+++ b/config/locales/nl_BE.yml
@@ -13,6 +13,7 @@ nl_BE:
         email: Klanten e-mail
       spree/payment:
         amount: Bedrag
+        state: Staat
       spree/product:
         primary_taxon: "Product categorie"
         supplier: "Leverancier"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 0e9da2fb53..cef2df924b 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -13,6 +13,7 @@ pt:
         email: Email do/a Consumidor/a
       spree/payment:
         amount: Quantia
+        state: Estado
       spree/product:
         primary_taxon: "Categoria de Produto"
         supplier: "Fornecedor"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index acdf438a4d..7c91a2c162 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -13,6 +13,7 @@ pt_BR:
         email: Email do cliente
       spree/payment:
         amount: Montante
+        state: Estado
       spree/product:
         primary_taxon: "Categoria de Produto"
         supplier: "Fornecedor"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 92d5d360e6..60d31909ed 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -8,6 +8,8 @@ sv:
         payment_state: Betalningstatus
         shipment_state: Leveransstatus
         state: Region
+      spree/payment:
+        state: Region
       spree/product:
         supplier: "Leverantör"
         variant_unit: "Enhet för variant"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 1bcf7af309..7157414c64 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -13,6 +13,7 @@ tr:
         email: Müşteri E-postası
       spree/payment:
         amount: Tutar
+        state: Durum
       spree/product:
         primary_taxon: "ÜRÜN KATEGORİSİ"
         supplier: "TEDARİKÇİ"
@@ -676,11 +677,11 @@ tr:
           primary_producer: Birincil üretici misiniz?
           primary_producer_tip: Siz de birincil üreticisiyseniz 'Üretici' yi seçin.
           producer: ÜRETİCİ
-          any: Hepsi
-          none: SATMIYOR
+          any: KENDİ VE/VEYA BAŞKASININ ÜRÜNLERİ
+          none: SATIŞ YAPMIYOR
           own: KENDİ ÜRÜNLERİ
           sells: NE SATIYOR
-          sells_tip: "Hiç - İşletme müşterilere doğrudan satış yapmaz. <br /> Kendi - İşletme müşterilerine kendi ürünlerini satar. <br /> Hepsi - İşletme kendi ürünlerini veya diğer işletmelerin ürünlerini satabilir. <br />"
+          sells_tip: "Satış Yapmıyor - İşletme müşterilere doğrudan satış yapmaz. <br /> Kendi Ürünleri - İşletme müşterilerine kendi ürünlerini satar. <br /> Kendi ve/veya başkasının ürünleri - İşletme kendi ürünlerini ve/veya diğer işletmelerin ürünlerini satabilir. <br />"
           visible_in_search: ARAMADA GÖRÜNÜR MÜ?
           visible_in_search_tip: Sitede arama yapılırken bu işletmenin müşteriler tarafından görünür olup olmayacağını belirler.
           visible: GÖRÜNÜR
@@ -1015,7 +1016,7 @@ tr:
       orders_and_fulfillment:
         name: Siparişler ve Gerçekleşme Raporları
       customers:
-        name: MÜŞTERİLER
+        name: Müşteriler
       products_and_inventory:
         name: Ürünler ve Stok
       users_and_enterprises:
@@ -1376,17 +1377,17 @@ tr:
   connect_cta: "Keşfedin"
   system_headline: "Nasıl çalışıyor ?"
   system_step1: "1. Ara"
-  system_step1_text: "Yerel, adil, temiz ve mevsimsel gıda için, bağımsız ve cesur üreticilerimizin ve dağıtımcılarımızın dükkanlarından alışveriş yapın.  Konuma, ürün kategorisine, üretici özelliklerine veya teslimat tercihlerine göre arama yapabilirsiniz. "
+  system_step1_text: "Yerel ve mevsimsel gıda için, bağımsız ve cesur üreticilerimizin ve dağıtımcılarımızın dükkanlarından alışveriş yapın.  "
   system_step2: "2. Alışveriş Yap"
-  system_step2_text: "Gıdanızı yerel üretici tezgahlarından, üretici ve türetici pazarlarından temin edin. Yaşanabilir bir dünya için alışkanlıklarınızı şimdi değiştirin. Gıdanızın ve onu size getiren insanların hikayelerini öğrenin!"
+  system_step2_text: "Gıdanızı yerel üreticilerden ve türetici pazarlarından temin edin. Yaşanabilir bir dünya için alışkanlıklarınızı şimdi değiştirin. "
   system_step3: "3. Teslimat "
-  system_step3_text: "Gıdanıza ulaşmak için adresinize teslim edilmesini  bekleyin. Dilerseniz gıdanız ile daha kişisel bir bağ kurmak için üreticinizi veya pazarını kendiniz ziyaret edin. Doğayla ve gıdayla istediğiniz  şekilde ama gerçek bir bağ kurun. "
+  system_step3_text: "Siparişinizin teslim edilmesini bekleyin veya teslim alım noktasında buluşun. Gıdayla istediğiniz şekilde ama gerçek bir bağ kurun.  "
   cta_headline: "Dünyayı daha iyi bir yer yapan alışveriş biçimi."
-  cta_label: "Hazırım"
+  cta_label: "ALIŞVERİŞE HAZIRIM"
   stats_headline: "Yeni bir gıda sistemi yaratıyoruz."
   stats_producers: "ÜRETİCİ"
   stats_shops: "DÜKKAN"
-  stats_shoppers: "TÜRETİCİ"
+  stats_shoppers: "ALICI"
   stats_orders: "ALIŞVERİŞ"
   checkout_title: Ödeme Yap
   checkout_now: Alışverişi Tamamla
@@ -1521,7 +1522,7 @@ tr:
   shopping_tabs_contact: "İLETİŞİM"
   shopping_contact_address: "Adres"
   shopping_contact_web: "İLETİŞİM"
-  shopping_contact_social: "Takip et"
+  shopping_contact_social: "TAKİP ET"
   shopping_groups_part_of: "şunun parçası:"
   shopping_producers_of_hub: "%{hub} üreticileri:"
   enterprises_next_closing: "Bir sonraki sipariş kapanışı"
@@ -1542,7 +1543,7 @@ tr:
   hubs_filter_delivery: "Eve Teslim"
   hubs_filter_property: "Özellik"
   hubs_matches: "Bunu mu arıyordunuz?"
-  hubs_intro: Bulunduğunuz bölgeden alışveriş yapın
+  hubs_intro: Alışverişe başlayın
   hubs_distance: En yakın
   hubs_distance_filter: "Bana %{location} yakınındaki dükkanları göster"
   shop_changeable_orders_alert_html:
@@ -1588,7 +1589,7 @@ tr:
   groups_producers: "ÜRETİCİLERİMİZ"
   groups_hubs: "Pazarlarımız"
   groups_contact_web: İLETİŞİM
-  groups_contact_social: Takip et
+  groups_contact_social: TAKİP ET
   groups_contact_address: Adres
   groups_contact_email: Bize e-posta gönderin
   groups_contact_website: İnternet sitemizi ziyaret edin
@@ -1616,7 +1617,7 @@ tr:
   producers_buy: Alışveriş ürünleri
   producers_contact: İLETİŞİM
   producers_contact_phone: 'Tel:'
-  producers_contact_social: Takip et
+  producers_contact_social: TAKİP ET
   producers_buy_at_html: "%{enterprise} ürünleri için buradan alışveriş yapın:"
   producers_filter: Filtrele
   producers_filter_type: tür
@@ -1893,7 +1894,7 @@ tr:
   bulk: "toplu"
   shop_variant_quantity_min: "min"
   shop_variant_quantity_max: "maks"
-  follow: "Takip et"
+  follow: "TAKİP ET"
   shop_for_products_html: "<span class=\"turquoise\">%{enterprise}</span> ürünleri için şuradan alışveriş yapın:"
   change_shop: "Dükkanı şuna değiştir:"
   shop_at: "Şimdi alışveriş yapın:"
@@ -2457,7 +2458,7 @@ tr:
           non_producer_example: 'Örn: Manavlar, Gıda Kooperatifleri, Gıda Toplulukları vs.'
         enterprise_status:
           status_title: "%{name} kuruldu ve başlamaya hazır!"
-          severity: Şiddet
+          severity: ÖNEM
           description: Açıklama
           resolve: Çözüm
         exchange_products:
@@ -3103,7 +3104,7 @@ tr:
           new_shipping_method: "YENİ TESLİMAT YÖNTEMİ"
           back_to_shipping_methods_list: "Teslİmat Yöntemlerİne Gerİ Dön"
         edit:
-          editing_shipping_method: "Teslİmat YöntemİNİ Düzenle"
+          editing_shipping_method: "Teslimat Yöntemini Düzenle"
           new: "YENİ"
           back_to_shipping_methods_list: "Teslİmat Yöntemlerİne Gerİ Dön"
         form:

From ffc98c63faec4e66c408213d1a3343a94d740145 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Sat, 25 Jul 2020 23:36:48 +1000
Subject: [PATCH 185/340] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4f3102e9d1..115a360802 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -14,6 +14,7 @@ fr:
       spree/payment:
         amount: Montant
         state: Statut
+        source: Source
       spree/product:
         primary_taxon: "Catégorie Produit"
         supplier: "Fournisseur"

From 227892b6291c945a8f1965c3a1740e1c683fdb44 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Sat, 25 Jul 2020 23:36:58 +1000
Subject: [PATCH 186/340] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 226b76073b..4d85ebcb22 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -14,6 +14,7 @@ en_FR:
       spree/payment:
         amount: Amount
         state: State
+        source: Source
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"

From df22ad46d6c8e2e0e9904fa75c0126ad455efee7 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 25 Jul 2020 14:53:35 +0100
Subject: [PATCH 187/340] Update GETTING_STARTED.md

Clarify users landing on this page that they should use ofn-install for server deployments.
---
 GETTING_STARTED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GETTING_STARTED.md b/GETTING_STARTED.md
index b252993215..fd8dc47769 100644
--- a/GETTING_STARTED.md
+++ b/GETTING_STARTED.md
@@ -1,6 +1,6 @@
 ### Getting Started
 
-This is a general guide to setting up an Open Food Network development environment on your local machine.
+This is a general guide to setting up an Open Food Network **development environment on your local machine**. If you want to setup OFN on a server, please have a look at the [ofn-install deployment guide](https://github.com/openfoodfoundation/ofn-install/wiki).
 
 ### Requirements
 

From 5266d95910a9072b128e048fee0502edac9d7925 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 24 Jul 2020 18:09:58 +0100
Subject: [PATCH 188/340] Move method closer to related/similar methods

---
 app/controllers/checkout_controller.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index c83b5e361d..1c8ebbcbaa 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -138,14 +138,6 @@ class CheckoutController < Spree::StoreController
     current_order.payments.destroy_all if request.put?
   end
 
-  def rescue_from_spree_gateway_error(error)
-    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 }
-    end
-  end
-
   def valid_payment_intent_provided?
     return false unless params["payment_intent"]&.starts_with?("pi_")
 
@@ -261,6 +253,14 @@ class CheckoutController < Spree::StoreController
     end
   end
 
+  def rescue_from_spree_gateway_error(error)
+    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 }
+    end
+  end
+
   def permitted_params
     PermittedAttributes::Checkout.new(params).call
   end

From 1bf946d1242d5788d7ed9e3c207614477a0e2ae3 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 24 Jul 2020 18:14:32 +0100
Subject: [PATCH 189/340] Reused code in checkout controller, the reponse for
 the case when there is a stripe exception anywhere is the same as when the
 update action fails

---
 app/controllers/checkout_controller.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 1c8ebbcbaa..3d068f1a8b 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -255,10 +255,9 @@ class CheckoutController < Spree::StoreController
 
   def rescue_from_spree_gateway_error(error)
     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 }
-    end
+    # This can also happen during the edit action
+    #   but the response needed here is the same as when the update action fails
+    update_failed_response
   end
 
   def permitted_params

From b23b707b5d9daa61fa166244c9a17f37834566a0 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 24 Jul 2020 18:27:51 +0100
Subject: [PATCH 190/340] Notify bugsnag and execute post checkout actions
 (reset to cart state) whenever there's a payment gateway exceeption raised

---
 app/controllers/checkout_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 3d068f1a8b..8c4aea8cc4 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -254,6 +254,9 @@ class CheckoutController < Spree::StoreController
   end
 
   def rescue_from_spree_gateway_error(error)
+    Bugsnag.notify(error)
+    checkout_failed
+
     flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
     # This can also happen during the edit action
     #   but the response needed here is the same as when the update action fails

From ec0d06af542f167f23e049816000acf573f96db6 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 24 Jul 2020 18:29:47 +0100
Subject: [PATCH 191/340] Reuse update_failed method as the code needed is
 exactly the same

---
 app/controllers/checkout_controller.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 8c4aea8cc4..dd1a67c702 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -254,13 +254,10 @@ class CheckoutController < Spree::StoreController
   end
 
   def rescue_from_spree_gateway_error(error)
-    Bugsnag.notify(error)
-    checkout_failed
-
     flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
     # This can also happen during the edit action
-    #   but the response needed here is the same as when the update action fails
-    update_failed_response
+    #   but the actions and response needed are exactly the same as when the update action fails
+    update_failed(error)
   end
 
   def permitted_params

From 79aadf5c86b851f455444c868ae449a336626d9e Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 27 Jul 2020 03:23:28 +1000
Subject: [PATCH 192/340] Updating translations for config/locales/tr.yml

---
 config/locales/tr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7157414c64..cd328fd0fe 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -14,6 +14,7 @@ tr:
       spree/payment:
         amount: Tutar
         state: Durum
+        source: Kaynak
       spree/product:
         primary_taxon: "ÜRÜN KATEGORİSİ"
         supplier: "TEDARİKÇİ"

From 16b9c8c8140fe071b34257e053e174ad40b18ef4 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 12:28:33 +0100
Subject: [PATCH 193/340] Replace usage of create_enterprise_user with :user
 factory

---
 .../admin/bulk_line_items_controller_spec.rb  |  4 +--
 .../admin/enterprises_controller_spec.rb      | 28 ++++++-------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/spec/controllers/admin/bulk_line_items_controller_spec.rb b/spec/controllers/admin/bulk_line_items_controller_spec.rb
index 553e796558..da05149079 100644
--- a/spec/controllers/admin/bulk_line_items_controller_spec.rb
+++ b/spec/controllers/admin/bulk_line_items_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Admin::BulkLineItemsController, type: :controller do
-  include AuthenticationWorkflow
-
   describe '#index' do
     render_views
 
@@ -17,7 +15,7 @@ describe Admin::BulkLineItemsController, type: :controller do
     let!(:line_item4) { FactoryBot.create(:line_item_with_shipment, order: order3) }
 
     context "as a normal user" do
-      before { allow(controller).to receive_messages spree_current_user: create_enterprise_user }
+      before { allow(controller).to receive_messages spree_current_user: create(:user) }
 
       it "should deny me access to the index action" do
         spree_get :index, format: :json
diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb
index c8a0a9ac29..c707fd759f 100644
--- a/spec/controllers/admin/enterprises_controller_spec.rb
+++ b/spec/controllers/admin/enterprises_controller_spec.rb
@@ -2,8 +2,6 @@ require 'spec_helper'
 require 'open_food_network/order_cycle_permissions'
 
 describe Admin::EnterprisesController, type: :controller do
-  include AuthenticationWorkflow
-
   let(:user) { create(:user) }
   let(:admin_user) { create(:admin_user) }
   let(:distributor_manager) { create(:user, enterprise_limit: 10, enterprises: [distributor]) }
@@ -366,18 +364,8 @@ describe Admin::EnterprisesController, type: :controller do
   end
 
   describe "bulk updating enterprises" do
-    let!(:original_owner) do
-      user = create_enterprise_user
-      user.enterprise_limit = 2
-      user.save!
-      user
-    end
-    let!(:new_owner) do
-      user = create_enterprise_user
-      user.enterprise_limit = 2
-      user.save!
-      user
-    end
+    let!(:original_owner) { create(:user) }
+    let!(:new_owner) { create(:user) }
     let!(:profile_enterprise1) { create(:enterprise, sells: 'none', owner: original_owner ) }
     let!(:profile_enterprise2) { create(:enterprise, sells: 'none', owner: original_owner ) }
 
@@ -441,7 +429,7 @@ describe Admin::EnterprisesController, type: :controller do
   end
 
   describe "for_order_cycle" do
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
     let!(:enterprise) { create(:enterprise, sells: 'any', owner: user) }
     let(:permission_mock) { double(:permission) }
 
@@ -487,7 +475,7 @@ describe Admin::EnterprisesController, type: :controller do
   end
 
   describe "visible" do
-    let!(:user) { create(:user, enterprise_limit: 10) }
+    let!(:user) { create(:user) }
     let!(:visible_enterprise) { create(:enterprise, sells: 'any', owner: user) }
     let!(:not_visible_enterprise) { create(:enterprise, sells: 'any') }
 
@@ -508,10 +496,10 @@ describe Admin::EnterprisesController, type: :controller do
   describe "index" do
     context "as super admin" do
       let(:super_admin) { create(:admin_user) }
-      let!(:user) { create_enterprise_user(enterprise_limit: 10) }
+      let!(:user) { create(:user) }
       let!(:enterprise1) { create(:enterprise, sells: 'any', owner: user) }
       let!(:enterprise2) { create(:enterprise, sells: 'own', owner: user) }
-      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create_enterprise_user ) }
+      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create(:user) ) }
 
       before do
         allow(controller).to receive_messages spree_current_user: super_admin
@@ -533,10 +521,10 @@ describe Admin::EnterprisesController, type: :controller do
     end
 
     context "as an enterprise user" do
-      let!(:user) { create_enterprise_user(enterprise_limit: 10) }
+      let!(:user) { create(:user) }
       let!(:enterprise1) { create(:enterprise, sells: 'any', owner: user) }
       let!(:enterprise2) { create(:enterprise, sells: 'own', owner: user) }
-      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create_enterprise_user ) }
+      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create(:user) ) }
 
       before do
         allow(controller).to receive_messages spree_current_user: user

From 3217b3ba8660b5d8773a701622513e93c44277da Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 12:28:53 +0100
Subject: [PATCH 194/340] Delete dead commented code

---
 spec/support/request/authentication_workflow.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 8968c84da5..457a2f2b33 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -40,10 +40,6 @@ module AuthenticationWorkflow
   def login_to_admin_as(user)
     quick_login_as user
     visit spree.admin_dashboard_path
-    # visit spree.admin_dashboard_path
-    # fill_in 'spree_user_email', :with => user.email
-    # fill_in 'spree_user_password', :with => user.password
-    # click_button 'Login'
   end
 
   def fill_in_and_submit_login_form(user)

From 1af4bf69947b5079684dfb79fdc714a984f1d027 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 13:14:08 +0100
Subject: [PATCH 195/340] Replace usage of create_enterprise_user with :user
 factory

---
 .../admin/order_cycles_controller_spec.rb     |  6 ++---
 .../api/enterprises_controller_spec.rb        |  7 +++---
 .../registration_controller_spec.rb           |  5 ++---
 .../spree/admin/orders_controller_spec.rb     |  3 +--
 .../spree/admin/overview_controller_spec.rb   |  6 ++---
 .../spree/admin/search_controller_spec.rb     |  7 +++---
 .../spree/credit_cards_controller_spec.rb     |  3 +--
 .../spree/user_sessions_controller_spec.rb    |  4 +---
 .../user_confirmations_controller_spec.rb     |  7 +++---
 .../admin/bulk_order_management_spec.rb       |  2 +-
 .../admin/bulk_product_update_spec.rb         |  2 +-
 spec/features/admin/customers_spec.rb         |  2 +-
 spec/features/admin/enterprise_fees_spec.rb   |  4 ++--
 spec/features/admin/enterprise_groups_spec.rb |  4 ++--
 .../admin/enterprise_relationships_spec.rb    |  4 ++--
 spec/features/admin/enterprise_user_spec.rb   |  4 ++--
 .../features/admin/enterprises/images_spec.rb |  4 ++--
 spec/features/admin/enterprises/index_spec.rb |  8 +++----
 spec/features/admin/enterprises_spec.rb       |  4 ++--
 .../admin/order_cycles/simple_spec.rb         |  8 +++----
 .../features/admin/order_print_ticket_spec.rb |  4 ++--
 spec/features/admin/order_spec.rb             |  4 ++--
 spec/features/admin/overview_spec.rb          |  4 ++--
 spec/features/admin/payment_method_spec.rb    |  4 ++--
 spec/features/admin/product_import_spec.rb    |  4 ++--
 spec/features/admin/products_spec.rb          |  4 ++--
 spec/features/admin/reports_spec.rb           | 22 +++++++++----------
 spec/features/admin/shipping_methods_spec.rb  |  4 ++--
 spec/features/admin/subscriptions_spec.rb     |  2 +-
 spec/features/admin/variant_overrides_spec.rb |  2 +-
 .../order_cycle_form_applicator_spec.rb       |  4 +---
 .../order_cycle_management_report_spec.rb     |  4 +---
 .../users_and_enterprises_report_spec.rb      | 10 ++++-----
 spec/models/enterprise_spec.rb                |  8 +++----
 spec/models/product_importer_spec.rb          |  8 +++----
 .../admin/index_enterprise_serializer_spec.rb |  4 +---
 .../spree/admin/orders/edit.html.haml_spec.rb |  3 +--
 .../admin/orders/index.html.haml_spec.rb      |  4 +---
 38 files changed, 83 insertions(+), 110 deletions(-)

diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb
index 0175cc1d28..a12b644f2c 100644
--- a/spec/controllers/admin/order_cycles_controller_spec.rb
+++ b/spec/controllers/admin/order_cycles_controller_spec.rb
@@ -2,9 +2,7 @@ require 'spec_helper'
 
 module Admin
   describe OrderCyclesController, type: :controller do
-    include AuthenticationWorkflow
-
-    let!(:distributor_owner) { create_enterprise_user enterprise_limit: 2 }
+    let!(:distributor_owner) { create(:user) }
 
     before do
       allow(controller).to receive_messages spree_current_user: distributor_owner
@@ -300,7 +298,7 @@ module Admin
     end
 
     describe "notifying producers" do
-      let(:user) { create_enterprise_user }
+      let(:user) { create(:user) }
       let(:admin_user) do
         user = create(:user)
         user.spree_roles << Spree::Role.find_or_create_by!(name: 'admin')
diff --git a/spec/controllers/api/enterprises_controller_spec.rb b/spec/controllers/api/enterprises_controller_spec.rb
index b6e42967dc..0a2a185b72 100644
--- a/spec/controllers/api/enterprises_controller_spec.rb
+++ b/spec/controllers/api/enterprises_controller_spec.rb
@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Api::EnterprisesController, type: :controller do
-  include AuthenticationWorkflow
   render_views
 
   let(:enterprise) { create(:distributor_enterprise) }
 
   context "as an enterprise owner" do
-    let(:enterprise_owner) { create_enterprise_user enterprise_limit: 10 }
+    let(:enterprise_owner) { create(:user) }
     let!(:enterprise) { create(:distributor_enterprise, owner: enterprise_owner) }
 
     before do
@@ -52,7 +51,7 @@ describe Api::EnterprisesController, type: :controller do
   end
 
   context "as an enterprise manager" do
-    let(:enterprise_manager) { create_enterprise_user }
+    let(:enterprise_manager) { create(:user) }
 
     before do
       enterprise_manager.enterprise_roles.build(enterprise: enterprise).save
@@ -74,7 +73,7 @@ describe Api::EnterprisesController, type: :controller do
   end
 
   context "as an non-managing user" do
-    let(:non_managing_user) { create_enterprise_user }
+    let(:non_managing_user) { create(:user) }
 
     before do
       allow(Enterprise)
diff --git a/spec/controllers/registration_controller_spec.rb b/spec/controllers/registration_controller_spec.rb
index 31a1a91116..ea5f73c590 100644
--- a/spec/controllers/registration_controller_spec.rb
+++ b/spec/controllers/registration_controller_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RegistrationController, type: :controller do
-  include AuthenticationWorkflow
   describe "redirecting when user not logged in" do
     it "index" do
       get :index
@@ -10,7 +9,7 @@ describe RegistrationController, type: :controller do
   end
 
   describe "redirecting when user has reached enterprise ownership limit" do
-    let!(:user) { create_enterprise_user( enterprise_limit: 1 ) }
+    let!(:user) { create(:user, enterprise_limit: 1 ) }
     let!(:enterprise) { create(:distributor_enterprise, owner: user) }
 
     before do
@@ -24,7 +23,7 @@ describe RegistrationController, type: :controller do
   end
 
   describe "loading data when user is logged in" do
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
 
     before do
       allow(controller).to receive_messages spree_current_user: user
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index 5d0401c6cc..b1b7d5a05f 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Spree::Admin::OrdersController, type: :controller do
-  include AuthenticationWorkflow
   include OpenFoodNetwork::EmailHelper
 
   describe "#edit" do
@@ -109,7 +108,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
   describe "#index" do
     context "as a regular user" do
-      before { allow(controller).to receive(:spree_current_user) { create_enterprise_user } }
+      before { allow(controller).to receive(:spree_current_user) { create(:user) } }
 
       it "should deny me access to the index action" do
         spree_get :index
diff --git a/spec/controllers/spree/admin/overview_controller_spec.rb b/spec/controllers/spree/admin/overview_controller_spec.rb
index e445932555..3c610b62cc 100644
--- a/spec/controllers/spree/admin/overview_controller_spec.rb
+++ b/spec/controllers/spree/admin/overview_controller_spec.rb
@@ -1,15 +1,13 @@
 require 'spec_helper'
 
 describe Spree::Admin::OverviewController, type: :controller do
-  include AuthenticationWorkflow
-
   describe "#index" do
     before do
       allow(controller).to receive(:spree_current_user).and_return(user)
     end
 
     context "when user owns only one enterprise" do
-      let(:user) { create_enterprise_user }
+      let(:user) { create(:user) }
       let!(:enterprise) { create(:distributor_enterprise, owner: user) }
 
       context "when the referer is not an admin page" do
@@ -48,7 +46,7 @@ describe Spree::Admin::OverviewController, type: :controller do
     end
 
     context "when user owns multiple enterprises" do
-      let(:user) { create_enterprise_user(enterprise_limit: 2) }
+      let(:user) { create(:user) }
 
       let!(:enterprise1) { create(:distributor_enterprise, owner: user) }
       before { create(:distributor_enterprise, owner: user) }
diff --git a/spec/controllers/spree/admin/search_controller_spec.rb b/spec/controllers/spree/admin/search_controller_spec.rb
index 48fffbabcd..d1219e8e67 100644
--- a/spec/controllers/spree/admin/search_controller_spec.rb
+++ b/spec/controllers/spree/admin/search_controller_spec.rb
@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe Spree::Admin::SearchController, type: :controller do
-  include AuthenticationWorkflow
   context "Distributor Enterprise User" do
-    let!(:owner) { create_enterprise_user( email: "test1@email.com" ) }
-    let!(:manager) { create_enterprise_user( email: "test2@email.com" ) }
-    let!(:random) { create_enterprise_user( email: "test3@email.com" ) }
+    let!(:owner) { create(:user, email: "test1@email.com" ) }
+    let!(:manager) { create(:user, email: "test2@email.com" ) }
+    let!(:random) { create(:user, email: "test3@email.com" ) }
     let!(:enterprise) { create(:enterprise, owner: owner, users: [owner, manager]) }
     before { login_as_enterprise_user [enterprise] }
 
diff --git a/spec/controllers/spree/credit_cards_controller_spec.rb b/spec/controllers/spree/credit_cards_controller_spec.rb
index 2c4f6a3a15..e98956ae32 100644
--- a/spec/controllers/spree/credit_cards_controller_spec.rb
+++ b/spec/controllers/spree/credit_cards_controller_spec.rb
@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'support/request/authentication_workflow'
 
 describe Spree::CreditCardsController, type: :controller do
-  include AuthenticationWorkflow
-  let(:user) { create_enterprise_user }
+  let(:user) { create(:user) }
   let(:token) { "tok_234bd2c22" }
 
   before do
diff --git a/spec/controllers/spree/user_sessions_controller_spec.rb b/spec/controllers/spree/user_sessions_controller_spec.rb
index 60cbbb7d03..d5bcff290c 100644
--- a/spec/controllers/spree/user_sessions_controller_spec.rb
+++ b/spec/controllers/spree/user_sessions_controller_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Spree::UserSessionsController, type: :controller do
-  include AuthenticationWorkflow
-
-  let(:user) { create_enterprise_user }
+  let(:user) { create(:user) }
 
   before do
     @request.env["devise.mapping"] = Devise.mappings[:spree_user]
diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb
index 9920330161..2fed4d0418 100644
--- a/spec/controllers/user_confirmations_controller_spec.rb
+++ b/spec/controllers/user_confirmations_controller_spec.rb
@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe UserConfirmationsController, type: :controller do
-  include AuthenticationWorkflow
   include OpenFoodNetwork::EmailHelper
 
-  let!(:user) { create_enterprise_user }
-  let!(:confirmed_user) { create_enterprise_user(confirmed_at: nil) }
-  let!(:unconfirmed_user) { create_enterprise_user(confirmed_at: nil) }
+  let!(:user) { create(:user) }
+  let!(:confirmed_user) { create(:user, confirmed_at: nil) }
+  let!(:unconfirmed_user) { create(:user, confirmed_at: nil) }
   let!(:confirmed_token) { confirmed_user.confirmation_token }
 
   before do
diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index a92afed022..cbd50ed2d9 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -719,7 +719,7 @@ feature '
     let!(:line_item_not_distributed) { create(:line_item_with_shipment, order: o2, product: create(:product, supplier: s1) ) }
 
     before(:each) do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: s1).save
       @enterprise_user.enterprise_roles.build(enterprise: d1).save
 
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index c0b55ed224..c216cda878 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -658,7 +658,7 @@ feature '
     end
 
     before do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: supplier_managed1).save
       @enterprise_user.enterprise_roles.build(enterprise: supplier_managed2).save
       @enterprise_user.enterprise_roles.build(enterprise: distributor_managed).save
diff --git a/spec/features/admin/customers_spec.rb b/spec/features/admin/customers_spec.rb
index a78e5b70e4..2260e2261a 100644
--- a/spec/features/admin/customers_spec.rb
+++ b/spec/features/admin/customers_spec.rb
@@ -6,7 +6,7 @@ feature 'Customers' do
   include WebHelper
 
   context "as an enterprise user" do
-    let(:user) { create_enterprise_user(enterprise_limit: 10) }
+    let(:user) { create(:user, enterprise_limit: 10) }
     let(:managed_distributor1) { create(:distributor_enterprise, owner: user) }
     let(:managed_distributor2) { create(:distributor_enterprise, owner: user) }
     let(:unmanaged_distributor) { create(:distributor_enterprise) }
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index a231f272e5..5129953df6 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an administrator
     I want to manage enterprise fees
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   let!(:tax_category_gst) { create(:tax_category, name: 'GST') }
 
@@ -107,7 +107,7 @@ feature '
   end
 
   context "as an enterprise manager" do
-    let(:enterprise_user) { create_enterprise_user }
+    let(:enterprise_user) { create(:user) }
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Second Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Third Distributor') }
diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb
index c6fa57b055..029e3c3283 100644
--- a/spec/features/admin/enterprise_groups_spec.rb
+++ b/spec/features/admin/enterprise_groups_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an administrator
     I want to manage enterprise groups
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   before(:each) do
     login_to_admin_section
@@ -107,7 +107,7 @@ feature '
   end
 
   context "as an enterprise user" do
-    let(:user) { create_enterprise_user }
+    let(:user) { create(:user) }
     let!(:enterprise) { create(:distributor_enterprise, owner: user) }
     let!(:group) { create(:enterprise_group, name: 'My Group', owner: user) }
 
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index 1926503045..43f4441108 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -4,8 +4,8 @@ feature '
   As an Administrator
   I want to manage relationships between enterprises
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "as a site administrator" do
     before { quick_login_as_admin }
@@ -92,7 +92,7 @@ feature '
     let!(:d1) { create(:distributor_enterprise) }
     let!(:d2) { create(:distributor_enterprise) }
     let!(:d3) { create(:distributor_enterprise) }
-    let(:enterprise_user) { create_enterprise_user( enterprises: [d1] ) }
+    let(:enterprise_user) { create(:user, enterprises: [d1] ) }
 
     let!(:er1) { create(:enterprise_relationship, parent: d1, child: d2) }
     let!(:er2) { create(:enterprise_relationship, parent: d2, child: d1) }
diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb
index 6b4f4dd778..d62322bc14 100644
--- a/spec/features/admin/enterprise_user_spec.rb
+++ b/spec/features/admin/enterprise_user_spec.rb
@@ -4,10 +4,10 @@ feature '
     As a Super User
     I want to setup users to manage an enterprise
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
-  let!(:user) { create_enterprise_user }
+  let!(:user) { create(:user) }
   let!(:supplier1) { create(:supplier_enterprise, name: 'Supplier 1') }
   let!(:supplier2) { create(:supplier_enterprise, name: 'Supplier 2') }
   let(:supplier_profile) { create(:supplier_enterprise, name: 'Supplier profile', sells: 'none') }
diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb
index 110b8c2664..ba264b4ca0 100644
--- a/spec/features/admin/enterprises/images_spec.rb
+++ b/spec/features/admin/enterprises/images_spec.rb
@@ -1,11 +1,11 @@
 require "spec_helper"
 
 feature "Managing enterprise images" do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "as an Enterprise user", js: true do
-    let(:enterprise_user) { create_enterprise_user(enterprise_limit: 1) }
+    let(:enterprise_user) { create(:user, enterprise_limit: 1) }
     let(:distributor) { create(:distributor_enterprise, name: "First Distributor") }
 
     before do
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index b4897cbb11..78b348fcd9 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 feature 'Enterprises Index' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "as an admin user" do
     scenario "listing enterprises" do
@@ -36,7 +36,7 @@ feature 'Enterprises Index' do
     context "editing enterprises in bulk" do
       let!(:s){ create(:supplier_enterprise) }
       let!(:d){ create(:distributor_enterprise, sells: 'none') }
-      let!(:d_manager) { create_enterprise_user(enterprise_limit: 1) }
+      let!(:d_manager) { create(:user, enterprise_limit: 1) }
 
       before do
         d_manager.enterprise_roles.build(enterprise: d).save
@@ -107,7 +107,7 @@ feature 'Enterprises Index' do
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Another Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Yet Another Distributor') }
-    let(:enterprise_manager) { create_enterprise_user }
+    let(:enterprise_manager) { create(:user) }
     let!(:er) { create(:enterprise_relationship, parent: distributor3, child: distributor1, permissions_list: [:edit_profile]) }
 
     before(:each) do
@@ -165,7 +165,7 @@ feature 'Enterprises Index' do
   end
 
   describe "as the owner of an enterprise" do
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
     let!(:owned_distributor) { create(:distributor_enterprise, name: 'Owned Distributor', owner: user) }
 
     before do
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index 4244e265e7..bd06ebc1a4 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an administrator
     I want to manage enterprises
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   scenario "viewing an enterprise" do
     e = create(:enterprise)
@@ -287,7 +287,7 @@ feature '
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Another Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Yet Another Distributor') }
-    let(:enterprise_user) { create_enterprise_user(enterprise_limit: 1) }
+    let(:enterprise_user) { create(:user, enterprise_limit: 1) }
     let!(:er) { create(:enterprise_relationship, parent: distributor3, child: distributor1, permissions_list: [:edit_profile]) }
 
     before(:each) do
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb
index 0d6872c19c..b946eefae8 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/features/admin/order_cycles/simple_spec.rb
@@ -151,7 +151,7 @@ feature '
 
     context "that is a manager of the coordinator" do
       before do
-        @new_user = create_enterprise_user
+        @new_user = create(:user)
         @new_user.enterprise_roles.build(enterprise: supplier_managed).save
         @new_user.enterprise_roles.build(enterprise: distributor_managed).save
         @new_user.enterprise_roles.build(enterprise: other_distributor_managed).save
@@ -288,7 +288,7 @@ feature '
     end
 
     context "that is a manager of a participating producer" do
-      let(:new_user) { create_enterprise_user }
+      let(:new_user) { create(:user) }
 
       before do
         new_user.enterprise_roles.build(enterprise: supplier_managed).save
@@ -354,7 +354,7 @@ feature '
 
     context "that is the manager of a participating hub" do
       let(:my_distributor) { create(:distributor_enterprise) }
-      let(:new_user) { create_enterprise_user }
+      let(:new_user) { create(:user) }
 
       before do
         create(:enterprise_relationship, parent: supplier_managed, child: my_distributor, permissions_list: [:add_to_order_cycle])
@@ -419,7 +419,7 @@ feature '
   end
 
   describe "simplified interface for enterprise users selling only their own produce" do
-    let(:user) { create_enterprise_user }
+    let(:user) { create(:user) }
     let(:enterprise) { create(:enterprise, is_primary_producer: true, sells: 'own') }
     let!(:p1) { create(:simple_product, supplier: enterprise) }
     let!(:p2) { create(:simple_product, supplier: enterprise) }
diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb
index add2ef9e7d..1718e62436 100644
--- a/spec/features/admin/order_print_ticket_spec.rb
+++ b/spec/features/admin/order_print_ticket_spec.rb
@@ -6,8 +6,8 @@ feature '
     As an administrator
     I want to print a ticket for an order
 ', js: true do
-  include AuthenticationWorkflow
   include CheckoutHelper
+  include AuthenticationWorkflow
   include ActionView::Helpers::NumberHelper
 
   context "as an enterprise manager" do
@@ -24,7 +24,7 @@ feature '
     end
 
     before do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: distributor).save
 
       quick_login_as @enterprise_user
diff --git a/spec/features/admin/order_spec.rb b/spec/features/admin/order_spec.rb
index 009092686b..7fec04d8ee 100644
--- a/spec/features/admin/order_spec.rb
+++ b/spec/features/admin/order_spec.rb
@@ -6,8 +6,8 @@ feature '
     As an administrator
     I want to create and edit orders
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   let(:user) { create(:user) }
   let(:product) { create(:simple_product) }
@@ -187,7 +187,7 @@ feature '
     let(:product) { order_cycle1.products.first }
 
     before(:each) do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: supplier1).save
       @enterprise_user.enterprise_roles.build(enterprise: coordinator1).save
       @enterprise_user.enterprise_roles.build(enterprise: distributor1).save
diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb
index 3d472dac2f..460d4cf433 100644
--- a/spec/features/admin/overview_spec.rb
+++ b/spec/features/admin/overview_spec.rb
@@ -4,13 +4,13 @@ feature '
   As a backend user
   I want to be given information about the state of my enterprises, products and order cycles
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
   include ::Spree::TestingSupport::AuthorizationHelpers
 
   context "as an enterprise user" do
     before do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       allow_any_instance_of(Spree::Admin::OverviewController).to receive(:spree_current_user).and_return @enterprise_user
       quick_login_as @enterprise_user
     end
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index 356c450611..6ca99e8c85 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -4,8 +4,8 @@ feature '
     As a Super Admin
     I want to be able to set a distributor on each payment method
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   background do
     @distributors = (1..3).map { create(:distributor_enterprise) }
@@ -131,7 +131,7 @@ feature '
   end
 
   context "as an enterprise user", js: true do
-    let(:enterprise_user) { create_enterprise_user }
+    let(:enterprise_user) { create(:user) }
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Second Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Third Distributor') }
diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb
index e12f2db82c..fac9e73628 100644
--- a/spec/features/admin/product_import_spec.rb
+++ b/spec/features/admin/product_import_spec.rb
@@ -7,8 +7,8 @@ feature "Product Import", js: true do
   include WebHelper
 
   let!(:admin) { create(:admin_user) }
-  let!(:user) { create_enterprise_user }
-  let!(:user2) { create_enterprise_user }
+  let!(:user) { create(:user) }
+  let!(:user2) { create(:user) }
   let!(:enterprise) { create(:supplier_enterprise, owner: user, name: "User Enterprise") }
   let!(:enterprise2) { create(:distributor_enterprise, owner: user2, name: "Another Enterprise") }
   let!(:relationship) { create(:enterprise_relationship, parent: enterprise, child: enterprise2, permissions_list: [:create_variant_overrides]) }
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index b2ef204312..33777da783 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an admin
     I want to set a supplier and distributor(s) for a product
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   let!(:taxon) { create(:taxon) }
   let!(:stock_location) { create(:stock_location, backorderable_default: false) }
@@ -97,7 +97,7 @@ feature '
     let!(:tax_category) { create(:tax_category) }
 
     before do
-      @new_user = create_enterprise_user
+      @new_user = create(:user)
       @supplier2 = create(:supplier_enterprise, name: 'Another Supplier')
       @supplier_permitted = create(:supplier_enterprise, name: 'Permitted Supplier')
       @new_user.enterprise_roles.build(enterprise: @supplier2).save
diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb
index b8eb70f010..dc4dfe58df 100644
--- a/spec/features/admin/reports_spec.rb
+++ b/spec/features/admin/reports_spec.rb
@@ -4,22 +4,22 @@ feature '
     As an administrator
     I want numbers, all the numbers!
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "Permissions for different reports" do
     context "As an enterprise user" do
       let(:user) do
-        create_enterprise_user(enterprises: [
-                                 create(:distributor_enterprise)
-                               ])
+        create(:user, enterprises: [create(:distributor_enterprise)])
       end
+
       it "does not show super admin only report" do
         login_to_admin_as user
         click_link "Reports"
         expect(page).not_to have_content "Users & Enterprises"
       end
     end
+
     context "As an admin user" do
       it "shows the super admin only report" do
         login_to_admin_section
@@ -167,8 +167,8 @@ feature '
   describe "sales tax report" do
     let(:distributor1) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
     let(:distributor2) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
-    let(:user1) { create_enterprise_user enterprises: [distributor1] }
-    let(:user2) { create_enterprise_user enterprises: [distributor2] }
+    let(:user1) { create(:user, enterprises: [distributor1]) }
+    let(:user2) { create(:user, enterprises: [distributor2]) }
     let!(:shipping_method) { create(:shipping_method_with, :expensive_name, distributors: [distributor1]) }
     let(:enterprise_fee) { create(:enterprise_fee, enterprise: user1.enterprises.first, tax_category: product2.tax_category, calculator: Calculator::FlatRate.new(preferred_amount: 120.0)) }
     let(:order_cycle) { create(:simple_order_cycle, coordinator: distributor1, coordinator_fees: [enterprise_fee], distributors: [distributor1], variants: [product1.master]) }
@@ -329,9 +329,9 @@ feature '
   end
 
   describe "users and enterprises report" do
-    let!(:enterprise1) { create( :enterprise, owner: create_enterprise_user ) }
-    let!(:enterprise2) { create( :enterprise, owner: create_enterprise_user ) }
-    let!(:enterprise3) { create( :enterprise, owner: create_enterprise_user ) }
+    let!(:enterprise1) { create( :enterprise, owner: create(:user) ) }
+    let!(:enterprise2) { create( :enterprise, owner: create(:user) ) }
+    let!(:enterprise3) { create( :enterprise, owner: create(:user) ) }
 
     before do
       enterprise3.enterprise_roles.build( user: enterprise1.owner ).save
@@ -379,8 +379,8 @@ feature '
   describe "Xero invoices report" do
     let(:distributor1) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
     let(:distributor2) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
-    let(:user1) { create_enterprise_user enterprises: [distributor1] }
-    let(:user2) { create_enterprise_user enterprises: [distributor2] }
+    let(:user1) { create(:user, enterprises: [distributor1]) }
+    let(:user2) { create(:user, enterprises: [distributor2]) }
     let(:shipping_method) { create(:shipping_method_with, :expensive_name) }
     let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
 
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index 84de423581..04083ff4a3 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 feature 'shipping methods' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   before :each do
     @shipping_method = create(:shipping_method)
@@ -82,7 +82,7 @@ feature 'shipping methods' do
   end
 
   context "as an enterprise user", js: true do
-    let(:enterprise_user) { create_enterprise_user }
+    let(:enterprise_user) { create(:user) }
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Second Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Third Distributor') }
diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/features/admin/subscriptions_spec.rb
index 61d5f59bcd..358ffb4671 100644
--- a/spec/features/admin/subscriptions_spec.rb
+++ b/spec/features/admin/subscriptions_spec.rb
@@ -6,7 +6,7 @@ feature 'Subscriptions' do
   include WebHelper
 
   context "as an enterprise user", js: true do
-    let!(:user) { create_enterprise_user(enterprise_limit: 10) }
+    let!(:user) { create(:user) }
     let!(:shop) { create(:distributor_enterprise, owner: user, enable_subscriptions: true) }
     let!(:shop2) { create(:distributor_enterprise, owner: user, enable_subscriptions: true) }
     let!(:shop_unmanaged) { create(:distributor_enterprise, enable_subscriptions: true) }
diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index 1fb6e15981..e631b546b1 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -24,7 +24,7 @@ feature "
       create(:enterprise_relationship, parent: producer_related, child: hub,
                                        permissions_list: [:create_variant_overrides])
     }
-    let(:user) { create_enterprise_user enterprises: [hub, producer_managed] }
+    let(:user) { create(:user, enterprises: [hub, producer_managed]) }
 
     before { quick_login_as user }
 
diff --git a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
index a850e1ead9..94742455e3 100644
--- a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
@@ -4,9 +4,7 @@ require 'open_food_network/order_cycle_form_applicator'
 
 module OpenFoodNetwork
   describe OrderCycleFormApplicator do
-    include AuthenticationWorkflow
-
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
 
     context "unit specs" do
       it "creates new exchanges for incoming_exchanges" do
diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
index 8f65a80889..e0214b732a 100644
--- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 require 'open_food_network/order_cycle_management_report'
 
-include AuthenticationWorkflow
-
 module OpenFoodNetwork
   describe OrderCycleManagementReport do
     context "as a site admin" do
@@ -37,7 +35,7 @@ module OpenFoodNetwork
     end
 
     context "as an enterprise user" do
-      let!(:user) { create_enterprise_user }
+      let!(:user) { create(:user) }
 
       subject { OrderCycleManagementReport.new user, {}, true }
 
diff --git a/spec/lib/open_food_network/users_and_enterprises_report_spec.rb b/spec/lib/open_food_network/users_and_enterprises_report_spec.rb
index 0587e7bbaa..f7503d992c 100644
--- a/spec/lib/open_food_network/users_and_enterprises_report_spec.rb
+++ b/spec/lib/open_food_network/users_and_enterprises_report_spec.rb
@@ -3,8 +3,6 @@ require 'open_food_network/users_and_enterprises_report'
 
 module OpenFoodNetwork
   describe UsersAndEnterprisesReport do
-    include AuthenticationWorkflow
-
     describe "users_and_enterprises" do
       let!(:owners_and_enterprises) { double(:owners_and_enterprises) }
       let!(:managers_and_enterprises) { double(:managers_and_enterprises) }
@@ -63,8 +61,8 @@ module OpenFoodNetwork
     end
 
     describe "filtering results" do
-      let!(:enterprise1) { create(:enterprise, owner: create_enterprise_user ) }
-      let!(:enterprise2) { create(:enterprise, owner: create_enterprise_user ) }
+      let!(:enterprise1) { create(:enterprise, owner: create(:user) ) }
+      let!(:enterprise2) { create(:enterprise, owner: create(:user) ) }
 
       describe "for owners and enterprises" do
         describe "by enterprise id" do
@@ -103,8 +101,8 @@ module OpenFoodNetwork
         end
 
         describe "by user id" do
-          let!(:manager1) { create_enterprise_user }
-          let!(:manager2) { create_enterprise_user }
+          let!(:manager1) { create(:user) }
+          let!(:manager2) { create(:user) }
           let!(:params) { { user_id_in: [manager1.id.to_s] } }
           let!(:subject) { OpenFoodNetwork::UsersAndEnterprisesReport.new params, true }
 
diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index 9d5c7a0879..b5dad386a5 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 describe Enterprise do
-  include AuthenticationWorkflow
-
   describe "sending emails" do
     describe "on creation" do
-      let!(:user) { create_enterprise_user( enterprise_limit: 2 ) }
+      let!(:user) { create(:user) }
       let!(:enterprise) { create(:enterprise, owner: user) }
 
       it "sends a welcome email" do
@@ -82,8 +80,8 @@ describe Enterprise do
     end
 
     describe "ownership" do
-      let(:u1) { create_enterprise_user }
-      let(:u2) { create_enterprise_user }
+      let(:u1) { create(:user) }
+      let(:u2) { create(:user) }
       let!(:e) { create(:enterprise, owner: u1 ) }
 
       it "adds new owner to list of managers" do
diff --git a/spec/models/product_importer_spec.rb b/spec/models/product_importer_spec.rb
index 89008c54f9..9c556045c7 100644
--- a/spec/models/product_importer_spec.rb
+++ b/spec/models/product_importer_spec.rb
@@ -2,12 +2,10 @@ require 'spec_helper'
 require 'open_food_network/permissions'
 
 describe ProductImport::ProductImporter do
-  include AuthenticationWorkflow
-
   let!(:admin) { create(:admin_user) }
-  let!(:user) { create_enterprise_user }
-  let!(:user2) { create_enterprise_user }
-  let!(:user3) { create_enterprise_user }
+  let!(:user) { create(:user) }
+  let!(:user2) { create(:user) }
+  let!(:user3) { create(:user) }
   let!(:enterprise) { create(:enterprise, is_primary_producer: true, owner: user, name: "User Enterprise") }
   let!(:enterprise2) { create(:distributor_enterprise, is_primary_producer: true, owner: user2, name: "Another Enterprise") }
   let!(:enterprise3) { create(:distributor_enterprise, is_primary_producer: true, owner: user3, name: "And Another Enterprise") }
diff --git a/spec/serializers/api/admin/index_enterprise_serializer_spec.rb b/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
index f1d084b946..f0e0233ea2 100644
--- a/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
+++ b/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 describe Api::Admin::IndexEnterpriseSerializer do
-  include AuthenticationWorkflow
-
   let(:enterprise) { create(:distributor_enterprise) }
   context "when spree_current_user is a manager" do
-    let(:user) { create_enterprise_user }
+    let(:user) { create(:user) }
     before do
       user.enterprise_roles.create(enterprise: enterprise)
     end
diff --git a/spec/views/spree/admin/orders/edit.html.haml_spec.rb b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
index b33cd187ef..e6b779df39 100644
--- a/spec/views/spree/admin/orders/edit.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe "spree/admin/orders/edit.html.haml" do
-  include AuthenticationWorkflow
   helper Spree::BaseHelper # required to make pretty_time work
 
   around do |example|
@@ -17,7 +16,7 @@ describe "spree/admin/orders/edit.html.haml" do
       end
     end
 
-    allow(view).to receive_messages spree_current_user: create_enterprise_user
+    allow(view).to receive_messages spree_current_user: create(:user)
 
     order = create(:completed_order_with_fees)
     order.distributor = create(:distributor_enterprise)
diff --git a/spec/views/spree/admin/orders/index.html.haml_spec.rb b/spec/views/spree/admin/orders/index.html.haml_spec.rb
index 8cbbfeb90a..8379a77610 100644
--- a/spec/views/spree/admin/orders/index.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/index.html.haml_spec.rb
@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe "spree/admin/orders/index.html.haml" do
-  include AuthenticationWorkflow
-
   around do |example|
     original_config = Spree::Config[:enable_invoices?]
     example.run
@@ -16,7 +14,7 @@ describe "spree/admin/orders/index.html.haml" do
       end
     end
 
-    allow(view).to receive_messages spree_current_user: create_enterprise_user
+    allow(view).to receive_messages spree_current_user: create(:user)
   end
 
   describe "print invoices button" do

From 81710a27043a0f2e4e79ecbc8408a821cc07fa7e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 13:20:44 +0100
Subject: [PATCH 196/340] Remove now dead create_enterprise_user, the user
 factory should be used instead

---
 spec/support/request/authentication_workflow.rb | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 457a2f2b33..7d84dc9c5f 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -24,19 +24,6 @@ module AuthenticationWorkflow
     visit spree.admin_dashboard_path
   end
 
-  # TODO: Should probably just rename this to create_user
-  def create_enterprise_user( attrs = {} )
-    new_user = build(:user, attrs)
-    new_user.spree_roles = [Spree::Role.find_or_create_by!(name: 'user')]
-    new_user.save
-    if attrs.key? :enterprises
-      attrs[:enterprises].each do |enterprise|
-        enterprise.users << new_user
-      end
-    end
-    new_user
-  end
-
   def login_to_admin_as(user)
     quick_login_as user
     visit spree.admin_dashboard_path

From 8e84754f35271c1fceaf29998625e151dc6e6800 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 13:22:14 +0100
Subject: [PATCH 197/340] Rename login_as_admin to a more specific name
 controller_login_as_admin

---
 spec/controllers/spree/admin/adjustments_controller_spec.rb | 2 +-
 spec/controllers/spree/admin/countries_controller_spec.rb   | 2 +-
 .../spree/admin/image_settings_controller_spec.rb           | 2 +-
 .../controllers/spree/admin/mail_methods_controller_spec.rb | 2 +-
 spec/controllers/spree/admin/orders_controller_spec.rb      | 4 ++--
 spec/controllers/spree/admin/products_controller_spec.rb    | 2 +-
 spec/controllers/spree/admin/reports_controller_spec.rb     | 6 +++---
 .../spree/admin/return_authorizations_controller_spec.rb    | 2 +-
 .../spree/admin/shipping_categories_controller_spec.rb      | 2 +-
 .../spree/admin/shipping_methods_controller_spec.rb         | 6 +++---
 spec/controllers/spree/admin/variants_controller_spec.rb    | 2 +-
 spec/support/controller_helper.rb                           | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb
index 4ad02b73c7..624fa0c839 100644
--- a/spec/controllers/spree/admin/adjustments_controller_spec.rb
+++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb
@@ -4,7 +4,7 @@ module Spree
   describe Admin::AdjustmentsController, type: :controller do
     include AuthenticationWorkflow
 
-    before { login_as_admin }
+    before { controller_login_as_admin }
 
     describe "setting included tax" do
       let(:order) { create(:order) }
diff --git a/spec/controllers/spree/admin/countries_controller_spec.rb b/spec/controllers/spree/admin/countries_controller_spec.rb
index 4146a506de..f961a36b22 100644
--- a/spec/controllers/spree/admin/countries_controller_spec.rb
+++ b/spec/controllers/spree/admin/countries_controller_spec.rb
@@ -8,7 +8,7 @@ module Spree
       include AuthenticationWorkflow
 
       describe "#update" do
-        before { login_as_admin }
+        before { controller_login_as_admin }
 
         it "updates the name of an existing country" do
           country = create(:country)
diff --git a/spec/controllers/spree/admin/image_settings_controller_spec.rb b/spec/controllers/spree/admin/image_settings_controller_spec.rb
index 89ccac822c..2084dea1b3 100644
--- a/spec/controllers/spree/admin/image_settings_controller_spec.rb
+++ b/spec/controllers/spree/admin/image_settings_controller_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::Admin::ImageSettingsController do
   include AuthenticationWorkflow
 
-  before { login_as_admin }
+  before { controller_login_as_admin }
 
   context "updating image settings" do
     it "should be able to update paperclip settings" do
diff --git a/spec/controllers/spree/admin/mail_methods_controller_spec.rb b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
index 1a706462a7..410bb5c8ee 100644
--- a/spec/controllers/spree/admin/mail_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::Admin::MailMethodsController do
   include AuthenticationWorkflow
 
-  before { login_as_admin }
+  before { controller_login_as_admin }
 
   context "#update" do
     it "should reinitialize the mail settings" do
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index b1b7d5a05f..0d10068f1e 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -6,7 +6,7 @@ describe Spree::Admin::OrdersController, type: :controller do
   describe "#edit" do
     let!(:order) { create(:order_with_totals_and_distribution, ship_address: create(:address)) }
 
-    before { login_as_admin }
+    before { controller_login_as_admin }
 
     it "advances the order state" do
       expect {
@@ -40,7 +40,7 @@ describe Spree::Admin::OrdersController, type: :controller do
                  order_cycle_id: order.order_cycle_id } }
     end
 
-    before { login_as_admin }
+    before { controller_login_as_admin }
 
     context "complete order" do
       let(:order) { create :completed_order_with_totals }
diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb
index efc6ce9b5b..a8a99563ab 100644
--- a/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/spec/controllers/spree/admin/products_controller_spec.rb
@@ -134,7 +134,7 @@ describe Spree::Admin::ProductsController, type: :controller do
     }
 
     before do
-      login_as_admin
+      controller_login_as_admin
       create(:stock_location)
     end
 
diff --git a/spec/controllers/spree/admin/reports_controller_spec.rb b/spec/controllers/spree/admin/reports_controller_spec.rb
index 8cfda5fe36..db261fe961 100644
--- a/spec/controllers/spree/admin/reports_controller_spec.rb
+++ b/spec/controllers/spree/admin/reports_controller_spec.rb
@@ -191,7 +191,7 @@ describe Spree::Admin::ReportsController, type: :controller do
   end
 
   context "Products & Inventory" do
-    before { login_as_admin }
+    before { controller_login_as_admin }
 
     context "with distributors and suppliers" do
       let(:distributors) { [coordinator1, distributor1, distributor2] }
@@ -235,7 +235,7 @@ describe Spree::Admin::ReportsController, type: :controller do
   end
 
   context "My Customers" do
-    before { login_as_admin }
+    before { controller_login_as_admin }
 
     it "should have report types for customers" do
       expect(subject.report_types[:customers]).to eq([
@@ -286,7 +286,7 @@ describe Spree::Admin::ReportsController, type: :controller do
   end
 
   context "Admin" do
-    before { login_as_admin }
+    before { controller_login_as_admin }
 
     describe "users_and_enterprises" do
       let!(:present_objects) { [coordinator1] }
diff --git a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
index 6c28642da5..1567bd8127 100644
--- a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
+++ b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
@@ -13,7 +13,7 @@ module Spree
       end
 
       before do
-        login_as_admin
+        controller_login_as_admin
 
         # Pay the order
         order.payments.first.complete
diff --git a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
index 531b175072..2125281bcf 100644
--- a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
+++ b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
@@ -8,7 +8,7 @@ module Spree
       include AuthenticationWorkflow
 
       describe "#create and #update" do
-        before { login_as_admin }
+        before { controller_login_as_admin }
 
         it "creates a shipping shipping category" do
           expect {
diff --git a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
index 105d55563c..a78a24700e 100644
--- a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
@@ -16,7 +16,7 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do
       }
     }
 
-    before { login_as_admin }
+    before { controller_login_as_admin }
 
     it "updates preferred_amount and preferred_currency of a FlatRate calculator" do
       shipping_method.calculator = create(:calculator_flat_rate, calculable: shipping_method)
@@ -81,7 +81,7 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do
       let(:shipping_method) { create(:shipping_method) }
 
       scenario "is soft deleted" do
-        login_as_admin
+        controller_login_as_admin
         expect(shipping_method.deleted_at).to be_nil
 
         spree_delete :destroy, "id" => shipping_method.id
@@ -94,7 +94,7 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do
       let(:order) { create(:order_with_line_items) }
 
       scenario "is not soft deleted" do
-        login_as_admin
+        controller_login_as_admin
         expect(order.shipping_method.deleted_at).to be_nil
 
         spree_delete :destroy, "id" => order.shipping_method.id
diff --git a/spec/controllers/spree/admin/variants_controller_spec.rb b/spec/controllers/spree/admin/variants_controller_spec.rb
index 7163f6f423..9af2be952a 100644
--- a/spec/controllers/spree/admin/variants_controller_spec.rb
+++ b/spec/controllers/spree/admin/variants_controller_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 module Spree
   module Admin
     describe VariantsController, type: :controller do
-      before { login_as_admin }
+      before { controller_login_as_admin }
 
       describe "#index" do
         describe "deleted variants" do
diff --git a/spec/support/controller_helper.rb b/spec/support/controller_helper.rb
index b543555319..053f28d7b7 100644
--- a/spec/support/controller_helper.rb
+++ b/spec/support/controller_helper.rb
@@ -1,6 +1,6 @@
 module OpenFoodNetwork
   module ControllerHelper
-    def login_as_admin
+    def controller_login_as_admin
       @admin_user ||= begin
         user = create(:user)
         user.spree_roles << Spree::Role.find_or_create_by!(name: 'admin')

From f1a3814c0d024efff8b9945e749a6d38d86e036f Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 13:24:25 +0100
Subject: [PATCH 198/340] Rename login_as_enterprise_user to a more specific
 name controller_login_as_enterprise_user

---
 spec/controllers/admin/enterprises_controller_spec.rb     | 4 ++--
 spec/controllers/admin/order_cycles_controller_spec.rb    | 4 ++--
 .../admin/orders/customer_details_controller_spec.rb      | 2 +-
 spec/controllers/spree/admin/products_controller_spec.rb  | 8 ++++----
 spec/controllers/spree/admin/reports_controller_spec.rb   | 6 +++---
 spec/controllers/spree/admin/search_controller_spec.rb    | 2 +-
 spec/support/controller_helper.rb                         | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb
index c707fd759f..a51af80b36 100644
--- a/spec/controllers/admin/enterprises_controller_spec.rb
+++ b/spec/controllers/admin/enterprises_controller_spec.rb
@@ -136,7 +136,7 @@ describe Admin::EnterprisesController, type: :controller do
         let!(:property) { create(:property, name: "A nice name") }
 
         before do
-          login_as_enterprise_user [producer]
+          controller_login_as_enterprise_user [producer]
         end
 
         context "when a submitted property does not already exist" do
@@ -177,7 +177,7 @@ describe Admin::EnterprisesController, type: :controller do
         let!(:tag_rule) { create(:tag_rule, enterprise: enterprise) }
 
         before do
-          login_as_enterprise_user [enterprise]
+          controller_login_as_enterprise_user [enterprise]
         end
 
         context "discount order rules" do
diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb
index a12b644f2c..6988fa4787 100644
--- a/spec/controllers/admin/order_cycles_controller_spec.rb
+++ b/spec/controllers/admin/order_cycles_controller_spec.rb
@@ -102,7 +102,7 @@ module Admin
         let(:params) { { format: :json, order_cycle: {} } }
 
         before do
-          login_as_enterprise_user([shop])
+          controller_login_as_enterprise_user([shop])
           allow(OrderCycleForm).to receive(:new) { form_mock }
         end
 
@@ -148,7 +148,7 @@ module Admin
       end
 
       context "as a manager of the coordinator" do
-        before { login_as_enterprise_user([coordinator]) }
+        before { controller_login_as_enterprise_user([coordinator]) }
         let(:params) { { format: :json, id: order_cycle.id, order_cycle: {} } }
 
         context "when updating succeeds" do
diff --git a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
index c62d0a0f9c..e4cc3a1c33 100644
--- a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
@@ -37,7 +37,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
       }
 
       before do
-        login_as_enterprise_user [order.distributor]
+        controller_login_as_enterprise_user [order.distributor]
       end
 
       it "advances the order state" do
diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb
index a8a99563ab..b33198d14c 100644
--- a/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/spec/controllers/spree/admin/products_controller_spec.rb
@@ -10,7 +10,7 @@ describe Spree::Admin::ProductsController, type: :controller do
       end
 
       before do
-        login_as_enterprise_user [s_managed]
+        controller_login_as_enterprise_user [s_managed]
         spree_post :bulk_update,
                    "products" => [{ "id" => product.id, "name" => "Pine nuts" }]
       end
@@ -38,7 +38,7 @@ describe Spree::Admin::ProductsController, type: :controller do
         )
       end
 
-      before { login_as_enterprise_user([producer]) }
+      before { controller_login_as_enterprise_user([producer]) }
 
       it 'fails' do
         spree_post :bulk_update,
@@ -92,7 +92,7 @@ describe Spree::Admin::ProductsController, type: :controller do
         )
       end
 
-      before { login_as_enterprise_user([producer]) }
+      before { controller_login_as_enterprise_user([producer]) }
 
       it 'does not fail' do
         spree_post :bulk_update,
@@ -174,7 +174,7 @@ describe Spree::Admin::ProductsController, type: :controller do
     let!(:product) { create(:simple_product, supplier: producer) }
 
     before do
-      login_as_enterprise_user [producer]
+      controller_login_as_enterprise_user [producer]
     end
 
     describe "change product supplier" do
diff --git a/spec/controllers/spree/admin/reports_controller_spec.rb b/spec/controllers/spree/admin/reports_controller_spec.rb
index db261fe961..9b72b5418f 100644
--- a/spec/controllers/spree/admin/reports_controller_spec.rb
+++ b/spec/controllers/spree/admin/reports_controller_spec.rb
@@ -65,7 +65,7 @@ describe Spree::Admin::ReportsController, type: :controller do
   context "Coordinator Enterprise User" do
     let!(:present_objects) { [orderA1, orderA2, orderB1, orderB2] }
 
-    before { login_as_enterprise_user [coordinator1] }
+    before { controller_login_as_enterprise_user [coordinator1] }
 
     describe 'Orders & Fulfillment' do
       it "shows all orders in order cycles I coordinate" do
@@ -79,7 +79,7 @@ describe Spree::Admin::ReportsController, type: :controller do
 
   # As a Distributor Enterprise user for distributor1
   context "Distributor Enterprise User" do
-    before { login_as_enterprise_user [distributor1] }
+    before { controller_login_as_enterprise_user [distributor1] }
 
     describe 'Orders and Distributors' do
       let!(:present_objects) { [orderA1, orderA2, orderB1, orderB2] }
@@ -132,7 +132,7 @@ describe Spree::Admin::ReportsController, type: :controller do
 
   # As a Supplier Enterprise user for supplier1
   context "Supplier" do
-    before { login_as_enterprise_user [supplier1] }
+    before { controller_login_as_enterprise_user [supplier1] }
 
     describe 'index' do
       it "loads reports relevant to producers" do
diff --git a/spec/controllers/spree/admin/search_controller_spec.rb b/spec/controllers/spree/admin/search_controller_spec.rb
index d1219e8e67..a6f8623b30 100644
--- a/spec/controllers/spree/admin/search_controller_spec.rb
+++ b/spec/controllers/spree/admin/search_controller_spec.rb
@@ -6,7 +6,7 @@ describe Spree::Admin::SearchController, type: :controller do
     let!(:manager) { create(:user, email: "test2@email.com" ) }
     let!(:random) { create(:user, email: "test3@email.com" ) }
     let!(:enterprise) { create(:enterprise, owner: owner, users: [owner, manager]) }
-    before { login_as_enterprise_user [enterprise] }
+    before { controller_login_as_enterprise_user [enterprise] }
 
     describe 'searching for known users' do
       describe "when search query is not an exact match" do
diff --git a/spec/support/controller_helper.rb b/spec/support/controller_helper.rb
index 053f28d7b7..2d7ddf585d 100644
--- a/spec/support/controller_helper.rb
+++ b/spec/support/controller_helper.rb
@@ -10,7 +10,7 @@ module OpenFoodNetwork
       allow(controller).to receive_messages(spree_current_user: @admin_user)
     end
 
-    def login_as_enterprise_user(enterprises)
+    def controller_login_as_enterprise_user(enterprises)
       @enterprise_user ||= begin
         user = create(:user)
         user.spree_roles = []

From 8b04e45ea5d4c902ada59012f43c8abdd399e308 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 13:40:16 +0100
Subject: [PATCH 199/340] Create login_to_admin_and_visit to avoid loading the
 admin dashboard unnecessarily

This commit removes 19 unnecessary page loads of the admin dashboard
---
 spec/features/admin/adjustments_spec.rb         |  9 +++------
 spec/features/admin/content_spec.rb             |  3 +--
 spec/features/admin/enterprise_fees_spec.rb     |  3 +--
 spec/features/admin/enterprise_user_spec.rb     |  3 +--
 spec/features/admin/enterprises/index_spec.rb   |  3 +--
 spec/features/admin/image_settings_spec.rb      |  3 +--
 spec/features/admin/order_cycles/list_spec.rb   |  3 +--
 spec/features/admin/order_cycles/simple_spec.rb |  3 +--
 spec/features/admin/payment_method_spec.rb      |  4 +---
 spec/features/admin/properties_spec.rb          |  3 +--
 spec/features/admin/tag_rules_spec.rb           |  3 +--
 spec/features/admin/variant_overrides_spec.rb   |  4 +---
 spec/features/admin/variants_spec.rb            | 15 +++++----------
 spec/support/request/authentication_workflow.rb |  8 ++++++--
 14 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/spec/features/admin/adjustments_spec.rb b/spec/features/admin/adjustments_spec.rb
index fcd0a0bb39..61646be708 100644
--- a/spec/features/admin/adjustments_spec.rb
+++ b/spec/features/admin/adjustments_spec.rb
@@ -21,8 +21,7 @@ feature '
 
   scenario "adding taxed adjustments to an order" do
     # When I go to the adjustments page for the order
-    login_to_admin_section
-    visit spree.admin_orders_path
+    login_to_admin_and_visit spree.admin_orders_path
     page.find('td.actions a.icon-edit').click
     click_link 'Adjustments'
 
@@ -44,8 +43,7 @@ feature '
     adjustment = create(:adjustment, label: "Extra Adjustment", adjustable: order, amount: 110, included_tax: 10)
 
     # When I go to the adjustments page for the order
-    login_to_admin_section
-    visit spree.admin_orders_path
+    login_to_admin_and_visit spree.admin_orders_path
     page.find('td.actions a.icon-edit').click
     click_link 'Adjustments'
     page.find('tr', text: 'Extra Adjustment').find('a.icon-edit').click
@@ -68,8 +66,7 @@ feature '
     adjustment = create(:adjustment, label: "Extra Adjustment", adjustable: order, amount: 110, included_tax: 0)
 
     # When I go to the adjustments page for the order
-    login_to_admin_section
-    visit spree.admin_orders_path
+    login_to_admin_and_visit spree.admin_orders_path
     page.find('td.actions a.icon-edit').click
     click_link 'Adjustments'
     page.find('tr', text: 'Extra Adjustment').find('a.icon-edit').click
diff --git a/spec/features/admin/content_spec.rb b/spec/features/admin/content_spec.rb
index 75dd4ad656..1194f4af34 100644
--- a/spec/features/admin/content_spec.rb
+++ b/spec/features/admin/content_spec.rb
@@ -8,8 +8,7 @@ feature '
   include WebHelper
 
   before do
-    login_to_admin_section
-    click_link 'Configuration'
+    login_to_admin_and_visit spree.admin_general_settings_path
     click_link 'Content'
   end
 
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index 5129953df6..a99c3b0d1a 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -13,8 +13,7 @@ feature '
     fee = create(:enterprise_fee, name: '$0.50 / kg', fee_type: 'packing', tax_category: tax_category_gst)
     amount = fee.calculator.preferred_amount
 
-    login_to_admin_section
-    click_link 'Configuration'
+    login_to_admin_and_visit spree.admin_general_settings_path
     click_link 'Enterprise Fees'
 
     expect(page).to have_select "enterprise_fee_set_collection_attributes_0_enterprise_id"
diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb
index d62322bc14..8e5170130d 100644
--- a/spec/features/admin/enterprise_user_spec.rb
+++ b/spec/features/admin/enterprise_user_spec.rb
@@ -19,8 +19,7 @@ feature '
     context "with a limitted number of owned enterprises" do
       scenario "setting the enterprise ownership limit" do
         expect(user.enterprise_limit).to eq 5
-        login_to_admin_section
-        click_link 'Users'
+        login_to_admin_and_visit spree.admin_users_path
         click_link user.email
 
         fill_in "user_enterprise_limit", with: 2
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index 78b348fcd9..a55a7ee373 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -9,8 +9,7 @@ feature 'Enterprises Index' do
       s = create(:supplier_enterprise)
       d = create(:distributor_enterprise)
 
-      login_to_admin_section
-      click_link 'Enterprises'
+      login_to_admin_and_visit admin_enterprises_path
 
       within("tr.enterprise-#{s.id}") do
         expect(page).to have_content s.name
diff --git a/spec/features/admin/image_settings_spec.rb b/spec/features/admin/image_settings_spec.rb
index 9ef2860cd4..d23e4c5952 100644
--- a/spec/features/admin/image_settings_spec.rb
+++ b/spec/features/admin/image_settings_spec.rb
@@ -20,8 +20,7 @@ feature '
 
   scenario "setting the image format for a paperclip style" do
     # When I go to the image settings page
-    login_to_admin_section
-    visit spree.edit_admin_image_settings_path
+    login_to_admin_and_visit spree.edit_admin_image_settings_path
 
     # All the styles should default to "Unchanged"
     expect(page).to have_select 'attachment_styles_format_mini',    selected: 'Unchanged'
diff --git a/spec/features/admin/order_cycles/list_spec.rb b/spec/features/admin/order_cycles/list_spec.rb
index d675984dd8..3dc5626986 100644
--- a/spec/features/admin/order_cycles/list_spec.rb
+++ b/spec/features/admin/order_cycles/list_spec.rb
@@ -30,8 +30,7 @@ feature '
     create(:proxy_order, subscription: create(:subscription, schedule: schedule1), order_cycle: oc1)
 
     # When I go to the admin order cycles page
-    login_to_admin_section
-    click_link 'Order Cycles'
+    login_to_admin_and_visit admin_order_cycles_path
 
     # Then the order cycles should be ordered correctly
     expect(page).to have_selector "#listing_order_cycles tr td:first-child", count: 7
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb
index b946eefae8..903857cfae 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/features/admin/order_cycles/simple_spec.rb
@@ -100,8 +100,7 @@ feature '
       end
 
       it "displays a warning on the order cycles screen" do
-        quick_login_as_admin
-        visit admin_order_cycles_path
+        login_to_admin_and_visit admin_order_cycles_path
         expect(page).to have_content "The hub #{hub.name} is listed in an active order cycle, but does not have valid shipping and payment methods. Until you set these up, customers will not be able to shop at this hub."
       end
     end
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index 6ca99e8c85..f46262b5af 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -13,9 +13,7 @@ feature '
 
   describe "creating a payment method", js: true do
     scenario "assigning a distributor to the payment method" do
-      login_to_admin_section
-
-      click_link 'Configuration'
+      login_to_admin_and_visit spree.admin_general_settings_path
       click_link 'Payment Methods'
       click_link 'New Payment Method'
 
diff --git a/spec/features/admin/properties_spec.rb b/spec/features/admin/properties_spec.rb
index 905810039e..52a573509a 100644
--- a/spec/features/admin/properties_spec.rb
+++ b/spec/features/admin/properties_spec.rb
@@ -9,8 +9,7 @@ feature '
   include AuthenticationWorkflow
 
   scenario "creating and editing a property" do
-    login_to_admin_section
-    visit spree.admin_properties_path
+    login_to_admin_and_visit spree.admin_properties_path
 
     click_link 'New Property'
     fill_in 'property_name', with: 'New property!'
diff --git a/spec/features/admin/tag_rules_spec.rb b/spec/features/admin/tag_rules_spec.rb
index ca53fb68a9..3867a0f006 100644
--- a/spec/features/admin/tag_rules_spec.rb
+++ b/spec/features/admin/tag_rules_spec.rb
@@ -242,8 +242,7 @@ feature 'Tag Rules', js: true do
   end
 
   def visit_tag_rules
-    login_to_admin_section
-    visit main_app.edit_admin_enterprise_path(enterprise)
+    login_to_admin_and_visit main_app.edit_admin_enterprise_path(enterprise)
     expect(page).to have_content "PRIMARY DETAILS"
     click_link "Tag Rules"
   end
diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index e631b546b1..24a5135904 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -401,9 +401,7 @@ feature "
       let(:product) { order_cycle.products.first }
 
       before do
-        login_to_admin_section
-
-        visit 'admin/orders/new'
+        login_to_admin_and_visit 'admin/orders/new'
         select2_select distributor.name, from: 'order_distributor_id'
         select2_select order_cycle.name, from: 'order_order_cycle_id'
         click_button 'Next'
diff --git a/spec/features/admin/variants_spec.rb b/spec/features/admin/variants_spec.rb
index 700c375954..b22a322486 100644
--- a/spec/features/admin/variants_spec.rb
+++ b/spec/features/admin/variants_spec.rb
@@ -12,8 +12,7 @@ feature '
     product = create(:simple_product, variant_unit: "weight", variant_unit_scale: "1")
 
     # When I create a variant on the product
-    login_to_admin_section
-    visit spree.admin_product_variants_path product
+    login_to_admin_and_visit spree.admin_product_variants_path product
     click_link 'New Variant'
 
     fill_in 'unit_value_human', with: '1'
@@ -35,8 +34,7 @@ feature '
       product.option_types << variant.option_values.first.option_type
 
       # When I view the variant
-      login_to_admin_section
-      visit spree.admin_product_variants_path product
+      login_to_admin_and_visit spree.admin_product_variants_path product
       page.find('table.index .icon-edit').click
 
       # Then I should not see a traditional option value field for the unit-related option value
@@ -62,8 +60,7 @@ feature '
       variant = product.variants.first
       variant.update(unit_description: 'foo')
 
-      login_to_admin_section
-      visit spree.edit_admin_product_variant_path(product, variant)
+      login_to_admin_and_visit spree.edit_admin_product_variant_path(product, variant)
 
       expect(page).to_not have_field "unit_value_human"
       expect(page).to have_field "variant_unit_description", with: "foo"
@@ -120,8 +117,7 @@ feature '
     product = create(:simple_product)
     variant = create(:variant, product: product)
 
-    login_to_admin_section
-    visit spree.admin_product_variants_path product
+    login_to_admin_and_visit spree.admin_product_variants_path product
 
     within "tr#spree_variant_#{variant.id}" do
       accept_alert do
@@ -138,8 +134,7 @@ feature '
     variant = product.variants.first
 
     # When I view the variant
-    login_to_admin_section
-    visit spree.admin_product_variants_path product
+    login_to_admin_and_visit spree.admin_product_variants_path product
     page.find('table.index .icon-edit').click
 
     # It should allow the display name to be changed
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 7d84dc9c5f..43106a66bb 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -19,9 +19,13 @@ module AuthenticationWorkflow
     admin_user
   end
 
-  def login_to_admin_section
+  def login_to_admin_and_visit(path_visit)
     quick_login_as_admin
-    visit spree.admin_dashboard_path
+    visit path_visit
+  end
+
+  def login_to_admin_section
+    login_to_admin__and_visit(spree.admin_dashboard_path)
   end
 
   def login_to_admin_as(user)

From c6bb75653160c2928838e0d17d65bbb1817b32a8 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 14:00:05 +0100
Subject: [PATCH 200/340] Rename quick_login_as_admin to login_as_admin and
 also re-use login_to_admin_and_visit when applicable

---
 .../admin/bulk_order_management_spec.rb       |  6 +--
 .../admin/bulk_product_update_spec.rb         | 41 ++++++++-----------
 .../configuration/general_settings_spec.rb    |  3 +-
 .../configuration/image_settings_spec.rb      |  3 +-
 .../admin/configuration/mail_methods_spec.rb  |  4 +-
 .../admin/configuration/states_spec.rb        |  2 +-
 .../configuration/tax_categories_spec.rb      |  4 +-
 .../admin/configuration/tax_rates_spec.rb     |  4 +-
 .../admin/configuration/taxonomies_spec.rb    |  4 +-
 .../admin/configuration/zones_spec.rb         |  7 ++--
 spec/features/admin/enterprise_fees_spec.rb   |  9 ++--
 .../admin/enterprise_relationships_spec.rb    |  2 +-
 spec/features/admin/enterprises/index_spec.rb |  6 +--
 spec/features/admin/enterprises_spec.rb       | 13 +++---
 .../complex_creating_specific_time_spec.rb    |  3 +-
 ...x_editing_exchange_same_enterprise_spec.rb |  3 +-
 ...lex_editing_multiple_product_pages_spec.rb |  3 +-
 .../order_cycles/complex_editing_spec.rb      |  3 +-
 .../complex_updating_specific_time_spec.rb    |  3 +-
 spec/features/admin/order_cycles/list_spec.rb |  3 +-
 .../admin/order_cycles/simple_spec.rb         | 15 +++----
 .../order_cycles_complex_nav_check_spec.rb    |  3 +-
 spec/features/admin/order_spec.rb             | 15 +++----
 spec/features/admin/orders_spec.rb            | 17 +++-----
 spec/features/admin/payment_method_spec.rb    | 10 ++---
 spec/features/admin/payments_spec.rb          | 12 ++----
 spec/features/admin/product_import_spec.rb    |  4 +-
 spec/features/admin/products_spec.rb          |  3 +-
 .../admin/reports/packing_report_spec.rb      |  2 +-
 spec/features/admin/reports_spec.rb           | 39 ++++++------------
 spec/features/admin/shipping_methods_spec.rb  |  2 +-
 spec/features/admin/tax_settings_spec.rb      |  3 +-
 spec/features/admin/users_spec.rb             |  2 +-
 .../request/authentication_workflow.rb        |  6 +--
 34 files changed, 93 insertions(+), 166 deletions(-)

diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index cbd50ed2d9..f4d40cd85f 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -10,7 +10,7 @@ feature '
 
   context "listing orders" do
     before :each do
-      quick_login_as_admin
+      login_as_admin
     end
 
     it "displays a message when number of line items is zero" do
@@ -121,7 +121,7 @@ feature '
 
   context "altering line item properties" do
     before :each do
-      quick_login_as_admin
+      login_as_admin
     end
 
     context "tracking changes" do
@@ -177,7 +177,7 @@ feature '
 
   context "using page controls" do
     before :each do
-      quick_login_as_admin
+      login_as_admin
     end
 
     let!(:p1) { create(:product_with_option_types, group_buy: true, group_buy_unit_size: 5000, variant_unit: "weight", variants: [create(:variant, unit_value: 1000)] ) }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index c216cda878..18c05c8268 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -10,7 +10,7 @@ feature '
 
   describe "listing products" do
     before do
-      quick_login_as_admin
+      login_as_admin
     end
 
     it "displays a list of products" do
@@ -101,7 +101,7 @@ feature '
 
   describe "listing variants" do
     before do
-      quick_login_as_admin
+      login_as_admin
     end
 
     it "displays a list of variants for each product" do
@@ -176,8 +176,7 @@ feature '
     shipping_category = create(:shipping_category)
     taxon = create(:taxon)
 
-    quick_login_as_admin
-    visit spree.admin_products_path
+    login_to_admin_and_visit spree.admin_products_path
 
     find("a", text: "NEW PRODUCT").click
     expect(page).to have_content 'NEW PRODUCT'
@@ -199,7 +198,7 @@ feature '
   scenario "creating new variants" do
     # Given a product without variants or a unit
     p = FactoryBot.create(:product, variant_unit: 'weight', variant_unit_scale: 1000)
-    quick_login_as_admin
+    login_as_admin
     visit spree.admin_products_path
 
     # I should see an add variant button
@@ -250,7 +249,7 @@ feature '
     t2 = FactoryBot.create(:taxon)
     p = FactoryBot.create(:product, supplier: s1, available_on: Date.current, variant_unit: 'volume', variant_unit_scale: 1, primary_taxon: t2, sku: "OLD SKU")
 
-    quick_login_as_admin
+    login_as_admin
     visit spree.admin_products_path
 
     toggle_columns "Available On", /^Category?/, "Inherits Properties?", "SKU"
@@ -290,7 +289,7 @@ feature '
   scenario "updating a product with a variant unit of 'items'" do
     p = FactoryBot.create(:product, variant_unit: 'weight', variant_unit_scale: 1000)
 
-    quick_login_as_admin
+    login_as_admin
     visit spree.admin_products_path
 
     expect(page).to have_select "variant_unit_with_scale", selected: "Weight (kg)"
@@ -317,7 +316,7 @@ feature '
     v.update_attribute(:on_demand, false)
     v.update_attribute(:on_hand, 9)
 
-    quick_login_as_admin
+    login_as_admin
     visit spree.admin_products_path
     expect(page).to have_selector "a.view-variants", count: 1
     find("a.view-variants").click
@@ -353,7 +352,7 @@ feature '
     p = FactoryBot.create(:product)
     v = FactoryBot.create(:variant, product: p, price: 3.0)
 
-    quick_login_as_admin
+    login_as_admin
     visit spree.admin_products_path
     expect(page).to have_selector "a.view-variants", count: 1
     find("a.view-variants").click
@@ -376,7 +375,7 @@ feature '
 
   scenario "updating a product mutiple times without refresh" do
     p = FactoryBot.create(:product, name: 'original name')
-    quick_login_as_admin
+    login_as_admin
 
     visit spree.admin_products_path
 
@@ -409,7 +408,7 @@ feature '
 
   scenario "updating a product after cloning a product" do
     p = FactoryBot.create(:product, name: "product 1")
-    quick_login_as_admin
+    login_as_admin
 
     visit spree.admin_products_path
 
@@ -435,7 +434,7 @@ feature '
     s2 = create(:supplier_enterprise)
     p1 = FactoryBot.create(:simple_product, name: "product1", supplier: s1)
     p2 = FactoryBot.create(:simple_product, name: "product2", supplier: s2)
-    quick_login_as_admin
+    login_as_admin
 
     visit spree.admin_products_path
 
@@ -463,7 +462,7 @@ feature '
       let!(:v3) { FactoryBot.create(:variant, product: p2 ) }
 
       before do
-        quick_login_as_admin
+        login_as_admin
         visit spree.admin_products_path
       end
 
@@ -512,8 +511,7 @@ feature '
       let!(:v2) { p2.variants.first }
 
       before do
-        quick_login_as_admin
-        visit spree.admin_products_path
+        login_to_admin_and_visit spree.admin_products_path
       end
 
       it "shows an edit button for products, which takes the user to the standard edit page for that product in a new window" do
@@ -555,9 +553,8 @@ feature '
         p1 = FactoryBot.create(:product, name: "P1")
         p2 = FactoryBot.create(:product, name: "P2")
         p3 = FactoryBot.create(:product, name: "P3")
-        quick_login_as_admin
 
-        visit spree.admin_products_path
+        login_to_admin_and_visit spree.admin_products_path
 
         expect(page).to have_selector "a.clone-product", count: 3
 
@@ -581,9 +578,7 @@ feature '
     describe "using column display dropdown" do
       it "shows a column display dropdown, which shows a list of columns when clicked" do
         FactoryBot.create(:simple_product)
-        quick_login_as_admin
-
-        visit spree.admin_products_path
+        login_to_admin_and_visit spree.admin_products_path
 
         toggle_columns "Available On"
 
@@ -609,9 +604,8 @@ feature '
         s2 = create(:supplier_enterprise)
         p1 = FactoryBot.create(:simple_product, name: "product1", supplier: s1)
         p2 = FactoryBot.create(:simple_product, name: "product2", supplier: s2)
-        quick_login_as_admin
 
-        visit spree.admin_products_path
+        login_to_admin_and_visit spree.admin_products_path
 
         # Page shows the filter controls
         expect(page).to have_select "producer_filter", visible: false
@@ -762,8 +756,7 @@ feature '
     let!(:product) { create(:simple_product, name: "Carrots") }
 
     it "displays product images and image upload modal" do
-      quick_login_as_admin
-      visit spree.admin_products_path
+      login_to_admin_and_visit spree.admin_products_path
 
       within "table#listing_products tr#p_#{product.id}" do
         # Displays product images
diff --git a/spec/features/admin/configuration/general_settings_spec.rb b/spec/features/admin/configuration/general_settings_spec.rb
index 4dcc8ab63a..2a67b668da 100644
--- a/spec/features/admin/configuration/general_settings_spec.rb
+++ b/spec/features/admin/configuration/general_settings_spec.rb
@@ -4,8 +4,7 @@ describe "General Settings" do
   include AuthenticationWorkflow
 
   before(:each) do
-    quick_login_as_admin
-    visit spree.admin_dashboard_path
+    login_to_admin_and_visit spree.admin_dashboard_path
     click_link "Configuration"
     click_link "General Settings"
   end
diff --git a/spec/features/admin/configuration/image_settings_spec.rb b/spec/features/admin/configuration/image_settings_spec.rb
index 858f53c677..6d5a63038d 100644
--- a/spec/features/admin/configuration/image_settings_spec.rb
+++ b/spec/features/admin/configuration/image_settings_spec.rb
@@ -4,8 +4,7 @@ describe "image settings" do
   include AuthenticationWorkflow
 
   before do
-    quick_login_as_admin
-    visit spree.admin_dashboard_path
+    login_to_admin_and_visit spree.admin_dashboard_path
     click_link "Configuration"
     click_link "Image Settings"
   end
diff --git a/spec/features/admin/configuration/mail_methods_spec.rb b/spec/features/admin/configuration/mail_methods_spec.rb
index d1e550db02..fc2eab6f5c 100644
--- a/spec/features/admin/configuration/mail_methods_spec.rb
+++ b/spec/features/admin/configuration/mail_methods_spec.rb
@@ -4,9 +4,7 @@ describe "Mail Methods" do
   include AuthenticationWorkflow
 
   before(:each) do
-    quick_login_as_admin
-    visit spree.admin_dashboard_path
-    click_link "Configuration"
+    login_to_admin_and_visit spree.admin_general_settings_path
   end
 
   context "edit" do
diff --git a/spec/features/admin/configuration/states_spec.rb b/spec/features/admin/configuration/states_spec.rb
index b762b33c84..6aaa117bbc 100755
--- a/spec/features/admin/configuration/states_spec.rb
+++ b/spec/features/admin/configuration/states_spec.rb
@@ -6,7 +6,7 @@ describe "States" do
   let!(:country) { create(:country) }
 
   before(:each) do
-    quick_login_as_admin
+    login_as_admin
     @hungary = Spree::Country.create!(name: "Hungary", iso_name: "Hungary")
     Spree::Config[:default_country_id] = country.id
   end
diff --git a/spec/features/admin/configuration/tax_categories_spec.rb b/spec/features/admin/configuration/tax_categories_spec.rb
index 4248ff2596..d394541d20 100644
--- a/spec/features/admin/configuration/tax_categories_spec.rb
+++ b/spec/features/admin/configuration/tax_categories_spec.rb
@@ -4,9 +4,7 @@ describe "Tax Categories" do
   include AuthenticationWorkflow
 
   before(:each) do
-    quick_login_as_admin
-    visit spree.admin_dashboard_path
-    click_link "Configuration"
+    login_to_admin_and_visit spree.admin_general_settings_path
   end
 
   context "admin visiting tax categories list" do
diff --git a/spec/features/admin/configuration/tax_rates_spec.rb b/spec/features/admin/configuration/tax_rates_spec.rb
index c4d11716c2..58cebcc44b 100644
--- a/spec/features/admin/configuration/tax_rates_spec.rb
+++ b/spec/features/admin/configuration/tax_rates_spec.rb
@@ -7,9 +7,7 @@ describe "Tax Rates" do
   let!(:tax_rate) { create(:tax_rate, calculator: calculator) }
 
   before do
-    quick_login_as_admin
-    visit spree.admin_dashboard_path
-    click_link "Configuration"
+    login_to_admin_and_visit spree.admin_general_settings_path
   end
 
   # Regression test for #535
diff --git a/spec/features/admin/configuration/taxonomies_spec.rb b/spec/features/admin/configuration/taxonomies_spec.rb
index 6e871e3529..dcd04c56cb 100644
--- a/spec/features/admin/configuration/taxonomies_spec.rb
+++ b/spec/features/admin/configuration/taxonomies_spec.rb
@@ -4,9 +4,7 @@ describe "Taxonomies" do
   include AuthenticationWorkflow
 
   before(:each) do
-    quick_login_as_admin
-    visit spree.admin_dashboard_path
-    click_link "Configuration"
+    login_to_admin_and_visit spree.admin_general_settings_path
   end
 
   context "show" do
diff --git a/spec/features/admin/configuration/zones_spec.rb b/spec/features/admin/configuration/zones_spec.rb
index 11b3f92649..9403d080af 100644
--- a/spec/features/admin/configuration/zones_spec.rb
+++ b/spec/features/admin/configuration/zones_spec.rb
@@ -4,16 +4,15 @@ describe "Zones" do
   include AuthenticationWorkflow
 
   before do
-    quick_login_as_admin
+    login_as_admin
     Spree::Zone.delete_all
   end
 
   scenario "list existing zones" do
-    visit spree.admin_dashboard_path
-    click_link "Configuration"
-
+    visit spree.admin_general_settings_path
     create(:zone, name: "eastern", description: "zone is eastern")
     create(:zone, name: "western", description: "cool san fran")
+
     click_link "Zones"
 
     within_row(1) { expect(page).to have_content("eastern") }
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index a99c3b0d1a..6ab9adbda7 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -29,8 +29,7 @@ feature '
     e = create(:supplier_enterprise, name: 'Feedme')
 
     # When I go to the enterprise fees page
-    quick_login_as_admin
-    visit admin_enterprise_fees_path
+    login_to_admin_and_visit admin_enterprise_fees_path
 
     # And I fill in the fields for a new enterprise fee and click update
     select 'Feedme', from: 'enterprise_fee_set_collection_attributes_0_enterprise_id'
@@ -58,8 +57,7 @@ feature '
     enterprise = create(:enterprise, name: 'Foo')
 
     # When I go to the enterprise fees page
-    quick_login_as_admin
-    visit admin_enterprise_fees_path
+    login_to_admin_and_visit admin_enterprise_fees_path
 
     # And I update the fields for the enterprise fee and click update
     select 'Foo', from: 'enterprise_fee_set_collection_attributes_0_enterprise_id'
@@ -92,8 +90,7 @@ feature '
     fee = create(:enterprise_fee)
 
     # When I go to the enterprise fees page
-    quick_login_as_admin
-    visit admin_enterprise_fees_path
+    login_to_admin_and_visit admin_enterprise_fees_path
 
     # And I click delete
     accept_alert do
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index 43f4441108..23797478be 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -8,7 +8,7 @@ feature '
   include AuthenticationWorkflow
 
   context "as a site administrator" do
-    before { quick_login_as_admin }
+    before { login_as_admin }
 
     scenario "listing relationships" do
       # Given some enterprises with relationships
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index a55a7ee373..393cf6fdef 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -44,8 +44,7 @@ feature 'Enterprises Index' do
 
       context "without violating rules" do
         before do
-          quick_login_as_admin
-          visit admin_enterprises_path
+          login_to_admin_and_visit admin_enterprises_path
         end
 
         it "updates the enterprises" do
@@ -71,8 +70,7 @@ feature 'Enterprises Index' do
           d_manager.enterprise_roles.build(enterprise: second_distributor).save
           expect(d.owner).to_not eq d_manager
 
-          quick_login_as_admin
-          visit admin_enterprises_path
+          login_to_admin_and_visit admin_enterprises_path
         end
 
         def enterprise_row_index(enterprise_name)
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index bd06ebc1a4..b00aa5d716 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -25,7 +25,7 @@ feature '
     enterprise_fee = create(:enterprise_fee)
 
     # Navigating
-    admin = quick_login_as_admin
+    admin = login_as_admin
     visit '/admin/enterprises'
     click_link 'New Enterprise'
 
@@ -66,7 +66,7 @@ feature '
     enterprise_fee = create(:enterprise_fee, enterprise: @enterprise )
     user = create(:user)
 
-    admin = quick_login_as_admin
+    admin = login_as_admin
 
     visit '/admin/enterprises'
     within "tr.enterprise-#{@enterprise.id}" do
@@ -219,8 +219,7 @@ feature '
       s = create(:supplier_enterprise)
 
       # When I go to its properties page
-      quick_login_as_admin
-      visit admin_enterprises_path
+      login_to_admin_and_visit admin_enterprises_path
       within(".enterprise-#{s.id}") { click_link 'Properties' }
 
       # And I create a property
@@ -243,8 +242,7 @@ feature '
       s.producer_properties.create! property_name: 'Certified Organic', value: 'NASAA 12345'
 
       # When I go to its properties page
-      quick_login_as_admin
-      visit main_app.admin_enterprise_producer_properties_path(s)
+      login_to_admin_and_visit main_app.admin_enterprise_producer_properties_path(s)
 
       # And I update the property
       fill_in 'enterprise_producer_properties_attributes_0_property_name', with: "Biodynamic"
@@ -266,8 +264,7 @@ feature '
       pp = s.producer_properties.create! property_name: 'Certified Organic', value: 'NASAA 12345'
 
       # When I go to its properties page
-      quick_login_as_admin
-      visit main_app.admin_enterprise_producer_properties_path(s)
+      login_to_admin_and_visit main_app.admin_enterprise_producer_properties_path(s)
 
       # And I remove the property
       expect(page).to have_field 'enterprise_producer_properties_attributes_0_property_name', with: 'Certified Organic'
diff --git a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
index 39130fa434..44198f40c2 100644
--- a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
+++ b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
@@ -33,8 +33,7 @@ feature '
     distributor_fee = create(:enterprise_fee, enterprise: distributor, name: 'Distributor fee')
 
     # When I go to the new order cycle page
-    quick_login_as_admin
-    visit admin_order_cycles_path
+    login_to_admin_and_visit admin_order_cycles_path
     click_link 'New Order Cycle'
 
     # Select a coordinator since there are two available
diff --git a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
index 484dd21f40..285148164d 100644
--- a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
@@ -20,8 +20,7 @@ feature '
     oc_outgoing = create(:simple_order_cycle, coordinator: c, distributors: [c])
 
     # When I edit the first order cycle, the exchange should appear as incoming
-    quick_login_as_admin
-    visit admin_order_cycle_incoming_path(oc_incoming)
+    login_to_admin_and_visit admin_order_cycle_incoming_path(oc_incoming)
     expect(page).to have_selector 'table.exchanges tr.supplier'
     visit admin_order_cycle_outgoing_path(oc_incoming)
     expect(page).not_to have_selector 'table.exchanges tr.distributor'
diff --git a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
index 5ff181e7f5..faefd97fe1 100644
--- a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -18,8 +18,7 @@ feature '
     before do
       stub_const("#{Api::ExchangeProductsController}::DEFAULT_PER_PAGE", 1)
 
-      quick_login_as_admin
-      visit admin_order_cycle_incoming_path(order_cycle)
+      login_to_admin_and_visit admin_order_cycle_incoming_path(order_cycle)
       expect(page).to have_content "1 / 2 selected"
 
       page.find("tr.supplier-#{supplier_enterprise.id} td.products").click
diff --git a/spec/features/admin/order_cycles/complex_editing_spec.rb b/spec/features/admin/order_cycles/complex_editing_spec.rb
index 72eb521554..02f8833198 100644
--- a/spec/features/admin/order_cycles/complex_editing_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_spec.rb
@@ -19,8 +19,7 @@ feature '
     oc.distributors.last.update_attribute :name, 'ZZZZ'
 
     # When I edit it
-    quick_login_as_admin
-    visit edit_admin_order_cycle_path(oc)
+    login_to_admin_and_visit edit_admin_order_cycle_path(oc)
 
     wait_for_edit_form_to_load_order_cycle(oc)
 
diff --git a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
index 2094a83f7e..34a867f1bf 100644
--- a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
+++ b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
@@ -40,8 +40,7 @@ feature '
     distributor_fee2 = create(:enterprise_fee, enterprise: distributor, name: 'Distributor fee 2')
 
     # When I go to its edit page
-    quick_login_as_admin
-    visit admin_order_cycles_path
+    login_to_admin_and_visit admin_order_cycles_path
     within "tr.order-cycle-#{oc.id}" do
       find("a.edit-order-cycle").click
     end
diff --git a/spec/features/admin/order_cycles/list_spec.rb b/spec/features/admin/order_cycles/list_spec.rb
index 3dc5626986..a616cb161f 100644
--- a/spec/features/admin/order_cycles/list_spec.rb
+++ b/spec/features/admin/order_cycles/list_spec.rb
@@ -128,8 +128,7 @@ feature '
 
     context 'using datepickers' do
       it "correctly opens the datepicker and changes the date field" do
-        quick_login_as_admin
-        visit admin_order_cycles_path
+        login_to_admin_and_visit admin_order_cycles_path
 
         within("tr.order-cycle-#{oc_pt.id}") do
           expect(find('input.datetimepicker', match: :first).value).to start_with '2012-01-01 00:00'
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb
index 903857cfae..c735c6bcaa 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/features/admin/order_cycles/simple_spec.rb
@@ -19,8 +19,7 @@ feature '
                  orders_close_at: Time.zone.local(2041, 12, 12, 12, 12, 12))
 
     # When I go to the order cycles page
-    quick_login_as_admin
-    visit admin_order_cycles_path
+    login_to_admin_and_visit admin_order_cycles_path
 
     # And I fill in some new opening/closing times and save them
     within("tr.order-cycle-#{oc1.id}") do
@@ -77,8 +76,7 @@ feature '
     oc = create(:simple_order_cycle)
 
     # When I clone it
-    quick_login_as_admin
-    visit admin_order_cycles_path
+    login_to_admin_and_visit admin_order_cycles_path
     within "tr.order-cycle-#{oc.id}" do
       find('a.clone-order-cycle').click
     end
@@ -507,8 +505,7 @@ feature '
       ex.update! pickup_time: 'pickup time', pickup_instructions: 'pickup instructions'
 
       # When I edit it
-      quick_login_as_admin
-      visit admin_order_cycles_path
+      login_to_admin_and_visit admin_order_cycles_path
       within "tr.order-cycle-#{oc.id}" do
         find("a.edit-order-cycle").click
       end
@@ -540,8 +537,7 @@ feature '
       ex.update! pickup_time: 'pickup time', pickup_instructions: 'pickup instructions'
 
       # When I edit it
-      quick_login_as_admin
-      visit edit_admin_order_cycle_path oc
+      login_to_admin_and_visit edit_admin_order_cycle_path oc
 
       wait_for_edit_form_to_load_order_cycle(oc)
 
@@ -595,8 +591,7 @@ feature '
 
   scenario "deleting an order cycle" do
     order_cycle = create(:simple_order_cycle, name: "Translusent Berries")
-    quick_login_as_admin
-    visit admin_order_cycles_path
+    login_to_admin_and_visit admin_order_cycles_path
     expect(page).to have_selector "tr.order-cycle-#{order_cycle.id}"
     accept_alert do
       first('a.delete-order-cycle').click
diff --git a/spec/features/admin/order_cycles_complex_nav_check_spec.rb b/spec/features/admin/order_cycles_complex_nav_check_spec.rb
index 4d89e16bb1..bfc33bbfd3 100644
--- a/spec/features/admin/order_cycles_complex_nav_check_spec.rb
+++ b/spec/features/admin/order_cycles_complex_nav_check_spec.rb
@@ -13,8 +13,7 @@ feature '
     oc = create(:order_cycle)
 
     # When I edit the form
-    quick_login_as_admin
-    visit edit_admin_order_cycle_path(oc)
+    login_to_admin_and_visit edit_admin_order_cycle_path(oc)
 
     wait_for_edit_form_to_load_order_cycle(oc)
 
diff --git a/spec/features/admin/order_spec.rb b/spec/features/admin/order_spec.rb
index 7fec04d8ee..31c606d48b 100644
--- a/spec/features/admin/order_spec.rb
+++ b/spec/features/admin/order_spec.rb
@@ -43,8 +43,7 @@ feature '
     distributor_disabled = create(:distributor_enterprise)
     create(:simple_order_cycle, name: 'Two')
 
-    quick_login_as_admin
-    visit spree.admin_orders_path
+    login_to_admin_and_visit spree.admin_orders_path
     click_link 'New Order'
 
     # Distributors without an order cycle should be shown as disabled
@@ -79,8 +78,7 @@ feature '
   end
 
   scenario "can add a product to an existing order" do
-    quick_login_as_admin
-    visit spree.edit_admin_order_path(order)
+    login_to_admin_and_visit spree.edit_admin_order_path(order)
 
     targetted_select2_search product.name, from: '#add_variant_id', dropdown_css: '.select2-drop'
 
@@ -102,8 +100,7 @@ feature '
     order.user = nil
     order.save
 
-    quick_login_as_admin
-    visit spree.edit_admin_order_path(order)
+    login_to_admin_and_visit spree.edit_admin_order_path(order)
 
     expect(page).to have_select2 "order_distributor_id", with_options: [d.name]
     select2_select d.name, from: 'order_distributor_id'
@@ -117,15 +114,13 @@ feature '
   scenario "can't add products to an order outside the order's hub and order cycle" do
     product = create(:simple_product)
 
-    quick_login_as_admin
-    visit spree.edit_admin_order_path(order)
+    login_to_admin_and_visit spree.edit_admin_order_path(order)
 
     expect(page).not_to have_select2 "add_variant_id", with_options: [product.name]
   end
 
   scenario "can't change distributor or order cycle once order has been finalized" do
-    quick_login_as_admin
-    visit spree.edit_admin_order_path(order)
+    login_to_admin_and_visit spree.edit_admin_order_path(order)
 
     expect(page).not_to have_select2 'order_distributor_id'
     expect(page).not_to have_select2 'order_order_cycle_id'
diff --git a/spec/features/admin/orders_spec.rb b/spec/features/admin/orders_spec.rb
index ea50ddb082..41db8b3bcc 100644
--- a/spec/features/admin/orders_spec.rb
+++ b/spec/features/admin/orders_spec.rb
@@ -29,8 +29,7 @@ feature '
       create(:simple_order_cycle, name: 'Four', orders_close_at: 4.weeks.from_now)
       create(:simple_order_cycle, name: 'Three', orders_close_at: 3.weeks.from_now)
 
-      quick_login_as_admin
-      visit 'admin/orders'
+      login_to_admin_and_visit 'admin/orders'
 
       open_select2('#s2id_q_order_cycle_id_in')
 
@@ -50,8 +49,7 @@ feature '
       order4 = create(:order_with_credit_payment, user: user, distributor: distributor,
                                                   order_cycle: order_cycle4)
 
-      quick_login_as_admin
-      visit 'admin/orders'
+      login_to_admin_and_visit 'admin/orders'
 
       multi_select2_select 'Two', from: 'q_order_cycle_id_in'
       multi_select2_select 'Three', from: 'q_order_cycle_id_in'
@@ -71,9 +69,7 @@ feature '
       end
 
       scenario "capture payment" do
-        quick_login_as_admin
-
-        visit spree.admin_orders_path
+        login_to_admin_and_visit spree.admin_orders_path
         expect(page).to have_current_path spree.admin_orders_path
 
         # click the 'capture' link for the order
@@ -91,8 +87,7 @@ feature '
 
       scenario "ship order from the orders index page" do
         order.payments.first.capture!
-        quick_login_as_admin
-        visit spree.admin_orders_path
+        login_to_admin_and_visit spree.admin_orders_path
 
         page.find("[data-powertip=Ship]").click
 
@@ -106,9 +101,7 @@ feature '
     scenario "can edit order" do
       incomplete_order = create(:order, distributor: distributor, order_cycle: order_cycle)
 
-      quick_login_as_admin
-
-      visit spree.admin_orders_path
+      login_to_admin_and_visit spree.admin_orders_path
       uncheck 'Only show complete orders'
       page.find('a.icon-search').click
 
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index f46262b5af..8fbebf921c 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -68,14 +68,12 @@ feature '
 
     scenario "checking a single distributor is checked by default" do
       2.times.each { Enterprise.last.destroy }
-      quick_login_as_admin
-      visit spree.new_admin_payment_method_path
+      login_to_admin_and_visit spree.new_admin_payment_method_path
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[0].id}", checked: true
     end
 
     scenario "checking more than a distributor displays no default choice" do
-      quick_login_as_admin
-      visit spree.new_admin_payment_method_path
+      login_to_admin_and_visit spree.new_admin_payment_method_path
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[0].id}", checked: false
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[1].id}", checked: false
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[2].id}", checked: false
@@ -84,9 +82,7 @@ feature '
 
   scenario "updating a payment method", js: true do
     payment_method = create(:payment_method, distributors: [@distributors[0]])
-    quick_login_as_admin
-
-    visit spree.edit_admin_payment_method_path payment_method
+    login_to_admin_and_visit spree.edit_admin_payment_method_path payment_method
 
     fill_in 'payment_method_name', with: 'New PM Name'
     find(:css, "tags-input .tags input").set "member\n"
diff --git a/spec/features/admin/payments_spec.rb b/spec/features/admin/payments_spec.rb
index adce888db2..2a2233b187 100644
--- a/spec/features/admin/payments_spec.rb
+++ b/spec/features/admin/payments_spec.rb
@@ -9,8 +9,7 @@ feature '
   let(:order) { create(:completed_order_with_fees) }
 
   scenario "visiting the payment form" do
-    quick_login_as_admin
-    visit spree.new_admin_order_payment_path order
+    login_to_admin_and_visit spree.new_admin_order_payment_path order
 
     expect(page).to have_content "New Payment"
   end
@@ -26,8 +25,7 @@ feature '
     end
 
     scenario "visiting the payment form" do
-      quick_login_as_admin
-      visit spree.new_admin_order_payment_path order
+      login_to_admin_and_visit spree.new_admin_order_payment_path order
 
       expect(page).to have_content "New Payment"
     end
@@ -40,8 +38,7 @@ feature '
     end
 
     it "renders the payment details" do
-      quick_login_as_admin
-      visit spree.admin_order_payments_path order
+      login_to_admin_and_visit spree.admin_order_payments_path order
 
       page.click_link("StripeSCA")
       expect(page).to have_content order.payments.last.source.last_digits
@@ -53,8 +50,7 @@ feature '
       end
 
       it "renders the payment details" do
-        quick_login_as_admin
-        visit spree.admin_order_payments_path order
+        login_to_admin_and_visit spree.admin_order_payments_path order
 
         page.click_link("StripeSCA")
         expect(page).to have_content order.payments.last.amount
diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb
index fac9e73628..eda7695086 100644
--- a/spec/features/admin/product_import_spec.rb
+++ b/spec/features/admin/product_import_spec.rb
@@ -31,7 +31,7 @@ feature "Product Import", js: true do
   let(:shipping_category_id_str) { Spree::ShippingCategory.all.first.id.to_s }
 
   describe "when importing products from uploaded file" do
-    before { quick_login_as_admin }
+    before { login_as_admin }
     after { File.delete('/tmp/test.csv') }
 
     it "validates entries and saves them if they are all valid and allows viewing new items in Bulk Products" do
@@ -342,7 +342,7 @@ feature "Product Import", js: true do
   end
 
   describe "when dealing with uploaded files" do
-    before { quick_login_as_admin }
+    before { login_as_admin }
 
     it "checks filetype on upload" do
       File.write('/tmp/test.txt', "Wrong filetype!")
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index 33777da783..27e5b12b4d 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -67,8 +67,7 @@ feature '
     end
 
     scenario "creating an on-demand product", js: true do
-      quick_login_as_admin
-      visit spree.admin_products_path
+      login_to_admin_and_visit spree.admin_products_path
 
       click_link 'New Product'
 
diff --git a/spec/features/admin/reports/packing_report_spec.rb b/spec/features/admin/reports/packing_report_spec.rb
index 9ab6ff1150..79378a5040 100644
--- a/spec/features/admin/reports/packing_report_spec.rb
+++ b/spec/features/admin/reports/packing_report_spec.rb
@@ -13,7 +13,7 @@ feature "Packing Reports", js: true do
   before do
     order.line_items << li1
     order.line_items << li2
-    quick_login_as_admin
+    login_as_admin
   end
 
   describe "viewing a report" do
diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb
index dc4dfe58df..37ef696e9c 100644
--- a/spec/features/admin/reports_spec.rb
+++ b/spec/features/admin/reports_spec.rb
@@ -31,8 +31,7 @@ feature '
 
   describe "Customers report" do
     before do
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
     end
 
     scenario "customers report" do
@@ -63,8 +62,7 @@ feature '
 
   describe "Order cycle management report" do
     before do
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
     end
 
     scenario "payment method report" do
@@ -90,8 +88,7 @@ feature '
 
   describe "Packing reports" do
     before do
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
     end
 
     let(:bill_address1) { create(:address, lastname: "Aman") }
@@ -147,8 +144,7 @@ feature '
   end
 
   scenario "orders and distributors report" do
-    quick_login_as_admin
-    visit spree.admin_reports_path
+    login_to_admin_and_visit spree.admin_reports_path
     click_link 'Orders And Distributors'
     click_button 'Search'
 
@@ -156,8 +152,7 @@ feature '
   end
 
   scenario "payments reports" do
-    quick_login_as_admin
-    visit spree.admin_reports_path
+    login_to_admin_and_visit spree.admin_reports_path
     click_link 'Payment Reports'
     click_button 'Search'
 
@@ -191,8 +186,7 @@ feature '
       order1.reload.update_distribution_charge!
       order1.finalize!
 
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
 
       click_link "Sales Tax"
       select("Tax types", from: "report_type")
@@ -227,8 +221,7 @@ feature '
 
   describe "orders & fulfilment reports" do
     it "loads the report page" do
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
       click_link 'Orders & Fulfillment Reports'
 
       expect(page).to have_content 'Supplier'
@@ -253,8 +246,7 @@ feature '
 
       it "is precise to time of day, not just date" do
         # When I generate a customer report with a timeframe that includes one order but not the other
-        quick_login_as_admin
-        visit spree.orders_and_fulfillment_admin_reports_path
+        login_to_admin_and_visit spree.orders_and_fulfillment_admin_reports_path
 
         fill_in 'q_completed_at_gt', with: '2013-04-25 13:00:00'
         fill_in 'q_completed_at_lt', with: '2013-04-25 15:00:00'
@@ -271,8 +263,7 @@ feature '
       oc = create(:simple_order_cycle, name: "My Order Cycle", distributors: [distributor], orders_open_at: Time.zone.now, orders_close_at: nil)
       o = create(:order, order_cycle: oc, distributor: distributor)
 
-      quick_login_as_admin
-      visit spree.orders_and_fulfillment_admin_reports_path
+      login_to_admin_and_visit spree.orders_and_fulfillment_admin_reports_path
 
       expect(page).to have_content "My Order Cycle"
     end
@@ -303,8 +294,7 @@ feature '
     end
 
     it "shows products and inventory report" do
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
 
       expect(page).to have_content "All products"
       expect(page).to have_content "Inventory (on hand)"
@@ -318,8 +308,7 @@ feature '
     end
 
     it "shows the LettuceShare report" do
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
       click_link 'LettuceShare'
       click_button "Go"
 
@@ -336,8 +325,7 @@ feature '
     before do
       enterprise3.enterprise_roles.build( user: enterprise1.owner ).save
 
-      quick_login_as_admin
-      visit spree.admin_reports_path
+      login_to_admin_and_visit spree.admin_reports_path
 
       click_link 'Users & Enterprises'
     end
@@ -414,8 +402,7 @@ feature '
         order1.update_attribute :email, 'customer@email.com'
         Timecop.travel(Time.zone.local(2015, 4, 25, 14, 0, 0)) { order1.finalize! }
 
-        quick_login_as_admin
-        visit spree.admin_reports_path
+        login_to_admin_and_visit spree.admin_reports_path
 
         click_link 'Xero Invoices'
       end
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index 04083ff4a3..8ab7cb1bc0 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -10,7 +10,7 @@ feature 'shipping methods' do
 
   context "as a site admin" do
     before(:each) do
-      quick_login_as_admin
+      login_as_admin
     end
 
     scenario "creating a shipping method owned by some distributors" do
diff --git a/spec/features/admin/tax_settings_spec.rb b/spec/features/admin/tax_settings_spec.rb
index 830f45f692..e496d0619a 100644
--- a/spec/features/admin/tax_settings_spec.rb
+++ b/spec/features/admin/tax_settings_spec.rb
@@ -16,12 +16,11 @@ feature 'Account and Billing Settings' do
     end
 
     before do
-      quick_login_as_admin
+      login_as_admin
     end
 
     context "as an admin user" do
       it "loads the page" do
-        visit spree.admin_dashboard_path
         click_link "Configuration"
         click_link "Tax Settings"
 
diff --git a/spec/features/admin/users_spec.rb b/spec/features/admin/users_spec.rb
index b97089a0aa..ae1fa8da4f 100644
--- a/spec/features/admin/users_spec.rb
+++ b/spec/features/admin/users_spec.rb
@@ -7,7 +7,7 @@ feature "Managing users" do
   context "as super-admin" do
     before do
       setup_email
-      quick_login_as_admin
+      login_as_admin
     end
 
     context "from the index page" do
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 43106a66bb..8d9ce7c8e8 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -5,7 +5,7 @@ module AuthenticationWorkflow
     login_as user
   end
 
-  def quick_login_as_admin
+  def login_as_admin
     admin_role = Spree::Role.find_or_create_by!(name: 'admin')
     admin_user = create(:user,
                         password: 'passw0rd',
@@ -20,12 +20,12 @@ module AuthenticationWorkflow
   end
 
   def login_to_admin_and_visit(path_visit)
-    quick_login_as_admin
+    login_as_admin
     visit path_visit
   end
 
   def login_to_admin_section
-    login_to_admin__and_visit(spree.admin_dashboard_path)
+    login_to_admin_and_visit(spree.admin_dashboard_path)
   end
 
   def login_to_admin_as(user)

From 5738ec0542c900d496a9cc35a230586666c22e93 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 14:01:39 +0100
Subject: [PATCH 201/340] Rename login_to_admin_and_visit to
 login_as_admin_and_visit

---
 spec/features/admin/adjustments_spec.rb       |  6 ++---
 .../admin/bulk_product_update_spec.rb         | 12 ++++-----
 .../configuration/general_settings_spec.rb    |  2 +-
 .../configuration/image_settings_spec.rb      |  2 +-
 .../admin/configuration/mail_methods_spec.rb  |  2 +-
 .../configuration/tax_categories_spec.rb      |  2 +-
 .../admin/configuration/tax_rates_spec.rb     |  2 +-
 .../admin/configuration/taxonomies_spec.rb    |  2 +-
 spec/features/admin/content_spec.rb           |  2 +-
 spec/features/admin/enterprise_fees_spec.rb   |  8 +++---
 spec/features/admin/enterprise_user_spec.rb   |  2 +-
 spec/features/admin/enterprises/index_spec.rb |  6 ++---
 spec/features/admin/enterprises_spec.rb       |  6 ++---
 spec/features/admin/image_settings_spec.rb    |  2 +-
 .../complex_creating_specific_time_spec.rb    |  2 +-
 ...x_editing_exchange_same_enterprise_spec.rb |  2 +-
 ...lex_editing_multiple_product_pages_spec.rb |  2 +-
 .../order_cycles/complex_editing_spec.rb      |  2 +-
 .../complex_updating_specific_time_spec.rb    |  2 +-
 spec/features/admin/order_cycles/list_spec.rb |  4 +--
 .../admin/order_cycles/simple_spec.rb         | 12 ++++-----
 .../order_cycles_complex_nav_check_spec.rb    |  2 +-
 spec/features/admin/order_spec.rb             | 10 +++----
 spec/features/admin/orders_spec.rb            | 10 +++----
 spec/features/admin/payment_method_spec.rb    |  8 +++---
 spec/features/admin/payments_spec.rb          |  8 +++---
 spec/features/admin/products_spec.rb          |  2 +-
 spec/features/admin/properties_spec.rb        |  2 +-
 spec/features/admin/reports_spec.rb           | 26 +++++++++----------
 spec/features/admin/tag_rules_spec.rb         |  2 +-
 spec/features/admin/variant_overrides_spec.rb |  2 +-
 spec/features/admin/variants_spec.rb          | 10 +++----
 .../request/authentication_workflow.rb        |  4 +--
 33 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/spec/features/admin/adjustments_spec.rb b/spec/features/admin/adjustments_spec.rb
index 61646be708..511f8a91bc 100644
--- a/spec/features/admin/adjustments_spec.rb
+++ b/spec/features/admin/adjustments_spec.rb
@@ -21,7 +21,7 @@ feature '
 
   scenario "adding taxed adjustments to an order" do
     # When I go to the adjustments page for the order
-    login_to_admin_and_visit spree.admin_orders_path
+    login_as_admin_and_visit spree.admin_orders_path
     page.find('td.actions a.icon-edit').click
     click_link 'Adjustments'
 
@@ -43,7 +43,7 @@ feature '
     adjustment = create(:adjustment, label: "Extra Adjustment", adjustable: order, amount: 110, included_tax: 10)
 
     # When I go to the adjustments page for the order
-    login_to_admin_and_visit spree.admin_orders_path
+    login_as_admin_and_visit spree.admin_orders_path
     page.find('td.actions a.icon-edit').click
     click_link 'Adjustments'
     page.find('tr', text: 'Extra Adjustment').find('a.icon-edit').click
@@ -66,7 +66,7 @@ feature '
     adjustment = create(:adjustment, label: "Extra Adjustment", adjustable: order, amount: 110, included_tax: 0)
 
     # When I go to the adjustments page for the order
-    login_to_admin_and_visit spree.admin_orders_path
+    login_as_admin_and_visit spree.admin_orders_path
     page.find('td.actions a.icon-edit').click
     click_link 'Adjustments'
     page.find('tr', text: 'Extra Adjustment').find('a.icon-edit').click
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 18c05c8268..e7ed955cc7 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -176,7 +176,7 @@ feature '
     shipping_category = create(:shipping_category)
     taxon = create(:taxon)
 
-    login_to_admin_and_visit spree.admin_products_path
+    login_as_admin_and_visit spree.admin_products_path
 
     find("a", text: "NEW PRODUCT").click
     expect(page).to have_content 'NEW PRODUCT'
@@ -511,7 +511,7 @@ feature '
       let!(:v2) { p2.variants.first }
 
       before do
-        login_to_admin_and_visit spree.admin_products_path
+        login_as_admin_and_visit spree.admin_products_path
       end
 
       it "shows an edit button for products, which takes the user to the standard edit page for that product in a new window" do
@@ -554,7 +554,7 @@ feature '
         p2 = FactoryBot.create(:product, name: "P2")
         p3 = FactoryBot.create(:product, name: "P3")
 
-        login_to_admin_and_visit spree.admin_products_path
+        login_as_admin_and_visit spree.admin_products_path
 
         expect(page).to have_selector "a.clone-product", count: 3
 
@@ -578,7 +578,7 @@ feature '
     describe "using column display dropdown" do
       it "shows a column display dropdown, which shows a list of columns when clicked" do
         FactoryBot.create(:simple_product)
-        login_to_admin_and_visit spree.admin_products_path
+        login_as_admin_and_visit spree.admin_products_path
 
         toggle_columns "Available On"
 
@@ -605,7 +605,7 @@ feature '
         p1 = FactoryBot.create(:simple_product, name: "product1", supplier: s1)
         p2 = FactoryBot.create(:simple_product, name: "product2", supplier: s2)
 
-        login_to_admin_and_visit spree.admin_products_path
+        login_as_admin_and_visit spree.admin_products_path
 
         # Page shows the filter controls
         expect(page).to have_select "producer_filter", visible: false
@@ -756,7 +756,7 @@ feature '
     let!(:product) { create(:simple_product, name: "Carrots") }
 
     it "displays product images and image upload modal" do
-      login_to_admin_and_visit spree.admin_products_path
+      login_as_admin_and_visit spree.admin_products_path
 
       within "table#listing_products tr#p_#{product.id}" do
         # Displays product images
diff --git a/spec/features/admin/configuration/general_settings_spec.rb b/spec/features/admin/configuration/general_settings_spec.rb
index 2a67b668da..6791e93a05 100644
--- a/spec/features/admin/configuration/general_settings_spec.rb
+++ b/spec/features/admin/configuration/general_settings_spec.rb
@@ -4,7 +4,7 @@ describe "General Settings" do
   include AuthenticationWorkflow
 
   before(:each) do
-    login_to_admin_and_visit spree.admin_dashboard_path
+    login_as_admin_and_visit spree.admin_dashboard_path
     click_link "Configuration"
     click_link "General Settings"
   end
diff --git a/spec/features/admin/configuration/image_settings_spec.rb b/spec/features/admin/configuration/image_settings_spec.rb
index 6d5a63038d..6a2ede12da 100644
--- a/spec/features/admin/configuration/image_settings_spec.rb
+++ b/spec/features/admin/configuration/image_settings_spec.rb
@@ -4,7 +4,7 @@ describe "image settings" do
   include AuthenticationWorkflow
 
   before do
-    login_to_admin_and_visit spree.admin_dashboard_path
+    login_as_admin_and_visit spree.admin_dashboard_path
     click_link "Configuration"
     click_link "Image Settings"
   end
diff --git a/spec/features/admin/configuration/mail_methods_spec.rb b/spec/features/admin/configuration/mail_methods_spec.rb
index fc2eab6f5c..5063335c21 100644
--- a/spec/features/admin/configuration/mail_methods_spec.rb
+++ b/spec/features/admin/configuration/mail_methods_spec.rb
@@ -4,7 +4,7 @@ describe "Mail Methods" do
   include AuthenticationWorkflow
 
   before(:each) do
-    login_to_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.admin_general_settings_path
   end
 
   context "edit" do
diff --git a/spec/features/admin/configuration/tax_categories_spec.rb b/spec/features/admin/configuration/tax_categories_spec.rb
index d394541d20..5b3041caf2 100644
--- a/spec/features/admin/configuration/tax_categories_spec.rb
+++ b/spec/features/admin/configuration/tax_categories_spec.rb
@@ -4,7 +4,7 @@ describe "Tax Categories" do
   include AuthenticationWorkflow
 
   before(:each) do
-    login_to_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.admin_general_settings_path
   end
 
   context "admin visiting tax categories list" do
diff --git a/spec/features/admin/configuration/tax_rates_spec.rb b/spec/features/admin/configuration/tax_rates_spec.rb
index 58cebcc44b..4211ce1f56 100644
--- a/spec/features/admin/configuration/tax_rates_spec.rb
+++ b/spec/features/admin/configuration/tax_rates_spec.rb
@@ -7,7 +7,7 @@ describe "Tax Rates" do
   let!(:tax_rate) { create(:tax_rate, calculator: calculator) }
 
   before do
-    login_to_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.admin_general_settings_path
   end
 
   # Regression test for #535
diff --git a/spec/features/admin/configuration/taxonomies_spec.rb b/spec/features/admin/configuration/taxonomies_spec.rb
index dcd04c56cb..ffa82fb0fd 100644
--- a/spec/features/admin/configuration/taxonomies_spec.rb
+++ b/spec/features/admin/configuration/taxonomies_spec.rb
@@ -4,7 +4,7 @@ describe "Taxonomies" do
   include AuthenticationWorkflow
 
   before(:each) do
-    login_to_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.admin_general_settings_path
   end
 
   context "show" do
diff --git a/spec/features/admin/content_spec.rb b/spec/features/admin/content_spec.rb
index 1194f4af34..cc9d8af55c 100644
--- a/spec/features/admin/content_spec.rb
+++ b/spec/features/admin/content_spec.rb
@@ -8,7 +8,7 @@ feature '
   include WebHelper
 
   before do
-    login_to_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.admin_general_settings_path
     click_link 'Content'
   end
 
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index 6ab9adbda7..a20ba2a419 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -13,7 +13,7 @@ feature '
     fee = create(:enterprise_fee, name: '$0.50 / kg', fee_type: 'packing', tax_category: tax_category_gst)
     amount = fee.calculator.preferred_amount
 
-    login_to_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.admin_general_settings_path
     click_link 'Enterprise Fees'
 
     expect(page).to have_select "enterprise_fee_set_collection_attributes_0_enterprise_id"
@@ -29,7 +29,7 @@ feature '
     e = create(:supplier_enterprise, name: 'Feedme')
 
     # When I go to the enterprise fees page
-    login_to_admin_and_visit admin_enterprise_fees_path
+    login_as_admin_and_visit admin_enterprise_fees_path
 
     # And I fill in the fields for a new enterprise fee and click update
     select 'Feedme', from: 'enterprise_fee_set_collection_attributes_0_enterprise_id'
@@ -57,7 +57,7 @@ feature '
     enterprise = create(:enterprise, name: 'Foo')
 
     # When I go to the enterprise fees page
-    login_to_admin_and_visit admin_enterprise_fees_path
+    login_as_admin_and_visit admin_enterprise_fees_path
 
     # And I update the fields for the enterprise fee and click update
     select 'Foo', from: 'enterprise_fee_set_collection_attributes_0_enterprise_id'
@@ -90,7 +90,7 @@ feature '
     fee = create(:enterprise_fee)
 
     # When I go to the enterprise fees page
-    login_to_admin_and_visit admin_enterprise_fees_path
+    login_as_admin_and_visit admin_enterprise_fees_path
 
     # And I click delete
     accept_alert do
diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb
index 8e5170130d..59fe2e07a5 100644
--- a/spec/features/admin/enterprise_user_spec.rb
+++ b/spec/features/admin/enterprise_user_spec.rb
@@ -19,7 +19,7 @@ feature '
     context "with a limitted number of owned enterprises" do
       scenario "setting the enterprise ownership limit" do
         expect(user.enterprise_limit).to eq 5
-        login_to_admin_and_visit spree.admin_users_path
+        login_as_admin_and_visit spree.admin_users_path
         click_link user.email
 
         fill_in "user_enterprise_limit", with: 2
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index 393cf6fdef..56af1c66da 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -9,7 +9,7 @@ feature 'Enterprises Index' do
       s = create(:supplier_enterprise)
       d = create(:distributor_enterprise)
 
-      login_to_admin_and_visit admin_enterprises_path
+      login_as_admin_and_visit admin_enterprises_path
 
       within("tr.enterprise-#{s.id}") do
         expect(page).to have_content s.name
@@ -44,7 +44,7 @@ feature 'Enterprises Index' do
 
       context "without violating rules" do
         before do
-          login_to_admin_and_visit admin_enterprises_path
+          login_as_admin_and_visit admin_enterprises_path
         end
 
         it "updates the enterprises" do
@@ -70,7 +70,7 @@ feature 'Enterprises Index' do
           d_manager.enterprise_roles.build(enterprise: second_distributor).save
           expect(d.owner).to_not eq d_manager
 
-          login_to_admin_and_visit admin_enterprises_path
+          login_as_admin_and_visit admin_enterprises_path
         end
 
         def enterprise_row_index(enterprise_name)
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index b00aa5d716..37b8fefd35 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -219,7 +219,7 @@ feature '
       s = create(:supplier_enterprise)
 
       # When I go to its properties page
-      login_to_admin_and_visit admin_enterprises_path
+      login_as_admin_and_visit admin_enterprises_path
       within(".enterprise-#{s.id}") { click_link 'Properties' }
 
       # And I create a property
@@ -242,7 +242,7 @@ feature '
       s.producer_properties.create! property_name: 'Certified Organic', value: 'NASAA 12345'
 
       # When I go to its properties page
-      login_to_admin_and_visit main_app.admin_enterprise_producer_properties_path(s)
+      login_as_admin_and_visit main_app.admin_enterprise_producer_properties_path(s)
 
       # And I update the property
       fill_in 'enterprise_producer_properties_attributes_0_property_name', with: "Biodynamic"
@@ -264,7 +264,7 @@ feature '
       pp = s.producer_properties.create! property_name: 'Certified Organic', value: 'NASAA 12345'
 
       # When I go to its properties page
-      login_to_admin_and_visit main_app.admin_enterprise_producer_properties_path(s)
+      login_as_admin_and_visit main_app.admin_enterprise_producer_properties_path(s)
 
       # And I remove the property
       expect(page).to have_field 'enterprise_producer_properties_attributes_0_property_name', with: 'Certified Organic'
diff --git a/spec/features/admin/image_settings_spec.rb b/spec/features/admin/image_settings_spec.rb
index d23e4c5952..9968952798 100644
--- a/spec/features/admin/image_settings_spec.rb
+++ b/spec/features/admin/image_settings_spec.rb
@@ -20,7 +20,7 @@ feature '
 
   scenario "setting the image format for a paperclip style" do
     # When I go to the image settings page
-    login_to_admin_and_visit spree.edit_admin_image_settings_path
+    login_as_admin_and_visit spree.edit_admin_image_settings_path
 
     # All the styles should default to "Unchanged"
     expect(page).to have_select 'attachment_styles_format_mini',    selected: 'Unchanged'
diff --git a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
index 44198f40c2..b6227fe95a 100644
--- a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
+++ b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
@@ -33,7 +33,7 @@ feature '
     distributor_fee = create(:enterprise_fee, enterprise: distributor, name: 'Distributor fee')
 
     # When I go to the new order cycle page
-    login_to_admin_and_visit admin_order_cycles_path
+    login_as_admin_and_visit admin_order_cycles_path
     click_link 'New Order Cycle'
 
     # Select a coordinator since there are two available
diff --git a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
index 285148164d..ce9d5f0914 100644
--- a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
@@ -20,7 +20,7 @@ feature '
     oc_outgoing = create(:simple_order_cycle, coordinator: c, distributors: [c])
 
     # When I edit the first order cycle, the exchange should appear as incoming
-    login_to_admin_and_visit admin_order_cycle_incoming_path(oc_incoming)
+    login_as_admin_and_visit admin_order_cycle_incoming_path(oc_incoming)
     expect(page).to have_selector 'table.exchanges tr.supplier'
     visit admin_order_cycle_outgoing_path(oc_incoming)
     expect(page).not_to have_selector 'table.exchanges tr.distributor'
diff --git a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
index faefd97fe1..44c05037e5 100644
--- a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -18,7 +18,7 @@ feature '
     before do
       stub_const("#{Api::ExchangeProductsController}::DEFAULT_PER_PAGE", 1)
 
-      login_to_admin_and_visit admin_order_cycle_incoming_path(order_cycle)
+      login_as_admin_and_visit admin_order_cycle_incoming_path(order_cycle)
       expect(page).to have_content "1 / 2 selected"
 
       page.find("tr.supplier-#{supplier_enterprise.id} td.products").click
diff --git a/spec/features/admin/order_cycles/complex_editing_spec.rb b/spec/features/admin/order_cycles/complex_editing_spec.rb
index 02f8833198..d93999ab3b 100644
--- a/spec/features/admin/order_cycles/complex_editing_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_spec.rb
@@ -19,7 +19,7 @@ feature '
     oc.distributors.last.update_attribute :name, 'ZZZZ'
 
     # When I edit it
-    login_to_admin_and_visit edit_admin_order_cycle_path(oc)
+    login_as_admin_and_visit edit_admin_order_cycle_path(oc)
 
     wait_for_edit_form_to_load_order_cycle(oc)
 
diff --git a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
index 34a867f1bf..d76ba551c2 100644
--- a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
+++ b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
@@ -40,7 +40,7 @@ feature '
     distributor_fee2 = create(:enterprise_fee, enterprise: distributor, name: 'Distributor fee 2')
 
     # When I go to its edit page
-    login_to_admin_and_visit admin_order_cycles_path
+    login_as_admin_and_visit admin_order_cycles_path
     within "tr.order-cycle-#{oc.id}" do
       find("a.edit-order-cycle").click
     end
diff --git a/spec/features/admin/order_cycles/list_spec.rb b/spec/features/admin/order_cycles/list_spec.rb
index a616cb161f..17bda44e4f 100644
--- a/spec/features/admin/order_cycles/list_spec.rb
+++ b/spec/features/admin/order_cycles/list_spec.rb
@@ -30,7 +30,7 @@ feature '
     create(:proxy_order, subscription: create(:subscription, schedule: schedule1), order_cycle: oc1)
 
     # When I go to the admin order cycles page
-    login_to_admin_and_visit admin_order_cycles_path
+    login_as_admin_and_visit admin_order_cycles_path
 
     # Then the order cycles should be ordered correctly
     expect(page).to have_selector "#listing_order_cycles tr td:first-child", count: 7
@@ -128,7 +128,7 @@ feature '
 
     context 'using datepickers' do
       it "correctly opens the datepicker and changes the date field" do
-        login_to_admin_and_visit admin_order_cycles_path
+        login_as_admin_and_visit admin_order_cycles_path
 
         within("tr.order-cycle-#{oc_pt.id}") do
           expect(find('input.datetimepicker', match: :first).value).to start_with '2012-01-01 00:00'
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb
index c735c6bcaa..ff05885895 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/features/admin/order_cycles/simple_spec.rb
@@ -19,7 +19,7 @@ feature '
                  orders_close_at: Time.zone.local(2041, 12, 12, 12, 12, 12))
 
     # When I go to the order cycles page
-    login_to_admin_and_visit admin_order_cycles_path
+    login_as_admin_and_visit admin_order_cycles_path
 
     # And I fill in some new opening/closing times and save them
     within("tr.order-cycle-#{oc1.id}") do
@@ -76,7 +76,7 @@ feature '
     oc = create(:simple_order_cycle)
 
     # When I clone it
-    login_to_admin_and_visit admin_order_cycles_path
+    login_as_admin_and_visit admin_order_cycles_path
     within "tr.order-cycle-#{oc.id}" do
       find('a.clone-order-cycle').click
     end
@@ -98,7 +98,7 @@ feature '
       end
 
       it "displays a warning on the order cycles screen" do
-        login_to_admin_and_visit admin_order_cycles_path
+        login_as_admin_and_visit admin_order_cycles_path
         expect(page).to have_content "The hub #{hub.name} is listed in an active order cycle, but does not have valid shipping and payment methods. Until you set these up, customers will not be able to shop at this hub."
       end
     end
@@ -505,7 +505,7 @@ feature '
       ex.update! pickup_time: 'pickup time', pickup_instructions: 'pickup instructions'
 
       # When I edit it
-      login_to_admin_and_visit admin_order_cycles_path
+      login_as_admin_and_visit admin_order_cycles_path
       within "tr.order-cycle-#{oc.id}" do
         find("a.edit-order-cycle").click
       end
@@ -537,7 +537,7 @@ feature '
       ex.update! pickup_time: 'pickup time', pickup_instructions: 'pickup instructions'
 
       # When I edit it
-      login_to_admin_and_visit edit_admin_order_cycle_path oc
+      login_as_admin_and_visit edit_admin_order_cycle_path oc
 
       wait_for_edit_form_to_load_order_cycle(oc)
 
@@ -591,7 +591,7 @@ feature '
 
   scenario "deleting an order cycle" do
     order_cycle = create(:simple_order_cycle, name: "Translusent Berries")
-    login_to_admin_and_visit admin_order_cycles_path
+    login_as_admin_and_visit admin_order_cycles_path
     expect(page).to have_selector "tr.order-cycle-#{order_cycle.id}"
     accept_alert do
       first('a.delete-order-cycle').click
diff --git a/spec/features/admin/order_cycles_complex_nav_check_spec.rb b/spec/features/admin/order_cycles_complex_nav_check_spec.rb
index bfc33bbfd3..12c90e79a1 100644
--- a/spec/features/admin/order_cycles_complex_nav_check_spec.rb
+++ b/spec/features/admin/order_cycles_complex_nav_check_spec.rb
@@ -13,7 +13,7 @@ feature '
     oc = create(:order_cycle)
 
     # When I edit the form
-    login_to_admin_and_visit edit_admin_order_cycle_path(oc)
+    login_as_admin_and_visit edit_admin_order_cycle_path(oc)
 
     wait_for_edit_form_to_load_order_cycle(oc)
 
diff --git a/spec/features/admin/order_spec.rb b/spec/features/admin/order_spec.rb
index 31c606d48b..33a1cc9ae2 100644
--- a/spec/features/admin/order_spec.rb
+++ b/spec/features/admin/order_spec.rb
@@ -43,7 +43,7 @@ feature '
     distributor_disabled = create(:distributor_enterprise)
     create(:simple_order_cycle, name: 'Two')
 
-    login_to_admin_and_visit spree.admin_orders_path
+    login_as_admin_and_visit spree.admin_orders_path
     click_link 'New Order'
 
     # Distributors without an order cycle should be shown as disabled
@@ -78,7 +78,7 @@ feature '
   end
 
   scenario "can add a product to an existing order" do
-    login_to_admin_and_visit spree.edit_admin_order_path(order)
+    login_as_admin_and_visit spree.edit_admin_order_path(order)
 
     targetted_select2_search product.name, from: '#add_variant_id', dropdown_css: '.select2-drop'
 
@@ -100,7 +100,7 @@ feature '
     order.user = nil
     order.save
 
-    login_to_admin_and_visit spree.edit_admin_order_path(order)
+    login_as_admin_and_visit spree.edit_admin_order_path(order)
 
     expect(page).to have_select2 "order_distributor_id", with_options: [d.name]
     select2_select d.name, from: 'order_distributor_id'
@@ -114,13 +114,13 @@ feature '
   scenario "can't add products to an order outside the order's hub and order cycle" do
     product = create(:simple_product)
 
-    login_to_admin_and_visit spree.edit_admin_order_path(order)
+    login_as_admin_and_visit spree.edit_admin_order_path(order)
 
     expect(page).not_to have_select2 "add_variant_id", with_options: [product.name]
   end
 
   scenario "can't change distributor or order cycle once order has been finalized" do
-    login_to_admin_and_visit spree.edit_admin_order_path(order)
+    login_as_admin_and_visit spree.edit_admin_order_path(order)
 
     expect(page).not_to have_select2 'order_distributor_id'
     expect(page).not_to have_select2 'order_order_cycle_id'
diff --git a/spec/features/admin/orders_spec.rb b/spec/features/admin/orders_spec.rb
index 41db8b3bcc..df1690d59b 100644
--- a/spec/features/admin/orders_spec.rb
+++ b/spec/features/admin/orders_spec.rb
@@ -29,7 +29,7 @@ feature '
       create(:simple_order_cycle, name: 'Four', orders_close_at: 4.weeks.from_now)
       create(:simple_order_cycle, name: 'Three', orders_close_at: 3.weeks.from_now)
 
-      login_to_admin_and_visit 'admin/orders'
+      login_as_admin_and_visit 'admin/orders'
 
       open_select2('#s2id_q_order_cycle_id_in')
 
@@ -49,7 +49,7 @@ feature '
       order4 = create(:order_with_credit_payment, user: user, distributor: distributor,
                                                   order_cycle: order_cycle4)
 
-      login_to_admin_and_visit 'admin/orders'
+      login_as_admin_and_visit 'admin/orders'
 
       multi_select2_select 'Two', from: 'q_order_cycle_id_in'
       multi_select2_select 'Three', from: 'q_order_cycle_id_in'
@@ -69,7 +69,7 @@ feature '
       end
 
       scenario "capture payment" do
-        login_to_admin_and_visit spree.admin_orders_path
+        login_as_admin_and_visit spree.admin_orders_path
         expect(page).to have_current_path spree.admin_orders_path
 
         # click the 'capture' link for the order
@@ -87,7 +87,7 @@ feature '
 
       scenario "ship order from the orders index page" do
         order.payments.first.capture!
-        login_to_admin_and_visit spree.admin_orders_path
+        login_as_admin_and_visit spree.admin_orders_path
 
         page.find("[data-powertip=Ship]").click
 
@@ -101,7 +101,7 @@ feature '
     scenario "can edit order" do
       incomplete_order = create(:order, distributor: distributor, order_cycle: order_cycle)
 
-      login_to_admin_and_visit spree.admin_orders_path
+      login_as_admin_and_visit spree.admin_orders_path
       uncheck 'Only show complete orders'
       page.find('a.icon-search').click
 
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index 8fbebf921c..c5cdc86767 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -13,7 +13,7 @@ feature '
 
   describe "creating a payment method", js: true do
     scenario "assigning a distributor to the payment method" do
-      login_to_admin_and_visit spree.admin_general_settings_path
+      login_as_admin_and_visit spree.admin_general_settings_path
       click_link 'Payment Methods'
       click_link 'New Payment Method'
 
@@ -68,12 +68,12 @@ feature '
 
     scenario "checking a single distributor is checked by default" do
       2.times.each { Enterprise.last.destroy }
-      login_to_admin_and_visit spree.new_admin_payment_method_path
+      login_as_admin_and_visit spree.new_admin_payment_method_path
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[0].id}", checked: true
     end
 
     scenario "checking more than a distributor displays no default choice" do
-      login_to_admin_and_visit spree.new_admin_payment_method_path
+      login_as_admin_and_visit spree.new_admin_payment_method_path
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[0].id}", checked: false
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[1].id}", checked: false
       expect(page).to have_field "payment_method_distributor_ids_#{@distributors[2].id}", checked: false
@@ -82,7 +82,7 @@ feature '
 
   scenario "updating a payment method", js: true do
     payment_method = create(:payment_method, distributors: [@distributors[0]])
-    login_to_admin_and_visit spree.edit_admin_payment_method_path payment_method
+    login_as_admin_and_visit spree.edit_admin_payment_method_path payment_method
 
     fill_in 'payment_method_name', with: 'New PM Name'
     find(:css, "tags-input .tags input").set "member\n"
diff --git a/spec/features/admin/payments_spec.rb b/spec/features/admin/payments_spec.rb
index 2a2233b187..f9cac18498 100644
--- a/spec/features/admin/payments_spec.rb
+++ b/spec/features/admin/payments_spec.rb
@@ -9,7 +9,7 @@ feature '
   let(:order) { create(:completed_order_with_fees) }
 
   scenario "visiting the payment form" do
-    login_to_admin_and_visit spree.new_admin_order_payment_path order
+    login_as_admin_and_visit spree.new_admin_order_payment_path order
 
     expect(page).to have_content "New Payment"
   end
@@ -25,7 +25,7 @@ feature '
     end
 
     scenario "visiting the payment form" do
-      login_to_admin_and_visit spree.new_admin_order_payment_path order
+      login_as_admin_and_visit spree.new_admin_order_payment_path order
 
       expect(page).to have_content "New Payment"
     end
@@ -38,7 +38,7 @@ feature '
     end
 
     it "renders the payment details" do
-      login_to_admin_and_visit spree.admin_order_payments_path order
+      login_as_admin_and_visit spree.admin_order_payments_path order
 
       page.click_link("StripeSCA")
       expect(page).to have_content order.payments.last.source.last_digits
@@ -50,7 +50,7 @@ feature '
       end
 
       it "renders the payment details" do
-        login_to_admin_and_visit spree.admin_order_payments_path order
+        login_as_admin_and_visit spree.admin_order_payments_path order
 
         page.click_link("StripeSCA")
         expect(page).to have_content order.payments.last.amount
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index 27e5b12b4d..bba42f7218 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -67,7 +67,7 @@ feature '
     end
 
     scenario "creating an on-demand product", js: true do
-      login_to_admin_and_visit spree.admin_products_path
+      login_as_admin_and_visit spree.admin_products_path
 
       click_link 'New Product'
 
diff --git a/spec/features/admin/properties_spec.rb b/spec/features/admin/properties_spec.rb
index 52a573509a..958aa87867 100644
--- a/spec/features/admin/properties_spec.rb
+++ b/spec/features/admin/properties_spec.rb
@@ -9,7 +9,7 @@ feature '
   include AuthenticationWorkflow
 
   scenario "creating and editing a property" do
-    login_to_admin_and_visit spree.admin_properties_path
+    login_as_admin_and_visit spree.admin_properties_path
 
     click_link 'New Property'
     fill_in 'property_name', with: 'New property!'
diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb
index 37ef696e9c..75da617a8f 100644
--- a/spec/features/admin/reports_spec.rb
+++ b/spec/features/admin/reports_spec.rb
@@ -31,7 +31,7 @@ feature '
 
   describe "Customers report" do
     before do
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
     end
 
     scenario "customers report" do
@@ -62,7 +62,7 @@ feature '
 
   describe "Order cycle management report" do
     before do
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
     end
 
     scenario "payment method report" do
@@ -88,7 +88,7 @@ feature '
 
   describe "Packing reports" do
     before do
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
     end
 
     let(:bill_address1) { create(:address, lastname: "Aman") }
@@ -144,7 +144,7 @@ feature '
   end
 
   scenario "orders and distributors report" do
-    login_to_admin_and_visit spree.admin_reports_path
+    login_as_admin_and_visit spree.admin_reports_path
     click_link 'Orders And Distributors'
     click_button 'Search'
 
@@ -152,7 +152,7 @@ feature '
   end
 
   scenario "payments reports" do
-    login_to_admin_and_visit spree.admin_reports_path
+    login_as_admin_and_visit spree.admin_reports_path
     click_link 'Payment Reports'
     click_button 'Search'
 
@@ -186,7 +186,7 @@ feature '
       order1.reload.update_distribution_charge!
       order1.finalize!
 
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
 
       click_link "Sales Tax"
       select("Tax types", from: "report_type")
@@ -221,7 +221,7 @@ feature '
 
   describe "orders & fulfilment reports" do
     it "loads the report page" do
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
       click_link 'Orders & Fulfillment Reports'
 
       expect(page).to have_content 'Supplier'
@@ -246,7 +246,7 @@ feature '
 
       it "is precise to time of day, not just date" do
         # When I generate a customer report with a timeframe that includes one order but not the other
-        login_to_admin_and_visit spree.orders_and_fulfillment_admin_reports_path
+        login_as_admin_and_visit spree.orders_and_fulfillment_admin_reports_path
 
         fill_in 'q_completed_at_gt', with: '2013-04-25 13:00:00'
         fill_in 'q_completed_at_lt', with: '2013-04-25 15:00:00'
@@ -263,7 +263,7 @@ feature '
       oc = create(:simple_order_cycle, name: "My Order Cycle", distributors: [distributor], orders_open_at: Time.zone.now, orders_close_at: nil)
       o = create(:order, order_cycle: oc, distributor: distributor)
 
-      login_to_admin_and_visit spree.orders_and_fulfillment_admin_reports_path
+      login_as_admin_and_visit spree.orders_and_fulfillment_admin_reports_path
 
       expect(page).to have_content "My Order Cycle"
     end
@@ -294,7 +294,7 @@ feature '
     end
 
     it "shows products and inventory report" do
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
 
       expect(page).to have_content "All products"
       expect(page).to have_content "Inventory (on hand)"
@@ -308,7 +308,7 @@ feature '
     end
 
     it "shows the LettuceShare report" do
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
       click_link 'LettuceShare'
       click_button "Go"
 
@@ -325,7 +325,7 @@ feature '
     before do
       enterprise3.enterprise_roles.build( user: enterprise1.owner ).save
 
-      login_to_admin_and_visit spree.admin_reports_path
+      login_as_admin_and_visit spree.admin_reports_path
 
       click_link 'Users & Enterprises'
     end
@@ -402,7 +402,7 @@ feature '
         order1.update_attribute :email, 'customer@email.com'
         Timecop.travel(Time.zone.local(2015, 4, 25, 14, 0, 0)) { order1.finalize! }
 
-        login_to_admin_and_visit spree.admin_reports_path
+        login_as_admin_and_visit spree.admin_reports_path
 
         click_link 'Xero Invoices'
       end
diff --git a/spec/features/admin/tag_rules_spec.rb b/spec/features/admin/tag_rules_spec.rb
index 3867a0f006..710e567b04 100644
--- a/spec/features/admin/tag_rules_spec.rb
+++ b/spec/features/admin/tag_rules_spec.rb
@@ -242,7 +242,7 @@ feature 'Tag Rules', js: true do
   end
 
   def visit_tag_rules
-    login_to_admin_and_visit main_app.edit_admin_enterprise_path(enterprise)
+    login_as_admin_and_visit main_app.edit_admin_enterprise_path(enterprise)
     expect(page).to have_content "PRIMARY DETAILS"
     click_link "Tag Rules"
   end
diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index 24a5135904..ea5744349e 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -401,7 +401,7 @@ feature "
       let(:product) { order_cycle.products.first }
 
       before do
-        login_to_admin_and_visit 'admin/orders/new'
+        login_as_admin_and_visit 'admin/orders/new'
         select2_select distributor.name, from: 'order_distributor_id'
         select2_select order_cycle.name, from: 'order_order_cycle_id'
         click_button 'Next'
diff --git a/spec/features/admin/variants_spec.rb b/spec/features/admin/variants_spec.rb
index b22a322486..163cc78d7e 100644
--- a/spec/features/admin/variants_spec.rb
+++ b/spec/features/admin/variants_spec.rb
@@ -12,7 +12,7 @@ feature '
     product = create(:simple_product, variant_unit: "weight", variant_unit_scale: "1")
 
     # When I create a variant on the product
-    login_to_admin_and_visit spree.admin_product_variants_path product
+    login_as_admin_and_visit spree.admin_product_variants_path product
     click_link 'New Variant'
 
     fill_in 'unit_value_human', with: '1'
@@ -34,7 +34,7 @@ feature '
       product.option_types << variant.option_values.first.option_type
 
       # When I view the variant
-      login_to_admin_and_visit spree.admin_product_variants_path product
+      login_as_admin_and_visit spree.admin_product_variants_path product
       page.find('table.index .icon-edit').click
 
       # Then I should not see a traditional option value field for the unit-related option value
@@ -60,7 +60,7 @@ feature '
       variant = product.variants.first
       variant.update(unit_description: 'foo')
 
-      login_to_admin_and_visit spree.edit_admin_product_variant_path(product, variant)
+      login_as_admin_and_visit spree.edit_admin_product_variant_path(product, variant)
 
       expect(page).to_not have_field "unit_value_human"
       expect(page).to have_field "variant_unit_description", with: "foo"
@@ -117,7 +117,7 @@ feature '
     product = create(:simple_product)
     variant = create(:variant, product: product)
 
-    login_to_admin_and_visit spree.admin_product_variants_path product
+    login_as_admin_and_visit spree.admin_product_variants_path product
 
     within "tr#spree_variant_#{variant.id}" do
       accept_alert do
@@ -134,7 +134,7 @@ feature '
     variant = product.variants.first
 
     # When I view the variant
-    login_to_admin_and_visit spree.admin_product_variants_path product
+    login_as_admin_and_visit spree.admin_product_variants_path product
     page.find('table.index .icon-edit').click
 
     # It should allow the display name to be changed
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 8d9ce7c8e8..c8d2940a01 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -19,13 +19,13 @@ module AuthenticationWorkflow
     admin_user
   end
 
-  def login_to_admin_and_visit(path_visit)
+  def login_as_admin_and_visit(path_visit)
     login_as_admin
     visit path_visit
   end
 
   def login_to_admin_section
-    login_to_admin_and_visit(spree.admin_dashboard_path)
+    login_as_admin_and_visit(spree.admin_dashboard_path)
   end
 
   def login_to_admin_as(user)

From 10b07aabd9bb5bb1a9fab70001c42e15df509826 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 14:03:07 +0100
Subject: [PATCH 202/340] Rename quick_login_as to login_as

---
 spec/features/admin/bulk_order_management_spec.rb     | 2 +-
 spec/features/admin/customers_spec.rb                 | 2 +-
 spec/features/admin/enterprise_fees_spec.rb           | 2 +-
 spec/features/admin/enterprise_groups_spec.rb         | 2 +-
 spec/features/admin/enterprise_relationships_spec.rb  | 2 +-
 spec/features/admin/enterprise_user_spec.rb           | 2 +-
 spec/features/admin/enterprises/images_spec.rb        | 2 +-
 spec/features/admin/enterprises/index_spec.rb         | 4 ++--
 spec/features/admin/enterprises_spec.rb               | 2 +-
 spec/features/admin/multilingual_spec.rb              | 2 +-
 spec/features/admin/order_cycles/simple_spec.rb       | 2 +-
 spec/features/admin/order_print_ticket_spec.rb        | 2 +-
 spec/features/admin/order_spec.rb                     | 4 ++--
 spec/features/admin/overview_spec.rb                  | 2 +-
 spec/features/admin/payment_method_spec.rb            | 4 ++--
 spec/features/admin/product_import_spec.rb            | 4 ++--
 spec/features/admin/products_spec.rb                  | 2 +-
 spec/features/admin/schedules_spec.rb                 | 2 +-
 spec/features/admin/shipping_methods_spec.rb          | 2 +-
 spec/features/admin/subscriptions_spec.rb             | 2 +-
 spec/features/admin/variant_overrides_spec.rb         | 4 ++--
 spec/features/consumer/account/cards_spec.rb          | 2 +-
 spec/features/consumer/account/settings_spec.rb       | 2 +-
 spec/features/consumer/multilingual_spec.rb           | 4 ++--
 spec/features/consumer/registration_spec.rb           | 2 +-
 spec/features/consumer/shopping/cart_spec.rb          | 2 +-
 spec/features/consumer/shopping/checkout_auth_spec.rb | 2 +-
 spec/features/consumer/shopping/checkout_spec.rb      | 4 ++--
 spec/features/consumer/shopping/orders_spec.rb        | 2 +-
 spec/features/consumer/shopping/shopping_spec.rb      | 4 ++--
 spec/requests/checkout/stripe_connect_spec.rb         | 2 +-
 spec/requests/checkout/stripe_sca_spec.rb             | 2 +-
 spec/requests/embedded_shopfronts_headers_spec.rb     | 2 +-
 spec/support/request/authentication_workflow.rb       | 6 +++---
 34 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index f4d40cd85f..a17d933f80 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -723,7 +723,7 @@ feature '
       @enterprise_user.enterprise_roles.build(enterprise: s1).save
       @enterprise_user.enterprise_roles.build(enterprise: d1).save
 
-      quick_login_as @enterprise_user
+      login_as @enterprise_user
     end
 
     it "displays a Bulk Management Tab under the Orders item" do
diff --git a/spec/features/admin/customers_spec.rb b/spec/features/admin/customers_spec.rb
index 2260e2261a..49338715bb 100644
--- a/spec/features/admin/customers_spec.rb
+++ b/spec/features/admin/customers_spec.rb
@@ -18,7 +18,7 @@ feature 'Customers' do
       let!(:customer4) { create(:customer, enterprise: managed_distributor2) }
 
       before do
-        quick_login_as user
+        login_as user
         visit admin_customers_path
       end
 
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index a20ba2a419..a5732a67b4 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -113,7 +113,7 @@ feature '
     before(:each) do
       enterprise_user.enterprise_roles.build(enterprise: distributor1).save
       enterprise_user.enterprise_roles.build(enterprise: distributor2).save
-      quick_login_as enterprise_user
+      login_as enterprise_user
     end
 
     it "creates enterprise fees" do
diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb
index 029e3c3283..4cab98f0e7 100644
--- a/spec/features/admin/enterprise_groups_spec.rb
+++ b/spec/features/admin/enterprise_groups_spec.rb
@@ -112,7 +112,7 @@ feature '
     let!(:group) { create(:enterprise_group, name: 'My Group', owner: user) }
 
     it "lets me access enterprise groups" do
-      quick_login_as user
+      login_as user
       visit spree.admin_dashboard_path
       click_link 'Groups'
       expect(page).to have_content 'My Group'
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index 23797478be..cb9bbaea1a 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -98,7 +98,7 @@ feature '
     let!(:er2) { create(:enterprise_relationship, parent: d2, child: d1) }
     let!(:er3) { create(:enterprise_relationship, parent: d2, child: d3) }
 
-    before { quick_login_as enterprise_user }
+    before { login_as enterprise_user }
 
     scenario "enterprise user can only see relationships involving their enterprises" do
       visit admin_enterprise_relationships_path
diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb
index 59fe2e07a5..9d6aa54535 100644
--- a/spec/features/admin/enterprise_user_spec.rb
+++ b/spec/features/admin/enterprise_user_spec.rb
@@ -34,7 +34,7 @@ feature '
   describe "system management lockdown" do
     before do
       user.enterprise_roles.create!(enterprise: supplier1)
-      quick_login_as user
+      login_as user
     end
 
     scenario "should not be able to see system configuration" do
diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb
index ba264b4ca0..302db2d291 100644
--- a/spec/features/admin/enterprises/images_spec.rb
+++ b/spec/features/admin/enterprises/images_spec.rb
@@ -11,7 +11,7 @@ feature "Managing enterprise images" do
     before do
       enterprise_user.enterprise_roles.build(enterprise: distributor).save!
 
-      quick_login_as enterprise_user
+      login_as enterprise_user
       visit edit_admin_enterprise_path(distributor)
     end
 
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index 56af1c66da..8afc7acb7e 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -111,7 +111,7 @@ feature 'Enterprises Index' do
       enterprise_manager.enterprise_roles.build(enterprise: supplier1).save
       enterprise_manager.enterprise_roles.build(enterprise: distributor1).save
 
-      quick_login_as enterprise_manager
+      login_as enterprise_manager
     end
 
     context "listing enterprises", js: true do
@@ -166,7 +166,7 @@ feature 'Enterprises Index' do
     let!(:owned_distributor) { create(:distributor_enterprise, name: 'Owned Distributor', owner: user) }
 
     before do
-      quick_login_as user
+      login_as user
     end
 
     context "listing enterprises", js: true do
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index 37b8fefd35..dc5d1e5458 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -291,7 +291,7 @@ feature '
       enterprise_user.enterprise_roles.build(enterprise: supplier1).save
       enterprise_user.enterprise_roles.build(enterprise: distributor1).save
 
-      quick_login_as enterprise_user
+      login_as enterprise_user
     end
 
     context "when I have reached my enterprise ownership limit" do
diff --git a/spec/features/admin/multilingual_spec.rb b/spec/features/admin/multilingual_spec.rb
index 90d21d1ecd..33ad4d1d03 100644
--- a/spec/features/admin/multilingual_spec.rb
+++ b/spec/features/admin/multilingual_spec.rb
@@ -8,7 +8,7 @@ feature 'Multilingual', js: true do
 
   background do
     admin_user.spree_roles << admin_role
-    quick_login_as admin_user
+    login_as admin_user
     visit spree.admin_dashboard_path
   end
 
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb
index ff05885895..02d49be349 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/features/admin/order_cycles/simple_spec.rb
@@ -153,7 +153,7 @@ feature '
         @new_user.enterprise_roles.build(enterprise: distributor_managed).save
         @new_user.enterprise_roles.build(enterprise: other_distributor_managed).save
 
-        quick_login_as @new_user
+        login_as @new_user
       end
 
       scenario "viewing a list of order cycles I am coordinating" do
diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb
index 1718e62436..08616352dd 100644
--- a/spec/features/admin/order_print_ticket_spec.rb
+++ b/spec/features/admin/order_print_ticket_spec.rb
@@ -27,7 +27,7 @@ feature '
       @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: distributor).save
 
-      quick_login_as @enterprise_user
+      login_as @enterprise_user
 
       Spree::Config[:enable_receipt_printing?] = true
     end
diff --git a/spec/features/admin/order_spec.rb b/spec/features/admin/order_spec.rb
index 33a1cc9ae2..be70b5392f 100644
--- a/spec/features/admin/order_spec.rb
+++ b/spec/features/admin/order_spec.rb
@@ -144,7 +144,7 @@ feature '
     order.shipping_method.update_attribute :require_ship_address, true
 
     # When I create a new order
-    quick_login_as user
+    login_as user
     new_order_with_distribution(distributor, order_cycle)
     targetted_select2_search product.name, from: '#add_variant_id', dropdown_css: '.select2-drop'
     find('button.add_variant').click
@@ -187,7 +187,7 @@ feature '
       @enterprise_user.enterprise_roles.build(enterprise: coordinator1).save
       @enterprise_user.enterprise_roles.build(enterprise: distributor1).save
 
-      quick_login_as @enterprise_user
+      login_as @enterprise_user
     end
 
     feature "viewing the edit page" do
diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb
index 460d4cf433..79b4ebf55c 100644
--- a/spec/features/admin/overview_spec.rb
+++ b/spec/features/admin/overview_spec.rb
@@ -12,7 +12,7 @@ feature '
     before do
       @enterprise_user = create(:user)
       allow_any_instance_of(Spree::Admin::OverviewController).to receive(:spree_current_user).and_return @enterprise_user
-      quick_login_as @enterprise_user
+      login_as @enterprise_user
     end
 
     context "with an enterprise" do
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index c5cdc86767..f6b8f798c2 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -45,7 +45,7 @@ feature '
       end
 
       it "communicates the status of the stripe connection to the user" do
-        quick_login_as user
+        login_as user
         visit spree.new_admin_payment_method_path
 
         select2_select "Stripe", from: "payment_method_type"
@@ -136,7 +136,7 @@ feature '
     before(:each) do
       enterprise_user.enterprise_roles.build(enterprise: distributor1).save
       enterprise_user.enterprise_roles.build(enterprise: distributor2).save
-      quick_login_as enterprise_user
+      login_as enterprise_user
     end
 
     it "I can get to the new enterprise page" do
diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb
index eda7695086..85669fa9ed 100644
--- a/spec/features/admin/product_import_spec.rb
+++ b/spec/features/admin/product_import_spec.rb
@@ -408,7 +408,7 @@ feature "Product Import", js: true do
       end
       File.write('/tmp/test.csv', csv_data)
 
-      quick_login_as user
+      login_as user
       visit main_app.admin_product_import_path
 
       attach_file 'file', '/tmp/test.csv'
@@ -432,7 +432,7 @@ feature "Product Import", js: true do
     let(:tmp_csv_path) { "/tmp/test.csv" }
 
     before do
-      quick_login_as admin
+      login_as admin
       visit main_app.admin_product_import_path
     end
 
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index bba42f7218..61f1a45c6e 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -104,7 +104,7 @@ feature '
       create(:enterprise_relationship, parent: @supplier_permitted, child: @supplier2,
                                        permissions_list: [:manage_products])
 
-      quick_login_as @new_user
+      login_as @new_user
     end
 
     context "products do not require a tax category" do
diff --git a/spec/features/admin/schedules_spec.rb b/spec/features/admin/schedules_spec.rb
index f017596e53..1d70d1bf34 100644
--- a/spec/features/admin/schedules_spec.rb
+++ b/spec/features/admin/schedules_spec.rb
@@ -16,7 +16,7 @@ feature 'Schedules', js: true do
     let!(:oc5) { create(:simple_order_cycle, coordinator: managed_enterprise2, name: 'oc5') }
     let!(:weekly_schedule) { create(:schedule, name: 'Weekly', order_cycles: [oc1, oc2, oc3, oc4]) }
 
-    before { quick_login_as user }
+    before { login_as user }
 
     describe "Adding a new Schedule" do
       it "immediately shows the schedule in the order cycle list once created" do
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index 8ab7cb1bc0..fb57f2f898 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -94,7 +94,7 @@ feature 'shipping methods' do
     before(:each) do
       enterprise_user.enterprise_roles.build(enterprise: distributor1).save
       enterprise_user.enterprise_roles.build(enterprise: distributor2).save
-      quick_login_as enterprise_user
+      login_as enterprise_user
     end
 
     it "creating a shipping method" do
diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/features/admin/subscriptions_spec.rb
index 358ffb4671..604126cf45 100644
--- a/spec/features/admin/subscriptions_spec.rb
+++ b/spec/features/admin/subscriptions_spec.rb
@@ -11,7 +11,7 @@ feature 'Subscriptions' do
     let!(:shop2) { create(:distributor_enterprise, owner: user, enable_subscriptions: true) }
     let!(:shop_unmanaged) { create(:distributor_enterprise, enable_subscriptions: true) }
 
-    before { quick_login_as user }
+    before { login_as user }
 
     context 'listing subscriptions' do
       let!(:subscription) { create(:subscription, shop: shop, with_items: true, with_proxy_orders: true) }
diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index ea5744349e..d540a3518e 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -26,7 +26,7 @@ feature "
     }
     let(:user) { create(:user, enterprises: [hub, producer_managed]) }
 
-    before { quick_login_as user }
+    before { login_as user }
 
     describe "selecting a hub" do
       let!(:er1) {
@@ -471,7 +471,7 @@ feature "
       last_variant = inventory_items.last.variant
       first_variant.product.update!(name: "A First Product")
       last_variant.product.update!(name: "Z Last Product")
-      quick_login_as supplier.users.first
+      login_as supplier.users.first
       visit admin_inventory_path
 
       expect(page).to have_text first_variant.name
diff --git a/spec/features/consumer/account/cards_spec.rb b/spec/features/consumer/account/cards_spec.rb
index 2b2008b049..c0a5da2150 100644
--- a/spec/features/consumer/account/cards_spec.rb
+++ b/spec/features/consumer/account/cards_spec.rb
@@ -9,7 +9,7 @@ feature "Credit Cards", js: true do
     let!(:non_default_card) { create(:credit_card, user_id: user.id, gateway_customer_profile_id: 'cus_FDTG') }
 
     before do
-      quick_login_as user
+      login_as user
 
       allow(Stripe).to receive(:api_key) { "sk_test_xxxx" }
       allow(Stripe).to receive(:publishable_key) { "some_token" }
diff --git a/spec/features/consumer/account/settings_spec.rb b/spec/features/consumer/account/settings_spec.rb
index 2edc45cab1..16eeade5a1 100644
--- a/spec/features/consumer/account/settings_spec.rb
+++ b/spec/features/consumer/account/settings_spec.rb
@@ -14,7 +14,7 @@ feature "Account Settings", js: true do
 
     before do
       setup_email
-      quick_login_as user
+      login_as user
       visit "/account"
       click_link I18n.t('spree.users.show.tabs.settings')
       expect(page).to have_content I18n.t('spree.users.form.account_settings')
diff --git a/spec/features/consumer/multilingual_spec.rb b/spec/features/consumer/multilingual_spec.rb
index 3e8a19f4d0..a62a1b6ba3 100644
--- a/spec/features/consumer/multilingual_spec.rb
+++ b/spec/features/consumer/multilingual_spec.rb
@@ -77,14 +77,14 @@ feature 'Multilingual', js: true do
 
       expect_menu_and_cookie_in_es
       expect(user.locale).to be_nil
-      quick_login_as user
+      login_as user
       visit root_path
 
       expect_menu_and_cookie_in_es
     end
 
     it 'updates user locale and stays in cookie after logout' do
-      quick_login_as user
+      login_as user
       visit root_path(locale: 'es')
       user.reload
 
diff --git a/spec/features/consumer/registration_spec.rb b/spec/features/consumer/registration_spec.rb
index 0e9f1b221c..ddb93298c7 100644
--- a/spec/features/consumer/registration_spec.rb
+++ b/spec/features/consumer/registration_spec.rb
@@ -154,7 +154,7 @@ feature "Registration", js: true do
     let!(:user2) { create(:user) }
 
     before do
-      quick_login_as user2
+      login_as user2
     end
 
     context "if accepting Terms of Service is not required" do
diff --git a/spec/features/consumer/shopping/cart_spec.rb b/spec/features/consumer/shopping/cart_spec.rb
index 0bc4523a24..7d156ef596 100644
--- a/spec/features/consumer/shopping/cart_spec.rb
+++ b/spec/features/consumer/shopping/cart_spec.rb
@@ -262,7 +262,7 @@ feature "full-page cart", js: true do
         order.distributor.allow_order_changes = true
         order.distributor.save
         add_product_to_cart order, product_with_tax
-        quick_login_as user
+        login_as user
         visit main_app.cart_path
       end
 
diff --git a/spec/features/consumer/shopping/checkout_auth_spec.rb b/spec/features/consumer/shopping/checkout_auth_spec.rb
index a4d9d8c1c3..4631e636ce 100644
--- a/spec/features/consumer/shopping/checkout_auth_spec.rb
+++ b/spec/features/consumer/shopping/checkout_auth_spec.rb
@@ -24,7 +24,7 @@ feature "As a consumer I want to check out my cart", js: true do
     end
 
     it "does not render the login form when logged in" do
-      quick_login_as user
+      login_as user
       visit checkout_path
       within "section[role='main']" do
         expect(page).to have_no_content "Login"
diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb
index 342c699a43..7f665e6351 100644
--- a/spec/features/consumer/shopping/checkout_spec.rb
+++ b/spec/features/consumer/shopping/checkout_spec.rb
@@ -65,7 +65,7 @@ feature "As a consumer I want to check out my cart", js: true do
       let(:user) { create(:user) }
 
       before do
-        quick_login_as(user)
+        login_as(user)
       end
 
       context "with details filled out" do
@@ -292,7 +292,7 @@ feature "As a consumer I want to check out my cart", js: true do
           expect(page).to have_content "Donkeys"
           expect(page).not_to have_content "Local"
 
-          quick_login_as(user)
+          login_as(user)
           visit checkout_path
 
           # Default rule in still effect, disallows access to 'Local'
diff --git a/spec/features/consumer/shopping/orders_spec.rb b/spec/features/consumer/shopping/orders_spec.rb
index 4f2a379c12..1d5221e257 100644
--- a/spec/features/consumer/shopping/orders_spec.rb
+++ b/spec/features/consumer/shopping/orders_spec.rb
@@ -109,7 +109,7 @@ feature "Order Management", js: true do
       order.save
       order.reload
 
-      quick_login_as user
+      login_as user
     end
 
     it 'shows the name of the shipping method' do
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index b28dcbefec..9dd9ebbc65 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -485,7 +485,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
         let(:user) { create(:user, bill_address: address, ship_address: address) }
 
         before do
-          quick_login_as user
+          login_as user
         end
 
         context "as non-customer" do
@@ -533,7 +533,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
         let!(:returning_user) { create(:user, email: unregistered_customer.email) }
 
         before do
-          quick_login_as returning_user
+          login_as returning_user
         end
 
         it "shows the products without customer only message" do
diff --git a/spec/requests/checkout/stripe_connect_spec.rb b/spec/requests/checkout/stripe_connect_spec.rb
index 000b2250a8..75ca23c8c4 100644
--- a/spec/requests/checkout/stripe_connect_spec.rb
+++ b/spec/requests/checkout/stripe_connect_spec.rb
@@ -244,7 +244,7 @@ describe "checking out an order with a Stripe Connect payment method", type: :re
 
     before do
       params[:order][:existing_card_id] = credit_card.id
-      quick_login_as(order.user)
+      login_as(order.user)
 
       # Requests a token
       stub_request(:post, "https://api.stripe.com/v1/tokens")
diff --git a/spec/requests/checkout/stripe_sca_spec.rb b/spec/requests/checkout/stripe_sca_spec.rb
index d2734f66d4..95a5b29554 100644
--- a/spec/requests/checkout/stripe_sca_spec.rb
+++ b/spec/requests/checkout/stripe_sca_spec.rb
@@ -289,7 +289,7 @@ describe "checking out an order with a Stripe SCA payment method", type: :reques
 
       before do
         params[:order][:existing_card_id] = credit_card.id
-        quick_login_as(order.user)
+        login_as(order.user)
       end
 
       context "and the payment intent and payment method requests are accepted" do
diff --git a/spec/requests/embedded_shopfronts_headers_spec.rb b/spec/requests/embedded_shopfronts_headers_spec.rb
index 9e1dd4be4d..f04de87b86 100644
--- a/spec/requests/embedded_shopfronts_headers_spec.rb
+++ b/spec/requests/embedded_shopfronts_headers_spec.rb
@@ -7,7 +7,7 @@ describe "setting response headers for embedded shopfronts", type: :request do
   let(:user) { enterprise.owner }
 
   before do
-    quick_login_as(user)
+    login_as(user)
   end
 
   context "with embedded shopfront disabled" do
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index c8d2940a01..a10c858508 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -1,7 +1,7 @@
 module AuthenticationWorkflow
   include Warden::Test::Helpers
 
-  def quick_login_as(user)
+  def login_as(user)
     login_as user
   end
 
@@ -15,7 +15,7 @@ module AuthenticationWorkflow
                         login: 'admin@ofn.org')
 
     admin_user.spree_roles << admin_role
-    quick_login_as admin_user
+    login_as admin_user
     admin_user
   end
 
@@ -29,7 +29,7 @@ module AuthenticationWorkflow
   end
 
   def login_to_admin_as(user)
-    quick_login_as user
+    login_as user
     visit spree.admin_dashboard_path
   end
 

From a2ebc614d9ca34de44898d5f611c1f701c72ab49 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 14:07:32 +0100
Subject: [PATCH 203/340] Rename AuthenticationWorkflow to AuthenticationHelper

---
 spec/controllers/admin/column_preferences_controller_spec.rb  | 2 +-
 spec/controllers/admin/customers_controller_spec.rb           | 2 +-
 spec/controllers/admin/inventory_items_controller_spec.rb     | 2 +-
 spec/controllers/admin/proxy_orders_controller_spec.rb        | 2 +-
 spec/controllers/admin/schedules_controller_spec.rb           | 2 +-
 .../admin/subscription_line_items_controller_spec.rb          | 2 +-
 spec/controllers/admin/subscriptions_controller_spec.rb       | 2 +-
 spec/controllers/admin/variant_overrides_controller_spec.rb   | 2 +-
 spec/controllers/api/customers_controller_spec.rb             | 2 +-
 spec/controllers/api/enterprise_fees_controller_spec.rb       | 2 +-
 spec/controllers/api/exchange_products_controller_spec.rb     | 2 +-
 spec/controllers/api/logos_controller_spec.rb                 | 2 +-
 spec/controllers/api/orders_controller_spec.rb                | 2 +-
 spec/controllers/api/product_images_controller_spec.rb        | 2 +-
 spec/controllers/api/promo_images_controller_spec.rb          | 2 +-
 spec/controllers/api/shops_controller_spec.rb                 | 2 +-
 spec/controllers/spree/admin/adjustments_controller_spec.rb   | 2 +-
 spec/controllers/spree/admin/countries_controller_spec.rb     | 2 +-
 .../controllers/spree/admin/image_settings_controller_spec.rb | 2 +-
 spec/controllers/spree/admin/mail_methods_controller_spec.rb  | 2 +-
 .../spree/admin/orders/customer_details_controller_spec.rb    | 2 +-
 .../spree/admin/return_authorizations_controller_spec.rb      | 2 +-
 .../spree/admin/shipping_categories_controller_spec.rb        | 2 +-
 .../spree/admin/shipping_methods_controller_spec.rb           | 2 +-
 spec/controllers/spree/users_controller_spec.rb               | 2 +-
 spec/features/admin/adjustments_spec.rb                       | 2 +-
 spec/features/admin/authentication_spec.rb                    | 2 +-
 spec/features/admin/bulk_order_management_spec.rb             | 2 +-
 spec/features/admin/bulk_product_update_spec.rb               | 2 +-
 spec/features/admin/configuration/general_settings_spec.rb    | 2 +-
 spec/features/admin/configuration/image_settings_spec.rb      | 2 +-
 spec/features/admin/configuration/mail_methods_spec.rb        | 2 +-
 spec/features/admin/configuration/states_spec.rb              | 2 +-
 spec/features/admin/configuration/tax_categories_spec.rb      | 2 +-
 spec/features/admin/configuration/tax_rates_spec.rb           | 2 +-
 spec/features/admin/configuration/taxonomies_spec.rb          | 2 +-
 spec/features/admin/configuration/zones_spec.rb               | 2 +-
 spec/features/admin/content_spec.rb                           | 2 +-
 spec/features/admin/customers_spec.rb                         | 2 +-
 spec/features/admin/enterprise_fees_spec.rb                   | 2 +-
 spec/features/admin/enterprise_groups_spec.rb                 | 2 +-
 spec/features/admin/enterprise_relationships_spec.rb          | 2 +-
 spec/features/admin/enterprise_roles_spec.rb                  | 2 +-
 spec/features/admin/enterprise_user_spec.rb                   | 2 +-
 spec/features/admin/enterprises/images_spec.rb                | 2 +-
 spec/features/admin/enterprises/index_spec.rb                 | 2 +-
 spec/features/admin/enterprises_spec.rb                       | 2 +-
 spec/features/admin/external_services_spec.rb                 | 2 +-
 spec/features/admin/image_settings_spec.rb                    | 2 +-
 spec/features/admin/multilingual_spec.rb                      | 2 +-
 .../admin/order_cycles/complex_creating_specific_time_spec.rb | 2 +-
 .../complex_editing_exchange_same_enterprise_spec.rb          | 2 +-
 .../complex_editing_multiple_product_pages_spec.rb            | 2 +-
 spec/features/admin/order_cycles/complex_editing_spec.rb      | 2 +-
 .../admin/order_cycles/complex_updating_specific_time_spec.rb | 2 +-
 spec/features/admin/order_cycles/list_spec.rb                 | 2 +-
 spec/features/admin/order_cycles/simple_spec.rb               | 2 +-
 spec/features/admin/order_cycles_complex_nav_check_spec.rb    | 2 +-
 spec/features/admin/order_print_ticket_spec.rb                | 2 +-
 spec/features/admin/order_spec.rb                             | 2 +-
 spec/features/admin/orders_spec.rb                            | 2 +-
 spec/features/admin/overview_spec.rb                          | 2 +-
 spec/features/admin/payment_method_spec.rb                    | 2 +-
 spec/features/admin/payments_spec.rb                          | 2 +-
 spec/features/admin/product_import_spec.rb                    | 2 +-
 spec/features/admin/products_spec.rb                          | 2 +-
 spec/features/admin/properties_spec.rb                        | 2 +-
 spec/features/admin/reports/packing_report_spec.rb            | 2 +-
 spec/features/admin/reports_spec.rb                           | 2 +-
 spec/features/admin/schedules_spec.rb                         | 2 +-
 spec/features/admin/shipping_methods_spec.rb                  | 2 +-
 spec/features/admin/subscriptions_spec.rb                     | 2 +-
 spec/features/admin/tag_rules_spec.rb                         | 2 +-
 spec/features/admin/tax_settings_spec.rb                      | 2 +-
 spec/features/admin/users_spec.rb                             | 2 +-
 spec/features/admin/variant_overrides_spec.rb                 | 2 +-
 spec/features/admin/variants_spec.rb                          | 2 +-
 spec/features/consumer/account/cards_spec.rb                  | 2 +-
 spec/features/consumer/account/settings_spec.rb               | 2 +-
 spec/features/consumer/account_spec.rb                        | 2 +-
 spec/features/consumer/authentication_spec.rb                 | 2 +-
 spec/features/consumer/groups_spec.rb                         | 2 +-
 spec/features/consumer/multilingual_spec.rb                   | 2 +-
 spec/features/consumer/producers_spec.rb                      | 2 +-
 spec/features/consumer/registration_spec.rb                   | 2 +-
 spec/features/consumer/shopping/cart_spec.rb                  | 2 +-
 spec/features/consumer/shopping/checkout_auth_spec.rb         | 2 +-
 spec/features/consumer/shopping/checkout_spec.rb              | 2 +-
 spec/features/consumer/shopping/embedded_shopfronts_spec.rb   | 2 +-
 spec/features/consumer/shopping/orders_spec.rb                | 2 +-
 spec/features/consumer/shopping/products_spec.rb              | 2 +-
 spec/features/consumer/shopping/shopping_spec.rb              | 2 +-
 spec/features/consumer/shopping/variant_overrides_spec.rb     | 2 +-
 spec/features/consumer/shops_spec.rb                          | 2 +-
 .../open_food_network/orders_and_fulfillments_report_spec.rb  | 2 +-
 spec/lib/open_food_network/packing_report_spec.rb             | 2 +-
 spec/requests/checkout/stripe_connect_spec.rb                 | 2 +-
 spec/requests/checkout/stripe_sca_spec.rb                     | 2 +-
 spec/requests/embedded_shopfronts_headers_spec.rb             | 2 +-
 .../{authentication_workflow.rb => authentication_helper.rb}  | 4 ++--
 spec/views/spree/shared/_order_details.html.haml_spec.rb      | 2 +-
 101 files changed, 102 insertions(+), 102 deletions(-)
 rename spec/support/request/{authentication_workflow.rb => authentication_helper.rb} (94%)

diff --git a/spec/controllers/admin/column_preferences_controller_spec.rb b/spec/controllers/admin/column_preferences_controller_spec.rb
index acc3c194a5..53f2d12fda 100644
--- a/spec/controllers/admin/column_preferences_controller_spec.rb
+++ b/spec/controllers/admin/column_preferences_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::ColumnPreferencesController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "bulk_update" do
     let!(:user1) { create(:user) }
diff --git a/spec/controllers/admin/customers_controller_spec.rb b/spec/controllers/admin/customers_controller_spec.rb
index 8e344879a2..b439cc7c9c 100644
--- a/spec/controllers/admin/customers_controller_spec.rb
+++ b/spec/controllers/admin/customers_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::CustomersController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "index" do
     let(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/controllers/admin/inventory_items_controller_spec.rb b/spec/controllers/admin/inventory_items_controller_spec.rb
index 9fce5711a6..2c1b3cfd9d 100644
--- a/spec/controllers/admin/inventory_items_controller_spec.rb
+++ b/spec/controllers/admin/inventory_items_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::InventoryItemsController, type: :controller do
-  # include AuthenticationWorkflow
+  # include AuthenticationHelper
 
   describe "create" do
     context "json" do
diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb
index 0bc63e3cb8..19b4f8acc0 100644
--- a/spec/controllers/admin/proxy_orders_controller_spec.rb
+++ b/spec/controllers/admin/proxy_orders_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::ProxyOrdersController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe 'cancel' do
     let!(:user) { create(:user, enterprise_limit: 10) }
diff --git a/spec/controllers/admin/schedules_controller_spec.rb b/spec/controllers/admin/schedules_controller_spec.rb
index 8a0ac86c78..0648574642 100644
--- a/spec/controllers/admin/schedules_controller_spec.rb
+++ b/spec/controllers/admin/schedules_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::SchedulesController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "index" do
     let!(:coordinated_order_cycle) { create(:simple_order_cycle) }
diff --git a/spec/controllers/admin/subscription_line_items_controller_spec.rb b/spec/controllers/admin/subscription_line_items_controller_spec.rb
index d60c581ab5..6df2a71f53 100644
--- a/spec/controllers/admin/subscription_line_items_controller_spec.rb
+++ b/spec/controllers/admin/subscription_line_items_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::SubscriptionLineItemsController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "build" do
     let(:user) { create(:user) }
diff --git a/spec/controllers/admin/subscriptions_controller_spec.rb b/spec/controllers/admin/subscriptions_controller_spec.rb
index 7eb11807bf..1aeb87ddef 100644
--- a/spec/controllers/admin/subscriptions_controller_spec.rb
+++ b/spec/controllers/admin/subscriptions_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::SubscriptionsController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include OpenFoodNetwork::EmailHelper
 
   describe 'index' do
diff --git a/spec/controllers/admin/variant_overrides_controller_spec.rb b/spec/controllers/admin/variant_overrides_controller_spec.rb
index 4690dba35b..721152c45f 100644
--- a/spec/controllers/admin/variant_overrides_controller_spec.rb
+++ b/spec/controllers/admin/variant_overrides_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Admin::VariantOverridesController, type: :controller do
-  # include AuthenticationWorkflow
+  # include AuthenticationHelper
 
   describe "bulk_update" do
     context "json" do
diff --git a/spec/controllers/api/customers_controller_spec.rb b/spec/controllers/api/customers_controller_spec.rb
index cab5b2e1e1..25fc52cc09 100644
--- a/spec/controllers/api/customers_controller_spec.rb
+++ b/spec/controllers/api/customers_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Api
   describe CustomersController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
     render_views
 
     let(:user) { create(:user) }
diff --git a/spec/controllers/api/enterprise_fees_controller_spec.rb b/spec/controllers/api/enterprise_fees_controller_spec.rb
index 8991e5fcde..b32423fea2 100644
--- a/spec/controllers/api/enterprise_fees_controller_spec.rb
+++ b/spec/controllers/api/enterprise_fees_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Api
   describe EnterpriseFeesController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
 
     let!(:unreferenced_fee) { create(:enterprise_fee) }
     let!(:referenced_fee) { create(:enterprise_fee) }
diff --git a/spec/controllers/api/exchange_products_controller_spec.rb b/spec/controllers/api/exchange_products_controller_spec.rb
index f94089280c..3fa7248198 100644
--- a/spec/controllers/api/exchange_products_controller_spec.rb
+++ b/spec/controllers/api/exchange_products_controller_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Api
   describe ExchangeProductsController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
 
     let(:order_cycle) { create(:order_cycle) }
     let(:exchange) { order_cycle.exchanges.incoming.first }
diff --git a/spec/controllers/api/logos_controller_spec.rb b/spec/controllers/api/logos_controller_spec.rb
index 213ac8bc6e..b4cee3e896 100644
--- a/spec/controllers/api/logos_controller_spec.rb
+++ b/spec/controllers/api/logos_controller_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Api
   describe LogosController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
 
     let(:admin_user) { create(:admin_user) }
     let(:enterprise_owner) { create(:user) }
diff --git a/spec/controllers/api/orders_controller_spec.rb b/spec/controllers/api/orders_controller_spec.rb
index 726756734d..b4d03951fc 100644
--- a/spec/controllers/api/orders_controller_spec.rb
+++ b/spec/controllers/api/orders_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Api
   describe OrdersController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
     render_views
 
     let!(:regular_user) { create(:user) }
diff --git a/spec/controllers/api/product_images_controller_spec.rb b/spec/controllers/api/product_images_controller_spec.rb
index 5015d41b00..44fb239e38 100644
--- a/spec/controllers/api/product_images_controller_spec.rb
+++ b/spec/controllers/api/product_images_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Api
   describe ProductImagesController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
     render_views
 
     describe "uploading an image" do
diff --git a/spec/controllers/api/promo_images_controller_spec.rb b/spec/controllers/api/promo_images_controller_spec.rb
index cce6d08f5f..ac73a1d94b 100644
--- a/spec/controllers/api/promo_images_controller_spec.rb
+++ b/spec/controllers/api/promo_images_controller_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Api
   describe PromoImagesController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
 
     let(:admin_user) { create(:admin_user) }
     let(:enterprise_owner) { create(:user) }
diff --git a/spec/controllers/api/shops_controller_spec.rb b/spec/controllers/api/shops_controller_spec.rb
index a90f606f57..08040feea8 100644
--- a/spec/controllers/api/shops_controller_spec.rb
+++ b/spec/controllers/api/shops_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Api::ShopsController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   render_views
 
   context "as a non-authenticated user" do
diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb
index 624fa0c839..7691bd6e72 100644
--- a/spec/controllers/spree/admin/adjustments_controller_spec.rb
+++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   describe Admin::AdjustmentsController, type: :controller do
-    include AuthenticationWorkflow
+    include AuthenticationHelper
 
     before { controller_login_as_admin }
 
diff --git a/spec/controllers/spree/admin/countries_controller_spec.rb b/spec/controllers/spree/admin/countries_controller_spec.rb
index f961a36b22..87a9356f1e 100644
--- a/spec/controllers/spree/admin/countries_controller_spec.rb
+++ b/spec/controllers/spree/admin/countries_controller_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Spree
   module Admin
     describe CountriesController, type: :controller do
-      include AuthenticationWorkflow
+      include AuthenticationHelper
 
       describe "#update" do
         before { controller_login_as_admin }
diff --git a/spec/controllers/spree/admin/image_settings_controller_spec.rb b/spec/controllers/spree/admin/image_settings_controller_spec.rb
index 2084dea1b3..20bdd9dae0 100644
--- a/spec/controllers/spree/admin/image_settings_controller_spec.rb
+++ b/spec/controllers/spree/admin/image_settings_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Admin::ImageSettingsController do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before { controller_login_as_admin }
 
diff --git a/spec/controllers/spree/admin/mail_methods_controller_spec.rb b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
index 410bb5c8ee..f7aa10959b 100644
--- a/spec/controllers/spree/admin/mail_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Admin::MailMethodsController do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before { controller_login_as_admin }
 
diff --git a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
index e4cc3a1c33..bc0c135505 100644
--- a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "#update" do
     context "adding customer details via newly created admin order" do
diff --git a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
index 1567bd8127..4cc170872b 100644
--- a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
+++ b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Spree
   module Admin
     describe ReturnAuthorizationsController, type: :controller do
-      include AuthenticationWorkflow
+      include AuthenticationHelper
 
       let(:order) do
         create(:order, :with_line_item, :completed,
diff --git a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
index 2125281bcf..05aefff048 100644
--- a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
+++ b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module Spree
   module Admin
     describe ShippingCategoriesController, type: :controller do
-      include AuthenticationWorkflow
+      include AuthenticationHelper
 
       describe "#create and #update" do
         before { controller_login_as_admin }
diff --git a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
index a78a24700e..f209e87a81 100644
--- a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Admin::ShippingMethodsController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "#update" do
     let(:shipping_method) { create(:shipping_method) }
diff --git a/spec/controllers/spree/users_controller_spec.rb b/spec/controllers/spree/users_controller_spec.rb
index 50ac3ebf6f..5210c1717a 100644
--- a/spec/controllers/spree/users_controller_spec.rb
+++ b/spec/controllers/spree/users_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::UsersController, type: :controller do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "show" do
     let!(:u1) { create(:user) }
diff --git a/spec/features/admin/adjustments_spec.rb b/spec/features/admin/adjustments_spec.rb
index 511f8a91bc..5911e602c5 100644
--- a/spec/features/admin/adjustments_spec.rb
+++ b/spec/features/admin/adjustments_spec.rb
@@ -4,7 +4,7 @@ feature '
     As an administrator
     I want to manage adjustments on orders
 ', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let!(:user) { create(:user) }
diff --git a/spec/features/admin/authentication_spec.rb b/spec/features/admin/authentication_spec.rb
index a7add975f2..f9401ad192 100644
--- a/spec/features/admin/authentication_spec.rb
+++ b/spec/features/admin/authentication_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature "Authentication", js: true do
   include UIComponentHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let(:user) { create(:user, password: "password", password_confirmation: "password") }
diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index a17d933f80..efe3a3ed7e 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -5,7 +5,7 @@ feature '
   I want to be able to manage orders in bulk
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   context "listing orders" do
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index e7ed955cc7..553e2182aa 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -5,7 +5,7 @@ feature '
   I want to be able to manage products in bulk
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   describe "listing products" do
diff --git a/spec/features/admin/configuration/general_settings_spec.rb b/spec/features/admin/configuration/general_settings_spec.rb
index 6791e93a05..e676f32801 100644
--- a/spec/features/admin/configuration/general_settings_spec.rb
+++ b/spec/features/admin/configuration/general_settings_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "General Settings" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before(:each) do
     login_as_admin_and_visit spree.admin_dashboard_path
diff --git a/spec/features/admin/configuration/image_settings_spec.rb b/spec/features/admin/configuration/image_settings_spec.rb
index 6a2ede12da..5c87e8e6ad 100644
--- a/spec/features/admin/configuration/image_settings_spec.rb
+++ b/spec/features/admin/configuration/image_settings_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "image settings" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before do
     login_as_admin_and_visit spree.admin_dashboard_path
diff --git a/spec/features/admin/configuration/mail_methods_spec.rb b/spec/features/admin/configuration/mail_methods_spec.rb
index 5063335c21..3296ca0317 100644
--- a/spec/features/admin/configuration/mail_methods_spec.rb
+++ b/spec/features/admin/configuration/mail_methods_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Mail Methods" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before(:each) do
     login_as_admin_and_visit spree.admin_general_settings_path
diff --git a/spec/features/admin/configuration/states_spec.rb b/spec/features/admin/configuration/states_spec.rb
index 6aaa117bbc..e3a761088d 100755
--- a/spec/features/admin/configuration/states_spec.rb
+++ b/spec/features/admin/configuration/states_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "States" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let!(:country) { create(:country) }
 
diff --git a/spec/features/admin/configuration/tax_categories_spec.rb b/spec/features/admin/configuration/tax_categories_spec.rb
index 5b3041caf2..54832143b3 100644
--- a/spec/features/admin/configuration/tax_categories_spec.rb
+++ b/spec/features/admin/configuration/tax_categories_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Tax Categories" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before(:each) do
     login_as_admin_and_visit spree.admin_general_settings_path
diff --git a/spec/features/admin/configuration/tax_rates_spec.rb b/spec/features/admin/configuration/tax_rates_spec.rb
index 4211ce1f56..a3cb9fc83e 100644
--- a/spec/features/admin/configuration/tax_rates_spec.rb
+++ b/spec/features/admin/configuration/tax_rates_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Tax Rates" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let!(:calculator) { create(:calculator_per_item, calculable: create(:order)) }
   let!(:tax_rate) { create(:tax_rate, calculator: calculator) }
diff --git a/spec/features/admin/configuration/taxonomies_spec.rb b/spec/features/admin/configuration/taxonomies_spec.rb
index ffa82fb0fd..317d49c846 100644
--- a/spec/features/admin/configuration/taxonomies_spec.rb
+++ b/spec/features/admin/configuration/taxonomies_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Taxonomies" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before(:each) do
     login_as_admin_and_visit spree.admin_general_settings_path
diff --git a/spec/features/admin/configuration/zones_spec.rb b/spec/features/admin/configuration/zones_spec.rb
index 9403d080af..75d05936f3 100644
--- a/spec/features/admin/configuration/zones_spec.rb
+++ b/spec/features/admin/configuration/zones_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Zones" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before do
     login_as_admin
diff --git a/spec/features/admin/content_spec.rb b/spec/features/admin/content_spec.rb
index cc9d8af55c..225965aed0 100644
--- a/spec/features/admin/content_spec.rb
+++ b/spec/features/admin/content_spec.rb
@@ -4,7 +4,7 @@ feature '
   As a site administrator
   I want to configure the site content
 ' do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   before do
diff --git a/spec/features/admin/customers_spec.rb b/spec/features/admin/customers_spec.rb
index 49338715bb..4674504e2a 100644
--- a/spec/features/admin/customers_spec.rb
+++ b/spec/features/admin/customers_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Customers' do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   context "as an enterprise user" do
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index a5732a67b4..7b16c71ed4 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want to manage enterprise fees
 ', js: true do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let!(:tax_category_gst) { create(:tax_category, name: 'GST') }
 
diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb
index 4cab98f0e7..ff19b44f17 100644
--- a/spec/features/admin/enterprise_groups_spec.rb
+++ b/spec/features/admin/enterprise_groups_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want to manage enterprise groups
 ' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before(:each) do
     login_to_admin_section
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index cb9bbaea1a..3dd00acbae 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -5,7 +5,7 @@ feature '
   I want to manage relationships between enterprises
 ', js: true do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   context "as a site administrator" do
     before { login_as_admin }
diff --git a/spec/features/admin/enterprise_roles_spec.rb b/spec/features/admin/enterprise_roles_spec.rb
index ff29207aeb..2e7c2775a1 100644
--- a/spec/features/admin/enterprise_roles_spec.rb
+++ b/spec/features/admin/enterprise_roles_spec.rb
@@ -4,7 +4,7 @@ feature '
   As an Administrator
   I want to manage relationships between users and enterprises
 ', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include OpenFoodNetwork::EmailHelper
 
diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb
index 9d6aa54535..30b3907970 100644
--- a/spec/features/admin/enterprise_user_spec.rb
+++ b/spec/features/admin/enterprise_user_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want to setup users to manage an enterprise
 ' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let!(:user) { create(:user) }
   let!(:supplier1) { create(:supplier_enterprise, name: 'Supplier 1') }
diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb
index 302db2d291..0d4644f8c7 100644
--- a/spec/features/admin/enterprises/images_spec.rb
+++ b/spec/features/admin/enterprises/images_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 feature "Managing enterprise images" do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   context "as an Enterprise user", js: true do
     let(:enterprise_user) { create(:user, enterprise_limit: 1) }
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index 8afc7acb7e..550879d3c1 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Enterprises Index' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   context "as an admin user" do
     scenario "listing enterprises" do
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index dc5d1e5458..be7e9ddfa9 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want to manage enterprises
 ' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   scenario "viewing an enterprise" do
     e = create(:enterprise)
diff --git a/spec/features/admin/external_services_spec.rb b/spec/features/admin/external_services_spec.rb
index 3a9a72610e..ceeef4c556 100644
--- a/spec/features/admin/external_services_spec.rb
+++ b/spec/features/admin/external_services_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'External services' do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   describe "bugherd" do
     before do
diff --git a/spec/features/admin/image_settings_spec.rb b/spec/features/admin/image_settings_spec.rb
index 9968952798..83e584a0ce 100644
--- a/spec/features/admin/image_settings_spec.rb
+++ b/spec/features/admin/image_settings_spec.rb
@@ -4,7 +4,7 @@ feature '
     As an admin
     I want to manage image formats
 ' do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   before(:all) do
diff --git a/spec/features/admin/multilingual_spec.rb b/spec/features/admin/multilingual_spec.rb
index 33ad4d1d03..32e4684936 100644
--- a/spec/features/admin/multilingual_spec.rb
+++ b/spec/features/admin/multilingual_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Multilingual', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   let(:admin_role) { Spree::Role.find_or_create_by!(name: 'admin') }
   let(:admin_user) { create(:user) }
diff --git a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
index b6227fe95a..237764eaae 100644
--- a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
+++ b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to create/update complex order cycles with a specific time
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let(:order_cycle_opening_time) { Time.zone.local(2040, 11, 0o6, 0o6, 0o0, 0o0).strftime("%F %T %z") }
diff --git a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
index ce9d5f0914..ef0d1c5f95 100644
--- a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to manage complex order cycles
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   scenario "editing an order cycle with an exchange between the same enterprise" do
diff --git a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
index 44c05037e5..c13e0dd8b1 100644
--- a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to manage complex order cycles
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   describe "editing an order cycle with multiple pages of products", js: true do
diff --git a/spec/features/admin/order_cycles/complex_editing_spec.rb b/spec/features/admin/order_cycles/complex_editing_spec.rb
index d93999ab3b..4b9aa275fc 100644
--- a/spec/features/admin/order_cycles/complex_editing_spec.rb
+++ b/spec/features/admin/order_cycles/complex_editing_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to manage complex order cycles
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   scenario "editing an order cycle" do
diff --git a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
index d76ba551c2..dfa2946d97 100644
--- a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
+++ b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to create/update complex order cycles with a specific time
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let(:order_cycle_opening_time) { Time.zone.local(2040, 11, 0o6, 0o6, 0o0, 0o0).strftime("%F %T %z") }
diff --git a/spec/features/admin/order_cycles/list_spec.rb b/spec/features/admin/order_cycles/list_spec.rb
index 17bda44e4f..a7a4890511 100644
--- a/spec/features/admin/order_cycles/list_spec.rb
+++ b/spec/features/admin/order_cycles/list_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to list and filter order cycles
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   scenario "listing and filtering order cycles" do
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb
index 02d49be349..1f22485f4c 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/features/admin/order_cycles/simple_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to manage simple order cycles
 ', js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   scenario "updating many order cycle opening/closing times at once", js: true do
diff --git a/spec/features/admin/order_cycles_complex_nav_check_spec.rb b/spec/features/admin/order_cycles_complex_nav_check_spec.rb
index 12c90e79a1..1814d9f5af 100644
--- a/spec/features/admin/order_cycles_complex_nav_check_spec.rb
+++ b/spec/features/admin/order_cycles_complex_nav_check_spec.rb
@@ -6,7 +6,7 @@ feature '
     As an administrator
     I want to be alerted when I navigate away from a dirty order cycle form
 ', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   scenario "alert when navigating away from dirty form" do
     # Given a 'complex' order cycle form
diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb
index 08616352dd..15fd46692a 100644
--- a/spec/features/admin/order_print_ticket_spec.rb
+++ b/spec/features/admin/order_print_ticket_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to print a ticket for an order
 ', js: true do
   include CheckoutHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include ActionView::Helpers::NumberHelper
 
   context "as an enterprise manager" do
diff --git a/spec/features/admin/order_spec.rb b/spec/features/admin/order_spec.rb
index be70b5392f..bfef4f6931 100644
--- a/spec/features/admin/order_spec.rb
+++ b/spec/features/admin/order_spec.rb
@@ -7,7 +7,7 @@ feature '
     I want to create and edit orders
 ', js: true do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let(:user) { create(:user) }
   let(:product) { create(:simple_product) }
diff --git a/spec/features/admin/orders_spec.rb b/spec/features/admin/orders_spec.rb
index df1690d59b..8510ff5943 100644
--- a/spec/features/admin/orders_spec.rb
+++ b/spec/features/admin/orders_spec.rb
@@ -6,7 +6,7 @@ feature '
     As an administrator
     I want to manage orders
 ', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb
index 79b4ebf55c..3a4a3feb7d 100644
--- a/spec/features/admin/overview_spec.rb
+++ b/spec/features/admin/overview_spec.rb
@@ -5,7 +5,7 @@ feature '
   I want to be given information about the state of my enterprises, products and order cycles
 ', js: true do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include ::Spree::TestingSupport::AuthorizationHelpers
 
   context "as an enterprise user" do
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index f6b8f798c2..5ef9f6fa4b 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want to be able to set a distributor on each payment method
 ' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   background do
     @distributors = (1..3).map { create(:distributor_enterprise) }
diff --git a/spec/features/admin/payments_spec.rb b/spec/features/admin/payments_spec.rb
index f9cac18498..851843dc30 100644
--- a/spec/features/admin/payments_spec.rb
+++ b/spec/features/admin/payments_spec.rb
@@ -4,7 +4,7 @@ feature '
     As an admin
     I want to manage payments
 ' do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let(:order) { create(:completed_order_with_fees) }
 
diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb
index 85669fa9ed..a4bae3794a 100644
--- a/spec/features/admin/product_import_spec.rb
+++ b/spec/features/admin/product_import_spec.rb
@@ -3,7 +3,7 @@ require 'open_food_network/permissions'
 
 feature "Product Import", js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let!(:admin) { create(:admin_user) }
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index 61f1a45c6e..dd9bfafd2c 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want to set a supplier and distributor(s) for a product
 ' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let!(:taxon) { create(:taxon) }
   let!(:stock_location) { create(:stock_location, backorderable_default: false) }
diff --git a/spec/features/admin/properties_spec.rb b/spec/features/admin/properties_spec.rb
index 958aa87867..634f3fd436 100644
--- a/spec/features/admin/properties_spec.rb
+++ b/spec/features/admin/properties_spec.rb
@@ -6,7 +6,7 @@ feature '
     As an admin
     I want to manage product properties
 ' do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   scenario "creating and editing a property" do
     login_as_admin_and_visit spree.admin_properties_path
diff --git a/spec/features/admin/reports/packing_report_spec.rb b/spec/features/admin/reports/packing_report_spec.rb
index 79378a5040..41035bada1 100644
--- a/spec/features/admin/reports/packing_report_spec.rb
+++ b/spec/features/admin/reports/packing_report_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 feature "Packing Reports", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let(:distributor) { create(:distributor_enterprise) }
diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb
index 75da617a8f..265d8cb97d 100644
--- a/spec/features/admin/reports_spec.rb
+++ b/spec/features/admin/reports_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want numbers, all the numbers!
 ' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   context "Permissions for different reports" do
     context "As an enterprise user" do
diff --git a/spec/features/admin/schedules_spec.rb b/spec/features/admin/schedules_spec.rb
index 1d70d1bf34..41c963e403 100644
--- a/spec/features/admin/schedules_spec.rb
+++ b/spec/features/admin/schedules_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Schedules', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   context "as an enterprise user" do
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index fb57f2f898..560fe2f357 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'shipping methods' do
   include WebHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   before :each do
     @shipping_method = create(:shipping_method)
diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/features/admin/subscriptions_spec.rb
index 604126cf45..4278018aa2 100644
--- a/spec/features/admin/subscriptions_spec.rb
+++ b/spec/features/admin/subscriptions_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Subscriptions' do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   context "as an enterprise user", js: true do
diff --git a/spec/features/admin/tag_rules_spec.rb b/spec/features/admin/tag_rules_spec.rb
index 710e567b04..0f3f035379 100644
--- a/spec/features/admin/tag_rules_spec.rb
+++ b/spec/features/admin/tag_rules_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Tag Rules', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let!(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/features/admin/tax_settings_spec.rb b/spec/features/admin/tax_settings_spec.rb
index e496d0619a..0226ccb5f7 100644
--- a/spec/features/admin/tax_settings_spec.rb
+++ b/spec/features/admin/tax_settings_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Account and Billing Settings' do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   describe "updating" do
diff --git a/spec/features/admin/users_spec.rb b/spec/features/admin/users_spec.rb
index ae1fa8da4f..94cb4b881f 100644
--- a/spec/features/admin/users_spec.rb
+++ b/spec/features/admin/users_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 feature "Managing users" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include OpenFoodNetwork::EmailHelper
 
   context "as super-admin" do
diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index d540a3518e..80571f5488 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -6,7 +6,7 @@ feature "
   Without affecting other hubs that share the same products
 ", js: true do
   include AdminHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   context "as the manager of a hub" do
diff --git a/spec/features/admin/variants_spec.rb b/spec/features/admin/variants_spec.rb
index 163cc78d7e..2b5df3c0aa 100644
--- a/spec/features/admin/variants_spec.rb
+++ b/spec/features/admin/variants_spec.rb
@@ -4,7 +4,7 @@ feature '
     As an admin
     I want to manage product variants
 ' do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   scenario "creating a new variant" do
diff --git a/spec/features/consumer/account/cards_spec.rb b/spec/features/consumer/account/cards_spec.rb
index c0a5da2150..e364d8057f 100644
--- a/spec/features/consumer/account/cards_spec.rb
+++ b/spec/features/consumer/account/cards_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "Credit Cards", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   describe "as a logged in user" do
     let(:user) { create(:user) }
     let!(:customer) { create(:customer, user: user) }
diff --git a/spec/features/consumer/account/settings_spec.rb b/spec/features/consumer/account/settings_spec.rb
index 16eeade5a1..77012ee3d8 100644
--- a/spec/features/consumer/account/settings_spec.rb
+++ b/spec/features/consumer/account/settings_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "Account Settings", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include OpenFoodNetwork::EmailHelper
 
   describe "as a logged in user" do
diff --git a/spec/features/consumer/account_spec.rb b/spec/features/consumer/account_spec.rb
index bdba76c971..401c8fbd33 100644
--- a/spec/features/consumer/account_spec.rb
+++ b/spec/features/consumer/account_spec.rb
@@ -6,7 +6,7 @@ feature '
     and view any outstanding balance.
 ', js: true do
   include UIComponentHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let(:user) { create(:user) }
   let!(:distributor1) { create(:distributor_enterprise) }
diff --git a/spec/features/consumer/authentication_spec.rb b/spec/features/consumer/authentication_spec.rb
index c172f40f38..a98d7183b0 100644
--- a/spec/features/consumer/authentication_spec.rb
+++ b/spec/features/consumer/authentication_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "Authentication", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include UIComponentHelper
   include OpenFoodNetwork::EmailHelper
 
diff --git a/spec/features/consumer/groups_spec.rb b/spec/features/consumer/groups_spec.rb
index dc9a3e4b75..3284b709c8 100644
--- a/spec/features/consumer/groups_spec.rb
+++ b/spec/features/consumer/groups_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Groups', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include UIComponentHelper
 
   let(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/features/consumer/multilingual_spec.rb b/spec/features/consumer/multilingual_spec.rb
index a62a1b6ba3..1a54a813d3 100644
--- a/spec/features/consumer/multilingual_spec.rb
+++ b/spec/features/consumer/multilingual_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Multilingual', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
   include UIComponentHelper
diff --git a/spec/features/consumer/producers_spec.rb b/spec/features/consumer/producers_spec.rb
index cf49db00df..f9e03d5f87 100644
--- a/spec/features/consumer/producers_spec.rb
+++ b/spec/features/consumer/producers_spec.rb
@@ -5,7 +5,7 @@ feature '
     I want to see a list of producers
     So that I can shop at hubs distributing their products
 ', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include UIComponentHelper
 
diff --git a/spec/features/consumer/registration_spec.rb b/spec/features/consumer/registration_spec.rb
index ddb93298c7..3d7cbb0a0f 100644
--- a/spec/features/consumer/registration_spec.rb
+++ b/spec/features/consumer/registration_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "Registration", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   describe "Registering a Profile" do
diff --git a/spec/features/consumer/shopping/cart_spec.rb b/spec/features/consumer/shopping/cart_spec.rb
index 7d156ef596..5339aa99f7 100644
--- a/spec/features/consumer/shopping/cart_spec.rb
+++ b/spec/features/consumer/shopping/cart_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "full-page cart", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
   include UIComponentHelper
diff --git a/spec/features/consumer/shopping/checkout_auth_spec.rb b/spec/features/consumer/shopping/checkout_auth_spec.rb
index 4631e636ce..acbbabd970 100644
--- a/spec/features/consumer/shopping/checkout_auth_spec.rb
+++ b/spec/features/consumer/shopping/checkout_auth_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "As a consumer I want to check out my cart", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
   include CheckoutWorkflow
diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb
index 7f665e6351..dd79d95958 100644
--- a/spec/features/consumer/shopping/checkout_spec.rb
+++ b/spec/features/consumer/shopping/checkout_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "As a consumer I want to check out my cart", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include ShopWorkflow
   include CheckoutWorkflow
   include WebHelper
diff --git a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
index 445a92186f..075209769e 100644
--- a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
+++ b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature "Using embedded shopfront functionality", js: true do
   include OpenFoodNetwork::EmbeddedPagesHelper
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
   include CheckoutWorkflow
diff --git a/spec/features/consumer/shopping/orders_spec.rb b/spec/features/consumer/shopping/orders_spec.rb
index 1d5221e257..f7b0a832c5 100644
--- a/spec/features/consumer/shopping/orders_spec.rb
+++ b/spec/features/consumer/shopping/orders_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "Order Management", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include OpenFoodNetwork::EmailHelper
 
   describe "viewing a completed order" do
diff --git a/spec/features/consumer/shopping/products_spec.rb b/spec/features/consumer/shopping/products_spec.rb
index 0846845021..91393e3213 100644
--- a/spec/features/consumer/shopping/products_spec.rb
+++ b/spec/features/consumer/shopping/products_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "As a consumer I want to view products", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
   include UIComponentHelper
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index 9dd9ebbc65..f55c3aded5 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "As a consumer I want to shop with a distributor", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
   include UIComponentHelper
diff --git a/spec/features/consumer/shopping/variant_overrides_spec.rb b/spec/features/consumer/shopping/variant_overrides_spec.rb
index 9c7ca0a5d1..d89990dc55 100644
--- a/spec/features/consumer/shopping/variant_overrides_spec.rb
+++ b/spec/features/consumer/shopping/variant_overrides_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "shopping with variant overrides defined", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
   include ShopWorkflow
   include CheckoutWorkflow
diff --git a/spec/features/consumer/shops_spec.rb b/spec/features/consumer/shops_spec.rb
index a9c262817c..80483840fc 100644
--- a/spec/features/consumer/shops_spec.rb
+++ b/spec/features/consumer/shops_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Shops', js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include UIComponentHelper
   include WebHelper
 
diff --git a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
index e646884e6e..af91f3a917 100644
--- a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
+++ b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'open_food_network/orders_and_fulfillments_report'
 
 describe OpenFoodNetwork::OrdersAndFulfillmentsReport do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let(:distributor) { create(:distributor_enterprise) }
   let(:order_cycle) { create(:simple_order_cycle) }
diff --git a/spec/lib/open_food_network/packing_report_spec.rb b/spec/lib/open_food_network/packing_report_spec.rb
index 197224d5d8..462baf0b58 100644
--- a/spec/lib/open_food_network/packing_report_spec.rb
+++ b/spec/lib/open_food_network/packing_report_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'open_food_network/packing_report'
 
-include AuthenticationWorkflow
+include AuthenticationHelper
 
 module OpenFoodNetwork
   describe PackingReport do
diff --git a/spec/requests/checkout/stripe_connect_spec.rb b/spec/requests/checkout/stripe_connect_spec.rb
index 75ca23c8c4..4bc09fc74f 100644
--- a/spec/requests/checkout/stripe_connect_spec.rb
+++ b/spec/requests/checkout/stripe_connect_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "checking out an order with a Stripe Connect payment method", type: :request do
   include ShopWorkflow
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include OpenFoodNetwork::ApiHelper
 
   let!(:order_cycle) { create(:simple_order_cycle) }
diff --git a/spec/requests/checkout/stripe_sca_spec.rb b/spec/requests/checkout/stripe_sca_spec.rb
index 95a5b29554..ad03211b1a 100644
--- a/spec/requests/checkout/stripe_sca_spec.rb
+++ b/spec/requests/checkout/stripe_sca_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe "checking out an order with a Stripe SCA payment method", type: :request do
   include ShopWorkflow
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include OpenFoodNetwork::ApiHelper
 
   let!(:order_cycle) { create(:simple_order_cycle) }
diff --git a/spec/requests/embedded_shopfronts_headers_spec.rb b/spec/requests/embedded_shopfronts_headers_spec.rb
index f04de87b86..1a6f2a3a01 100644
--- a/spec/requests/embedded_shopfronts_headers_spec.rb
+++ b/spec/requests/embedded_shopfronts_headers_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "setting response headers for embedded shopfronts", type: :request do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
 
   let(:enterprise) { create(:distributor_enterprise) }
   let(:user) { enterprise.owner }
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_helper.rb
similarity index 94%
rename from spec/support/request/authentication_workflow.rb
rename to spec/support/request/authentication_helper.rb
index a10c858508..c60f7b92ba 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_helper.rb
@@ -1,4 +1,4 @@
-module AuthenticationWorkflow
+module AuthenticationHelper
   include Warden::Test::Helpers
 
   def login_as(user)
@@ -46,7 +46,7 @@ module AuthenticationWorkflow
 end
 
 RSpec.configure do |config|
-  config.extend AuthenticationWorkflow, type: :feature
+  config.extend AuthenticationHelper, type: :feature
 
   # rspec-rails 3 will no longer automatically infer an example group's spec type
   # from the file location. You can explicitly opt-in to the feature using this
diff --git a/spec/views/spree/shared/_order_details.html.haml_spec.rb b/spec/views/spree/shared/_order_details.html.haml_spec.rb
index ac6d788f24..60e95ac0f6 100644
--- a/spec/views/spree/shared/_order_details.html.haml_spec.rb
+++ b/spec/views/spree/shared/_order_details.html.haml_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe "spree/shared/_order_details.html.haml" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   helper Spree::BaseHelper
 
   let(:order) { create(:completed_order_with_fees) }

From d6a5ad70a8f9b201c52b45d9cac961935fc6324f Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 14:17:33 +0100
Subject: [PATCH 204/340] Adapt specs in order mgmt engine to new
 authentication helper

---
 .../spec/features/order_management/reports/bulk_coop_spec.rb | 5 ++---
 .../reports/enterprise_fee_summaries_spec.rb                 | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/order_management/spec/features/order_management/reports/bulk_coop_spec.rb b/engines/order_management/spec/features/order_management/reports/bulk_coop_spec.rb
index 29caf17a15..2cbc464c75 100644
--- a/engines/order_management/spec/features/order_management/reports/bulk_coop_spec.rb
+++ b/engines/order_management/spec/features/order_management/reports/bulk_coop_spec.rb
@@ -3,12 +3,11 @@
 require "spec_helper"
 
 feature "bulk coop" do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   scenario "bulk co-op report" do
-    quick_login_as_admin
-    visit spree.admin_reports_path
+    login_as_admin_and_visit spree.admin_reports_path
     click_link 'Bulk Co-Op'
     click_button 'Generate Report'
 
diff --git a/engines/order_management/spec/features/order_management/reports/enterprise_fee_summaries_spec.rb b/engines/order_management/spec/features/order_management/reports/enterprise_fee_summaries_spec.rb
index 553d78d093..8d66b93bfc 100644
--- a/engines/order_management/spec/features/order_management/reports/enterprise_fee_summaries_spec.rb
+++ b/engines/order_management/spec/features/order_management/reports/enterprise_fee_summaries_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 feature "enterprise fee summaries", js: true do
-  include AuthenticationWorkflow
+  include AuthenticationHelper
   include WebHelper
 
   let!(:distributor) { create(:distributor_enterprise) }

From 95a9ca77753f0d6dc2aac5d3d004b23dea61d3c7 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 14:43:22 +0100
Subject: [PATCH 205/340] Remove redundant method, login_as is the name of the
 test helper in warden

---
 spec/support/request/authentication_helper.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spec/support/request/authentication_helper.rb b/spec/support/request/authentication_helper.rb
index c60f7b92ba..cde0e51912 100644
--- a/spec/support/request/authentication_helper.rb
+++ b/spec/support/request/authentication_helper.rb
@@ -1,10 +1,6 @@
 module AuthenticationHelper
   include Warden::Test::Helpers
 
-  def login_as(user)
-    login_as user
-  end
-
   def login_as_admin
     admin_role = Spree::Role.find_or_create_by!(name: 'admin')
     admin_user = create(:user,

From 4df81f0864c70ec2a220f40920e544cd3017f1b5 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 14:47:02 +0100
Subject: [PATCH 206/340] Remove unnecesasary and now broken require statement
 from spec and fix rubocop todo files

---
 .rubocop_manual_todo.yml                               | 2 +-
 .rubocop_todo.yml                                      | 2 +-
 spec/controllers/spree/credit_cards_controller_spec.rb | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index 446be30aec..286b945692 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -644,7 +644,7 @@ Metrics/MethodLength:
   - spec/features/consumer/shopping/checkout_paypal_spec.rb
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/models/product_importer_spec.rb
-  - spec/support/request/authentication_workflow.rb
+  - spec/support/request/authentication_helper.rb
 
 Metrics/ClassLength:
   Max: 100
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a0c6a0b30c..c88c48b817 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1338,7 +1338,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/support/performance_helper.rb'
     - 'spec/support/products_helper.rb'
     - 'spec/support/request/admin_helper.rb'
-    - 'spec/support/request/authentication_workflow.rb'
+    - 'spec/support/request/authentication_helper.rb'
     - 'spec/support/request/checkout_workflow.rb'
     - 'spec/support/request/cookie_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
diff --git a/spec/controllers/spree/credit_cards_controller_spec.rb b/spec/controllers/spree/credit_cards_controller_spec.rb
index e98956ae32..fd15916f0f 100644
--- a/spec/controllers/spree/credit_cards_controller_spec.rb
+++ b/spec/controllers/spree/credit_cards_controller_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'support/request/authentication_workflow'
 
 describe Spree::CreditCardsController, type: :controller do
   let(:user) { create(:user) }

From 27ace50eb712f7dbdd76b86eedd7c5b6d2aac3d9 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 15:23:54 +0100
Subject: [PATCH 207/340] Fix general settings path in specs

---
 spec/features/admin/configuration/mail_methods_spec.rb   | 2 +-
 spec/features/admin/configuration/tax_categories_spec.rb | 2 +-
 spec/features/admin/configuration/tax_rates_spec.rb      | 2 +-
 spec/features/admin/configuration/taxonomies_spec.rb     | 2 +-
 spec/features/admin/configuration/zones_spec.rb          | 2 +-
 spec/features/admin/content_spec.rb                      | 2 +-
 spec/features/admin/enterprise_fees_spec.rb              | 2 +-
 spec/features/admin/payment_method_spec.rb               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/features/admin/configuration/mail_methods_spec.rb b/spec/features/admin/configuration/mail_methods_spec.rb
index 3296ca0317..27d044d894 100644
--- a/spec/features/admin/configuration/mail_methods_spec.rb
+++ b/spec/features/admin/configuration/mail_methods_spec.rb
@@ -4,7 +4,7 @@ describe "Mail Methods" do
   include AuthenticationHelper
 
   before(:each) do
-    login_as_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.edit_admin_general_settings_path
   end
 
   context "edit" do
diff --git a/spec/features/admin/configuration/tax_categories_spec.rb b/spec/features/admin/configuration/tax_categories_spec.rb
index 54832143b3..9e5d2f3823 100644
--- a/spec/features/admin/configuration/tax_categories_spec.rb
+++ b/spec/features/admin/configuration/tax_categories_spec.rb
@@ -4,7 +4,7 @@ describe "Tax Categories" do
   include AuthenticationHelper
 
   before(:each) do
-    login_as_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.edit_admin_general_settings_path
   end
 
   context "admin visiting tax categories list" do
diff --git a/spec/features/admin/configuration/tax_rates_spec.rb b/spec/features/admin/configuration/tax_rates_spec.rb
index a3cb9fc83e..56ff8fac73 100644
--- a/spec/features/admin/configuration/tax_rates_spec.rb
+++ b/spec/features/admin/configuration/tax_rates_spec.rb
@@ -7,7 +7,7 @@ describe "Tax Rates" do
   let!(:tax_rate) { create(:tax_rate, calculator: calculator) }
 
   before do
-    login_as_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.edit_admin_general_settings_path
   end
 
   # Regression test for #535
diff --git a/spec/features/admin/configuration/taxonomies_spec.rb b/spec/features/admin/configuration/taxonomies_spec.rb
index 317d49c846..f26b320be3 100644
--- a/spec/features/admin/configuration/taxonomies_spec.rb
+++ b/spec/features/admin/configuration/taxonomies_spec.rb
@@ -4,7 +4,7 @@ describe "Taxonomies" do
   include AuthenticationHelper
 
   before(:each) do
-    login_as_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.edit_admin_general_settings_path
   end
 
   context "show" do
diff --git a/spec/features/admin/configuration/zones_spec.rb b/spec/features/admin/configuration/zones_spec.rb
index 75d05936f3..1c03ff0941 100644
--- a/spec/features/admin/configuration/zones_spec.rb
+++ b/spec/features/admin/configuration/zones_spec.rb
@@ -9,7 +9,7 @@ describe "Zones" do
   end
 
   scenario "list existing zones" do
-    visit spree.admin_general_settings_path
+    visit spree.edit_admin_general_settings_path
     create(:zone, name: "eastern", description: "zone is eastern")
     create(:zone, name: "western", description: "cool san fran")
 
diff --git a/spec/features/admin/content_spec.rb b/spec/features/admin/content_spec.rb
index 225965aed0..cdc4971839 100644
--- a/spec/features/admin/content_spec.rb
+++ b/spec/features/admin/content_spec.rb
@@ -8,7 +8,7 @@ feature '
   include WebHelper
 
   before do
-    login_as_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.edit_admin_general_settings_path
     click_link 'Content'
   end
 
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index 7b16c71ed4..a525ae854a 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -13,7 +13,7 @@ feature '
     fee = create(:enterprise_fee, name: '$0.50 / kg', fee_type: 'packing', tax_category: tax_category_gst)
     amount = fee.calculator.preferred_amount
 
-    login_as_admin_and_visit spree.admin_general_settings_path
+    login_as_admin_and_visit spree.edit_admin_general_settings_path
     click_link 'Enterprise Fees'
 
     expect(page).to have_select "enterprise_fee_set_collection_attributes_0_enterprise_id"
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index 5ef9f6fa4b..2cdc226bdf 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -13,7 +13,7 @@ feature '
 
   describe "creating a payment method", js: true do
     scenario "assigning a distributor to the payment method" do
-      login_as_admin_and_visit spree.admin_general_settings_path
+      login_as_admin_and_visit spree.edit_admin_general_settings_path
       click_link 'Payment Methods'
       click_link 'New Payment Method'
 

From ecc58cedd974a3ec41e364b06b273135d3df9bc9 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 15:27:03 +0100
Subject: [PATCH 208/340] Fix navigation problem in spec

---
 spec/features/admin/tax_settings_spec.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spec/features/admin/tax_settings_spec.rb b/spec/features/admin/tax_settings_spec.rb
index 0226ccb5f7..5da7384c55 100644
--- a/spec/features/admin/tax_settings_spec.rb
+++ b/spec/features/admin/tax_settings_spec.rb
@@ -5,8 +5,6 @@ feature 'Account and Billing Settings' do
   include WebHelper
 
   describe "updating" do
-    let!(:admin) { create(:admin_user) }
-
     before do
       Spree::Config.set(
         products_require_tax_category: false,
@@ -15,13 +13,9 @@ feature 'Account and Billing Settings' do
       )
     end
 
-    before do
-      login_as_admin
-    end
-
     context "as an admin user" do
       it "loads the page" do
-        click_link "Configuration"
+        login_as_admin_and_visit spree.edit_admin_general_settings_path
         click_link "Tax Settings"
 
         expect(page).to have_unchecked_field 'preferences_products_require_tax_category'
@@ -30,7 +24,7 @@ feature 'Account and Billing Settings' do
       end
 
       it "attributes can be changed" do
-        visit spree.edit_admin_tax_settings_path
+        login_as_admin_and_visit spree.edit_admin_tax_settings_path
 
         check 'preferences_products_require_tax_category'
         check 'preferences_shipment_inc_vat'

From a002ec1894b52ee32ca16d11ff955530e70ba19c Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 15:55:35 +0100
Subject: [PATCH 209/340] Simplify login_as_admin by using existing factory
 admin_user

---
 spec/support/request/authentication_helper.rb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/spec/support/request/authentication_helper.rb b/spec/support/request/authentication_helper.rb
index cde0e51912..f439314e5d 100644
--- a/spec/support/request/authentication_helper.rb
+++ b/spec/support/request/authentication_helper.rb
@@ -2,15 +2,7 @@ module AuthenticationHelper
   include Warden::Test::Helpers
 
   def login_as_admin
-    admin_role = Spree::Role.find_or_create_by!(name: 'admin')
-    admin_user = create(:user,
-                        password: 'passw0rd',
-                        password_confirmation: 'passw0rd',
-                        remember_me: false,
-                        persistence_token: 'pass',
-                        login: 'admin@ofn.org')
-
-    admin_user.spree_roles << admin_role
+    admin_user = create(:admin_user)
     login_as admin_user
     admin_user
   end

From d673f278ce0ecc00df6b504a241c1b89dd5ec25f Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 27 Jul 2020 21:22:37 +0100
Subject: [PATCH 210/340] Add unit test to
 order.charge_shipping_and_payment_fees!

---
 spec/models/spree/order_spec.rb | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 0c2c3d33e5..5c583a5252 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -855,12 +855,39 @@ describe Spree::Order do
         order.state = 'delivery' # payment's previous state
 
         allow(order).to receive(:payment_required?) { true }
-        allow(order).to receive(:charge_shipping_and_payment_fees!)
       end
 
-      it 'calls charge_shipping_and_payment_fees!' do
+      it 'calls charge_shipping_and_payment_fees! and updates totals' do
+        expect(order).to receive(:charge_shipping_and_payment_fees!)
+        expect(order).to receive(:update_totals).at_least(:once)
+
         order.next
-        expect(order).to have_received(:charge_shipping_and_payment_fees!)
+      end
+
+      context "payment's amount" do
+        let(:failed_payment) { create(:payment, order: order, state: 'failed', amount: 100) }
+
+        before do
+          allow(order).to receive(:total) { 120 }
+        end
+
+        it 'is not updated for failed payments' do
+          failed_payment
+
+          order.next
+
+          expect(failed_payment.reload.amount).to eq 100
+        end
+
+        it 'is updated only for pending payments' do
+          pending_payment = create(:payment, order: order, state: 'pending', amount: 80)
+          failed_payment
+
+          order.next
+
+          expect(failed_payment.reload.amount).to eq 100
+          expect(pending_payment.reload.amount).to eq 120
+        end
       end
     end
   end

From d0a7f8e1afe9659dc0625d10a103465d860599de Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2020 23:44:40 +0000
Subject: [PATCH 211/340] Bump unicorn from 5.5.5 to 5.6.0

Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.5 to 5.6.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 422ecd984c..1c1e1b665f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -668,7 +668,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
-    unicorn (5.5.5)
+    unicorn (5.6.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)

From aff8933d25f03aad2c271f54b02c72bd0d80fb3d Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Wed, 29 Jul 2020 00:36:57 +1000
Subject: [PATCH 212/340] Updating translations for config/locales/ca.yml

---
 config/locales/ca.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0cbf60323f..d28dc4ce8f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -14,6 +14,7 @@ ca:
       spree/payment:
         amount: Import
         state: Estat
+        source: Source
       spree/product:
         primary_taxon: "Categoria del producte"
         supplier: "Proveïdora"

From 8263e2e3733c4d0882ea34b69d7edb02d6b2c66b Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Wed, 29 Jul 2020 00:39:21 +1000
Subject: [PATCH 213/340] Updating translations for config/locales/es.yml

---
 config/locales/es.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1c9d3f32f0..47bb7f0cfc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -14,6 +14,7 @@ es:
       spree/payment:
         amount: Cantidad
         state: Provincia
+        source: Source
       spree/product:
         primary_taxon: "categoría del producto"
         supplier: "Proveedora"
@@ -183,6 +184,7 @@ es:
         explainer: El procesamiento automático de estas órdenes falló por un motivo desconocido. Esto no debería ocurrir, contáctanos si estás viendo esto.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Bienvenido a"
   site_meta_description: "Nosotros empezamos desde abajo. Con granjeros y productoras listas para contar sus historias con orgullo y autenticidad. Con distribuidoras listas para conectar gente con productos de forma justa y honesta. Con compradores que creen que mejores decisiones de compras semanales pueden..."
   search_by_name: Buscar por nombre o municipio...
   producers_join: Las productoras australianas ahora son bienvenidas a unirse a Open Food Network.
@@ -1152,7 +1154,12 @@ es:
         cart: "Carrito"
       cart_sidebar:
         checkout: "Validar"
+        edit_cart: "Editar carrito"
+        items_in_cart_singular: "%{num} artículo en su carrito"
+        items_in_cart_plural: "%{num} artículos en su carrito"
         close: "Cerrar"
+        cart_empty: "Tu carrito esta vacío"
+        take_me_shopping: "¡Llévame de compras!"
       signed_in:
         profile: "Perfil"
       mobile_menu:
@@ -1711,6 +1718,7 @@ es:
   remember_me: Recordarme
   are_you_sure: "¿Está seguro?"
   orders_open: "Pedidos abiertos"
+  closing: "Cerrando"
   going_back_to_home_page: "Le estamos llevando de vuelta a la página de inicio"
   creating: Creando
   updating: Actualizando
@@ -2068,6 +2076,7 @@ es:
   hub_sidebar_at_least: "Al menos un grupo debe ser seleccionado"
   hub_sidebar_blue: "azul"
   hub_sidebar_red: "rojo"
+  order_cycles_closed_for_hub: "El grupo que ha seleccionado está temporalmente cerrado para pedidos. Por favor, inténtelo de nuevo más tarde."
   report_customers_distributor: "Distribuidor"
   report_customers_supplier: "Proveedora"
   report_customers_cycle: "Ciclo de Pedido"
@@ -2304,6 +2313,7 @@ es:
   order_cycles_email_to_producers_notice: 'Los correos electrónicos que se enviarán a las productoras se han puesto en cola para enviarlos.'
   order_cycles_no_permission_to_coordinate_error: "Ninguna de tus organizaciones tiene permiso para coordinar un ciclo de pedido"
   order_cycles_no_permission_to_create_error: "No tienes permiso para crear un ciclo de pedido coordinado por esta empresa."
+  order_cycle_closed: "El ciclo de pedido que ha seleccionado se acaba de cerrar. ¡Inténtalo de nuevo!"
   back_to_orders_list: "Volver a la lista de pedidos"
   no_orders_found: "No se encontraron pedidos"
   order_information: "información del pedido"

From be3a10b2b1ef34aefe3a7ccfefd4b5e3b7f5f3cf Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Tue, 28 Jul 2020 19:01:14 +0200
Subject: [PATCH 214/340] Fix some easy rubocop issues

---
 lib/spree/core.rb                        | 2 +-
 lib/spree/core/calculated_adjustments.rb | 4 ++--
 lib/spree/core/delegate_belongs_to.rb    | 2 +-
 lib/spree/core/permalinks.rb             | 4 ++--
 lib/spree/i18n/initializer.rb            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/spree/core.rb b/lib/spree/core.rb
index a72bd8b5f8..5a7d98dbd2 100644
--- a/lib/spree/core.rb
+++ b/lib/spree/core.rb
@@ -35,7 +35,7 @@ module Spree
   #
   # This method is defined within the core gem on purpose.
   # Some people may only wish to use the Core part of Spree.
-  def self.config(&block)
+  def self.config
     yield(Spree::Config)
   end
 end
diff --git a/lib/spree/core/calculated_adjustments.rb b/lib/spree/core/calculated_adjustments.rb
index e735ec4993..c502c00099 100644
--- a/lib/spree/core/calculated_adjustments.rb
+++ b/lib/spree/core/calculated_adjustments.rb
@@ -65,15 +65,15 @@ module Spree
             calculator.compute(calculable)
           end
 
-          private
-
           def self.model_name_without_spree_namespace
             to_s.tableize.gsub('/', '_').sub('spree_', '')
           end
+          private_class_method :model_name_without_spree_namespace
 
           def self.spree_calculators
             Rails.application.config.spree.calculators
           end
+          private_class_method :spree_calculators
         end
       end
     end
diff --git a/lib/spree/core/delegate_belongs_to.rb b/lib/spree/core/delegate_belongs_to.rb
index cf471ebb74..bfbf0b1fc0 100644
--- a/lib/spree/core/delegate_belongs_to.rb
+++ b/lib/spree/core/delegate_belongs_to.rb
@@ -91,4 +91,4 @@ module DelegateBelongsTo
   protected :delegator_for
 end
 
-ActiveRecord::Base.__send__(:include, DelegateBelongsTo)
+ActiveRecord::Base.include(DelegateBelongsTo)
diff --git a/lib/spree/core/permalinks.rb b/lib/spree/core/permalinks.rb
index 6dc1fb9c6a..b9d8a83274 100644
--- a/lib/spree/core/permalinks.rb
+++ b/lib/spree/core/permalinks.rb
@@ -71,5 +71,5 @@ module Spree
   end
 end
 
-ActiveRecord::Base.__send__ :include, Spree::Core::Permalinks
-ActiveRecord::Relation.__send__ :include, Spree::Core::Permalinks
+ActiveRecord::Base.include(Spree::Core::Permalinks)
+ActiveRecord::Relation.include(Spree::Core::Permalinks)
diff --git a/lib/spree/i18n/initializer.rb b/lib/spree/i18n/initializer.rb
index 85757681fe..64b649f708 100644
--- a/lib/spree/i18n/initializer.rb
+++ b/lib/spree/i18n/initializer.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Spree::BaseController.__send__(:include, Spree::ViewContext)
+Spree::BaseController.include(Spree::ViewContext)

From 555a74c9e626e6b437530a2f626a8c07adeeb757 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 21:10:22 +0000
Subject: [PATCH 215/340] Bump oj from 3.10.7 to 3.10.8

Bumps [oj](https://github.com/ohler55/oj) from 3.10.7 to 3.10.8.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.7...v3.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 422ecd984c..37d3d29b24 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -478,7 +478,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.7)
+    oj (3.10.8)
     optimist (3.0.0)
     orm_adapter (0.5.0)
     paper_trail (5.2.3)

From d8a96c9d34cfd1df47b0c3e3e9b02eff6fb5f849 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 19:19:46 +0100
Subject: [PATCH 216/340] Bring order checkout workflow and some of its specs
 from spree_core

---
 app/models/spree/order/checkout.rb       | 182 +++++++++++++
 spec/models/spree/order/checkout_spec.rb | 331 +++++++++++++++++++++++
 2 files changed, 513 insertions(+)
 create mode 100644 app/models/spree/order/checkout.rb

diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
new file mode 100644
index 0000000000..0b70dda37a
--- /dev/null
+++ b/app/models/spree/order/checkout.rb
@@ -0,0 +1,182 @@
+module Spree
+  class Order < ActiveRecord::Base
+    module Checkout
+      def self.included(klass)
+        klass.class_eval do
+          class_attribute :next_event_transitions
+          class_attribute :previous_states
+          class_attribute :checkout_flow
+          class_attribute :checkout_steps
+          class_attribute :removed_transitions
+
+          def self.checkout_flow(&block)
+            if block_given?
+              @checkout_flow = block
+              define_state_machine!
+            else
+              @checkout_flow
+            end
+          end
+
+          def self.define_state_machine!
+            self.checkout_steps = {}
+            self.next_event_transitions = []
+            self.previous_states = [:cart]
+            self.removed_transitions = []
+
+            # Build the checkout flow using the checkout_flow defined either
+            # within the Order class, or a decorator for that class.
+            #
+            # This method may be called multiple times depending on if the
+            # checkout_flow is re-defined in a decorator or not.
+            instance_eval(&checkout_flow)
+
+            klass = self
+
+            # To avoid a ton of warnings when the state machine is re-defined
+            StateMachine::Machine.ignore_method_conflicts = true
+            # To avoid multiple occurrences of the same transition being defined
+            # On first definition, state_machines will not be defined
+            state_machines.clear if respond_to?(:state_machines)
+            state_machine :state, :initial => :cart do
+              klass.next_event_transitions.each { |t| transition(t.merge(:on => :next)) }
+
+              # Persist the state on the order
+              after_transition do |order|
+                order.state = order.state
+                order.save
+              end
+
+              event :cancel do
+                transition :to => :canceled, :if => :allow_cancel?
+              end
+
+              event :return do
+                transition :to => :returned, :from => :awaiting_return, :unless => :awaiting_returns?
+              end
+
+              event :resume do
+                transition :to => :resumed, :from => :canceled, :if => :allow_resume?
+              end
+
+              event :authorize_return do
+                transition :to => :awaiting_return
+              end
+
+              if states[:payment]
+                before_transition :to => :complete do |order|
+                  order.process_payments! if order.payment_required?
+                end
+              end
+
+              before_transition :from => :cart, :do => :ensure_line_items_present
+
+              before_transition :to => :delivery, :do => :create_proposed_shipments
+              before_transition :to => :delivery, :do => :ensure_available_shipping_rates
+
+              after_transition :to => :complete, :do => :finalize!
+              after_transition :to => :delivery, :do => :create_tax_charge!
+              after_transition :to => :resumed,  :do => :after_resume
+              after_transition :to => :canceled, :do => :after_cancel
+            end
+          end
+
+          def self.go_to_state(name, options={})
+            self.checkout_steps[name] = options
+            previous_states.each do |state|
+              add_transition({:from => state, :to => name}.merge(options))
+            end
+            if options[:if]
+              self.previous_states << name
+            else
+              self.previous_states = [name]
+            end
+          end
+
+          def self.insert_checkout_step(name, options = {})
+            before = options.delete(:before)
+            after = options.delete(:after) unless before
+            after = self.checkout_steps.keys.last unless before || after
+
+            cloned_steps = self.checkout_steps.clone
+            cloned_removed_transitions = self.removed_transitions.clone
+            self.checkout_flow do
+              cloned_steps.each_pair do |key, value|
+                self.go_to_state(name, options) if key == before
+                self.go_to_state(key, value)
+                self.go_to_state(name, options) if key == after
+              end
+              cloned_removed_transitions.each do |transition|
+                self.remove_transition(transition)
+              end
+            end
+          end
+
+          def self.remove_checkout_step(name)
+            cloned_steps = self.checkout_steps.clone
+            cloned_removed_transitions = self.removed_transitions.clone
+            self.checkout_flow do
+              cloned_steps.each_pair do |key, value|
+                self.go_to_state(key, value) unless key == name
+              end
+              cloned_removed_transitions.each do |transition|
+                self.remove_transition(transition)
+              end
+            end
+          end
+
+          def self.remove_transition(options={})
+            self.removed_transitions << options
+            self.next_event_transitions.delete(find_transition(options))
+          end
+
+          def self.find_transition(options={})
+            return nil if options.nil? || !options.include?(:from) || !options.include?(:to)
+            self.next_event_transitions.detect do |transition|
+              transition[options[:from].to_sym] == options[:to].to_sym
+            end
+          end
+
+          def self.next_event_transitions
+            @next_event_transitions ||= []
+          end
+
+          def self.checkout_steps
+            @checkout_steps ||= {}
+          end
+
+          def self.add_transition(options)
+            self.next_event_transitions << { options.delete(:from) => options.delete(:to) }.merge(options)
+          end
+
+          def checkout_steps
+            steps = self.class.checkout_steps.each_with_object([]) { |(step, options), checkout_steps|
+              next if options.include?(:if) && !options[:if].call(self)
+              checkout_steps << step
+            }.map(&:to_s)
+            # Ensure there is always a complete step
+            steps << "complete" unless steps.include?("complete")
+            steps
+          end
+
+          def has_checkout_step?(step)
+            step.present? ? self.checkout_steps.include?(step) : false
+          end
+
+          def checkout_step_index(step)
+            self.checkout_steps.index(step)
+          end
+
+          def self.removed_transitions
+            @removed_transitions ||= []
+          end
+
+          def can_go_to_state?(state)
+            return false unless self.state.present? && has_checkout_step?(state) && has_checkout_step?(self.state)
+            checkout_step_index(state) > checkout_step_index(self.state)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/spree/order/checkout_spec.rb b/spec/models/spree/order/checkout_spec.rb
index 8eed383c6a..4cc9ca5101 100644
--- a/spec/models/spree/order/checkout_spec.rb
+++ b/spec/models/spree/order/checkout_spec.rb
@@ -1,6 +1,337 @@
 require 'spec_helper'
 
 describe Spree::Order do
+  let(:order) { Spree::Order.new }
+
+  context "with default state machine" do
+    let(:transitions) do
+      [
+        { :address => :delivery },
+        { :delivery => :payment },
+        { :payment => :confirm },
+        { :confirm => :complete },
+        { :payment => :complete },
+        { :delivery => :complete }
+      ]
+    end
+
+    it "has the following transitions" do
+      transitions.each do |transition|
+        transition = Spree::Order.find_transition(:from => transition.keys.first, :to => transition.values.first)
+        transition.should_not be_nil
+      end
+    end
+
+    it "does not have a transition from delivery to confirm" do
+      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition.should be_nil
+    end
+      
+    it '.find_transition when contract was broken' do
+      Spree::Order.find_transition({foo: :bar, baz: :dog}).should be_false
+    end
+
+    it '.remove_transition' do
+      options = {:from => transitions.first.keys.first, :to => transitions.first.values.first}
+      Spree::Order.stub(:next_event_transition).and_return([options])
+      Spree::Order.remove_transition(options).should be_true
+    end
+
+    it '.remove_transition when contract was broken' do
+      Spree::Order.remove_transition(nil).should be_false
+    end
+
+    context "#checkout_steps" do
+      context "when confirmation not required" do
+        before do
+          order.stub :confirmation_required? => false
+          order.stub :payment_required? => true
+        end
+
+        specify do
+          order.checkout_steps.should == %w(address delivery payment complete)
+        end
+      end
+
+      context "when confirmation required" do
+        before do
+          order.stub :confirmation_required? => true
+          order.stub :payment_required? => true
+        end
+
+        specify do
+          order.checkout_steps.should == %w(address delivery payment confirm complete)
+        end
+      end
+
+      context "when payment not required" do
+        before { order.stub :payment_required? => false }
+        specify do
+          order.checkout_steps.should == %w(address delivery complete)
+        end
+      end
+
+      context "when payment required" do
+        before { order.stub :payment_required? => true }
+        specify do
+          order.checkout_steps.should == %w(address delivery payment complete)
+        end
+      end
+    end
+
+    it "starts out at cart" do
+      order.state.should == "cart"
+    end
+
+    it "transitions to address" do
+      order.line_items << FactoryGirl.create(:line_item)
+      order.email = "user@example.com"
+      order.next!
+      order.state.should == "address"
+    end
+
+    it "cannot transition to address without any line items" do
+      order.line_items.should be_blank
+      lambda { order.next! }.should raise_error(StateMachine::InvalidTransition, /#{Spree.t(:there_are_no_items_for_this_order)}/)
+    end
+
+    context "from address" do
+      before do
+        order.state = 'address'
+        order.stub(:has_available_payment)
+        shipment = FactoryGirl.create(:shipment, :order => order)
+        order.email = "user@example.com"
+        order.save!
+      end
+
+      it "transitions to delivery" do
+        order.stub(:ensure_available_shipping_rates => true)
+        order.next!
+        order.state.should == "delivery"
+      end
+
+      context "cannot transition to delivery" do
+        context "if there are no shipping rates for any shipment" do
+          specify do
+            transition = lambda { order.next! }
+            transition.should raise_error(StateMachine::InvalidTransition, /#{Spree.t(:items_cannot_be_shipped)}/)
+          end
+        end
+      end
+    end
+
+    context "from delivery" do
+      before do
+        order.state = 'delivery'
+      end
+
+      context "with payment required" do
+        before do
+          order.stub :payment_required? => true
+        end
+
+        it "transitions to payment" do
+          order.next!
+          order.state.should == 'payment'
+        end
+      end
+
+      context "without payment required" do
+        before do
+          order.stub :payment_required? => false
+        end
+
+        it "transitions to complete" do
+          order.next!
+          order.state.should == "complete"
+        end
+      end
+    end
+
+    context "from payment" do
+      before do
+        order.state = 'payment'
+      end
+
+      context "with confirmation required" do
+        before do
+          order.stub :confirmation_required? => true
+        end
+
+        it "transitions to confirm" do
+          order.next!
+          order.state.should == "confirm"
+        end
+      end
+
+      context "without confirmation required" do
+        before do
+          order.stub :confirmation_required? => false
+          order.stub :payment_required? => true
+        end
+
+        it "transitions to complete" do
+          order.should_receive(:process_payments!).once.and_return true
+          order.next!
+          order.state.should == "complete"
+        end
+      end
+
+      # Regression test for #2028
+      context "when payment is not required" do
+        before do
+          order.stub :payment_required? => false
+        end
+
+        it "does not call process payments" do
+          order.should_not_receive(:process_payments!)
+          order.next!
+          order.state.should == "complete"
+        end
+      end
+    end
+  end
+
+  context "subclassed order" do
+    # This causes another test above to fail, but fixing this test should make
+    #   the other test pass
+    class SubclassedOrder < Spree::Order
+      checkout_flow do
+        go_to_state :payment
+        go_to_state :complete
+      end
+    end
+
+    it "should only call default transitions once when checkout_flow is redefined" do
+      order = SubclassedOrder.new
+      order.stub :payment_required? => true
+      order.should_receive(:process_payments!).once
+      order.state = "payment"
+      order.next!
+      order.state.should == "complete"
+    end
+  end
+
+  context "re-define checkout flow" do
+    before do
+      @old_checkout_flow = Spree::Order.checkout_flow
+      Spree::Order.class_eval do
+        checkout_flow do
+          go_to_state :payment
+          go_to_state :complete
+        end
+      end
+    end
+
+    after do
+      Spree::Order.checkout_flow(&@old_checkout_flow)
+    end
+
+    it "should not keep old event transitions when checkout_flow is redefined" do
+      Spree::Order.next_event_transitions.should == [{:cart=>:payment}, {:payment=>:complete}]
+    end
+
+    it "should not keep old events when checkout_flow is redefined" do
+      state_machine = Spree::Order.state_machine
+      state_machine.states.any? { |s| s.name == :address }.should be_false
+      known_states = state_machine.events[:next].branches.map(&:known_states).flatten
+      known_states.should_not include(:address)
+      known_states.should_not include(:delivery)
+      known_states.should_not include(:confirm)
+    end
+  end
+
+  # Regression test for #3665
+  context "with only a complete step" do
+    before do
+      @old_checkout_flow = Spree::Order.checkout_flow
+      Spree::Order.class_eval do
+        checkout_flow do
+          go_to_state :complete
+        end
+      end
+    end
+
+    after do
+      Spree::Order.checkout_flow(&@old_checkout_flow)
+    end
+
+    it "does not attempt to process payments" do
+      order.stub_chain(:line_items, :present?).and_return(true)
+      order.should_not_receive(:payment_required?)
+      order.should_not_receive(:process_payments!)
+      order.next!
+    end
+
+  end
+
+  context "insert checkout step" do
+    before do
+      @old_checkout_flow = Spree::Order.checkout_flow
+      Spree::Order.class_eval do
+        insert_checkout_step :new_step, before: :address
+      end
+    end
+
+    after do
+      Spree::Order.checkout_flow(&@old_checkout_flow)
+    end
+
+    it "should maintain removed transitions" do
+      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition.should be_nil
+    end
+
+    context "before" do
+      before do
+        Spree::Order.class_eval do
+          insert_checkout_step :before_address, before: :address
+        end
+      end
+
+      specify do
+        order = Spree::Order.new
+        order.checkout_steps.should == %w(new_step before_address address delivery complete)
+      end
+    end
+
+    context "after" do
+      before do
+        Spree::Order.class_eval do
+          insert_checkout_step :after_address, after: :address
+        end
+      end
+
+      specify do
+        order = Spree::Order.new
+        order.checkout_steps.should == %w(new_step address after_address delivery complete)
+      end
+    end
+  end
+
+  context "remove checkout step" do
+    before do
+      @old_checkout_flow = Spree::Order.checkout_flow
+      Spree::Order.class_eval do
+        remove_checkout_step :address
+      end
+    end
+
+    after do
+      Spree::Order.checkout_flow(&@old_checkout_flow)
+    end
+
+    it "should maintain removed transitions" do
+      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition.should be_nil
+    end
+
+    specify do
+      order = Spree::Order.new
+      order.checkout_steps.should == %w(delivery complete)
+    end
+  end
+
   describe 'event :restart_checkout' do
     let(:order) { create(:order) }
 

From e99f0dc6b70fc447d8d965e2c2a9c1df916d8eed Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 19:29:53 +0100
Subject: [PATCH 217/340] Rubocop autocorrect and easy rubocop issues

---
 app/models/spree/order/checkout.rb       | 93 +++++++++++++-----------
 spec/models/spree/order/checkout_spec.rb | 66 +++++++++--------
 2 files changed, 85 insertions(+), 74 deletions(-)

diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
index 0b70dda37a..ffecf63f23 100644
--- a/app/models/spree/order/checkout.rb
+++ b/app/models/spree/order/checkout.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class Order < ActiveRecord::Base
     module Checkout
@@ -38,8 +40,8 @@ module Spree
             # To avoid multiple occurrences of the same transition being defined
             # On first definition, state_machines will not be defined
             state_machines.clear if respond_to?(:state_machines)
-            state_machine :state, :initial => :cart do
-              klass.next_event_transitions.each { |t| transition(t.merge(:on => :next)) }
+            state_machine :state, initial: :cart do
+              klass.next_event_transitions.each { |t| transition(t.merge(on: :next)) }
 
               # Persist the state on the order
               after_transition do |order|
@@ -48,46 +50,46 @@ module Spree
               end
 
               event :cancel do
-                transition :to => :canceled, :if => :allow_cancel?
+                transition to: :canceled, if: :allow_cancel?
               end
 
               event :return do
-                transition :to => :returned, :from => :awaiting_return, :unless => :awaiting_returns?
+                transition to: :returned, from: :awaiting_return, unless: :awaiting_returns?
               end
 
               event :resume do
-                transition :to => :resumed, :from => :canceled, :if => :allow_resume?
+                transition to: :resumed, from: :canceled, if: :allow_resume?
               end
 
               event :authorize_return do
-                transition :to => :awaiting_return
+                transition to: :awaiting_return
               end
 
               if states[:payment]
-                before_transition :to => :complete do |order|
+                before_transition to: :complete do |order|
                   order.process_payments! if order.payment_required?
                 end
               end
 
-              before_transition :from => :cart, :do => :ensure_line_items_present
+              before_transition from: :cart, do: :ensure_line_items_present
 
-              before_transition :to => :delivery, :do => :create_proposed_shipments
-              before_transition :to => :delivery, :do => :ensure_available_shipping_rates
+              before_transition to: :delivery, do: :create_proposed_shipments
+              before_transition to: :delivery, do: :ensure_available_shipping_rates
 
-              after_transition :to => :complete, :do => :finalize!
-              after_transition :to => :delivery, :do => :create_tax_charge!
-              after_transition :to => :resumed,  :do => :after_resume
-              after_transition :to => :canceled, :do => :after_cancel
+              after_transition to: :complete, do: :finalize!
+              after_transition to: :delivery, do: :create_tax_charge!
+              after_transition to: :resumed,  do: :after_resume
+              after_transition to: :canceled, do: :after_cancel
             end
           end
 
-          def self.go_to_state(name, options={})
-            self.checkout_steps[name] = options
+          def self.go_to_state(name, options = {})
+            checkout_steps[name] = options
             previous_states.each do |state|
-              add_transition({:from => state, :to => name}.merge(options))
+              add_transition({ from: state, to: name }.merge(options))
             end
             if options[:if]
-              self.previous_states << name
+              previous_states << name
             else
               self.previous_states = [name]
             end
@@ -96,43 +98,44 @@ module Spree
           def self.insert_checkout_step(name, options = {})
             before = options.delete(:before)
             after = options.delete(:after) unless before
-            after = self.checkout_steps.keys.last unless before || after
+            after = checkout_steps.keys.last unless before || after
 
-            cloned_steps = self.checkout_steps.clone
-            cloned_removed_transitions = self.removed_transitions.clone
-            self.checkout_flow do
+            cloned_steps = checkout_steps.clone
+            cloned_removed_transitions = removed_transitions.clone
+            checkout_flow do
               cloned_steps.each_pair do |key, value|
-                self.go_to_state(name, options) if key == before
-                self.go_to_state(key, value)
-                self.go_to_state(name, options) if key == after
+                go_to_state(name, options) if key == before
+                go_to_state(key, value)
+                go_to_state(name, options) if key == after
               end
               cloned_removed_transitions.each do |transition|
-                self.remove_transition(transition)
+                remove_transition(transition)
               end
             end
           end
 
           def self.remove_checkout_step(name)
-            cloned_steps = self.checkout_steps.clone
-            cloned_removed_transitions = self.removed_transitions.clone
-            self.checkout_flow do
+            cloned_steps = checkout_steps.clone
+            cloned_removed_transitions = removed_transitions.clone
+            checkout_flow do
               cloned_steps.each_pair do |key, value|
-                self.go_to_state(key, value) unless key == name
+                go_to_state(key, value) unless key == name
               end
               cloned_removed_transitions.each do |transition|
-                self.remove_transition(transition)
+                remove_transition(transition)
               end
             end
           end
 
-          def self.remove_transition(options={})
-            self.removed_transitions << options
-            self.next_event_transitions.delete(find_transition(options))
+          def self.remove_transition(options = {})
+            removed_transitions << options
+            next_event_transitions.delete(find_transition(options))
           end
 
-          def self.find_transition(options={})
+          def self.find_transition(options = {})
             return nil if options.nil? || !options.include?(:from) || !options.include?(:to)
-            self.next_event_transitions.detect do |transition|
+
+            next_event_transitions.detect do |transition|
               transition[options[:from].to_sym] == options[:to].to_sym
             end
           end
@@ -146,12 +149,15 @@ module Spree
           end
 
           def self.add_transition(options)
-            self.next_event_transitions << { options.delete(:from) => options.delete(:to) }.merge(options)
+            next_event_transitions << { options.delete(:from) => options.delete(:to) }.
+              merge(options)
           end
 
           def checkout_steps
-            steps = self.class.checkout_steps.each_with_object([]) { |(step, options), checkout_steps|
+            steps = self.class.checkout_steps.
+              each_with_object([]) { |(step, options), checkout_steps|
               next if options.include?(:if) && !options[:if].call(self)
+
               checkout_steps << step
             }.map(&:to_s)
             # Ensure there is always a complete step
@@ -159,12 +165,12 @@ module Spree
             steps
           end
 
-          def has_checkout_step?(step)
-            step.present? ? self.checkout_steps.include?(step) : false
+          def checkout_step?(step)
+            step.present? ? checkout_steps.include?(step) : false
           end
 
           def checkout_step_index(step)
-            self.checkout_steps.index(step)
+            checkout_steps.index(step)
           end
 
           def self.removed_transitions
@@ -172,7 +178,10 @@ module Spree
           end
 
           def can_go_to_state?(state)
-            return false unless self.state.present? && has_checkout_step?(state) && has_checkout_step?(self.state)
+            return false unless self.state.present? &&
+                                checkout_step?(state) &&
+                                checkout_step?(self.state)
+
             checkout_step_index(state) > checkout_step_index(self.state)
           end
         end
diff --git a/spec/models/spree/order/checkout_spec.rb b/spec/models/spree/order/checkout_spec.rb
index 4cc9ca5101..75a3ae6a95 100644
--- a/spec/models/spree/order/checkout_spec.rb
+++ b/spec/models/spree/order/checkout_spec.rb
@@ -6,33 +6,34 @@ describe Spree::Order do
   context "with default state machine" do
     let(:transitions) do
       [
-        { :address => :delivery },
-        { :delivery => :payment },
-        { :payment => :confirm },
-        { :confirm => :complete },
-        { :payment => :complete },
-        { :delivery => :complete }
+        { address: :delivery },
+        { delivery: :payment },
+        { payment: :confirm },
+        { confirm: :complete },
+        { payment: :complete },
+        { delivery: :complete }
       ]
     end
 
     it "has the following transitions" do
       transitions.each do |transition|
-        transition = Spree::Order.find_transition(:from => transition.keys.first, :to => transition.values.first)
+        transition = Spree::Order.find_transition(from: transition.keys.first,
+                                                  to: transition.values.first)
         transition.should_not be_nil
       end
     end
 
     it "does not have a transition from delivery to confirm" do
-      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
       transition.should be_nil
     end
-      
+
     it '.find_transition when contract was broken' do
-      Spree::Order.find_transition({foo: :bar, baz: :dog}).should be_false
+      Spree::Order.find_transition({ foo: :bar, baz: :dog }).should be_false
     end
 
     it '.remove_transition' do
-      options = {:from => transitions.first.keys.first, :to => transitions.first.values.first}
+      options = { from: transitions.first.keys.first, to: transitions.first.values.first }
       Spree::Order.stub(:next_event_transition).and_return([options])
       Spree::Order.remove_transition(options).should be_true
     end
@@ -44,8 +45,8 @@ describe Spree::Order do
     context "#checkout_steps" do
       context "when confirmation not required" do
         before do
-          order.stub :confirmation_required? => false
-          order.stub :payment_required? => true
+          order.stub confirmation_required?: false
+          order.stub payment_required?: true
         end
 
         specify do
@@ -55,8 +56,8 @@ describe Spree::Order do
 
       context "when confirmation required" do
         before do
-          order.stub :confirmation_required? => true
-          order.stub :payment_required? => true
+          order.stub confirmation_required?: true
+          order.stub payment_required?: true
         end
 
         specify do
@@ -65,14 +66,14 @@ describe Spree::Order do
       end
 
       context "when payment not required" do
-        before { order.stub :payment_required? => false }
+        before { order.stub payment_required?: false }
         specify do
           order.checkout_steps.should == %w(address delivery complete)
         end
       end
 
       context "when payment required" do
-        before { order.stub :payment_required? => true }
+        before { order.stub payment_required?: true }
         specify do
           order.checkout_steps.should == %w(address delivery payment complete)
         end
@@ -92,20 +93,21 @@ describe Spree::Order do
 
     it "cannot transition to address without any line items" do
       order.line_items.should be_blank
-      lambda { order.next! }.should raise_error(StateMachine::InvalidTransition, /#{Spree.t(:there_are_no_items_for_this_order)}/)
+      lambda { order.next! }.should raise_error(StateMachine::InvalidTransition,
+                                                /#{Spree.t(:there_are_no_items_for_this_order)}/)
     end
 
     context "from address" do
       before do
         order.state = 'address'
         order.stub(:has_available_payment)
-        shipment = FactoryGirl.create(:shipment, :order => order)
+        shipment = FactoryGirl.create(:shipment, order: order)
         order.email = "user@example.com"
         order.save!
       end
 
       it "transitions to delivery" do
-        order.stub(:ensure_available_shipping_rates => true)
+        order.stub(ensure_available_shipping_rates: true)
         order.next!
         order.state.should == "delivery"
       end
@@ -114,7 +116,8 @@ describe Spree::Order do
         context "if there are no shipping rates for any shipment" do
           specify do
             transition = lambda { order.next! }
-            transition.should raise_error(StateMachine::InvalidTransition, /#{Spree.t(:items_cannot_be_shipped)}/)
+            transition.should raise_error(StateMachine::InvalidTransition,
+                                          /#{Spree.t(:items_cannot_be_shipped)}/)
           end
         end
       end
@@ -127,7 +130,7 @@ describe Spree::Order do
 
       context "with payment required" do
         before do
-          order.stub :payment_required? => true
+          order.stub payment_required?: true
         end
 
         it "transitions to payment" do
@@ -138,7 +141,7 @@ describe Spree::Order do
 
       context "without payment required" do
         before do
-          order.stub :payment_required? => false
+          order.stub payment_required?: false
         end
 
         it "transitions to complete" do
@@ -155,7 +158,7 @@ describe Spree::Order do
 
       context "with confirmation required" do
         before do
-          order.stub :confirmation_required? => true
+          order.stub confirmation_required?: true
         end
 
         it "transitions to confirm" do
@@ -166,8 +169,8 @@ describe Spree::Order do
 
       context "without confirmation required" do
         before do
-          order.stub :confirmation_required? => false
-          order.stub :payment_required? => true
+          order.stub confirmation_required?: false
+          order.stub payment_required?: true
         end
 
         it "transitions to complete" do
@@ -180,7 +183,7 @@ describe Spree::Order do
       # Regression test for #2028
       context "when payment is not required" do
         before do
-          order.stub :payment_required? => false
+          order.stub payment_required?: false
         end
 
         it "does not call process payments" do
@@ -204,7 +207,7 @@ describe Spree::Order do
 
     it "should only call default transitions once when checkout_flow is redefined" do
       order = SubclassedOrder.new
-      order.stub :payment_required? => true
+      order.stub payment_required?: true
       order.should_receive(:process_payments!).once
       order.state = "payment"
       order.next!
@@ -228,7 +231,7 @@ describe Spree::Order do
     end
 
     it "should not keep old event transitions when checkout_flow is redefined" do
-      Spree::Order.next_event_transitions.should == [{:cart=>:payment}, {:payment=>:complete}]
+      Spree::Order.next_event_transitions.should == [{ cart: :payment }, { payment: :complete }]
     end
 
     it "should not keep old events when checkout_flow is redefined" do
@@ -262,7 +265,6 @@ describe Spree::Order do
       order.should_not_receive(:process_payments!)
       order.next!
     end
-
   end
 
   context "insert checkout step" do
@@ -278,7 +280,7 @@ describe Spree::Order do
     end
 
     it "should maintain removed transitions" do
-      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
       transition.should be_nil
     end
 
@@ -322,7 +324,7 @@ describe Spree::Order do
     end
 
     it "should maintain removed transitions" do
-      transition = Spree::Order.find_transition(:from => :delivery, :to => :confirm)
+      transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
       transition.should be_nil
     end
 

From 51de5269dcb8bcf84bfe8b5757ea61ce010c45e3 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 19:50:34 +0100
Subject: [PATCH 218/340] Fix specs in checkout_spec

---
 spec/models/spree/order/checkout_spec.rb | 107 ++++++++---------------
 1 file changed, 37 insertions(+), 70 deletions(-)

diff --git a/spec/models/spree/order/checkout_spec.rb b/spec/models/spree/order/checkout_spec.rb
index 75a3ae6a95..d4ac24d7e4 100644
--- a/spec/models/spree/order/checkout_spec.rb
+++ b/spec/models/spree/order/checkout_spec.rb
@@ -8,8 +8,6 @@ describe Spree::Order do
       [
         { address: :delivery },
         { delivery: :payment },
-        { payment: :confirm },
-        { confirm: :complete },
         { payment: :complete },
         { delivery: :complete }
       ]
@@ -17,83 +15,63 @@ describe Spree::Order do
 
     it "has the following transitions" do
       transitions.each do |transition|
+        puts transition.keys.first
+        puts transition.values.first
         transition = Spree::Order.find_transition(from: transition.keys.first,
                                                   to: transition.values.first)
-        transition.should_not be_nil
+        expect(transition).to_not be_nil
       end
     end
 
     it "does not have a transition from delivery to confirm" do
       transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
-      transition.should be_nil
+      expect(transition).to be_nil
     end
 
     it '.find_transition when contract was broken' do
-      Spree::Order.find_transition({ foo: :bar, baz: :dog }).should be_false
+      expect(Spree::Order.find_transition({ foo: :bar, baz: :dog })).to be_falsy
     end
 
     it '.remove_transition' do
       options = { from: transitions.first.keys.first, to: transitions.first.values.first }
       Spree::Order.stub(:next_event_transition).and_return([options])
-      Spree::Order.remove_transition(options).should be_true
+      expect(Spree::Order.remove_transition(options)).to be_truthy
     end
 
     it '.remove_transition when contract was broken' do
-      Spree::Order.remove_transition(nil).should be_false
+      expect(Spree::Order.remove_transition(nil)).to be_falsy
     end
 
     context "#checkout_steps" do
-      context "when confirmation not required" do
-        before do
-          order.stub confirmation_required?: false
-          order.stub payment_required?: true
-        end
-
-        specify do
-          order.checkout_steps.should == %w(address delivery payment complete)
-        end
-      end
-
-      context "when confirmation required" do
-        before do
-          order.stub confirmation_required?: true
-          order.stub payment_required?: true
-        end
-
-        specify do
-          order.checkout_steps.should == %w(address delivery payment confirm complete)
-        end
-      end
-
       context "when payment not required" do
         before { order.stub payment_required?: false }
         specify do
-          order.checkout_steps.should == %w(address delivery complete)
+          expect(order.checkout_steps).to eq %w(address delivery complete)
         end
       end
 
       context "when payment required" do
         before { order.stub payment_required?: true }
         specify do
-          order.checkout_steps.should == %w(address delivery payment complete)
+          expect(order.checkout_steps).to eq %w(address delivery payment complete)
         end
       end
     end
 
     it "starts out at cart" do
-      order.state.should == "cart"
+      expect(order.state).to eq "cart"
     end
 
     it "transitions to address" do
       order.line_items << FactoryGirl.create(:line_item)
       order.email = "user@example.com"
       order.next!
-      order.state.should == "address"
+      expect(order.state).to eq "address"
     end
 
     it "cannot transition to address without any line items" do
-      order.line_items.should be_blank
-      lambda { order.next! }.should raise_error(StateMachine::InvalidTransition,
+      expect(order.line_items).to be_blank
+      expect(lambda { order.next! }).to raise_error(StateMachine::InvalidTransition,
                                                 /#{Spree.t(:there_are_no_items_for_this_order)}/)
     end
 
@@ -101,7 +79,7 @@ describe Spree::Order do
       before do
         order.state = 'address'
         order.stub(:has_available_payment)
-        shipment = FactoryGirl.create(:shipment, order: order)
+        order.shipments << create(:shipment)
         order.email = "user@example.com"
         order.save!
       end
@@ -109,14 +87,14 @@ describe Spree::Order do
       it "transitions to delivery" do
         order.stub(ensure_available_shipping_rates: true)
         order.next!
-        order.state.should == "delivery"
+        expect(order.state).to eq "delivery"
       end
 
       context "cannot transition to delivery" do
         context "if there are no shipping rates for any shipment" do
           specify do
             transition = lambda { order.next! }
-            transition.should raise_error(StateMachine::InvalidTransition,
+            expect(transition).to raise_error(StateMachine::InvalidTransition,
                                           /#{Spree.t(:items_cannot_be_shipped)}/)
           end
         end
@@ -135,7 +113,7 @@ describe Spree::Order do
 
         it "transitions to payment" do
           order.next!
-          order.state.should == 'payment'
+          expect(order.state).to eq 'payment'
         end
       end
 
@@ -146,7 +124,7 @@ describe Spree::Order do
 
         it "transitions to complete" do
           order.next!
-          order.state.should == "complete"
+          expect(order.state).to eq "complete"
         end
       end
     end
@@ -156,27 +134,16 @@ describe Spree::Order do
         order.state = 'payment'
       end
 
-      context "with confirmation required" do
-        before do
-          order.stub confirmation_required?: true
-        end
-
-        it "transitions to confirm" do
-          order.next!
-          order.state.should == "confirm"
-        end
-      end
-
-      context "without confirmation required" do
+     context "when payment is required" do
         before do
           order.stub confirmation_required?: false
           order.stub payment_required?: true
         end
 
         it "transitions to complete" do
-          order.should_receive(:process_payments!).once.and_return true
+          expect(order).to receive(:process_payments!).once.and_return true
           order.next!
-          order.state.should == "complete"
+          expect(order.state).to eq "complete"
         end
       end
 
@@ -187,9 +154,9 @@ describe Spree::Order do
         end
 
         it "does not call process payments" do
-          order.should_not_receive(:process_payments!)
+          expect(order).to_not receive(:process_payments!)
           order.next!
-          order.state.should == "complete"
+          expect(order.state).to eq "complete"
         end
       end
     end
@@ -208,10 +175,10 @@ describe Spree::Order do
     it "should only call default transitions once when checkout_flow is redefined" do
       order = SubclassedOrder.new
       order.stub payment_required?: true
-      order.should_receive(:process_payments!).once
+      expect(order).to receive(:process_payments!).once
       order.state = "payment"
       order.next!
-      order.state.should == "complete"
+      expect(order.state).to eq "complete"
     end
   end
 
@@ -231,16 +198,16 @@ describe Spree::Order do
     end
 
     it "should not keep old event transitions when checkout_flow is redefined" do
-      Spree::Order.next_event_transitions.should == [{ cart: :payment }, { payment: :complete }]
+      expect(Spree::Order.next_event_transitions).to eq [{ cart: :payment }, { payment: :complete }]
     end
 
     it "should not keep old events when checkout_flow is redefined" do
       state_machine = Spree::Order.state_machine
-      state_machine.states.any? { |s| s.name == :address }.should be_false
+      expect(state_machine.states.any? { |s| s.name == :address }).to be_falsy
       known_states = state_machine.events[:next].branches.map(&:known_states).flatten
-      known_states.should_not include(:address)
-      known_states.should_not include(:delivery)
-      known_states.should_not include(:confirm)
+      expect(known_states).to_not include(:address)
+      expect(known_states).to_not include(:delivery)
+      expect(known_states).to_not include(:confirm)
     end
   end
 
@@ -261,8 +228,8 @@ describe Spree::Order do
 
     it "does not attempt to process payments" do
       order.stub_chain(:line_items, :present?).and_return(true)
-      order.should_not_receive(:payment_required?)
-      order.should_not_receive(:process_payments!)
+      expect(order).to_not receive(:payment_required?)
+      expect(order).to_not receive(:process_payments!)
       order.next!
     end
   end
@@ -281,7 +248,7 @@ describe Spree::Order do
 
     it "should maintain removed transitions" do
       transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
-      transition.should be_nil
+      expect(transition).to be_nil
     end
 
     context "before" do
@@ -293,7 +260,7 @@ describe Spree::Order do
 
       specify do
         order = Spree::Order.new
-        order.checkout_steps.should == %w(new_step before_address address delivery complete)
+        expect(order.checkout_steps).to eq %w(new_step before_address address delivery complete)
       end
     end
 
@@ -306,7 +273,7 @@ describe Spree::Order do
 
       specify do
         order = Spree::Order.new
-        order.checkout_steps.should == %w(new_step address after_address delivery complete)
+        expect(order.checkout_steps).to eq %w(new_step address after_address delivery complete)
       end
     end
   end
@@ -325,12 +292,12 @@ describe Spree::Order do
 
     it "should maintain removed transitions" do
       transition = Spree::Order.find_transition(from: :delivery, to: :confirm)
-      transition.should be_nil
+      expect(transition).to be_nil
     end
 
     specify do
       order = Spree::Order.new
-      order.checkout_steps.should == %w(delivery complete)
+      expect(order.checkout_steps).to eq %w(delivery complete)
     end
   end
 

From e80337a458d87ef26a6ec84e085600741c02f4ad Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 20:07:31 +0100
Subject: [PATCH 219/340] Transpec checkout_spec

---
 spec/models/spree/order/checkout_spec.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/models/spree/order/checkout_spec.rb b/spec/models/spree/order/checkout_spec.rb
index d4ac24d7e4..5f49792aa2 100644
--- a/spec/models/spree/order/checkout_spec.rb
+++ b/spec/models/spree/order/checkout_spec.rb
@@ -34,7 +34,7 @@ describe Spree::Order do
 
     it '.remove_transition' do
       options = { from: transitions.first.keys.first, to: transitions.first.values.first }
-      Spree::Order.stub(:next_event_transition).and_return([options])
+      allow(Spree::Order).to receive(:next_event_transition).and_return([options])
       expect(Spree::Order.remove_transition(options)).to be_truthy
     end
 
@@ -44,14 +44,14 @@ describe Spree::Order do
 
     context "#checkout_steps" do
       context "when payment not required" do
-        before { order.stub payment_required?: false }
+        before { allow(order).to receive_messages payment_required?: false }
         specify do
           expect(order.checkout_steps).to eq %w(address delivery complete)
         end
       end
 
       context "when payment required" do
-        before { order.stub payment_required?: true }
+        before { allow(order).to receive_messages payment_required?: true }
         specify do
           expect(order.checkout_steps).to eq %w(address delivery payment complete)
         end
@@ -78,14 +78,14 @@ describe Spree::Order do
     context "from address" do
       before do
         order.state = 'address'
-        order.stub(:has_available_payment)
+        allow(order).to receive(:has_available_payment)
         order.shipments << create(:shipment)
         order.email = "user@example.com"
         order.save!
       end
 
       it "transitions to delivery" do
-        order.stub(ensure_available_shipping_rates: true)
+        allow(order).to receive_messages(ensure_available_shipping_rates: true)
         order.next!
         expect(order.state).to eq "delivery"
       end
@@ -108,7 +108,7 @@ describe Spree::Order do
 
       context "with payment required" do
         before do
-          order.stub payment_required?: true
+          allow(order).to receive_messages payment_required?: true
         end
 
         it "transitions to payment" do
@@ -119,7 +119,7 @@ describe Spree::Order do
 
       context "without payment required" do
         before do
-          order.stub payment_required?: false
+          allow(order).to receive_messages payment_required?: false
         end
 
         it "transitions to complete" do
@@ -136,8 +136,8 @@ describe Spree::Order do
 
      context "when payment is required" do
         before do
-          order.stub confirmation_required?: false
-          order.stub payment_required?: true
+          allow(order).to receive_messages confirmation_required?: false
+          allow(order).to receive_messages payment_required?: true
         end
 
         it "transitions to complete" do
@@ -150,7 +150,7 @@ describe Spree::Order do
       # Regression test for #2028
       context "when payment is not required" do
         before do
-          order.stub payment_required?: false
+          allow(order).to receive_messages payment_required?: false
         end
 
         it "does not call process payments" do
@@ -174,7 +174,7 @@ describe Spree::Order do
 
     it "should only call default transitions once when checkout_flow is redefined" do
       order = SubclassedOrder.new
-      order.stub payment_required?: true
+      allow(order).to receive_messages payment_required?: true
       expect(order).to receive(:process_payments!).once
       order.state = "payment"
       order.next!
@@ -227,7 +227,7 @@ describe Spree::Order do
     end
 
     it "does not attempt to process payments" do
-      order.stub_chain(:line_items, :present?).and_return(true)
+      allow(order).to receive_message_chain(:line_items, :present?).and_return(true)
       expect(order).to_not receive(:payment_required?)
       expect(order).to_not receive(:process_payments!)
       order.next!

From 734fce5ce7c6b4a0904006db45589cd9ba478c3a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 25 Jul 2020 20:55:25 +0100
Subject: [PATCH 220/340] Add code to persist payments after failed payments.
 The state machine rollbacks the transactions, with this we keep record of
 what went wrong.

---
 app/controllers/checkout_controller.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index dd1a67c702..b79df645c0 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -152,11 +152,23 @@ class CheckoutController < Spree::StoreController
       checkout_succeeded
       redirect_to(order_path(@order)) && return
     else
+      persist_all_payments if @order.state == "payment"
       flash[:error] = order_error
       checkout_failed
     end
   end
 
+  # When a payment fails, the order state machine rollbacks all transactions
+  #   Here we ensure we always persist all payments
+  def persist_all_payments
+    @order.payments.each do |payment|
+      original_payment_state = payment.state
+      if original_payment_state != payment.reload.state
+        payment.update(state: original_payment_state)
+      end
+    end
+  end
+
   def checkout_workflow(shipping_method_id)
     while @order.state != "complete"
       if @order.state == "payment"

From 26eee4631f22a9e5bda4968a65634ae5e17a5529 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 23:40:49 +0100
Subject: [PATCH 221/340] Rename AdvanceOrderService to OrderWorkflow

---
 .../spree/admin/orders/customer_details_controller.rb  |  2 +-
 app/controllers/spree/admin/orders_controller.rb       |  2 +-
 app/jobs/subscription_placement_job.rb                 |  2 +-
 .../{advance_order_service.rb => order_workflow.rb}    |  6 +++---
 ...ce_order_service_spec.rb => order_workflow_spec.rb} | 10 +++++-----
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename app/services/{advance_order_service.rb => order_workflow.rb} (94%)
 rename spec/services/{advance_order_service_spec.rb => order_workflow_spec.rb} (89%)

diff --git a/app/controllers/spree/admin/orders/customer_details_controller.rb b/app/controllers/spree/admin/orders/customer_details_controller.rb
index 82c0c2347e..3239ffff01 100644
--- a/app/controllers/spree/admin/orders/customer_details_controller.rb
+++ b/app/controllers/spree/admin/orders/customer_details_controller.rb
@@ -23,7 +23,7 @@ module Spree
               @order.associate_user!(Spree.user_class.find_by(email: @order.email))
             end
 
-            AdvanceOrderService.new(@order).call
+            OrderWorkflow.new(@order).complete
 
             @order.shipments.map(&:refresh_rates)
             flash[:success] = Spree.t('customer_details_updated')
diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb
index 8cde99be81..e0b07fbbd9 100644
--- a/app/controllers/spree/admin/orders_controller.rb
+++ b/app/controllers/spree/admin/orders_controller.rb
@@ -35,7 +35,7 @@ module Spree
       def edit
         @order.shipments.map(&:refresh_rates)
 
-        AdvanceOrderService.new(@order).call
+        OrderWorkflow.new(@order).complete
 
         # The payment step shows an error of 'No pending payments'
         # Clearing the errors from the order object will stop this error
diff --git a/app/jobs/subscription_placement_job.rb b/app/jobs/subscription_placement_job.rb
index 8b5df2b159..320c7b199a 100644
--- a/app/jobs/subscription_placement_job.rb
+++ b/app/jobs/subscription_placement_job.rb
@@ -66,7 +66,7 @@ class SubscriptionPlacementJob
   end
 
   def move_to_completion(order)
-    AdvanceOrderService.new(order).call!
+    OrderWorkflow.new(order).complete!
   end
 
   def unavailable_stock_lines_for(order)
diff --git a/app/services/advance_order_service.rb b/app/services/order_workflow.rb
similarity index 94%
rename from app/services/advance_order_service.rb
rename to app/services/order_workflow.rb
index 1377c36147..ab4673b970 100644
--- a/app/services/advance_order_service.rb
+++ b/app/services/order_workflow.rb
@@ -1,15 +1,15 @@
-class AdvanceOrderService
+class OrderWorkflow
   attr_reader :order
 
   def initialize(order)
     @order = order
   end
 
-  def call
+  def complete
     advance_order(advance_order_options)
   end
 
-  def call!
+  def complete!
     advance_order!(advance_order_options)
   end
 
diff --git a/spec/services/advance_order_service_spec.rb b/spec/services/order_workflow_spec.rb
similarity index 89%
rename from spec/services/advance_order_service_spec.rb
rename to spec/services/order_workflow_spec.rb
index 58a2fcb03a..5b2b6f0bf5 100644
--- a/spec/services/advance_order_service_spec.rb
+++ b/spec/services/order_workflow_spec.rb
@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AdvanceOrderService do
+describe OrderWorkflow do
   let!(:distributor) { create(:distributor_enterprise) }
   let!(:order) do
     create(:order_with_totals_and_distribution, distributor: distributor,
@@ -13,7 +13,7 @@ describe AdvanceOrderService do
 
   it "transitions the order multiple steps" do
     expect(order.state).to eq("cart")
-    service.call
+    service.complete
     order.reload
     expect(order.state).to eq("complete")
   end
@@ -30,7 +30,7 @@ describe AdvanceOrderService do
 
     it "retains delivery method of the order" do
       order.select_shipping_method(shipping_method_b.id)
-      service.call
+      service.complete
       order.reload
       expect(order.shipping_method).to eq(shipping_method_b)
     end
@@ -38,7 +38,7 @@ describe AdvanceOrderService do
 
   context "when raising on error" do
     it "transitions the order multiple steps" do
-      service.call!
+      service.complete!
       order.reload
       expect(order.state).to eq("complete")
     end
@@ -49,7 +49,7 @@ describe AdvanceOrderService do
       end
 
       it "raises error" do
-        expect { service.call! }.to raise_error(StateMachine::InvalidTransition)
+        expect { service.complete! }.to raise_error(StateMachine::InvalidTransition)
       end
     end
   end

From c3f99050fdba69acad5b814de472a39b2ddb51b1 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 23:43:07 +0100
Subject: [PATCH 222/340] Move advance_order_state from checkout_controller to
 OrderWorkflow service

---
 app/controllers/checkout_controller.rb | 13 ++-----------
 app/services/order_workflow.rb         |  8 ++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index b79df645c0..2654e5c0ff 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -148,7 +148,7 @@ class CheckoutController < Spree::StoreController
   end
 
   def handle_redirect_from_stripe
-    if advance_order_state(@order) && order_complete?
+    if OrderWorkflow.new(@order).next && order_complete?
       checkout_succeeded
       redirect_to(order_path(@order)) && return
     else
@@ -177,7 +177,7 @@ class CheckoutController < Spree::StoreController
 
       @order.select_shipping_method(shipping_method_id) if @order.state == "delivery"
 
-      next if advance_order_state(@order)
+      next if OrderWorkflow.new(@order).next
 
       return update_failed
     end
@@ -194,15 +194,6 @@ class CheckoutController < Spree::StoreController
     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_error
     if @order.errors.present?
       @order.errors.full_messages.to_sentence
diff --git a/app/services/order_workflow.rb b/app/services/order_workflow.rb
index ab4673b970..1351bfeee6 100644
--- a/app/services/order_workflow.rb
+++ b/app/services/order_workflow.rb
@@ -13,6 +13,14 @@ class OrderWorkflow
     advance_order!(advance_order_options)
   end
 
+  def next
+    tries ||= 3
+    order.next
+  rescue ActiveRecord::StaleObjectError
+    retry unless (tries -= 1).zero?
+    false
+  end
+
   private
 
   def advance_order_options

From 9cbcf1448550c9dcbc103727b2d1ccf9b60fe65a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 23:50:47 +0100
Subject: [PATCH 223/340] Move shipping method id setting code to OrderWorkflow
 service

---
 app/controllers/checkout_controller.rb | 4 +---
 app/services/order_workflow.rb         | 8 ++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 2654e5c0ff..66d5b445f7 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -175,9 +175,7 @@ class CheckoutController < Spree::StoreController
         return if redirect_to_payment_gateway
       end
 
-      @order.select_shipping_method(shipping_method_id) if @order.state == "delivery"
-
-      next if OrderWorkflow.new(@order).next
+      next if OrderWorkflow.new(@order).next({ shipping_method_id: shipping_method_id })
 
       return update_failed
     end
diff --git a/app/services/order_workflow.rb b/app/services/order_workflow.rb
index 1351bfeee6..d333149283 100644
--- a/app/services/order_workflow.rb
+++ b/app/services/order_workflow.rb
@@ -13,9 +13,13 @@ class OrderWorkflow
     advance_order!(advance_order_options)
   end
 
-  def next
+  def next(options = {})
     tries ||= 3
-    order.next
+    result = order.next
+
+    after_transition_hook(options)
+
+    result
   rescue ActiveRecord::StaleObjectError
     retry unless (tries -= 1).zero?
     false

From ac5882e3e6f334abdb834539847b4e3cabfdd666 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 23:55:36 +0100
Subject: [PATCH 224/340] Refactor OrderWorkflow

---
 app/services/order_workflow.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/services/order_workflow.rb b/app/services/order_workflow.rb
index d333149283..f3d8b7143a 100644
--- a/app/services/order_workflow.rb
+++ b/app/services/order_workflow.rb
@@ -14,15 +14,11 @@ class OrderWorkflow
   end
 
   def next(options = {})
-    tries ||= 3
-    result = order.next
+    result = advance_order_one_step
 
     after_transition_hook(options)
 
     result
-  rescue ActiveRecord::StaleObjectError
-    retry unless (tries -= 1).zero?
-    false
   end
 
   private
@@ -47,6 +43,14 @@ class OrderWorkflow
     end
   end
 
+  def advance_order_one_step
+    tries ||= 3
+    order.next
+  rescue ActiveRecord::StaleObjectError
+    retry unless (tries -= 1).zero?
+    false
+  end
+
   def after_transition_hook(options)
     if order.state == "delivery"
       order.select_shipping_method(options[:shipping_method_id]) if options[:shipping_method_id]

From 07005594ff09a688f8a1af0a5a6afe4c3d1325cc Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 28 Jul 2020 23:56:43 +0100
Subject: [PATCH 225/340] Move payments persistence code to order workflow
 service

---
 app/controllers/checkout_controller.rb | 12 ------------
 app/services/order_workflow.rb         | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 66d5b445f7..6280be51bb 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -152,23 +152,11 @@ class CheckoutController < Spree::StoreController
       checkout_succeeded
       redirect_to(order_path(@order)) && return
     else
-      persist_all_payments if @order.state == "payment"
       flash[:error] = order_error
       checkout_failed
     end
   end
 
-  # When a payment fails, the order state machine rollbacks all transactions
-  #   Here we ensure we always persist all payments
-  def persist_all_payments
-    @order.payments.each do |payment|
-      original_payment_state = payment.state
-      if original_payment_state != payment.reload.state
-        payment.update(state: original_payment_state)
-      end
-    end
-  end
-
   def checkout_workflow(shipping_method_id)
     while @order.state != "complete"
       if @order.state == "payment"
diff --git a/app/services/order_workflow.rb b/app/services/order_workflow.rb
index f3d8b7143a..b7db840ef8 100644
--- a/app/services/order_workflow.rb
+++ b/app/services/order_workflow.rb
@@ -55,5 +55,19 @@ class OrderWorkflow
     if order.state == "delivery"
       order.select_shipping_method(options[:shipping_method_id]) if options[:shipping_method_id]
     end
+
+    persist_all_payments if order.state == "payment"
   end
+
+  # When a payment fails, the order state machine rollbacks all transactions
+  #   Here we ensure we always persist all payments
+  def persist_all_payments
+    order.payments.each do |payment|
+      original_payment_state = payment.state
+      if original_payment_state != payment.reload.state
+        payment.update(state: original_payment_state)
+      end
+    end
+  end
+
 end

From 4375a34ef825cf134ff9c88147aba05a504af6d6 Mon Sep 17 00:00:00 2001
From: Robin Klaus <rmklaus12@gmail.com>
Date: Wed, 29 Jul 2020 10:18:25 +1000
Subject: [PATCH 226/340] Updated message to Paypal payments cannot be captured
 in the Backoffice

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 668d94322d..0f7020857e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3332,7 +3332,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
           paypal:
-            no_payment_via_admin_backend: No Payment Via Admin Backend
+            no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:

From fe0c04b65043d83736e120cf1a33f47afc4a4044 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 29 Jul 2020 12:03:09 +1000
Subject: [PATCH 227/340] Complete renaming of AdvanceOrderService to
 OrderWorkflow

---
 app/controllers/spree/admin/payments_controller.rb     | 2 +-
 lib/tasks/sample_data/order_factory.rb                 | 2 +-
 spec/controllers/admin/proxy_orders_controller_spec.rb | 2 +-
 spec/jobs/subscription_confirm_job_spec.rb             | 4 ++--
 spec/services/order_factory_spec.rb                    | 2 +-
 spec/services/order_syncer_spec.rb                     | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb
index 408e6e5c81..bfdb4fd2ff 100644
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -37,7 +37,7 @@ module Spree
 
             redirect_to admin_order_payments_path(@order)
           else
-            AdvanceOrderService.new(@order).call!
+            OrderWorkflow.new(@order).complete!
 
             flash[:success] = Spree.t(:new_order_completed)
             redirect_to edit_admin_order_url(@order)
diff --git a/lib/tasks/sample_data/order_factory.rb b/lib/tasks/sample_data/order_factory.rb
index 29d4cf03c6..9614f685a0 100644
--- a/lib/tasks/sample_data/order_factory.rb
+++ b/lib/tasks/sample_data/order_factory.rb
@@ -45,7 +45,7 @@ class OrderFactory
 
   def create_complete_order
     order = create_cart_order
-    AdvanceOrderService.new(order).call
+    OrderWorkflow.new(order).complete
     order
   end
 
diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb
index 0bc63e3cb8..8d74a8d901 100644
--- a/spec/controllers/admin/proxy_orders_controller_spec.rb
+++ b/spec/controllers/admin/proxy_orders_controller_spec.rb
@@ -77,7 +77,7 @@ describe Admin::ProxyOrdersController, type: :controller do
     before do
       # Processing order to completion
       allow(Spree::OrderMailer).to receive(:cancel_email) { double(:email, deliver: true) }
-      AdvanceOrderService.new(order).call!
+      OrderWorkflow.new(order).complete!
       proxy_order.reload
       proxy_order.cancel
       allow(controller).to receive(:spree_current_user) { user }
diff --git a/spec/jobs/subscription_confirm_job_spec.rb b/spec/jobs/subscription_confirm_job_spec.rb
index 603da10a10..96f718efd1 100644
--- a/spec/jobs/subscription_confirm_job_spec.rb
+++ b/spec/jobs/subscription_confirm_job_spec.rb
@@ -19,7 +19,7 @@ describe SubscriptionConfirmJob do
     let(:proxy_orders) { job.send(:unconfirmed_proxy_orders) }
 
     before do
-      AdvanceOrderService.new(order).call!
+      OrderWorkflow.new(order).complete!
     end
 
     it "returns proxy orders that meet all of the criteria" do
@@ -126,7 +126,7 @@ describe SubscriptionConfirmJob do
     let(:order) { proxy_order.initialise_order! }
 
     before do
-      AdvanceOrderService.new(order).call!
+      OrderWorkflow.new(order).complete!
       allow(job).to receive(:send_confirmation_email).and_call_original
       setup_email
       expect(job).to receive(:record_order)
diff --git a/spec/services/order_factory_spec.rb b/spec/services/order_factory_spec.rb
index c67cbaaf0e..394de7eaeb 100644
--- a/spec/services/order_factory_spec.rb
+++ b/spec/services/order_factory_spec.rb
@@ -47,7 +47,7 @@ describe OrderFactory do
     end
 
     it "retains address, delivery, and payment attributes until completion of the order" do
-      AdvanceOrderService.new(order).call
+      OrderWorkflow.new(order).complete
 
       order.reload
 
diff --git a/spec/services/order_syncer_spec.rb b/spec/services/order_syncer_spec.rb
index 9990425f6a..2cd6010736 100644
--- a/spec/services/order_syncer_spec.rb
+++ b/spec/services/order_syncer_spec.rb
@@ -409,7 +409,7 @@ describe OrderSyncer do
 
       context "when order is complete" do
         it "does not update the line_item quantities and adds the order to order_update_issues with insufficient stock" do
-          AdvanceOrderService.new(order).call
+          OrderWorkflow.new(order).complete
 
           expect(syncer.sync!).to be true
 
@@ -423,7 +423,7 @@ describe OrderSyncer do
         it "does not update the line_item quantities and adds the order to order_update_issues with out of stock" do
           # this single item available is used when the order is completed below, making the item out of stock
           variant.update_attribute(:on_hand, 1)
-          AdvanceOrderService.new(order).call
+          OrderWorkflow.new(order).complete
 
           expect(syncer.sync!).to be true
 
@@ -507,7 +507,7 @@ describe OrderSyncer do
       end
 
       context "when order is complete" do
-        before { AdvanceOrderService.new(order).call }
+        before { OrderWorkflow.new(order).complete }
 
         it "does not add line_item and adds the order to order_update_issues" do
           expect(syncer.sync!).to be true

From c923edd3bbb75d083cff20525f99dc82a06a7de0 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 29 Jul 2020 11:36:49 +0200
Subject: [PATCH 228/340] Replace hardcoded URL with path helper

---
 spec/features/admin/variant_overrides_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index 80571f5488..7c4c6ff543 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -401,7 +401,7 @@ feature "
       let(:product) { order_cycle.products.first }
 
       before do
-        login_as_admin_and_visit 'admin/orders/new'
+        login_as_admin_and_visit spree.new_admin_order_path
         select2_select distributor.name, from: 'order_distributor_id'
         select2_select order_cycle.name, from: 'order_order_cycle_id'
         click_button 'Next'

From 9bf58a82584bf6afcdb8b20c72e6d19565c7daf5 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 29 Jul 2020 12:53:34 +0200
Subject: [PATCH 229/340] Add missing Catalan, Arabic & Turkish for momentjs

---
 app/assets/javascripts/darkswarm/all.js.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 953bbe645f..51209fadd6 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -39,6 +39,9 @@
 #= require moment/pt.js
 #= require moment/ru.js
 #= require moment/sv.js
+#= require moment/ca.js
+#= require moment/ar.js
+#= require moment/tr.js
 #
 #= require modernizr
 #

From 84178c637eea639cd5bd486cf131cb2ff4273dd7 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Wed, 29 Jul 2020 13:02:46 +0200
Subject: [PATCH 230/340] Add missing momentjs languages to back-office

---
 app/assets/javascripts/admin/all.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index 1acc26c66f..c43f365cb6 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -82,6 +82,9 @@
 //= require moment/pt.js
 //= require moment/ru.js
 //= require moment/sv.js
+//= require moment/ca.js
+//= require moment/ar.js
+//= require moment/tr.js
 
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

From 54cb479fa12e96b2d82552d80855f6a896d6edab Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Wed, 29 Jul 2020 13:04:34 -0700
Subject: [PATCH 231/340] Update Docker instructions to mention the
 recommendation to create one's own fork

---
 DOCKER.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/DOCKER.md b/DOCKER.md
index 65f6815425..935e62b729 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -17,7 +17,13 @@ Better to have at least 2GB free on your computer in order to download images an
 
 Open a terminal with a shell.
 
-Clone the repository:
+Clone the repository. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the Fork button in the top-right corner of this screen. You should then be able to use git clone to copy your fork onto your local machine.
+
+```sh
+$ git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
+```
+
+Otherwise, if you just want to get things running, clone from the OFN main repo:
 
 ```sh
 $ git clone git@github.com:openfoodfoundation/openfoodnetwork.git

From ad00971ca86fedb5ddd1a9b15d5e9e7148a3d343 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 29 Jul 2020 14:15:17 +0100
Subject: [PATCH 232/340] Improve readability and add bugsnag error (now in the
 checkout_failed method) when checkout_fails while handling stripe redirect

---
 app/controllers/checkout_controller.rb       | 30 +++++++++-----------
 spec/controllers/checkout_controller_spec.rb |  4 +--
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 6280be51bb..b801213e09 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -39,13 +39,13 @@ class CheckoutController < Spree::StoreController
 
     # This is only required because of spree_paypal_express. If we implement
     # a version of paypal that uses this controller, and more specifically
-    # the #update_failed method, then we can remove this call
+    # the #action_failed method, then we can remove this call
     OrderCheckoutRestart.new(@order).call
   end
 
   def update
     params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
-    return update_failed unless @order.update(params_adapter.params[:order])
+    return action_failed unless @order.update(params_adapter.params[:order])
 
     fire_event('spree.checkout.update')
 
@@ -54,7 +54,7 @@ class CheckoutController < Spree::StoreController
     rescue_from_spree_gateway_error(e)
   rescue StandardError => e
     flash[:error] = I18n.t("checkout.failed")
-    update_failed(e)
+    action_failed(e)
   end
 
   # Clears the cached order. Required for #current_order to return a new order
@@ -152,7 +152,6 @@ class CheckoutController < Spree::StoreController
       checkout_succeeded
       redirect_to(order_path(@order)) && return
     else
-      flash[:error] = order_error
       checkout_failed
     end
   end
@@ -165,7 +164,7 @@ class CheckoutController < Spree::StoreController
 
       next if OrderWorkflow.new(@order).next({ shipping_method_id: shipping_method_id })
 
-      return update_failed
+      return action_failed
     end
 
     update_response
@@ -193,7 +192,7 @@ class CheckoutController < Spree::StoreController
       checkout_succeeded
       update_succeeded_response
     else
-      update_failed(RuntimeError.new("Order not complete after the checkout workflow"))
+      action_failed(RuntimeError.new("Order not complete after the checkout workflow"))
     end
   end
 
@@ -219,19 +218,18 @@ class CheckoutController < Spree::StoreController
     end
   end
 
-  def update_failed(error = RuntimeError.new(order_error))
-    Bugsnag.notify(error)
-
-    flash[:error] = order_error if flash.blank?
-    checkout_failed
-    update_failed_response
+  def action_failed(error = RuntimeError.new(order_error))
+    checkout_failed(error)
+    action_failed_response
   end
 
-  def checkout_failed
+  def checkout_failed(error = RuntimeError.new(order_error))
+    Bugsnag.notify(error)
+    flash[:error] = order_error if flash.blank?
     Checkout::PostCheckoutActions.new(@order).failure
   end
 
-  def update_failed_response
+  def action_failed_response
     respond_to do |format|
       format.html do
         render :edit
@@ -244,9 +242,7 @@ class CheckoutController < Spree::StoreController
 
   def rescue_from_spree_gateway_error(error)
     flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
-    # This can also happen during the edit action
-    #   but the actions and response needed are exactly the same as when the update action fails
-    update_failed(error)
+    action_failed(error)
   end
 
   def permitted_params
diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb
index ecb18971db..e6412bebe3 100644
--- a/spec/controllers/checkout_controller_spec.rb
+++ b/spec/controllers/checkout_controller_spec.rb
@@ -298,7 +298,7 @@ describe CheckoutController, type: :controller do
     end
   end
 
-  describe "#update_failed" do
+  describe "#action_failed" do
     let(:restart_checkout) { instance_double(OrderCheckoutRestart, call: true) }
 
     before do
@@ -312,7 +312,7 @@ describe CheckoutController, type: :controller do
       expect(restart_checkout).to receive(:call)
       expect(controller).to receive(:respond_to)
 
-      controller.send(:update_failed)
+      controller.send(:action_failed)
     end
   end
 end

From da4abf66179618ced45abbe4c8f3724d5d5bc23e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 29 Jul 2020 21:57:55 +0100
Subject: [PATCH 233/340] Add a comment to explain the necessity of the first
 rescue in the update action

---
 app/controllers/checkout_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index b801213e09..479d740581 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -51,6 +51,8 @@ class CheckoutController < Spree::StoreController
 
     checkout_workflow(params_adapter.shipping_method_id)
   rescue Spree::Core::GatewayError => e
+    # This rescue is not replaceable by the generic rescue_from above because otherwise the rescue
+    #   below (StandardError) would catch the GatewayError and report it as a generic error
     rescue_from_spree_gateway_error(e)
   rescue StandardError => e
     flash[:error] = I18n.t("checkout.failed")

From 9e9e0d0bd8600def5eb469bc793d626bca365c67 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 29 Jul 2020 22:01:15 +0100
Subject: [PATCH 234/340] Remove rescue_from and just add the rescue to the
 edit action, the update action has a different logic where there is a generic
 rescue StandardError after the GatewayError rescue

---
 app/controllers/checkout_controller.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 479d740581..1dbffc71e1 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -32,8 +32,6 @@ class CheckoutController < Spree::StoreController
 
   helper 'spree/orders'
 
-  rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
-
   def edit
     return handle_redirect_from_stripe if valid_payment_intent_provided?
 
@@ -41,6 +39,8 @@ class CheckoutController < Spree::StoreController
     # a version of paypal that uses this controller, and more specifically
     # the #action_failed method, then we can remove this call
     OrderCheckoutRestart.new(@order).call
+  rescue Spree::Core::GatewayError => e
+    rescue_from_spree_gateway_error(e)
   end
 
   def update
@@ -51,8 +51,6 @@ class CheckoutController < Spree::StoreController
 
     checkout_workflow(params_adapter.shipping_method_id)
   rescue Spree::Core::GatewayError => e
-    # This rescue is not replaceable by the generic rescue_from above because otherwise the rescue
-    #   below (StandardError) would catch the GatewayError and report it as a generic error
     rescue_from_spree_gateway_error(e)
   rescue StandardError => e
     flash[:error] = I18n.t("checkout.failed")

From 2136eecd0968476878f1ab797beb809a14b9cafe Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 29 Jul 2020 22:34:45 +0100
Subject: [PATCH 235/340] Avoid reloading the payment every time, so that
 in-memory data is not wiped out

When checkout fails and the payment states dont match (inside the if), in-memory data of the failed payment can be lost but updating the payment state is the fundamental part here so that further checkout attempts work. We may improve this update statement so that all the data of the failed payment is persisted
---
 app/services/order_workflow.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/order_workflow.rb b/app/services/order_workflow.rb
index b7db840ef8..c2a7e9dc95 100644
--- a/app/services/order_workflow.rb
+++ b/app/services/order_workflow.rb
@@ -64,8 +64,8 @@ class OrderWorkflow
   def persist_all_payments
     order.payments.each do |payment|
       original_payment_state = payment.state
-      if original_payment_state != payment.reload.state
-        payment.update(state: original_payment_state)
+      if original_payment_state != Spree::Payment.find(payment.id).state
+        payment.reload.update(state: original_payment_state)
       end
     end
   end

From e739c5185ef9a7b79807ac0eb53649a2720d2621 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 29 Jul 2020 23:30:34 +0100
Subject: [PATCH 236/340] Add specs to verify that Spree::Core::Gateway
 exceptions are handled correctly

---
 spec/controllers/checkout_controller_spec.rb | 38 +++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb
index e6412bebe3..0d285dab08 100644
--- a/spec/controllers/checkout_controller_spec.rb
+++ b/spec/controllers/checkout_controller_spec.rb
@@ -67,10 +67,31 @@ describe CheckoutController, type: :controller do
         allow(order).to receive_message_chain(:insufficient_stock_lines, :empty?).and_return true
       end
 
-      it "does not redirect" do
-        expect(order_cycle_distributed_variants).to receive(:distributes_order_variants?).with(order).and_return(true)
-        get :edit
-        expect(response).to be_success
+      describe "order variants are distributed in the OC" do
+        before do
+          expect(order_cycle_distributed_variants).to receive(:distributes_order_variants?).with(order).and_return(true)
+        end
+
+        it "does not redirect" do
+          get :edit
+          expect(response).to be_success
+        end
+
+        it "returns a specific flash message when Spree::Core::GatewayError occurs" do
+          order_checkout_restart = double(:order_checkout_restart)
+          allow(OrderCheckoutRestart).to receive(:new) { order_checkout_restart }
+          call_count = 0
+          allow(order_checkout_restart).to receive(:call) do
+            call_count += 1
+            raise Spree::Core::GatewayError.new("Gateway blow up") if call_count == 1
+          end
+
+          spree_post :edit
+
+          expect(response.status).to eq(200)
+          flash_message = I18n.t(:spree_gateway_error_flash_for_checkout, error: "Gateway blow up")
+          expect(flash[:error]).to eq flash_message
+        end
       end
 
       describe "when the order is in payment state and a stripe payment intent is provided" do
@@ -230,6 +251,15 @@ describe CheckoutController, type: :controller do
       expect(response.body).to eq({ errors: {}, flash: { error: I18n.t("checkout.failed") } }.to_json)
     end
 
+    it "returns a specific error on Spree::Core::GatewayError" do
+      allow(order).to receive(:update).and_raise(Spree::Core::GatewayError.new("Gateway blow up"))
+      spree_post :update, format: :json, order: {}
+
+      expect(response.status).to eq(400)
+      flash_message = I18n.t(:spree_gateway_error_flash_for_checkout, error: "Gateway blow up")
+      expect(json_response["flash"]["error"]).to eq flash_message
+    end
+
     describe "stale object handling" do
       it "retries when a stale object error is encountered" do
         allow(OrderCompletionReset).to receive(:new).with(controller, order) { reset_order_service }

From 0359d103b2e151d48b2b0340957a7ecf6277fbd9 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 30 Jul 2020 17:12:41 +0100
Subject: [PATCH 237/340] Improve code comments on dodgy and/but critical
 checkout process method

---
 app/services/order_workflow.rb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/services/order_workflow.rb b/app/services/order_workflow.rb
index c2a7e9dc95..b55ed43ce1 100644
--- a/app/services/order_workflow.rb
+++ b/app/services/order_workflow.rb
@@ -59,15 +59,21 @@ class OrderWorkflow
     persist_all_payments if order.state == "payment"
   end
 
-  # When a payment fails, the order state machine rollbacks all transactions
-  #   Here we ensure we always persist all payments
+  # When a payment fails, the order state machine stays in 'payment' and rollbacks all transactions
+  #   This rollback also reverts the payment state from 'failed', 'void' or 'invalid' to 'pending'
+  #   Despite the rollback, the in-memory payment still has the correct state, so we persist it
   def persist_all_payments
     order.payments.each do |payment|
-      original_payment_state = payment.state
-      if original_payment_state != Spree::Payment.find(payment.id).state
-        payment.reload.update(state: original_payment_state)
+      in_memory_payment_state = payment.state
+      if different_from_db_payment_state?(in_memory_payment_state, payment.id)
+        payment.reload.update(state: in_memory_payment_state)
       end
     end
   end
 
+  # Verifies if the in-memory payment state is different from the one stored in the database
+  #   This is be done without reloading the payment so that in-memory data is not changed
+  def different_from_db_payment_state?(in_memory_payment_state, payment_id)
+    in_memory_payment_state != Spree::Payment.find(payment_id).state
+  end
 end

From 18cb0e0980e5c929b4ff1e8a860a50eefb1542cb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2020 16:56:15 +0000
Subject: [PATCH 238/340] Bump paper_trail from 5.2.3 to 7.1.3

Bumps [paper_trail](https://github.com/airblade/paper_trail) from 5.2.3 to 7.1.3.
- [Release notes](https://github.com/airblade/paper_trail/releases)
- [Changelog](https://github.com/paper-trail-gem/paper_trail/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airblade/paper_trail/compare/v5.2.3...v7.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0c442ca2c6..b2eede5f3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'oj'
-gem 'paper_trail', '~> 5.2.3'
+gem 'paper_trail', '~> 7.1.3'
 gem 'paperclip', '~> 3.4.1'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
diff --git a/Gemfile.lock b/Gemfile.lock
index fa904aedfc..0945342318 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -466,7 +466,7 @@ GEM
     money (5.1.1)
       i18n (~> 0.6.0)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (3.18.1.330)
@@ -481,8 +481,8 @@ GEM
     oj (3.10.8)
     optimist (3.0.0)
     orm_adapter (0.5.0)
-    paper_trail (5.2.3)
-      activerecord (>= 3.0, < 6.0)
+    paper_trail (7.1.3)
+      activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
     paperclip (3.4.2)
       activemodel (>= 3.0.0)
@@ -553,7 +553,7 @@ GEM
       nokogiri (~> 1.5)
       optimist (~> 3.0)
     redcarpet (3.5.0)
-    request_store (1.4.1)
+    request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
     roadie (3.4.0)
@@ -772,7 +772,7 @@ DEPENDENCIES
   ofn-qz!
   oj
   order_management!
-  paper_trail (~> 5.2.3)
+  paper_trail (~> 7.1.3)
   paperclip (~> 3.4.1)
   paranoia (~> 2.0)
   pg (~> 0.21.0)

From 27404872de24afa84db9951ea9f0ad51554880d6 Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Fri, 31 Jul 2020 00:20:55 +0300
Subject: [PATCH 239/340] Missing translation key for "height", "width",
 "depth"

When edit product in path admin/products/PRODUCT_NAME/varians/NN/edit
---
 config/locales/en.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4409580442..6f92710151 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -305,6 +305,9 @@ en:
   "on hand": "On Hand"
   ship: "Ship"
   shipping_category: "Shipping Category"
+  height: "Height"
+  width: "Width"
+  depth: "Depth"
 
   actions:
     create_and_add_another: "Create and Add Another"

From bee7990c608b068ec87c3bb98accff9b1ef33273 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 31 Jul 2020 15:58:04 +1000
Subject: [PATCH 240/340] Update translations

---
 config/locales/ar.yml     |  2 ++
 config/locales/ca.yml     |  2 ++
 config/locales/de_DE.yml  |  1 +
 config/locales/en_AU.yml  |  2 ++
 config/locales/en_BE.yml  |  2 ++
 config/locales/en_CA.yml  |  2 ++
 config/locales/en_DE.yml  |  2 ++
 config/locales/en_FR.yml  |  2 ++
 config/locales/en_GB.yml  |  2 ++
 config/locales/en_IE.yml  |  2 ++
 config/locales/en_IN.yml  |  2 ++
 config/locales/en_NZ.yml  |  2 ++
 config/locales/en_PH.yml  |  2 ++
 config/locales/en_US.yml  |  2 ++
 config/locales/en_ZA.yml  |  2 ++
 config/locales/es.yml     |  2 ++
 config/locales/es_CR.yml  |  2 ++
 config/locales/fil_PH.yml |  2 ++
 config/locales/fr.yml     |  4 +++-
 config/locales/fr_BE.yml  |  2 ++
 config/locales/fr_CA.yml  |  2 ++
 config/locales/it.yml     | 11 +++++++++++
 config/locales/nb.yml     |  2 ++
 config/locales/nl_BE.yml  |  2 ++
 config/locales/pt.yml     |  2 ++
 config/locales/pt_BR.yml  |  2 ++
 config/locales/tr.yml     | 10 ++++++----
 27 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e532c0e451..cc0b9e975f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1935,6 +1935,7 @@ ar:
   supplier: "المورد"
   product_name: "اسم المنتج"
   product_description: "وصف المنتج"
+  shipping_categories: "فئات الشحن"
   units: "حجم الوحدة"
   coordinator: "منسق"
   distributor: "الموزع"
@@ -2031,6 +2032,7 @@ ar:
   remove_tax: "إزالة الضريبة"
   first_name_begins_with: "الاسم الأول يبدأ بـ"
   last_name_begins_with: "اسم العائلة يبدأ بـ"
+  new_order: "طلب جديد"
   enterprise_tos_link: "شروط المؤسسة لخدمة الرابط"
   enterprise_tos_message: "نريد العمل مع أشخاص يشاركوننا أهدافنا وقيمنا. على هذا النحو ، نطلب من المؤسسات الجديدة الموافقة على"
   enterprise_tos_link_text: "شروط الخدمة."
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d28dc4ce8f..ab35107e71 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1963,6 +1963,7 @@ ca:
   supplier: "Proveïdora"
   product_name: "Nom del producte"
   product_description: "Descripció del producte"
+  shipping_categories: "Tipus d'enviament"
   units: "Mida d'unitat"
   coordinator: "Coordinador"
   distributor: "Distribuïdora"
@@ -2059,6 +2060,7 @@ ca:
   remove_tax: "Suprimeix comissions"
   first_name_begins_with: "El nom comença amb"
   last_name_begins_with: "El cognom comença amb"
+  new_order: "Nova comanda"
   enterprise_tos_link: "Enllaç a les condicions d'ús de l'organització"
   enterprise_tos_message: "Volem treballar amb persones que comparteixen els nostres objectius i valors. Com a tal, demanem a les noves organitzacions que acceptin la nostra"
   enterprise_tos_link_text: "Termes del servei."
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index f363ab3a6c..2cdcd6fcc3 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -1931,6 +1931,7 @@ de_DE:
   supplier: "Anbieter"
   product_name: "Produktname"
   product_description: "Produktbeschreibung"
+  shipping_categories: "Versandkategorien"
   units: "Einheitsgröße"
   coordinator: "Koordinator"
   distributor: "Verteiler"
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
index b29d8ba4d6..e6e8d32f5a 100644
--- a/config/locales/en_AU.yml
+++ b/config/locales/en_AU.yml
@@ -1928,6 +1928,7 @@ en_AU:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2023,6 +2024,7 @@ en_AU:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml
index c7814a9c5b..a77ebfec6e 100644
--- a/config/locales/en_BE.yml
+++ b/config/locales/en_BE.yml
@@ -1888,6 +1888,7 @@ en_BE:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -1983,6 +1984,7 @@ en_BE:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index 530fd92e97..534596c546 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -1959,6 +1959,7 @@ en_CA:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2055,6 +2056,7 @@ en_CA:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index 8ac88a1c22..22d03e1dd2 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -1898,6 +1898,7 @@ en_DE:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -1993,6 +1994,7 @@ en_DE:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 4d85ebcb22..e455b97258 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -1960,6 +1960,7 @@ en_FR:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2056,6 +2057,7 @@ en_FR:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index f0eb4a9725..4b029c385a 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -1959,6 +1959,7 @@ en_GB:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2055,6 +2056,7 @@ en_GB:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Surname begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_IE.yml b/config/locales/en_IE.yml
index 2d46fa0f80..c3ae9025ef 100644
--- a/config/locales/en_IE.yml
+++ b/config/locales/en_IE.yml
@@ -1957,6 +1957,7 @@ en_IE:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2053,6 +2054,7 @@ en_IE:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Surname begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_IN.yml b/config/locales/en_IN.yml
index 024c3eee41..c9eb57367d 100644
--- a/config/locales/en_IN.yml
+++ b/config/locales/en_IN.yml
@@ -1959,6 +1959,7 @@ en_IN:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2055,6 +2056,7 @@ en_IN:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Surname begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index 1ce3017028..7b17a515d8 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -1959,6 +1959,7 @@ en_NZ:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2055,6 +2056,7 @@ en_NZ:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_PH.yml b/config/locales/en_PH.yml
index a687445c8e..a2ce920948 100644
--- a/config/locales/en_PH.yml
+++ b/config/locales/en_PH.yml
@@ -1933,6 +1933,7 @@ en_PH:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2029,6 +2030,7 @@ en_PH:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index da39b9874a..eae38be679 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -1957,6 +1957,7 @@ en_US:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2053,6 +2054,7 @@ en_US:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml
index ad18d61c0d..84ddac5500 100644
--- a/config/locales/en_ZA.yml
+++ b/config/locales/en_ZA.yml
@@ -1947,6 +1947,7 @@ en_ZA:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
   distributor: "Distributor"
@@ -2043,6 +2044,7 @@ en_ZA:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Surname begins with"
+  new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
   enterprise_tos_link_text: "Terms of Service."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 47bb7f0cfc..99fc21813f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1962,6 +1962,7 @@ es:
   supplier: "Proveedora"
   product_name: "nombre del producto"
   product_description: "Descripción del producto"
+  shipping_categories: "Categorías de envío"
   units: "Unidad de medida"
   coordinator: "Coordinadora"
   distributor: "Distribuidor"
@@ -2058,6 +2059,7 @@ es:
   remove_tax: "Eliminar impuesto"
   first_name_begins_with: "El nombre comienza con"
   last_name_begins_with: "El apellido comienza con"
+  new_order: "Nuevo pedido"
   enterprise_tos_link: "Enlace a los Términos del Servicio de la Organización"
   enterprise_tos_message: "Queremos trabajar con personas que compartan nuestros objetivos y valores. Por ello, pedimos a las nuevas organizaciones que acepten"
   enterprise_tos_link_text: "Términos del Servicio."
diff --git a/config/locales/es_CR.yml b/config/locales/es_CR.yml
index 02d9bfe609..60d302418d 100644
--- a/config/locales/es_CR.yml
+++ b/config/locales/es_CR.yml
@@ -1937,6 +1937,7 @@ es_CR:
   supplier: "Proveedora"
   product_name: "nombre del producto"
   product_description: "Descripción del producto"
+  shipping_categories: "Categorías de envío"
   units: "Unidad de medida"
   coordinator: "Coordinadora"
   distributor: "Distribuidor"
@@ -2033,6 +2034,7 @@ es_CR:
   remove_tax: "Eliminar impuesto"
   first_name_begins_with: "El nombre comienza con"
   last_name_begins_with: "El apellido comienza con"
+  new_order: "Nuevo pedido"
   enterprise_tos_link: "Enlace a los Términos del Servicio de la Organización"
   enterprise_tos_message: "Queremos trabajar con personas que compartan nuestros objetivos y valores. Por ello, pedimos a las nuevas organizaciones que acepten"
   enterprise_tos_link_text: "Términos del Servicio."
diff --git a/config/locales/fil_PH.yml b/config/locales/fil_PH.yml
index a69c602532..d892591c6b 100644
--- a/config/locales/fil_PH.yml
+++ b/config/locales/fil_PH.yml
@@ -1937,6 +1937,7 @@ fil_PH:
   supplier: "Supplier"
   product_name: "pangalan ng produkto"
   product_description: "paglalarawan ng produkto"
+  shipping_categories: "mga kategorya ng pagpapadala"
   units: "laki kada yunit"
   coordinator: "coordinator"
   distributor: "Distributor"
@@ -2033,6 +2034,7 @@ fil_PH:
   remove_tax: "alisin ang tax"
   first_name_begins_with: "ang pangalan ay nagsisimula sa"
   last_name_begins_with: "ang apelyido ay nagsisimula sa"
+  new_order: "bagong order"
   enterprise_tos_link: "Link para sa palatuntunan ng serbisyo ng Enterprise"
   enterprise_tos_message: "nais naming makiisa sa mga taong kapareho ng aming layunin at adhikain. Dahil dito, hinihiling namin sa mga bagong enterprise na sumang-ayon sa aming"
   enterprise_tos_link_text: "Mga Tuntunin ng Serbisyo."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 115a360802..7d7b336f17 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1153,7 +1153,7 @@ fr:
       cart:
         cart: "Panier"
       cart_sidebar:
-        checkout: "Etape suivante (coordonnées)"
+        checkout: "Etape suivante"
         edit_cart: "Modifier le panier"
         items_in_cart_singular: "%{num} élément dans le panier"
         items_in_cart_plural: "%{num} éléments dans le panier"
@@ -1962,6 +1962,7 @@ fr:
   supplier: "Fournisseur"
   product_name: "Nom du Produit"
   product_description: "Description du Produit"
+  shipping_categories: "Conditions de transport"
   units: "Unité de mesure"
   coordinator: "Coordinateur"
   distributor: "Distributeur"
@@ -2058,6 +2059,7 @@ fr:
   remove_tax: "Retirer TVA"
   first_name_begins_with: "Prénom commence par"
   last_name_begins_with: "Nom de famille commence par"
+  new_order: "Nouvelle commande"
   enterprise_tos_link: "Lien vers les Conditions Générales d'Utilisation"
   enterprise_tos_message: "Nous soutenons la mise en place d'un système alimentaire résilient et durable, et souhaitons œuvrer avec des entreprises qui partagent nos valeurs et notre vision. Ainsi, nous demandons aux entreprises s'enregistrant sur Open Food France de valider nos "
   enterprise_tos_link_text: "Conditions d'utilisation"
diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml
index cb8f260e97..81a2b61b42 100644
--- a/config/locales/fr_BE.yml
+++ b/config/locales/fr_BE.yml
@@ -1940,6 +1940,7 @@ fr_BE:
   supplier: "Fournisseurs"
   product_name: "Nom du Produit"
   product_description: "Description du Produit"
+  shipping_categories: "Condition de transport"
   units: "Unité de mesure"
   coordinator: "Coordinateur"
   distributor: "Distributeur"
@@ -2036,6 +2037,7 @@ fr_BE:
   remove_tax: "Retirer TVA"
   first_name_begins_with: "Début du prénom"
   last_name_begins_with: "Début du nom de famille"
+  new_order: "Nouvelle commande"
   enterprise_tos_link: "Lien vers les Conditions Générales d'Utilisation"
   enterprise_tos_message: "Nous soutenons la mise en place d'un système alimentaire résilient et durable, et souhaitons œuvrer avec des acteurs et actrices qui partagent nos valeurs et notre vision. Ainsi, nous demandons aux acteurs s'enregistrant sur Open Food Network de valider nos "
   enterprise_tos_link_text: "Conditions d'utilisation"
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 20e5e4c0f5..92b8a8a99e 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -1961,6 +1961,7 @@ fr_CA:
   supplier: "Fournisseurs"
   product_name: "Nom du Produit"
   product_description: "Description du Produit"
+  shipping_categories: "Condition de transport"
   units: "Unité de mesure"
   coordinator: "Coordinateur"
   distributor: "Distributeur"
@@ -2057,6 +2058,7 @@ fr_CA:
   remove_tax: "Retirer taxe"
   first_name_begins_with: "Prénom commence par"
   last_name_begins_with: "Nom de famille commence par"
+  new_order: "Nouvelle commande"
   enterprise_tos_link: "Lien vers les Conditions Générales d'Utilisation"
   enterprise_tos_message: "Nous soutenons la mise en place d'un système alimentaire résilient et durable, et souhaitons œuvrer avec des entreprises qui partagent nos valeurs et notre vision. Ainsi, nous demandons aux entreprises s'enregistrant sur Open Food Network de valider nos "
   enterprise_tos_link_text: "Conditions d'utilisation"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 607b854f1f..70718ec09b 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -14,6 +14,7 @@ it:
       spree/payment:
         amount: Quantità
         state: Stato
+        source: Fonte
       spree/product:
         primary_taxon: "Categoria Prodotto"
         supplier: "Fornitore"
@@ -183,6 +184,7 @@ it:
         explainer: L'elaborazione automatica di queste gentili richieste non è riuscita per una ragione sconosciuta. Questo non dovrebbe accadere, ti preghiamo di contattarci se visualizzi questo messaggio.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Benvenuto su"
   site_meta_description: "Cominciamo da zero. Con i produttori e gli allevatori pronti a raccontare le loro storie, sinceramente e orgogliosamente. Con i distributori pronti a connettere le persone con i prodotti in modo giusto ed equo. Con i compratori che credono che migliori decisioni per l'acquisto settimanale possano..."
   search_by_name: Cerca per nome o zona...
   producers_join: I Produttori sono ora invitati ad unirsi ad Open Food Network
@@ -1151,7 +1153,11 @@ it:
         cart: "Carrello"
       cart_sidebar:
         checkout: "Paga"
+        edit_cart: "Modifica il carrello"
+        items_in_cart_singular: "%{num} articolo nel tuo carrello"
+        items_in_cart_plural: "%{num} articoli nel tuo carrello"
         close: "Chiuso"
+        cart_empty: "Il tuo carrello è vuoto"
       signed_in:
         profile: "Profilo"
       mobile_menu:
@@ -1710,6 +1716,7 @@ it:
   remember_me: Ricordami
   are_you_sure: "Sei sicuro?"
   orders_open: "Richieste aperte"
+  closing: "In chiusura"
   going_back_to_home_page: "Reindirizzamento alla homepage"
   creating: In creazione
   updating: In aggiornamento
@@ -1953,6 +1960,7 @@ it:
   supplier: "Fornitore"
   product_name: "Nome Prodotto"
   product_description: "Descrizione prodotto"
+  shipping_categories: "Categorie Spedizioni"
   units: "Unità di misura"
   coordinator: "Coordinatore"
   distributor: "Distributore"
@@ -2049,6 +2057,7 @@ it:
   remove_tax: "Rimuovi tassa"
   first_name_begins_with: "Il nome inizia con"
   last_name_begins_with: "Il cognome inizia con"
+  new_order: "Nuovo ordine"
   enterprise_tos_link: "link Termini di Servizio Aziende"
   enterprise_tos_message: "Abbiamo bisogno di lavorare con persone che condividono i nostri scopi e i nostri valori. Per questo chiediamo alle nuove aziende di sottoscrivere i nostri"
   enterprise_tos_link_text: "Termini di Servizio"
@@ -2067,6 +2076,7 @@ it:
   hub_sidebar_at_least: "Almeno un hub deve essere selezionato"
   hub_sidebar_blue: "blu"
   hub_sidebar_red: "rosso"
+  order_cycles_closed_for_hub: "L'hub che hai selezionato è temporaneamente chiuso. Riprova più tardi."
   report_customers_distributor: "Distributore"
   report_customers_supplier: "Fornitore"
   report_customers_cycle: "Ciclo di richieste"
@@ -2303,6 +2313,7 @@ it:
   order_cycles_email_to_producers_notice: 'Le email da inviare ai produttori sono state messe in coda per l''invio.'
   order_cycles_no_permission_to_coordinate_error: "Nessuna delle tue aziende ha il permesso di coordinare un ciclo di richieste"
   order_cycles_no_permission_to_create_error: "Non hai il permesso di creare un ciclo di richieste coordinato da questa azienda"
+  order_cycle_closed: "Il ciclo di richieste che hai selezionato è appena chiuso. Riprova per favore!"
   back_to_orders_list: "Indietro alla lista delle gentili richieste"
   no_orders_found: "Nessuna gentile richiesta trovata"
   order_information: "Informazioni Gentile Richiesta"
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index e2125ed1dc..bec2cfbc50 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1957,6 +1957,7 @@ nb:
   supplier: "Leverandør"
   product_name: "Produktnavn"
   product_description: "Produktbeskrivelse"
+  shipping_categories: "Fraktkategorier"
   units: "Enhetsstørrelse"
   coordinator: "Koordinator"
   distributor: "Distributør"
@@ -2053,6 +2054,7 @@ nb:
   remove_tax: "Fjern avgift"
   first_name_begins_with: "Fornavn begynner med"
   last_name_begins_with: "Etternavn begynner med"
+  new_order: "Ny bestilling"
   enterprise_tos_link: "Lenke til Tjenestevilkår for Bedrifter"
   enterprise_tos_message: "Vi ønsker å jobbe med bedrifter som deler våre mål og verdier. Derfor ber vi nye bedrifter om å godta vår"
   enterprise_tos_link_text: "Tjenestevilkår."
diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml
index 2df7deb5ec..9d0b11be09 100644
--- a/config/locales/nl_BE.yml
+++ b/config/locales/nl_BE.yml
@@ -1891,6 +1891,7 @@ nl_BE:
   supplier: "Leverancier"
   product_name: "Naam produkt"
   product_description: "Beschrijving product"
+  shipping_categories: "Verzendingscategorieën"
   units: "Stukgrootte"
   coordinator: "Coördinator"
   distributor: "Distributeur"
@@ -1986,6 +1987,7 @@ nl_BE:
   remove_tax: "Verwijder belasting"
   first_name_begins_with: "Voornaam begint met"
   last_name_begins_with: "Familienaam begint met "
+  new_order: "Nieuwe bestelling"
   enterprise_tos_link: "Link Voorwaarden Onderneming"
   enterprise_tos_message: "We willen met mensen werken die onze normen en waarden en delen. Daarom vragen wij aan de nieuwe bedrijven akkoord te gaan met onze  "
   enterprise_tos_link_text: "Dienstvoorwaarden"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index cef2df924b..ace3115424 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1864,6 +1864,7 @@ pt:
   supplier: "Fornecedor"
   product_name: "Nome do Produto"
   product_description: "Descrição do Produto"
+  shipping_categories: "Categorias de Envio"
   units: "Tamanho unitário"
   coordinator: "Coordenador"
   distributor: "Distribuidor"
@@ -1958,6 +1959,7 @@ pt:
   remove_tax: "Remover imposto"
   first_name_begins_with: "Primeiro nome começa com"
   last_name_begins_with: "Último nome começa com"
+  new_order: "Nova Encomenda"
   enterprise_tos_link: "Ligação para Termos de Serviço da Organização"
   enterprise_tos_message: "Queremos trabalhar com pessoas que partilham os nossos objectivos e valores. Por isso pedimos às organizações novas que concordem com os nossos"
   enterprise_tos_link_text: "Termos de Serviço."
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 7c91a2c162..c267ef9cfa 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -1957,6 +1957,7 @@ pt_BR:
   supplier: "Fornecedor"
   product_name: "Nome do Produto"
   product_description: "Descrição do Produto"
+  shipping_categories: "Categorias de Remessa"
   units: "Unidade de medida"
   coordinator: "Coordenador"
   distributor: "Distribuidor"
@@ -2053,6 +2054,7 @@ pt_BR:
   remove_tax: "Remover taxa"
   first_name_begins_with: "O primeiro nome começa com"
   last_name_begins_with: "O sobrenome começa com"
+  new_order: "Novo Pedido"
   enterprise_tos_link: "Link de Termos de Serviço da iniciativa"
   enterprise_tos_message: "Queremos trabalhar com pessoas que compartilham nossos objetivos e valores. Como tal, pedimos às novas iniciativas que concordem com nossos"
   enterprise_tos_link_text: "Termos de Serviço."
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index cd328fd0fe..133a5b669c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -125,9 +125,9 @@ tr:
       subject: "Lütfen %{enterprise} için e-posta adresini doğrulayın"
     welcome:
       subject: "%{enterprise} şimdi %{sitename} 'de"
-      email_welcome: "Hoşgeldiniz"
+      email_welcome: "Aramıza Hoşgeldiniz "
       email_registered: "şimdi bir parçası"
-      email_userguide_html: "Tezgah veya Pazar hesapları ayarları ile ilgili ayrıntılı desteğe sahip Kullanıcı Kılavuzu burada: %{link}"
+      email_userguide_html: "Dükkan veya Pazar hesapları ayarları ile ilgili ayrıntılı desteğe sahip Kullanıcı Kılavuzu burada: %{link}"
       userguide: "Açık Gıda Ağı Kullanıcı Kılavuzu"
       email_admin_html: "%{link}'dan oturum açarak veya ana sayfanın sağ üst kısmındaki ayarlar simgesini tıkladıktan sonra Yönetim' butonu üzerinden hesabınızı yönetebilirsiniz."
       admin_panel: "YönetiİCİ Panelİ"
@@ -1619,7 +1619,7 @@ tr:
   producers_contact: İLETİŞİM
   producers_contact_phone: 'Tel:'
   producers_contact_social: TAKİP ET
-  producers_buy_at_html: "%{enterprise} ürünleri için buradan alışveriş yapın:"
+  producers_buy_at_html: "%{enterprise} ÜRÜNLERİNİ SATIN ALIN:"
   producers_filter: Filtrele
   producers_filter_type: tür
   producers_filter_property: Özellik
@@ -1896,7 +1896,7 @@ tr:
   shop_variant_quantity_min: "min"
   shop_variant_quantity_max: "maks"
   follow: "TAKİP ET"
-  shop_for_products_html: "<span class=\"turquoise\">%{enterprise}</span> ürünleri için şuradan alışveriş yapın:"
+  shop_for_products_html: "<span class=\"turquoise\">%{enterprise}</span> ÜRÜNLERİNİ SATIN ALIN:"
   change_shop: "Dükkanı şuna değiştir:"
   shop_at: "Şimdi alışveriş yapın:"
   price_breakdown: "Fiyat dökümü"
@@ -1960,6 +1960,7 @@ tr:
   supplier: "Tedarikçi"
   product_name: "Ürün Adı"
   product_description: "Ürün Açıklaması"
+  shipping_categories: "Teslimat Kategorileri"
   units: "Ölçü Birimi"
   coordinator: "KOORDİNATÖR"
   distributor: "Dağıtımcı"
@@ -2056,6 +2057,7 @@ tr:
   remove_tax: "Vergiyi kaldır"
   first_name_begins_with: "Adının BAŞ HARFİ"
   last_name_begins_with: "Soyadının BAŞ HARFİ"
+  new_order: "Yeni Sipariş"
   enterprise_tos_link: "İşletme Üyelik Sözleşmesi bağlantısı"
   enterprise_tos_message: "Amaçlarımızı ve değerlerimizi paylaşan insanlarla çalışmak istiyoruz. Yasal zorunluluk gereği de yeni işletmelerden kabul etmesini istiyoruz:"
   enterprise_tos_link_text: "Üyelik Sözleşmesi"

From 581a246b4fbc3a7cab32e272619cf9af48a5dcf3 Mon Sep 17 00:00:00 2001
From: Robin Klaus <rmklaus12@gmail.com>
Date: Fri, 31 Jul 2020 16:16:06 +1000
Subject: [PATCH 241/340] Added translation key for subscriptions heading

---
 config/locales/en.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3726167337..a0c3551a46 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -347,6 +347,8 @@ en:
     volume: Volume
     items: Items
     select_all: Select all
+    subscription:
+      subscriptions: Subscriptions
 
     # General form elements
     quick_search: Quick Search

From 50647697179c5501b8bce919ee0849a5fdf581d8 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 31 Jul 2020 16:59:55 +1000
Subject: [PATCH 242/340] Updating translations for config/locales/ca.yml

---
 config/locales/ca.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ab35107e71..803542692b 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1529,7 +1529,7 @@ ca:
   shopping_contact_social: "Segueix"
   shopping_groups_part_of: "forma part de:"
   shopping_producers_of_hub: "Productores de%{hub}:"
-  enterprises_next_closing: "Tancament de la comanda següent"
+  enterprises_next_closing: "La següent comanda tanca"
   enterprises_ready_for: "Llest per"
   enterprises_choose: "Escull quan vols la teva comanda:"
   maps_open: "Obert"
@@ -1963,6 +1963,7 @@ ca:
   supplier: "Proveïdora"
   product_name: "Nom del producte"
   product_description: "Descripció del producte"
+  permalink: "Enllaç permanent"
   shipping_categories: "Tipus d'enviament"
   units: "Mida d'unitat"
   coordinator: "Coordinador"
@@ -2060,6 +2061,7 @@ ca:
   remove_tax: "Suprimeix comissions"
   first_name_begins_with: "El nom comença amb"
   last_name_begins_with: "El cognom comença amb"
+  shipping_method: "Mètode d'enviament"
   new_order: "Nova comanda"
   enterprise_tos_link: "Enllaç a les condicions d'ús de l'organització"
   enterprise_tos_message: "Volem treballar amb persones que comparteixen els nostres objectius i valors. Com a tal, demanem a les noves organitzacions que acceptin la nostra"
@@ -3176,6 +3178,8 @@ ca:
           stripe:
             error_saving_payment: Error en desar el pagament
             submitting_payment: S'està lliurant el pagament...
+          paypal:
+            no_payment_via_admin_backend: Els pagaments amb Paypal no es poden capturar des de l'administració
       products:
         image_upload_error: "No s'ha reconegut la imatge del producte. Carregueu una imatge en format PNG o JPG."
         new:

From 1ea06763f82ef413b665aee38e3d1db803b358bb Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 31 Jul 2020 17:00:19 +1000
Subject: [PATCH 243/340] Updating translations for config/locales/es.yml

---
 config/locales/es.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 99fc21813f..b22bb7e193 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1962,6 +1962,7 @@ es:
   supplier: "Proveedora"
   product_name: "nombre del producto"
   product_description: "Descripción del producto"
+  permalink: "Enlace permanente"
   shipping_categories: "Categorías de envío"
   units: "Unidad de medida"
   coordinator: "Coordinadora"
@@ -2059,6 +2060,7 @@ es:
   remove_tax: "Eliminar impuesto"
   first_name_begins_with: "El nombre comienza con"
   last_name_begins_with: "El apellido comienza con"
+  shipping_method: "Método de envío"
   new_order: "Nuevo pedido"
   enterprise_tos_link: "Enlace a los Términos del Servicio de la Organización"
   enterprise_tos_message: "Queremos trabajar con personas que compartan nuestros objetivos y valores. Por ello, pedimos a las nuevas organizaciones que acepten"
@@ -3176,6 +3178,8 @@ es:
           stripe:
             error_saving_payment: Error al guardar el pago
             submitting_payment: Enviando pago...
+          paypal:
+            no_payment_via_admin_backend: Los pagos de PayPal no se pueden capturar desde l'administración
       products:
         image_upload_error: "La imagen del producto no fue reconocida. Por favor, cargue una imagen en formato PNG o JPG."
         new:

From 85e9819c3b262dd93069a2a6b7bb3b4a1e78375a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 31 Jul 2020 08:59:11 +0100
Subject: [PATCH 244/340] Make more translation keys use lazy look ups

---
 app/views/admin/subscriptions/_form.html.haml    |  2 +-
 app/views/admin/subscriptions/edit.html.haml     |  2 +-
 app/views/admin/subscriptions/index.html.haml    |  4 ++--
 app/views/admin/subscriptions/new.html.haml      |  2 +-
 .../subscriptions/setup_explanation.html.haml    |  2 +-
 config/locales/en.yml                            | 16 ++++++++++------
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/subscriptions/_form.html.haml b/app/views/admin/subscriptions/_form.html.haml
index 2b3a06673b..cfb4feddaf 100644
--- a/app/views/admin/subscriptions/_form.html.haml
+++ b/app/views/admin/subscriptions/_form.html.haml
@@ -4,7 +4,7 @@
       %a.button{ href: main_app.admin_subscriptions_path, ng: { show: "['details','review'].indexOf(view) >= 0" } }= t(:cancel)
       %input{ type: "button", value: t(:back), ng: { click: 'back()', show: '!!backCallbacks[view]'} }
       %input.red{ type: "button", value: t(:next), ng: { click: 'next()', show: '!!nextCallbacks[view]' } }
-      %input.red{ type: "submit", value: t('admin.subscriptions.create'), ng: { show: "view == 'review'" } }
+      %input.red{ type: "submit", value: t('.create'), ng: { show: "view == 'review'" } }
     %div{ ng: { show: 'subscription.id' } }
       %a.button{ href: main_app.admin_subscriptions_path }= t(:close)
       %input.red{ type: "button", value: t(:review), ng: { click: "setView('review')", show: "view != 'review'" } }
diff --git a/app/views/admin/subscriptions/edit.html.haml b/app/views/admin/subscriptions/edit.html.haml
index 2084e9d761..51b4c40045 100644
--- a/app/views/admin/subscriptions/edit.html.haml
+++ b/app/views/admin/subscriptions/edit.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  =t('admin.subscriptions.edit')
+  =t('.title')
 
 -# - content_for :page_actions do
 -#   %li= button_link_to "Back to subscriptions list", main_app.admin_subscriptions_path, icon: 'icon-arrow-left'
diff --git a/app/views/admin/subscriptions/index.html.haml b/app/views/admin/subscriptions/index.html.haml
index 4dd37c4f75..f6688693f7 100644
--- a/app/views/admin/subscriptions/index.html.haml
+++ b/app/views/admin/subscriptions/index.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = t('admin.subscriptions.subscriptions')
+  = t('.title')
 
 - content_for :main_ng_app_name do
   = "admin.subscriptions"
@@ -7,7 +7,7 @@
 - content_for :page_actions do
   %li
     %a.button.icon-plus#new-subscription{ href: "javascript:void(0)", "new-subscription-dialog" => true }
-      = t('admin.subscriptions.new')
+      = t('.new')
 
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
diff --git a/app/views/admin/subscriptions/new.html.haml b/app/views/admin/subscriptions/new.html.haml
index c82824891c..6ac3749982 100644
--- a/app/views/admin/subscriptions/new.html.haml
+++ b/app/views/admin/subscriptions/new.html.haml
@@ -1,7 +1,7 @@
 -# = render :partial => 'spree/shared/error_messages', :locals => { :target => @enterprise }
 
 - content_for :page_title do
-  =t('admin.subscriptions.new')
+  =t('.title')
 
 -# - content_for :page_actions do
 -#   %li= button_link_to "Back to subscriptions list", main_app.admin_subscriptions_path, icon: 'icon-arrow-left'
diff --git a/app/views/admin/subscriptions/setup_explanation.html.haml b/app/views/admin/subscriptions/setup_explanation.html.haml
index 676483a55e..a3e7a8017e 100644
--- a/app/views/admin/subscriptions/setup_explanation.html.haml
+++ b/app/views/admin/subscriptions/setup_explanation.html.haml
@@ -1,4 +1,4 @@
-%h1.text-center.margin-bottom-30= t('admin.subscription.subscriptions')
+%h1.text-center.margin-bottom-30= t('.title')
 
 .row
   .four.columns.alpha &nbsp;
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a0c3551a46..80803d7aa5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -347,8 +347,6 @@ en:
     volume: Volume
     items: Items
     select_all: Select all
-    subscription:
-      subscriptions: Subscriptions
 
     # General form elements
     quick_search: Quick Search
@@ -1093,10 +1091,13 @@ en:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1105,6 +1106,7 @@ en:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1118,6 +1120,8 @@ en:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address

From f7ee6ce6c57ab9cb8dfdc3b7badd77b948b29730 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 14:31:50 +0000
Subject: [PATCH 245/340] [Security] Bump devise from 2.2.8 to 3.5.10

Bumps [devise](https://github.com/plataformatec/devise) from 2.2.8 to 3.5.10. **This update includes a security fix.**
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/v3.5.10/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v2.2.8...v3.5.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0c442ca2c6..13beb57c1e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,7 +49,7 @@ gem 'stripe'
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78.0'
 
-gem 'devise', '~> 3.0.1'
+gem 'devise', '~> 3.5.10'
 gem 'devise-encryptable'
 gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
diff --git a/Gemfile.lock b/Gemfile.lock
index fa904aedfc..68f8b9dfe1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,8 +148,6 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt (3.1.13)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     bugsnag (6.14.0)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
@@ -219,10 +217,12 @@ GEM
       delayed_job (> 2.0.3)
       rack-protection (>= 1.5.5)
       sinatra (>= 1.4.4)
-    devise (3.0.4)
-      bcrypt-ruby (~> 3.0)
+    devise (3.5.10)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
@@ -555,6 +555,8 @@ GEM
     redcarpet (3.5.0)
     request_store (1.4.1)
       rack (>= 1.4)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
     rexml (3.2.4)
     roadie (3.4.0)
       css_parser (~> 1.4)
@@ -735,7 +737,7 @@ DEPENDENCIES
   debugger-linecache
   delayed_job_active_record
   delayed_job_web
-  devise (~> 3.0.1)
+  devise (~> 3.5.10)
   devise-encryptable
   dfc_provider!
   diffy

From 40e065eadaff112442ce2411c0638c42a11f0231 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 18 Jun 2020 15:58:39 +0100
Subject: [PATCH 246/340] Add gem for Devise::TokenAuthenticatable and
 configure it

---
 Gemfile                       | 3 ++-
 Gemfile.lock                  | 3 +++
 config/initializers/devise.rb | 9 +++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 13beb57c1e..88ad191231 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,8 +49,9 @@ gem 'stripe'
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78.0'
 
-gem 'devise', '~> 3.5.10'
+gem 'devise', '~> 3.5.10' # v4.0.0 needs rails 4.1
 gem 'devise-encryptable'
+gem 'devise-token_authenticatable', '~> 0.4.10' # v0.5.0 needs devise v4
 gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 68f8b9dfe1..f0678f9a11 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -226,6 +226,8 @@ GEM
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
+    devise-token_authenticatable (0.4.10)
+      devise (>= 3.5.2, < 4.0.0)
     diff-lcs (1.3)
     diffy (3.3.0)
     docile (1.3.2)
@@ -739,6 +741,7 @@ DEPENDENCIES
   delayed_job_web
   devise (~> 3.5.10)
   devise-encryptable
+  devise-token_authenticatable (~> 0.4.10)
   dfc_provider!
   diffy
   eventmachine (>= 1.2.3)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index e20b748148..5a101fbe4d 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -90,10 +90,6 @@ Devise.setup do |config|
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
 
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  config.token_authentication_key = :auth_token
-
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering 'sessions/new', it will first check for
   # 'users/sessions/new'. It's turned off by default because it's slower if you
@@ -141,3 +137,8 @@ Devise.setup do |config|
 
   config.case_insensitive_keys = [:email]
 end
+
+Devise::TokenAuthenticatable.setup do |config|
+  # Defines name of the authentication token params key
+  config.token_authentication_key = :auth_token
+end

From 26ca374a76a1d8702a89d5b542ad22017aa140ed Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 18 Jun 2020 16:52:14 +0100
Subject: [PATCH 247/340] Adpat user mailer to devise v3

---
 app/mailers/spree/user_mailer.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/mailers/spree/user_mailer.rb b/app/mailers/spree/user_mailer.rb
index ba25809b5d..13acb321dc 100644
--- a/app/mailers/spree/user_mailer.rb
+++ b/app/mailers/spree/user_mailer.rb
@@ -25,8 +25,9 @@ module Spree
     end
 
     # Overrides `Devise::Mailer.confirmation_instructions`
-    def confirmation_instructions(user, _opts)
+    def confirmation_instructions(user, token, _opts = {})
       @user = user
+      @token = token
       @instance = Spree::Config[:site_name]
       @contact = ContentConfig.footer_email
 

From a2ae78bde9faffc84d1b873f6883f181b9545426 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 18 Jun 2020 18:11:49 +0100
Subject: [PATCH 248/340] Replay commit from spree_auth_devise that upgrades to
 devise 3

https://github.com/spree/spree_auth_devise/commit/fe7941f67426ac17aa894b3b73c45577e4bb2513
---
 app/mailers/spree/user_mailer.rb | 7 +++----
 app/models/spree/user.rb         | 4 ----
 spec/mailers/user_mailer_spec.rb | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/mailers/spree/user_mailer.rb b/app/mailers/spree/user_mailer.rb
index 13acb321dc..a93aff05a5 100644
--- a/app/mailers/spree/user_mailer.rb
+++ b/app/mailers/spree/user_mailer.rb
@@ -5,12 +5,11 @@ module Spree
     include I18nHelper
 
     # Overrides `Devise::Mailer.reset_password_instructions`
-    def reset_password_instructions(user)
-      recipient = user.respond_to?(:id) ? user : Spree.user_class.find(user)
+    def reset_password_instructions(user, token, _opts = {})
       @edit_password_reset_url = spree.
-        edit_spree_user_password_url(reset_password_token: recipient.reset_password_token)
+        edit_spree_user_password_url(reset_password_token: token)
 
-      mail(to: recipient.email, from: from_address,
+      mail(to: user.email, from: from_address,
            subject: Spree::Config[:site_name] + ' ' +
              I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]))
     end
diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb
index 3df57a9cf8..e602c172de 100644
--- a/app/models/spree/user.rb
+++ b/app/models/spree/user.rb
@@ -49,10 +49,6 @@ module Spree
       has_spree_role?('admin')
     end
 
-    def send_reset_password_instructions
-      generate_reset_password_token!
-      UserMailer.reset_password_instructions(id).deliver
-    end
     # handle_asynchronously will define send_reset_password_instructions_with_delay.
     # If handle_asynchronously is called twice, we get an infinite job loop.
     handle_asynchronously :send_reset_password_instructions unless method_defined? :send_reset_password_instructions_with_delay
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 9b4790e5ad..642ffd1406 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -49,7 +49,7 @@ describe Spree::UserMailer do
   describe '#reset_password_instructions' do
     describe 'message contents' do
       before do
-        @message = described_class.reset_password_instructions(user)
+        @message = described_class.reset_password_instructions(user, nil)
       end
 
       context 'subject includes' do
@@ -72,7 +72,7 @@ describe Spree::UserMailer do
     describe 'legacy support for User object' do
       it 'sends an email' do
         expect do
-          Spree::UserMailer.reset_password_instructions(user).deliver
+          Spree::UserMailer.reset_password_instructions(user, nil).deliver
         end.to change(ActionMailer::Base.deliveries, :size).by(1)
       end
     end

From c0f9f8c8bfa87e63633c10db231eed717349064e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 24 Jun 2020 21:09:06 +0100
Subject: [PATCH 249/340] Remove comment refering to old spree upgrade

---
 spec/support/email_helper.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/support/email_helper.rb b/spec/support/email_helper.rb
index f622785425..4291844575 100644
--- a/spec/support/email_helper.rb
+++ b/spec/support/email_helper.rb
@@ -2,8 +2,6 @@ module OpenFoodNetwork
   module EmailHelper
     # Some specs trigger actions that send emails, for example creating an order.
     # But sending emails doesn't work out-of-the-box. This code sets it up.
-    # It's here in a single place to allow an easy upgrade to Spree 2 which
-    # needs a different implementation of this method.
     def setup_email
       Spree::Config[:mails_from] = "test@ofn.example.org"
     end

From 0f2980619860ed1a24ff0ad63a508c4954c7c2cb Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 24 Jun 2020 21:12:19 +0100
Subject: [PATCH 250/340] Adapt code to devise 3.2 where the
 reset_password_token stored in the db is a encrypted version of the token
 sent in the email

In this particular case, the user confirmations controller is redirecting to the reset password page but it doesnt know what is the raw reset_password_token

So we regenerate the reset password token so that it can know what's the raw value for the redirect

The method User#regenerate_reset_password_token is a proxy to the protected method in Devise::Recoverable
---
 app/controllers/user_confirmations_controller.rb       | 3 ++-
 app/models/spree/user.rb                               | 4 ++++
 spec/controllers/user_confirmations_controller_spec.rb | 3 ++-
 spec/features/consumer/confirm_invitation_spec.rb      | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb
index 1e15a6a296..f4d1ef3925 100644
--- a/app/controllers/user_confirmations_controller.rb
+++ b/app/controllers/user_confirmations_controller.rb
@@ -45,8 +45,9 @@ class UserConfirmationsController < DeviseController
       end
 
     if resource.reset_password_token.present?
+      raw_reset_password_token = resource.regenerate_reset_password_token
       return spree.edit_spree_user_password_path(
-        reset_password_token: resource.reset_password_token
+        reset_password_token: raw_reset_password_token
       )
     end
 
diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb
index e602c172de..d14694de9b 100644
--- a/app/models/spree/user.rb
+++ b/app/models/spree/user.rb
@@ -53,6 +53,10 @@ module Spree
     # If handle_asynchronously is called twice, we get an infinite job loop.
     handle_asynchronously :send_reset_password_instructions unless method_defined? :send_reset_password_instructions_with_delay
 
+    def regenerate_reset_password_token
+      set_reset_password_token
+    end
+
     def known_users
       if admin?
         Spree::User.where(nil)
diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb
index 9920330161..9fb6340bd1 100644
--- a/spec/controllers/user_confirmations_controller_spec.rb
+++ b/spec/controllers/user_confirmations_controller_spec.rb
@@ -52,7 +52,8 @@ describe UserConfirmationsController, type: :controller do
         unconfirmed_user.reset_password_token = Devise.friendly_token
         unconfirmed_user.save!
         spree_get :show, confirmation_token: unconfirmed_user.confirmation_token
-        expect(response).to redirect_to spree.edit_spree_user_password_path(reset_password_token: unconfirmed_user.reset_password_token)
+        expect(response).to be_redirect
+        expect(response.body).to include spree.edit_spree_user_password_path
       end
     end
   end
diff --git a/spec/features/consumer/confirm_invitation_spec.rb b/spec/features/consumer/confirm_invitation_spec.rb
index bfdd4baddc..43645a9e31 100644
--- a/spec/features/consumer/confirm_invitation_spec.rb
+++ b/spec/features/consumer/confirm_invitation_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 feature "Confirm invitation as manager" do
-  include UIComponentHelper # for be_logged_in_as
+  include UIComponentHelper
   include OpenFoodNetwork::EmailHelper
 
   describe "confirm email and set password" do
@@ -15,8 +15,8 @@ feature "Confirm invitation as manager" do
       user.save!
     end
 
-    it "allows you to set a password" do
-      visit spree.spree_user_confirmation_url(confirmation_token: user.confirmation_token)
+    it "lets the user set a password" do
+      visit spree.spree_user_confirmation_path(confirmation_token: user.confirmation_token)
 
       expect(user.reload.confirmed?).to be true
       expect(page).to have_text I18n.t(:change_my_password)

From f31d790714c82fdae8ec51a18f17b0bea9843b57 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 24 Jun 2020 21:13:13 +0100
Subject: [PATCH 251/340] Add auth spec to cover case where user tries to reset
 password before confirming their email

---
 spec/features/consumer/authentication_spec.rb | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/spec/features/consumer/authentication_spec.rb b/spec/features/consumer/authentication_spec.rb
index c172f40f38..ad1da5cd77 100644
--- a/spec/features/consumer/authentication_spec.rb
+++ b/spec/features/consumer/authentication_spec.rb
@@ -28,6 +28,7 @@ feature "Authentication", js: true do
           browse_as_large
           open_login_modal
         end
+
         scenario "showing login" do
           expect(page).to have_login_modal
         end
@@ -106,8 +107,31 @@ feature "Authentication", js: true do
             end.to enqueue_job Delayed::PerformableMethod
             expect(Delayed::Job.last.payload_object.method_name).to eq(:send_reset_password_instructions_without_delay)
           end
+
+          context "user with unconfirmed email" do
+            let(:email) { "test@example.org" }
+            let!(:user) { Spree::User.create(email: email, unconfirmed_email: email, password: "secret") }
+
+            scenario "cannot reset password before confirming email" do
+              fill_in "Your email", with: email
+              click_reset_password_button
+              expect(page).to have_content I18n.t('email_unconfirmed')
+              page.find("a", text: I18n.t('devise.confirmations.resend_confirmation_email')).click
+              expect(page).to have_content I18n.t('devise.confirmations.send_instructions')
+
+              visit spree.spree_user_confirmation_path(confirmation_token: user.confirmation_token)
+              expect(user.reload.confirmed?).to be true
+              expect(page).to have_text I18n.t('devise.confirmations.confirmed')
+
+              select_login_tab "Forgot Password?"
+              fill_in "Your email", with: email
+              click_reset_password_button
+              expect(page).to have_reset_password
+            end
+          end
         end
       end
+
       describe "as medium" do
         before do
           browse_as_medium

From ca9898839a243533190eeeb08b81cabda2a8da9d Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 24 Jun 2020 21:17:09 +0100
Subject: [PATCH 252/340] Confirm! is deprecated and only redirects to confirm
 now in devise 3.5

---
 spec/controllers/user_confirmations_controller_spec.rb | 2 +-
 spec/models/spree/user_spec.rb                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb
index 9fb6340bd1..335b46af79 100644
--- a/spec/controllers/user_confirmations_controller_spec.rb
+++ b/spec/controllers/user_confirmations_controller_spec.rb
@@ -11,7 +11,7 @@ describe UserConfirmationsController, type: :controller do
 
   before do
     @request.env["devise.mapping"] = Devise.mappings[:spree_user]
-    confirmed_user.confirm!
+    confirmed_user.confirm
   end
 
   context "confirming a user" do
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index ba5b4cd488..fc89796e3c 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -109,7 +109,7 @@ describe Spree.user_class do
       setup_email
 
       expect do
-        create(:user, confirmed_at: nil).confirm!
+        create(:user, confirmed_at: nil).confirm
       end.to enqueue_job ConfirmSignupJob
     end
   end

From 86afa6f4132e9f803d27edbd2a9e8f07eba3f7ab Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 24 Jun 2020 21:28:40 +0100
Subject: [PATCH 253/340] Adapt to devise 3.2 and use after_confirmation
 callback to send welcome email

---
 app/models/spree/user.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb
index d14694de9b..da276ec936 100644
--- a/app/models/spree/user.rb
+++ b/app/models/spree/user.rb
@@ -34,10 +34,6 @@ module Spree
 
     # We use the same options as Spree and add :confirmable
     devise :confirmable, reconfirmable: true
-    # TODO: Later versions of devise have a dedicated after_confirmation callback, so use that
-    after_update :welcome_after_confirm, if: lambda {
-      confirmation_token_changed? && confirmation_token.nil?
-    }
 
     class DestroyWithOrdersError < StandardError; end
 
@@ -82,9 +78,9 @@ module Spree
       customers.find_by(enterprise_id: enterprise)
     end
 
-    def welcome_after_confirm
-      # Send welcome email if we are confirming an user's email
-      # Note: this callback only runs on email confirmation
+    # This is a Devise Confirmable callback that runs on email confirmation
+    # It sends a welcome email after the user email is confirmed
+    def after_confirmation
       return unless confirmed? && unconfirmed_email.nil? && !unconfirmed_email_changed?
 
       send_signup_confirmation

From 7c498a573cd84850d8cf98f533d2d959c9a02308 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 6 Jul 2020 17:51:19 +0100
Subject: [PATCH 254/340] Make shopfront redirect work when logging out by
 storing it outside session data

---
 app/controllers/application_controller.rb         |  6 +++++-
 app/controllers/spree/user_sessions_controller.rb | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 17585a7237..e9cb17480b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -62,11 +62,15 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_out_path_for(_resource_or_scope)
-    session[:shopfront_redirect] || main_app.root_path
+    shopfront_redirect || main_app.root_path
   end
 
   private
 
+  def shopfront_redirect
+    session[:shopfront_redirect]
+  end
+
   def restrict_iframes
     response.headers['X-Frame-Options'] = 'DENY'
     response.headers['Content-Security-Policy'] = "frame-ancestors 'none'"
diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb
index df42f622e1..7ff26a3437 100644
--- a/app/controllers/spree/user_sessions_controller.rb
+++ b/app/controllers/spree/user_sessions_controller.rb
@@ -39,8 +39,18 @@ module Spree
       end
     end
 
+    def destroy
+      # Logout will clear session data including shopfront_redirect
+      #   Here we store it before actually logging out so that the redirect works correctly
+      @shopfront_redirect = session[:shopfront_redirect]
+
+      super
+    end
+
     private
 
+    attr_reader :shopfront_redirect
+
     def accurate_title
       Spree.t(:login)
     end

From aae0a6533a79641457db50d886ae091bb1665b25 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 31 Jul 2020 18:10:57 +1000
Subject: [PATCH 255/340] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7d7b336f17..a65b1bb91a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1962,6 +1962,7 @@ fr:
   supplier: "Fournisseur"
   product_name: "Nom du Produit"
   product_description: "Description du Produit"
+  permalink: "Permalien"
   shipping_categories: "Conditions de transport"
   units: "Unité de mesure"
   coordinator: "Coordinateur"
@@ -2059,6 +2060,7 @@ fr:
   remove_tax: "Retirer TVA"
   first_name_begins_with: "Prénom commence par"
   last_name_begins_with: "Nom de famille commence par"
+  shipping_method: "Méthode de livraison"
   new_order: "Nouvelle commande"
   enterprise_tos_link: "Lien vers les Conditions Générales d'Utilisation"
   enterprise_tos_message: "Nous soutenons la mise en place d'un système alimentaire résilient et durable, et souhaitons œuvrer avec des entreprises qui partagent nos valeurs et notre vision. Ainsi, nous demandons aux entreprises s'enregistrant sur Open Food France de valider nos "
@@ -3200,6 +3202,8 @@ fr:
           stripe:
             error_saving_payment: Erreur à l'enregistrement du paiement
             submitting_payment: Envoi du paiement...
+          paypal:
+            no_payment_via_admin_backend: 'Il n''est pas encore possible de payer avec Paypal via l''administration. '
       products:
         image_upload_error: "L'image du produit n'a pas été reconnue. Veuillez importer une image au format PNG ou JPG."
         new:

From 9d1e12da68f76385d383debd398f7c0490c66a6e Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Fri, 31 Jul 2020 18:11:19 +1000
Subject: [PATCH 256/340] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index e455b97258..3116e58434 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -1960,6 +1960,7 @@ en_FR:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  permalink: "Permalink"
   shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
@@ -2057,6 +2058,7 @@ en_FR:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  shipping_method: "Shipping method"
   new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
@@ -3170,6 +3172,8 @@ en_FR:
           stripe:
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
+          paypal:
+            no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:

From d052a7b796317b3efcb3f678441afb04377a7c0e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 31 Jul 2020 09:08:48 +0100
Subject: [PATCH 257/340] Verify the user is confirmed before returning a reset
 password token

Co-authored-by: Maikel <maikel@email.org.au>
---
 app/controllers/user_confirmations_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb
index f4d1ef3925..0915447bc5 100644
--- a/app/controllers/user_confirmations_controller.rb
+++ b/app/controllers/user_confirmations_controller.rb
@@ -44,7 +44,7 @@ class UserConfirmationsController < DeviseController
         'not_confirmed'
       end
 
-    if resource.reset_password_token.present?
+    if result == 'confirmed' && resource.reset_password_token.present?
       raw_reset_password_token = resource.regenerate_reset_password_token
       return spree.edit_spree_user_password_path(
         reset_password_token: raw_reset_password_token

From 2aa6c70dc6c2a96eafe7a9d8020126b172f95225 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 24 Jul 2020 13:15:36 +0100
Subject: [PATCH 258/340] Remove select from relation

This relation is only used above for a call to empty? so we don't need to worry about the select part of the query, specially not introducing an expensive DISTINCT
---
 .../api/admin/for_order_cycle/enterprise_serializer.rb         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
index 7e6fed44f7..fecf675c5f 100644
--- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
+++ b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
@@ -31,8 +31,7 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer
     products_relation = object.supplied_products
     if order_cycle.prefers_product_selection_from_coordinator_inventory_only?
       products_relation = products_relation.
-        visible_for(order_cycle.coordinator).
-        select('DISTINCT spree_products.*')
+        visible_for(order_cycle.coordinator)
     end
     products_relation
   end

From 3c23952fd62d53c762cb2bbce9af96a2c413084c Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Fri, 31 Jul 2020 20:08:09 +0100
Subject: [PATCH 259/340] Don't double escape :open_street_map_provider_options
 so they are parsed into a JS object rather than a string.

Before if you entered '{ accessToken: secret }' into the open street map provider options field in the admin content settings the 'JSON.parse(openStreetMapConfig.open_street_map_provider_options)' call in the open_street_map directive was converting them into a string because they were double escaped. They need to be converted into a JS object in order to set the Leaflet provider options.
---
 app/serializers/api/open_street_map_config_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/serializers/api/open_street_map_config_serializer.rb b/app/serializers/api/open_street_map_config_serializer.rb
index 8c5aec5dbb..2253f3e15d 100644
--- a/app/serializers/api/open_street_map_config_serializer.rb
+++ b/app/serializers/api/open_street_map_config_serializer.rb
@@ -15,7 +15,7 @@ module Api
     end
 
     def open_street_map_provider_options
-      ContentConfig.open_street_map_provider_options.to_json
+      ContentConfig.open_street_map_provider_options
     end
   end
 end

From ef7c7a3e7348a8afd351708a4c4797ddd422b3bf Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Fri, 31 Jul 2020 20:18:15 +0100
Subject: [PATCH 260/340] Upgrade vendored :leaflet-providers JS to 1.10.2 to
 update available OSM tile providers and fix deprecated MapBox endpoint.

Before MapBox could no longer be used as an OSM tile provider as they recently deprecated their tile API endpoint (https://blog.mapbox.com/deprecating-studio-classic-styles-d8892ac38cb4)

This update of leaflet-providers from 1.9.1 to 1.10.2 uses the new MapBox endpoint, it also adds new tile providers and removes some ones no longer supported. See https://github.com/leaflet-extras/leaflet-providers/blob/master/CHANGELOG.md#1102-2020-07-31
---
 .../assets/javascripts/leaflet-providers.js   | 123 +++++++++---------
 1 file changed, 64 insertions(+), 59 deletions(-)

diff --git a/vendor/assets/javascripts/leaflet-providers.js b/vendor/assets/javascripts/leaflet-providers.js
index 208b6257d0..6d8349839b 100644
--- a/vendor/assets/javascripts/leaflet-providers.js
+++ b/vendor/assets/javascripts/leaflet-providers.js
@@ -219,66 +219,16 @@
 			}
 		},
 		CyclOSM: {
-			url: 'https://dev.{s}.tile.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
+			url: 'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
 			options: {
 				maxZoom: 20,
 				attribution: '<a href="https://github.com/cyclosm/cyclosm-cartocss-style/releases" title="CyclOSM - Open Bicycle render">CyclOSM</a> | Map data: {attribution.OpenStreetMap}'
 			}
 		},
-		OpenMapSurfer: {
-			url: 'https://maps.heigit.org/openmapsurfer/tiles/{variant}/webmercator/{z}/{x}/{y}.png',
-			options: {
-				maxZoom: 19,
-				variant: 'roads',
-				attribution: 'Imagery from <a href="http://giscience.uni-hd.de/">GIScience Research Group @ University of Heidelberg</a> | Map data '
-			},
-			variants: {
-				Roads: {
-					options: {
-						variant: 'roads',
-						attribution: '{attribution.OpenMapSurfer}{attribution.OpenStreetMap}'
-					}
-				},
-				Hybrid: {
-					options: {
-						variant: 'hybrid',
-						attribution: '{attribution.OpenMapSurfer}{attribution.OpenStreetMap}'
-					}
-				},
-				AdminBounds: {
-					options: {
-						variant: 'adminb',
-						maxZoom: 18,
-						attribution: '{attribution.OpenMapSurfer}{attribution.OpenStreetMap}'
-					}
-				},
-				ContourLines: {
-					options: {
-						variant: 'asterc',
-						maxZoom: 18,
-						minZoom: 13,
-						attribution: '{attribution.OpenMapSurfer} <a href="https://lpdaac.usgs.gov/products/aster_policies">ASTER GDEM</a>'
-					}
-				},
-				Hillshade: {
-					options: {
-						variant: 'asterh',
-						maxZoom: 18,
-						attribution: '{attribution.OpenMapSurfer} <a href="https://lpdaac.usgs.gov/products/aster_policies">ASTER GDEM</a>, <a href="http://srtm.csi.cgiar.org/">SRTM</a>'
-					}
-				},
-				ElementsAtRisk: {
-					options: {
-						variant: 'elements_at_risk',
-						attribution: '{attribution.OpenMapSurfer}{attribution.OpenStreetMap}'
-					}
-				}
-			}
-		},
 		Hydda: {
 			url: 'https://{s}.tile.openstreetmap.se/hydda/{variant}/{z}/{x}/{y}.png',
 			options: {
-				maxZoom: 18,
+				maxZoom: 20,
 				variant: 'full',
 				attribution: 'Tiles courtesy of <a href="http://openstreetmap.se/" target="_blank">OpenStreetMap Sweden</a> &mdash; Map data {attribution.OpenStreetMap}'
 			},
@@ -288,18 +238,73 @@
 				RoadsAndLabels: 'roads_and_labels'
 			}
 		},
-		MapBox: {
-			url: 'https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}{r}.png?access_token={accessToken}',
+		Jawg: {
+			url: 'https://{s}.tile.jawg.io/{variant}/{z}/{x}/{y}{r}.png?access-token={accessToken}',
 			options: {
 				attribution:
-					'<a href="https://www.mapbox.com/about/maps/" target="_blank">&copy; Mapbox</a> ' +
+					'<a href="http://jawg.io" title="Tiles Courtesy of Jawg Maps" target="_blank">&copy; <b>Jawg</b>Maps</a> ' +
+					'{attribution.OpenStreetMap}',
+				minZoom: 0,
+				maxZoom: 22,
+				subdomains: 'abcd',
+				variant: 'jawg-terrain',
+				// Get your own Jawg access token here : https://www.jawg.io/lab/
+				// NB : this is a demonstration key that comes with no guarantee
+				accessToken: '<insert your access token here>',
+			},
+			variants: {
+				Streets: 'jawg-streets',
+				Terrain: 'jawg-terrain',
+				Sunny: 'jawg-sunny',
+				Dark: 'jawg-dark',
+				Light: 'jawg-light',
+				Matrix: 'jawg-matrix'
+			}
+		},
+		MapBox: {
+			url: 'https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}{r}?access_token={accessToken}',
+			options: {
+				attribution:
+					'&copy; <a href="https://www.mapbox.com/about/maps/" target="_blank">Mapbox</a> ' +
 					'{attribution.OpenStreetMap} ' +
 					'<a href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a>',
-				subdomains: 'abcd',
-				id: 'mapbox.streets',
+				tileSize: 512,
+				maxZoom: 18,
+				zoomOffset: -1,
+				id: 'mapbox/streets-v11',
 				accessToken: '<insert your access token here>',
 			}
 		},
+		MapTiler: {
+			url: 'https://api.maptiler.com/maps/{variant}/{z}/{x}/{y}{r}.{ext}?key={key}',
+			options: {
+				attribution:
+					'<a href="https://www.maptiler.com/copyright/" target="_blank">&copy; MapTiler</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>',
+				variant: 'streets',
+				ext: 'png',
+				key: '<insert your MapTiler Cloud API key here>',
+				tileSize: 512,
+				zoomOffset: -1,
+				minZoom: 0,
+				maxZoom: 21
+			},
+			variants: {
+				Streets: 'streets',
+				Basic: 'basic',
+				Bright: 'bright',
+				Pastel: 'pastel',
+				Positron: 'positron',
+				Hybrid: {
+					options: {
+						variant: 'hybrid',
+						ext: 'jpg'
+					}
+				},
+				Toner: 'toner',
+				Topo: 'topo',
+				Voyager: 'voyager'
+			}
+		},
 		Stamen: {
 			url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/{variant}/{z}/{x}/{y}{r}.{ext}',
 			options: {
@@ -719,11 +724,11 @@
 			}
 		},
 		FreeMapSK: {
-			url: 'http://t{s}.freemap.sk/T/{z}/{x}/{y}.jpeg',
+			url: 'https://{s}.freemap.sk/T/{z}/{x}/{y}.jpeg',
 			options: {
 				minZoom: 8,
 				maxZoom: 16,
-				subdomains: '1234',
+				subdomains: 'abcd',
 				bounds: [[47.204642, 15.996093], [49.830896, 22.576904]],
 				attribution:
 					'{attribution.OpenStreetMap}, vizualization CC-By-SA 2.0 <a href="http://freemap.sk">Freemap.sk</a>'

From ff82a1b73fb6c564545fd2fe0bb75450dc5b2a43 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 1 Aug 2020 07:31:53 +0000
Subject: [PATCH 261/340] Bump activerecord-import from 1.0.5 to 1.0.6

Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.5...v1.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fa904aedfc..df29087667 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,7 +108,7 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-import (1.0.5)
+    activerecord-import (1.0.6)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -466,7 +466,7 @@ GEM
     money (5.1.1)
       i18n (~> 0.6.0)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (3.18.1.330)

From e61567454185e1223954cb059074158001f07c42 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 1 Aug 2020 14:57:18 +0000
Subject: [PATCH 262/340] Bump bugsnag from 6.14.0 to 6.15.0

Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.14.0 to 6.15.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.14.0...v6.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f0678f9a11..cf47f93064 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,7 +148,7 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt (3.1.13)
-    bugsnag (6.14.0)
+    bugsnag (6.15.0)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
     byebug (11.0.1)

From 51f39ee89d8fd64656421db4b43c20cbc1c02844 Mon Sep 17 00:00:00 2001
From: Eduardo <jeduardo824@gmail.com>
Date: Sun, 2 Aug 2020 20:01:49 -0300
Subject: [PATCH 263/340] move coffee directive to partial

---
 app/views/spree/admin/orders/edit.html.haml         | 3 ---
 app/views/spree/admin/shared/_order_links.html.haml | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/spree/admin/orders/edit.html.haml b/app/views/spree/admin/orders/edit.html.haml
index 8d5d26eecc..ada2ff5953 100644
--- a/app/views/spree/admin/orders/edit.html.haml
+++ b/app/views/spree/admin/orders/edit.html.haml
@@ -29,6 +29,3 @@
 
     %div{"data-hook" => "admin_order_edit_form"}
       = render :partial => 'form', :locals => { :order => @order }
-
-:coffee
-  angular.bootstrap(document.getElementById("links-dropdown"),['admin.dropdown'])
diff --git a/app/views/spree/admin/shared/_order_links.html.haml b/app/views/spree/admin/shared/_order_links.html.haml
index 7db3d968be..352371c04a 100644
--- a/app/views/spree/admin/shared/_order_links.html.haml
+++ b/app/views/spree/admin/shared/_order_links.html.haml
@@ -1 +1,4 @@
 %li.links-dropdown#links-dropdown{ links: order_links(@order).to_json }
+
+:coffee
+  angular.bootstrap(document.getElementById("links-dropdown"),['admin.dropdown'])

From 422958ed6f13fcd5c1cfc291b18a736fba1f6aa8 Mon Sep 17 00:00:00 2001
From: Eduardo <jeduardo824@gmail.com>
Date: Sun, 2 Aug 2020 20:02:36 -0300
Subject: [PATCH 264/340] create specific spec for order links partial

---
 .../spree/admin/orders/edit.html.haml_spec.rb | 11 ---------
 .../shared/_order_links.html.haml_spec.rb     | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 spec/views/spree/admin/shared/_order_links.html.haml_spec.rb

diff --git a/spec/views/spree/admin/orders/edit.html.haml_spec.rb b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
index 6e099d27c7..b33cd187ef 100644
--- a/spec/views/spree/admin/orders/edit.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
@@ -35,15 +35,4 @@ describe "spree/admin/orders/edit.html.haml" do
       expect(rendered).to have_content("Order Total $36.00")
     end
   end
-
-  describe "actions dropwdown" do
-    it "contains all the actions buttons" do
-      render
-
-      expect(rendered).to have_content("Resend Confirmation")
-      expect(rendered).to have_content("Send Invoice")
-      expect(rendered).to have_content("Print Invoices")
-      expect(rendered).to have_content("Cancel Order")
-    end
-  end
 end
diff --git a/spec/views/spree/admin/shared/_order_links.html.haml_spec.rb b/spec/views/spree/admin/shared/_order_links.html.haml_spec.rb
new file mode 100644
index 0000000000..63b7be6339
--- /dev/null
+++ b/spec/views/spree/admin/shared/_order_links.html.haml_spec.rb
@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe "spree/admin/shared/_order_links.html.haml" do
+  helper Spree::BaseHelper # required to make pretty_time work
+
+  around do |example|
+    original_config = Spree::Config[:enable_invoices?]
+    example.run
+    Spree::Config[:enable_invoices?] = original_config
+  end
+
+  before do
+    order = create(:completed_order_with_fees)
+    assign(:order, order)
+  end
+
+  describe "actions dropwdown" do
+    it "contains all the actions buttons" do
+      render
+
+      expect(rendered).to have_content("links-dropdown")
+    end
+  end
+end

From 619e13ccba4375d666bd5fd8034e8d77e758948c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2020 08:32:45 +0000
Subject: [PATCH 265/340] Bump rswag from 2.2.0 to 2.3.1

Bumps [rswag](https://github.com/rswag/rswag) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cf47f93064..b50ab35992 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -468,7 +468,7 @@ GEM
     money (5.1.1)
       i18n (~> 0.6.0)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (3.18.1.330)
@@ -510,7 +510,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
     rack (1.5.5)
     rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
@@ -592,19 +592,19 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.9.2)
-    rswag (2.2.0)
-      rswag-api (= 2.2.0)
-      rswag-specs (= 2.2.0)
-      rswag-ui (= 2.2.0)
-    rswag-api (2.2.0)
-      railties (>= 3.1, < 6.1)
-    rswag-specs (2.2.0)
-      activesupport (>= 3.1, < 6.1)
+    rswag (2.3.1)
+      rswag-api (= 2.3.1)
+      rswag-specs (= 2.3.1)
+      rswag-ui (= 2.3.1)
+    rswag-api (2.3.1)
+      railties (>= 3.1, < 7.0)
+    rswag-specs (2.3.1)
+      activesupport (>= 3.1, < 7.0)
       json-schema (~> 2.2)
-      railties (>= 3.1, < 6.1)
-    rswag-ui (2.2.0)
-      actionpack (>= 3.1, < 6.1)
-      railties (>= 3.1, < 6.1)
+      railties (>= 3.1, < 7.0)
+    rswag-ui (2.3.1)
+      actionpack (>= 3.1, < 7.0)
+      railties (>= 3.1, < 7.0)
     rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

From 1d44d463e7f32f79f480b010d2e1ee105ee52c0b Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 3 Aug 2020 22:48:36 +1000
Subject: [PATCH 266/340] Updating translations for config/locales/tr.yml

---
 config/locales/tr.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 133a5b669c..89cc2746f3 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1960,6 +1960,7 @@ tr:
   supplier: "Tedarikçi"
   product_name: "Ürün Adı"
   product_description: "Ürün Açıklaması"
+  permalink: "Permalink"
   shipping_categories: "Teslimat Kategorileri"
   units: "Ölçü Birimi"
   coordinator: "KOORDİNATÖR"
@@ -2057,6 +2058,7 @@ tr:
   remove_tax: "Vergiyi kaldır"
   first_name_begins_with: "Adının BAŞ HARFİ"
   last_name_begins_with: "Soyadının BAŞ HARFİ"
+  shipping_method: "Teslimat Yöntemi"
   new_order: "Yeni Sipariş"
   enterprise_tos_link: "İşletme Üyelik Sözleşmesi bağlantısı"
   enterprise_tos_message: "Amaçlarımızı ve değerlerimizi paylaşan insanlarla çalışmak istiyoruz. Yasal zorunluluk gereği de yeni işletmelerden kabul etmesini istiyoruz:"
@@ -3172,6 +3174,8 @@ tr:
           stripe:
             error_saving_payment: Ödeme kaydedilirken hata oluştu
             submitting_payment: Ödeme gönderiliyor ...
+          paypal:
+            no_payment_via_admin_backend: Paypal ödemeleri alınamıyor.
       products:
         image_upload_error: "Ürün resmi tanınamadı. Lütfen PNG veya JPG biçiminde bir resim yükleyin."
         new:

From c97fc4510954f4e0772546f19b6c4f1e0f5e7144 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 3 Aug 2020 22:53:31 +1000
Subject: [PATCH 267/340] Updating translations for config/locales/nb.yml

---
 config/locales/nb.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index bec2cfbc50..c1f12e2dad 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -14,6 +14,7 @@ nb:
       spree/payment:
         amount: Beløp
         state: Tilstand
+        source: Kilde
       spree/product:
         primary_taxon: "Produktkategori"
         supplier: "Leverandør"
@@ -183,6 +184,7 @@ nb:
         explainer: Automatisk behandling av disse bestillingene mislyktes av en ukjent grunn. Dette bør ikke skje, vennligst kontakt oss hvis du ser dette.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Velkommen til"
   site_meta_description: "Vi begynner fra grunnen. Med bønder og dyrkere klare til å fortelle sine historier, stolt og virkelig. Med distributører klare til å koble mennesker med produkter på en rettferdig og ærlig måte. Med kunder som tror på at ukentlige innkjøpsrutiner kan..."
   search_by_name: Søk på navn eller sted...
   producers_join: Norske produsenter er nå velkommen til å bli med i Open Food Network.
@@ -1714,6 +1716,7 @@ nb:
   remember_me: Husk meg
   are_you_sure: "Er du sikker?"
   orders_open: "Åpen for bestilling"
+  closing: "Stenger"
   going_back_to_home_page: "Tar deg tilbake til hjemmesiden"
   creating: Oppretter
   updating: Oppdaterer
@@ -1957,6 +1960,7 @@ nb:
   supplier: "Leverandør"
   product_name: "Produktnavn"
   product_description: "Produktbeskrivelse"
+  permalink: "Permalink"
   shipping_categories: "Fraktkategorier"
   units: "Enhetsstørrelse"
   coordinator: "Koordinator"
@@ -2054,6 +2058,7 @@ nb:
   remove_tax: "Fjern avgift"
   first_name_begins_with: "Fornavn begynner med"
   last_name_begins_with: "Etternavn begynner med"
+  shipping_method: "Leveringsmetode"
   new_order: "Ny bestilling"
   enterprise_tos_link: "Lenke til Tjenestevilkår for Bedrifter"
   enterprise_tos_message: "Vi ønsker å jobbe med bedrifter som deler våre mål og verdier. Derfor ber vi nye bedrifter om å godta vår"
@@ -2073,6 +2078,7 @@ nb:
   hub_sidebar_at_least: "Minst én hub må være valgt"
   hub_sidebar_blue: "blå"
   hub_sidebar_red: "rød"
+  order_cycles_closed_for_hub: "Huben du har valgt er midlertidig lukket for bestillinger. Vennligst prøv igjen senere."
   report_customers_distributor: "Distributør"
   report_customers_supplier: "Leverandør"
   report_customers_cycle: "Bestillingsrunde"
@@ -2309,6 +2315,7 @@ nb:
   order_cycles_email_to_producers_notice: 'E-poster som skal sendes til produsentene har blitt satt i kø for sending.'
   order_cycles_no_permission_to_coordinate_error: "Ingen av bedriftene dine har tillatelse til å koordinere en bestillingsrunde"
   order_cycles_no_permission_to_create_error: "Du har ikke rettigheter til å opprette en bestillingsrunde som er koordinert av den bedriften"
+  order_cycle_closed: "Bestillingsrunden du har valgt har akkurat stengt. Vennligst prøv igjen!"
   back_to_orders_list: "Tilbake til bestillingslisten"
   no_orders_found: "Ingen bestillinger funnet"
   order_information: "Bestillingsinformasjon"
@@ -3164,6 +3171,8 @@ nb:
           stripe:
             error_saving_payment: Feil ved lagring av betaling
             submitting_payment: Sender inn betaling...
+          paypal:
+            no_payment_via_admin_backend: Paypal-betalinger kan ikke behandles i Backoffice
       products:
         image_upload_error: "Produktbildet ble ikke gjenkjent. Last opp et bilde i PNG- eller JPG-format."
         new:

From e6ab2ae7539568cdbf78e937be126c967cee795d Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Mon, 3 Aug 2020 15:12:40 +0100
Subject: [PATCH 268/340] Remove unused positiveAngles and negativeAngles
 arrays from map centre calculator service.

I forgot to remove these when I was refactoring this earlier.
---
 .../darkswarm/services/map_centre_calculator.js.coffee      | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
index 85ca34ff54..978afb5858 100644
--- a/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
@@ -14,16 +14,10 @@ Darkswarm.factory 'MapCentreCalculator', (Enterprises, openStreetMapConfig) ->
         openStreetMapConfig.open_street_map_default_longitude
 
     _calculate: (angleName, coordinates) =>
-      positiveAngles = []
-      negativeAngles = []
       angles = []
 
       for coordinate in coordinates
         angles.push(coordinate[angleName])
-        if coordinate[angleName] > 0
-          positiveAngles.push(coordinate[angleName])
-        else
-          negativeAngles.push(coordinate[angleName])
 
       minimumAngle = Math.min.apply(null, angles)
       maximumAngle = Math.max.apply(null, angles)

From 6e57e1ad564b93b3193e2c070861074241db8958 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 3 Aug 2020 16:09:37 +0100
Subject: [PATCH 269/340] Fix conflict between unused Spree::CheckoutHelper in
 spree_core and the required ::CheckoutHelper in OFN

The OFN checkoutHelper was not being included and instead the Spree::CheckoutHelper, that doesnt have the necessary helpers, was used
---
 app/mailers/spree/order_mailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb
index 4cd6676c59..ce9b79874e 100644
--- a/app/mailers/spree/order_mailer.rb
+++ b/app/mailers/spree/order_mailer.rb
@@ -3,7 +3,7 @@
 module Spree
   class OrderMailer < BaseMailer
     helper HtmlHelper
-    helper CheckoutHelper
+    helper ::CheckoutHelper
     helper SpreeCurrencyHelper
     helper OrderHelper
     include I18nHelper

From 425901fa7ac7409955ebacac167fa4c8f7d799d6 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 3 Aug 2020 16:43:11 +0100
Subject: [PATCH 270/340] Add some paragraphs and breaklines to the tempalte
 that used to be text and is now html

This template needs to be revisited, this is just a quick fix
---
 .../shipment_mailer/shipped_email.html.haml   | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/views/spree/shipment_mailer/shipped_email.html.haml b/app/views/spree/shipment_mailer/shipped_email.html.haml
index 04c8368787..c5675a6975 100644
--- a/app/views/spree/shipment_mailer/shipped_email.html.haml
+++ b/app/views/spree/shipment_mailer/shipped_email.html.haml
@@ -1,19 +1,30 @@
-= t('.dear_customer')
+%p
+  = t('.dear_customer')
+%p
+  = t('.instructions')
 
-= t('.instructions')
+%p
+  = "============================================================"
+  %br
+  = t('.shipment_summary')
+  %br
+  = "============================================================"
 
-= "============================================================"
-= t('.shipment_summary')
-= "============================================================"
-- @shipment.manifest.each do |item|
-  = item.variant.sku
-  = item.variant.product.name
-  = item.variant.options_text
-= "============================================================"
+%p
+  - @shipment.manifest.each do |item|
+    = item.variant.sku
+    = item.variant.product.name
+    = item.variant.options_text
+  %br
+  = "============================================================"
 
 - if @shipment.tracking
-  = t('.track_information', tracking: @shipment.tracking)
-- if @shipment.tracking_url
-  = t('.track_link', url: @shipment.tracking_url)
+  %p
+    = t('.track_information', tracking: @shipment.tracking)
 
-= t('.thanks')
+- if @shipment.tracking_url
+  %p
+    = t('.track_link', url: @shipment.tracking_url)
+
+%p
+  = t('.thanks')

From 61c14cb61d09c01b811c66580c9e9918bbdf8130 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Tue, 4 Aug 2020 08:48:08 +0200
Subject: [PATCH 271/340] Remove unneeded RSpec config block

Spec files individually include the module and we specify the type of
spec in each RSpec's describe so none of this settings are needed. They
are just Spree's legacy I bet.
---
 spec/support/request/authentication_helper.rb | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/spec/support/request/authentication_helper.rb b/spec/support/request/authentication_helper.rb
index f439314e5d..8c5e9e890a 100644
--- a/spec/support/request/authentication_helper.rb
+++ b/spec/support/request/authentication_helper.rb
@@ -32,18 +32,3 @@ module AuthenticationHelper
     expect(page).to_not have_selector ".menu #login-link"
   end
 end
-
-RSpec.configure do |config|
-  config.extend AuthenticationHelper, type: :feature
-
-  # rspec-rails 3 will no longer automatically infer an example group's spec type
-  # from the file location. You can explicitly opt-in to the feature using this
-  # config option.
-  # To explicitly tag specs without using automatic inference, set the `:type`
-  # metadata manually:
-  #
-  #     describe ThingsController, :type => :controller do
-  #       # Equivalent to being in spec/controllers
-  #     end
-  config.infer_spec_type_from_file_location!
-end

From 9ef59f440bc627114e7ec98e3b20cfa001df3ae9 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Tue, 4 Aug 2020 08:50:14 +0200
Subject: [PATCH 272/340] Remove commented out includes

---
 spec/controllers/admin/inventory_items_controller_spec.rb   | 2 --
 spec/controllers/admin/variant_overrides_controller_spec.rb | 2 --
 2 files changed, 4 deletions(-)

diff --git a/spec/controllers/admin/inventory_items_controller_spec.rb b/spec/controllers/admin/inventory_items_controller_spec.rb
index 2c1b3cfd9d..6d3f30f41f 100644
--- a/spec/controllers/admin/inventory_items_controller_spec.rb
+++ b/spec/controllers/admin/inventory_items_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Admin::InventoryItemsController, type: :controller do
-  # include AuthenticationHelper
-
   describe "create" do
     context "json" do
       let(:format) { :json }
diff --git a/spec/controllers/admin/variant_overrides_controller_spec.rb b/spec/controllers/admin/variant_overrides_controller_spec.rb
index 721152c45f..cc8add0156 100644
--- a/spec/controllers/admin/variant_overrides_controller_spec.rb
+++ b/spec/controllers/admin/variant_overrides_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Admin::VariantOverridesController, type: :controller do
-  # include AuthenticationHelper
-
   describe "bulk_update" do
     context "json" do
       let(:format) { :json }

From 800ac0cabfb5a0d481aac1b4476070a4247380cf Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 4 Aug 2020 17:26:53 +1000
Subject: [PATCH 273/340] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a65b1bb91a..15983fbc34 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -273,6 +273,9 @@ fr:
   on hand: "En stock"
   ship: "Expédier"
   shipping_category: "Condition de transport"
+  height: "Hauteur"
+  width: "Largeur"
+  depth: "Profondeur"
   actions:
     create_and_add_another: "Créer et ajouter nouveau"
     create: "Créer"

From e8ba44f958c67f41391b5f3adbba75469ca293a0 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 4 Aug 2020 17:27:10 +1000
Subject: [PATCH 274/340] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 3116e58434..a8780fa3ca 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -273,6 +273,9 @@ en_FR:
   on hand: "On Hand"
   ship: "Ship"
   shipping_category: "Shipping Category"
+  height: "Height"
+  width: "Width"
+  depth: "Depth"
   actions:
     create_and_add_another: "Create and Add Another"
     create: "Create"

From b91f1578c94093e9a9bf91ed7a48fd2a40739c41 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 4 Aug 2020 18:14:27 +1000
Subject: [PATCH 275/340] Updating translations for config/locales/ca.yml

---
 config/locales/ca.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 803542692b..d78d7ae06a 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -273,6 +273,9 @@ ca:
   on hand: "Disponibles"
   ship: "Enviament"
   shipping_category: "Categoria d'enviament"
+  height: "Alçada"
+  width: "Amplada"
+  depth: "Profunditat"
   actions:
     create_and_add_another: "Crea i afegeix-ne una altra"
     create: "Crear"

From 8792ec1de3814ed926e4e7e327616f5ca434156c Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 4 Aug 2020 18:14:45 +1000
Subject: [PATCH 276/340] Updating translations for config/locales/es.yml

---
 config/locales/es.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index b22bb7e193..f10e9b594a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -273,6 +273,9 @@ es:
   on hand: "Disponibles"
   ship: "Envío"
   shipping_category: "Categoría de envío"
+  height: "Altura"
+  width: "Anchura"
+  depth: "Profundidad"
   actions:
     create_and_add_another: "Crear y agregar otro"
     create: "Crear"
@@ -3179,7 +3182,7 @@ es:
             error_saving_payment: Error al guardar el pago
             submitting_payment: Enviando pago...
           paypal:
-            no_payment_via_admin_backend: Los pagos de PayPal no se pueden capturar desde l'administración
+            no_payment_via_admin_backend: Los pagos de PayPal no se pueden capturar desde la administración
       products:
         image_upload_error: "La imagen del producto no fue reconocida. Por favor, cargue una imagen en formato PNG o JPG."
         new:

From 6e39ab779ce99069ef21b5fd54397e366eee31e5 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Tue, 4 Aug 2020 11:24:49 +0200
Subject: [PATCH 277/340] Make RSpec infer the file type from its location

Apparently, although we tend to add the type of spec file some RSpec
methods are not working without it. We're getting:

```
NoMethodError:
  undefined method `helper' for RSpec::ExampleGroups::SpreeSharedOrderDetailsHtmlHaml:Class
```

```
NameError:
   undefined local variable or method `controller' for #<RSpec::ExampleGroups::SpreeAdminUsersController::AuthorizeAdmin:0x00007fa8b32addf8>
 # ./spec/controllers/spree/admin/users_controller_spec.rb:10:in `block (3 levels) in <top (required)>'
```

It needs more investigation but another day.
---
 spec/spec_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9ea40e8c66..9e42ff6191 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -201,4 +201,5 @@ RSpec.configure do |config|
   # config.after :suite do
   # PerfTools::CpuProfiler.stop
   # end
+  config.infer_spec_type_from_file_location!
 end

From 5404efcbcefe771cbc7ee9f86383d6513585927c Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Thu, 6 Aug 2020 00:21:09 +1000
Subject: [PATCH 278/340] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 15983fbc34..11d93355ad 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1041,10 +1041,13 @@ fr:
         name: "Résumé des marges et commissions"
         description: "Résumé des marges et commissions collectées"
     subscriptions:
-      subscriptions: Abonnements
-      new: Nouvel abonnement
-      create: Créer abonnement
-      edit: Mettre à jour Abonnement
+      index:
+        title: "Abonnements"
+        new: "Nouvel abonnement"
+      new:
+        title: "Nouvel abonnement"
+      edit:
+        title: "Mettre à jour Abonnement"
       table:
         edit_subscription: Mettre à jour Abonnement
         pause_subscription: Mettre en pause Abonnement
@@ -1053,6 +1056,7 @@ fr:
       filters:
         query_placeholder: "Recherche par email"
       setup_explanation:
+        title: "Abonnements"
         just_a_few_more_steps: 'Encore quelques étapes avant de pouvoir commencer:'
         enable_subscriptions: "Activez la fonction abonnements pour au moins une de vos boutiques"
         enable_subscriptions_step_1_html: 1. Allez à %{enterprises_link}, trouvez votre boutique, et cliquez sur "Gérer"
@@ -1066,6 +1070,8 @@ fr:
         create_at_least_one_schedule_step_3: 3. Cliquez sur "+ Nouveau Rythme d'abonnement", et remplissez le formulaire
         once_you_are_done_you_can_html: Une fois que c'est fait, vous pouvez %{reload_this_page_link}
         reload_this_page: recharger cette page
+      form:
+        create: "Créer abonnement"
       steps:
         details: 1. Informations de base
         address: 2. Adresse

From b2309f8673b67f4188e7e8dbdf6cbe75afa9576f Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Thu, 6 Aug 2020 00:21:16 +1000
Subject: [PATCH 279/340] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index a8780fa3ca..04a4a20454 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -1039,10 +1039,13 @@ en_FR:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1051,6 +1054,7 @@ en_FR:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1064,6 +1068,8 @@ en_FR:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address

From dd86e009133900b85b2b38e99fb1a748e3042949 Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Wed, 5 Aug 2020 18:17:14 +0300
Subject: [PATCH 280/340] Update en.yml

---
 config/locales/en.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0bd243a5ce..4175f8f9c0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1395,6 +1395,8 @@ en:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
 
   card_number: Card Number
   card_securitycode: "Security Code"

From 6e626447d07d24884a47a4fc7409c867ed4fb7be Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2020 23:48:20 +0000
Subject: [PATCH 281/340] Bump ddtrace from 0.38.0 to 0.39.0

Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.38.0 to 0.39.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.38.0...v0.39.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fbdb755d75..3a0b9bb512 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -204,7 +204,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.38.0)
+    ddtrace (0.39.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)

From 1e2c092b70ac8ebfbd1458b96c3c6d0f6bac5308 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Thu, 6 Aug 2020 17:14:33 +1000
Subject: [PATCH 282/340] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 11d93355ad..efc40acc1e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3390,6 +3390,33 @@ fr:
       invoice_email:
         hi: "Bonjour %{name}"
         invoice_attached_text: 'Veuillez trouver ci-joint la facture pour votre récente commande auprès de '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Votre demande de nouveau mot de passe a bien été prise en compte.
+            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
+        link_text: >
+            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
+            lien ci-dessous :
+        issue_text: |
+            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
+            Si le problème persiste, n'hésitez pas à nous contacter.
+      confirmation_instructions:
+        subject: "Veuillez confirmer votre compte"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Cher Acheteur,"
+        instructions: "Votre commande a été expédiée"
+        shipment_summary: "Résumé de l'envoi"
+        subject: "Notification d'expédition"
+        thanks: "Merci pour votre commande."
+        track_information: "Informations de suivi : %{tracking}"
+        track_link: "Lien de suivi : %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Félicitations !"
+        message: "Si vous avez reçu cet email, cela signifie que vos emails sont bien paramétrés."
+        subject: "Mail de test"
     order_state:
       address: adresse
       adjustments: ajustements
@@ -3411,19 +3438,6 @@ fr:
       ended: terminé
       paused: mis en pause
       canceled: annulé
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Votre demande de nouveau mot de passe a bien été prise en compte.
-            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
-        link_text: >
-            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
-            lien ci-dessous :
-        issue_text: |
-            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
-            Si le problème persiste, n'hésitez pas à nous contacter.
-      confirmation_instructions:
-        subject: Veuillez confirmer votre compte
     users:
       form:
         account_settings: Paramètres du Compte

From f92d05656ca6b896009c0fd97e8af0dc3dc0a743 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Thu, 6 Aug 2020 17:17:36 +1000
Subject: [PATCH 283/340] Updating translations for config/locales/en_FR.yml

---
 config/locales/en_FR.yml | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 04a4a20454..878adadb55 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -3360,6 +3360,32 @@ en_FR:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulations!"
+        message: "If you have received this email, then your email settings are correct."
+        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments
@@ -3381,18 +3407,6 @@ en_FR:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings

From 2ccb7c3eb0c4a3196c798f5ab0422f9678504ee5 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Thu, 6 Aug 2020 14:09:03 +0200
Subject: [PATCH 284/340] Point spree_paypal_express to its latest commit

This brings in the fix for the intermittent PayPal connection failures
due to SSL verification failed. Checkout that gem's commit for details.
---
 Gemfile      | 2 ++
 Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 88ad191231..fd3f7aaacc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,9 @@ gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 # Our branch contains two changes
 # - Pass customer email and phone number to PayPal (merged to upstream master)
 # - Change type of password from string to password to hide it in the form
+# - Skip CA cert file and use the ones provided by the OS
 gem 'spree_paypal_express', github: 'openfoodfoundation/better_spree_paypal_express', branch: '2-1-0-stable'
+
 gem 'stripe'
 
 # We need at least this version to have Digicert's root certificate
diff --git a/Gemfile.lock b/Gemfile.lock
index fbdb755d75..5d08824020 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: e28e4a8c5cedba504eea9cdad4be440d277d7e68
+  revision: 1736e3268239a841576d2719a1f276cf9b74c5c5
   branch: 2-1-0-stable
   specs:
     spree_paypal_express (2.0.3)

From 766b7449d819c1886efdb5a2cd2de2d2ffc053a2 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 7 Aug 2020 10:00:21 +0100
Subject: [PATCH 285/340] Update all locales with the latest Transifex
 translations

---
 config/locales/ar.yml     | 47 ++++++++++++++++++++++++-------------
 config/locales/ca.yml     | 49 +++++++++++++++++++++++++--------------
 config/locales/de_DE.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_AU.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_BE.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_CA.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_DE.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_GB.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_IE.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_IN.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_NZ.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_PH.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_US.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/en_ZA.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/es.yml     | 47 ++++++++++++++++++++++++-------------
 config/locales/es_CR.yml  | 47 ++++++++++++++++++++++++-------------
 config/locales/fil_PH.yml | 47 ++++++++++++++++++++++++-------------
 config/locales/fr_BE.yml  | 49 +++++++++++++++++++++++++--------------
 config/locales/fr_CA.yml  | 49 +++++++++++++++++++++++++--------------
 config/locales/it.yml     | 47 ++++++++++++++++++++++++-------------
 config/locales/nb.yml     | 47 ++++++++++++++++++++++++-------------
 config/locales/nl_BE.yml  | 49 +++++++++++++++++++++++++--------------
 config/locales/pt.yml     | 45 +++++++++++++++++++++++------------
 config/locales/pt_BR.yml  | 42 ++++++++++++++++++++-------------
 config/locales/sv.yml     | 20 ++++++++--------
 config/locales/tr.yml     | 47 ++++++++++++++++++++++++-------------
 26 files changed, 783 insertions(+), 413 deletions(-)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index cc0b9e975f..fa8510a3d7 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1021,10 +1021,13 @@ ar:
         name: "ملخص رسوم الشركات"
         description: "ملخص رسوم الشركات التي تم جمعها"
     subscriptions:
-      subscriptions: الاشتراكات
-      new: اشتراك جديد
-      create: إنشاء اشتراك
-      edit: تحرير الاشتراك
+      index:
+        title: "الاشتراكات"
+        new: "اشتراك جديد"
+      new:
+        title: "اشتراك جديد"
+      edit:
+        title: "تحرير الاشتراك"
       table:
         edit_subscription: تحرير الاشتراك
         pause_subscription: وقف مؤقت الاشتراك
@@ -1033,6 +1036,7 @@ ar:
       filters:
         query_placeholder: "البحث عن طريق البريد الإلكتروني ..."
       setup_explanation:
+        title: "الاشتراكات"
         just_a_few_more_steps: 'فقط بضع خطوات أخرى قبل أن تبدأ:'
         enable_subscriptions: "تمكين الاشتراكات في واحد على الأقل من المتاجر الخاصة بك"
         enable_subscriptions_step_1_html: 1. انتقل إلى صفحة %{enterprises_link} ، وابحث عن متجرك ، وانقر على &quot;إدارة&quot;
@@ -1046,6 +1050,8 @@ ar:
         create_at_least_one_schedule_step_3: 3. انقر فوق &quot;+ جدول جديد&quot; ، واملأ النموذج
         once_you_are_done_you_can_html: بمجرد الانتهاء من ذلك ، يمكنك %{reload_this_page_link}
         reload_this_page: اعد تحميل هذه الصفحة
+      form:
+        create: "إنشاء اشتراك"
       steps:
         details: 1. التفاصيل الأساسية
         address: 2. العنوان
@@ -3244,6 +3250,27 @@ ar:
       invoice_email:
         hi: "مرحبًا %{name}"
         invoice_attached_text: يرجى الاطلاع على فاتورة مرفقة لطلبك الأخير من
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            تم تقديم طلب لإعادة تعيين كلمة المرور الخاصة بك.
+            إذا لم تقدم هذا الطلب ، ببساطة تجاهل هذا البريد الإلكتروني.
+        link_text: >
+            إذا قمت بهذا الطلب ، فما عليك سوى النقر فوق الرابط أدناه:
+        issue_text: |
+            إذا لم يعمل عنوان URL أعلاه ، فحاول نسخه ولصقه في متصفحك.
+            إذا كنت لا تزال تواجه مشاكل ، فلا تتردد في الاتصال بنا.
+      confirmation_instructions:
+        subject: "يرجى تأكيد حسابك OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "عزيزي العميل،"
+        instructions: "تم شحن طلبك"
+        shipment_summary: "ملخص الشحن"
+        subject: "إشعار الشحن"
+        thanks: "شكرا لك على اعمالك."
+        track_information: "معلومات التتبع : %{tracking}"
+        track_link: "رابط التتبع: %{url}"
     order_state:
       address: العنوان
       adjustments: التعديلات
@@ -3265,18 +3292,6 @@ ar:
       ended: انتهى
       paused: التعليق
       canceled: الالغاء
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            تم تقديم طلب لإعادة تعيين كلمة المرور الخاصة بك.
-            إذا لم تقدم هذا الطلب ، ببساطة تجاهل هذا البريد الإلكتروني.
-        link_text: >
-            إذا قمت بهذا الطلب ، فما عليك سوى النقر فوق الرابط أدناه:
-        issue_text: |
-            إذا لم يعمل عنوان URL أعلاه ، فحاول نسخه ولصقه في متصفحك.
-            إذا كنت لا تزال تواجه مشاكل ، فلا تتردد في الاتصال بنا.
-      confirmation_instructions:
-        subject: يرجى تأكيد حسابك OFN
     users:
       form:
         account_settings: إعدادت الحساب
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d78d7ae06a..77f02af74c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1042,10 +1042,13 @@ ca:
         name: "Resum de les comissions de l'organització"
         description: "Resum de les comissions de l'organització recollides"
     subscriptions:
-      subscriptions: Subscripcions
-      new: Nova subscripció
-      create: Crea una subscripció
-      edit: Edita la subscripció
+      index:
+        title: "Subscripcions"
+        new: "Nova subscripció"
+      new:
+        title: "Nova subscripció"
+      edit:
+        title: "Edita la subscripció"
       table:
         edit_subscription: Edita la subscripció
         pause_subscription: Pausa la subscripció
@@ -1054,6 +1057,7 @@ ca:
       filters:
         query_placeholder: "Cerca per correu electrònic ..."
       setup_explanation:
+        title: "Subscripcions"
         just_a_few_more_steps: 'Només uns quants passos més abans de començar:'
         enable_subscriptions: "Activa les subscripcions d'almenys una de les teves botigues"
         enable_subscriptions_step_1_html: 1. Aneu a la pàgina %{enterprises_link}, cerqueu la vostra botiga i feu clic a "Gestionar"
@@ -1067,6 +1071,8 @@ ca:
         create_at_least_one_schedule_step_3: 3. Fes clic a '+ Nova programació' i omple el formulari
         once_you_are_done_you_can_html: Un cop hagueu acabat, podeu %{reload_this_page_link}
         reload_this_page: tornar a carregar aquesta pàgina
+      form:
+        create: "Crea una subscripció"
       steps:
         details: 1. Detalls bàsics
         address: 2. Adreça
@@ -1941,7 +1947,7 @@ ca:
   admin_enterprise_groups: "Grups d'organització"
   admin_enterprise_groups_name: "Nom"
   admin_enterprise_groups_owner: "Propietària"
-  admin_enterprise_groups_on_front_page: "A la primera pàgina?"
+  admin_enterprise_groups_on_front_page: "Visible a la web"
   admin_enterprise_groups_enterprise: "Organitzacions"
   admin_enterprise_groups_data_powertip: "La usuària principal responsable d'aquest grup."
   admin_enterprise_groups_data_powertip_logo: "Això és el logotip del grup"
@@ -3360,6 +3366,27 @@ ca:
       invoice_email:
         hi: "Hola %{name}"
         invoice_attached_text: Trobareu adjunta un comprovant de la compra per a la vostra comanda recent
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            S'ha fet una sol·licitud per restablir la teva contrasenya.
+            Si no has fet aquesta sol·licitud, simplement ignora aquest correu electrònic.
+        link_text: >
+            Si has fet aquesta sol·licitud, fes clic a l'enllaç següent:
+        issue_text: |
+            Si l'URL anterior no funciona, prova de copiar-lo i enganxar-lo al navegador.
+            Si continues tenint problemes, no dubtis en contactar-nos.
+      confirmation_instructions:
+        subject: "Si us plau confirma el teu compte d'OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Benvolguda consumidora:"
+        instructions: "La vostra comanda s'ha enviat"
+        shipment_summary: "Resum de l'enviament"
+        subject: "Notificació d'enviament"
+        thanks: "Gràcies per la teva compra."
+        track_information: "Informació del seguiment: %{tracking}"
+        track_link: "Enllaç del seguiment: %{url}"
     order_state:
       address: adreça
       adjustments: ajustaments
@@ -3381,18 +3408,6 @@ ca:
       ended: acabat
       paused: en pausa
       canceled: cancel·lat
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            S'ha fet una sol·licitud per restablir la teva contrasenya.
-            Si no has fet aquesta sol·licitud, simplement ignora aquest correu electrònic.
-        link_text: >
-            Si has fet aquesta sol·licitud, fes clic a l'enllaç següent:
-        issue_text: |
-            Si l'URL anterior no funciona, prova de copiar-lo i enganxar-lo al navegador.
-            Si continues tenint problemes, no dubtis en contactar-nos.
-      confirmation_instructions:
-        subject: Si us plau confirma el teu compte d'OFN
     users:
       form:
         account_settings: Configuració del compte
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 2cdcd6fcc3..827850fefe 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -1029,10 +1029,13 @@ de_DE:
         name: "Unternehmensgebühr Zusammenfassung"
         description: "Zusammenfassung der erhobenen Zuschläge"
     subscriptions:
-      subscriptions: Abonnements
-      new: Neues Abonnement
-      create: Abonnement erstellen
-      edit: Abonnement bearbeiten
+      index:
+        title: "Abonnements"
+        new: "Neues Abonnement"
+      new:
+        title: "Neues Abonnement"
+      edit:
+        title: "Abonnement bearbeiten"
       table:
         edit_subscription: Abonnement bearbeiten
         pause_subscription: Abonement pausieren
@@ -1041,6 +1044,7 @@ de_DE:
       filters:
         query_placeholder: "Suche per E-Mail ..."
       setup_explanation:
+        title: "Abonnements"
         just_a_few_more_steps: 'Nur noch ein paar Schritte bevor Sie beginnen können:'
         enable_subscriptions: "Aktivieren Sie Abonnements für mindestens einen Ihrer Läden"
         enable_subscriptions_step_1_html: 1. Gehen Sie zur Seite %{enterprises_link}, suchen Sie Ihren Laden und klicken Sie auf "Verwalten"
@@ -1054,6 +1058,8 @@ de_DE:
         create_at_least_one_schedule_step_3: 3. Klicken Sie auf "+ Neuer Zeitplan" und füllen Sie das Formular aus
         once_you_are_done_you_can_html: Sobald Sie fertig sind, können Sie %{reload_this_page_link}
         reload_this_page: diese Seite neu laden
+      form:
+        create: "Abonnement erstellen"
       steps:
         details: 1. Grundlegendes
         address: 2. Adresse
@@ -3259,6 +3265,27 @@ de_DE:
       invoice_email:
         hi: "Hallo %{name}"
         invoice_attached_text: Im Anhang findest Du eine Rechnung für die letzte Bestellung vom
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Es wurde angefragt, das Passwort zurückzusetzen.
+            Sollte kein neues Passwort angefordert werden, bitte dieses E-Mail ignorieren.
+        link_text: >
+            Sollte ein neues Passwort angefordert werden, bitte den folgenden Aktivierungslink
+            bestätigen.
+        issue_text: |
+            Falls die URL nicht funktioniert, bitte den Link kopieren und in die Adresszeile Ihres Browsers einfügen
+      confirmation_instructions:
+        subject: "Bitte OFN-Konto bestätigen"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Sehr geehrter Kunde,"
+        instructions: "Ihre Bestellung wurde versandt"
+        shipment_summary: "Übersicht"
+        subject: "Versandbenachrichtigung"
+        thanks: "Danke für Ihren Einkauf."
+        track_information: "Tracking-Informationen: %{tracking}"
+        track_link: "Tracking-Link: %{url}"
     order_state:
       address: Adresse
       adjustments: Verbesserungen
@@ -3280,18 +3307,6 @@ de_DE:
       ended: beendet
       paused: pausiert
       canceled: storniert
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Es wurde angefragt, das Passwort zurückzusetzen.
-            Sollte kein neues Passwort angefordert werden, bitte dieses E-Mail ignorieren.
-        link_text: >
-            Sollte ein neues Passwort angefordert werden, bitte den folgenden Aktivierungslink
-            bestätigen.
-        issue_text: |
-            Falls die URL nicht funktioniert, bitte den Link kopieren und in die Adresszeile Ihres Browsers einfügen
-      confirmation_instructions:
-        subject: Bitte OFN-Konto bestätigen
     users:
       form:
         account_settings: Konto Einstellungen
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
index e6e8d32f5a..e2870ac449 100644
--- a/config/locales/en_AU.yml
+++ b/config/locales/en_AU.yml
@@ -1028,10 +1028,13 @@ en_AU:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1040,6 +1043,7 @@ en_AU:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1053,6 +1057,8 @@ en_AU:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3187,6 +3193,27 @@ en_AU:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3208,18 +3235,6 @@ en_AU:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml
index a77ebfec6e..eb4fe37c28 100644
--- a/config/locales/en_BE.yml
+++ b/config/locales/en_BE.yml
@@ -991,10 +991,13 @@ en_BE:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1003,6 +1006,7 @@ en_BE:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1016,6 +1020,8 @@ en_BE:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3096,6 +3102,27 @@ en_BE:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3117,18 +3144,6 @@ en_BE:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index 534596c546..e1a06b250b 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -1035,10 +1035,13 @@ en_CA:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_CA:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_CA:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3345,6 +3351,27 @@ en_CA:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer, "
+        instructions: "Your order has been shipped or picked up."
+        shipment_summary: "Shipment/Pick Up Summary"
+        subject: "Shipment/Pick Up Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3366,18 +3393,6 @@ en_CA:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index 22d03e1dd2..12d0eed27a 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -999,10 +999,13 @@ en_DE:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1011,6 +1014,7 @@ en_DE:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1024,6 +1028,8 @@ en_DE:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3113,6 +3119,27 @@ en_DE:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3134,18 +3161,6 @@ en_DE:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 4b029c385a..9ca46758e3 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -1035,10 +1035,13 @@ en_GB:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_GB:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_GB:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3352,6 +3358,27 @@ en_GB:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3373,18 +3400,6 @@ en_GB:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_IE.yml b/config/locales/en_IE.yml
index c3ae9025ef..acba252f19 100644
--- a/config/locales/en_IE.yml
+++ b/config/locales/en_IE.yml
@@ -1034,10 +1034,13 @@ en_IE:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1046,6 +1049,7 @@ en_IE:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1059,6 +1063,8 @@ en_IE:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3350,6 +3356,27 @@ en_IE:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3371,18 +3398,6 @@ en_IE:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_IN.yml b/config/locales/en_IN.yml
index c9eb57367d..0a03177aec 100644
--- a/config/locales/en_IN.yml
+++ b/config/locales/en_IN.yml
@@ -1035,10 +1035,13 @@ en_IN:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_IN:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_IN:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3352,6 +3358,27 @@ en_IN:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3373,18 +3400,6 @@ en_IN:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index 7b17a515d8..e38b224f74 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -1035,10 +1035,13 @@ en_NZ:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1047,6 +1050,7 @@ en_NZ:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1060,6 +1064,8 @@ en_NZ:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3346,6 +3352,27 @@ en_NZ:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3367,18 +3394,6 @@ en_NZ:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_PH.yml b/config/locales/en_PH.yml
index a2ce920948..0e45bef317 100644
--- a/config/locales/en_PH.yml
+++ b/config/locales/en_PH.yml
@@ -1027,10 +1027,13 @@ en_PH:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1039,6 +1042,7 @@ en_PH:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1052,6 +1056,8 @@ en_PH:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3279,6 +3285,27 @@ en_PH:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3300,18 +3327,6 @@ en_PH:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index eae38be679..8641ca95b1 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -1034,10 +1034,13 @@ en_US:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1046,6 +1049,7 @@ en_US:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1059,6 +1063,8 @@ en_US:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3344,6 +3350,27 @@ en_US:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below.
+        issue_text: |
+            If the above URL does nor work, try to copy and paste it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your business."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3365,18 +3392,6 @@ en_US:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below.
-        issue_text: |
-            If the above URL does nor work, try to copy and paste it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml
index 84ddac5500..b46ded3e6c 100644
--- a/config/locales/en_ZA.yml
+++ b/config/locales/en_ZA.yml
@@ -1029,10 +1029,13 @@ en_ZA:
         name: "Enterprise Fee Summary"
         description: "Summary of Enterprise Fees collected"
     subscriptions:
-      subscriptions: Subscriptions
-      new: New Subscription
-      create: Create Subscription
-      edit: Edit Subscription
+      index:
+        title: "Subscriptions"
+        new: "New Subscription"
+      new:
+        title: "New Subscription"
+      edit:
+        title: "Edit Subscription"
       table:
         edit_subscription: Edit Subscription
         pause_subscription: Pause Subscription
@@ -1041,6 +1044,7 @@ en_ZA:
       filters:
         query_placeholder: "Search by email..."
       setup_explanation:
+        title: "Subscriptions"
         just_a_few_more_steps: 'Just a few more steps before you can begin:'
         enable_subscriptions: "Enable subscriptions for at least one of your shops"
         enable_subscriptions_step_1_html: 1. Go to the %{enterprises_link} page, find your shop, and click "Manage"
@@ -1054,6 +1058,8 @@ en_ZA:
         create_at_least_one_schedule_step_3: 3. Click '+ New Schedule', and fill out the form
         once_you_are_done_you_can_html: Once you are done, you can %{reload_this_page_link}
         reload_this_page: reload this page
+      form:
+        create: "Create Subscription"
       steps:
         details: 1. Basic Details
         address: 2. Address
@@ -3172,6 +3178,27 @@ en_ZA:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            A request to reset your password has been made.
+            If you did not make this request, simply ignore this email.
+        link_text: >
+            If you did make this request just click the link below:
+        issue_text: |
+            If the above URL does not work try copying and pasting it into your browser.
+            If you continue to have problems please feel free to contact us.
+      confirmation_instructions:
+        subject: "Please confirm your OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "Your order has been shipped"
+        shipment_summary: "Shipment Summary"
+        subject: "Shipment Notification"
+        thanks: "Thank you for your order with us."
+        track_information: "Tracking Information: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: address
       adjustments: adjustments
@@ -3193,18 +3220,6 @@ en_ZA:
       ended: ended
       paused: paused
       canceled: cancelled
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            A request to reset your password has been made.
-            If you did not make this request, simply ignore this email.
-        link_text: >
-            If you did make this request just click the link below:
-        issue_text: |
-            If the above URL does not work try copying and pasting it into your browser.
-            If you continue to have problems please feel free to contact us.
-      confirmation_instructions:
-        subject: Please confirm your OFN account
     users:
       form:
         account_settings: Account Settings
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f10e9b594a..72dbbb7476 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1041,10 +1041,13 @@ es:
         name: "Resumen de las comisiones de la organización"
         description: "Resumen de las comisiones de la organización recolectadas"
     subscriptions:
-      subscriptions: Suscripciones
-      new: Nueva suscripción
-      create: Crear suscripción
-      edit: Editar suscripción
+      index:
+        title: "Suscripciones"
+        new: "Nueva suscripción"
+      new:
+        title: "Nueva suscripción"
+      edit:
+        title: "Editar suscripción"
       table:
         edit_subscription: Editar suscripción
         pause_subscription: Pausa Suscripción
@@ -1053,6 +1056,7 @@ es:
       filters:
         query_placeholder: "Buscar por correo electrónico ..."
       setup_explanation:
+        title: "Suscripciones"
         just_a_few_more_steps: 'Solo unos pocos pasos más antes de que pueda comenzar:'
         enable_subscriptions: "Habilita suscripciones para al menos una de tus tiendas"
         enable_subscriptions_step_1_html: 1. Vaya a la página %{enterprises_link}, encuentre su tienda y haga clic en "Administrar"
@@ -1066,6 +1070,8 @@ es:
         create_at_least_one_schedule_step_3: 3. Haga clic en '+ Nueva programación' y complete el formulario
         once_you_are_done_you_can_html: Una vez que haya terminado, puede %{reload_this_page_link}
         reload_this_page: recarga esta página
+      form:
+        create: "Crear suscripción"
       steps:
         details: 1. Detalles básicos
         address: 2. Dirección
@@ -3360,6 +3366,27 @@ es:
       invoice_email:
         hi: "Hola %{name}"
         invoice_attached_text: Adjunta una factura para su pedido reciente de
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Se ha solicitado el cambio de tu contraseña.
+            Si tu no lo has solicitado simplemente ignora este email.
+        link_text: >
+            Si has solicitado esta acción haz click en el siguiente enlace:
+        issue_text: |
+            Si el enlace no funciona prueba a copiarlo y pegarlo en tu navegador.
+            Si los problemas continúan no dudes en contactarnos.
+      confirmation_instructions:
+        subject: "Por favor, confirma tu cuenta de OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Estimada consumidora,"
+        instructions: "Tu pedido ha sido enviado"
+        shipment_summary: "Resumen de envío"
+        subject: "Notificación de envío"
+        thanks: "Gracias por hacer negocios."
+        track_information: "Información de seguimiento: %{tracking}"
+        track_link: "Enlace de seguimiento: %{url}"
     order_state:
       address: dirección
       adjustments: ajustes
@@ -3381,18 +3408,6 @@ es:
       ended: terminado
       paused: pausado
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Se ha solicitado el cambio de tu contraseña.
-            Si tu no lo has solicitado simplemente ignora este email.
-        link_text: >
-            Si has solicitado esta acción haz click en el siguiente enlace:
-        issue_text: |
-            Si el enlace no funciona prueba a copiarlo y pegarlo en tu navegador.
-            Si los problemas continúan no dudes en contactarnos.
-      confirmation_instructions:
-        subject: Por favor, confirma tu cuenta de OFN
     users:
       form:
         account_settings: Configuración de la cuenta
diff --git a/config/locales/es_CR.yml b/config/locales/es_CR.yml
index 60d302418d..e9ed32698b 100644
--- a/config/locales/es_CR.yml
+++ b/config/locales/es_CR.yml
@@ -1030,10 +1030,13 @@ es_CR:
         name: "Resumen de las comisiones de la organización"
         description: "Resumen de las comisiones de la organización recolectadas"
     subscriptions:
-      subscriptions: Suscripciones
-      new: Nueva suscripción
-      create: Crear suscripción
-      edit: Editar suscripción
+      index:
+        title: "Suscripciones"
+        new: "Nueva suscripción"
+      new:
+        title: "Nueva suscripción"
+      edit:
+        title: "Editar suscripción"
       table:
         edit_subscription: Editar suscripción
         pause_subscription: Pausar suscripción
@@ -1042,6 +1045,7 @@ es_CR:
       filters:
         query_placeholder: "Buscar por correo electrónico ..."
       setup_explanation:
+        title: "Suscripciones"
         just_a_few_more_steps: 'Solo unos pocos pasos más antes de que pueda comenzar:'
         enable_subscriptions: "Habilita suscripciones para al menos una de sus tiendas"
         enable_subscriptions_step_1_html: 1. Ir a la página %{enterprises_link}, encuentre su tienda y haga clic en "Administrar"
@@ -1055,6 +1059,8 @@ es_CR:
         create_at_least_one_schedule_step_3: 3. Haga clic en '+ Nueva programación' y complete el formulario
         once_you_are_done_you_can_html: Una vez que haya terminado, puede %{reload_this_page_link}
         reload_this_page: recarga esta página
+      form:
+        create: "Crear suscripción"
       steps:
         details: 1. Detalles básicos
         address: 2. Dirección
@@ -3287,6 +3293,27 @@ es_CR:
       invoice_email:
         hi: "Hola %{name}"
         invoice_attached_text: Adjunta una factura para su pedido reciente de
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            La solicitud de restablecer su contraseña se ha realizado.
+            Si usted no lo ha solicitado, ignora este correo electrónico.
+        link_text: >
+            Si has solicitado esta acción haz click en el siguiente enlace:
+        issue_text: |
+            Si el enlace anterior no funciona pruebe con copiarlo y pegarlo en su navegador.
+            Si los problemas continúan no dude en contactarnos.
+      confirmation_instructions:
+        subject: "Por favor, confirma tu cuenta de OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Estimado cliente,"
+        instructions: "Su pedido ha sido enviado"
+        shipment_summary: "Resumen de envío"
+        subject: "Notificación de envío"
+        thanks: "Gracias por su negocio."
+        track_information: "Información de seguimiento: %{tracking}"
+        track_link: "Enlace de seguimiento: %{url}"
     order_state:
       address: dirección
       adjustments: ajustes
@@ -3308,18 +3335,6 @@ es_CR:
       ended: terminado
       paused: pausado
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            La solicitud de restablecer su contraseña se ha realizado.
-            Si usted no lo ha solicitado, ignora este correo electrónico.
-        link_text: >
-            Si has solicitado esta acción haz click en el siguiente enlace:
-        issue_text: |
-            Si el enlace anterior no funciona pruebe con copiarlo y pegarlo en su navegador.
-            Si los problemas continúan no dude en contactarnos.
-      confirmation_instructions:
-        subject: Por favor, confirma tu cuenta de OFN
     users:
       form:
         account_settings: Configuración de la cuenta
diff --git a/config/locales/fil_PH.yml b/config/locales/fil_PH.yml
index d892591c6b..b5bdb71f93 100644
--- a/config/locales/fil_PH.yml
+++ b/config/locales/fil_PH.yml
@@ -1030,10 +1030,13 @@ fil_PH:
         name: "buod ng bayad sa enterprise"
         description: "buod ng mga nakolektang fees para sa enterprise"
     subscriptions:
-      subscriptions: mga subscription
-      new: bagong subscription
-      create: gumawa ng subscription
-      edit: i-edit ang subscription
+      index:
+        title: "mga nauulit na order"
+        new: "bagong subscription"
+      new:
+        title: "bagong subscription"
+      edit:
+        title: "i-edit ang subscription"
       table:
         edit_subscription: i-edit ang subscription
         pause_subscription: panandaliang ihinto ang subscription
@@ -1042,6 +1045,7 @@ fil_PH:
       filters:
         query_placeholder: "hanapin gamit ang email..."
       setup_explanation:
+        title: "mga nauulit na order"
         just_a_few_more_steps: 'ilang hakbang na lamang bago ka makapagsimula:'
         enable_subscriptions: "paganahin ang subscription sa kahit isa sa iyong mga shop"
         enable_subscriptions_step_1_html: 1. pumunta sa%{enterprises_link}pahina, hanapin ang iyong shop at pindutin ang "pamahalaan"
@@ -1055,6 +1059,8 @@ fil_PH:
         create_at_least_one_schedule_step_3: 3. pindutin ang '+ bagong iskedyul' at sagutan ang form
         once_you_are_done_you_can_html: kapag natapos na ito, maaari mong%{reload_this_page_link}
         reload_this_page: i-reload ang pahina na ito
+      form:
+        create: "gumawa ng subscription"
       steps:
         details: 1. pangunahing detalye
         address: 2. address
@@ -3292,6 +3298,27 @@ fil_PH:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: 'tignan ang nakalakip na invoice para sa pinakabagong order mula sa  '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            may ginawang request para i-reset ang inyong password.
+            kung hindi ikaw ang gumawa nito, huwag pansinin ang email na ito.
+        link_text: >
+            kung ikaw ang gumawa ng request na ito, pindutin ang link sa ilalim:
+        issue_text: |
+            kung ang URL sa itaas ay hindi gumagana, subukang kopyahin at i-paste ito sa inyong browser.
+            kung patuloy na magkakaroon ng mga problema, huwag mag-atubiling makipag-ugnayan sa amin.
+      confirmation_instructions:
+        subject: "kumpirmahin ang inyong OFN account"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Dear Customer,"
+        instructions: "ang iyong order ay na-ship na "
+        shipment_summary: "buod ng kargamento"
+        subject: "notification ukol sa kargamento"
+        thanks: "Salamat sa inyong pagtangkilik"
+        track_information: "Impormasyon ukol sa pag-track: %{tracking}"
+        track_link: "Link ng pag-track:%{url}"
     order_state:
       address: tirahan
       adjustments: mga pagsasaayos
@@ -3313,18 +3340,6 @@ fil_PH:
       ended: natapos na
       paused: nakahinto
       canceled: kanselado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            may ginawang request para i-reset ang inyong password.
-            kung hindi ikaw ang gumawa nito, huwag pansinin ang email na ito.
-        link_text: >
-            kung ikaw ang gumawa ng request na ito, pindutin ang link sa ilalim:
-        issue_text: |
-            kung ang URL sa itaas ay hindi gumagana, subukang kopyahin at i-paste ito sa inyong browser.
-            kung patuloy na magkakaroon ng mga problema, huwag mag-atubiling makipag-ugnayan sa amin.
-      confirmation_instructions:
-        subject: kumpirmahin ang inyong OFN account
     users:
       form:
         account_settings: Setting ng Account
diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml
index 81a2b61b42..c87a36c9da 100644
--- a/config/locales/fr_BE.yml
+++ b/config/locales/fr_BE.yml
@@ -1029,10 +1029,13 @@ fr_BE:
         name: "Récapitulatif de la commission d'entreprise "
         description: "Récapitulatif des commissions d'entreprise perçues"
     subscriptions:
-      subscriptions: Abonnements
-      new: Nouvel abonnement
-      create: Créer abonnement
-      edit: Mettre à jour Abonnement
+      index:
+        title: "commandes récurrantes"
+        new: "Nouvel abonnement"
+      new:
+        title: "Nouvel abonnement"
+      edit:
+        title: "Mettre à jour Abonnement"
       table:
         edit_subscription: Mettre à jour Abonnement
         pause_subscription: Mettre en pause Abonnement
@@ -1041,6 +1044,7 @@ fr_BE:
       filters:
         query_placeholder: "Recherche par email ..."
       setup_explanation:
+        title: "commandes récurrantes"
         just_a_few_more_steps: 'Encore quelques étapes avant de pouvoir commencer:'
         enable_subscriptions: "Activez la fonction abonnements pour au moins une de vos comptoirs"
         enable_subscriptions_step_1_html: 1. Allez à %{enterprises_link}, trouvez votre comptoir, et cliquez sur "Gérer"
@@ -1054,6 +1058,8 @@ fr_BE:
         create_at_least_one_schedule_step_3: 3. Cliquez sur "+ Nouveau Rythme d'abonnement", et remplissez le formulaire
         once_you_are_done_you_can_html: Une fois que c'est fait, vous pouvez %{reload_this_page_link}
         reload_this_page: recharger cette page
+      form:
+        create: "Créer abonnement"
       steps:
         details: 1. Informations de base
         address: 2. Adresse
@@ -3230,6 +3236,28 @@ fr_BE:
       invoice_email:
         hi: "Bonjour %{name}"
         invoice_attached_text: 'Veuillez trouver ci-joint la facture pour votre récente commande auprès de '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Votre demande de nouveau mot de passe a bien été prise en compte.
+            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
+        link_text: >
+            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
+            lien ci-dessous :
+        issue_text: |
+            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
+            Si le problème persiste, n'hésitez pas à nous contacter.
+      confirmation_instructions:
+        subject: "Veuillez confirmer votre compte"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Cher Client,"
+        instructions: "Votre commande a été expédiée"
+        shipment_summary: "Résumé de l'envoi"
+        subject: "Notification d'expédition"
+        thanks: "Merci pour votre commande."
+        track_information: "Informations de suivi : %{tracking}"
+        track_link: "Lien de suivi : %{url}"
     order_state:
       address: adresse
       adjustments: ajustements
@@ -3251,19 +3279,6 @@ fr_BE:
       ended: terminé
       paused: mis en pause
       canceled: annulé
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Votre demande de nouveau mot de passe a bien été prise en compte.
-            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
-        link_text: >
-            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
-            lien ci-dessous :
-        issue_text: |
-            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
-            Si le problème persiste, n'hésitez pas à nous contacter.
-      confirmation_instructions:
-        subject: Veuillez confirmer votre compte
     users:
       form:
         account_settings: Paramètres du Compte
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 92b8a8a99e..0ad10aa41a 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -1038,10 +1038,13 @@ fr_CA:
         name: "Résumé des marges et commissions"
         description: "Résumé des marges et commissions collectées"
     subscriptions:
-      subscriptions: Abonnements
-      new: Nouvel abonnement
-      create: Créer abonnement
-      edit: Mettre à jour Abonnement
+      index:
+        title: "Abonnements"
+        new: "Nouvel abonnement"
+      new:
+        title: "Nouvel abonnement"
+      edit:
+        title: "Mettre à jour Abonnement"
       table:
         edit_subscription: Mettre à jour Abonnement
         pause_subscription: Mettre en pause Abonnement
@@ -1050,6 +1053,7 @@ fr_CA:
       filters:
         query_placeholder: "Recherche par email"
       setup_explanation:
+        title: "Abonnements"
         just_a_few_more_steps: 'Encore quelques étapes avant de pouvoir commencer:'
         enable_subscriptions: "Activez la fonction abonnements pour au moins une de vos boutiques"
         enable_subscriptions_step_1_html: 1. Allez à %{enterprises_link}, trouvez votre boutique, et cliquez sur "Gérer"
@@ -1063,6 +1067,8 @@ fr_CA:
         create_at_least_one_schedule_step_3: 3. Cliquez sur "+ Nouveau Rythme d'abonnement", et remplissez le formulaire
         once_you_are_done_you_can_html: Une fois que c'est fait, vous pouvez %{reload_this_page_link}
         reload_this_page: recharger cette page
+      form:
+        create: "Créer abonnement"
       steps:
         details: 1. Informations de base
         address: 2. Adresse
@@ -3359,6 +3365,28 @@ fr_CA:
       invoice_email:
         hi: "Bonjour %{name}"
         invoice_attached_text: 'Veuillez trouver ci-joint la facture pour votre récente commande auprès de '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Votre demande de nouveau mot de passe a bien été prise en compte.
+            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
+        link_text: >
+            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
+            lien ci-dessous :
+        issue_text: |
+            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
+            Si le problème persiste, n'hésitez pas à nous contacter.
+      confirmation_instructions:
+        subject: "Veuillez confirmer votre compte"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Cher Acheteur,"
+        instructions: "Votre commande a été expédiée"
+        shipment_summary: "Résumé de l'envoi"
+        subject: "Notification d'expédition"
+        thanks: "Merci pour votre commande."
+        track_information: "Informations de suivi :%{tracking}"
+        track_link: "Lien de suivi :%{url}"
     order_state:
       address: adresse
       adjustments: ajustements
@@ -3380,19 +3408,6 @@ fr_CA:
       ended: terminé
       paused: mis en pause
       canceled: annulé
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Votre demande de nouveau mot de passe a bien été prise en compte.
-            Si vous n'avez pas demandé de nouveau mot de passe, veuillez ignorer cet e-mail.
-        link_text: >
-            Si vous êtes bien à l'origine de cette demande, veuillez cliquer sur le
-            lien ci-dessous :
-        issue_text: |
-            Si le lien ne fonctionne pas, essayez de le copier - coller dans la barre d'adresse de votre navigateur.
-            Si le problème persiste, n'hésitez pas à nous contacter.
-      confirmation_instructions:
-        subject: Veuillez confirmer votre compte
     users:
       form:
         account_settings: Paramètres du Compte
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 70718ec09b..52ed76ce8f 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1037,10 +1037,13 @@ it:
         name: "Riepilogo commissioni dell'azienda"
         description: "Riepilogo delle commissioni dell'azienda"
     subscriptions:
-      subscriptions: Abbonamenti
-      new: Nuovo Abbonamento
-      create: Crea Abbonamento
-      edit: Modifica Abbonamento
+      index:
+        title: "Abbonamenti"
+        new: "Nuovo Abbonamento"
+      new:
+        title: "Nuovo Abbonamento"
+      edit:
+        title: "Modifica Abbonamento"
       table:
         edit_subscription: Modifica Abbonamento
         pause_subscription: Metti in pausa l'abbonamento
@@ -1049,6 +1052,7 @@ it:
       filters:
         query_placeholder: "Cerca per email..."
       setup_explanation:
+        title: "Abbonamenti"
         just_a_few_more_steps: 'Ancora pochi passi prima di cominciare:'
         enable_subscriptions: "Ativa abbonamento ad almeno uno dei tuoi negozi"
         enable_subscriptions_step_1_html: 1. Vai alla pagina %{enterprises_link}, trova il tuo negozio e clicca "Gestisci"
@@ -1062,6 +1066,8 @@ it:
         create_at_least_one_schedule_step_3: '3. Clicca su"+ Nuovo programma" e compila il modulo '
         once_you_are_done_you_can_html: Quando hai fatto, puoi %{reload_this_page_link}
         reload_this_page: Ricarica questa pagina
+      form:
+        create: "Crea Abbonamento"
       steps:
         details: 1. Dettagli base
         address: 2. Indirizzo
@@ -3350,6 +3356,27 @@ it:
       invoice_email:
         hi: "Ciao %{name}"
         invoice_attached_text: 'Aggiunge una fattura per il tuo recente ordine di '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            E' stata fatta una richiesta per resettare la tua password
+            Se non hai fatto questa richiesta, ignora semplicemente questa email.
+        link_text: >
+            Se hai fatto questa richiesta, clicca il link seguente:
+        issue_text: |
+            Se l'URL qui sopra non funziona, prova a copiarlo e incollarlo nel tuo browser.
+            Se continui ad avere problemi, contattaci.
+      confirmation_instructions:
+        subject: "Per favore conferma il tuo account OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Caro Cliente,"
+        instructions: "Il tuo ordine è stato spedito"
+        shipment_summary: "Riepilogo della Spedizione"
+        subject: "Notifica di Spedizione"
+        thanks: "Grazie per il tuo lavoro."
+        track_information: "Informazioni Tracking: %{tracking}"
+        track_link: "Tracking Link: %{url}"
     order_state:
       address: indirizzo
       adjustments: aggiustamenti
@@ -3371,18 +3398,6 @@ it:
       ended: finito
       paused: in pausa
       canceled: annullato
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            E' stata fatta una richiesta per resettare la tua password
-            Se non hai fatto questa richiesta, ignora semplicemente questa email.
-        link_text: >
-            Se hai fatto questa richiesta, clicca il link seguente:
-        issue_text: |
-            Se l'URL qui sopra non funziona, prova a copiarlo e incollarlo nel tuo browser.
-            Se continui ad avere problemi, contattaci.
-      confirmation_instructions:
-        subject: Per favore conferma il tuo account OFN
     users:
       form:
         account_settings: Impostazioni account
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index c1f12e2dad..08f365af9b 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1036,10 +1036,13 @@ nb:
         name: "Sammendrag Bedriftsavgift"
         description: "Sammendrag av bedriftsavgifter innsamlet"
     subscriptions:
-      subscriptions: Abonnement
-      new: Nytt abonnement
-      create: Opprett abonnement
-      edit: Rediger abonnement
+      index:
+        title: "Abonnement"
+        new: "Nytt abonnement"
+      new:
+        title: "Nytt abonnement"
+      edit:
+        title: "Rediger abonnement"
       table:
         edit_subscription: Rediger abonnement
         pause_subscription: Pause abonnement
@@ -1048,6 +1051,7 @@ nb:
       filters:
         query_placeholder: "Søk på epost..."
       setup_explanation:
+        title: "Abonnement"
         just_a_few_more_steps: 'Bare noen få skritt før du kan begynne:'
         enable_subscriptions: "Aktiver abonnementer for minst en av butikkene dine"
         enable_subscriptions_step_1_html: 1. Gå til siden %{enterprises_link}, finn butikken din, og klikk på "Endre profil"
@@ -1061,6 +1065,8 @@ nb:
         create_at_least_one_schedule_step_3: 3. Klikk på '+ Ny tidsplan', og fyll ut skjemaet
         once_you_are_done_you_can_html: Når du er ferdig, kan du %{reload_this_page_link}
         reload_this_page: oppdater denne siden
+      form:
+        create: "Opprett abonnement"
       steps:
         details: 1. Grunnleggende detaljer
         address: 2. Adresse
@@ -3350,6 +3356,27 @@ nb:
       invoice_email:
         hi: "Hei %{name}"
         invoice_attached_text: Vennligst finn vedlagt en faktura for din nylige bestilling fra
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            En forespørsel om å nullstille ditt passord er utført.
+            Hvis det ikke var du som forespurte dette kan du se bort i fra denne eposten.
+        link_text: >
+            Hvis det var du som forespurte dette kan du klikke nedenfor:
+        issue_text: |
+            Hvis URL'en ovenfor ikke fungerer prøv å kopier og lim den inn i din nettleser.
+            Hvis du fortsatt har problemer vennligst ta kontakt.
+      confirmation_instructions:
+        subject: "Vennligst bekreft OFN-kontoen din"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Kjære Kunde,"
+        instructions: "Din bestilling har blitt sendt"
+        shipment_summary: "Leveringssammendrag"
+        subject: "Leveringsvarsling"
+        thanks: "Takk for handelen."
+        track_information: "Sporingsinformasjon: %{tracking}"
+        track_link: "Sporingslink: %{url}"
     order_state:
       address: adresse
       adjustments: justeringer
@@ -3371,18 +3398,6 @@ nb:
       ended: avsluttet
       paused: pauset
       canceled: avbrutt
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            En forespørsel om å nullstille ditt passord er utført.
-            Hvis det ikke var du som forespurte dette kan du se bort i fra denne eposten.
-        link_text: >
-            Hvis det var du som forespurte dette kan du klikke nedenfor:
-        issue_text: |
-            Hvis URL'en ovenfor ikke fungerer prøv å kopier og lim den inn i din nettleser.
-            Hvis du fortsatt har problemer vennligst ta kontakt.
-      confirmation_instructions:
-        subject: Vennligst bekreft OFN-kontoen din
     users:
       form:
         account_settings: Kontoinnstillinger
diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml
index 9d0b11be09..20c35831f2 100644
--- a/config/locales/nl_BE.yml
+++ b/config/locales/nl_BE.yml
@@ -994,10 +994,13 @@ nl_BE:
         name: "Samenvatting van de honoraria voor ondernemingen"
         description: "Overzicht van de geïnde ondernemingsvergoedingen"
     subscriptions:
-      subscriptions: Abonnementen
-      new: Nieuw abonnement
-      create: Abonnement aanmaken
-      edit: Abonnement bewerken
+      index:
+        title: "Abonnementen"
+        new: "Nieuw abonnement"
+      new:
+        title: "Nieuw abonnement"
+      edit:
+        title: "Abonnement bewerken"
       table:
         edit_subscription: Abonnement bewerken
         pause_subscription: Pauze Abonnement
@@ -1006,6 +1009,7 @@ nl_BE:
       filters:
         query_placeholder: "Zoeken per e-mail ..."
       setup_explanation:
+        title: "Abonnementen"
         just_a_few_more_steps: 'Nog een paar stappen voordat u kunt beginnen:'
         enable_subscriptions: "Inschrijven voor minstens één van uw winkels mogelijk maken"
         enable_subscriptions_step_1_html: 1. Ga naar de %{enterprises_link}pagina, vind uw winkel en klik op "Beheren".
@@ -1019,6 +1023,8 @@ nl_BE:
         create_at_least_one_schedule_step_3: 3. Klik '+ Nieuwe Planning', en vul een formulier in
         once_you_are_done_you_can_html: Eens je klaar bent, kan je %{reload_this_page_link}
         reload_this_page: herlaad deze pagina
+      form:
+        create: "Abonnement aanmaken"
       steps:
         details: 1. Basis Specificaties
         address: 2. Adres
@@ -3105,6 +3111,28 @@ nl_BE:
       invoice_email:
         hi: "Hallo %{name}"
         invoice_attached_text: 'Gelieve hier de factuur te vinden in veband met de laatste bestelling geplaatst bij '
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Uw aanvraag voor een nieuww paswoord is in acht genomen
+            Indien je geen nieuw paswoord aangevraagd heeft, gelieve hiermee geen rekening te houden.
+        link_text: >
+            Indien U wel de aanvraag gedaan hebt, gelieve op de link hieronder te
+            klikken :
+        issue_text: |
+            Indien de link niet functioneert, gelieve die te copiëren-plakken in het adresstrook van uw navigator.
+            Moest het probleem blijven duren, aarzel niet ons te contacteren
+      confirmation_instructions:
+        subject: "Gelieve uw OFN rekening te bevestigen"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Geachte klant,"
+        instructions: "Uw bestelling is verzonden"
+        shipment_summary: "Samenvatting van de zending"
+        subject: "Kennisgeving van verzending"
+        thanks: "Bedankt voor uw bedrijf."
+        track_information: "Tracking informatie: %{tracking}"
+        track_link: "Tracking Link:%{url} "
     order_state:
       address: adres
       adjustments: aanpassingen
@@ -3126,19 +3154,6 @@ nl_BE:
       ended: ten einde gebracht
       paused: 'in pause '
       canceled: geschrapt
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Uw aanvraag voor een nieuww paswoord is in acht genomen
-            Indien je geen nieuw paswoord aangevraagd heeft, gelieve hiermee geen rekening te houden.
-        link_text: >
-            Indien U wel de aanvraag gedaan hebt, gelieve op de link hieronder te
-            klikken :
-        issue_text: |
-            Indien de link niet functioneert, gelieve die te copiëren-plakken in het adresstrook van uw navigator.
-            Moest het probleem blijven duren, aarzel niet ons te contacteren
-      confirmation_instructions:
-        subject: Gelieve uw OFN rekening te bevestigen
     users:
       form:
         account_settings: Rekeningsinstellingen
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index ace3115424..e80d88a608 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -979,16 +979,20 @@ pt:
         name: "Sumário das Taxas de Organização"
         description: "Sumário das Taxas de Organização cobradas"
     subscriptions:
-      subscriptions: Subscrições
-      new: Nova Subscrição
-      create: Criar Subscrição
-      edit: Editar Subscrição
+      index:
+        title: "Subscrições"
+        new: "Nova Subscrição"
+      new:
+        title: "Nova Subscrição"
+      edit:
+        title: "Editar Subscrição"
       table:
         edit_subscription: Editar Subscrição
         pause_subscription: Pausar Subscrição
         unpause_subscription: Parar pausa da Subscrição
         cancel_subscription: Cancelar Subscrição
       setup_explanation:
+        title: "Subscrições"
         just_a_few_more_steps: 'Só mais uns passos antes de poder começar:'
         enable_subscriptions: "Activar subscrições para pelo menos uma das suas lojas"
         enable_subscriptions_step_1_html: 1. Vá à página %{enterprises_link}, encontre a sua loja, e clique em "Gerir"
@@ -1002,6 +1006,8 @@ pt:
         create_at_least_one_schedule_step_3: 3. Clique em '+ Novo Horário', e preencha o formulário
         once_you_are_done_you_can_html: Assim que estiver feito, pode %{reload_this_page_link}
         reload_this_page: carregar de novo esta página
+      form:
+        create: "Criar Subscrição"
       steps:
         details: 1. Detalhes Básicos
         address: 2. Morada
@@ -3041,6 +3047,26 @@ pt:
       invoice_email:
         hi: "Olá %{name}"
         invoice_attached_text: Pode encontrar em anexo um recibo da encomenda que fez recentemente a
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Recebemos um pedido para redefinir a sua palavra-passe.
+            Se não fez este pedido, simplesmente ignore esta mensagem.
+        link_text: >
+            Se fez este pedido, clique no link abaixo:
+        issue_text: |
+            Se o endereço URL acima não funcionar, tente copiá-lo e colá-lo directamente no browser. Se continuar a ter problemas por favor entre em contacto connosco.
+      confirmation_instructions:
+        subject: "Por favor confirme a sua conta OFN"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Caro Consumidor,"
+        instructions: "A sua encomenda foi enviada"
+        shipment_summary: "Sumário de Envio"
+        subject: "Notificação de Envio"
+        thanks: "Obrigado."
+        track_information: "Informação de envio: %{tracking}"
+        track_link: "Link de envio: %{url}"
     order_state:
       address: morada
       adjustments: ajustes
@@ -3062,17 +3088,6 @@ pt:
       ended: terminou
       paused: em pausa
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Recebemos um pedido para redefinir a sua palavra-passe.
-            Se não fez este pedido, simplesmente ignore esta mensagem.
-        link_text: >
-            Se fez este pedido, clique no link abaixo:
-        issue_text: |
-            Se o endereço URL acima não funcionar, tente copiá-lo e colá-lo directamente no browser. Se continuar a ter problemas por favor entre em contacto connosco.
-      confirmation_instructions:
-        subject: Por favor confirme a sua conta OFN
     users:
       form:
         account_settings: Definições de Conta
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index c267ef9cfa..27229839b8 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -1034,10 +1034,10 @@ pt_BR:
         name: "Resumo das taxas da empresa"
         description: "Resumo das taxas corporativas coletadas"
     subscriptions:
-      subscriptions: Assinaturas
-      new: Nova assinatura
-      create: Criar assinatura
-      edit: Editar assinatura
+      index:
+        title: "Assinaturas"
+      edit:
+        title: "Editar assinatura"
       table:
         edit_subscription: Editar assinatura
         pause_subscription: Pausar assinatura
@@ -1046,6 +1046,7 @@ pt_BR:
       filters:
         query_placeholder: "Pesquisar por email ..."
       setup_explanation:
+        title: "Assinaturas"
         just_a_few_more_steps: 'Apenas mais algumas etapas antes de começar:'
         enable_subscriptions: "Ative assinaturas para pelo menos uma de suas lojas"
         enable_subscriptions_step_1_html: '1. Vá para a página %{enterprises_link}, encontre sua loja e clique em "Gerenciar" '
@@ -3349,6 +3350,27 @@ pt_BR:
       invoice_email:
         hi: "Oi %{name}"
         invoice_attached_text: Encontre anexa uma fatura para sua recente ordem de
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Foi feito um pedido para redefinir sua senha.
+            Se você não fez essa solicitação, simplesmente ignore este e-mail.
+        link_text: >
+            Se você fez esse pedido, basta clicar no link abaixo:
+        issue_text: |
+            Se o URL acima não funcionar, tente copiar e colá-lo em seu navegador.
+            Se continuar a ter problemas, por favor não hesite em contactar-nos.
+      confirmation_instructions:
+        subject: "Confirme sua conta na OFB"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Estimado cliente,"
+        instructions: "Seu pedido foi enviado"
+        shipment_summary: "Resumo de Envio"
+        subject: "Notificação de envio"
+        thanks: "Agradeço pelos seus serviços."
+        track_information: "Informações de rastreamento: %{tracking}"
+        track_link: "Link de rastreamento: %{url}"
     order_state:
       address: endereço
       adjustments: ajustes
@@ -3370,18 +3392,6 @@ pt_BR:
       ended: finalizado
       paused: pausado
       canceled: cancelado
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Foi feito um pedido para redefinir sua senha.
-            Se você não fez essa solicitação, simplesmente ignore este e-mail.
-        link_text: >
-            Se você fez esse pedido, basta clicar no link abaixo:
-        issue_text: |
-            Se o URL acima não funcionar, tente copiar e colá-lo em seu navegador.
-            Se continuar a ter problemas, por favor não hesite em contactar-nos.
-      confirmation_instructions:
-        subject: Confirme sua conta na OFB
     users:
       form:
         account_settings: Configurações da conta
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 60d31909ed..ed853e0697 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2108,6 +2108,16 @@ sv:
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Här är en faktura för din senaste order från
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            En begäran om att återställa ditt lösenord har gjorts.
+            Om du inte gjorde denna förfrågan ignorerar du bara det här e-postmeddelandet.
+        link_text: >
+            Om du gjorde denna förfrågan klickar du bara på länken nedan:
+        issue_text: |
+            Om den ovan nämnda webbadressen inte fungerar kan du försöka kopiera och klistra in den i webbläsaren.
+            Om du får problem, var god kontakta oss.
     order_state:
       address: adress
       adjustments: justeringar
@@ -2120,16 +2130,6 @@ sv:
       resumed: återupptagen
       returned: returnerad
       skrill: skrill
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            En begäran om att återställa ditt lösenord har gjorts.
-            Om du inte gjorde denna förfrågan ignorerar du bara det här e-postmeddelandet.
-        link_text: >
-            Om du gjorde denna förfrågan klickar du bara på länken nedan:
-        issue_text: |
-            Om den ovan nämnda webbadressen inte fungerar kan du försöka kopiera och klistra in den i webbläsaren.
-            Om du får problem, var god kontakta oss.
     users:
       open_orders:
         order: Beställningar
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 89cc2746f3..3639a737bc 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1036,10 +1036,13 @@ tr:
         name: "İşletme Ücreti Özeti"
         description: "Toplanan İşletme Ücretlerinin Özeti"
     subscriptions:
-      subscriptions: Üyelikler
-      new: Yeni Üyelik
-      create: Üyelik Oluştur
-      edit: Üyeliği düzenle
+      index:
+        title: "Üyelikler"
+        new: "Yeni Üyelik"
+      new:
+        title: "Yeni Üyelik"
+      edit:
+        title: "Üyeliği Düzenle"
       table:
         edit_subscription: Üyeliği Düzenle
         pause_subscription: Üyeliği Duraklat
@@ -1048,6 +1051,7 @@ tr:
       filters:
         query_placeholder: "E-posta ile ara ..."
       setup_explanation:
+        title: "Üyelikler"
         just_a_few_more_steps: 'Başlamadan önce birkaç adım kaldı:'
         enable_subscriptions: "Dükkanınızdan en az biri için üyelikleri etkinleştirin"
         enable_subscriptions_step_1_html: 1. %{enterprises_link} sayfasına gidin, dükkanınızı bulun ve ‘Yönet’i tıklayın
@@ -1061,6 +1065,8 @@ tr:
         create_at_least_one_schedule_step_3: 3. 'Yeni Takvim' butonuna tıklayın ve formu doldurun
         once_you_are_done_you_can_html: 'İşiniz bittiğinde, %{reload_this_page_link} '
         reload_this_page: Sayfayı yeniden yükle
+      form:
+        create: "Üyelik Oluştur"
       steps:
         details: 1. Temel Bilgiler
         address: 2. Adres
@@ -3353,6 +3359,27 @@ tr:
       invoice_email:
         hi: "Merhaba %{name}"
         invoice_attached_text: 'Son siparişiniz için gelen fatura ektedir:'
+    user_mailer:
+      reset_password_instructions:
+        request_sent_text: |
+            Şifrenizin değiştirilmesi için bir talepte bulunuldu.
+            Eğer talepte bulunan siz değilseniz lütfen bu mesajı gözardı edin.
+        link_text: >
+            Bu talepte bulunduysanız lütfen aşağıdaki bağlantıya tıklayın:
+        issue_text: |
+            Üstteki URL çalışmıyor ise tarayıcınızın adres çubuğuna kopyalayıp yapıştırmayı deneyebilirsiniz.
+            Sorun yaşamaya devam ederseniz bizimle iletişime geçmekten çekinmeyin.
+      confirmation_instructions:
+        subject: "Lütfen AGA hesabınızı onaylayın"
+    shipment_mailer:
+      shipped_email:
+        dear_customer: "Değerli müşterimiz,"
+        instructions: "Siparişiniz gönderildi"
+        shipment_summary: "Teslimat Özeti"
+        subject: "TESLİMAT BİLDİRİMİ"
+        thanks: "İş birliğiniz için teşekkür ederim."
+        track_information: "Takip Bilgileri: %{tracking}"
+        track_link: "Takip Bağlantısı: %{url}"
     order_state:
       address: adres
       adjustments: düzenlemeler
@@ -3374,18 +3401,6 @@ tr:
       ended: bitti
       paused: durduruldu
       canceled: iptal edildi
-    user_mailer:
-      reset_password_instructions:
-        request_sent_text: |
-            Şifrenizin değiştirilmesi için bir talepte bulunuldu.
-            Eğer talepte bulunan siz değilseniz lütfen bu mesajı gözardı edin.
-        link_text: >
-            Bu talepte bulunduysanız lütfen aşağıdaki bağlantıya tıklayın:
-        issue_text: |
-            Üstteki URL çalışmıyor ise tarayıcınızın adres çubuğuna kopyalayıp yapıştırmayı deneyebilirsiniz.
-            Sorun yaşamaya devam ederseniz bizimle iletişime geçmekten çekinmeyin.
-      confirmation_instructions:
-        subject: Lütfen AGA hesabınızı onaylayın
     users:
       form:
         account_settings: Hesap Ayarları

From 1123e08a985fe2dc59353313fd6cf29d1e448a5c Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 7 Aug 2020 12:36:49 +0100
Subject: [PATCH 286/340] Update BugsnagJS to latest version and update
 initialization syntax

---
 app/views/layouts/_bugsnag_js.html.haml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_bugsnag_js.html.haml b/app/views/layouts/_bugsnag_js.html.haml
index b9f3f5a736..9c3b3b9238 100644
--- a/app/views/layouts/_bugsnag_js.html.haml
+++ b/app/views/layouts/_bugsnag_js.html.haml
@@ -1,10 +1,8 @@
 - bugsnag_js_key = ENV['BUGSNAG_JS_KEY'] || ENV['BUGSNAG_API_KEY']
 - if bugsnag_js_key.present?
-  %script{src: "//d2wy8f7a9ursnm.cloudfront.net/v6/bugsnag.min.js"}
+  %script{src: "//d2wy8f7a9ursnm.cloudfront.net/v7/bugsnag.min.js"}
   :javascript
-    window.bugsnagClient = bugsnag({
+    Bugsnag.start({
       apiKey: "#{bugsnag_js_key}",
-      beforeSend: function (report) {
-        report.app.releaseStage = "#{Rails.env}"
-      }
-    });
+      releaseStage: "#{Rails.env}"
+    })

From abaa66cc14f13b85661f726cbc9a95046f859000 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 13:06:16 +0100
Subject: [PATCH 287/340] Bring models from spree_core

---
 app/models/spree/credit_card.rb          | 115 +++++++++++++
 app/models/spree/gateway.rb              |  54 +++++++
 app/models/spree/gateway/bogus.rb        |  85 ++++++++++
 app/models/spree/gateway/bogus_simple.rb |  26 +++
 app/models/spree/payment_method.rb       |  62 +++++++
 app/models/spree/payment_method/check.rb |  29 ++++
 spec/models/spree/credit_card_spec.rb    | 197 +++++++++++++++++++++++
 spec/models/spree/gateway_spec.rb        |  24 +++
 spec/models/spree/payment_method_spec.rb |  33 ++++
 9 files changed, 625 insertions(+)
 create mode 100644 app/models/spree/credit_card.rb
 create mode 100644 app/models/spree/gateway.rb
 create mode 100644 app/models/spree/gateway/bogus.rb
 create mode 100644 app/models/spree/gateway/bogus_simple.rb
 create mode 100644 app/models/spree/payment_method.rb
 create mode 100644 app/models/spree/payment_method/check.rb
 create mode 100644 spec/models/spree/gateway_spec.rb

diff --git a/app/models/spree/credit_card.rb b/app/models/spree/credit_card.rb
new file mode 100644
index 0000000000..21bc709ec1
--- /dev/null
+++ b/app/models/spree/credit_card.rb
@@ -0,0 +1,115 @@
+module Spree
+  class CreditCard < ActiveRecord::Base
+    has_many :payments, as: :source
+
+    before_save :set_last_digits
+
+    attr_accessor :number, :verification_value
+
+    validates :month, :year, numericality: { only_integer: true }
+    validates :number, presence: true, unless: :has_payment_profile?, on: :create
+    validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
+    validate :expiry_not_in_the_past
+
+    scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
+
+    # needed for some of the ActiveMerchant gateways (eg. SagePay)
+    alias_attribute :brand, :cc_type
+
+    def expiry=(expiry)
+      self[:month], self[:year] = expiry.split(" / ")
+      self[:year] = "20" + self[:year]
+    end
+
+    def number=(num)
+      @number = num.gsub(/[^0-9]/, '') rescue nil
+    end
+
+    # cc_type is set by jquery.payment, which helpfully provides different
+    # types from Active Merchant. Converting them is necessary.
+    def cc_type=(type)
+      real_type = case type
+      when 'mastercard', 'maestro'
+        'master'
+      when 'amex'
+        'american_express'
+      when 'dinersclub'
+        'diners_club'
+      else
+        type
+      end
+      self[:cc_type] = real_type
+    end
+
+    def set_last_digits
+      number.to_s.gsub!(/\s/,'')
+      verification_value.to_s.gsub!(/\s/,'')
+      self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
+    end
+
+    def name?
+      first_name? && last_name?
+    end
+
+    def name
+      "#{first_name} #{last_name}"
+    end
+
+    def verification_value?
+      verification_value.present?
+    end
+
+    # Show the card number, with all but last 4 numbers replace with "X". (XXXX-XXXX-XXXX-4338)
+    def display_number
+      "XXXX-XXXX-XXXX-#{last_digits}"
+    end
+
+    def actions
+      %w{capture void credit}
+    end
+
+    # Indicates whether its possible to capture the payment
+    def can_capture?(payment)
+      payment.pending? || payment.checkout?
+    end
+
+    # Indicates whether its possible to void the payment.
+    def can_void?(payment)
+      !payment.void?
+    end
+
+    # Indicates whether its possible to credit the payment.  Note that most gateways require that the
+    # payment be settled first which generally happens within 12-24 hours of the transaction.
+    def can_credit?(payment)
+      return false unless payment.completed?
+      return false unless payment.order.payment_state == 'credit_owed'
+      payment.credit_allowed > 0
+    end
+
+    def has_payment_profile?
+      gateway_customer_profile_id.present?
+    end
+
+    def to_active_merchant
+      ActiveMerchant::Billing::CreditCard.new(
+        :number => number,
+        :month => month,
+        :year => year,
+        :verification_value => verification_value,
+        :first_name => first_name,
+        :last_name => last_name
+      )
+    end
+
+    private
+
+    def expiry_not_in_the_past
+      if year.present? && month.present?
+        time = "#{year}-#{month}-1".to_time
+        if time < Time.zone.now.to_time.beginning_of_month
+          errors.add(:base, :card_expired)
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb
new file mode 100644
index 0000000000..4e1cbaa368
--- /dev/null
+++ b/app/models/spree/gateway.rb
@@ -0,0 +1,54 @@
+module Spree
+  class Gateway < PaymentMethod
+    delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
+
+    validates :name, :type, presence: true
+
+    preference :server, :string, default: 'test'
+    preference :test_mode, :boolean, default: true
+
+    def payment_source_class
+      CreditCard
+    end
+
+    # instantiates the selected gateway and configures with the options stored in the database
+    def self.current
+      super
+    end
+
+    def provider
+      gateway_options = options
+      gateway_options.delete :login if gateway_options.has_key?(:login) and gateway_options[:login].nil?
+      if gateway_options[:server]
+        ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
+      end
+      @provider ||= provider_class.new(gateway_options)
+    end
+
+    def options
+      self.preferences.inject({}){ |memo, (key, value)| memo[key.to_sym] = value; memo }
+    end
+
+    def method_missing(method, *args)
+      if @provider.nil? || !@provider.respond_to?(method)
+        super
+      else
+        provider.send(method, *args)
+      end
+    end
+
+    def payment_profiles_supported?
+      false
+    end
+
+    def method_type
+      'gateway'
+    end
+
+    def supports?(source)
+      return true unless provider_class.respond_to? :supports?
+      return false unless source.brand
+      provider_class.supports?(source.brand)
+    end
+  end
+end
diff --git a/app/models/spree/gateway/bogus.rb b/app/models/spree/gateway/bogus.rb
new file mode 100644
index 0000000000..de241848ad
--- /dev/null
+++ b/app/models/spree/gateway/bogus.rb
@@ -0,0 +1,85 @@
+module Spree
+  class Gateway::Bogus < Gateway
+    TEST_VISA = ['4111111111111111','4012888888881881','4222222222222']
+    TEST_MC   = ['5500000000000004','5555555555554444','5105105105105100']
+    TEST_AMEX = ['378282246310005','371449635398431','378734493671000','340000000000009']
+    TEST_DISC = ['6011000000000004','6011111111111117','6011000990139424']
+
+    VALID_CCS = ['1', TEST_VISA, TEST_MC, TEST_AMEX, TEST_DISC].flatten
+
+    attr_accessor :test
+
+    def provider_class
+      self.class
+    end
+
+    def preferences
+      {}
+    end
+
+    def create_profile(payment)
+      # simulate the storage of credit card profile using remote service
+      success = VALID_CCS.include? payment.source.number
+      payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
+    end
+
+    def authorize(money, credit_card, options = {})
+      profile_id = credit_card.gateway_customer_profile_id
+      if VALID_CCS.include? credit_card.number or (profile_id and profile_id.starts_with? 'BGS-')
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+      else
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { :message => 'Bogus Gateway: Forced failure' }, :test => true)
+      end
+    end
+
+    def purchase(money, credit_card, options = {})
+      profile_id = credit_card.gateway_customer_profile_id
+      if VALID_CCS.include? credit_card.number  or (profile_id and profile_id.starts_with? 'BGS-')
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+      else
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :message => 'Bogus Gateway: Forced failure', :test => true)
+      end
+    end
+
+    def credit(money, credit_card, response_code, options = {})
+      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345')
+    end
+
+    def capture(authorization, credit_card, gateway_options)
+      if authorization.response_code == '12345'
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '67890')
+      else
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :error => 'Bogus Gateway: Forced failure', :test => true)
+      end
+
+    end
+
+    def void(response_code, credit_card, options = {})
+      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345')
+    end
+
+    def test?
+      # Test mode is not really relevant with bogus gateway (no such thing as live server)
+      true
+    end
+
+    def payment_profiles_supported?
+      true
+    end
+
+    def actions
+      %w(capture void credit)
+    end
+
+    private
+      def generate_profile_id(success)
+        record = true
+        prefix = success ? 'BGS' : 'FAIL'
+        while record
+          random = "#{prefix}-#{Array.new(6){rand(6)}.join}"
+          record = CreditCard.where(:gateway_customer_profile_id => random).first
+        end
+        random
+      end
+  end
+end
diff --git a/app/models/spree/gateway/bogus_simple.rb b/app/models/spree/gateway/bogus_simple.rb
new file mode 100644
index 0000000000..8b0757b220
--- /dev/null
+++ b/app/models/spree/gateway/bogus_simple.rb
@@ -0,0 +1,26 @@
+# Bogus Gateway that doesn't support payment profiles
+module Spree
+  class Gateway::BogusSimple < Gateway::Bogus
+
+    def payment_profiles_supported?
+      false
+    end
+
+    def authorize(money, credit_card, options = {})
+      if VALID_CCS.include? credit_card.number
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+      else
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { :message => 'Bogus Gateway: Forced failure' }, :test => true)
+      end
+    end
+
+    def purchase(money, credit_card, options = {})
+      if VALID_CCS.include? credit_card.number
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+      else
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :message => 'Bogus Gateway: Forced failure', :test => true)
+      end
+    end
+
+  end
+end
diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
new file mode 100644
index 0000000000..aba5a7ee9c
--- /dev/null
+++ b/app/models/spree/payment_method.rb
@@ -0,0 +1,62 @@
+module Spree
+  class PaymentMethod < ActiveRecord::Base
+    acts_as_paranoid
+    DISPLAY = [:both, :front_end, :back_end]
+    default_scope -> { where(deleted_at: nil) }
+
+    scope :production, -> { where(environment: 'production') }
+
+    validates :name, presence: true
+
+    def self.providers
+      Rails.application.config.spree.payment_methods
+    end
+
+    def provider_class
+      raise 'You must implement provider_class method for this gateway.'
+    end
+
+    # The class that will process payments for this payment type, used for @payment.source
+    # e.g. CreditCard in the case of a the Gateway payment type
+    # nil means the payment method doesn't require a source e.g. check
+    def payment_source_class
+      raise 'You must implement payment_source_class method for this gateway.'
+    end
+
+    def self.available(display_on = 'both')
+      all.select do |p|
+        p.active &&
+        (p.display_on == display_on.to_s || p.display_on.blank?) &&
+        (p.environment == Rails.env || p.environment.blank?)
+      end
+    end
+
+    def self.active?
+      where(type: self.to_s, environment: Rails.env, active: true).count > 0
+    end
+
+    def method_type
+      type.demodulize.downcase
+    end
+
+    def self.find_with_destroyed *args
+      unscoped { find(*args) }
+    end
+
+    def payment_profiles_supported?
+      false
+    end
+
+    def source_required?
+      true
+    end
+
+    def auto_capture?
+      Spree::Config[:auto_capture]
+    end
+
+    def supports?(source)
+      true
+    end
+  end
+end
diff --git a/app/models/spree/payment_method/check.rb b/app/models/spree/payment_method/check.rb
new file mode 100644
index 0000000000..108d8317d1
--- /dev/null
+++ b/app/models/spree/payment_method/check.rb
@@ -0,0 +1,29 @@
+module Spree
+  class PaymentMethod::Check < PaymentMethod
+    def actions
+      %w{capture void}
+    end
+
+    # Indicates whether its possible to capture the payment
+    def can_capture?(payment)
+      ['checkout', 'pending'].include?(payment.state)
+    end
+
+    # Indicates whether its possible to void the payment.
+    def can_void?(payment)
+      payment.state != 'void'
+    end
+
+    def capture(*args)
+      ActiveMerchant::Billing::Response.new(true, "", {}, {})
+    end
+
+    def void(*args)
+      ActiveMerchant::Billing::Response.new(true, "", {}, {})
+    end
+
+    def source_required?
+      false
+    end
+  end
+end
diff --git a/spec/models/spree/credit_card_spec.rb b/spec/models/spree/credit_card_spec.rb
index 845b1dd84a..a2b812fe33 100644
--- a/spec/models/spree/credit_card_spec.rb
+++ b/spec/models/spree/credit_card_spec.rb
@@ -2,6 +2,203 @@ require 'spec_helper'
 
 module Spree
   describe CreditCard do
+    describe "original specs from Spree" do
+      let(:valid_credit_card_attributes) { { number: '4111111111111111', verification_value: '123', month: 12, year: Time.now.year + 1 } }
+
+      def self.payment_states
+        Spree::Payment.state_machine.states.keys
+      end
+
+      def stub_rails_env(environment)
+        Rails.stub(env: ActiveSupport::StringInquirer.new(environment))
+      end
+
+      let(:credit_card) { Spree::CreditCard.new }
+
+      before(:each) do
+
+        @order = create(:order)
+        @payment = Spree::Payment.create(:amount => 100, :order => @order)
+
+        @success_response = double('gateway_response', success?: true, authorization: '123', avs_result: { 'code' => 'avs-code' })
+        @fail_response = double('gateway_response', success?: false)
+
+        @payment_gateway = mock_model(Spree::PaymentMethod,
+          payment_profiles_supported?: true,
+          authorize: @success_response,
+          purchase: @success_response,
+          capture: @success_response,
+          void: @success_response,
+          credit: @success_response,
+          environment: 'test'
+        )
+
+        @payment.stub payment_method: @payment_gateway
+      end
+
+      context "#can_capture?" do
+        it "should be true if payment is pending" do
+          payment = mock_model(Spree::Payment, pending?: true, created_at: Time.now)
+          credit_card.can_capture?(payment).should be_true
+        end
+
+        it "should be true if payment is checkout" do
+          payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.now)
+          credit_card.can_capture?(payment).should be_true
+        end
+      end
+
+      context "#can_void?" do
+        it "should be true if payment is not void" do
+          payment = mock_model(Spree::Payment, void?: false)
+          credit_card.can_void?(payment).should be_true
+        end
+      end
+
+      context "#can_credit?" do
+        it "should be false if payment is not completed" do
+          payment = mock_model(Spree::Payment, completed?: false)
+          credit_card.can_credit?(payment).should be_false
+        end
+
+        it "should be false when order payment_state is not 'credit_owed'" do
+          payment = mock_model(Spree::Payment, completed?: true, order: mock_model(Spree::Order, payment_state: 'paid'))
+          credit_card.can_credit?(payment).should be_false
+        end
+
+        it "should be false when credit_allowed is zero" do
+          payment = mock_model(Spree::Payment, completed?: true, credit_allowed: 0, order: mock_model(Spree::Order, payment_state: 'credit_owed'))
+          credit_card.can_credit?(payment).should be_false
+        end
+      end
+
+      context "#valid?" do
+        it "should validate presence of number" do
+          credit_card.attributes = valid_credit_card_attributes.except(:number)
+          credit_card.should_not be_valid
+          credit_card.errors[:number].should == ["can't be blank"]
+        end
+
+        it "should validate presence of security code" do
+          credit_card.attributes = valid_credit_card_attributes.except(:verification_value)
+          credit_card.should_not be_valid
+          credit_card.errors[:verification_value].should == ["can't be blank"]
+        end
+
+        it "should validate expiration is not in the past" do
+          credit_card.month = 1.month.ago.month
+          credit_card.year = 1.month.ago.year
+          credit_card.should_not be_valid
+          credit_card.errors[:base].should == ["Card has expired"]
+        end
+
+        it "does not run expiration in the past validation if month is not set" do
+          credit_card.month = nil
+          credit_card.year = Time.now.year
+          credit_card.should_not be_valid
+          credit_card.errors[:base].should be_blank
+        end
+
+        it "does not run expiration in the past validation if year is not set" do
+          credit_card.month = Time.now.month
+          credit_card.year = nil
+          credit_card.should_not be_valid
+          credit_card.errors[:base].should be_blank
+        end
+        
+        it "does not run expiration in the past validation if year and month are empty" do
+          credit_card.year = ""
+          credit_card.month = ""
+          credit_card.should_not be_valid
+          credit_card.errors[:card].should be_blank
+        end 
+
+        it "should only validate on create" do
+          credit_card.attributes = valid_credit_card_attributes
+          credit_card.save
+          credit_card.should be_valid
+        end
+      end
+
+      context "#save" do
+        before do
+          credit_card.attributes = valid_credit_card_attributes
+          credit_card.save!
+        end
+
+        let!(:persisted_card) { Spree::CreditCard.find(credit_card.id) }
+
+        it "should not actually store the number" do
+          persisted_card.number.should be_blank
+        end
+
+        it "should not actually store the security code" do
+          persisted_card.verification_value.should be_blank
+        end
+      end
+
+      context "#number=" do
+        it "should strip non-numeric characters from card input" do
+          credit_card.number = "6011000990139424"
+          credit_card.number.should == "6011000990139424"
+
+          credit_card.number = "  6011-0009-9013-9424  "
+          credit_card.number.should == "6011000990139424"
+        end
+
+        it "should not raise an exception on non-string input" do
+          credit_card.number = Hash.new
+          credit_card.number.should be_nil
+        end
+      end
+
+      context "#cc_type=" do
+        it "converts between the different types" do
+          credit_card.cc_type = 'mastercard'
+          credit_card.cc_type.should == 'master'
+
+          credit_card.cc_type = 'maestro'
+          credit_card.cc_type.should == 'master'
+
+          credit_card.cc_type = 'amex'
+          credit_card.cc_type.should == 'american_express'
+
+          credit_card.cc_type = 'dinersclub'
+          credit_card.cc_type.should == 'diners_club'
+
+          credit_card.cc_type = 'some_outlandish_cc_type'
+          credit_card.cc_type.should == 'some_outlandish_cc_type'
+        end
+      end
+
+      context "#associations" do
+        it "should be able to access its payments" do
+          expect { credit_card.payments.to_a }.not_to raise_error
+        end
+      end
+      
+      context "#to_active_merchant" do
+        before do
+          credit_card.number = "4111111111111111"
+          credit_card.year = Time.now.year
+          credit_card.month = Time.now.month
+          credit_card.first_name = "Bob"
+          credit_card.last_name = "Boblaw"
+          credit_card.verification_value = 123
+        end
+
+        it "converts to an ActiveMerchant::Billing::CreditCard object" do
+          am_card = credit_card.to_active_merchant
+          am_card.number.should == "4111111111111111"
+          am_card.year.should == Time.now.year
+          am_card.month.should == Time.now.month
+          am_card.first_name.should == "Bob"
+          am_card.last_name = "Boblaw"
+          am_card.verification_value.should == 123
+        end
+      end
+    end
+
     describe "setting default credit card for a user" do
       let(:user) { create(:user) }
       let(:onetime_card_attrs) do
diff --git a/spec/models/spree/gateway_spec.rb b/spec/models/spree/gateway_spec.rb
new file mode 100644
index 0000000000..cdedccd730
--- /dev/null
+++ b/spec/models/spree/gateway_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Spree::Gateway do
+  class Provider
+    def initialize(options)
+    end
+
+    def imaginary_method
+
+    end
+  end
+
+  class TestGateway < Spree::Gateway
+    def provider_class
+      Provider
+    end
+  end
+
+  it "passes through all arguments on a method_missing call" do
+    gateway = TestGateway.new
+    gateway.provider.should_receive(:imaginary_method).with('foo')
+    gateway.imaginary_method('foo')
+  end
+end
diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb
index 396b9f1ab0..e61fd8252c 100644
--- a/spec/models/spree/payment_method_spec.rb
+++ b/spec/models/spree/payment_method_spec.rb
@@ -2,6 +2,39 @@ require 'spec_helper'
 
 module Spree
   describe PaymentMethod do
+    describe "#available" do
+      before(:all) do
+        Spree::PaymentMethod.delete_all
+
+        [nil, 'both', 'front_end', 'back_end'].each do |display_on|
+          Spree::Gateway::Test.create(
+            :name => 'Display Both',
+            :display_on => display_on,
+            :active => true,
+            :environment => 'test',
+            :description => 'foofah'
+          )
+        end
+        Spree::PaymentMethod.all.size.should == 4
+      end
+
+      it "should return all methods available to front-end/back-end when no parameter is passed" do
+        Spree::PaymentMethod.available.size.should == 2
+      end
+
+      it "should return all methods available to front-end/back-end when display_on = :both" do
+        Spree::PaymentMethod.available(:both).size.should == 2
+      end
+
+      it "should return all methods available to front-end when display_on = :front_end" do
+        Spree::PaymentMethod.available(:front_end).size.should == 2
+      end
+
+      it "should return all methods available to back-end when display_on = :back_end" do
+        Spree::PaymentMethod.available(:back_end).size.should == 2
+      end
+    end
+    
     it "orders payment methods by name" do
       pm1 = create(:payment_method, name: 'ZZ')
       pm2 = create(:payment_method, name: 'AA')

From 142bab8c35771efce02d0e9fcd1f9077d97acb09 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 13:13:43 +0100
Subject: [PATCH 288/340] Merge decorators with original spree files

---
 app/models/spree/credit_card.rb              | 37 ++++++++-
 app/models/spree/credit_card_decorator.rb    | 47 -----------
 app/models/spree/gateway.rb                  |  9 ++-
 app/models/spree/gateway_decorator.rb        |  9 ---
 app/models/spree/payment_method.rb           | 84 +++++++++++++++++++-
 app/models/spree/payment_method_decorator.rb | 84 --------------------
 6 files changed, 126 insertions(+), 144 deletions(-)
 delete mode 100644 app/models/spree/credit_card_decorator.rb
 delete mode 100644 app/models/spree/gateway_decorator.rb
 delete mode 100644 app/models/spree/payment_method_decorator.rb

diff --git a/app/models/spree/credit_card.rb b/app/models/spree/credit_card.rb
index 21bc709ec1..46718b5ad8 100644
--- a/app/models/spree/credit_card.rb
+++ b/app/models/spree/credit_card.rb
@@ -1,16 +1,26 @@
 module Spree
   class CreditCard < ActiveRecord::Base
+    # Should be able to remove once we reach Spree v2.2.0
+    # https://github.com/spree/spree/commit/411010f3975c919ab298cb63962ee492455b415c
+    belongs_to :payment_method
+    belongs_to :user
+
     has_many :payments, as: :source
 
     before_save :set_last_digits
 
     attr_accessor :number, :verification_value
+    # For holding customer preference in memory
+    attr_writer :save_requested_by_customer
 
     validates :month, :year, numericality: { only_integer: true }
     validates :number, presence: true, unless: :has_payment_profile?, on: :create
     validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
     validate :expiry_not_in_the_past
 
+    after_create :ensure_single_default_card
+    after_save :ensure_single_default_card, if: :default_card_needs_updating?
+
     scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
 
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
@@ -86,8 +96,9 @@ module Spree
       payment.credit_allowed > 0
     end
 
+    # Allows us to use a gateway_payment_profile_id to store Stripe Tokens
     def has_payment_profile?
-      gateway_customer_profile_id.present?
+      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
     end
 
     def to_active_merchant
@@ -101,6 +112,10 @@ module Spree
       )
     end
 
+    def save_requested_by_customer?
+      !!@save_requested_by_customer
+    end
+
     private
 
     def expiry_not_in_the_past
@@ -111,5 +126,25 @@ module Spree
         end
       end
     end
+
+    def reusable?
+      gateway_customer_profile_id.present?
+    end
+
+    def default_missing?
+      !user.credit_cards.exists?(is_default: true)
+    end
+
+    def default_card_needs_updating?
+      is_default_changed? || gateway_customer_profile_id_changed?
+    end
+
+    def ensure_single_default_card
+      return unless user
+      return unless is_default? || (reusable? && default_missing?)
+
+      user.credit_cards.update_all(['is_default=(id=?)', id])
+      self.is_default = true
+    end
   end
 end
diff --git a/app/models/spree/credit_card_decorator.rb b/app/models/spree/credit_card_decorator.rb
deleted file mode 100644
index b8c78f01b7..0000000000
--- a/app/models/spree/credit_card_decorator.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-Spree::CreditCard.class_eval do
-  # For holding customer preference in memory
-  attr_writer :save_requested_by_customer
-
-  # Should be able to remove once we reach Spree v2.2.0
-  # https://github.com/spree/spree/commit/411010f3975c919ab298cb63962ee492455b415c
-  belongs_to :payment_method
-
-  belongs_to :user
-
-  after_create :ensure_single_default_card
-  after_save :ensure_single_default_card, if: :default_card_needs_updating?
-
-  # Allows us to use a gateway_payment_profile_id to store Stripe Tokens
-  # Should be able to remove once we reach Spree v2.2.0
-  # Commit: https://github.com/spree/spree/commit/5a4d690ebc64b264bf12904a70187e7a8735ef3f
-  # See also: https://github.com/spree/spree_gateway/issues/111
-  def has_payment_profile? # rubocop:disable Naming/PredicateName
-    gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
-  end
-
-  def save_requested_by_customer?
-    !!@save_requested_by_customer
-  end
-
-  private
-
-  def reusable?
-    gateway_customer_profile_id.present?
-  end
-
-  def default_missing?
-    !user.credit_cards.exists?(is_default: true)
-  end
-
-  def default_card_needs_updating?
-    is_default_changed? || gateway_customer_profile_id_changed?
-  end
-
-  def ensure_single_default_card
-    return unless user
-    return unless is_default? || (reusable? && default_missing?)
-
-    user.credit_cards.update_all(['is_default=(id=?)', id])
-    self.is_default = true
-  end
-end
diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb
index 4e1cbaa368..165fffd91a 100644
--- a/app/models/spree/gateway.rb
+++ b/app/models/spree/gateway.rb
@@ -1,11 +1,16 @@
+require 'spree/concerns/payment_method_distributors'
+
 module Spree
   class Gateway < PaymentMethod
+    include Spree::PaymentMethodDistributors
+
     delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
 
     validates :name, :type, presence: true
 
-    preference :server, :string, default: 'test'
-    preference :test_mode, :boolean, default: true
+    # Default to live
+    preference :server, :string, default: 'live'
+    preference :test_mode, :boolean, default: false
 
     def payment_source_class
       CreditCard
diff --git a/app/models/spree/gateway_decorator.rb b/app/models/spree/gateway_decorator.rb
deleted file mode 100644
index c62702a321..0000000000
--- a/app/models/spree/gateway_decorator.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spree/concerns/payment_method_distributors'
-
-Spree::Gateway.class_eval do
-  include Spree::PaymentMethodDistributors
-
-  # Default to live
-  preference :server, :string, default: 'live'
-  preference :test_mode, :boolean, default: false
-end
diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index aba5a7ee9c..01a9be0ce5 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -1,12 +1,56 @@
+require 'spree/concerns/payment_method_distributors'
+
 module Spree
   class PaymentMethod < ActiveRecord::Base
+    include Spree::Core::CalculatedAdjustments
+    include Spree::PaymentMethodDistributors
+
+    acts_as_taggable
     acts_as_paranoid
+
     DISPLAY = [:both, :front_end, :back_end]
     default_scope -> { where(deleted_at: nil) }
 
-    scope :production, -> { where(environment: 'production') }
+    has_many :credit_cards, class_name: "Spree::CreditCard" # from Spree v.2.3.0 d470b31798f37
 
     validates :name, presence: true
+    validate :distributor_validation
+
+    after_initialize :init
+
+    scope :production, -> { where(environment: 'production') }
+
+    # -- Scopes
+    scope :managed_by, lambda { |user|
+      if user.has_spree_role?('admin')
+        where(nil)
+      else
+        joins(:distributors).
+          where('distributors_payment_methods.distributor_id IN (?)', user.enterprises.select(&:id)).
+          select('DISTINCT spree_payment_methods.*')
+      end
+    }
+
+    scope :for_distributors, ->(distributors) {
+      non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
+      where(id: non_unique_matches.map(&:id))
+    }
+
+    scope :for_distributor, lambda { |distributor|
+      joins(:distributors).
+        where('enterprises.id = ?', distributor)
+    }
+
+    scope :for_subscriptions, -> { where(type: Subscription::ALLOWED_PAYMENT_METHOD_TYPES) }
+
+    scope :by_name, -> { order('spree_payment_methods.name ASC') }
+
+    # Rewrite Spree's ruby-land class method as a scope
+    scope :available, lambda { |display_on = 'both'|
+      where(active: true).
+        where('spree_payment_methods.display_on=? OR spree_payment_methods.display_on=? OR spree_payment_methods.display_on IS NULL', display_on, '').
+        where('spree_payment_methods.environment=? OR spree_payment_methods.environment=? OR spree_payment_methods.environment IS NULL', Rails.env, '')
+    }
 
     def self.providers
       Rails.application.config.spree.payment_methods
@@ -58,5 +102,43 @@ module Spree
     def supports?(source)
       true
     end
+
+    def init
+      unless reflections.key?(:calculator)
+        self.class.include Spree::Core::CalculatedAdjustments
+      end
+
+      self.calculator ||= Calculator::FlatRate.new(preferred_amount: 0)
+    end
+
+    def has_distributor?(distributor)
+      distributors.include?(distributor)
+    end
+
+    def self.clean_name
+      case name
+      when "Spree::PaymentMethod::Check"
+        "Cash/EFT/etc. (payments for which automatic validation is not required)"
+      when "Spree::Gateway::Migs"
+        "MasterCard Internet Gateway Service (MIGS)"
+      when "Spree::Gateway::Pin"
+        "Pin Payments"
+      when "Spree::Gateway::StripeConnect"
+        "Stripe"
+      when "Spree::Gateway::StripeSCA"
+        "Stripe SCA"
+      when "Spree::Gateway::PayPalExpress"
+        "PayPal Express"
+      else
+        i = name.rindex('::') + 2
+        name[i..-1]
+      end
+    end
+
+    private
+
+    def distributor_validation
+      validates_with DistributorsValidator
+    end
   end
 end
diff --git a/app/models/spree/payment_method_decorator.rb b/app/models/spree/payment_method_decorator.rb
deleted file mode 100644
index 4c2770daea..0000000000
--- a/app/models/spree/payment_method_decorator.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-require 'spree/concerns/payment_method_distributors'
-
-Spree::PaymentMethod.class_eval do
-  include Spree::Core::CalculatedAdjustments
-  include Spree::PaymentMethodDistributors
-
-  acts_as_taggable
-
-  has_many :credit_cards, class_name: "Spree::CreditCard" # from Spree v.2.3.0 d470b31798f37
-
-  after_initialize :init
-
-  validate :distributor_validation
-
-  # -- Scopes
-  scope :managed_by, lambda { |user|
-    if user.has_spree_role?('admin')
-      where(nil)
-    else
-      joins(:distributors).
-        where('distributors_payment_methods.distributor_id IN (?)', user.enterprises.select(&:id)).
-        select('DISTINCT spree_payment_methods.*')
-    end
-  }
-
-  scope :for_distributors, ->(distributors) {
-    non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
-    where(id: non_unique_matches.map(&:id))
-  }
-
-  scope :for_distributor, lambda { |distributor|
-    joins(:distributors).
-      where('enterprises.id = ?', distributor)
-  }
-
-  scope :for_subscriptions, -> { where(type: Subscription::ALLOWED_PAYMENT_METHOD_TYPES) }
-
-  scope :by_name, -> { order('spree_payment_methods.name ASC') }
-
-  # Rewrite Spree's ruby-land class method as a scope
-  scope :available, lambda { |display_on = 'both'|
-    where(active: true).
-      where('spree_payment_methods.display_on=? OR spree_payment_methods.display_on=? OR spree_payment_methods.display_on IS NULL', display_on, '').
-      where('spree_payment_methods.environment=? OR spree_payment_methods.environment=? OR spree_payment_methods.environment IS NULL', Rails.env, '')
-  }
-
-  def init
-    unless reflections.key?(:calculator)
-      self.class.include Spree::Core::CalculatedAdjustments
-    end
-
-    self.calculator ||= Calculator::FlatRate.new(preferred_amount: 0)
-  end
-
-  def has_distributor?(distributor)
-    distributors.include?(distributor)
-  end
-
-  def self.clean_name
-    case name
-    when "Spree::PaymentMethod::Check"
-      "Cash/EFT/etc. (payments for which automatic validation is not required)"
-    when "Spree::Gateway::Migs"
-      "MasterCard Internet Gateway Service (MIGS)"
-    when "Spree::Gateway::Pin"
-      "Pin Payments"
-    when "Spree::Gateway::StripeConnect"
-      "Stripe"
-    when "Spree::Gateway::StripeSCA"
-      "Stripe SCA"
-    when "Spree::Gateway::PayPalExpress"
-      "PayPal Express"
-    else
-      i = name.rindex('::') + 2
-      name[i..-1]
-    end
-  end
-
-  private
-
-  def distributor_validation
-    validates_with DistributorsValidator
-  end
-end

From 621e2a3132de8a27651bfa2ab035c000fea4f9d8 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 13:16:38 +0100
Subject: [PATCH 289/340] Run rubocop autocorrect

---
 app/models/spree/credit_card.rb          | 41 +++++++++-------
 app/models/spree/gateway.rb              |  7 ++-
 app/models/spree/gateway/bogus.rb        | 60 ++++++++++++------------
 app/models/spree/gateway/bogus_simple.rb | 16 +++----
 app/models/spree/payment_method.rb       | 14 +++---
 app/models/spree/payment_method/check.rb |  6 ++-
 spec/models/spree/credit_card_spec.rb    | 44 +++++++++--------
 spec/models/spree/gateway_spec.rb        |  9 ++--
 spec/models/spree/payment_method_spec.rb | 12 ++---
 9 files changed, 111 insertions(+), 98 deletions(-)

diff --git a/app/models/spree/credit_card.rb b/app/models/spree/credit_card.rb
index 46718b5ad8..f075de0e14 100644
--- a/app/models/spree/credit_card.rb
+++ b/app/models/spree/credit_card.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class CreditCard < ActiveRecord::Base
     # Should be able to remove once we reach Spree v2.2.0
@@ -32,28 +34,32 @@ module Spree
     end
 
     def number=(num)
-      @number = num.gsub(/[^0-9]/, '') rescue nil
+      @number = begin
+                  num.gsub(/[^0-9]/, '')
+                rescue StandardError
+                  nil
+                end
     end
 
     # cc_type is set by jquery.payment, which helpfully provides different
     # types from Active Merchant. Converting them is necessary.
     def cc_type=(type)
       real_type = case type
-      when 'mastercard', 'maestro'
-        'master'
-      when 'amex'
-        'american_express'
-      when 'dinersclub'
-        'diners_club'
-      else
-        type
+                  when 'mastercard', 'maestro'
+                    'master'
+                  when 'amex'
+                    'american_express'
+                  when 'dinersclub'
+                    'diners_club'
+                  else
+                    type
       end
       self[:cc_type] = real_type
     end
 
     def set_last_digits
-      number.to_s.gsub!(/\s/,'')
-      verification_value.to_s.gsub!(/\s/,'')
+      number.to_s.gsub!(/\s/, '')
+      verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 
@@ -93,6 +99,7 @@ module Spree
     def can_credit?(payment)
       return false unless payment.completed?
       return false unless payment.order.payment_state == 'credit_owed'
+
       payment.credit_allowed > 0
     end
 
@@ -103,12 +110,12 @@ module Spree
 
     def to_active_merchant
       ActiveMerchant::Billing::CreditCard.new(
-        :number => number,
-        :month => month,
-        :year => year,
-        :verification_value => verification_value,
-        :first_name => first_name,
-        :last_name => last_name
+        number: number,
+        month: month,
+        year: year,
+        verification_value: verification_value,
+        first_name: first_name,
+        last_name: last_name
       )
     end
 
diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb
index 165fffd91a..283a8458de 100644
--- a/app/models/spree/gateway.rb
+++ b/app/models/spree/gateway.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/concerns/payment_method_distributors'
 
 module Spree
@@ -23,7 +25,7 @@ module Spree
 
     def provider
       gateway_options = options
-      gateway_options.delete :login if gateway_options.has_key?(:login) and gateway_options[:login].nil?
+      gateway_options.delete :login if gateway_options.key?(:login) && gateway_options[:login].nil?
       if gateway_options[:server]
         ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
       end
@@ -31,7 +33,7 @@ module Spree
     end
 
     def options
-      self.preferences.inject({}){ |memo, (key, value)| memo[key.to_sym] = value; memo }
+      preferences.each_with_object({}){ |(key, value), memo| memo[key.to_sym] = value; }
     end
 
     def method_missing(method, *args)
@@ -53,6 +55,7 @@ module Spree
     def supports?(source)
       return true unless provider_class.respond_to? :supports?
       return false unless source.brand
+
       provider_class.supports?(source.brand)
     end
   end
diff --git a/app/models/spree/gateway/bogus.rb b/app/models/spree/gateway/bogus.rb
index de241848ad..2efa234fe9 100644
--- a/app/models/spree/gateway/bogus.rb
+++ b/app/models/spree/gateway/bogus.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Spree
   class Gateway::Bogus < Gateway
-    TEST_VISA = ['4111111111111111','4012888888881881','4222222222222']
-    TEST_MC   = ['5500000000000004','5555555555554444','5105105105105100']
-    TEST_AMEX = ['378282246310005','371449635398431','378734493671000','340000000000009']
-    TEST_DISC = ['6011000000000004','6011111111111117','6011000990139424']
+    TEST_VISA = ['4111111111111111', '4012888888881881', '4222222222222'].freeze
+    TEST_MC   = ['5500000000000004', '5555555555554444', '5105105105105100'].freeze
+    TEST_AMEX = ['378282246310005', '371449635398431', '378734493671000', '340000000000009'].freeze
+    TEST_DISC = ['6011000000000004', '6011111111111117', '6011000990139424'].freeze
 
     VALID_CCS = ['1', TEST_VISA, TEST_MC, TEST_AMEX, TEST_DISC].flatten
 
@@ -20,42 +22,41 @@ module Spree
     def create_profile(payment)
       # simulate the storage of credit card profile using remote service
       success = VALID_CCS.include? payment.source.number
-      payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
+      payment.source.update(gateway_customer_profile_id: generate_profile_id(success))
     end
 
-    def authorize(money, credit_card, options = {})
+    def authorize(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
-      if VALID_CCS.include? credit_card.number or (profile_id and profile_id.starts_with? 'BGS-')
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+      if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { :message => 'Bogus Gateway: Forced failure' }, :test => true)
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
       end
     end
 
-    def purchase(money, credit_card, options = {})
+    def purchase(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
-      if VALID_CCS.include? credit_card.number  or (profile_id and profile_id.starts_with? 'BGS-')
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+      if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :message => 'Bogus Gateway: Forced failure', :test => true)
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
       end
     end
 
-    def credit(money, credit_card, response_code, options = {})
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345')
+    def credit(_money, _credit_card, _response_code, _options = {})
+      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 
-    def capture(authorization, credit_card, gateway_options)
+    def capture(authorization, _credit_card, _gateway_options)
       if authorization.response_code == '12345'
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '67890')
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '67890')
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :error => 'Bogus Gateway: Forced failure', :test => true)
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', error: 'Bogus Gateway: Forced failure', test: true)
       end
-
     end
 
-    def void(response_code, credit_card, options = {})
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345')
+    def void(_response_code, _credit_card, _options = {})
+      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 
     def test?
@@ -72,14 +73,15 @@ module Spree
     end
 
     private
-      def generate_profile_id(success)
-        record = true
-        prefix = success ? 'BGS' : 'FAIL'
-        while record
-          random = "#{prefix}-#{Array.new(6){rand(6)}.join}"
-          record = CreditCard.where(:gateway_customer_profile_id => random).first
-        end
-        random
+
+    def generate_profile_id(success)
+      record = true
+      prefix = success ? 'BGS' : 'FAIL'
+      while record
+        random = "#{prefix}-#{Array.new(6){ rand(6) }.join}"
+        record = CreditCard.where(gateway_customer_profile_id: random).first
       end
+      random
+    end
   end
 end
diff --git a/app/models/spree/gateway/bogus_simple.rb b/app/models/spree/gateway/bogus_simple.rb
index 8b0757b220..0a9d64c1a0 100644
--- a/app/models/spree/gateway/bogus_simple.rb
+++ b/app/models/spree/gateway/bogus_simple.rb
@@ -1,26 +1,26 @@
+# frozen_string_literal: true
+
 # Bogus Gateway that doesn't support payment profiles
 module Spree
   class Gateway::BogusSimple < Gateway::Bogus
-
     def payment_profiles_supported?
       false
     end
 
-    def authorize(money, credit_card, options = {})
+    def authorize(_money, credit_card, _options = {})
       if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { :message => 'Bogus Gateway: Forced failure' }, :test => true)
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
       end
     end
 
-    def purchase(money, credit_card, options = {})
+    def purchase(_money, credit_card, _options = {})
       if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :message => 'Bogus Gateway: Forced failure', :test => true)
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
       end
     end
-
   end
 end
diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index 01a9be0ce5..c659c9a47a 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/concerns/payment_method_distributors'
 
 module Spree
@@ -8,7 +10,7 @@ module Spree
     acts_as_taggable
     acts_as_paranoid
 
-    DISPLAY = [:both, :front_end, :back_end]
+    DISPLAY = [:both, :front_end, :back_end].freeze
     default_scope -> { where(deleted_at: nil) }
 
     has_many :credit_cards, class_name: "Spree::CreditCard" # from Spree v.2.3.0 d470b31798f37
@@ -70,20 +72,20 @@ module Spree
     def self.available(display_on = 'both')
       all.select do |p|
         p.active &&
-        (p.display_on == display_on.to_s || p.display_on.blank?) &&
-        (p.environment == Rails.env || p.environment.blank?)
+          (p.display_on == display_on.to_s || p.display_on.blank?) &&
+          (p.environment == Rails.env || p.environment.blank?)
       end
     end
 
     def self.active?
-      where(type: self.to_s, environment: Rails.env, active: true).count > 0
+      where(type: to_s, environment: Rails.env, active: true).count > 0
     end
 
     def method_type
       type.demodulize.downcase
     end
 
-    def self.find_with_destroyed *args
+    def self.find_with_destroyed(*args)
       unscoped { find(*args) }
     end
 
@@ -99,7 +101,7 @@ module Spree
       Spree::Config[:auto_capture]
     end
 
-    def supports?(source)
+    def supports?(_source)
       true
     end
 
diff --git a/app/models/spree/payment_method/check.rb b/app/models/spree/payment_method/check.rb
index 108d8317d1..8ebdd19fc7 100644
--- a/app/models/spree/payment_method/check.rb
+++ b/app/models/spree/payment_method/check.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class PaymentMethod::Check < PaymentMethod
     def actions
@@ -14,11 +16,11 @@ module Spree
       payment.state != 'void'
     end
 
-    def capture(*args)
+    def capture(*_args)
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
-    def void(*args)
+    def void(*_args)
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
diff --git a/spec/models/spree/credit_card_spec.rb b/spec/models/spree/credit_card_spec.rb
index a2b812fe33..930cefa995 100644
--- a/spec/models/spree/credit_card_spec.rb
+++ b/spec/models/spree/credit_card_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 module Spree
   describe CreditCard do
     describe "original specs from Spree" do
-      let(:valid_credit_card_attributes) { { number: '4111111111111111', verification_value: '123', month: 12, year: Time.now.year + 1 } }
+      let(:valid_credit_card_attributes) { { number: '4111111111111111', verification_value: '123', month: 12, year: Time.zone.now.year + 1 } }
 
       def self.payment_states
         Spree::Payment.state_machine.states.keys
@@ -16,34 +16,32 @@ module Spree
       let(:credit_card) { Spree::CreditCard.new }
 
       before(:each) do
-
         @order = create(:order)
-        @payment = Spree::Payment.create(:amount => 100, :order => @order)
+        @payment = Spree::Payment.create(amount: 100, order: @order)
 
         @success_response = double('gateway_response', success?: true, authorization: '123', avs_result: { 'code' => 'avs-code' })
         @fail_response = double('gateway_response', success?: false)
 
         @payment_gateway = mock_model(Spree::PaymentMethod,
-          payment_profiles_supported?: true,
-          authorize: @success_response,
-          purchase: @success_response,
-          capture: @success_response,
-          void: @success_response,
-          credit: @success_response,
-          environment: 'test'
-        )
+                                      payment_profiles_supported?: true,
+                                      authorize: @success_response,
+                                      purchase: @success_response,
+                                      capture: @success_response,
+                                      void: @success_response,
+                                      credit: @success_response,
+                                      environment: 'test')
 
         @payment.stub payment_method: @payment_gateway
       end
 
       context "#can_capture?" do
         it "should be true if payment is pending" do
-          payment = mock_model(Spree::Payment, pending?: true, created_at: Time.now)
+          payment = mock_model(Spree::Payment, pending?: true, created_at: Time.zone.now)
           credit_card.can_capture?(payment).should be_true
         end
 
         it "should be true if payment is checkout" do
-          payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.now)
+          payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.zone.now)
           credit_card.can_capture?(payment).should be_true
         end
       end
@@ -94,24 +92,24 @@ module Spree
 
         it "does not run expiration in the past validation if month is not set" do
           credit_card.month = nil
-          credit_card.year = Time.now.year
+          credit_card.year = Time.zone.now.year
           credit_card.should_not be_valid
           credit_card.errors[:base].should be_blank
         end
 
         it "does not run expiration in the past validation if year is not set" do
-          credit_card.month = Time.now.month
+          credit_card.month = Time.zone.now.month
           credit_card.year = nil
           credit_card.should_not be_valid
           credit_card.errors[:base].should be_blank
         end
-        
+
         it "does not run expiration in the past validation if year and month are empty" do
           credit_card.year = ""
           credit_card.month = ""
           credit_card.should_not be_valid
           credit_card.errors[:card].should be_blank
-        end 
+        end
 
         it "should only validate on create" do
           credit_card.attributes = valid_credit_card_attributes
@@ -147,7 +145,7 @@ module Spree
         end
 
         it "should not raise an exception on non-string input" do
-          credit_card.number = Hash.new
+          credit_card.number = ({})
           credit_card.number.should be_nil
         end
       end
@@ -176,12 +174,12 @@ module Spree
           expect { credit_card.payments.to_a }.not_to raise_error
         end
       end
-      
+
       context "#to_active_merchant" do
         before do
           credit_card.number = "4111111111111111"
-          credit_card.year = Time.now.year
-          credit_card.month = Time.now.month
+          credit_card.year = Time.zone.now.year
+          credit_card.month = Time.zone.now.month
           credit_card.first_name = "Bob"
           credit_card.last_name = "Boblaw"
           credit_card.verification_value = 123
@@ -190,8 +188,8 @@ module Spree
         it "converts to an ActiveMerchant::Billing::CreditCard object" do
           am_card = credit_card.to_active_merchant
           am_card.number.should == "4111111111111111"
-          am_card.year.should == Time.now.year
-          am_card.month.should == Time.now.month
+          am_card.year.should == Time.zone.now.year
+          am_card.month.should == Time.zone.now.month
           am_card.first_name.should == "Bob"
           am_card.last_name = "Boblaw"
           am_card.verification_value.should == 123
diff --git a/spec/models/spree/gateway_spec.rb b/spec/models/spree/gateway_spec.rb
index cdedccd730..f68155edaf 100644
--- a/spec/models/spree/gateway_spec.rb
+++ b/spec/models/spree/gateway_spec.rb
@@ -1,13 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::Gateway do
   class Provider
-    def initialize(options)
-    end
+    def initialize(options); end
 
-    def imaginary_method
-
-    end
+    def imaginary_method; end
   end
 
   class TestGateway < Spree::Gateway
diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb
index e61fd8252c..79920f62e0 100644
--- a/spec/models/spree/payment_method_spec.rb
+++ b/spec/models/spree/payment_method_spec.rb
@@ -8,11 +8,11 @@ module Spree
 
         [nil, 'both', 'front_end', 'back_end'].each do |display_on|
           Spree::Gateway::Test.create(
-            :name => 'Display Both',
-            :display_on => display_on,
-            :active => true,
-            :environment => 'test',
-            :description => 'foofah'
+            name: 'Display Both',
+            display_on: display_on,
+            active: true,
+            environment: 'test',
+            description: 'foofah'
           )
         end
         Spree::PaymentMethod.all.size.should == 4
@@ -34,7 +34,7 @@ module Spree
         Spree::PaymentMethod.available(:back_end).size.should == 2
       end
     end
-    
+
     it "orders payment methods by name" do
       pm1 = create(:payment_method, name: 'ZZ')
       pm2 = create(:payment_method, name: 'AA')

From d746ae3d9e273a2aa14fee07407bf701b4a62720 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 13:28:09 +0100
Subject: [PATCH 290/340] Fix easy rubocop issues

---
 app/models/spree/credit_card.rb          |  26 ++--
 app/models/spree/gateway.rb              |   2 +-
 app/models/spree/gateway/bogus.rb        | 157 +++++++++++++----------
 app/models/spree/gateway/bogus_simple.rb |  42 +++---
 app/models/spree/payment_method.rb       |   5 +-
 app/models/spree/payment_method/check.rb |  42 +++---
 spec/models/spree/credit_card_spec.rb    |  55 +++++---
 7 files changed, 186 insertions(+), 143 deletions(-)

diff --git a/app/models/spree/credit_card.rb b/app/models/spree/credit_card.rb
index f075de0e14..7f6b41bcb4 100644
--- a/app/models/spree/credit_card.rb
+++ b/app/models/spree/credit_card.rb
@@ -11,9 +11,9 @@ module Spree
 
     before_save :set_last_digits
 
-    attr_accessor :number, :verification_value
-    # For holding customer preference in memory
-    attr_writer :save_requested_by_customer
+    attr_accessor :verification_value
+    attr_reader :number
+    attr_writer :save_requested_by_customer # For holding customer preference in memory
 
     validates :month, :year, numericality: { only_integer: true }
     validates :number, presence: true, unless: :has_payment_profile?, on: :create
@@ -53,7 +53,7 @@ module Spree
                     'diners_club'
                   else
                     type
-      end
+                  end
       self[:cc_type] = real_type
     end
 
@@ -94,13 +94,13 @@ module Spree
       !payment.void?
     end
 
-    # Indicates whether its possible to credit the payment.  Note that most gateways require that the
-    # payment be settled first which generally happens within 12-24 hours of the transaction.
+    # Indicates whether its possible to credit the payment. Note that most gateways require that the
+    #   payment be settled first which generally happens within 12-24 hours of the transaction.
     def can_credit?(payment)
       return false unless payment.completed?
       return false unless payment.order.payment_state == 'credit_owed'
 
-      payment.credit_allowed > 0
+      payment.credit_allowed.positive?
     end
 
     # Allows us to use a gateway_payment_profile_id to store Stripe Tokens
@@ -126,12 +126,12 @@ module Spree
     private
 
     def expiry_not_in_the_past
-      if year.present? && month.present?
-        time = "#{year}-#{month}-1".to_time
-        if time < Time.zone.now.to_time.beginning_of_month
-          errors.add(:base, :card_expired)
-        end
-      end
+      return unless year.present? && month.present?
+
+      time = "#{year}-#{month}-1".to_time
+      return unless time < Time.zone.now.to_time.beginning_of_month
+
+      errors.add(:base, :card_expired)
     end
 
     def reusable?
diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb
index 283a8458de..216f0cfe6b 100644
--- a/app/models/spree/gateway.rb
+++ b/app/models/spree/gateway.rb
@@ -40,7 +40,7 @@ module Spree
       if @provider.nil? || !@provider.respond_to?(method)
         super
       else
-        provider.send(method, *args)
+        provider.__send__(method, *args)
       end
     end
 
diff --git a/app/models/spree/gateway/bogus.rb b/app/models/spree/gateway/bogus.rb
index 2efa234fe9..2a844a0ace 100644
--- a/app/models/spree/gateway/bogus.rb
+++ b/app/models/spree/gateway/bogus.rb
@@ -1,87 +1,102 @@
 # frozen_string_literal: true
 
 module Spree
-  class Gateway::Bogus < Gateway
-    TEST_VISA = ['4111111111111111', '4012888888881881', '4222222222222'].freeze
-    TEST_MC   = ['5500000000000004', '5555555555554444', '5105105105105100'].freeze
-    TEST_AMEX = ['378282246310005', '371449635398431', '378734493671000', '340000000000009'].freeze
-    TEST_DISC = ['6011000000000004', '6011111111111117', '6011000990139424'].freeze
+  module Gateway
+    class Bogus < Spree::Gateway
+      TEST_VISA = ['4111111111111111', '4012888888881881', '4222222222222'].freeze
+      TEST_MC   = ['5500000000000004', '5555555555554444', '5105105105105100'].freeze
+      TEST_AMEX = ['378282246310005', '371449635398431',
+                   '378734493671000', '340000000000009'].freeze
+      TEST_DISC = ['6011000000000004', '6011111111111117', '6011000990139424'].freeze
 
-    VALID_CCS = ['1', TEST_VISA, TEST_MC, TEST_AMEX, TEST_DISC].flatten
+      VALID_CCS = ['1', TEST_VISA, TEST_MC, TEST_AMEX, TEST_DISC].flatten
 
-    attr_accessor :test
+      attr_accessor :test
 
-    def provider_class
-      self.class
-    end
-
-    def preferences
-      {}
-    end
-
-    def create_profile(payment)
-      # simulate the storage of credit card profile using remote service
-      success = VALID_CCS.include? payment.source.number
-      payment.source.update(gateway_customer_profile_id: generate_profile_id(success))
-    end
-
-    def authorize(_money, credit_card, _options = {})
-      profile_id = credit_card.gateway_customer_profile_id
-      if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
+      def provider_class
+        self.class
       end
-    end
 
-    def purchase(_money, credit_card, _options = {})
-      profile_id = credit_card.gateway_customer_profile_id
-      if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
+      def preferences
+        {}
       end
-    end
 
-    def credit(_money, _credit_card, _response_code, _options = {})
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
-    end
-
-    def capture(authorization, _credit_card, _gateway_options)
-      if authorization.response_code == '12345'
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '67890')
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', error: 'Bogus Gateway: Forced failure', test: true)
+      def create_profile(payment)
+        # simulate the storage of credit card profile using remote service
+        success = VALID_CCS.include? payment.source.number
+        payment.source.update(gateway_customer_profile_id: generate_profile_id(success))
       end
-    end
 
-    def void(_response_code, _credit_card, _options = {})
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
-    end
-
-    def test?
-      # Test mode is not really relevant with bogus gateway (no such thing as live server)
-      true
-    end
-
-    def payment_profiles_supported?
-      true
-    end
-
-    def actions
-      %w(capture void credit)
-    end
-
-    private
-
-    def generate_profile_id(success)
-      record = true
-      prefix = success ? 'BGS' : 'FAIL'
-      while record
-        random = "#{prefix}-#{Array.new(6){ rand(6) }.join}"
-        record = CreditCard.where(gateway_customer_profile_id: random).first
+      def authorize(_money, credit_card, _options = {})
+        profile_id = credit_card.gateway_customer_profile_id
+        if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                { message: 'Bogus Gateway: Forced failure' },
+                                                test: true)
+        end
+      end
+
+      def purchase(_money, credit_card, _options = {})
+        profile_id = credit_card.gateway_customer_profile_id
+        if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                message: 'Bogus Gateway: Forced failure',
+                                                test: true)
+        end
+      end
+
+      def credit(_money, _credit_card, _response_code, _options = {})
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                              test: true, authorization: '12345')
+      end
+
+      def capture(authorization, _credit_card, _gateway_options)
+        if authorization.response_code == '12345'
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '67890')
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                error: 'Bogus Gateway: Forced failure', test: true)
+        end
+      end
+
+      def void(_response_code, _credit_card, _options = {})
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                              test: true, authorization: '12345')
+      end
+
+      def test?
+        # Test mode is not really relevant with bogus gateway (no such thing as live server)
+        true
+      end
+
+      def payment_profiles_supported?
+        true
+      end
+
+      def actions
+        %w(capture void credit)
+      end
+
+      private
+
+      def generate_profile_id(success)
+        record = true
+        prefix = success ? 'BGS' : 'FAIL'
+        while record
+          random = "#{prefix}-#{Array.new(6){ rand(6) }.join}"
+          record = CreditCard.find_by(gateway_customer_profile_id: random)
+        end
+        random
       end
-      random
     end
   end
 end
diff --git a/app/models/spree/gateway/bogus_simple.rb b/app/models/spree/gateway/bogus_simple.rb
index 0a9d64c1a0..62938e438f 100644
--- a/app/models/spree/gateway/bogus_simple.rb
+++ b/app/models/spree/gateway/bogus_simple.rb
@@ -2,24 +2,34 @@
 
 # Bogus Gateway that doesn't support payment profiles
 module Spree
-  class Gateway::BogusSimple < Gateway::Bogus
-    def payment_profiles_supported?
-      false
-    end
-
-    def authorize(_money, credit_card, _options = {})
-      if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
+  module Gateway
+    class BogusSimple < Spree::Gateway::Bogus
+      def payment_profiles_supported?
+        false
       end
-    end
 
-    def purchase(_money, credit_card, _options = {})
-      if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
+      def authorize(_money, credit_card, _options = {})
+        if VALID_CCS.include? credit_card.number
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                { message: 'Bogus Gateway: Forced failure' },
+                                                test: true)
+        end
+      end
+
+      def purchase(_money, credit_card, _options = {})
+        if VALID_CCS.include? credit_card.number
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                message: 'Bogus Gateway: Forced failure',
+                                                test: true)
+        end
       end
     end
   end
diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index c659c9a47a..a799eaebdd 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -28,7 +28,8 @@ module Spree
         where(nil)
       else
         joins(:distributors).
-          where('distributors_payment_methods.distributor_id IN (?)', user.enterprises.select(&:id)).
+          where('distributors_payment_methods.distributor_id IN (?)',
+                user.enterprises.select(&:id)).
           select('DISTINCT spree_payment_methods.*')
       end
     }
@@ -78,7 +79,7 @@ module Spree
     end
 
     def self.active?
-      where(type: to_s, environment: Rails.env, active: true).count > 0
+      where(type: to_s, environment: Rails.env, active: true).count.positive?
     end
 
     def method_type
diff --git a/app/models/spree/payment_method/check.rb b/app/models/spree/payment_method/check.rb
index 8ebdd19fc7..15be0202b1 100644
--- a/app/models/spree/payment_method/check.rb
+++ b/app/models/spree/payment_method/check.rb
@@ -1,31 +1,33 @@
 # frozen_string_literal: true
 
 module Spree
-  class PaymentMethod::Check < PaymentMethod
-    def actions
-      %w{capture void}
-    end
+  module PaymentMethod
+    class Check < Spree::PaymentMethod
+      def actions
+        %w{capture void}
+      end
 
-    # Indicates whether its possible to capture the payment
-    def can_capture?(payment)
-      ['checkout', 'pending'].include?(payment.state)
-    end
+      # Indicates whether its possible to capture the payment
+      def can_capture?(payment)
+        ['checkout', 'pending'].include?(payment.state)
+      end
 
-    # Indicates whether its possible to void the payment.
-    def can_void?(payment)
-      payment.state != 'void'
-    end
+      # Indicates whether its possible to void the payment.
+      def can_void?(payment)
+        payment.state != 'void'
+      end
 
-    def capture(*_args)
-      ActiveMerchant::Billing::Response.new(true, "", {}, {})
-    end
+      def capture(*_args)
+        ActiveMerchant::Billing::Response.new(true, "", {}, {})
+      end
 
-    def void(*_args)
-      ActiveMerchant::Billing::Response.new(true, "", {}, {})
-    end
+      def void(*_args)
+        ActiveMerchant::Billing::Response.new(true, "", {}, {})
+      end
 
-    def source_required?
-      false
+      def source_required?
+        false
+      end
     end
   end
 end
diff --git a/spec/models/spree/credit_card_spec.rb b/spec/models/spree/credit_card_spec.rb
index 930cefa995..87b5daf62d 100644
--- a/spec/models/spree/credit_card_spec.rb
+++ b/spec/models/spree/credit_card_spec.rb
@@ -3,7 +3,14 @@ require 'spec_helper'
 module Spree
   describe CreditCard do
     describe "original specs from Spree" do
-      let(:valid_credit_card_attributes) { { number: '4111111111111111', verification_value: '123', month: 12, year: Time.zone.now.year + 1 } }
+      let(:valid_credit_card_attributes) {
+        {
+          number: '4111111111111111',
+          verification_value: '123',
+          month: 12,
+          year: Time.zone.now.year + 1
+        }
+      }
 
       def self.payment_states
         Spree::Payment.state_machine.states.keys
@@ -19,7 +26,9 @@ module Spree
         @order = create(:order)
         @payment = Spree::Payment.create(amount: 100, order: @order)
 
-        @success_response = double('gateway_response', success?: true, authorization: '123', avs_result: { 'code' => 'avs-code' })
+        @success_response = double('gateway_response', success?: true,
+                                                       authorization: '123',
+                                                       avs_result: { 'code' => 'avs-code' })
         @fail_response = double('gateway_response', success?: false)
 
         @payment_gateway = mock_model(Spree::PaymentMethod,
@@ -41,7 +50,9 @@ module Spree
         end
 
         it "should be true if payment is checkout" do
-          payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.zone.now)
+          payment = mock_model(Spree::Payment, pending?: false,
+                                               checkout?: true,
+                                               created_at: Time.zone.now)
           credit_card.can_capture?(payment).should be_true
         end
       end
@@ -60,12 +71,16 @@ module Spree
         end
 
         it "should be false when order payment_state is not 'credit_owed'" do
-          payment = mock_model(Spree::Payment, completed?: true, order: mock_model(Spree::Order, payment_state: 'paid'))
+          payment = mock_model(Spree::Payment,
+                               completed?: true,
+                               order: mock_model(Spree::Order, payment_state: 'paid'))
           credit_card.can_credit?(payment).should be_false
         end
 
         it "should be false when credit_allowed is zero" do
-          payment = mock_model(Spree::Payment, completed?: true, credit_allowed: 0, order: mock_model(Spree::Order, payment_state: 'credit_owed'))
+          payment = mock_model(Spree::Payment,
+                               completed?: true, credit_allowed: 0,
+                               order: mock_model(Spree::Order, payment_state: 'credit_owed'))
           credit_card.can_credit?(payment).should be_false
         end
       end
@@ -74,20 +89,20 @@ module Spree
         it "should validate presence of number" do
           credit_card.attributes = valid_credit_card_attributes.except(:number)
           credit_card.should_not be_valid
-          credit_card.errors[:number].should == ["can't be blank"]
+          expect(credit_card.errors[:number]).to eq ["can't be blank"]
         end
 
         it "should validate presence of security code" do
           credit_card.attributes = valid_credit_card_attributes.except(:verification_value)
           credit_card.should_not be_valid
-          credit_card.errors[:verification_value].should == ["can't be blank"]
+          expect(credit_card.errors[:verification_value]).to eq ["can't be blank"]
         end
 
         it "should validate expiration is not in the past" do
           credit_card.month = 1.month.ago.month
           credit_card.year = 1.month.ago.year
           credit_card.should_not be_valid
-          credit_card.errors[:base].should == ["Card has expired"]
+          expect(credit_card.errors[:base]).to eq ["Card has expired"]
         end
 
         it "does not run expiration in the past validation if month is not set" do
@@ -138,10 +153,10 @@ module Spree
       context "#number=" do
         it "should strip non-numeric characters from card input" do
           credit_card.number = "6011000990139424"
-          credit_card.number.should == "6011000990139424"
+          expect(credit_card.number).to eq "6011000990139424"
 
           credit_card.number = "  6011-0009-9013-9424  "
-          credit_card.number.should == "6011000990139424"
+          expect(credit_card.number).to eq "6011000990139424"
         end
 
         it "should not raise an exception on non-string input" do
@@ -153,19 +168,19 @@ module Spree
       context "#cc_type=" do
         it "converts between the different types" do
           credit_card.cc_type = 'mastercard'
-          credit_card.cc_type.should == 'master'
+          expect(credit_card.cc_type).to eq 'master'
 
           credit_card.cc_type = 'maestro'
-          credit_card.cc_type.should == 'master'
+          expect(credit_card.cc_type).to eq 'master'
 
           credit_card.cc_type = 'amex'
-          credit_card.cc_type.should == 'american_express'
+          expect(credit_card.cc_type).to eq 'american_express'
 
           credit_card.cc_type = 'dinersclub'
-          credit_card.cc_type.should == 'diners_club'
+          expect(credit_card.cc_type).to eq 'diners_club'
 
           credit_card.cc_type = 'some_outlandish_cc_type'
-          credit_card.cc_type.should == 'some_outlandish_cc_type'
+          expect(credit_card.cc_type).to eq 'some_outlandish_cc_type'
         end
       end
 
@@ -187,12 +202,12 @@ module Spree
 
         it "converts to an ActiveMerchant::Billing::CreditCard object" do
           am_card = credit_card.to_active_merchant
-          am_card.number.should == "4111111111111111"
-          am_card.year.should == Time.zone.now.year
-          am_card.month.should == Time.zone.now.month
-          am_card.first_name.should == "Bob"
+          expect(am_card.number).to eq "4111111111111111"
+          expect(am_card.year).to eq Time.zone.now.year
+          expect(am_card.month).to eq Time.zone.now.month
+          expect(am_card.first_name).to eq "Bob"
           am_card.last_name = "Boblaw"
-          am_card.verification_value.should == 123
+          expect(am_card.verification_value).to eq 123
         end
       end
     end

From b21a969502ddb66827a3f54df338dbe603b41c7e Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 13:45:25 +0100
Subject: [PATCH 291/340] Fix new credit_card_spec

---
 app/models/spree/gateway/bogus.rb        |  2 +-
 app/models/spree/gateway/bogus_simple.rb |  2 +-
 app/models/spree/payment_method/check.rb |  2 +-
 config/initializers/spree.rb             |  3 -
 spec/models/spree/credit_card_spec.rb    | 88 +++++++++++++-----------
 5 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/app/models/spree/gateway/bogus.rb b/app/models/spree/gateway/bogus.rb
index 2a844a0ace..76dde5f211 100644
--- a/app/models/spree/gateway/bogus.rb
+++ b/app/models/spree/gateway/bogus.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  module Gateway
+  class Gateway
     class Bogus < Spree::Gateway
       TEST_VISA = ['4111111111111111', '4012888888881881', '4222222222222'].freeze
       TEST_MC   = ['5500000000000004', '5555555555554444', '5105105105105100'].freeze
diff --git a/app/models/spree/gateway/bogus_simple.rb b/app/models/spree/gateway/bogus_simple.rb
index 62938e438f..2a7c9e7778 100644
--- a/app/models/spree/gateway/bogus_simple.rb
+++ b/app/models/spree/gateway/bogus_simple.rb
@@ -2,7 +2,7 @@
 
 # Bogus Gateway that doesn't support payment profiles
 module Spree
-  module Gateway
+  class Gateway
     class BogusSimple < Spree::Gateway::Bogus
       def payment_profiles_supported?
         false
diff --git a/app/models/spree/payment_method/check.rb b/app/models/spree/payment_method/check.rb
index 15be0202b1..9819a52c6c 100644
--- a/app/models/spree/payment_method/check.rb
+++ b/app/models/spree/payment_method/check.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  module PaymentMethod
+  class PaymentMethod
     class Check < Spree::PaymentMethod
       def actions
         %w{capture void}
diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 6ff230c5f5..be67509db8 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -17,9 +17,6 @@ Spree::Gateway.class_eval do
   acts_as_taggable
 end
 
-require "#{Rails.root}/app/models/spree/payment_method_decorator"
-require "#{Rails.root}/app/models/spree/gateway_decorator"
-
 Spree.config do |config|
   config.shipping_instructions = true
   config.address_requires_state = true
diff --git a/spec/models/spree/credit_card_spec.rb b/spec/models/spree/credit_card_spec.rb
index 87b5daf62d..a245b4e64f 100644
--- a/spec/models/spree/credit_card_spec.rb
+++ b/spec/models/spree/credit_card_spec.rb
@@ -24,112 +24,116 @@ module Spree
 
       before(:each) do
         @order = create(:order)
-        @payment = Spree::Payment.create(amount: 100, order: @order)
+        @payment = create(:payment, amount: 100, order: @order)
 
         @success_response = double('gateway_response', success?: true,
                                                        authorization: '123',
                                                        avs_result: { 'code' => 'avs-code' })
         @fail_response = double('gateway_response', success?: false)
 
-        @payment_gateway = mock_model(Spree::PaymentMethod,
-                                      payment_profiles_supported?: true,
-                                      authorize: @success_response,
-                                      purchase: @success_response,
-                                      capture: @success_response,
-                                      void: @success_response,
-                                      credit: @success_response,
-                                      environment: 'test')
-
+        @payment_gateway = create(:payment_method,
+                                  environment: 'test')
+        allow(@payment_gateway).to receive_messages :payment_profiles_supported? => true,
+                                                    :authorize => @success_response,
+                                                    :purchase => @success_response,
+                                                    :capture => @success_response,
+                                                    :void => @success_response,
+                                                    :credit => @success_response
         @payment.stub payment_method: @payment_gateway
       end
 
       context "#can_capture?" do
         it "should be true if payment is pending" do
-          payment = mock_model(Spree::Payment, pending?: true, created_at: Time.zone.now)
-          credit_card.can_capture?(payment).should be_true
+          payment = create(:payment, created_at: Time.zone.now)
+          allow(payment).to receive(:pending?) { true }
+          expect(credit_card.can_capture?(payment)).to be_truthy
         end
 
         it "should be true if payment is checkout" do
-          payment = mock_model(Spree::Payment, pending?: false,
-                                               checkout?: true,
-                                               created_at: Time.zone.now)
-          credit_card.can_capture?(payment).should be_true
+          payment = create(:payment, created_at: Time.zone.now)
+          allow(payment).to receive_messages :pending? => false,
+                                             :checkout? => true
+          expect(credit_card.can_capture?(payment)).to be_truthy
         end
       end
 
       context "#can_void?" do
         it "should be true if payment is not void" do
-          payment = mock_model(Spree::Payment, void?: false)
-          credit_card.can_void?(payment).should be_true
+          payment = create(:payment)
+          allow(payment).to receive(:void?) { false }
+          expect(credit_card.can_void?(payment)).to be_truthy
         end
       end
 
       context "#can_credit?" do
         it "should be false if payment is not completed" do
-          payment = mock_model(Spree::Payment, completed?: false)
-          credit_card.can_credit?(payment).should be_false
+          payment = create(:payment)
+          allow(payment).to receive(:completed?) { false }
+          expect(credit_card.can_credit?(payment)).to be_falsy
         end
 
         it "should be false when order payment_state is not 'credit_owed'" do
-          payment = mock_model(Spree::Payment,
-                               completed?: true,
-                               order: mock_model(Spree::Order, payment_state: 'paid'))
-          credit_card.can_credit?(payment).should be_false
+          payment = create(:payment,
+                           order: create(:order, payment_state: 'paid'))
+          allow(payment).to receive(:completed?) { true }
+          expect(credit_card.can_credit?(payment)).to be_falsy
         end
 
         it "should be false when credit_allowed is zero" do
-          payment = mock_model(Spree::Payment,
-                               completed?: true, credit_allowed: 0,
-                               order: mock_model(Spree::Order, payment_state: 'credit_owed'))
-          credit_card.can_credit?(payment).should be_false
+          payment = create(:payment,
+                           order: create(:order, payment_state: 'credit_owed'))
+          allow(payment).to receive_messages :completed? => true,
+                                             :credit_allowed => 0
+
+          expect(credit_card.can_credit?(payment)).to be_falsy
         end
       end
 
       context "#valid?" do
         it "should validate presence of number" do
           credit_card.attributes = valid_credit_card_attributes.except(:number)
-          credit_card.should_not be_valid
+          expect(credit_card).to_not be_valid
           expect(credit_card.errors[:number]).to eq ["can't be blank"]
         end
 
         it "should validate presence of security code" do
           credit_card.attributes = valid_credit_card_attributes.except(:verification_value)
-          credit_card.should_not be_valid
+          expect(credit_card).to_not be_valid
           expect(credit_card.errors[:verification_value]).to eq ["can't be blank"]
         end
 
         it "should validate expiration is not in the past" do
           credit_card.month = 1.month.ago.month
           credit_card.year = 1.month.ago.year
-          credit_card.should_not be_valid
-          expect(credit_card.errors[:base]).to eq ["Card has expired"]
+          expect(credit_card).to_not be_valid
+          expect(credit_card.errors[:base]).to eq ["has expired"]
         end
 
         it "does not run expiration in the past validation if month is not set" do
           credit_card.month = nil
           credit_card.year = Time.zone.now.year
-          credit_card.should_not be_valid
-          credit_card.errors[:base].should be_blank
+          expect(credit_card).to_not be_valid
+          expect(credit_card.errors[:base]).to be_blank
         end
 
         it "does not run expiration in the past validation if year is not set" do
           credit_card.month = Time.zone.now.month
           credit_card.year = nil
-          credit_card.should_not be_valid
-          credit_card.errors[:base].should be_blank
+          expect(credit_card).to_not be_valid
+          expect(credit_card.errors[:base]).to be_blank
         end
 
         it "does not run expiration in the past validation if year and month are empty" do
           credit_card.year = ""
           credit_card.month = ""
-          credit_card.should_not be_valid
-          credit_card.errors[:card].should be_blank
+          expect(credit_card).to_not be_valid
+          expect(credit_card.errors[:card]).to be_blank
         end
 
         it "should only validate on create" do
           credit_card.attributes = valid_credit_card_attributes
           credit_card.save
-          credit_card.should be_valid
+          expect(credit_card).to be_valid
         end
       end
 
@@ -142,11 +146,11 @@ module Spree
         let!(:persisted_card) { Spree::CreditCard.find(credit_card.id) }
 
         it "should not actually store the number" do
-          persisted_card.number.should be_blank
+          expect(persisted_card.number).to be_blank
         end
 
         it "should not actually store the security code" do
-          persisted_card.verification_value.should be_blank
+          expect(persisted_card.verification_value).to be_blank
         end
       end
 
@@ -161,7 +165,7 @@ module Spree
 
         it "should not raise an exception on non-string input" do
           credit_card.number = ({})
-          credit_card.number.should be_nil
+          expect(credit_card.number).to be_nil
         end
       end
 

From 798194c03ee03741204e8ad26d1029edd2443837 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 14:02:05 +0100
Subject: [PATCH 292/340] Fix payment_method spec

---
 spec/models/spree/payment_method_spec.rb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb
index 79920f62e0..3e0d99c5fa 100644
--- a/spec/models/spree/payment_method_spec.rb
+++ b/spec/models/spree/payment_method_spec.rb
@@ -1,9 +1,14 @@
 require 'spec_helper'
 
+class Spree::Gateway::Test < Spree::Gateway
+end
+
 module Spree
   describe PaymentMethod do
     describe "#available" do
-      before(:all) do
+      let(:enterprise) { create(:enterprise) }
+
+      before do
         Spree::PaymentMethod.delete_all
 
         [nil, 'both', 'front_end', 'back_end'].each do |display_on|
@@ -12,26 +17,27 @@ module Spree
             display_on: display_on,
             active: true,
             environment: 'test',
-            description: 'foofah'
+            description: 'foofah',
+            distributors: [enterprise]
           )
         end
-        Spree::PaymentMethod.all.size.should == 4
+        expect(Spree::PaymentMethod.all.size).to eq 4
       end
 
       it "should return all methods available to front-end/back-end when no parameter is passed" do
-        Spree::PaymentMethod.available.size.should == 2
+        expect(Spree::PaymentMethod.available.size).to eq 2
       end
 
       it "should return all methods available to front-end/back-end when display_on = :both" do
-        Spree::PaymentMethod.available(:both).size.should == 2
+        expect(Spree::PaymentMethod.available(:both).size).to eq 2
       end
 
       it "should return all methods available to front-end when display_on = :front_end" do
-        Spree::PaymentMethod.available(:front_end).size.should == 2
+        expect(Spree::PaymentMethod.available(:front_end).size).to eq 2
       end
 
       it "should return all methods available to back-end when display_on = :back_end" do
-        Spree::PaymentMethod.available(:back_end).size.should == 2
+        expect(Spree::PaymentMethod.available(:back_end).size).to eq 2
       end
     end
 

From 1b66a72c7fb173c65d918746f51b772b745e2027 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 14:03:15 +0100
Subject: [PATCH 293/340] Run transpec

---
 spec/models/spree/credit_card_spec.rb | 4 ++--
 spec/models/spree/gateway_spec.rb     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/models/spree/credit_card_spec.rb b/spec/models/spree/credit_card_spec.rb
index a245b4e64f..c1d8b8ae82 100644
--- a/spec/models/spree/credit_card_spec.rb
+++ b/spec/models/spree/credit_card_spec.rb
@@ -17,7 +17,7 @@ module Spree
       end
 
       def stub_rails_env(environment)
-        Rails.stub(env: ActiveSupport::StringInquirer.new(environment))
+        allow(Rails).to receive_messages(env: ActiveSupport::StringInquirer.new(environment))
       end
 
       let(:credit_card) { Spree::CreditCard.new }
@@ -39,7 +39,7 @@ module Spree
                                                     :capture => @success_response,
                                                     :void => @success_response,
                                                     :credit => @success_response
-        @payment.stub payment_method: @payment_gateway
+        allow(@payment).to receive_messages payment_method: @payment_gateway
       end
 
       context "#can_capture?" do
diff --git a/spec/models/spree/gateway_spec.rb b/spec/models/spree/gateway_spec.rb
index f68155edaf..294073a559 100644
--- a/spec/models/spree/gateway_spec.rb
+++ b/spec/models/spree/gateway_spec.rb
@@ -17,7 +17,7 @@ describe Spree::Gateway do
 
   it "passes through all arguments on a method_missing call" do
     gateway = TestGateway.new
-    gateway.provider.should_receive(:imaginary_method).with('foo')
+    expect(gateway.provider).to receive(:imaginary_method).with('foo')
     gateway.imaginary_method('foo')
   end
 end

From 49a60374e6f4c48202b1899b09b7c4a42fa0a027 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 14:14:46 +0100
Subject: [PATCH 294/340] Remove dead method in payment method, it's a scope in
 OFN and remove unnecessary comments about spree

---
 app/models/spree/credit_card.rb    |  2 --
 app/models/spree/payment_method.rb | 12 +-----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/models/spree/credit_card.rb b/app/models/spree/credit_card.rb
index 7f6b41bcb4..948dcf829d 100644
--- a/app/models/spree/credit_card.rb
+++ b/app/models/spree/credit_card.rb
@@ -2,8 +2,6 @@
 
 module Spree
   class CreditCard < ActiveRecord::Base
-    # Should be able to remove once we reach Spree v2.2.0
-    # https://github.com/spree/spree/commit/411010f3975c919ab298cb63962ee492455b415c
     belongs_to :payment_method
     belongs_to :user
 
diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index a799eaebdd..39df36486d 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -13,7 +13,7 @@ module Spree
     DISPLAY = [:both, :front_end, :back_end].freeze
     default_scope -> { where(deleted_at: nil) }
 
-    has_many :credit_cards, class_name: "Spree::CreditCard" # from Spree v.2.3.0 d470b31798f37
+    has_many :credit_cards, class_name: "Spree::CreditCard"
 
     validates :name, presence: true
     validate :distributor_validation
@@ -22,7 +22,6 @@ module Spree
 
     scope :production, -> { where(environment: 'production') }
 
-    # -- Scopes
     scope :managed_by, lambda { |user|
       if user.has_spree_role?('admin')
         where(nil)
@@ -48,7 +47,6 @@ module Spree
 
     scope :by_name, -> { order('spree_payment_methods.name ASC') }
 
-    # Rewrite Spree's ruby-land class method as a scope
     scope :available, lambda { |display_on = 'both'|
       where(active: true).
         where('spree_payment_methods.display_on=? OR spree_payment_methods.display_on=? OR spree_payment_methods.display_on IS NULL', display_on, '').
@@ -70,14 +68,6 @@ module Spree
       raise 'You must implement payment_source_class method for this gateway.'
     end
 
-    def self.available(display_on = 'both')
-      all.select do |p|
-        p.active &&
-          (p.display_on == display_on.to_s || p.display_on.blank?) &&
-          (p.environment == Rails.env || p.environment.blank?)
-      end
-    end
-
     def self.active?
       where(type: to_s, environment: Rails.env, active: true).count.positive?
     end

From f6c85af4da97bc70bf87b410ecf6445499e45c49 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Sat, 8 Aug 2020 00:21:32 +1000
Subject: [PATCH 295/340] Updating translations for config/locales/fr.yml

---
 config/locales/fr.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index efc40acc1e..29757b8572 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1316,6 +1316,8 @@ fr:
   cart_updating: "Mettre à jour le panier"
   cart_empty: "Panier vide"
   cart_edit: "Modifier votre panier"
+  item: "Produit"
+  qty: "Qté"
   card_number: Numéro de carte
   card_securitycode: "Cryptogramme visuel"
   card_expiry_date: Date d'expiration

From 4e227873865db51c2a403a6f700cfd25567e2c38 Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Fri, 7 Aug 2020 17:20:14 +0200
Subject: [PATCH 296/340] Fix docs OCD in Gemfile

@luisramos0 and I can't cope with reading TWO and seeing THREE items listed.
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index fd3f7aaacc..d18f0fab6d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem 'stringex', '~> 1.5.1'
 
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 
-# Our branch contains two changes
+# Our branch contains the following changes:
 # - Pass customer email and phone number to PayPal (merged to upstream master)
 # - Change type of password from string to password to hide it in the form
 # - Skip CA cert file and use the ones provided by the OS

From 09b7aa134b77eaee9b1d2e395baebde1a815799a Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 7 Aug 2020 17:31:39 +0100
Subject: [PATCH 297/340] Ammend payment method spec and specify a calculator
 so that the default calculator is not the spree one that is based on a
 calculator that does not exist in OFN: Spree::Calculator::FlatRate

---
 spec/features/admin/payment_method_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index 2cdc226bdf..851c1be1a0 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -81,7 +81,8 @@ feature '
   end
 
   scenario "updating a payment method", js: true do
-    payment_method = create(:payment_method, distributors: [@distributors[0]])
+    payment_method = create(:payment_method, distributors: [@distributors[0]],
+                                             calculator: build(:calculator_flat_rate))
     login_as_admin_and_visit spree.edit_admin_payment_method_path payment_method
 
     fill_in 'payment_method_name', with: 'New PM Name'

From 74252e9d135af219d5fcae3c2758c4f7edb75532 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sun, 9 Aug 2020 14:02:07 +0100
Subject: [PATCH 298/340] Suppress Selenium warnings in test log output.

---
 spec/spec_helper.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9e42ff6191..e50b4ea4b7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -181,6 +181,10 @@ RSpec.configure do |config|
 
   config.include JsonSpec::Helpers
 
+  # Suppress Selenium deprecation warnings. Stops a flood of pointless warnings filling the
+  # test output. We can remove this in the future after upgrading Rails, Rack, and Capybara.
+  Selenium::WebDriver.logger.level = :error
+
   # Profiling
   #
   # This code shouldn't be run in normal circumstances. But if you want to know

From a860b5ea42cecfecd881fc5ba1ccee2bd43980a0 Mon Sep 17 00:00:00 2001
From: Eduardo <jeduardo824@gmail.com>
Date: Sun, 9 Aug 2020 20:45:33 -0300
Subject: [PATCH 299/340] remove unnecessary code

---
 .../spree/admin/shared/_order_links.html.haml_spec.rb     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/spec/views/spree/admin/shared/_order_links.html.haml_spec.rb b/spec/views/spree/admin/shared/_order_links.html.haml_spec.rb
index 63b7be6339..027c188cab 100644
--- a/spec/views/spree/admin/shared/_order_links.html.haml_spec.rb
+++ b/spec/views/spree/admin/shared/_order_links.html.haml_spec.rb
@@ -3,14 +3,8 @@ require "spec_helper"
 describe "spree/admin/shared/_order_links.html.haml" do
   helper Spree::BaseHelper # required to make pretty_time work
 
-  around do |example|
-    original_config = Spree::Config[:enable_invoices?]
-    example.run
-    Spree::Config[:enable_invoices?] = original_config
-  end
-
   before do
-    order = create(:completed_order_with_fees)
+    order = create(:order)
     assign(:order, order)
   end
 

From 13bf7497a95c8d5e5cd264f84faefb8a340cfe9f Mon Sep 17 00:00:00 2001
From: Arun Kumar Mohan <arunmohandm@gmail.com>
Date: Mon, 10 Aug 2020 18:26:09 -0500
Subject: [PATCH 300/340] Fix price translation in Bulk Order Management

---
 app/views/spree/admin/orders/bulk_management.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index 1053235c67..644a9531e4 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -151,7 +151,7 @@
             %th.final_weight_volume{ 'ng-show' => 'columns.final_weight_volume.visible' }
               = t("admin.orders.bulk_management.weight_volume")
             %th.price{ 'ng-show' => 'columns.price.visible' }
-              = t("admin.price (#{currency_symbol})")
+              = "#{t('admin.price')} (#{currency_symbol})"
             %th.actions
             %th.actions
               = t("admin.orders.bulk_management.ask")

From acf984699e430ef76ae6426618766a67eed5e075 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 11 Aug 2020 12:02:26 +1000
Subject: [PATCH 301/340] Updating translations for config/locales/en_US.yml

---
 config/locales/en_US.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index 8641ca95b1..c900a375bd 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -14,6 +14,7 @@ en_US:
       spree/payment:
         amount: Amount
         state: State
+        source: Source
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
@@ -183,6 +184,7 @@ en_US:
         explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this.
   home: "OFN"
   title: "Open Food Network"
+  welcome_to: "Welcome to"
   site_meta_description: "We begin from the ground up. With farmers and growers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can seriously change the world."
   search_by_name: Search by name or city...
   producers_join: US producers are now welcome to join the Open Food Network.
@@ -271,6 +273,9 @@ en_US:
   on hand: "On Hand"
   ship: "Ship"
   shipping_category: "Shipping Category"
+  height: "Height"
+  width: "Width"
+  depth: "Depth"
   actions:
     create_and_add_another: "Create and Add Another"
     create: "Create"
@@ -1309,6 +1314,8 @@ en_US:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card number
   card_securitycode: "Security code"
   card_expiry_date: Expiry date
@@ -1720,6 +1727,7 @@ en_US:
   remember_me: Remember Me
   are_you_sure: "Are you sure?"
   orders_open: "Orders open"
+  closing: "Closing"
   going_back_to_home_page: "Taking you back to the home page"
   creating: Creating
   updating: Updating
@@ -1963,6 +1971,7 @@ en_US:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  permalink: "Permalink"
   shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
@@ -2060,6 +2069,7 @@ en_US:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  shipping_method: "Shipping method"
   new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
@@ -3173,6 +3183,8 @@ en_US:
           stripe:
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
+          paypal:
+            no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:
@@ -3371,6 +3383,11 @@ en_US:
         thanks: "Thank you for your business."
         track_information: "Tracking Information: %{tracking}"
         track_link: "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulations!"
+        message: "If you have received this email, then your email settings are correct."
+        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments

From dee34d1f26fd28b7e60c997bfce6b9421605e2c5 Mon Sep 17 00:00:00 2001
From: julesemmac <julia.e.carney@gmail.com>
Date: Mon, 10 Aug 2020 23:19:21 -0400
Subject: [PATCH 302/340] adding required argument to resolve Places error

---
 .../javascripts/darkswarm/directives/map_search.js.coffee       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
index 322fa4bb28..bd46a9c80d 100644
--- a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
@@ -43,7 +43,7 @@ Darkswarm.directive 'mapSearch', ($timeout, Search) ->
     # When the map loads, and we have a search from ?query, perform that search
     scope.performUrlSearch = (map) ->
       google.maps.event.addListenerOnce map, "idle", =>
-        google.maps.event.trigger(scope.input, 'focus');
+        google.maps.event.trigger(scope.input, 'focus',{});
         google.maps.event.trigger(scope.input, 'keydown', {keyCode: 13});
 
     # Bias the SearchBox results towards places that are within the bounds of the

From 0edeb82c32eee867796ae6637541624fc1307407 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 11 Aug 2020 14:02:49 +0200
Subject: [PATCH 303/340] Update spec/spec_helper.rb

Co-authored-by: Maikel <maikel@email.org.au>
---
 spec/spec_helper.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e50b4ea4b7..d4130a9d2d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -183,7 +183,13 @@ RSpec.configure do |config|
 
   # Suppress Selenium deprecation warnings. Stops a flood of pointless warnings filling the
   # test output. We can remove this in the future after upgrading Rails, Rack, and Capybara.
-  Selenium::WebDriver.logger.level = :error
+  if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 0
+    Selenium::WebDriver.logger.level = :error
+  else
+    ActiveSupport::Deprecation.warn(
+      "Suppressing Selenium deprecation warnings is not needed any more."
+    )
+  end
 
   # Profiling
   #

From 47bde1e77ca88b285c5eb1f1a3c3f0687f1ebb2f Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Wed, 12 Aug 2020 00:50:03 +1000
Subject: [PATCH 304/340] Updating translations for config/locales/tr.yml

---
 config/locales/tr.yml | 54 +++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 3639a737bc..5cb6832077 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -273,6 +273,9 @@ tr:
   on hand: "Mevcut"
   ship: "Teslimat"
   shipping_category: "Teslimat KategOrİSİ"
+  height: "Boy"
+  width: "En"
+  depth: "Boy"
   actions:
     create_and_add_another: "Oluştur ve Yeni Ekle"
     create: "Oluştur"
@@ -431,7 +434,7 @@ tr:
       enterprise_role:
         manages: yönetir
     products:
-      unit_name_placeholder: 'örn. demet'
+      unit_name_placeholder: 'Örn. demet'
       index:
         unit: Birim
         display_as: Gösterme Şekli
@@ -634,12 +637,12 @@ tr:
           name: Ad
           name_placeholder: Örn. Toprak Güneş
           email_address: E-posta Adresi
-          email_address_placeholder: Örn. siparis@yesilciftlik.com
+          email_address_placeholder: Örn. siparis@ciftlik.com
           email_address_tip: "Bu e-posta adresi profilinizde görüntülenecek"
           phone: Telefon
           phone_placeholder: Örn. 0532 123 00 01
           website: İnternet sitesi
-          website_placeholder: 'Örn: www.yesilciftlik.com'
+          website_placeholder: Örn. www.ciftlik.com
         enterprise_fees:
           name: Ad
           fee_type: Ücret Türü
@@ -735,8 +738,8 @@ tr:
           open_date: "AÇILIŞ TARİHİ"
           close_date: "KAPANIŞ TARİHİ"
         social:
-          twitter_placeholder: "Örneğin. @the_usta"
-          instagram_placeholder: "Örneğin. the_usta"
+          twitter_placeholder: "Örn.  @the_usta"
+          instagram_placeholder: "Örn. ciftlik   (başına @ işareti koymayınız)"
           facebook_placeholder: "Örn: www.facebook.com/TurkiyeKoop"
           linkedin_placeholder: "Örn: www.linkedin.com/in/adınızsoyadınız"
         stripe_connect:
@@ -1311,6 +1314,8 @@ tr:
   cart_updating: "Sepet güncelleniyor ..."
   cart_empty: "Sepetiniz boş"
   cart_edit: "Sepetinizi düzenleyin"
+  item: "Ürün"
+  qty: "Miktar"
   card_number: Kart numarası
   card_securitycode: "Güvenlik Kodu"
   card_expiry_date: Son kullanma tarihi
@@ -1370,8 +1375,8 @@ tr:
       cookies_policy_link: "çerezler politikası"
       cookies_accept_button: "Çerezleri kabul et"
   home_shop: 'ALIŞVERİŞE BAŞLAYIN '
-  brandstory_headline: "Bağımsız, adil ve temiz gıda ..."
-  brandstory_intro: "Bazen sistemi düzeltmenin en iyi yolu yeni bir sistem yaratmaktır…"
+  brandstory_headline: "Yerel, adil ve temiz gıda."
+  brandstory_intro: "Eğer sistemi düzeltemiyorsak en iyi yol yeni bir sistem yaratmaktır."
   brandstory_part1: "Açık Gıda Ağı, adil, temiz bir gıda sistemi oluşturmak için tasarlanan bir sosyal girişim projesidir. Üretici ve türeticilerin bir araya gelerek aracısız bir gıda düzeni ile her açıdan daha sağlıklı bir toplum yaratmaları için çözümler sunar. Toplum yararına çalışır, iletişim, dürüstlük ve dayanışmayı destekler."
   brandstory_part2: "AGA, üreticilere ve alıcılara aracısız ticaret faydaları sağlar ve toplumsal iletişimi ve güveni cesaretlendirir. Gıda yetiştiriciliği ve satışının kendine özgü ihtiyaçlarını karşılamak için geliştirilmiştir. Temiz gıdaya ulaşım sürecini kolaylaştırır."
   brandstory_part3: "Platform üzerinden yalnızca yerel ve bağımsız gıda üreticileri ve dağıtımcıları satış yapabilir. Siz de ürünlerinizi AGA üzerinden oluşturduğunuz dükan ile doğrudan alıcılara ulaştırabilir, dilerseniz bölgenizdeki diğer üreticiler ile bir araya gelerek kendi ortak 'Üretici Pazarı' veya 'Türetici Pazarı' nızı oluşturabilirsiniz. Bu şekilde çeşitliliği ve bereketi artırır, dayanışmanın getirdiği faydalardan da yararlanabilirsiniz."
@@ -1872,15 +1877,15 @@ tr:
         enterprise_final_step: "Son adım!"
         enterprise_social_text: "Kişiler %{enterprise}' nasıl çevrimiçi bulabilir?"
         website: "İnternet sitesi"
-        website_placeholder: "Örneğin. yesilciftlik.com"
+        website_placeholder: "Örn. ciftlik.com"
         facebook: "Facebook"
-        facebook_placeholder: "Örneğin. www.facebook.com/SayfaAdı"
+        facebook_placeholder: "Örn. www.facebook.com/Ciftlik"
         linkedin: "LinkedIn"
-        linkedin_placeholder: "Örneğin. www.linkedin.com/Adınız"
+        linkedin_placeholder: "Örn. www.linkedin.com/Adınız"
         twitter: "Twitter"
-        twitter_placeholder: "Örneğin. @twitter_ciftlik"
+        twitter_placeholder: "Örn. @twitter_ciftlik"
         instagram: "Instagram"
-        instagram_placeholder: "Örneğin. @instagram_ciftlik"
+        instagram_placeholder: "Örn. @instagram_ciftlik"
       limit_reached:
         headline: "Hayır!"
         message: "Sınıra ulaştınız!"
@@ -1947,17 +1952,17 @@ tr:
   admin_enterprise_groups_data_powertip_logo: "Grubun logosu"
   admin_enterprise_groups_data_powertip_promo_image: "Bu resim grup profilinin üstünde görüntülenir"
   admin_enterprise_groups_contact: "İLETİŞİM"
-  admin_enterprise_groups_contact_phone_placeholder: "Örneğin. 532 100 05 01"
-  admin_enterprise_groups_contact_address1_placeholder: "Örneğin. 123 Cadde"
+  admin_enterprise_groups_contact_phone_placeholder: "Örn. 532 100 05 01"
+  admin_enterprise_groups_contact_address1_placeholder: "Örn. 123 Cadde"
   admin_enterprise_groups_contact_city: "İlçe"
-  admin_enterprise_groups_contact_city_placeholder: "Örneğin. Kadıköy"
+  admin_enterprise_groups_contact_city_placeholder: "Örn. Kadıköy"
   admin_enterprise_groups_contact_zipcode: "Posta kodu"
   admin_enterprise_groups_contact_zipcode_placeholder: "Örn. 34000"
   admin_enterprise_groups_contact_state_id: "Şehir"
   admin_enterprise_groups_contact_country_id: "Ülke"
   admin_enterprise_groups_web: "Web Kaynakları"
-  admin_enterprise_groups_web_twitter: "Örneğin. @the_prof"
-  admin_enterprise_groups_web_website_placeholder: "Örneğin. www.ciftlik.com"
+  admin_enterprise_groups_web_twitter: "Örn. @the_ciftlik"
+  admin_enterprise_groups_web_website_placeholder: "Örn. www.ciftlik.com"
   admin_order_cycles: "Yönetici Sipariş Dönemleri"
   open: "AÇILIŞ"
   close: "KAPANIŞ"
@@ -2464,9 +2469,9 @@ tr:
               adına sipariş ve teslimatları yönetebilir, adil ve temiz gıdayı nihai
               tüketiciler ile buluşturmaya yardımcı olabilirler.
           producer_desc: Gıda üreticileri
-          producer_example: 'Örn: ÇİFTÇİLER, FIRINLAR, ÜRETİM KOOPERATİFLERİ vs.'
+          producer_example: Örn. ÇİFTÇİLER, FIRINLAR, ÜRETİM KOOPERATİFLERİ vs.
           non_producer_desc: Diğer tüm gıda işletmeleri
-          non_producer_example: 'Örn: Manavlar, Gıda Kooperatifleri, Gıda Toplulukları vs.'
+          non_producer_example: Örn. Dükkanlar, Gıda Kooperatifleri, Gıda Toplulukları vs.
         enterprise_status:
           status_title: "%{name} kuruldu ve başlamaya hazır!"
           severity: ÖNEM
@@ -3198,7 +3203,7 @@ tr:
           product_description: "Ürün Açıklaması"
           image: "Görsel"
           or: "veya"
-        unit_name_placeholder: 'Örneğin. demet'
+        unit_name_placeholder: 'Örn. Demet'
         index:
           header:
             title: Ürünleri Toplu Düzenleme
@@ -3276,8 +3281,8 @@ tr:
           price: "Fiyat"
           display_as: "Gösterme Şekli"
           display_name: "Ekran adı"
-          display_as_placeholder: 'örn. 2 kg'
-          display_name_placeholder: 'örn. Domates'
+          display_as_placeholder: 'Örn. 2 kg'
+          display_name_placeholder: 'Örn. Domates'
         autocomplete:
           out_of_stock: "Stokta Yok"
           producer_name: "Üretici"
@@ -3380,6 +3385,11 @@ tr:
         thanks: "İş birliğiniz için teşekkür ederim."
         track_information: "Takip Bilgileri: %{tracking}"
         track_link: "Takip Bağlantısı: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Tebrikler!"
+        message: "Bu maili teslim aldıysanız e-posta ayarlarınız doğru yapılmıştır demektir."
+        subject: "Test Maili"
     order_state:
       address: adres
       adjustments: düzenlemeler

From 99ca0adf64edc7b0f1be3509f1bebf4be5914175 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 12 Aug 2020 13:10:51 +1000
Subject: [PATCH 305/340] Remove unused dependency diffy

It was used to show differences in the product cache. But we removed the
cache in ab330e882eb1745606739bbbdcd14205ed8b4ad7 and the gem hasn't
been used since.
---
 Gemfile      | 1 -
 Gemfile.lock | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d18f0fab6d..797bcd19c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -86,7 +86,6 @@ gem 'acts-as-taggable-on', '~> 4.0'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'diffy'
 gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 02edc76995..ae96188548 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -229,7 +229,6 @@ GEM
     devise-token_authenticatable (0.4.10)
       devise (>= 3.5.2, < 4.0.0)
     diff-lcs (1.3)
-    diffy (3.3.0)
     docile (1.3.2)
     dry-inflector (0.1.2)
     erubis (2.7.0)
@@ -743,7 +742,6 @@ DEPENDENCIES
   devise-encryptable
   devise-token_authenticatable (~> 0.4.10)
   dfc_provider!
-  diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails (= 4.10.0)
   ffaker (~> 1.16)

From 95e048b37f7e65ffe7a954de3863f04e1fb921c4 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Thu, 13 Aug 2020 02:50:37 +1000
Subject: [PATCH 306/340] Updating translations for config/locales/en_CA.yml

---
 config/locales/en_CA.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index e1a06b250b..658cbcf1d4 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -14,6 +14,7 @@ en_CA:
       spree/payment:
         amount: Amount
         state: State
+        source: Source
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
@@ -272,6 +273,9 @@ en_CA:
   on hand: "On Hand"
   ship: "Ship"
   shipping_category: "Shipping Category"
+  height: "Height"
+  width: "Width"
+  depth: "Depth"
   actions:
     create_and_add_another: "Create and Add Another"
     create: "Create"
@@ -1310,6 +1314,8 @@ en_CA:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
@@ -1965,6 +1971,7 @@ en_CA:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  permalink: "Permalink"
   shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
@@ -2062,6 +2069,7 @@ en_CA:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  shipping_method: "Shipping method"
   new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
@@ -3174,6 +3182,8 @@ en_CA:
           stripe:
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
+          paypal:
+            no_payment_via_admin_backend: Paypal payments cannot be captured in the backoffice.
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:
@@ -3372,6 +3382,11 @@ en_CA:
         thanks: "Thank you for your business."
         track_information: "Tracking Information: %{tracking}"
         track_link: "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulations!"
+        message: "If you have received this email,  then your OFN email settings are correct."
+        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments

From c75a864ff2e5cb371fb76c6ab4af3bd946cfa013 Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Wed, 12 Aug 2020 12:21:07 -0700
Subject: [PATCH 307/340] link to the enterprise's shop instead of a full map

---
 .../spree/admin/overview/single_enterprise_dashboard.html.haml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml
index caa8e925c4..116fe2a550 100644
--- a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml
+++ b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml
@@ -42,8 +42,7 @@
       %p
         = t "on_ofn_map"
     .list
-      /-# Can we pass an anchor here to zoom to our enterprise?
-      %a.button.bottom{href: main_app.map_path, target: '_blank'}
+      %a.button.bottom{href: main_app.enterprise_shop_url(@enterprise), target: '_blank'}
         = t "see"
         = @enterprise.name
         = t "live"

From d46fad3a02ecc99c779d144c850bbc98b6b6a932 Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Wed, 12 Aug 2020 12:33:15 -0700
Subject: [PATCH 308/340] remove map reference

---
 .../admin/overview/single_enterprise_dashboard.html.haml      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml
index 116fe2a550..e53f9e436e 100644
--- a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml
+++ b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml
@@ -37,10 +37,8 @@
   .alpha.seven.columns.dashboard_item.single-ent#map
     .header
       %h3
-        %span.icon-map-marker
+        %span.icon-user
         = t "your_profil_live"
-      %p
-        = t "on_ofn_map"
     .list
       %a.button.bottom{href: main_app.enterprise_shop_url(@enterprise), target: '_blank'}
         = t "see"

From 7c223a43fcc624247ebcb31e0660a07b331c3fca Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Wed, 12 Aug 2020 12:59:38 -0700
Subject: [PATCH 309/340] remove unused key from en.yml

---
 config/locales/en.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6177ff03e6..f0b90a8e74 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -84,7 +84,7 @@ en:
       messages:
         inclusion: "is not included in the list"
       models:
-        order_management/subscriptions/validator:          
+        order_management/subscriptions/validator:
           attributes:
             subscription_line_items:
               at_least_one_product: "^Please add at least one product"
@@ -2182,7 +2182,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   spree_user_enterprise_limit_error: "^%{email} is not permitted to own any more enterprises (limit is %{enterprise_limit})."
   spree_variant_product_error: must have at least one variant
   your_profil_live: "Your profile live"
-  on_ofn_map: "on the Open Food Network map"
   see: "See"
   live: "live"
   manage: "Manage"

From 271d1ec1036710bddfc2ea138b0298cc7a700f3f Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 13 Aug 2020 10:52:55 +1000
Subject: [PATCH 310/340] Update translations from Transifex

---
 config/locales/ar.yml     | 2 ++
 config/locales/ca.yml     | 2 ++
 config/locales/de_DE.yml  | 2 ++
 config/locales/en_AU.yml  | 2 ++
 config/locales/en_BE.yml  | 2 ++
 config/locales/en_DE.yml  | 2 ++
 config/locales/en_FR.yml  | 2 ++
 config/locales/en_GB.yml  | 2 ++
 config/locales/en_IE.yml  | 2 ++
 config/locales/en_IN.yml  | 2 ++
 config/locales/en_NZ.yml  | 2 ++
 config/locales/en_PH.yml  | 2 ++
 config/locales/en_ZA.yml  | 2 ++
 config/locales/es.yml     | 2 ++
 config/locales/es_CR.yml  | 2 ++
 config/locales/fil_PH.yml | 2 ++
 config/locales/fr_BE.yml  | 2 ++
 config/locales/fr_CA.yml  | 2 ++
 config/locales/it.yml     | 2 ++
 config/locales/nb.yml     | 2 ++
 config/locales/nl_BE.yml  | 2 ++
 config/locales/pt.yml     | 2 ++
 config/locales/pt_BR.yml  | 2 ++
 config/locales/sv.yml     | 2 ++
 config/locales/tr.yml     | 6 +++---
 25 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index fa8510a3d7..9659e0eb16 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1287,6 +1287,8 @@ ar:
   cart_updating: "جارٍ تحديث العربة ..."
   cart_empty: "السلة فارغة"
   cart_edit: "تعديل عربة التسوق"
+  item: "بند"
+  qty: "الكمية"
   card_number: رقم البطاقة
   card_securitycode: "رمز الحماية"
   card_expiry_date: تاريخ الانتهاء
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 77f02af74c..1644f0cdb0 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1317,6 +1317,8 @@ ca:
   cart_updating: "Actualitzant la cistella..."
   cart_empty: "Cistella buida"
   cart_edit: "Edita la teva cistella"
+  item: "Article"
+  qty: "quant."
   card_number: Número de targeta
   card_securitycode: "Codi de seguretat"
   card_expiry_date: Data de caducitat
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 827850fefe..06e334a22a 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -1292,6 +1292,8 @@ de_DE:
   cart_updating: "Warenkorb aktualisieren..."
   cart_empty: "Warenkorb leer"
   cart_edit: "Warenkorb bearbeiten"
+  item: "Artikel"
+  qty: "Menge"
   card_number: Kartennummer
   card_securitycode: "Sicherheitscode"
   card_expiry_date: Ablaufdatum
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
index e2870ac449..276534010f 100644
--- a/config/locales/en_AU.yml
+++ b/config/locales/en_AU.yml
@@ -1291,6 +1291,8 @@ en_AU:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml
index eb4fe37c28..e68a2db4ab 100644
--- a/config/locales/en_BE.yml
+++ b/config/locales/en_BE.yml
@@ -1252,6 +1252,8 @@ en_BE:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index 12d0eed27a..c854c60e94 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -1262,6 +1262,8 @@ en_DE:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index 878adadb55..833ae09d47 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -1314,6 +1314,8 @@ en_FR:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 9ca46758e3..78c5755ee4 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -1310,6 +1310,8 @@ en_GB:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_IE.yml b/config/locales/en_IE.yml
index acba252f19..2e248b867b 100644
--- a/config/locales/en_IE.yml
+++ b/config/locales/en_IE.yml
@@ -1309,6 +1309,8 @@ en_IE:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_IN.yml b/config/locales/en_IN.yml
index 0a03177aec..75a7047ad3 100644
--- a/config/locales/en_IN.yml
+++ b/config/locales/en_IN.yml
@@ -1310,6 +1310,8 @@ en_IN:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index e38b224f74..a19889ff93 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -1310,6 +1310,8 @@ en_NZ:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_PH.yml b/config/locales/en_PH.yml
index 0e45bef317..25c7dbbe71 100644
--- a/config/locales/en_PH.yml
+++ b/config/locales/en_PH.yml
@@ -1293,6 +1293,8 @@ en_PH:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml
index b46ded3e6c..e35379630c 100644
--- a/config/locales/en_ZA.yml
+++ b/config/locales/en_ZA.yml
@@ -1299,6 +1299,8 @@ en_ZA:
   cart_updating: "Updating cart..."
   cart_empty: "Cart empty"
   cart_edit: "Edit your cart"
+  item: "Item"
+  qty: "Qty"
   card_number: Card Number
   card_securitycode: "Security Code"
   card_expiry_date: Expiry Date
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 72dbbb7476..111960a8ae 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1316,6 +1316,8 @@ es:
   cart_updating: "Actualizando el carrito..."
   cart_empty: "Carrito vacío"
   cart_edit: "Editar carrito"
+  item: "Artículo"
+  qty: "Cantidad"
   card_number: Número de tarjeta
   card_securitycode: "Código de seguridad"
   card_expiry_date: Fecha de expiración
diff --git a/config/locales/es_CR.yml b/config/locales/es_CR.yml
index e9ed32698b..fd81f7dc12 100644
--- a/config/locales/es_CR.yml
+++ b/config/locales/es_CR.yml
@@ -1296,6 +1296,8 @@ es_CR:
   cart_updating: "Actualizando el carrito..."
   cart_empty: "Carrito vacío"
   cart_edit: "Editar carrito"
+  item: "Artículo"
+  qty: "Cantidad"
   card_number: Número de tarjeta
   card_securitycode: "Código de seguridad"
   card_expiry_date: Fecha de expiración
diff --git a/config/locales/fil_PH.yml b/config/locales/fil_PH.yml
index b5bdb71f93..a22b91439c 100644
--- a/config/locales/fil_PH.yml
+++ b/config/locales/fil_PH.yml
@@ -1296,6 +1296,8 @@ fil_PH:
   cart_updating: "ina-update ang cart"
   cart_empty: "walang laman ang cart"
   cart_edit: "i-edit ang cart"
+  item: "Item"
+  qty: "Dami"
   card_number: numero ng card
   card_securitycode: "Security code"
   card_expiry_date: petsa ng pag-expire
diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml
index c87a36c9da..0cda69808c 100644
--- a/config/locales/fr_BE.yml
+++ b/config/locales/fr_BE.yml
@@ -1299,6 +1299,8 @@ fr_BE:
   cart_updating: "Mettre à jour le panier"
   cart_empty: "Panier vide"
   cart_edit: "Modifier votre panier"
+  item: "Produit"
+  qty: "Qté"
   card_number: Numéro de carte
   card_securitycode: "Cryptogramme visuel"
   card_expiry_date: Date d'expiration
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 0ad10aa41a..9fd489c31a 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -1312,6 +1312,8 @@ fr_CA:
   cart_updating: "Mettre à jour le panier"
   cart_empty: "Panier vide"
   cart_edit: "Modifier votre panier"
+  item: "Produit"
+  qty: "Qté"
   card_number: Numéro de carte
   card_securitycode: "Cryptogramme visuel"
   card_expiry_date: Date d'expiration
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 52ed76ce8f..6b1c036ebe 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1311,6 +1311,8 @@ it:
   cart_updating: "Aggiornamento del carrello..."
   cart_empty: "Carrello vuoto"
   cart_edit: "Modifica il tuo carrello"
+  item: "Articolo"
+  qty: "Qtà"
   card_number: Numero della carta
   card_securitycode: "Codice di sicurezza"
   card_expiry_date: Data di scadenza
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 08f365af9b..2a7b0b4e14 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1311,6 +1311,8 @@ nb:
   cart_updating: "Oppdaterer handlekurv..."
   cart_empty: "Handlekurven er tom"
   cart_edit: "Rediger handlekurv"
+  item: "Vare"
+  qty: "Antall"
   card_number: Kortnummer
   card_securitycode: "Sikkerhetskode"
   card_expiry_date: Utløpsdato
diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml
index 20c35831f2..52ee2cf0eb 100644
--- a/config/locales/nl_BE.yml
+++ b/config/locales/nl_BE.yml
@@ -1255,6 +1255,8 @@ nl_BE:
   cart_updating: "winkelwagentje wordt geüpdatet..."
   cart_empty: "Winkelwagentje is leeg"
   cart_edit: "Pas je winkelwagentje aan"
+  item: "Artikel"
+  qty: "Aantal"
   card_number: Kaartnummer
   card_securitycode: "Veiligheidscode"
   card_expiry_date: Vervaldatum
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index e80d88a608..bd70c0746e 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1229,6 +1229,8 @@ pt:
   cart_updating: "Atualizando carrinho"
   cart_empty: "Carrinho vazio"
   cart_edit: "Edite o seu carrinho"
+  item: "Item"
+  qty: "Qtd"
   card_number: Número do Cartão
   card_securitycode: "Código de Segurança"
   card_expiry_date: Data de Vencimento
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 27229839b8..4d46bb192c 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -1303,6 +1303,8 @@ pt_BR:
   cart_updating: "Atualizando carrinho"
   cart_empty: "Carrinho vazio"
   cart_edit: "Edite seu carrinho"
+  item: "Ítem"
+  qty: "Qtd"
   card_number: Número do Cartão
   card_securitycode: "Código de Segurança"
   card_expiry_date: Data de Vencimento
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index ed853e0697..96d65d324e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -753,6 +753,8 @@ sv:
   cart_updating: "Uppdatera din varukorg"
   cart_empty: "Tom varukorg"
   cart_edit: "Redigera din varukorg "
+  item: "Vara"
+  qty: "Kvantitet"
   card_number: Kortnummer
   card_securitycode: "Säkerhetskod"
   card_expiry_date: Förfallodatum
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 5cb6832077..7c28526310 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1909,7 +1909,7 @@ tr:
   follow: "TAKİP ET"
   shop_for_products_html: "<span class=\"turquoise\">%{enterprise}</span> ÜRÜNLERİNİ SATIN ALIN:"
   change_shop: "Dükkanı şuna değiştir:"
-  shop_at: "Şimdi alışveriş yapın:"
+  shop_at: "ŞİMDİ ALIŞVERİŞ YAPIN:"
   price_breakdown: "Fiyat dökümü"
   admin_fee: "Yönetim Ücreti"
   sales_fee: "Satış Ücreti"
@@ -1965,7 +1965,7 @@ tr:
   admin_enterprise_groups_web_website_placeholder: "Örn. www.ciftlik.com"
   admin_order_cycles: "Yönetici Sipariş Dönemleri"
   open: "AÇILIŞ"
-  close: "KAPANIŞ"
+  close: "Kapat"
   create: "Oluştur"
   search: "Ara"
   supplier: "Tedarikçi"
@@ -3378,7 +3378,7 @@ tr:
         subject: "Lütfen AGA hesabınızı onaylayın"
     shipment_mailer:
       shipped_email:
-        dear_customer: "Değerli müşterimiz,"
+        dear_customer: "Değerli Müşterimiz,"
         instructions: "Siparişiniz gönderildi"
         shipment_summary: "Teslimat Özeti"
         subject: "TESLİMAT BİLDİRİMİ"

From 5c6cb4840e9075c44a7bb81ab9311080ac1bd1ab Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 13 Aug 2020 01:56:14 +0000
Subject: [PATCH 311/340] Bump bugsnag from 6.15.0 to 6.16.0

Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.15.0 to 6.16.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.15.0...v6.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 02edc76995..0d664803a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,7 +148,7 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt (3.1.13)
-    bugsnag (6.15.0)
+    bugsnag (6.16.0)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
     byebug (11.0.1)
@@ -192,7 +192,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     css_parser (1.7.1)

From 63a9765feaec7a4dd3ad7daaeaea3878caea35c4 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 13 Aug 2020 16:33:47 +1000
Subject: [PATCH 312/340] Update rubocop todo lists

---
 .rubocop_manual_todo.yml |  37 +++++
 .rubocop_todo.yml        | 312 ++++++++++++++++++++++++++++-----------
 2 files changed, 261 insertions(+), 88 deletions(-)

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index 286b945692..96493448e2 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -321,6 +321,15 @@ Layout/LineLength:
   - spec/support/request/shop_workflow.rb
   - spec/support/request/web_helper.rb
   - spec/support/seeds.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - spec/controllers/base_controller2_spec.rb
+  - spec/features/consumer/caching/darkswarm_caching_spec.rb
+  - spec/models/calculator/flexi_rate_spec.rb
+  - spec/models/calculator/price_sack_spec.rb
+  - spec/models/spree/stock_item_spec.rb
+  - spec/requests/api/orders_spec.rb
+  - spec/swagger_helper.rb
+  - spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
 
 Metrics/AbcSize:
   Max: 15
@@ -444,6 +453,11 @@ Metrics/AbcSize:
   - spec/models/product_importer_spec.rb
   - spec/services/order_checkout_restart_spec.rb
   - spec/support/performance_helper.rb
+  - app/controllers/application_controller.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/BlockLength:
   Max: 25
@@ -482,6 +496,10 @@ Metrics/BlockLength:
   - spec/support/delayed_job_helper.rb
   - spec/support/matchers/select2_matchers.rb
   - spec/support/matchers/table_matchers.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - spec/requests/api/orders_spec.rb
+  - spec/swagger_helper.rb
 
 Metrics/CyclomaticComplexity:
   Max: 6
@@ -513,6 +531,9 @@ Metrics/CyclomaticComplexity:
   - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/PerceivedComplexity:
   Max: 7
@@ -539,6 +560,8 @@ Metrics/PerceivedComplexity:
   - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
+  - app/models/spree/order/checkout.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/MethodLength:
   Max: 10
@@ -645,6 +668,11 @@ Metrics/MethodLength:
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/models/product_importer_spec.rb
   - spec/support/request/authentication_helper.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb
 
 Metrics/ClassLength:
   Max: 100
@@ -686,6 +714,8 @@ Metrics/ClassLength:
   - lib/open_food_network/permissions.rb
   - lib/open_food_network/users_and_enterprises_report.rb
   - lib/open_food_network/xero_invoices_report.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/ModuleLength:
   Max: 100
@@ -728,6 +758,8 @@ Metrics/ModuleLength:
   - spec/models/spree/variant_spec.rb
   - spec/services/permissions/order_spec.rb
   - spec/support/request/web_helper.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
 
 Metrics/ParameterLists:
   Max: 5
@@ -736,3 +768,8 @@ Metrics/ParameterLists:
   - app/models/product_import/entry_processor.rb
   - lib/open_food_network/xero_invoices_report.rb
   - spec/features/admin/reports_spec.rb
+
+Lint/UselessAssignment:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/spree/core/controller_helpers/common.rb'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c88c48b817..e95d9e89c6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,79 +1,214 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2020-06-22 13:28:10 +0100 using RuboCop version 0.81.0.
+# on 2020-08-13 16:05:53 +1000 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 139
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'spec/models/spree/order/checkout_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
+  Exclude:
+    - 'spec/models/spree/order/checkout_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Layout/FirstArrayElementIndentation:
+  Exclude:
+    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Layout/FirstHashElementIndentation:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/swagger_helper.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: normal, indented_internal_methods
+Layout/IndentationConsistency:
+  Exclude:
+    - 'spec/models/spree/order/checkout_spec.rb'
+
+# Offense count: 26
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 268
+  Max: 409
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineHashBraceLayout:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+    - 'spec/services/checkout/form_data_adapter_spec.rb'
+    - 'spec/services/user_locale_setter_spec.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'spec/controllers/base_controller2_spec.rb'
+    - 'spec/features/consumer/shopping/shopping_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
 
 # Offense count: 2
 Lint/DuplicateMethods:
   Exclude:
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 9
+# Offense count: 8
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/models/spree/user.rb'
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
 
-# Offense count: 5
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
+
+# Offense count: 3
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
-    - 'lib/open_food_network/reports/bulk_coop_report.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
-
-# Offense count: 6
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 37
 
 # Offense count: 1
+Lint/UselessAssignment:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/spree/core/controller_helpers/common.rb'
+
+# Offense count: 19
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 126
+
+# Offense count: 7
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 27
+  Max: 102
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 101
+  Max: 231
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 23
 
-# Offense count: 6
+# Offense count: 19
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 20
+  Max: 140
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 121
+  Max: 208
 
-# Offense count: 8
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 24
+
+# Offense count: 9
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/spree/admin/taxonomies_controller.rb'
     - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
+    - 'lib/spree/core/controller_helpers/common.rb'
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/web_helper.rb'
 
@@ -117,6 +252,15 @@ Naming/PredicateName:
     - 'lib/open_food_network/packing_report.rb'
     - 'lib/tasks/data.rake'
 
+# Offense count: 7
+# Cop supports --auto-correct.
+Rails/ActiveRecordAliases:
+  Exclude:
+    - 'spec/controllers/line_items_controller_spec.rb'
+    - 'spec/controllers/spree/orders_controller_spec.rb'
+    - 'spec/features/consumer/shopping/orders_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -124,6 +268,13 @@ Rails/Date:
   Exclude:
     - 'app/models/order_cycle.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforceForPrefixed.
+Rails/Delegate:
+  Exclude:
+    - 'engines/order_management/app/services/order_management/reports/bulk_coop/renderers/html_renderer.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Whitelist.
@@ -150,7 +301,7 @@ Rails/FilePath:
     - 'spec/serializers/api/admin/enterprise_serializer_spec.rb'
     - 'spec/support/downloads_helper.rb'
 
-# Offense count: 7
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -160,15 +311,17 @@ Rails/FindBy:
     - 'app/models/product_import/entry_processor.rb'
     - 'app/models/product_import/entry_validator.rb'
     - 'app/models/product_import/spreadsheet_data.rb'
+    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/user.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/FindEach:
   Exclude:
     - 'app/models/spree/order_decorator.rb'
+    - 'app/models/spree/shipment.rb'
 
 # Offense count: 5
 # Configuration parameters: Include.
@@ -180,7 +333,7 @@ Rails/HasAndBelongsToMany:
     - 'app/models/spree/concerns/payment_method_distributors.rb'
     - 'app/models/spree/line_item_decorator.rb'
 
-# Offense count: 25
+# Offense count: 26
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -192,6 +345,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment_method_decorator.rb'
     - 'app/models/spree/property.rb'
+    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
@@ -268,7 +422,7 @@ Rails/ReflectionClassName:
     - 'app/models/enterprise_role.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 227
+# Offense count: 233
 # Configuration parameters: Blacklist, Whitelist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
@@ -287,7 +441,8 @@ Rails/SkipsModelValidations:
     - 'app/models/spree/address_decorator.rb'
     - 'app/models/spree/credit_card_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_decorator.rb'
+    - 'app/models/spree/payment.rb'
+    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/subscription.rb'
     - 'app/models/variant_override.rb'
@@ -355,27 +510,22 @@ Rails/SkipsModelValidations:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
   Exclude:
     - 'app/models/customer.rb'
     - 'app/models/exchange.rb'
-
-# Offense count: 2
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UniqueValidationWithoutIndex:
-  Exclude:
     - 'app/models/spree/stock_item.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: Environments.
 # Environments: development, test, production
 Rails/UnknownEnv:
   Exclude:
     - 'app/models/spree/app_configuration_decorator.rb'
+    - 'lib/spree/core/controller_helpers/ssl.rb'
 
 # Offense count: 2
 Style/CaseEquality:
@@ -383,7 +533,7 @@ Style/CaseEquality:
     - 'app/helpers/angular_form_helper.rb'
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 75
+# Offense count: 71
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -447,13 +597,9 @@ Style/ClassAndModuleChildren:
     - 'app/serializers/api/property_serializer.rb'
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'app/serializers/api/state_serializer.rb'
-    - 'app/serializers/api/taxon_image_serializer.rb'
     - 'app/serializers/api/taxon_serializer.rb'
     - 'app/serializers/api/variant_serializer.rb'
     - 'lib/open_food_network/locking.rb'
-    - 'lib/open_food_network/reports/bulk_coop_allocation_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
     - 'lib/open_food_network/reports/report.rb'
     - 'lib/open_food_network/reports/row.rb'
     - 'lib/open_food_network/reports/rule.rb'
@@ -475,7 +621,7 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
 
-# Offense count: 874
+# Offense count: 847
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -569,7 +715,6 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/variants_controller.rb'
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/credit_cards_controller.rb'
-    - 'app/controllers/spree/home_controller.rb'
     - 'app/controllers/spree/orders_controller.rb'
     - 'app/controllers/spree/store_controller.rb'
     - 'app/controllers/spree/user_passwords_controller.rb'
@@ -624,8 +769,6 @@ Style/FrozenStringLiteralComment:
     - 'app/jobs/subscription_placement_job.rb'
     - 'app/jobs/welcome_enterprise_job.rb'
     - 'app/mailers/enterprise_mailer.rb'
-    - 'app/mailers/spree/base_mailer_decorator.rb'
-    - 'app/mailers/spree/order_mailer_decorator.rb'
     - 'app/mailers/spree/user_mailer.rb'
     - 'app/mailers/subscription_mailer.rb'
     - 'app/models/adjustment_metadata.rb'
@@ -684,12 +827,6 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/address_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/flat_percent_item_total_decorator.rb'
-    - 'app/models/spree/calculator/flat_rate_decorator.rb'
-    - 'app/models/spree/calculator/flexi_rate_decorator.rb'
-    - 'app/models/spree/calculator/per_item_decorator.rb'
-    - 'app/models/spree/calculator/price_sack_decorator.rb'
     - 'app/models/spree/calculator_decorator.rb'
     - 'app/models/spree/classification_decorator.rb'
     - 'app/models/spree/concerns/payment_method_distributors.rb'
@@ -702,7 +839,6 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/option_type_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_decorator.rb'
     - 'app/models/spree/payment_method_decorator.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
     - 'app/models/spree/price_decorator.rb'
@@ -711,15 +847,12 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/product_property_decorator.rb'
     - 'app/models/spree/product_set.rb'
     - 'app/models/spree/property.rb'
-    - 'app/models/spree/shipment_decorator.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
-    - 'app/models/spree/stock/availability_validator_decorator.rb'
     - 'app/models/spree/stock_location_decorator.rb'
     - 'app/models/spree/tax_rate_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
-    - 'app/models/stock/package.rb'
     - 'app/models/stripe_account.rb'
     - 'app/models/subscription.rb'
     - 'app/models/subscription_line_item.rb'
@@ -803,7 +936,6 @@ Style/FrozenStringLiteralComment:
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'app/serializers/api/shop_for_orders_serializer.rb'
     - 'app/serializers/api/state_serializer.rb'
-    - 'app/serializers/api/taxon_image_serializer.rb'
     - 'app/serializers/api/taxon_jstree_attribute_serializer.rb'
     - 'app/serializers/api/taxon_jstree_serializer.rb'
     - 'app/serializers/api/taxon_serializer.rb'
@@ -811,7 +943,6 @@ Style/FrozenStringLiteralComment:
     - 'app/serializers/api/user_serializer.rb'
     - 'app/serializers/api/variant_serializer.rb'
     - 'app/services/action_callbacks.rb'
-    - 'app/services/advance_order_service.rb'
     - 'app/services/bulk_invoice_service.rb'
     - 'app/services/cart_service.rb'
     - 'app/services/create_order_cycle.rb'
@@ -831,6 +962,7 @@ Style/FrozenStringLiteralComment:
     - 'app/services/order_factory.rb'
     - 'app/services/order_syncer.rb'
     - 'app/services/order_update_issues.rb'
+    - 'app/services/order_workflow.rb'
     - 'app/services/permissions/order.rb'
     - 'app/services/product_tag_rules_filterer.rb'
     - 'app/services/products_renderer.rb'
@@ -893,7 +1025,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/address_finder.rb'
     - 'lib/open_food_network/available_payment_method_filter.rb'
-    - 'lib/open_food_network/bulk_coop_report.rb'
     - 'lib/open_food_network/column_preference_defaults.rb'
     - 'lib/open_food_network/customers_report.rb'
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
@@ -928,9 +1059,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/referer_parser.rb'
-    - 'lib/open_food_network/reports/bulk_coop_allocation_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
     - 'lib/open_food_network/reports/line_items.rb'
     - 'lib/open_food_network/reports/list.rb'
     - 'lib/open_food_network/reports/report.rb'
@@ -949,9 +1077,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/spree/api/controller_setup.rb'
     - 'lib/spree/api/testing_support/setup.rb'
     - 'lib/spree/authentication_helpers.rb'
-    - 'lib/spree/core/controller_helpers/auth_decorator.rb'
-    - 'lib/spree/core/controller_helpers/order_decorator.rb'
-    - 'lib/spree/core/controller_helpers/respond_with_decorator.rb'
     - 'lib/spree/localized_number.rb'
     - 'lib/spree/money_decorator.rb'
     - 'lib/spree/product_filters.rb'
@@ -980,7 +1105,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/tasks/sample_data/user_factory.rb'
     - 'lib/tasks/specs.rake'
     - 'lib/tasks/users.rake'
-    - 'spec/config/application_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'
@@ -1011,9 +1135,9 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/api/taxonomies_controller_spec.rb'
     - 'spec/controllers/api/taxons_controller_spec.rb'
     - 'spec/controllers/api/variants_controller_spec.rb'
+    - 'spec/controllers/base_controller2_spec.rb'
     - 'spec/controllers/base_controller_spec.rb'
     - 'spec/controllers/cart_controller_spec.rb'
-    - 'spec/controllers/checkout_controller_concurrency_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/groups_controller_spec.rb'
@@ -1030,7 +1154,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/overview_controller_spec.rb'
     - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
-    - 'spec/controllers/spree/admin/payments_controller_spec.rb'
     - 'spec/controllers/spree/admin/products_controller_spec.rb'
     - 'spec/controllers/spree/admin/reports_controller_spec.rb'
     - 'spec/controllers/spree/admin/search_controller_spec.rb'
@@ -1039,7 +1162,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/spree/admin/variants_controller_spec.rb'
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/spree/orders_controller_spec.rb'
-    - 'spec/controllers/spree/store_controller_spec.rb'
     - 'spec/controllers/spree/user_sessions_controller_spec.rb'
     - 'spec/controllers/spree/users_controller_spec.rb'
     - 'spec/controllers/stripe/callbacks_controller_spec.rb'
@@ -1147,7 +1269,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/jobs/subscription_placement_job_spec.rb'
     - 'spec/jobs/welcome_enterprise_job_spec.rb'
     - 'spec/lib/open_food_network/address_finder_spec.rb'
-    - 'spec/lib/open_food_network/bulk_coop_report_spec.rb'
     - 'spec/lib/open_food_network/customers_report_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_applicator_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
@@ -1190,12 +1311,16 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/tasks/enterprises_rake_spec.rb'
     - 'spec/lib/tasks/users_rake_spec.rb'
     - 'spec/mailers/enterprise_mailer_spec.rb'
-    - 'spec/mailers/order_mailer_spec.rb'
     - 'spec/mailers/producer_mailer_spec.rb'
     - 'spec/mailers/subscription_mailer_spec.rb'
     - 'spec/mailers/user_mailer_spec.rb'
     - 'spec/models/adjustment_metadata_spec.rb'
+    - 'spec/models/calculator/flat_percent_item_total_spec.rb'
     - 'spec/models/calculator/flat_percent_per_item_spec.rb'
+    - 'spec/models/calculator/flat_rate_spec.rb'
+    - 'spec/models/calculator/flexi_rate_spec.rb'
+    - 'spec/models/calculator/per_item_spec.rb'
+    - 'spec/models/calculator/price_sack_spec.rb'
     - 'spec/models/calculator/weight_spec.rb'
     - 'spec/models/column_preference_spec.rb'
     - 'spec/models/concerns/order_shipment_spec.rb'
@@ -1221,11 +1346,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/ability_spec.rb'
     - 'spec/models/spree/addresses_spec.rb'
     - 'spec/models/spree/adjustment_spec.rb'
-    - 'spec/models/spree/calculator/flat_percent_item_total_spec.rb'
-    - 'spec/models/spree/calculator/flat_rate_spec.rb'
-    - 'spec/models/spree/calculator/flexi_rate_spec.rb'
-    - 'spec/models/spree/calculator/per_item_spec.rb'
-    - 'spec/models/spree/calculator/price_sack_spec.rb'
     - 'spec/models/spree/calculator_spec.rb'
     - 'spec/models/spree/classification_spec.rb'
     - 'spec/models/spree/credit_card_spec.rb'
@@ -1240,14 +1360,12 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/price_spec.rb'
     - 'spec/models/spree/product_set_spec.rb'
     - 'spec/models/spree/product_spec.rb'
-    - 'spec/models/spree/shipment_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/stock/availability_validator_spec.rb'
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/models/spree/taxon_spec.rb'
     - 'spec/models/spree/user_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
-    - 'spec/models/stock/package_spec.rb'
     - 'spec/models/stripe_account_spec.rb'
     - 'spec/models/subscription_line_item_spec.rb'
     - 'spec/models/subscription_spec.rb'
@@ -1289,7 +1407,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/serializers/api/product_serializer_spec.rb'
     - 'spec/serializers/api/shipping_method_serializer_spec.rb'
     - 'spec/serializers/api/variant_serializer_spec.rb'
-    - 'spec/services/advance_order_service_spec.rb'
     - 'spec/services/bulk_invoice_service_spec.rb'
     - 'spec/services/cart_service_spec.rb'
     - 'spec/services/default_shipping_category_spec.rb'
@@ -1305,6 +1422,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/services/order_cycle_warning_spec.rb'
     - 'spec/services/order_factory_spec.rb'
     - 'spec/services/order_syncer_spec.rb'
+    - 'spec/services/order_workflow_spec.rb'
     - 'spec/services/permissions/order_spec.rb'
     - 'spec/services/product_tag_rules_filterer_spec.rb'
     - 'spec/services/products_renderer_spec.rb'
@@ -1355,8 +1473,9 @@ Style/FrozenStringLiteralComment:
     - 'spec/validators/integer_array_validator_spec.rb'
     - 'spec/views/spree/admin/orders/edit.html.haml_spec.rb'
     - 'spec/views/spree/admin/orders/index.html.haml_spec.rb'
+    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
 
-# Offense count: 51
+# Offense count: 48
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -1376,32 +1495,35 @@ Style/GuardClause:
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
-    - 'app/services/advance_order_service.rb'
     - 'app/services/order_syncer.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/variant_and_line_item_naming.rb'
-    - 'lib/spree/core/controller_helpers/order_decorator.rb'
-    - 'lib/spree/core/controller_helpers/respond_with_decorator.rb'
     - 'spec/support/delayed_job_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
+# Offense count: 54
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
 # Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
     - 'app/helpers/application_helper.rb'
 
-# Offense count: 4
+# Offense count: 2
 Style/MixinUsage:
   Exclude:
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
-    - 'spec/lib/open_food_network/bulk_coop_report_spec.rb'
-    - 'spec/lib/open_food_network/order_cycle_management_report_spec.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
-# Offense count: 41
+# Offense count: 39
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -1416,11 +1538,9 @@ Style/NumericPredicate:
     - 'app/models/product_import/product_importer.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
     - 'app/models/spree/adjustment_decorator.rb'
-    - 'app/models/spree/calculator/flexi_rate_decorator.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/shipment_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/variant_override.rb'
     - 'app/services/cart_service.rb'
@@ -1433,6 +1553,22 @@ Style/NumericPredicate:
     - 'lib/spree/money_decorator.rb'
     - 'lib/tasks/sample_data.rake'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: compact, exploded
+Style/RaiseArgs:
+  Exclude:
+    - 'spec/controllers/checkout_controller_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/spree/core/controller_helpers/auth.rb'
+
 # Offense count: 231
 Style/Send:
   Exclude:

From 90bf4f312bdf624a38475bbacad639c91b836e19 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 12 Aug 2020 16:14:51 +1000
Subject: [PATCH 313/340] Document and spec current controller behaviour

When we imported and merged Spree's controller modules with our
decorators, Rails started using Spree's original code again.

This was first included in v3.2.0 and deployed on 28 July 2020.
---
 lib/spree/core/controller_helpers/order.rb |  4 ++
 spec/controllers/base_controller_spec.rb   | 64 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index 1df01e286a..afa609e975 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -6,6 +6,10 @@ module Spree
   module Core
     module ControllerHelpers
       module Order
+        # WARNING: This code seems to be overridden by Spree's original in:
+        #   spree_core/lib/spree/core/controller_helpers/order.rb
+        #
+        # None of our patches are active.
         def self.included(base)
           base.class_eval do
             helper_method :current_order
diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb
index ee7dcb4bcc..70fce385cd 100644
--- a/spec/controllers/base_controller_spec.rb
+++ b/spec/controllers/base_controller_spec.rb
@@ -9,6 +9,70 @@ describe BaseController, type: :controller do
     end
   end
 
+  describe "#current_order" do
+    let(:user) { create(:user) }
+
+    it "doesn't change anything without a user" do
+      expect {
+        get :index
+      }.to_not change { Spree::Order.count }
+    end
+
+    it "creates a new order" do
+      allow(controller).to receive(:try_spree_current_user).and_return(user)
+
+      expect {
+        get :index
+      }.to change { Spree::Order.count }.by(1)
+
+      expect(user.orders.count).to eq 1
+    end
+
+    it "uses the last incomplete order" do
+      last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
+      allow(controller).to receive(:try_spree_current_user).and_return(user)
+
+      expect {
+        get :index
+      }.to_not change { Spree::Order.count }
+
+      expect(session[:order_id]).to eq last_cart.id
+    end
+
+    # This behaviour comes from spree_core/lib/spree/core/controller_helpers/order.rb.
+    # It should be overridden by our lib/spree/core/controller_helpers/order.rb.
+    # But this test case proves that the original Spree logic is active.
+    #
+    # We originally overrode the Spree logic because merging orders from different
+    # shops was confusing. Incomplete orders would also re-appear after checkout,
+    # confusing as well.
+    #
+    # When we brought this code from Spree and merged it with our overrides,
+    # we accidentally started using Spree's version again.
+    it "merges the last incomplete order into the current one" do
+      last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
+      last_cart.line_items << create(:line_item)
+
+      current_cart = create(
+        :order,
+        user: user,
+        created_by: user,
+        state: "cart",
+        completed_at: nil,
+        created_at: 1.week.ago
+      )
+      session[:order_id] = current_cart.id
+
+      allow(controller).to receive(:try_spree_current_user).and_return(user)
+
+      expect {
+        get :index
+      }.to_not change { session[:order_id] }
+
+      expect(current_cart.line_items.pluck(:id)).to match_array last_cart.line_items.map(&:id)
+    end
+  end
+
   it "redirects to home with message if order cycle is expired" do
     expect(controller).to receive(:current_order_cycle).and_return(oc).twice
     expect(controller).to receive(:current_order).and_return(order).twice

From 57610142053f61568a87f8d3a6cc914362c3d3cc Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 13 Aug 2020 16:57:02 +1000
Subject: [PATCH 314/340] Restore Spree customisations for controllers

---
 app/controllers/base_controller.rb         |  4 ++++
 lib/spree/core/controller_helpers/order.rb |  4 ----
 spec/controllers/base_controller_spec.rb   | 22 ++++++----------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
index 8fcdac8fe4..9c364e9e9d 100644
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,3 +1,7 @@
+require 'spree/core/controller_helpers'
+require 'spree/core/controller_helpers/auth'
+require 'spree/core/controller_helpers/common'
+require 'spree/core/controller_helpers/order'
 require 'spree/core/controller_helpers/respond_with'
 require 'open_food_network/tag_rule_applicator'
 
diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index afa609e975..1df01e286a 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -6,10 +6,6 @@ module Spree
   module Core
     module ControllerHelpers
       module Order
-        # WARNING: This code seems to be overridden by Spree's original in:
-        #   spree_core/lib/spree/core/controller_helpers/order.rb
-        #
-        # None of our patches are active.
         def self.included(base)
           base.class_eval do
             helper_method :current_order
diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb
index 70fce385cd..145f0c7cf8 100644
--- a/spec/controllers/base_controller_spec.rb
+++ b/spec/controllers/base_controller_spec.rb
@@ -19,7 +19,7 @@ describe BaseController, type: :controller do
     end
 
     it "creates a new order" do
-      allow(controller).to receive(:try_spree_current_user).and_return(user)
+      allow(controller).to receive(:spree_current_user).and_return(user)
 
       expect {
         get :index
@@ -30,7 +30,7 @@ describe BaseController, type: :controller do
 
     it "uses the last incomplete order" do
       last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
-      allow(controller).to receive(:try_spree_current_user).and_return(user)
+      allow(controller).to receive(:spree_current_user).and_return(user)
 
       expect {
         get :index
@@ -39,17 +39,7 @@ describe BaseController, type: :controller do
       expect(session[:order_id]).to eq last_cart.id
     end
 
-    # This behaviour comes from spree_core/lib/spree/core/controller_helpers/order.rb.
-    # It should be overridden by our lib/spree/core/controller_helpers/order.rb.
-    # But this test case proves that the original Spree logic is active.
-    #
-    # We originally overrode the Spree logic because merging orders from different
-    # shops was confusing. Incomplete orders would also re-appear after checkout,
-    # confusing as well.
-    #
-    # When we brought this code from Spree and merged it with our overrides,
-    # we accidentally started using Spree's version again.
-    it "merges the last incomplete order into the current one" do
+    it "deletes the last incomplete order" do
       last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
       last_cart.line_items << create(:line_item)
 
@@ -63,13 +53,13 @@ describe BaseController, type: :controller do
       )
       session[:order_id] = current_cart.id
 
-      allow(controller).to receive(:try_spree_current_user).and_return(user)
+      allow(controller).to receive(:spree_current_user).and_return(user)
 
       expect {
         get :index
-      }.to_not change { session[:order_id] }
+      }.to change { Spree::Order.count }.by(-1)
 
-      expect(current_cart.line_items.pluck(:id)).to match_array last_cart.line_items.map(&:id)
+      expect(current_cart.line_items.count).to eq 0
     end
   end
 

From e8139d394890f3ec60c861726886953c9e341e7f Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 14 Aug 2020 10:02:48 +1000
Subject: [PATCH 315/340] Keep old incomplete (cart) orders

We used to delete old cart orders so that they wouldn't re-appear after
a successful checkout of another order. Keeping them ensures that we
don't remove an order that is still used by another device. It also
makes sure that we keep references of failed payments.
---
 lib/spree/core/controller_helpers/order.rb | 10 +++----
 spec/controllers/base_controller_spec.rb   | 34 ++++++++++++++++++++--
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index 1df01e286a..e95499bef2 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -68,8 +68,7 @@ module Spree
           session[:guest_token] = nil
         end
 
-        # Do not attempt to merge incomplete and current orders.
-        #   Instead, destroy the incomplete orders.
+        # Recover incomplete orders from other sessions after logging in.
         def set_current_order
           return unless (user = spree_current_user)
 
@@ -77,11 +76,10 @@ module Spree
 
           if session[:order_id].nil? && last_incomplete_order
             session[:order_id] = last_incomplete_order.id
-          elsif current_order(true) &&
-                last_incomplete_order &&
-                current_order != last_incomplete_order
-            last_incomplete_order.destroy
           end
+
+          # Load current order and create a new one if necessary.
+          current_order(true)
         end
 
         def current_currency
diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb
index 145f0c7cf8..fb1d399335 100644
--- a/spec/controllers/base_controller_spec.rb
+++ b/spec/controllers/base_controller_spec.rb
@@ -39,7 +39,11 @@ describe BaseController, type: :controller do
       expect(session[:order_id]).to eq last_cart.id
     end
 
-    it "deletes the last incomplete order" do
+    it "ignores the last incomplete order" do
+      # Spree used to merge the last order with the current one.
+      # And we used to override that logic to delete old incomplete orders.
+      # Now we are checking here that none of that is happening.
+
       last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
       last_cart.line_items << create(:line_item)
 
@@ -57,10 +61,36 @@ describe BaseController, type: :controller do
 
       expect {
         get :index
-      }.to change { Spree::Order.count }.by(-1)
+      }.to_not change { Spree::Order.count }
 
       expect(current_cart.line_items.count).to eq 0
     end
+
+    it "doesn't recover old orders after checkout, a new empty one is created" do
+      last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
+      last_cart.line_items << create(:line_item)
+
+      just_completed_order = create(
+        :order,
+        user: user,
+        created_by: user,
+        state: "complete",
+        completed_at: Time.zone.now,
+        created_at: 1.week.ago
+      )
+      expect(just_completed_order.completed_at).to be_present
+      session[:order_id] = just_completed_order.id
+
+      allow(controller).to receive(:spree_current_user).and_return(user)
+
+      expect {
+        get :index
+      }.to change { Spree::Order.count }.by(1)
+
+      expect(session[:order_id]).to_not eq just_completed_order.id
+      expect(session[:order_id]).to_not eq last_cart.id
+      expect(controller.current_order.line_items.count).to eq 0
+    end
   end
 
   it "redirects to home with message if order cycle is expired" do

From b79c568b08268de1aa89a728d980c2ca63fef5cb Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 14 Aug 2020 10:34:50 +1000
Subject: [PATCH 316/340] Load our spree overrides instead of the originals

We changed some of Spree's logic and want to use that. And once we
remove the spree_core gem, we need to load those files before using
them.
---
 app/controllers/api/base_controller.rb                 | 1 +
 app/controllers/spree/user_passwords_controller.rb     | 7 +++++++
 app/controllers/spree/user_registrations_controller.rb | 7 +++++++
 app/controllers/spree/user_sessions_controller.rb      | 7 +++++++
 4 files changed, 22 insertions(+)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 423a4fb104..e9d82d19ad 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -1,5 +1,6 @@
 # Base controller for OFN's API
 require_dependency 'spree/api/controller_setup'
+require "spree/core/controller_helpers/ssl"
 
 module Api
   class BaseController < ActionController::Metal
diff --git a/app/controllers/spree/user_passwords_controller.rb b/app/controllers/spree/user_passwords_controller.rb
index bf8b13d379..4e7fc6e824 100644
--- a/app/controllers/spree/user_passwords_controller.rb
+++ b/app/controllers/spree/user_passwords_controller.rb
@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserPasswordsController < Devise::PasswordsController
     helper 'spree/base', 'spree/store'
diff --git a/app/controllers/spree/user_registrations_controller.rb b/app/controllers/spree/user_registrations_controller.rb
index 98ad3c8d1c..1a2d740da7 100644
--- a/app/controllers/spree/user_registrations_controller.rb
+++ b/app/controllers/spree/user_registrations_controller.rb
@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserRegistrationsController < Devise::RegistrationsController
     helper 'spree/base', 'spree/store'
diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb
index 7ff26a3437..c17eafb892 100644
--- a/app/controllers/spree/user_sessions_controller.rb
+++ b/app/controllers/spree/user_sessions_controller.rb
@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserSessionsController < Devise::SessionsController
     helper 'spree/base', 'spree/store'

From 0a1947ae340f2dcee4826214b5c2b6c0a19a3887 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 14 Aug 2020 10:56:20 +1000
Subject: [PATCH 317/340] Remove unused module from lib

I was looking for library files that may be used but are not loaded.
I would then add the missing `require` statements. But I found that this
module isn't used any more.

Usage removed in:
310d1b37260f49588c4302eaf529d5834005adb9
---
 .rubocop_todo.yml                                         | 1 -
 lib/open_food_network/model_class_from_controller_name.rb | 8 --------
 2 files changed, 9 deletions(-)
 delete mode 100644 lib/open_food_network/model_class_from_controller_name.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e95d9e89c6..21d7bd8851 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1037,7 +1037,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/i18n_config.rb'
     - 'lib/open_food_network/lettuce_share_report.rb'
     - 'lib/open_food_network/locking.rb'
-    - 'lib/open_food_network/model_class_from_controller_name.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'
diff --git a/lib/open_food_network/model_class_from_controller_name.rb b/lib/open_food_network/model_class_from_controller_name.rb
deleted file mode 100644
index 97b92a18d7..0000000000
--- a/lib/open_food_network/model_class_from_controller_name.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module OpenFoodNetwork
-  module ModelClassFromControllerName
-    # Equivalent to CanCan's "authorize_resource :class => false" (see https://github.com/ryanb/cancan/blob/master/lib/cancan/controller_resource.rb#L146)
-    def model_class
-      self.class.to_s.sub("Controller", "").underscore.split('/').last.singularize.to_sym
-    end
-  end
-end

From c3e0f45f1a49b2c68e508d5a0fb4f07bfb734afd Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 14 Aug 2020 11:20:05 +1000
Subject: [PATCH 318/340] Remove unused Report class from lib

Also removing related unused classes and their specs.
---
 .rubocop_todo.yml                             | 12 -------
 knapsack_rspec_report.json                    |  3 --
 lib/open_food_network/reports/report.rb       | 35 -------------------
 lib/open_food_network/reports/row.rb          | 15 --------
 lib/open_food_network/reports/rule.rb         | 21 -----------
 .../orders_and_fulfillments_report_spec.rb    |  1 +
 .../open_food_network/reports/report_spec.rb  | 15 --------
 .../lib/open_food_network/reports/row_spec.rb | 19 ----------
 .../open_food_network/reports/rule_spec.rb    | 21 -----------
 9 files changed, 1 insertion(+), 141 deletions(-)
 delete mode 100644 lib/open_food_network/reports/report.rb
 delete mode 100644 lib/open_food_network/reports/row.rb
 delete mode 100644 lib/open_food_network/reports/rule.rb
 delete mode 100644 spec/lib/open_food_network/reports/report_spec.rb
 delete mode 100644 spec/lib/open_food_network/reports/row_spec.rb
 delete mode 100644 spec/lib/open_food_network/reports/rule_spec.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 21d7bd8851..aec1f024b9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -600,13 +600,7 @@ Style/ClassAndModuleChildren:
     - 'app/serializers/api/taxon_serializer.rb'
     - 'app/serializers/api/variant_serializer.rb'
     - 'lib/open_food_network/locking.rb'
-    - 'lib/open_food_network/reports/report.rb'
-    - 'lib/open_food_network/reports/row.rb'
-    - 'lib/open_food_network/reports/rule.rb'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
-    - 'spec/lib/open_food_network/reports/row_spec.rb'
-    - 'spec/lib/open_food_network/reports/rule_spec.rb'
 
 # Offense count: 2
 Style/ClassVars:
@@ -1060,9 +1054,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/referer_parser.rb'
     - 'lib/open_food_network/reports/line_items.rb'
     - 'lib/open_food_network/reports/list.rb'
-    - 'lib/open_food_network/reports/report.rb'
-    - 'lib/open_food_network/reports/row.rb'
-    - 'lib/open_food_network/reports/rule.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'lib/open_food_network/scope_product_to_hub.rb'
     - 'lib/open_food_network/scope_variant_to_hub.rb'
@@ -1293,9 +1284,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
     - 'spec/lib/open_food_network/property_merge_spec.rb'
     - 'spec/lib/open_food_network/referer_parser_spec.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
-    - 'spec/lib/open_food_network/reports/row_spec.rb'
-    - 'spec/lib/open_food_network/reports/rule_spec.rb'
     - 'spec/lib/open_food_network/sales_tax_report_spec.rb'
     - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
     - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json
index 91499ba40e..f745a4438d 100644
--- a/knapsack_rspec_report.json
+++ b/knapsack_rspec_report.json
@@ -113,7 +113,6 @@
   "spec/models/subscription_line_item_spec.rb": 0.021193265914916992,
   "spec/controllers/api/statuses_controller_spec.rb": 0.02451467514038086,
   "spec/lib/open_food_network/referer_parser_spec.rb": 0.015799283981323242,
-  "spec/lib/open_food_network/reports/rule_spec.rb": 0.01628732681274414,
   "spec/helpers/serializer_helper_spec.rb": 0.004682064056396484,
   "spec/jobs/heartbeat_job_spec.rb": 0.013271570205688477,
   "spec/services/mail_configuration_spec.rb": 0.01050567626953125,
@@ -246,7 +245,6 @@
   "spec/validators/integer_array_validator_spec.rb": 0.04994392395019531,
   "spec/validators/date_time_string_validator_spec.rb": 0.05316734313964844,
   "spec/models/product_import/reset_absent_spec.rb": 0.04071307182312012,
-  "spec/lib/open_food_network/reports/report_spec.rb": 0.04329681396484375,
   "spec/jobs/confirm_signup_job_spec.rb": 0.03060293197631836,
   "spec/services/order_cycle_distributed_variants_spec.rb": 0.02808237075805664,
   "spec/lib/open_food_network/feature_toggle_spec.rb": 0.0240786075592041,
@@ -255,7 +253,6 @@
   "spec/models/spree/calculator/flat_rate_spec.rb": 0.014808177947998047,
   "spec/models/spree/image_spec.rb": 0.014715909957885742,
   "spec/helpers/spree/admin/base_helper_spec.rb": 0.008042573928833008,
-  "spec/lib/open_food_network/reports/row_spec.rb": 0.005358695983886719,
   "engines/order_management/spec/controllers/order_management/reports/enterprise_fee_summaries_controller_spec.rb": 0.7100100517272949,
   "engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/parameters_spec.rb": 4.190261602401733,
   "engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total_spec.rb": 0.006247282028198242,
diff --git a/lib/open_food_network/reports/report.rb b/lib/open_food_network/reports/report.rb
deleted file mode 100644
index 2c4e5900f2..0000000000
--- a/lib/open_food_network/reports/report.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'open_food_network/reports/row'
-require 'open_food_network/reports/rule'
-
-module OpenFoodNetwork::Reports
-  class Report
-    class_attribute :_header, :_columns, :_rules_head
-
-    # -- API
-    def header
-      _header
-    end
-
-    def columns
-      _columns.to_a
-    end
-
-    def rules
-      # Flatten linked list and return as hashes
-      rules = []
-
-      rule = _rules_head
-      while rule
-        rules << rule
-        rule = rule.next
-      end
-
-      rules.map(&:to_h)
-    end
-
-    # -- DSL
-    def self.header(*columns)
-      self._header = columns
-    end
-  end
-end
diff --git a/lib/open_food_network/reports/row.rb b/lib/open_food_network/reports/row.rb
deleted file mode 100644
index 35b4bffe33..0000000000
--- a/lib/open_food_network/reports/row.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module OpenFoodNetwork::Reports
-  class Row
-    def initialize
-      @columns = []
-    end
-
-    def column(&block)
-      @columns << block
-    end
-
-    def to_a
-      @columns
-    end
-  end
-end
diff --git a/lib/open_food_network/reports/rule.rb b/lib/open_food_network/reports/rule.rb
deleted file mode 100644
index cfb8b7e67f..0000000000
--- a/lib/open_food_network/reports/rule.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'open_food_network/reports/row'
-
-module OpenFoodNetwork::Reports
-  class Rule
-    attr_reader :next
-
-    def group(&block)
-      @group = block
-    end
-
-    def sort(&block)
-      @sort = block
-    end
-
-    def to_h
-      h = { group_by: @group, sort_by: @sort }
-      h[:summary_columns] = @summary_row.to_a if @summary_row
-      h
-    end
-  end
-end
diff --git a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
index af91f3a917..f970c4b83a 100644
--- a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
+++ b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'open_food_network/orders_and_fulfillments_report'
+require 'open_food_network/order_grouper'
 
 describe OpenFoodNetwork::OrdersAndFulfillmentsReport do
   include AuthenticationHelper
diff --git a/spec/lib/open_food_network/reports/report_spec.rb b/spec/lib/open_food_network/reports/report_spec.rb
deleted file mode 100644
index 86e76bcec5..0000000000
--- a/spec/lib/open_food_network/reports/report_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'open_food_network/reports/report'
-
-module OpenFoodNetwork::Reports
-  class TestReport < Report
-    header 'One', 'Two', 'Three', 'Four'
-  end
-
-  describe Report do
-    let(:report) { TestReport.new }
-
-    it "returns the header" do
-      expect(report.header).to eq(%w(One Two Three Four))
-    end
-  end
-end
diff --git a/spec/lib/open_food_network/reports/row_spec.rb b/spec/lib/open_food_network/reports/row_spec.rb
deleted file mode 100644
index c541832edf..0000000000
--- a/spec/lib/open_food_network/reports/row_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-require 'open_food_network/reports/row'
-
-module OpenFoodNetwork::Reports
-  describe Row do
-    let(:row) { Row.new }
-    # rubocop:disable Style/Proc
-    let(:proc) { Proc.new {} }
-    # rubocop:enable Style/Proc
-
-    it "can define a number of columns and return them as an array" do
-      row.column(&proc)
-      row.column(&proc)
-      row.column(&proc)
-
-      expect(row.to_a).to eq([proc, proc, proc])
-    end
-  end
-end
diff --git a/spec/lib/open_food_network/reports/rule_spec.rb b/spec/lib/open_food_network/reports/rule_spec.rb
deleted file mode 100644
index eae5b26045..0000000000
--- a/spec/lib/open_food_network/reports/rule_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'spec_helper'
-require 'open_food_network/reports/rule'
-
-module OpenFoodNetwork::Reports
-  describe Rule do
-    let(:rule) { Rule.new }
-    # rubocop:disable Style/Proc
-    let(:proc) { Proc.new {} }
-    # rubocop:enable Style/Proc
-
-    it "can define a group proc and return it in a hash" do
-      rule.group(&proc)
-      expect(rule.to_h).to eq(group_by: proc, sort_by: nil)
-    end
-
-    it "can define a sort proc and return it in a hash" do
-      rule.sort(&proc)
-      expect(rule.to_h).to eq(group_by: nil, sort_by: proc)
-    end
-  end
-end

From 23706ec1d6a1bcf4aa5022e72bc7ddc5477f4eac Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 14 Aug 2020 13:01:51 +1000
Subject: [PATCH 319/340] Load our version of the Spree environment

We didn't actually change any logic in our version of the Spree
environment file but if we do that in the future, we want to be sure
that it takes effect. Our file was ignored and not loaded before.
---
 config/initializers/spree.rb            |  1 +
 spec/lib/spree/core/environment_spec.rb | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 spec/lib/spree/core/environment_spec.rb

diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 6ff230c5f5..2e80f978ae 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -6,6 +6,7 @@
 # In order to initialize a setting do:
 # config.setting_name = 'new value'
 
+require "spree/core/environment"
 require 'spree/product_filters'
 
 # Due to a bug in ActiveRecord we need to load the tagging code in Gateway which
diff --git a/spec/lib/spree/core/environment_spec.rb b/spec/lib/spree/core/environment_spec.rb
new file mode 100644
index 0000000000..7eec8dc329
--- /dev/null
+++ b/spec/lib/spree/core/environment_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Spree::Core::Environment do
+  # Our version doesn't add any features we could test.
+  # So we just check that our file is loaded correctly.
+  let(:our_file) { Rails.root.join("lib/spree/core/environment.rb").to_s }
+
+  it "is defined in our code" do
+    file = subject.method(:initialize).source_location.first
+    expect(file).to eq our_file
+  end
+
+  it "used by Spree" do
+    file = Spree::Core::Engine.config.spree.method(:initialize).source_location.first
+    expect(file).to eq our_file
+  end
+end

From de22ad000078b825750a8e74bf7fce87a7e42f98 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 14 Aug 2020 12:41:56 +0100
Subject: [PATCH 320/340] Fix flash error issues in checkout requests

---
 app/controllers/checkout_controller.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 1dbffc71e1..c0d835ced8 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -235,6 +235,7 @@ class CheckoutController < Spree::StoreController
         render :edit
       end
       format.json do
+        xhr_flash_errors
         render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
       end
     end
@@ -248,4 +249,11 @@ class CheckoutController < Spree::StoreController
   def permitted_params
     PermittedAttributes::Checkout.new(params).call
   end
+
+  def xhr_flash_errors
+    # Marks flash errors for deletion after the current action has completed.
+    # This ensures flash errors generated during XHR requests are not persisted in the
+    # session for longer than expected.
+    flash.discard(:error)
+  end
 end

From ce5bcaaa207be4dc56283574462c0fd7dac62f0f Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 7 Aug 2020 14:46:08 +0100
Subject: [PATCH 321/340] Explicitly notify Bugsnag on checkout failure

---
 .../javascripts/darkswarm/services/checkout.js.coffee  |  3 ++-
 .../unit/darkswarm/services/checkout_spec.js.coffee    | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/darkswarm/services/checkout.js.coffee b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
index 4ec3081ad3..d74f075ea3 100644
--- a/app/assets/javascripts/darkswarm/services/checkout.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
@@ -24,7 +24,8 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
           try
             @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
           finally
-            throw error # generate a BugsnagJS alert
+            Bugsnag.notify(error)
+            throw error
 
     handle_checkout_error_response: (response) =>
       throw response unless response.data?
diff --git a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
index d7e23b457b..8caacdc531 100644
--- a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
@@ -1,4 +1,6 @@
 describe 'Checkout service', ->
+  BugsnagMock =
+    notify: (arg) ->
   Checkout = null
   orderData = null
   $httpBackend = null
@@ -48,6 +50,8 @@ describe 'Checkout service', ->
       ship_address: {test: "bar"}
       user_id: 901
 
+    window.Bugsnag = BugsnagMock
+
     module 'Darkswarm'
     module ($provide)->
       $provide.value "RailsFlashLoader", FlashLoaderMock
@@ -128,6 +132,7 @@ describe 'Checkout service', ->
         expect(Checkout.errors).toEqual {error: "frogs"}
 
       it "throws exception and sends generic flash message when there are errors but no flash message", ->
+        spyOn(BugsnagMock, "notify")
         $httpBackend.expectPUT("/checkout.json").respond 400, {errors: {error: "broken response"}}
         try
           Checkout.submit()
@@ -136,9 +141,11 @@ describe 'Checkout service', ->
           expect(error.data.errors.error).toBe("broken response")
 
         expect(Checkout.errors).toEqual {}
+        expect(BugsnagMock.notify).toHaveBeenCalled()
 
       it "throws an exception and sends a flash message to the flash service when reponse doesnt contain errors nor a flash message", ->
         spyOn(FlashLoaderMock, "loadFlash") # Stubbing out writes to window.location
+        spyOn(BugsnagMock, "notify")
         $httpBackend.expectPUT("/checkout.json").respond 400, "broken response"
         try
           Checkout.submit()
@@ -147,9 +154,11 @@ describe 'Checkout service', ->
           expect(error.data).toBe("broken response")
 
         expect(FlashLoaderMock.loadFlash).toHaveBeenCalledWith({ error: t("checkout.failed") })
+        expect(BugsnagMock.notify).toHaveBeenCalled()
 
       it "throws an exception and sends a flash message to the flash service when an exception is thrown while handling the error", ->
         spyOn(FlashLoaderMock, "loadFlash") # Stubbing out writes to window.location
+        spyOn(BugsnagMock, "notify")
         navigationSpy.and.callFake(-> throw "unexpected error")
         $httpBackend.expectPUT("/checkout.json").respond 400, {path: 'path'}
         try
@@ -159,6 +168,7 @@ describe 'Checkout service', ->
           expect(error).toBe("unexpected error")
 
         expect(FlashLoaderMock.loadFlash).toHaveBeenCalledWith({ error: t("checkout.failed") })
+        expect(BugsnagMock.notify).toHaveBeenCalled()
 
     describe "when using the Stripe Connect gateway", ->
       beforeEach inject ($injector, StripeElements) ->

From 4c3a3d5d1a7d24306a0315fcb9330f4f41ca9989 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Mon, 17 Aug 2020 18:19:09 +1000
Subject: [PATCH 322/340] Updating translations for config/locales/en_GB.yml

---
 config/locales/en_GB.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 78c5755ee4..8885e48054 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -14,6 +14,7 @@ en_GB:
       spree/payment:
         amount: Amount
         state: State
+        source: Source
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
@@ -272,6 +273,9 @@ en_GB:
   on hand: "In Stock"
   ship: "Ship"
   shipping_category: "Shipping Category"
+  height: "Height"
+  width: "Width"
+  depth: "Depth"
   actions:
     create_and_add_another: "Create and Add Another"
     create: "Create"
@@ -1967,6 +1971,7 @@ en_GB:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  permalink: "Permalink"
   shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
@@ -2064,6 +2069,7 @@ en_GB:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Surname begins with"
+  shipping_method: "Shipping method"
   new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
@@ -3183,6 +3189,8 @@ en_GB:
           stripe:
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
+          paypal:
+            no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:
@@ -3381,6 +3389,11 @@ en_GB:
         thanks: "Thank you for your order with us."
         track_information: "Tracking Information: %{tracking}"
         track_link: "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulations!"
+        message: "If you have received this email, then your email settings are correct."
+        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments

From 0fd163602dbb69576bb4a59ab766377237aa4750 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 17 Aug 2020 11:17:42 +0100
Subject: [PATCH 323/340] Rename method for clarity

---
 app/controllers/checkout_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index c0d835ced8..c47b112359 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -235,7 +235,7 @@ class CheckoutController < Spree::StoreController
         render :edit
       end
       format.json do
-        xhr_flash_errors
+        discard_flash_errors
         render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
       end
     end
@@ -250,7 +250,7 @@ class CheckoutController < Spree::StoreController
     PermittedAttributes::Checkout.new(params).call
   end
 
-  def xhr_flash_errors
+  def discard_flash_errors
     # Marks flash errors for deletion after the current action has completed.
     # This ensures flash errors generated during XHR requests are not persisted in the
     # session for longer than expected.

From 290120d01530eeb5a2ae72b6d47ee18f08e1c0ee Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 13 Aug 2020 19:44:21 +0100
Subject: [PATCH 324/340] Fix broken favicon path

Ensures the non-fingerprinted version of the favicon will be used directly from `/public/favicon.ico`. Needed after recent changes to the Rails asset pipeline.
---
 app/views/layouts/darkswarm.html.haml    | 2 +-
 app/views/layouts/registration.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 7fd21a35d3..17f256124a 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -9,7 +9,7 @@
       %meta{name: "robots", content: "noindex"}
     %title= content_for?(:title) ? "#{yield(:title)} - #{t(:title)}".html_safe : "#{t(:welcome_to)} #{t(:title)}"
     - if Rails.env.production?
-      = favicon_link_tag
+      = favicon_link_tag "/favicon.ico"
     - else
       = favicon_link_tag "/favicon-staging.ico"
     %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"}
diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml
index ebbcd9fd17..9f7e77612c 100644
--- a/app/views/layouts/registration.html.haml
+++ b/app/views/layouts/registration.html.haml
@@ -5,7 +5,7 @@
 
     %title= content_for?(:title) ? "#{yield(:title)} - #{Spree::Config[:site_name]}" : "#{t(:welcome_to)} #{Spree::Config[:site_name]}"
     - if Rails.env.production?
-      = favicon_link_tag
+      = favicon_link_tag "/favicon.ico"
     - else
       = favicon_link_tag "/favicon-staging.ico"
     %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"}

From ed346b3b542d02b4d5d3ebc38787d35e090db5af Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 17 Aug 2020 12:36:11 +0100
Subject: [PATCH 325/340] Add scrolling animate on sidebar hide

---
 app/assets/stylesheets/darkswarm/expanding-sidebar.scss | 4 +++-
 app/views/shared/menu/_cart_sidebar.html.haml           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/expanding-sidebar.scss b/app/assets/stylesheets/darkswarm/expanding-sidebar.scss
index da1034cf42..8bfcfe824b 100644
--- a/app/assets/stylesheets/darkswarm/expanding-sidebar.scss
+++ b/app/assets/stylesheets/darkswarm/expanding-sidebar.scss
@@ -16,12 +16,14 @@
     width: 100%;
     background-color: $shop-sidebar-overlay;
     opacity: 0;
-    transition: opacity $transition-sidebar;
+    visibility: hidden;
+    transition: all $transition-sidebar;
   }
 
   &.shown {
     .background {
       opacity: 1;
+      visibility: visible;
     }
 
     .sidebar,
diff --git a/app/views/shared/menu/_cart_sidebar.html.haml b/app/views/shared/menu/_cart_sidebar.html.haml
index 03c3f52222..10bef792ab 100644
--- a/app/views/shared/menu/_cart_sidebar.html.haml
+++ b/app/views/shared/menu/_cart_sidebar.html.haml
@@ -1,4 +1,4 @@
-.expanding-sidebar.cart-sidebar{ng: {controller: 'CartCtrl', show: 'showCartSidebar', class: "{'shown': showCartSidebar, 'hidden': !showCartSidebar}"}}
+.expanding-sidebar.cart-sidebar{ng: {controller: 'CartCtrl', class: "{'shown': showCartSidebar}"}}
   .background{ng: {click: 'toggleCartSidebar()'}}
   .sidebar
     .cart-header

From b367d4328e0567ba3213d41da943afccc62f0222 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 17 Aug 2020 18:28:23 +0100
Subject: [PATCH 326/340] Remove spree upgrade section from the PR template
 :heart:

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 86e4725518..d37e637543 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -23,10 +23,6 @@ The categories are based on https://keepachangelog.com/en/1.0.0/. -->
 
 Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
 
-#### How is this related to the Spree upgrade?
-<!-- Any known conflicts with the Spree Upgrade?
-Explain them or remove this section. -->
-
 
 
 #### Discourse thread

From 0efcf1536fea8a49c455de9081a8e51155517c4c Mon Sep 17 00:00:00 2001
From: romale <aleromex@gmail.com>
Date: Mon, 17 Aug 2020 23:10:43 +0300
Subject: [PATCH 327/340] Update en.yml

---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6177ff03e6..502164ab68 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -256,6 +256,7 @@ en:
   enterprises: Enterprises
   enterprise_groups: Groups
   reports: Reports
+  listing_reports: Listing Reports
   variant_overrides: Inventory
   import: Import
   spree_products: Spree Products

From bb3f958dd2cd907195f5702dbb93e5e6db119f4c Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 19 Aug 2020 10:37:18 +1000
Subject: [PATCH 328/340] Remove redundant includes

---
 app/controllers/base_controller.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
index 9c364e9e9d..b039a2447d 100644
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,4 +1,3 @@
-require 'spree/core/controller_helpers'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
@@ -6,7 +5,6 @@ require 'spree/core/controller_helpers/respond_with'
 require 'open_food_network/tag_rule_applicator'
 
 class BaseController < ApplicationController
-  include Spree::Core::ControllerHelpers
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Order

From 355c5f5c55ceffce9ffb958ea72be8f33eb89e97 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 19 Aug 2020 10:47:13 +1000
Subject: [PATCH 329/340] Remove unreachable order recovery code

Every page load creates a cart order if none is present. So when a user
logs in, they always have an order stored in their session. And
therefore, we never got to recover an old order.

We could have fixed the code to restore old orders. But as far as I can
tell, order recovery hasn't been working for years and I couldn't find
any issue requesting this feature.

If we wanted to implement order recovery, it should probably be designed
more carefully and included in the `current_order` method.
---
 lib/spree/core/controller_helpers/order.rb | 13 ++-----------
 spec/controllers/base_controller_spec.rb   | 11 -----------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index e95499bef2..fe99381c7f 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -68,18 +68,9 @@ module Spree
           session[:guest_token] = nil
         end
 
-        # Recover incomplete orders from other sessions after logging in.
+        # Load current order and create a new one if necessary.
         def set_current_order
-          return unless (user = spree_current_user)
-
-          last_incomplete_order = user.last_incomplete_spree_order
-
-          if session[:order_id].nil? && last_incomplete_order
-            session[:order_id] = last_incomplete_order.id
-          end
-
-          # Load current order and create a new one if necessary.
-          current_order(true)
+          current_order(true) if spree_current_user
         end
 
         def current_currency
diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb
index fb1d399335..e68e10e0c2 100644
--- a/spec/controllers/base_controller_spec.rb
+++ b/spec/controllers/base_controller_spec.rb
@@ -28,17 +28,6 @@ describe BaseController, type: :controller do
       expect(user.orders.count).to eq 1
     end
 
-    it "uses the last incomplete order" do
-      last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
-      allow(controller).to receive(:spree_current_user).and_return(user)
-
-      expect {
-        get :index
-      }.to_not change { Spree::Order.count }
-
-      expect(session[:order_id]).to eq last_cart.id
-    end
-
     it "ignores the last incomplete order" do
       # Spree used to merge the last order with the current one.
       # And we used to override that logic to delete old incomplete orders.

From 72f5b1b251c62df5b2a2ab71860204d3380dbed4 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Wed, 19 Aug 2020 17:36:36 +0100
Subject: [PATCH 330/340] Revert "Remove unreachable order recovery code"

This reverts commit 355c5f5c55ceffce9ffb958ea72be8f33eb89e97.

This code is necessary to preserver cart contents across logins on
different browser sessions.
---
 lib/spree/core/controller_helpers/order.rb | 13 +++++++++++--
 spec/controllers/base_controller_spec.rb   | 11 +++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index fe99381c7f..e95499bef2 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -68,9 +68,18 @@ module Spree
           session[:guest_token] = nil
         end
 
-        # Load current order and create a new one if necessary.
+        # Recover incomplete orders from other sessions after logging in.
         def set_current_order
-          current_order(true) if spree_current_user
+          return unless (user = spree_current_user)
+
+          last_incomplete_order = user.last_incomplete_spree_order
+
+          if session[:order_id].nil? && last_incomplete_order
+            session[:order_id] = last_incomplete_order.id
+          end
+
+          # Load current order and create a new one if necessary.
+          current_order(true)
         end
 
         def current_currency
diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb
index e68e10e0c2..fb1d399335 100644
--- a/spec/controllers/base_controller_spec.rb
+++ b/spec/controllers/base_controller_spec.rb
@@ -28,6 +28,17 @@ describe BaseController, type: :controller do
       expect(user.orders.count).to eq 1
     end
 
+    it "uses the last incomplete order" do
+      last_cart = create(:order, user: user, created_by: user, state: "cart", completed_at: nil)
+      allow(controller).to receive(:spree_current_user).and_return(user)
+
+      expect {
+        get :index
+      }.to_not change { Spree::Order.count }
+
+      expect(session[:order_id]).to eq last_cart.id
+    end
+
     it "ignores the last incomplete order" do
       # Spree used to merge the last order with the current one.
       # And we used to override that logic to delete old incomplete orders.

From 977ab26b00a76cb663f3a002a04516c81ad83b2e Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 19 Aug 2020 12:50:17 +0100
Subject: [PATCH 331/340] Add failing spec for payment fee calculation in
 customer totals report

---
 .../customer_totals_report_spec.rb            | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb b/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
index 6bae6da8a1..990f7e3cb7 100644
--- a/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
+++ b/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
@@ -1,5 +1,7 @@
 require "spec_helper"
+require 'open_food_network/orders_and_fulfillments_report'
 require 'open_food_network/orders_and_fulfillments_report/customer_totals_report'
+require 'open_food_network/order_grouper'
 
 RSpec.describe OpenFoodNetwork::OrdersAndFulfillmentsReport::CustomerTotalsReport do
   let!(:distributor) { create(:distributor_enterprise) }
@@ -79,6 +81,28 @@ RSpec.describe OpenFoodNetwork::OrdersAndFulfillmentsReport::CustomerTotalsRepor
     end
   end
 
+  context "displaying payment fees" do
+    context "with both failed and completed payments present" do
+      let!(:order) { 
+        create(:order_ready_to_ship, user: customer.user,
+                                     customer: customer, distributor: distributor)
+      }
+      let(:completed_payment) { order.payments.completed.first }
+      let!(:failed_payment) { create(:payment, order: order, state: "failed") }
+
+      before do
+        completed_payment.adjustment.update amount: 123.00
+        failed_payment.adjustment.update amount: 456.00, eligible: false, state: "finalized"
+      end
+
+      xit "shows the correct payment fee amount for the order" do
+        # Fails; the sum of adjustments for both failed and complete payments is shown
+        payment_fee_field = report_table.last[12]
+        expect(payment_fee_field).to eq completed_payment.adjustment.amount
+      end
+    end
+  end
+
   context 'when a variant override applies' do
     let!(:order) do
       create(:completed_order_with_totals, line_items_count: 1, user: customer.user,

From 3badaa07d20799b38d29f0309d3d9b922242f9d3 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 19 Aug 2020 12:52:40 +0100
Subject: [PATCH 332/340] Fix adjustment calculations; only "eligible"
 adjustments should be regarded as applied to an order.

When an order is submitted and the payment fails, the failed payment's adjustments (payment fees) are set to `eligible: false` to indicate they do not apply. These should not be counted as being included in an order's adjustments.
---
 app/services/order_adjustments_fetcher.rb                    | 5 +++--
 .../customer_totals_report_spec.rb                           | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/services/order_adjustments_fetcher.rb b/app/services/order_adjustments_fetcher.rb
index 40d78cf6bc..560f04bdb1 100644
--- a/app/services/order_adjustments_fetcher.rb
+++ b/app/services/order_adjustments_fetcher.rb
@@ -57,11 +57,12 @@ class OrderAdjustmentsFetcher
     if adjustments_eager_loaded?
       adjustment_scope = public_send("#{scope}_scope")
 
+      # Adjustments are already loaded here, this block is using `Array#select`
       adjustments.select do |adjustment|
-        match_by_scope(adjustment, adjustment_scope)
+        match_by_scope(adjustment, adjustment_scope) && match_by_scope(adjustment, eligible_scope)
       end
     else
-      adjustments.where(nil).public_send scope
+      adjustments.where(nil).eligible.public_send scope
     end
   end
 
diff --git a/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb b/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
index 990f7e3cb7..4799c3e4ac 100644
--- a/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
+++ b/spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
@@ -95,8 +95,7 @@ RSpec.describe OpenFoodNetwork::OrdersAndFulfillmentsReport::CustomerTotalsRepor
         failed_payment.adjustment.update amount: 456.00, eligible: false, state: "finalized"
       end
 
-      xit "shows the correct payment fee amount for the order" do
-        # Fails; the sum of adjustments for both failed and complete payments is shown
+      it "shows the correct payment fee amount for the order" do
         payment_fee_field = report_table.last[12]
         expect(payment_fee_field).to eq completed_payment.adjustment.amount
       end

From 0abcbc7b8f02755bd98212e00db251bf125b7c69 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Thu, 20 Aug 2020 10:51:44 +0100
Subject: [PATCH 333/340] Fix specs in mail interceptor spec

This was due to an incompatibility between two recent PRs: 5763 and
5733. PR 5733 did not take into account 5763 (the confirm email method was removed) and so the specs introduced
were broken.
---
 spec/lib/spree/core/mail_interceptor_spec.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
index d47538cb3c..48a7f948bb 100644
--- a/spec/lib/spree/core/mail_interceptor_spec.rb
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -2,11 +2,13 @@
 
 require 'spec_helper'
 
-# We'll use the OrderMailer as a quick and easy way to test. IF it works here
-# it works for all email (in theory.)
+# Here we use the OrderMailer as a way to test the mail interceptor.
 describe Spree::OrderMailer do
-  let(:order) { Spree::Order.new(email: "customer@example.com") }
-  let(:message) { Spree::OrderMailer.confirm_email(order) }
+  let(:order) do
+    Spree::Order.new(distributor: create(:enterprise),
+                     bill_address: create(:address))
+  end
+  let(:message) { Spree::OrderMailer.confirm_email_for_shop(order) }
 
   before(:all) do
     ActionMailer::Base.perform_deliveries = true
@@ -64,7 +66,7 @@ describe Spree::OrderMailer do
         Spree::Config[:intercept_email] = "intercept@foobar.com"
         message.deliver
         @email = ActionMailer::Base.deliveries.first
-        expect(@email.subject.match(/customer@example\.com/)).to be_truthy
+        expect(@email.subject).to include order.distributor.contact.email
       end
     end
 
@@ -73,7 +75,7 @@ describe Spree::OrderMailer do
         Spree::Config[:intercept_email] = ""
         message.deliver
         @email = ActionMailer::Base.deliveries.first
-        expect(@email.to).to eq ["customer@example.com"]
+        expect(@email.to).to eq [order.distributor.contact.email]
       end
     end
   end

From 9fd86131071b69091e5048251c4234b340850ae7 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 21 Aug 2020 14:56:26 +0100
Subject: [PATCH 334/340] Update all locales with the latest Transifex
 translations

---
 config/locales/en_US.yml |  2 +-
 config/locales/pt_BR.yml | 28 ++++++++++++++++++++++------
 config/locales/tr.yml    |  2 +-
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index c900a375bd..8cf511303b 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -32,7 +32,7 @@ en_US:
         spree/user:
           attributes:
             email:
-              taken: "There's already an account registered for this email. Please login to reset your password."
+              taken: "There's already an account registered for this email. Please login or reset your password."
         spree/order:
           no_card: There are no authorized credit cards available to charge
         spree/credit_card:
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 4d46bb192c..0fe3b4ab6c 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -14,6 +14,7 @@ pt_BR:
       spree/payment:
         amount: Montante
         state: Estado
+        source: Origem
       spree/product:
         primary_taxon: "Categoria de Produto"
         supplier: "Fornecedor"
@@ -272,6 +273,9 @@ pt_BR:
   on hand: "Disponível"
   ship: "Envio"
   shipping_category: "Tipos de Frete"
+  height: "Altura"
+  width: "Largura"
+  depth: "Profundidade"
   actions:
     create_and_add_another: "Criar e adicionar outro"
     create: "Criar"
@@ -1013,7 +1017,7 @@ pt_BR:
         name: Relatórios de pagamento
         description: Relatórios para pagamentos
       orders_and_fulfillment:
-        name: Relatórios de pedidos e de satisfação
+        name: Relatórios de pedidos e fechamento
       customers:
         name: Clientes
       products_and_inventory:
@@ -1036,6 +1040,9 @@ pt_BR:
     subscriptions:
       index:
         title: "Assinaturas"
+        new: "Nova Assinatura"
+      new:
+        title: "Nova Assinatura"
       edit:
         title: "Editar assinatura"
       table:
@@ -1060,6 +1067,8 @@ pt_BR:
         create_at_least_one_schedule_step_3: 3. Clique em "Novo cronograma" e preencha o formulário
         once_you_are_done_you_can_html: Quando terminar, você pode %{reload_this_page_link}
         reload_this_page: recarregar esta página
+      form:
+        create: "Criar Assinatura"
       steps:
         details: 1. Detalhes Básicos
         address: 2. Endereço
@@ -1206,14 +1215,14 @@ pt_BR:
   invoice_column_price_without_taxes: "Preço total (sem taxas)"
   invoice_column_tax_rate: "Taxa de imposto"
   invoice_tax_total: "Total de Imposto sobre Bens e Serviços"
-  tax_invoice: "NOTA FISCAL"
+  tax_invoice: "FATURA"
   tax_total: "Total de imposto (%{rate}):"
   total_excl_tax: "Total (sem imposto):"
   total_incl_tax: "Total (com imposto):"
   abn: "CNPJ"
   acn: "CNPJ:"
-  invoice_issued_on: "Nota fiscal emitida em:"
-  order_number: "Número da nota fiscal:"
+  invoice_issued_on: "Fatura emitida em:"
+  order_number: "Número da fatura:"
   date_of_transaction: "Dia da transação:"
   ticket_column_qty: "Qtd"
   ticket_column_item: "Ítem"
@@ -1526,7 +1535,7 @@ pt_BR:
   shopping_contact_social: "Seguir"
   shopping_groups_part_of: "é parte de:"
   shopping_producers_of_hub: "produtores de %{hub}:"
-  enterprises_next_closing: "Próximo fechamento de pedido"
+  enterprises_next_closing: "Próximo fechamento"
   enterprises_ready_for: "Pronto para"
   enterprises_choose: "Escolha para quando você quer seu pedido:"
   maps_open: "Aberto"
@@ -1960,6 +1969,7 @@ pt_BR:
   supplier: "Fornecedor"
   product_name: "Nome do Produto"
   product_description: "Descrição do Produto"
+  permalink: "Permalink"
   shipping_categories: "Categorias de Remessa"
   units: "Unidade de medida"
   coordinator: "Coordenador"
@@ -2057,6 +2067,7 @@ pt_BR:
   remove_tax: "Remover taxa"
   first_name_begins_with: "O primeiro nome começa com"
   last_name_begins_with: "O sobrenome começa com"
+  shipping_method: "Método de Envio"
   new_order: "Novo Pedido"
   enterprise_tos_link: "Link de Termos de Serviço da iniciativa"
   enterprise_tos_message: "Queremos trabalhar com pessoas que compartilham nossos objetivos e valores. Como tal, pedimos às novas iniciativas que concordem com nossos"
@@ -3065,7 +3076,7 @@ pt_BR:
           email: "Email do cliente"
         invoice:
           issued_on: "Emitida em"
-          tax_invoice: "NOTA FISCAL"
+          tax_invoice: "FATURA"
           code: "Código"
           from: "De"
           to: "Informações de cobrança"
@@ -3373,6 +3384,11 @@ pt_BR:
         thanks: "Agradeço pelos seus serviços."
         track_information: "Informações de rastreamento: %{tracking}"
         track_link: "Link de rastreamento: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Parabéns!"
+        message: "Se você recebeu este email, então as suas configurações de email estão corretas."
+        subject: "Email Teste"
     order_state:
       address: endereço
       adjustments: ajustes
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7c28526310..e5aa022fee 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1885,7 +1885,7 @@ tr:
         twitter: "Twitter"
         twitter_placeholder: "Örn. @twitter_ciftlik"
         instagram: "Instagram"
-        instagram_placeholder: "Örn. @instagram_ciftlik"
+        instagram_placeholder: "Örn. instagram_ciftlik"
       limit_reached:
         headline: "Hayır!"
         message: "Sınıra ulaştınız!"

From 2515b1ae2c39f604779066d01ff1c0be93431ff8 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Sat, 22 Aug 2020 00:58:13 +1000
Subject: [PATCH 335/340] Updating translations for config/locales/en_IE.yml

---
 config/locales/en_IE.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/config/locales/en_IE.yml b/config/locales/en_IE.yml
index 2e248b867b..c0743a88b4 100644
--- a/config/locales/en_IE.yml
+++ b/config/locales/en_IE.yml
@@ -14,6 +14,7 @@ en_IE:
       spree/payment:
         amount: Amount
         state: County
+        source: Source
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
@@ -183,7 +184,8 @@ en_IE:
         explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this.
   home: "OFN"
   title: "Open Food Network"
-  site_meta_description: "The Open Food Network software platform allows farmers to sell produce online, at a price that works for them. It has been built specifically for selling food so it can handle tricky measures or stock levels that only food has - a dozen eggs, a bunch of parsley, a whole chicken that varies in weight…"
+  welcome_to: "Welcome to"
+  site_meta_description: "Open Food Network Ireland allows farmers to sell produce online, at a price that works for them. It has been built specifically for selling food so it can handle tricky measures or stock levels that only food has - a dozen eggs, a bunch of parsley, a whole chicken that varies in weight…"
   search_by_name: Search by name, town, county or eircode...
   producers_join: Producers are now welcome to join Open Food Network Ireland.
   charges_sales_tax: Charges VAT?
@@ -271,6 +273,9 @@ en_IE:
   on hand: "In Stock"
   ship: "Ship"
   shipping_category: "Shipping Category"
+  height: "Height"
+  width: "Width"
+  depth: "Depth"
   actions:
     create_and_add_another: "Create and Add Another"
     create: "Create"
@@ -1659,7 +1664,7 @@ en_IE:
   sell_hubs_detail: "Set up a profile for your food enterprise or organisation on the OFN. At any time you can upgrade your profile to a multi-producer shop."
   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 a profile on OFN Ireland is free. Plans for shops and hubs start from as little as £1 per month.  For more detail on pricing visit https://about.openfoodnetwork.org.ie/pricing-and-plans/ ."
+  sell_listing_price: "Listing a profile on OFN Ireland is free. Plans for shops and hubs start from as little as €1 per month.  For more details go to our Pricing page in the top menu."
   sell_embed: "We collectively budget for new feature development from the international OFN community. This way the huge cost of good software development can be shared. If you want a new feature, chances are someone in France, South Africa, Australia, India or Brazil might want it too! Use the Community Forum to suggest features you'd like to see."
   sell_ask_services: "Ask us about OFN services."
   shops_title: Shops
@@ -1722,6 +1727,7 @@ en_IE:
   remember_me: Remember Me
   are_you_sure: "Are you sure?"
   orders_open: "Orders open"
+  closing: "Closing"
   going_back_to_home_page: "Taking you back to the home page"
   creating: Creating
   updating: Updating
@@ -1871,7 +1877,7 @@ en_IE:
         enterprise_final_step: "Final step!"
         enterprise_social_text: "How can people find %{enterprise} online?"
         website: "Website"
-        website_placeholder: "eg. openfoodnetwork.org.au"
+        website_placeholder: "eg. openfoodnetwork.ie"
         facebook: "Facebook"
         facebook_placeholder: "eg. www.facebook.com/PageNameHere"
         linkedin: "LinkedIn"
@@ -1965,6 +1971,7 @@ en_IE:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  permalink: "Permalink"
   shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
@@ -2062,6 +2069,7 @@ en_IE:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Surname begins with"
+  shipping_method: "Shipping method"
   new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
@@ -3181,6 +3189,8 @@ en_IE:
           stripe:
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
+          paypal:
+            no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:
@@ -3379,6 +3389,11 @@ en_IE:
         thanks: "Thank you for your order with us."
         track_information: "Tracking Information: %{tracking}"
         track_link: "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulations!"
+        message: "If you have received this email, then your email settings are correct."
+        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments

From e5395709cc5bccdddc6dfa9136e6f28ab08f7bde Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Sat, 22 Aug 2020 21:18:58 +1000
Subject: [PATCH 336/340] Updating translations for config/locales/en_NZ.yml

---
 config/locales/en_NZ.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index a19889ff93..987b08cdf0 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -14,6 +14,7 @@ en_NZ:
       spree/payment:
         amount: Amount
         state: State
+        source: Source
       spree/product:
         primary_taxon: "Product Category"
         supplier: "Supplier"
@@ -272,6 +273,9 @@ en_NZ:
   on hand: "On Hand"
   ship: "Ship"
   shipping_category: "Shipping Category"
+  height: "Height"
+  width: "Width"
+  depth: "Depth"
   actions:
     create_and_add_another: "Create and Add Another"
     create: "Create"
@@ -1967,6 +1971,7 @@ en_NZ:
   supplier: "Supplier"
   product_name: "Product Name"
   product_description: "Product Description"
+  permalink: "Permalink"
   shipping_categories: "Shipping Categories"
   units: "Unit Size"
   coordinator: "Coordinator"
@@ -2064,6 +2069,7 @@ en_NZ:
   remove_tax: "Remove tax"
   first_name_begins_with: "First name begins with"
   last_name_begins_with: "Last name begins with"
+  shipping_method: "Shipping method"
   new_order: "New Order"
   enterprise_tos_link: "Enterprise Terms of Service link"
   enterprise_tos_message: "We want to work with people that share our aims and values. As such we ask new enterprises to agree to our "
@@ -3177,6 +3183,8 @@ en_NZ:
           stripe:
             error_saving_payment: Error saving payment
             submitting_payment: Submitting payment...
+          paypal:
+            no_payment_via_admin_backend: Paypal payments cannot be captured in the Backoffice
       products:
         image_upload_error: "The product image was not recognised. Please upload an image in PNG or JPG format."
         new:
@@ -3375,6 +3383,11 @@ en_NZ:
         thanks: "Thank you for your business."
         track_information: "Tracking Information: %{tracking}"
         track_link: "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulations!"
+        message: "If you have received this email, then your email settings are correct."
+        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments

From f9e29c5aa77797396c650c84bdc047dc3a54abd7 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 25 Aug 2020 07:24:29 +1000
Subject: [PATCH 337/340] Updating translations for config/locales/ar.yml

---
 config/locales/ar.yml | 215 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 215 insertions(+)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9659e0eb16..728504b5d3 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -14,6 +14,7 @@ ar:
       spree/payment:
         amount: القيمة
         state: ولاية
+        source: المصدر
       spree/product:
         primary_taxon: "نوع المنتج "
         supplier: "المورد"
@@ -34,6 +35,10 @@ ar:
               taken: "يوجد حساب متصل بهذا الايميل.\nالرجاء الدخول او اعادة تعيين كلمة السر."
         spree/order:
           no_card: لا يوجد بطاقة ائتمان معتمدة متاحة لاتمام عملية الدفع
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: "انتهت صلاحيته"
         order_cycle:
           attributes:
             orders_close_at:
@@ -179,6 +184,7 @@ ar:
         explainer: فشلت المعالجة التلقائية لهذه الطلبات لسبب غير معروف. لا ينبغي أن يحدث هذا ، يرجى الاتصال بنا إذا كنت ترى هذا.
   home: "OFN"
   title: "شبكة الغذاء المفتوح"
+  welcome_to: "مرحبا بك في"
   site_meta_description: "نبدأ من الألف إلى الياء. مع المزارعين والمزارعين على استعداد لرواية قصصهم بفخر وحق. مع الموزعين على استعداد لتوصيل الأشخاص بالمنتجات بطريقة عادلة وبصدق. مع المشترين الذين يعتقدون أن أفضل قرارات التسوق الأسبوعية يمكن ..."
   search_by_name: البحث بالاسم أو الضاحية ...
   producers_join: المنتجون الأستراليون مدعوون الآن للانضمام إلى شبكة الغذاء المفتوح.
@@ -267,6 +273,9 @@ ar:
   on hand: "متوفر"
   ship: "الشحن"
   shipping_category: "نوع الشحن"
+  height: "الارتفاع"
+  width: "العرض"
+  depth: "العمق"
   actions:
     create_and_add_another: "إنشاء وإضافة آخر"
     create: "انشاء"
@@ -322,6 +331,7 @@ ar:
     show_n_more: عرض %{num} أكثر
     choose: "أختر..."
     please_select: الرجاء اختيار ...
+    column_save_as_default: إحفظ كافتراض اساسي
     columns: أعمدة
     actions: أجراءات
     viewing: "عرض: %{current_view_name}"
@@ -366,7 +376,10 @@ ar:
         title: "إعدادات Matomo"
         matomo_url: "العنوان الالكتروني ل Matomo "
         matomo_site_id: "معرف موقع Matomo"
+        matomo_tag_manager_url: "عنوان URL لبرنامج Matomo "
+        info_html: "ماتومو هو تطبيق تحليلات الويب والجوال. يمكنك اضافة Matomo محليًا أو استخدام خدمة مستضافة على السحابة. انظر <a href='http://matomo.org' target='_blank'>matomo.org</a> لمزيد من المعلومات."
         config_instructions_html: "هنا يمكنك تهيئة تكامل Matomo لشبكة الغذاء المفتوح. يجب أن يشير عنوان الالكتروني URL الخاص بـ Matomo أدناه إلى مثيل Matomo حيث سيتم إرسال معلومات تتبع المستخدم إلى ؛ إذا تم تركه فارغًا ، فسيتم تعطيل تتبع مستخدم Matomo. حقل معرف الموقع ليس إلزاميًا ولكنه مفيد إذا كنت تتعقب أكثر من موقع ويب على مثيل Matomo  ؛ يمكن العثور عليه على وحدة تحكم مثيل Matomo."
+        config_instructions_tag_manager_html: "يؤدي تعيين عنوان URL لبرنامج Matomo إلى تمكين Matomo . تتيح لك هذه الأداة إعداد أحداث التحليلات. يتم نسخ عنوان URL لبرنامج Matomo من قسم كود التثبيت في Manager. تأكد من تحديد الحاوية والبيئة المناسبة لأن هذه الخيارات تغير عنوان URL."
     customers:
       index:
         new_customer: "عميل جديد"
@@ -472,6 +485,7 @@ ar:
         line_number: "السطر %{number}:"
         encoding_error: "يرجى التحقق من إعداد اللغة للملف المصدر والتأكد من حفظه بترميز UTF-8"
         unexpected_error: "واجه استيراد المنتج خطأ غير متوقع أثناء فتح الملف: %{error_message}"
+        malformed_csv: "صادف استيراد المنتج ملف CSV مشوه: %{error_message}"
       index:
         notice: "تنويه"
         beta_notice: "لا تزال هذه الميزة تجريبية: قد تواجه بعض الأخطاء أثناء استخدامها. من فضلك لا تتردد في الاتصال بالدعم."
@@ -684,6 +698,7 @@ ar:
           ofn_uid_tip: المعرف الفريد المستخدم لتحديد الشركة على شبكة الغذاء المفتوح.
         shipping_methods:
           name: "اسم"
+          applies: "نشيط؟"
           manage: "إدارة طرق الشحن"
           create_button: "إنشاء طريقة شحن جديدة"
           create_one_button: "إنشاء واحدة الآن"
@@ -861,6 +876,7 @@ ar:
         incoming: "الوارد"
         supplier: "المورد"
         products: "منتجات"
+        receival_details: "تفاصيل الاستلام"
         fees: "رسوم"
         save: "حفظ"
         save_and_next: "حفظ والتالي"
@@ -872,6 +888,7 @@ ar:
         distributor: "الموزع"
         products: "منتجات"
         tags: "الاوسمة"
+        delivery_details: "تفاصيل التسليم"
         fees: "رسوم"
         previous: "السابق"
         save: "حفظ"
@@ -1143,7 +1160,12 @@ ar:
         cart: "سلة"
       cart_sidebar:
         checkout: "تابع للخروج"
+        edit_cart: "تعديل سلة التسوق"
+        items_in_cart_singular: "%{num} عنصر في سلة التسوق الخاصة بك"
+        items_in_cart_plural: "%{num} العناصر في سلة التسوق الخاصة بك"
         close: "إغلاق"
+        cart_empty: "سلة التسوق فارغة"
+        take_me_shopping: "خذني للتسوق!"
       signed_in:
         profile: "الملف الشخصي"
       mobile_menu:
@@ -1175,7 +1197,11 @@ ar:
         signup: "سجل"
         contact: "اتصل"
         require_customer_login: "يمكن للعملاء المعتمدين فقط الوصول إلى هذا المتجر."
+        require_login_html: "إذا كنت عميلاً معتمدًا بالفعل ، %{login} أو %{signup} للمتابعة."
+        require_login_2_html: "تريد أن تبدأ التسوق هنا؟ من فضلك %{contact} %{enterprise} واسأل عن الانضمام."
         require_customer_html: "إذا كنت ترغب في بدء التسوق هنا ، فيرجى %{contact} %{enterprise} أن تسأل عن الانضمام."
+      select_oc:
+        select_oc_html: "يرجى <span class='highlighted'>اختيار الوقت الذي تريده لطلبك</span> ، لمعرفة المنتجات المتوفرة."
   card_could_not_be_updated: لا يمكن تحديث البطاقة
   card_could_not_be_saved: لا يمكن حفظ البطاقة
   spree_gateway_error_flash_for_checkout: "حدثت مشكلة في معلومات الدفع الخاصة بك: %{error}"
@@ -1541,12 +1567,17 @@ ar:
   orders_changeable_orders_alert_html: تم تأكيد هذا الطلب ، ولكن يمكنك إجراء تغييرات حتى <strong>%{oc_close}</strong> .
   products_clear: ازالة
   products_showing: "عرض:"
+  products_results_for: "نتائج"
   products_or: "أو"
   products_and: "و"
+  products_filters_in: "في"
   products_with: مع
+  products_search: "بحث..."
   products_filter_by: "مرشح بواسطة"
   products_filter_selected: "تم الاختيار"
+  products_filter_heading: "المرشحات"
   products_filter_clear: "ازالة"
+  products_filter_done: "تم"
   products_loading: "جارٍ تحميل المنتجات ..."
   products_updating_cart: "جارٍ تحديث سلة المشتريات..."
   products_cart_empty: "السلة فارغة"
@@ -1557,6 +1588,8 @@ ar:
   products_update_error_msg: "فشل الحفظ."
   products_update_error_data: "فشل الحفظ بسبب بيانات غير صالحة:"
   products_changes_saved: "تم حفظ التغييرات."
+  products_no_results_html: "عذرا ، لم يتم العثور على نتائج لـ %{query}"
+  products_clear_search: "مسح البحث"
   search_no_results_html: "عذرًا ، لم يتم العثور على نتائج لـ %{query}. جرب بحث آخر؟"
   components_profiles_popover: "لا تملك ملفات التعريف واجهة متجر على شبكة الغذاء المفتوح ، ولكن قد يكون لها متجر على ارض الواقع أو عبر الإنترنت في أي مكان آخر"
   components_profiles_show: "إظهار الملفات الشخصية"
@@ -1701,6 +1734,7 @@ ar:
   remember_me: تذكرنى
   are_you_sure: "هل أنت واثق؟"
   orders_open: "الطلب مفتوح"
+  closing: "إغلاق"
   going_back_to_home_page: "الرجوع إلى الصفحة الرئيسية"
   creating: انشاء
   updating: تحديث
@@ -1915,6 +1949,7 @@ ar:
   admin_enterprise_relationships_permits: "تسمح"
   admin_enterprise_relationships_seach_placeholder: "بحث"
   admin_enterprise_relationships_button_create: "انشاء"
+  admin_enterprise_relationships_to: "إلى"
   admin_enterprise_groups: "مجموعات المؤسسة"
   admin_enterprise_groups_name: "اسم"
   admin_enterprise_groups_owner: "المالك"
@@ -1943,6 +1978,7 @@ ar:
   supplier: "المورد"
   product_name: "اسم المنتج"
   product_description: "وصف المنتج"
+  permalink: "الرابط الثابت"
   shipping_categories: "فئات الشحن"
   units: "حجم الوحدة"
   coordinator: "منسق"
@@ -2040,6 +2076,7 @@ ar:
   remove_tax: "إزالة الضريبة"
   first_name_begins_with: "الاسم الأول يبدأ بـ"
   last_name_begins_with: "اسم العائلة يبدأ بـ"
+  shipping_method: "طريقة الشحن"
   new_order: "طلب جديد"
   enterprise_tos_link: "شروط المؤسسة لخدمة الرابط"
   enterprise_tos_message: "نريد العمل مع أشخاص يشاركوننا أهدافنا وقيمنا. على هذا النحو ، نطلب من المؤسسات الجديدة الموافقة على"
@@ -2059,6 +2096,7 @@ ar:
   hub_sidebar_at_least: "يجب تحديد مركز واحد على الأقل"
   hub_sidebar_blue: "أزرق"
   hub_sidebar_red: "أحمر"
+  order_cycles_closed_for_hub: "المحور الذي حددته مغلق مؤقتًا للطلبات. الرجاء معاودة المحاولة في وقت لاحق."
   report_customers_distributor: "الموزع"
   report_customers_supplier: "المورد"
   report_customers_cycle: "ترتيب الدورة"
@@ -2293,6 +2331,7 @@ ar:
   order_cycles_email_to_producers_notice: 'رسائل البريد الإلكتروني المراد إرسالها إلى المنتجين تم وضعها في قائمة الانتظار للإرسال.'
   order_cycles_no_permission_to_coordinate_error: "لا تملك أي من مؤسساتك إذنًا لتنسيق دورة الطلب"
   order_cycles_no_permission_to_create_error: "ليس لديك إذن لإنشاء دورة طلب تنسقها تلك المؤسسة"
+  order_cycle_closed: "تم إغلاق دورة الطلب التي حددتها للتو. حاول مرة اخرى!"
   back_to_orders_list: "العودة إلى قائمة الطلب"
   no_orders_found: "لم يتم العثور على أية طلبات"
   order_information: "معلومات الطلب"
@@ -2320,6 +2359,10 @@ ar:
     resolve_errors: يرجى حل الأخطاء التالية
     more_items: "+ %{count} ايضا"
     default_card_updated: تم تحديث البطاقة الافتراضية
+    cart:
+      add_to_cart_failed: >
+          حدثت مشكلة أثناء إضافة هذا المنتج إلى عربة التسوق. ربما أصبح غير متوفر أو
+          أن المحل يغلق.
     admin:
       enterprise_limit_reached: "لقد وصلت إلى الحد القياسي للمؤسسات لكل حساب. اكتب %{contact_email} إذا كنت بحاجة إلى زيادته."
       modals:
@@ -2604,6 +2647,13 @@ ar:
       few: "كل"
       many: "كل"
       other: "كل"
+    bunch:
+      zero: "عناقيد"
+      one: "حفنة"
+      two: "عناقيد"
+      few: "عناقيد"
+      many: "عناقيد"
+      other: "عناقيد"
     pack:
       zero: "حزم"
       one: "رزمة"
@@ -2611,6 +2661,13 @@ ar:
       few: "حزم"
       many: "حزم"
       other: "حزم"
+    box:
+      zero: "مربعات"
+      one: "صندوق"
+      two: "مربعات"
+      few: "مربعات"
+      many: "مربعات"
+      other: "بكسات"
     bottle:
       zero: "زجاجات"
       one: "زجاجة"
@@ -2618,6 +2675,62 @@ ar:
       few: "زجاجات"
       many: "زجاجات"
       other: "زجاجات"
+    jar:
+      zero: "الجرار"
+      one: "إناء"
+      two: "الجرار"
+      few: "الجرار"
+      many: "الجرار"
+      other: "مرتبان"
+    head:
+      zero: "رؤساء"
+      one: "رئيس"
+      two: "رؤساء"
+      few: "رؤساء"
+      many: "رؤساء"
+      other: "رؤوس"
+    bag:
+      zero: "أكياس"
+      one: "كيس"
+      two: "أكياس"
+      few: "أكياس"
+      many: "أكياس"
+      other: "أكياس"
+    loaf:
+      zero: "أرغفة"
+      one: "رغيف"
+      two: "أرغفة"
+      few: "أرغفة"
+      many: "أرغفة"
+      other: "أرغفة"
+    single:
+      zero: "الفردي"
+      one: "غير مرتبطة"
+      two: "الفردي"
+      few: "الفردي"
+      many: "الفردي"
+      other: "الفردي"
+    tub:
+      zero: "أحواض"
+      one: "حوض"
+      two: "أحواض"
+      few: "أحواض"
+      many: "أحواض"
+      other: "أحواض"
+    punnet:
+      zero: "سلات"
+      one: "إناء"
+      two: "سلات"
+      few: "سلات"
+      many: "سلات"
+      other: "سلات"
+    packet:
+      zero: "الحزم"
+      one: "رزمة"
+      two: "الحزم"
+      few: "الحزم"
+      many: "الحزم"
+      other: "الحزم"
     item:
       zero: "العناصر"
       one: "بند"
@@ -2639,6 +2752,62 @@ ar:
       few: "الوحدات"
       many: "الوحدات"
       other: "الوحدات"
+    serve:
+      zero: "يخدم"
+      one: "تخدم"
+      two: "يخدم"
+      few: "يخدم"
+      many: "يخدم"
+      other: "خدمة"
+    tray:
+      zero: "صواني"
+      one: "صينية"
+      two: "صواني"
+      few: "صواني"
+      many: "صواني"
+      other: "صواني"
+    piece:
+      zero: "قطع"
+      one: "قطعة"
+      two: "قطع"
+      few: "قطع"
+      many: "قطع"
+      other: "قطع"
+    pot:
+      zero: "الأواني"
+      one: "وعاء"
+      two: "الأواني"
+      few: "الأواني"
+      many: "الأواني"
+      other: "اصص"
+    bundle:
+      zero: "حزم"
+      one: "حزمة"
+      two: "حزم"
+      few: "حزم"
+      many: "حزم"
+      other: "حزم"
+    flask:
+      zero: "قوارير"
+      one: "قارورة"
+      two: "قوارير"
+      few: "قوارير"
+      many: "قوارير"
+      other: "قوارير"
+    basket:
+      zero: "سلال"
+      one: "سلة"
+      two: "سلال"
+      few: "سلال"
+      many: "سلال"
+      other: "سلال"
+    sack:
+      zero: "أكياس"
+      one: "كيس"
+      two: "أكياس"
+      few: "أكياس"
+      many: "أكياس"
+      other: "أكياس"
   producers:
     signup:
       start_free_profile: "ابدأ بملف تعريف مجاني ، وتوسع عندما تكون جاهزًا!"
@@ -2768,6 +2937,12 @@ ar:
     void: "فارغ"
     login: "تسجيل الدخول"
     password: "كلمه السر"
+    signature: "التوقيع"
+    solution: "المحاليل"
+    landing_page: "الصفحة المقصودة"
+    server: "الخادم"
+    test_mode: "وضع الاختبار"
+    logourl: "وحدة"
     configurations: "تهيئة"
     general_settings: "الاعدادات العامة"
     site_name: "اسم الموقع"
@@ -2884,6 +3059,16 @@ ar:
     options: "خيارات"
     actions:
       update: "تحديث"
+    shared:
+      error_messages:
+        errors_prohibited_this_record_from_being_saved:
+          zero: "منعت أخطاء %{count} حفظ هذا السجل:"
+          one: "حظر خطأ واحد حفظ هذا السجل:"
+          two: "منعت أخطاء %{count} حفظ هذا السجل:"
+          few: "منعت أخطاء %{count} حفظ هذا السجل:"
+          many: "منعت أخطاء %{count} حفظ هذا السجل:"
+          other: "منعت أخطاء %{count} حفظ هذا السجل:"
+        there_were_problems_with_the_following_fields: "كانت هناك مشاكل مع الحقول التالية"
     errors:
       messages:
         blank: "لا يمكن أن تكون فارغة"
@@ -3026,6 +3211,8 @@ ar:
           zone: "منطقة"
           calculator: "آلة حاسبة"
           display: "عرض"
+          both: "كل من تسجيل الخروج والمكتب الخلفي"
+          back_end: "المكتب الخلفي فقط"
           no_shipping_methods_found: "لم يتم العثور على طرق الشحن"
         new:
           new_shipping_method: "طريقة الشحن الجديدة"
@@ -3037,6 +3224,9 @@ ar:
         form:
           categories: "التصنيفات"
           zones: "مناطق"
+          both: "كل من تسجيل الخروج والمكتب الخلفي"
+          back_end: "المكتب الخلفي فقط"
+          deactivation_warning: "يمكن أن يؤدي إلغاء تنشيط طريقة الشحن إلى اختفاء طريقة الشحن من قائمتك. بدلاً من ذلك ، يمكنك إخفاء طريقة الشحن من صفحة الخروج عن طريق تعيين الخيار\"عرض\" إلى\"المكتب الخلفي فقط\"."
       payment_methods:
         index:
           payment_methods: "طريقة الدفع"
@@ -3048,8 +3238,11 @@ ar:
           display: "عرض"
           active: "نشط"
           both: "على حد سواء"
+          front_end: "الخروج فقط"
+          back_end: "المكتب الخلفي فقط"
           active_yes: "نعم"
           active_no: "لا"
+          no_payment_methods_found: "لم يتم العثور على طرق دفع"
         new:
           new_payment_method: "طريقة الدفع الجديدة"
           back_to_payment_methods_list: "العودة إلى قائمة طرق الدفع"
@@ -3078,7 +3271,11 @@ ar:
           active: "نشط"
           active_yes: "نعم"
           active_no: "لا"
+          both: "كل من تسجيل الخروج والمكتب الخلفي"
+          front_end: "الخروج فقط"
+          back_end: "المكتب الخلفي فقط"
           tags: "الاوسمة"
+          deactivation_warning: "يمكن أن يؤدي إلغاء تنشيط طريقة الدفع إلى اختفاء طريقة الدفع من قائمتك. بدلاً من ذلك ، يمكنك إخفاء طريقة الدفع من صفحة الخروج عن طريق تعيين الخيار \"عرض\" إلى\"المكتب الخلفي فقط\"."
         providers:
           provider: "مزود"
       payments:
@@ -3086,6 +3283,8 @@ ar:
           stripe:
             error_saving_payment: خطأ في حفظ الدفعة
             submitting_payment: تقديم الدفعة ...
+          paypal:
+            no_payment_via_admin_backend: لا يمكن التقاط مدفوعات Paypal في Backoffice
       products:
         image_upload_error: "لم يتم التعرف على صورة المنتج. يرجى تحميل صورة بتنسيق PNG أو JPG."
         new:
@@ -3180,6 +3379,8 @@ ar:
           price: "السعر"
           display_as: "عرض ب"
           display_name: "اسم العرض"
+          display_as_placeholder: 'على سبيل المثال 2 كجم'
+          display_name_placeholder: 'على سبيل المثال طماطم'
         autocomplete:
           out_of_stock: "غير متوفر"
           producer_name: "المنتج"
@@ -3219,6 +3420,7 @@ ar:
       format: '٪ س-٪ م-%d'
       js_format: 'يوم-شهر-سنة'
     orders:
+      error_flash_for_unavailable_items: "عنصر في سلة التسوق الخاصة بك أصبح غير متوفر. يرجى تحديث الكميات المحددة."
       edit:
         login_to_view_order: "يرجى تسجيل الدخول لعرض طلبك."
       bought:
@@ -3246,6 +3448,14 @@ ar:
       invalid: غير صالحة
     order_mailer:
       cancel_email:
+        customer_greeting: "عزيزي %{name} ،"
+        instructions_html: "تم إلغاء طلبك مع <strong>%{distributor}</strong> . يرجى الاحتفاظ بمعلومات الإلغاء هذه في سجلاتك."
+        dont_cancel: "إذا غيرت رأيك أو لا ترغب في إلغاء هذا الطلب ، فيرجى الاتصال بـ %{email}"
+        order_summary_canceled_html: "<strong>ملخص الطلب # %{number} [ملغي]</strong>"
+        details: "إليك تفاصيل ما طلبته:"
+        unpaid_order: "لم يتم سداد طلبك ، لذا لم يتم رد الأموال"
+        paid_order: "تم دفع طلبك حتى أعاد %{distributor} المبلغ بالكامل"
+        credit_order: "تم دفع طلبك حتى تم إضافة رصيد إلى حسابك"
         subject: "إلغاء الطلب"
       confirm_email:
         subject: "تأكيد الطلب"
@@ -3273,6 +3483,11 @@ ar:
         thanks: "شكرا لك على اعمالك."
         track_information: "معلومات التتبع : %{tracking}"
         track_link: "رابط التتبع: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "تهانينا!"
+        message: "إذا كنت قد تلقيت هذا البريد الإلكتروني ، فإن إعدادات بريدك الإلكتروني صحيحة."
+        subject: "اختبار البريد"
     order_state:
       address: العنوان
       adjustments: التعديلات

From 489665f3f9bcdecf679c682b90d4c2355d5328f5 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 25 Aug 2020 18:21:04 +1000
Subject: [PATCH 338/340] Updating translations for config/locales/ca.yml

---
 config/locales/ca.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1644f0cdb0..c1ac9478a7 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -3389,6 +3389,11 @@ ca:
         thanks: "Gràcies per la teva compra."
         track_information: "Informació del seguiment: %{tracking}"
         track_link: "Enllaç del seguiment: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Enhorabona!"
+        message: "Si heu rebut aquest correu electrònic, la vostra configuració de correu electrònic és correcta."
+        subject: "Correu de prova"
     order_state:
       address: adreça
       adjustments: ajustaments

From 1c7ce9997a00dc2df6a8ad6538657b140c523733 Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 25 Aug 2020 18:21:19 +1000
Subject: [PATCH 339/340] Updating translations for config/locales/es.yml

---
 config/locales/es.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 111960a8ae..206400d614 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3389,6 +3389,11 @@ es:
         thanks: "Gracias por hacer negocios."
         track_information: "Información de seguimiento: %{tracking}"
         track_link: "Enlace de seguimiento: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "¡Felicidades!"
+        message: "Si ha recibido este correo electrónico, su configuración de correo electrónico es correcta."
+        subject: "Correo de prueba"
     order_state:
       address: dirección
       adjustments: ajustes

From 5ce51a4abb8ed38141f4ccdf2d30466ebbc1810a Mon Sep 17 00:00:00 2001
From: Transifex-Openfoodnetwork <transifex@openfoodnetwork.org>
Date: Tue, 25 Aug 2020 18:23:24 +1000
Subject: [PATCH 340/340] Updating translations for config/locales/nb.yml

---
 config/locales/nb.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 2a7b0b4e14..6abf1fb797 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -273,6 +273,9 @@ nb:
   on hand: "Tilgjengelig"
   ship: "Levere"
   shipping_category: "Leveringskategori"
+  height: "Høyde"
+  width: "Bredde"
+  depth: "Dybde"
   actions:
     create_and_add_another: "Opprett og legg til en annen"
     create: "Opprett"
@@ -3379,6 +3382,11 @@ nb:
         thanks: "Takk for handelen."
         track_information: "Sporingsinformasjon: %{tracking}"
         track_link: "Sporingslink: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Gratulerer!"
+        message: "Hvis du har mottatt denne eposten, er epostinnstillingene dine riktige."
+        subject: "Test Epost"
     order_state:
       address: adresse
       adjustments: justeringer