Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 18:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
David Bomba 2022-06-30 13:34:15 +10:00
parent 7ec0850684
commit c59ad58200
4 changed files with 927 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Jobs/Vendor/CreatePurchaseOrderPdf.php vendored
View File

@ -96,10 +96,10 @@ class CreatePurchaseOrderPdf implements ShouldQueue
try{ try{
if(!Storage::disk($this->disk)->exists($path)) if(!Storage::disk($this->disk)->exists($this->path))
Storage::disk($this->disk)->makeDirectory($path, 0775); Storage::disk($this->disk)->makeDirectory($this->path, 0775);
Storage::disk($this->disk)->put($file_path, $pdf, 'public'); Storage::disk($this->disk)->put($this->file_path, $pdf, 'public');
} }
catch(\Exception $e) catch(\Exception $e)
@ -135,10 +135,10 @@ class CreatePurchaseOrderPdf implements ShouldQueue
$entity_design_id = ''; $entity_design_id = '';
$path = $this->vendor->purchase_order_filepath($this->invitation); $this->path = $this->vendor->purchase_order_filepath($this->invitation);
$entity_design_id = 'purchase_order_design_id'; $entity_design_id = 'purchase_order_design_id';
$file_path = $path.$this->entity->numberFormatter().'.pdf'; $this->file_path = $this->path.$this->entity->numberFormatter().'.pdf';
$entity_design_id = $this->entity->design_id ? $this->entity->design_id : $this->decodePrimaryKey('Wpmbk5ezJn'); $entity_design_id = $this->entity->design_id ? $this->entity->design_id : $this->decodePrimaryKey('Wpmbk5ezJn');

15
app/Models/Presenters/CompanyPresenter.php
View File

@ -126,6 +126,21 @@ class CompanyPresenter extends EntityPresenter
} }
} }
public function address1()
{
return $this->settings->address1;
}
public function address2()
{
return $this->settings->address2;
}
public function qr_iban()
{
$qr_iban = Helpers::formatCustomFieldValue($this->custom_fields, '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)
{ {
$settings = $this->entity->settings; $settings = $this->entity->settings;

1
composer.json
View File

@ -85,6 +85,7 @@
"setasign/fpdi": "^2.3", "setasign/fpdi": "^2.3",
"socialiteproviders/apple": "^5.2", "socialiteproviders/apple": "^5.2",
"socialiteproviders/microsoft": "^4.1", "socialiteproviders/microsoft": "^4.1",
"sprain/swiss-qr-bill": "^3.2",
"square/square": "13.0.0.20210721", "square/square": "13.0.0.20210721",
"stripe/stripe-php": "^7.50", "stripe/stripe-php": "^7.50",
"symfony/http-client": "^5.2", "symfony/http-client": "^5.2",

1042
composer.lock generated
View File

File diff suppressed because it is too large Load Diff