merge

Author: kittendevv

frontend/src/routes/settings/+page.svelte

@@ -481,27 +481,27 @@
                 ><div class="label">
                   <span class="label-text">{t("Email")}</span>
                 </div>
-                <input type="email" class="input input-bordered w-full" bind:value={settings.email} disabled={!canUpdateSettings} />
+                <input type="email" class="input input-bordered w-full" bind:value={settings.companyEmail} disabled={!canUpdateSettings} />
               </label>
               <label class="form-control"
                 ><div class="label">
                   <span class="label-text">{t("Phone")}</span>
                 </div>
-                <input type="text" class="input input-bordered w-full" bind:value={settings.phone} disabled={!canUpdateSettings} />
+                <input type="text" class="input input-bordered w-full" bind:value={settings.companyPhone} disabled={!canUpdateSettings} />
               </label>
             </div>
             <div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
               <label class="form-control"
                 ><div class="label">
                   <span class="label-text">{t("Tax ID")}</span>
                 </div>
-                <input type="text" class="input input-bordered w-full" bind:value={settings.taxId} disabled={!canUpdateSettings} />
+                <input type="text" class="input input-bordered w-full" bind:value={settings.companyTaxId} disabled={!canUpdateSettings} />
               </label>
               <label class="form-control"
                 ><div class="label">
                   <span class="label-text">{t("Country Code")}</span>
                 </div>
-                <input type="text" class="input input-bordered w-full" bind:value={settings.countryCode} disabled={!canUpdateSettings} placeholder="US" />
+                <input type="text" class="input input-bordered w-full" bind:value={settings.companyCountryCode} disabled={!canUpdateSettings} placeholder="US" />
               </label>
             </div>
           </div>

frontend/src/routes/settings/components/SetupCompany.svelte

@@ -44,24 +44,24 @@
   <div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
     <label class="form-control">
       <div class="label"><span class="label-text">{t("Email")}</span></div>
-      <input type="email" class="input input-bordered w-full" bind:value={settings.email} disabled={!canUpdateSettings} />
+      <input type="email" class="input input-bordered w-full" bind:value={settings.companyEmail} disabled={!canUpdateSettings} />
     </label>
     <label class="form-control">
       <div class="label"><span class="label-text">{t("Phone")}</span></div>
-      <input type="text" class="input input-bordered w-full" bind:value={settings.phone} disabled={!canUpdateSettings} />
+      <input type="text" class="input input-bordered w-full" bind:value={settings.companyPhone} disabled={!canUpdateSettings} />
     </label>
   </div>
 
   <div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
     <label class="form-control">
       <div class="label"><span class="label-text">{t("Tax ID")}</span></div>
-      <input type="text" class="input input-bordered w-full" bind:value={settings.taxId} disabled={!canUpdateSettings} />
+      <input type="text" class="input input-bordered w-full" bind:value={settings.companyTaxId} disabled={!canUpdateSettings} />
     </label>
     <label class="form-control">
       <div class="label">
         <span class="label-text">{t("Country Code")}</span>
       </div>
-      <input type="text" class="input input-bordered w-full" bind:value={settings.countryCode} disabled={!canUpdateSettings} placeholder="US" />
+      <input type="text" class="input input-bordered w-full" bind:value={settings.companyCountryCode} disabled={!canUpdateSettings} placeholder="US" />
     </label>
   </div>
 </div>