From 5f0b4b3496b418db201c2bf0ab143c7ae7417c45 Mon Sep 17 00:00:00 2001
From: Nicolas Hedger <nicolas@hedger.ch>
Date: Wed, 11 Dec 2019 20:36:46 +0100
Subject: [PATCH 1/2] Prepend currency code to selector label.

---
 resources/assets/js/views/settings/Preferences.vue | 4 ++++
 resources/assets/js/views/wizard/Settings.vue      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/resources/assets/js/views/settings/Preferences.vue b/resources/assets/js/views/settings/Preferences.vue
index 43e0e892..37a5e21c 100644
--- a/resources/assets/js/views/settings/Preferences.vue
+++ b/resources/assets/js/views/settings/Preferences.vue
@@ -14,6 +14,7 @@
             <base-select
               v-model="formData.currency"
               :options="currencies"
+              :custom-label="currencyNameWithCode"
               :class="{'error': $v.formData.currency.$error }"
               :searchable="true"
               :show-labels="false"
@@ -179,6 +180,9 @@ export default {
     this.getDiscountSettings()
   },
   methods: {
+    currencyNameWithCode ({name, code}) {
+      return `${code} - ${name}`
+    },
     ...mapActions('currency', [
       'setDefaultCurrency'
     ]),
diff --git a/resources/assets/js/views/wizard/Settings.vue b/resources/assets/js/views/wizard/Settings.vue
index 346e020f..365dea00 100644
--- a/resources/assets/js/views/wizard/Settings.vue
+++ b/resources/assets/js/views/wizard/Settings.vue
@@ -11,6 +11,7 @@
             v-model="settingData.currency"
             :class="{'error': $v.settingData.currency.$error }"
             :options="currencies"
+            :custom-label="currencyNameWithCode"
             :searchable="true"
             :show-labels="false"
             :placeholder="$t('settings.currencies.select_currency')"
@@ -150,6 +151,9 @@ export default {
     this.getOnboardingData()
   },
   methods: {
+    currencyNameWithCode ({name, code}) {
+      return `${code} - ${name}`
+    },
     ...mapActions('auth', [
       'loginOnBoardingUser'
     ]),

From b06fc5f0b92136a29bae2d6d390c7a77aa17c44f Mon Sep 17 00:00:00 2001
From: Nicolas Hedger <649677+nhedger@users.noreply.github.com>
Date: Thu, 12 Dec 2019 14:37:16 +0100
Subject: [PATCH 2/2] Add missing currency code to customer create form

---
 resources/assets/js/views/customers/Create.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/assets/js/views/customers/Create.vue b/resources/assets/js/views/customers/Create.vue
index 5c2cade6..804794e3 100644
--- a/resources/assets/js/views/customers/Create.vue
+++ b/resources/assets/js/views/customers/Create.vue
@@ -61,6 +61,7 @@
                 <base-select
                   v-model="currency"
                   :options="currencies"
+                  :custom-label="currencyNameWithCode"
                   :allow-empty="false"
                   :searchable="true"
                   :show-labels="false"
@@ -435,6 +436,9 @@ export default {
     }
   },
   methods: {
+    currencyNameWithCode ({name, code}) {
+      return `${code} - ${name}`
+    },
     ...mapActions('customer', [
       'addCustomer',
       'fetchCustomer',