From 73af7d41193877265c03cee20c10a2d336ec8a67 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Mon, 21 Nov 2022 12:47:14 +0200
Subject: [PATCH] currency field ui impr

---
 client/res/templates/fields/currency/edit.tpl |  4 ++++
 client/src/views/fields/currency.js           |  8 +++++++-
 frontend/less/espo/custom.less                | 11 ++++++++++-
 frontend/less/espo/elements/form.less         |  7 +++++--
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/client/res/templates/fields/currency/edit.tpl b/client/res/templates/fields/currency/edit.tpl
index 5df95e301f..64c9e0b47b 100644
--- a/client/res/templates/fields/currency/edit.tpl
+++ b/client/res/templates/fields/currency/edit.tpl
@@ -10,10 +10,14 @@
             {{#if params.maxLength}} maxlength="{{params.maxLength}}"{{/if}}
         >
     </span>
+    {{#if multipleCurrencies}}
     <span class="input-group-item">
         <select
             data-name="{{currencyFieldName}}"
             class="form-control radius-right"
         >{{{options currencyList currencyValue}}}</select>
     </span>
+    {{else}}
+    <span class="input-group-addon radius-right">{{defaultCurrency}}</span>
+    {{/if}}
 </div>
diff --git a/client/src/views/fields/currency.js b/client/src/views/fields/currency.js
index 853a736acd..70ef8d571f 100644
--- a/client/src/views/fields/currency.js
+++ b/client/src/views/fields/currency.js
@@ -60,12 +60,16 @@ function (Dep, /** module:ui/select*/Select) {
                 this.getPreferences().get('defaultCurrency') ||
                 this.getConfig().get('defaultCurrency');
 
+            let multipleCurrencies = !this.isSingleCurrency || currencyValue !== this.defaultCurrency;
+
             return _.extend({
                 currencyFieldName: this.currencyFieldName,
                 currencyValue: currencyValue,
                 currencyOptions: this.currencyOptions,
                 currencyList: this.currencyList,
                 currencySymbol: this.getMetadata().get(['app', 'currency', 'symbolMap', currencyValue]) || '',
+                multipleCurrencies: multipleCurrencies,
+                defaultCurrency: this.defaultCurrency,
             }, Dep.prototype.data.call(this));
         },
 
@@ -223,7 +227,9 @@ function (Dep, /** module:ui/select*/Select) {
 
             let data = {};
 
-            let currencyValue = this.$currency.val();
+            let currencyValue = this.$currency.length ?
+                this.$currency.val() :
+                this.defaultCurrency;
 
             if (value === null) {
                 currencyValue = null;
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 5e00b75662..2ab428b420 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -3663,12 +3663,21 @@ a.close:hover {
 
     > .input-group-item:first-child {
         flex-grow: 1;
+        display: block;
     }
 
     > .input-group-item:last-child {
         flex-grow: 1;
+        display: block;
         min-width: 70px;
-        max-width: 22%;
+        max-width: 80px;
+    }
+
+    > .input-group-addon:last-child {
+        flex-grow: 1;
+        display: block;
+        min-width: fit-content;
+        max-width: fit-content;
     }
 }
 
diff --git a/frontend/less/espo/elements/form.less b/frontend/less/espo/elements/form.less
index f3c8f19583..30cd763601 100644
--- a/frontend/less/espo/elements/form.less
+++ b/frontend/less/espo/elements/form.less
@@ -401,11 +401,14 @@ input[type="radio"].form-radio {
 }
 
 .input-group-addon {
-    .radius-left {
+    padding: 6px 10px;
+    line-height: 1.5;
+
+    &.radius-left {
         border-top-left-radius: var(--border-radius);
         border-bottom-left-radius: var(--border-radius);
     }
-    .radius-right {
+    &.radius-right {
         border-top-right-radius: var(--border-radius);
         border-bottom-right-radius: var(--border-radius);
     }