Move currency selector to separate General Settings section
Changes: - Reorganized UserSettingsForm layout - Moved currency select field from tenant 2D code fieldset to new "General Settings" fieldset at the top of the form - Added translations for "general-settings-legend": - English: "General Settings" - Croatian: "Opće postavke" Currency is now in a more logical location as a general setting rather than being grouped with tenant-specific 2D code settings. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -49,6 +49,67 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
<fieldset className="fieldset bg-base-200 border-base-300 rounded-box w-xs border p-4 pt-1 pb-2 mt-4">
|
||||||
|
<legend className="fieldset-legend font-semibold uppercase">{t("general-settings-legend")}</legend>
|
||||||
|
|
||||||
|
<div className="form-control w-full">
|
||||||
|
<label className="label">
|
||||||
|
<span className="label-text">{t("currency-label")}</span>
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
id="currency"
|
||||||
|
name="currency"
|
||||||
|
className="select select-bordered w-full"
|
||||||
|
defaultValue={userSettings?.currency ?? "EUR"}
|
||||||
|
onChange={(e) => handleInputChange("currency", e.target.value)}
|
||||||
|
disabled={pending}
|
||||||
|
>
|
||||||
|
<option value="EUR">EUR - Euro</option>
|
||||||
|
<option value="USD">USD - US Dollar</option>
|
||||||
|
<option value="GBP">GBP - British Pound</option>
|
||||||
|
<option value="CHF">CHF - Swiss Franc</option>
|
||||||
|
<option value="JPY">JPY - Japanese Yen</option>
|
||||||
|
<option value="CAD">CAD - Canadian Dollar</option>
|
||||||
|
<option value="AUD">AUD - Australian Dollar</option>
|
||||||
|
<option value="NZD">NZD - New Zealand Dollar</option>
|
||||||
|
<option value="CNY">CNY - Chinese Yuan</option>
|
||||||
|
<option value="HKD">HKD - Hong Kong Dollar</option>
|
||||||
|
<option value="SGD">SGD - Singapore Dollar</option>
|
||||||
|
<option value="SEK">SEK - Swedish Krona</option>
|
||||||
|
<option value="NOK">NOK - Norwegian Krone</option>
|
||||||
|
<option value="DKK">DKK - Danish Krone</option>
|
||||||
|
<option value="PLN">PLN - Polish Zloty</option>
|
||||||
|
<option value="CZK">CZK - Czech Koruna</option>
|
||||||
|
<option value="HUF">HUF - Hungarian Forint</option>
|
||||||
|
<option value="RON">RON - Romanian Leu</option>
|
||||||
|
<option value="BGN">BGN - Bulgarian Lev</option>
|
||||||
|
<option value="RSD">RSD - Serbian Dinar</option>
|
||||||
|
<option value="BAM">BAM - Bosnia-Herzegovina Mark</option>
|
||||||
|
<option value="MKD">MKD - Macedonian Denar</option>
|
||||||
|
<option value="ALL">ALL - Albanian Lek</option>
|
||||||
|
<option value="TRY">TRY - Turkish Lira</option>
|
||||||
|
<option value="RUB">RUB - Russian Ruble</option>
|
||||||
|
<option value="UAH">UAH - Ukrainian Hryvnia</option>
|
||||||
|
<option value="INR">INR - Indian Rupee</option>
|
||||||
|
<option value="BRL">BRL - Brazilian Real</option>
|
||||||
|
<option value="MXN">MXN - Mexican Peso</option>
|
||||||
|
<option value="ZAR">ZAR - South African Rand</option>
|
||||||
|
<option value="KRW">KRW - South Korean Won</option>
|
||||||
|
<option value="THB">THB - Thai Baht</option>
|
||||||
|
<option value="MYR">MYR - Malaysian Ringgit</option>
|
||||||
|
<option value="IDR">IDR - Indonesian Rupiah</option>
|
||||||
|
<option value="PHP">PHP - Philippine Peso</option>
|
||||||
|
</select>
|
||||||
|
<div id="currency-error" aria-live="polite" aria-atomic="true">
|
||||||
|
{errors?.currency &&
|
||||||
|
errors.currency.map((error: string) => (
|
||||||
|
<p className="mt-2 text-sm text-red-500" key={error}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
<fieldset className="fieldset bg-base-200 border-base-300 rounded-box w-xs border p-4 pb-2 mt-4">
|
<fieldset className="fieldset bg-base-200 border-base-300 rounded-box w-xs border p-4 pb-2 mt-4">
|
||||||
<legend className="fieldset-legend font-semibold uppercase">{t("tenant-2d-code-legend")}</legend>
|
<legend className="fieldset-legend font-semibold uppercase">{t("tenant-2d-code-legend")}</legend>
|
||||||
|
|
||||||
@@ -168,63 +229,6 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="form-control w-full">
|
|
||||||
<label className="label">
|
|
||||||
<span className="label-text">{t("currency-label")}</span>
|
|
||||||
</label>
|
|
||||||
<select
|
|
||||||
id="currency"
|
|
||||||
name="currency"
|
|
||||||
className="select select-bordered w-full"
|
|
||||||
defaultValue={userSettings?.currency ?? "EUR"}
|
|
||||||
onChange={(e) => handleInputChange("currency", e.target.value)}
|
|
||||||
disabled={pending}
|
|
||||||
>
|
|
||||||
<option value="EUR">EUR - Euro</option>
|
|
||||||
<option value="USD">USD - US Dollar</option>
|
|
||||||
<option value="GBP">GBP - British Pound</option>
|
|
||||||
<option value="CHF">CHF - Swiss Franc</option>
|
|
||||||
<option value="JPY">JPY - Japanese Yen</option>
|
|
||||||
<option value="CAD">CAD - Canadian Dollar</option>
|
|
||||||
<option value="AUD">AUD - Australian Dollar</option>
|
|
||||||
<option value="NZD">NZD - New Zealand Dollar</option>
|
|
||||||
<option value="CNY">CNY - Chinese Yuan</option>
|
|
||||||
<option value="HKD">HKD - Hong Kong Dollar</option>
|
|
||||||
<option value="SGD">SGD - Singapore Dollar</option>
|
|
||||||
<option value="SEK">SEK - Swedish Krona</option>
|
|
||||||
<option value="NOK">NOK - Norwegian Krone</option>
|
|
||||||
<option value="DKK">DKK - Danish Krone</option>
|
|
||||||
<option value="PLN">PLN - Polish Zloty</option>
|
|
||||||
<option value="CZK">CZK - Czech Koruna</option>
|
|
||||||
<option value="HUF">HUF - Hungarian Forint</option>
|
|
||||||
<option value="RON">RON - Romanian Leu</option>
|
|
||||||
<option value="BGN">BGN - Bulgarian Lev</option>
|
|
||||||
<option value="RSD">RSD - Serbian Dinar</option>
|
|
||||||
<option value="BAM">BAM - Bosnia-Herzegovina Mark</option>
|
|
||||||
<option value="MKD">MKD - Macedonian Denar</option>
|
|
||||||
<option value="ALL">ALL - Albanian Lek</option>
|
|
||||||
<option value="TRY">TRY - Turkish Lira</option>
|
|
||||||
<option value="RUB">RUB - Russian Ruble</option>
|
|
||||||
<option value="UAH">UAH - Ukrainian Hryvnia</option>
|
|
||||||
<option value="INR">INR - Indian Rupee</option>
|
|
||||||
<option value="BRL">BRL - Brazilian Real</option>
|
|
||||||
<option value="MXN">MXN - Mexican Peso</option>
|
|
||||||
<option value="ZAR">ZAR - South African Rand</option>
|
|
||||||
<option value="KRW">KRW - South Korean Won</option>
|
|
||||||
<option value="THB">THB - Thai Baht</option>
|
|
||||||
<option value="MYR">MYR - Malaysian Ringgit</option>
|
|
||||||
<option value="IDR">IDR - Indonesian Rupiah</option>
|
|
||||||
<option value="PHP">PHP - Philippine Peso</option>
|
|
||||||
</select>
|
|
||||||
<div id="currency-error" aria-live="polite" aria-atomic="true">
|
|
||||||
{errors?.currency &&
|
|
||||||
errors.currency.map((error: string) => (
|
|
||||||
<p className="mt-2 text-sm text-red-500" key={error}>
|
|
||||||
{error}
|
|
||||||
</p>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<InfoBox className="p-1 mt-1">{t("additional-notes")}</InfoBox>
|
<InfoBox className="p-1 mt-1">{t("additional-notes")}</InfoBox>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -197,6 +197,7 @@
|
|||||||
"owner-town-placeholder": "enter your postal code and town",
|
"owner-town-placeholder": "enter your postal code and town",
|
||||||
"owner-iban-label": "IBAN",
|
"owner-iban-label": "IBAN",
|
||||||
"owner-iban-placeholder": "enter your IBAN",
|
"owner-iban-placeholder": "enter your IBAN",
|
||||||
|
"general-settings-legend": "General Settings",
|
||||||
"currency-label": "Currency",
|
"currency-label": "Currency",
|
||||||
"save-button": "Save",
|
"save-button": "Save",
|
||||||
"cancel-button": "Cancel",
|
"cancel-button": "Cancel",
|
||||||
|
|||||||
@@ -196,6 +196,7 @@
|
|||||||
"owner-town-placeholder": "unesite poštanski broj i grad",
|
"owner-town-placeholder": "unesite poštanski broj i grad",
|
||||||
"owner-iban-label": "IBAN",
|
"owner-iban-label": "IBAN",
|
||||||
"owner-iban-placeholder": "unesite svoj IBAN",
|
"owner-iban-placeholder": "unesite svoj IBAN",
|
||||||
|
"general-settings-legend": "Opće postavke",
|
||||||
"currency-label": "Valuta",
|
"currency-label": "Valuta",
|
||||||
"save-button": "Spremi",
|
"save-button": "Spremi",
|
||||||
"cancel-button": "Odbaci",
|
"cancel-button": "Odbaci",
|
||||||
|
|||||||
Reference in New Issue
Block a user