diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php index ee98cfa9..7afe7ffa 100644 --- a/app/Models/Estimate.php +++ b/app/Models/Estimate.php @@ -434,7 +434,7 @@ class Estimate extends Model implements HasMedia $estimateTemplate = EstimateTemplate::find($this->estimate_template_id); $company = Company::find($this->company_id); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); App::setLocale($locale); diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index dc4f8469..6445c12b 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -515,7 +515,7 @@ class Invoice extends Model implements HasMedia $invoiceTemplate = InvoiceTemplate::find($this->invoice_template_id); $company = Company::find($this->company_id); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); App::setLocale($locale); diff --git a/app/Models/Payment.php b/app/Models/Payment.php index d20f360e..645238d1 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -380,7 +380,7 @@ class Payment extends Model implements HasMedia public function getPDFData() { $company = Company::find($this->company_id); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); \App::setLocale($locale); diff --git a/app/Traits/HasCustomFieldsTrait.php b/app/Traits/HasCustomFieldsTrait.php index f7de7aa0..cf370104 100644 --- a/app/Traits/HasCustomFieldsTrait.php +++ b/app/Traits/HasCustomFieldsTrait.php @@ -42,4 +42,11 @@ trait HasCustomFieldsTrait $customFieldValue->save(); } } + + public function getCustomFieldBySlug($slug) + { + return $this->fields()->with('customField')->whereHas('customField', function ($query) use ($slug) { + $query->where('slug', $slug); + })->first(); + } }