Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Prevent duplicate shipping address details on delivery notes

Browse Source
This commit is contained in:
David Bomba 2023-03-12 11:02:35 +11:00
parent 9b60407d03
commit 617a8af7b5
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Filters/PaymentFilters.php
View File

@ -135,7 +135,9 @@ class PaymentFilters extends QueryFilters
/** /**
* Sorts the list based on $sort. * Sorts the list based on $sort.
* *
* @param string sort formatted as column|asc * formatted as column|asc
*
* @param string $sort
* @return Builder * @return Builder
*/ */
public function sort(string $sort = ''): Builder public function sort(string $sort = ''): Builder
@ -152,7 +154,7 @@ class PaymentFilters extends QueryFilters
/** /**
* Filters the query by the users company ID. * Filters the query by the users company ID.
* *
* @return Illuminate\Database\Query\Builder * @return Illuminate\Database\Eloquent\Builder
*/ */
public function entityFilter(): Builder public function entityFilter(): Builder
{ {

8
app/Services/Email/EmailObject.php
View File

@ -33,20 +33,24 @@ use App\Models\PurchaseOrderInvitation;
*/ */
class EmailObject class EmailObject
{ {
/** @var array[string] $args */
public array $to = []; public array $to = [];
public ?Address $from = null; public ?Address $from = null;
public array $reply_to = []; public array $reply_to = [];
/** @var array[Address] $args */
public array $cc = []; public array $cc = [];
/** @var array[Address] $args */
public array $bcc = []; public array $bcc = [];
public ?string $subject = null; public ?string $subject = null;
public ?string $body = null; public ?string $body = null;
/** @var array{key: value} $args */
public array $attachments = []; public array $attachments = [];
public string $company_key; public string $company_key;
@ -97,17 +101,19 @@ class EmailObject
public ?string $text_template = 'email.template.text'; public ?string $text_template = 'email.template.text';
/** @var array{key: value} $args */
public array $headers = []; public array $headers = [];
public ?string $entity_class = null; public ?string $entity_class = null;
/** @var array{key: value} $args */
public array $variables = []; public array $variables = [];
public bool $override = false; public bool $override = false;
public ?string $invitation_key = null; public ?string $invitation_key = null;
// @phpstan-ignore-next-line /** @var array[int] $args */
public array $documents = []; public array $documents = [];
public ?string $template = null; //invoice //quote //reminder1 public ?string $template = null; //invoice //quote //reminder1

2
app/Services/PdfMaker/Design.php
View File

@ -240,7 +240,7 @@ class Design extends BaseDesign
{ {
$elements = []; $elements = [];
if (!$this->client) { if (!$this->client || $this->type == self::DELIVERY_NOTE) {
return $elements; return $elements;
} }