From e9e7bdc6cda767a6011da684d0be468d5cfdc0d4 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 17 Oct 2020 17:54:48 +0100
Subject: [PATCH] Set `Spree::Config[:default_country_id]`` from ENV vars if
 default country specified.

---
 db/default/countries.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/default/countries.rb b/db/default/countries.rb
index 8e96d47f4f..846e77bdf3 100644
--- a/db/default/countries.rb
+++ b/db/default/countries.rb
@@ -227,4 +227,4 @@ Spree::Country.create!([
   { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659" },
   { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" }
 ])
-Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id
+Spree::Config[:default_country_id] = Spree::Country.find_by(iso: ENV.fetch("DEFAULT_COUNTRY_CODE", "US").id)