diff --git a/app/api/v1/admin/vendors.py b/app/api/v1/admin/vendors.py index 9546d26f..87896a71 100644 --- a/app/api/v1/admin/vendors.py +++ b/app/api/v1/admin/vendors.py @@ -151,6 +151,8 @@ def _build_vendor_detail_response(vendor) -> VendorDetailResponse: company_contact_email=vendor.company.contact_email, company_contact_phone=vendor.company.contact_phone, company_website=vendor.company.website, + company_business_address=vendor.company.business_address, + company_tax_number=vendor.company.tax_number, ) diff --git a/app/templates/admin/vendor-edit.html b/app/templates/admin/vendor-edit.html index 9245cacf..61d79b3c 100644 --- a/app/templates/admin/vendor-edit.html +++ b/app/templates/admin/vendor-edit.html @@ -323,7 +323,7 @@ x-model="formData.business_address" rows="3" :disabled="saving" - :placeholder="!formData.business_address ? 'Using company address' : 'Enter business address'" + :placeholder="vendor?.company_business_address || 'No company address'" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-textarea" :class="{ 'border-purple-300 dark:border-purple-600': !formData.business_address }" > @@ -352,7 +352,7 @@ type="text" x-model="formData.tax_number" :disabled="saving" - :placeholder="!formData.tax_number ? 'Using company tax number' : 'Enter tax number'" + :placeholder="vendor?.company_tax_number || 'No company tax number'" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input" :class="{ 'border-purple-300 dark:border-purple-600': !formData.tax_number }" > diff --git a/models/schema/vendor.py b/models/schema/vendor.py index f79a8660..8e3a0b2c 100644 --- a/models/schema/vendor.py +++ b/models/schema/vendor.py @@ -188,6 +188,8 @@ class VendorDetailResponse(VendorResponse): company_contact_email: str | None = Field(None, description="Company's contact email") company_contact_phone: str | None = Field(None, description="Company's phone number") company_website: str | None = Field(None, description="Company's website URL") + company_business_address: str | None = Field(None, description="Company's business address") + company_tax_number: str | None = Field(None, description="Company's tax number") class VendorCreateResponse(VendorDetailResponse):