company or personal
This commit is contained in:
@@ -16,6 +16,11 @@ use crate::{
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct ProfileForm {
|
||||
account_type: Option<String>,
|
||||
company_name: Option<String>,
|
||||
company_id: Option<String>,
|
||||
tax_id: Option<String>,
|
||||
vat_id: Option<String>,
|
||||
phone_prefix: Option<String>,
|
||||
phone: Option<String>,
|
||||
address: Option<String>,
|
||||
@@ -28,9 +33,27 @@ fn trimmed(value: Option<&str>) -> Option<String> {
|
||||
value.map(str::trim).filter(|v| !v.is_empty()).map(String::from)
|
||||
}
|
||||
|
||||
/// Normalize an account type to one of the two known values, defaulting to
|
||||
/// "personal" for anything unexpected.
|
||||
pub fn normalize_account_type(value: Option<&str>) -> String {
|
||||
match value.map(str::trim) {
|
||||
Some("company") => "company".to_string(),
|
||||
_ => "personal".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
impl From<ProfileForm> for ProfileFields {
|
||||
fn from(form: ProfileForm) -> Self {
|
||||
let is_company = normalize_account_type(form.account_type.as_deref()) == "company";
|
||||
// Company identifiers are only stored for company accounts, so switching
|
||||
// back to personal clears stale data.
|
||||
let company = |v: Option<&str>| if is_company { trimmed(v) } else { None };
|
||||
Self {
|
||||
account_type: normalize_account_type(form.account_type.as_deref()),
|
||||
company_name: company(form.company_name.as_deref()),
|
||||
company_id: company(form.company_id.as_deref()),
|
||||
tax_id: company(form.tax_id.as_deref()),
|
||||
vat_id: company(form.vat_id.as_deref()),
|
||||
phone_prefix: trimmed(form.phone_prefix.as_deref()),
|
||||
phone: trimmed(form.phone.as_deref()),
|
||||
address: trimmed(form.address.as_deref()),
|
||||
@@ -61,6 +84,11 @@ fn profile_view(
|
||||
"saved": saved,
|
||||
"name": name,
|
||||
"email": email,
|
||||
"account_type": profile.map_or("personal", |p| p.account_type.as_str()),
|
||||
"company_name": profile.and_then(|p| p.company_name.clone()),
|
||||
"company_id": profile.and_then(|p| p.company_id.clone()),
|
||||
"tax_id": profile.and_then(|p| p.tax_id.clone()),
|
||||
"vat_id": profile.and_then(|p| p.vat_id.clone()),
|
||||
"phone_prefix": profile.and_then(|p| p.phone_prefix.clone()),
|
||||
"phone": profile.and_then(|p| p.phone.clone()),
|
||||
"address": profile.and_then(|p| p.address.clone()),
|
||||
|
||||
Reference in New Issue
Block a user