Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Class cleanup for peppol

This commit is contained in:
David Bomba 2024-10-30 17:14:28 +11:00
parent 950669ad02
commit 618b2ee064
1 changed files with 106 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
app/Services/EDocument/Standards/Peppol.php
View File

@ -21,11 +21,7 @@ use App\Helpers\Invoice\InvoiceSum;
use InvoiceNinja\EInvoice\EInvoice; use InvoiceNinja\EInvoice\EInvoice;
use App\Utils\Traits\NumberFormatter; use App\Utils\Traits\NumberFormatter;
use App\Helpers\Invoice\InvoiceSumInclusive; use App\Helpers\Invoice\InvoiceSumInclusive;
use App\Exceptions\PeppolValidationException;
use App\Services\EDocument\Standards\Peppol\RO;
use App\Http\Requests\Client\StoreClientRequest;
use App\Services\EDocument\Gateway\Qvalia\Qvalia; use App\Services\EDocument\Gateway\Qvalia\Qvalia;
use InvoiceNinja\EInvoice\Models\Peppol\PaymentMeans;
use InvoiceNinja\EInvoice\Models\Peppol\ItemType\Item; use InvoiceNinja\EInvoice\Models\Peppol\ItemType\Item;
use App\Services\EDocument\Gateway\Storecove\Storecove; use App\Services\EDocument\Gateway\Storecove\Storecove;
use InvoiceNinja\EInvoice\Models\Peppol\PartyType\Party; use InvoiceNinja\EInvoice\Models\Peppol\PartyType\Party;
@ -35,33 +31,26 @@ use InvoiceNinja\EInvoice\Models\Peppol\AddressType\Address;
use InvoiceNinja\EInvoice\Models\Peppol\ContactType\Contact; use InvoiceNinja\EInvoice\Models\Peppol\ContactType\Contact;
use InvoiceNinja\EInvoice\Models\Peppol\CountryType\Country; use InvoiceNinja\EInvoice\Models\Peppol\CountryType\Country;
use InvoiceNinja\EInvoice\Models\Peppol\PartyIdentification; use InvoiceNinja\EInvoice\Models\Peppol\PartyIdentification;
use App\Services\EDocument\Gateway\Storecove\StorecoveRouter;
use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxAmount; use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxAmount;
use InvoiceNinja\EInvoice\Models\Peppol\Party as PeppolParty;
use InvoiceNinja\EInvoice\Models\Peppol\TaxTotalType\TaxTotal; use InvoiceNinja\EInvoice\Models\Peppol\TaxTotalType\TaxTotal;
use App\Services\EDocument\Standards\Settings\PropertyResolver;
use InvoiceNinja\EInvoice\Models\Peppol\AmountType\PriceAmount; use InvoiceNinja\EInvoice\Models\Peppol\AmountType\PriceAmount;
use InvoiceNinja\EInvoice\Models\Peppol\PartyNameType\PartyName; use InvoiceNinja\EInvoice\Models\Peppol\PartyNameType\PartyName;
use InvoiceNinja\EInvoice\Models\Peppol\TaxSchemeType\TaxScheme; use InvoiceNinja\EInvoice\Models\Peppol\TaxSchemeType\TaxScheme;
use InvoiceNinja\EInvoice\Models\Peppol\AmountType\PayableAmount; use InvoiceNinja\EInvoice\Models\Peppol\AmountType\PayableAmount;
use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxableAmount; use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxableAmount;
use InvoiceNinja\EInvoice\Models\Peppol\PeriodType\InvoicePeriod; use InvoiceNinja\EInvoice\Models\Peppol\PeriodType\InvoicePeriod;
use InvoiceNinja\EInvoice\Models\Peppol\TaxTotal as PeppolTaxTotal;
use InvoiceNinja\EInvoice\Models\Peppol\CodeType\IdentificationCode; use InvoiceNinja\EInvoice\Models\Peppol\CodeType\IdentificationCode;
use InvoiceNinja\EInvoice\Models\Peppol\InvoiceLineType\InvoiceLine; use InvoiceNinja\EInvoice\Models\Peppol\InvoiceLineType\InvoiceLine;
use InvoiceNinja\EInvoice\Models\Peppol\TaxCategoryType\TaxCategory; use InvoiceNinja\EInvoice\Models\Peppol\TaxCategoryType\TaxCategory;
use InvoiceNinja\EInvoice\Models\Peppol\TaxSubtotalType\TaxSubtotal; use InvoiceNinja\EInvoice\Models\Peppol\TaxSubtotalType\TaxSubtotal;
use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxExclusiveAmount; use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxExclusiveAmount;
use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxInclusiveAmount; use InvoiceNinja\EInvoice\Models\Peppol\AmountType\TaxInclusiveAmount;
use InvoiceNinja\EInvoice\Models\Peppol\LocationType\PhysicalLocation;
use InvoiceNinja\EInvoice\Models\Peppol\AmountType\LineExtensionAmount; use InvoiceNinja\EInvoice\Models\Peppol\AmountType\LineExtensionAmount;
use InvoiceNinja\EInvoice\Models\Peppol\OrderReferenceType\OrderReference; use InvoiceNinja\EInvoice\Models\Peppol\OrderReferenceType\OrderReference;
use InvoiceNinja\EInvoice\Models\Peppol\MonetaryTotalType\LegalMonetaryTotal; use InvoiceNinja\EInvoice\Models\Peppol\MonetaryTotalType\LegalMonetaryTotal;
use InvoiceNinja\EInvoice\Models\Peppol\TaxCategoryType\ClassifiedTaxCategory; use InvoiceNinja\EInvoice\Models\Peppol\TaxCategoryType\ClassifiedTaxCategory;
use InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\CustomerAssignedAccountID;
use InvoiceNinja\EInvoice\Models\Peppol\CustomerPartyType\AccountingCustomerParty; use InvoiceNinja\EInvoice\Models\Peppol\CustomerPartyType\AccountingCustomerParty;
use InvoiceNinja\EInvoice\Models\Peppol\SupplierPartyType\AccountingSupplierParty; use InvoiceNinja\EInvoice\Models\Peppol\SupplierPartyType\AccountingSupplierParty;
use InvoiceNinja\EInvoice\Models\Peppol\FinancialAccountType\PayeeFinancialAccount;
class Peppol extends AbstractService class Peppol extends AbstractService
{ {
@ -136,7 +125,6 @@ class Peppol extends AbstractService
] ]
]; ];
/** @var Company $company */
private Company $company; private Company $company;
private InvoiceSum | InvoiceSumInclusive $calc; private InvoiceSum | InvoiceSumInclusive $calc;
@ -157,12 +145,8 @@ class Peppol extends AbstractService
private string $profileID = 'urn:fdc:peppol.eu:2017:poacc:billing:01:1.0'; private string $profileID = 'urn:fdc:peppol.eu:2017:poacc:billing:01:1.0';
/** @var array $tax_map */
private array $tax_map = []; private array $tax_map = [];
/**
* @param Invoice $invoice
*/
public function __construct(public Invoice $invoice) public function __construct(public Invoice $invoice)
{ {
$this->company = $invoice->company; $this->company = $invoice->company;
@ -263,7 +247,7 @@ class Peppol extends AbstractService
*/ */
private function setInvoice(): self private function setInvoice(): self
{ {
/** Handle Existing Document */
if($this->invoice->e_invoice && isset($this->invoice->e_invoice->Invoice)) { if($this->invoice->e_invoice && isset($this->invoice->e_invoice->Invoice)) {
$this->decode($this->invoice->e_invoice->Invoice); $this->decode($this->invoice->e_invoice->Invoice);
@ -279,8 +263,10 @@ class Peppol extends AbstractService
} }
/** Scaffold new document */
$this->p_invoice = new \InvoiceNinja\EInvoice\Models\Peppol\Invoice(); $this->p_invoice = new \InvoiceNinja\EInvoice\Models\Peppol\Invoice();
/** Set Props */
$this->gateway $this->gateway
->mutator ->mutator
->setInvoice($this->invoice) ->setInvoice($this->invoice)
@ -305,7 +291,6 @@ class Peppol extends AbstractService
$this->_company_settings = isset($this->invoice->company->e_invoice->Invoice) ? $this->e->decode('Peppol', json_encode($this->invoice->company->e_invoice->Invoice), 'json') : null; $this->_company_settings = isset($this->invoice->company->e_invoice->Invoice) ? $this->e->decode('Peppol', json_encode($this->invoice->company->e_invoice->Invoice), 'json') : null;
return $this; return $this;
} }
/** /**
@ -315,14 +300,14 @@ class Peppol extends AbstractService
*/ */
public function getInvoice(): \InvoiceNinja\EInvoice\Models\Peppol\Invoice public function getInvoice(): \InvoiceNinja\EInvoice\Models\Peppol\Invoice
{ {
//@todo - need to process this and remove null values
return $this->p_invoice; return $this->p_invoice;
} }
/** /**
* toXml * toXml
* *
* Builds a full Peppol XML document including tags
*
* @return string * @return string
*/ */
public function toXml(): string public function toXml(): string
@ -341,8 +326,6 @@ class Peppol extends AbstractService
$xml .= $suffix; $xml .= $suffix;
nlog($xml);
return $xml; return $xml;
} }
@ -350,6 +333,8 @@ class Peppol extends AbstractService
/** /**
* toJson * toJson
* *
* Returns the peppol invoice in json format
*
* @return string * @return string
*/ */
public function toJson(): string public function toJson(): string
@ -364,20 +349,24 @@ class Peppol extends AbstractService
/** /**
* toObject * toObject
* *
* returns the Peppol document in object format.
*
* @return mixed * @return mixed
*/ */
public function toObject(): mixed public function toObject(): mixed
{ {
$invoice = new \stdClass; $invoice = new \stdClass;
$invoice->Invoice = json_decode($this->toJson());
return $invoice;
$invoice->Invoice = json_decode($this->toJson());
return $invoice;
} }
/** /**
* toArray * toArray
* *
* Returns the peppol document in Array format
*
* @return array * @return array
*/ */
public function toArray(): array public function toArray(): array
@ -386,12 +375,19 @@ class Peppol extends AbstractService
} }
/**
* setOrderReference
*
* Sets the order reference - if it exists - on the document.
* @return self
*/
private function setOrderReference(): self private function setOrderReference(): self
{ {
$this->p_invoice->BuyerReference = $this->invoice->po_number ?? ''; $this->p_invoice->BuyerReference = $this->invoice->po_number ?? '';
if (strlen($this->invoice->po_number ?? '') > 1) { if (strlen($this->invoice->po_number ?? '') > 1) {
$order_reference = new OrderReference(); $order_reference = new OrderReference();
$id = new ID(); $id = new ID();
$id->value = $this->invoice->po_number; $id->value = $this->invoice->po_number;
@ -400,18 +396,28 @@ class Peppol extends AbstractService
$this->p_invoice->OrderReference = $order_reference; $this->p_invoice->OrderReference = $order_reference;
} }
return $this; return $this;
} }
/**
* getAllowanceCharges
*
* Allowance charges are discounts / fees that are
* applied to line or invoice level items
*
* ChargeIndicator flags whether the item is a discount 'false'
* this prop is ONLY set for discounts. Fees are inferred.
*
* @return array
*/
private function getAllowanceCharges(): array private function getAllowanceCharges(): array
{ {
$allowances = []; $allowances = [];
//invoice discounts //Invoice Level discount
if($this->invoice->discount > 0){ if($this->invoice->discount > 0){
// Add Allowance Charge to Price // Add Allowance Charge to Price
@ -434,8 +440,7 @@ class Peppol extends AbstractService
$allowances[] = $allowanceCharge; $allowances[] = $allowanceCharge;
} }
//invoice surcharges (@todo React - need to turn back on surcharge taxes and use the first tax....) //Invoice level surcharges (@todo React - need to turn back on surcharge taxes and use the first tax....)
if($this->invoice->custom_surcharge1 > 0){ if($this->invoice->custom_surcharge1 > 0){
// Add Allowance Charge to Price // Add Allowance Charge to Price
@ -541,6 +546,8 @@ class Peppol extends AbstractService
/** /**
* getTaxType * getTaxType
* *
* Calculates the PEPPOL code for the tax type
*
* @param string $tax_id * @param string $tax_id
* @return string * @return string
*/ */
@ -592,6 +599,13 @@ class Peppol extends AbstractService
return $tax_type; return $tax_type;
} }
/**
* getInvoiceLines
*
* Compiles the invoice line items of the document
*
* @return array
*/
private function getInvoiceLines(): array private function getInvoiceLines(): array
{ {
$lines = []; $lines = [];
@ -602,7 +616,6 @@ class Peppol extends AbstractService
$_item->Name = $item->product_key; $_item->Name = $item->product_key;
$_item->Description = $item->notes; $_item->Description = $item->notes;
if($item->tax_rate1 > 0) if($item->tax_rate1 > 0)
{ {
$ctc = new ClassifiedTaxCategory(); $ctc = new ClassifiedTaxCategory();
@ -625,7 +638,6 @@ class Peppol extends AbstractService
$ctc->ID->value = $this->getTaxType($item->tax_id); $ctc->ID->value = $this->getTaxType($item->tax_id);
$ctc->Percent = $item->tax_rate2; $ctc->Percent = $item->tax_rate2;
$ts = new TaxScheme(); $ts = new TaxScheme();
$id = new ID(); $id = new ID();
$id->value = $this->standardizeTaxSchemeId($item->tax_name2); $id->value = $this->standardizeTaxSchemeId($item->tax_name2);
@ -667,11 +679,8 @@ class Peppol extends AbstractService
$line->LineExtensionAmount = $lea; $line->LineExtensionAmount = $lea;
$line->Item = $_item; $line->Item = $_item;
$item_taxes = $this->getItemTaxes($item); /** Builds the tax map for the document */
$this->getItemTaxes($item);
// if(count($item_taxes) > 0) {
// $line->TaxTotal = $item_taxes;
// }
// Handle Price and Discounts // Handle Price and Discounts
if ($item->discount > 0) { if ($item->discount > 0) {
@ -721,6 +730,14 @@ class Peppol extends AbstractService
} }
/**
* calculateDiscountAmount
*
* Helper method to determine the discount amount to be used.
*
* @param mixed $item
* @return float
*/
private function calculateDiscountAmount($item): float private function calculateDiscountAmount($item): float
{ {
if ($item->is_amount_discount) { if ($item->is_amount_discount) {
@ -734,6 +751,8 @@ class Peppol extends AbstractService
/** /**
* costWithDiscount * costWithDiscount
* *
* Helper method to determine the cost INCLUDING discount
*
* @param mixed $item * @param mixed $item
* @return float * @return float
*/ */
@ -752,51 +771,12 @@ class Peppol extends AbstractService
return $cost; return $cost;
} }
/**
* zeroTaxAmount
*
* @return array
*/
// private function zeroTaxAmount(): array
// {
// $blank_tax = [];
// $tax_amount = new TaxAmount();
// $tax_amount->currencyID = $this->invoice->client->currency()->code;
// $tax_amount->amount = '0';
// $tax_subtotal = new TaxSubtotal();
// $tax_subtotal->TaxAmount = $tax_amount;
// $taxable_amount = new TaxableAmount();
// $taxable_amount->currencyID = $this->invoice->client->currency()->code;
// $taxable_amount->amount = '0';
// $tax_subtotal->TaxableAmount = $taxable_amount;
// $tc = new TaxCategory();
// $id = new ID();
// $id->value = 'Z';
// $tc->ID = $id;
// $tc->Percent = '0';
// $ts = new TaxScheme();
// $id = new ID();
// $id->value = '0';
// $ts->ID = $id;
// $tc->TaxScheme = $ts;
// $tax_subtotal->TaxCategory = $tc;
// $tax_total = new TaxTotal();
// $tax_total->TaxAmount = $tax_amount;
// $tax_total->TaxSubtotal[] = $tax_subtotal;
// $blank_tax[] = $tax_total;
// return $blank_tax;
// }
/** /**
* getItemTaxes * getItemTaxes
* *
* Builds a tax map for later use when
* collating taxes
*
* @param object $item * @param object $item
* @return array * @return array
*/ */
@ -855,9 +835,7 @@ class Peppol extends AbstractService
$tax_amount = new TaxAmount(); $tax_amount = new TaxAmount();
$tax_amount->currencyID = $this->invoice->client->currency()->code; $tax_amount->currencyID = $this->invoice->client->currency()->code;
$tax_amount->amount = $this->invoice->uses_inclusive_taxes ? $this->calcInclusiveLineTax($item->tax_rate2, $item->line_total) : $this->calcAmountLineTax($item->tax_rate2, $item->line_total); $tax_amount->amount = $this->invoice->uses_inclusive_taxes ? $this->calcInclusiveLineTax($item->tax_rate2, $item->line_total) : $this->calcAmountLineTax($item->tax_rate2, $item->line_total);
$tax_subtotal = new TaxSubtotal(); $tax_subtotal = new TaxSubtotal();
$tax_subtotal->TaxAmount = $tax_amount; $tax_subtotal->TaxAmount = $tax_amount;
@ -866,7 +844,6 @@ class Peppol extends AbstractService
$taxable_amount->amount = $item->line_total; $taxable_amount->amount = $item->line_total;
$tax_subtotal->TaxableAmount = $taxable_amount; $tax_subtotal->TaxableAmount = $taxable_amount;
$tc = new TaxCategory(); $tc = new TaxCategory();
$id = new ID(); $id = new ID();
@ -886,16 +863,14 @@ class Peppol extends AbstractService
$tc->TaxScheme = $ts; $tc->TaxScheme = $ts;
$tax_subtotal->TaxCategory = $tc; $tax_subtotal->TaxCategory = $tc;
$tax_total = new TaxTotal(); $tax_total = new TaxTotal();
$tax_total->TaxAmount = $tax_amount; $tax_total->TaxAmount = $tax_amount;
$tax_total->TaxSubtotal[] = $tax_subtotal; $tax_total->TaxSubtotal[] = $tax_subtotal;
$this->tax_map[] = [ $this->tax_map[] = [
'taxableAmount' => $taxable_amount->amount, 'taxableAmount' => $taxable_amount->amount,
'taxAmount' => $tax_amount->amount, 'taxAmount' => $tax_amount->amount,
'percentage' => $item->tax_rate1, 'percentage' => $item->tax_rate2,
]; ];
$item_taxes[] = $tax_total; $item_taxes[] = $tax_total;
@ -918,7 +893,6 @@ class Peppol extends AbstractService
$taxable_amount->amount = $item->line_total; $taxable_amount->amount = $item->line_total;
$tax_subtotal->TaxableAmount = $taxable_amount; $tax_subtotal->TaxableAmount = $taxable_amount;
$tc = new TaxCategory(); $tc = new TaxCategory();
$id = new ID(); $id = new ID();
@ -946,12 +920,11 @@ class Peppol extends AbstractService
$this->tax_map[] = [ $this->tax_map[] = [
'taxableAmount' => $taxable_amount->amount, 'taxableAmount' => $taxable_amount->amount,
'taxAmount' => $tax_amount->amount, 'taxAmount' => $tax_amount->amount,
'percentage' => $item->tax_rate1, 'percentage' => $item->tax_rate3,
]; ];
$item_taxes[] = $tax_total; $item_taxes[] = $tax_total;
} }
return $item_taxes; return $item_taxes;
@ -975,18 +948,12 @@ class Peppol extends AbstractService
if (strlen($this->company->settings->vat_number ?? '') > 1) { if (strlen($this->company->settings->vat_number ?? '') > 1) {
$pi = new PartyIdentification(); $pi = new PartyIdentification();
$vatID = new ID(); $vatID = new ID();
$vatID->schemeID = $this->resolveScheme();
$vatID->value = $this->company->settings->vat_number; //todo if we are cross border - switch to the supplier local vat number
if ($scheme = $this->resolveTaxScheme()) {
$vatID->schemeID = $scheme;
}
$vatID->value = $this->company->settings->vat_number; //todo if we are cross border - switch to the supplier local vat number ->vat_number; //todo if we are cross border - switch to the supplier local vat number
$pi->ID = $vatID; $pi->ID = $vatID;
$party->PartyIdentification[] = $pi; $party->PartyIdentification[] = $pi;
$pts = new \InvoiceNinja\EInvoice\Models\Peppol\PartyTaxSchemeType\PartyTaxScheme(); $pts = new \InvoiceNinja\EInvoice\Models\Peppol\PartyTaxSchemeType\PartyTaxScheme();
$companyID = new \InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\CompanyID(); $companyID = new \InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\CompanyID();
@ -1010,7 +977,10 @@ class Peppol extends AbstractService
$address = new Address(); $address = new Address();
$address->CityName = $this->invoice->company->settings->city; $address->CityName = $this->invoice->company->settings->city;
$address->StreetName = $this->invoice->company->settings->address1; $address->StreetName = $this->invoice->company->settings->address1;
// $address->BuildingName = $this->invoice->company->settings->address2;
if(strlen($this->invoice->company->settings->address2 ?? '') > 1)
$address->AdditionalStreetName = $this->invoice->company->settings->address2;
$address->PostalZone = $this->invoice->company->settings->postal_code; $address->PostalZone = $this->invoice->company->settings->postal_code;
// $address->CountrySubentity = $this->invoice->company->settings->state; // $address->CountrySubentity = $this->invoice->company->settings->state;
@ -1021,9 +991,7 @@ class Peppol extends AbstractService
$country->IdentificationCode = $ic; $country->IdentificationCode = $ic;
$address->Country = $country; $address->Country = $country;
$party->PostalAddress = $address; $party->PostalAddress = $address;
// $party->PhysicalLocation = $address;
$contact = new Contact(); $contact = new Contact();
$contact->ElectronicMail = $this->gateway->mutator->getSetting('Invoice.AccountingSupplierParty.Party.Contact') ?? $this->invoice->company->owner()->present()->email(); $contact->ElectronicMail = $this->gateway->mutator->getSetting('Invoice.AccountingSupplierParty.Party.Contact') ?? $this->invoice->company->owner()->present()->email();
@ -1036,25 +1004,11 @@ class Peppol extends AbstractService
$ple->RegistrationName = $this->invoice->company->present()->name(); $ple->RegistrationName = $this->invoice->company->present()->name();
$party->PartyLegalEntity[] = $ple; $party->PartyLegalEntity[] = $ple;
$asp->Party = $party; $asp->Party = $party;
return $asp; return $asp;
} }
/**
* resolveTaxScheme
*
* @return string
*/
private function resolveTaxScheme(): string
{
return $this->resolveScheme();
// return (new StorecoveRouter())->resolveTaxScheme($this->invoice->client->country->iso_3166_2, $this->invoice->client->classification);
}
/** /**
* getAccountingCustomerParty * getAccountingCustomerParty
* *
@ -1072,11 +1026,7 @@ class Peppol extends AbstractService
$pi = new PartyIdentification(); $pi = new PartyIdentification();
$vatID = new ID(); $vatID = new ID();
$vatID->schemeID = $this->resolveScheme(true);
if($scheme = $this->resolveTaxScheme()) {
$vatID->schemeID = $scheme;
}
$vatID->value = $this->invoice->client->vat_number; $vatID->value = $this->invoice->client->vat_number;
$pi->ID = $vatID; $pi->ID = $vatID;
@ -1087,8 +1037,6 @@ class Peppol extends AbstractService
$party_name = new PartyName(); $party_name = new PartyName();
$party_name->Name = $this->invoice->client->present()->name(); $party_name->Name = $this->invoice->client->present()->name();
//@todo if we have an exact GLN/routing number we should update this, otherwise Storecove will proxy and update on transit //@todo if we have an exact GLN/routing number we should update this, otherwise Storecove will proxy and update on transit
if(strlen($this->invoice->client->routing_id ?? '') > 1) if(strlen($this->invoice->client->routing_id ?? '') > 1)
{ {
@ -1104,7 +1052,7 @@ class Peppol extends AbstractService
$address->CityName = $this->invoice->client->city; $address->CityName = $this->invoice->client->city;
$address->StreetName = $this->invoice->client->address1; $address->StreetName = $this->invoice->client->address1;
if(isset($this->invoice->client->address2) && strlen($this->invoice->client->address2) > 1) if(strlen($this->invoice->client->address2 ?? '') > 1)
$address->AdditionalStreetName = $this->invoice->client->address2; $address->AdditionalStreetName = $this->invoice->client->address2;
$address->PostalZone = $this->invoice->client->postal_code; $address->PostalZone = $this->invoice->client->postal_code;
@ -1120,16 +1068,10 @@ class Peppol extends AbstractService
$party->PostalAddress = $address; $party->PostalAddress = $address;
// $physical_location = new PhysicalLocation();
// $physical_location->Address = $address;
// $party->PhysicalLocation = $physical_location;
$contact = new Contact(); $contact = new Contact();
$contact->ElectronicMail = $this->invoice->client->present()->email(); $contact->ElectronicMail = $this->invoice->client->present()->email();
if(isset($this->invoice->client->phone) && strlen($this->invoice->client->phone) > 2) if(strlen($this->invoice->client->phone ?? '') > 2)
$contact->Telephone = $this->invoice->client->phone; $contact->Telephone = $this->invoice->client->phone;
$party->Contact = $contact; $party->Contact = $contact;
@ -1372,6 +1314,16 @@ class Peppol extends AbstractService
return $this->standardizeTaxSchemeId($tax_name); return $this->standardizeTaxSchemeId($tax_name);
} }
/**
* ResolveScheme
*
* If we need to explicitly set the schemeID, we will need to resolve
* the exact one based on the type the user has, ie. GLN DUNS, validation
* is performed here, so lots can go wrong if bad data is used.
*
* @param bool $is_client
* @return string
*/
private function resolveScheme(bool $is_client=false): string private function resolveScheme(bool $is_client=false): string
{ {
@ -1381,4 +1333,5 @@ class Peppol extends AbstractService
return '0037'; return '0037';
} }
} }