Working on Swiss QR Codes

This commit is contained in:
David Bomba 2022-06-30 14:29:18 +10:00
parent 8e6d0fd250
commit 27f1e753a3
2 changed files with 6 additions and 3 deletions

View File

@ -25,6 +25,8 @@ class CompanySettings extends BaseSettings
/*Invoice*/ /*Invoice*/
public $auto_archive_invoice = false; // @implemented public $auto_archive_invoice = false; // @implemented
public $qr_iban = '';
public $lock_invoices = 'off'; //off,when_sent,when_paid //@implemented public $lock_invoices = 'off'; //off,when_sent,when_paid //@implemented
public $enable_client_portal_tasks = false; //@ben to implement public $enable_client_portal_tasks = false; //@ben to implement
@ -289,6 +291,7 @@ class CompanySettings extends BaseSettings
public $auto_archive_invoice_cancelled = false; public $auto_archive_invoice_cancelled = false;
public static $casts = [ public static $casts = [
'qr_iban' => 'string',
'email_subject_purchase_order' => 'string', 'email_subject_purchase_order' => 'string',
'email_template_purchase_order' => 'string', 'email_template_purchase_order' => 'string',
'require_purchase_order_signature' => 'bool', 'require_purchase_order_signature' => 'bool',

View File

@ -128,17 +128,17 @@ class CompanyPresenter extends EntityPresenter
public function address1() public function address1()
{ {
return $this->settings->address1; return $this->entity->settings->address1;
} }
public function address2() public function address2()
{ {
return $this->settings->address2; return $this->entity->settings->address2;
} }
public function qr_iban() public function qr_iban()
{ {
$qr_iban = Helpers::formatCustomFieldValue($this->custom_fields, 'qr_iban') return $this->entity->getSetting('qr_iban');
} }
public function getSpcQrCode($client_currency, $invoice_number, $balance_due_raw, $user_iban) public function getSpcQrCode($client_currency, $invoice_number, $balance_due_raw, $user_iban)