Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Query improvements

Browse Source
This commit is contained in:
David Bomba 2024-10-29 16:34:16 +11:00
parent 69224a28d6
commit 4223067095
3 changed files with 95 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/Filters/ClientFilters.php
View File

@ -124,26 +124,49 @@ class ClientFilters extends QueryFilters
*/
public function filter(string $filter = ''): Builder
{
if (strlen($filter) == 0) {
return $this->builder;
}
return $this->builder->where(function ($query) use ($filter) {
$query->where('name', 'like', '%'.$filter.'%')
->orWhere('id_number', 'like', '%'.$filter.'%')
->orWhere('number', 'like', '%'.$filter.'%')
$searchTerms = array_filter(explode(' ', $filter));
->orWhereHas('contacts', function ($query) use ($filter) {
$query->where('first_name', 'like', '%'.$filter.'%');
$query->orWhere('last_name', 'like', '%'.$filter.'%');
$query->orWhere('email', 'like', '%'.$filter.'%');
$query->orWhere('phone', 'like', '%'.$filter.'%');
})
->orWhere('custom_value1', 'like', '%'.$filter.'%')
->orWhere('custom_value2', 'like', '%'.$filter.'%')
->orWhere('custom_value3', 'like', '%'.$filter.'%')
->orWhere('custom_value4', 'like', '%'.$filter.'%');
return $this->builder->where(function ($query) use ($searchTerms) {
foreach ($searchTerms as $term) {
$query->where(function ($subQuery) use ($term) {
$subQuery->where('name', 'like', '%'.$term.'%')
->orWhere('id_number', 'like', '%'.$term.'%')
->orWhere('number', 'like', '%'.$term.'%')
->orWhereHas('contacts', function ($contactQuery) use ($term) {
$contactQuery->where('first_name', 'like', '%'.$term.'%')
->orWhere('last_name', 'like', '%'.$term.'%')
->orWhere('email', 'like', '%'.$term.'%')
->orWhere('phone', 'like', '%'.$term.'%');
})
->orWhere('custom_value1', 'like', '%'.$term.'%')
->orWhere('custom_value2', 'like', '%'.$term.'%')
->orWhere('custom_value3', 'like', '%'.$term.'%')
->orWhere('custom_value4', 'like', '%'.$term.'%');
});
}
});
// return $this->builder->where(function ($query) use ($filter) {
// $query->where('name', 'like', '%'.$filter.'%')
// ->orWhere('id_number', 'like', '%'.$filter.'%')
// ->orWhere('number', 'like', '%'.$filter.'%')
// ->orWhereHas('contacts', function ($query) use ($filter) {
// $query->where('first_name', 'like', '%'.$filter.'%');
// $query->orWhere('last_name', 'like', '%'.$filter.'%');
// $query->orWhere('email', 'like', '%'.$filter.'%');
// $query->orWhere('phone', 'like', '%'.$filter.'%');
// })
// ->orWhere('custom_value1', 'like', '%'.$filter.'%')
// ->orWhere('custom_value2', 'like', '%'.$filter.'%')
// ->orWhere('custom_value3', 'like', '%'.$filter.'%')
// ->orWhere('custom_value4', 'like', '%'.$filter.'%');
// });
}
/**

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

@ -304,7 +304,11 @@ class Peppol extends AbstractService
private EInvoice $e;
private string $api_network = Storecove::class; // Storecove::class; // Qvalia::class;
private string $customizationID = 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0';
private string $profileID = 'urn:fdc:peppol.eu:2017:poacc:billing:01:1.0';
public Qvalia | Storecove $gateway;
/**
@ -326,6 +330,8 @@ class Peppol extends AbstractService
*/
public function run(): self
{
$this->p_invoice->CustomizationID = $this->customizationID;
$this->p_invoice->ProfileID = $this->profileID;
$this->p_invoice->ID = $this->invoice->number;
$this->p_invoice->IssueDate = new \DateTime($this->invoice->date);
@ -734,7 +740,13 @@ class Peppol extends AbstractService
$ctc->ID = new ID();
$ctc->ID->value = $this->getTaxType($item->tax_id);
$ctc->Percent = $item->tax_rate1;
$ts = new TaxScheme();
$id = new ID();
$id->value = $item->tax_name1;
$ts->ID = $id;
$ctc->TaxScheme = $ts;
$_item->ClassifiedTaxCategory[] = $ctc;
}
@ -744,6 +756,13 @@ class Peppol extends AbstractService
$ctc->ID->value = $this->getTaxType($item->tax_id);
$ctc->Percent = $item->tax_rate2;
$ts = new TaxScheme();
$id = new ID();
$id->value = $item->tax_name2;
$ts->ID = $id;
$ctc->TaxScheme = $ts;
$_item->ClassifiedTaxCategory[] = $ctc;
}
@ -753,6 +772,12 @@ class Peppol extends AbstractService
$ctc->ID->value = $this->getTaxType($item->tax_id);
$ctc->Percent = $item->tax_rate3;
$ts = new TaxScheme();
$id = new ID();
$id->value = $item->tax_name3;
$ts->ID = $id;
$ctc->TaxScheme = $ts;
$_item->ClassifiedTaxCategory[] = $ctc;
}
@ -761,7 +786,11 @@ class Peppol extends AbstractService
$id = new ID();
$id->value = (string) ($key+1);
$line->ID = $id;
$line->InvoicedQuantity = $item->quantity;
$iq = new \InvoiceNinja\EInvoice\Models\Peppol\QuantityType\InvoicedQuantity();
$iq->amount = $item->quantity;
$iq->unitCode = $item->unit_code ?? 'C62';
$line->InvoicedQuantity = $iq;
$lea = new LineExtensionAmount();
$lea->currencyID = $this->invoice->client->currency()->code;
@ -1064,8 +1093,6 @@ class Peppol extends AbstractService
$party_name->Name = $this->invoice->company->present()->name();
$party->PartyName[] = $party_name;
if (strlen($this->company->settings->vat_number ?? '') > 1) {
$pi = new PartyIdentification();
@ -1108,13 +1135,25 @@ class Peppol extends AbstractService
$party->Contact = $contact;
// $pts = new \InvoiceNinja\EInvoice\Models\Peppol\PartyTaxSchemeType\PartyTaxScheme();
$pts = new \InvoiceNinja\EInvoice\Models\Peppol\PartyTaxSchemeType\PartyTaxScheme();
if(strlen($this->invoice->company->settings->id_number) > 1)
{
$companyID = new \InvoiceNinja\EInvoice\Models\Peppol\IdentifierType\CompanyID();
$companyID->value = $this->invoice->company->settings->id_number;
$pts->CompanyID = $companyID;
}
$ple = new \InvoiceNinja\EInvoice\Models\Peppol\PartyLegalEntity();
$ple->RegistrationName = $this->invoice->company->present()->name();
$party->PartyLegalEntity[] = $ple;
// $ts = new TaxScheme();
// $ts->CurrencyCode = $this->invoice->client->currency()->code;
// $ts->JurisdictionRegionAddress[] = $this->getJurisdiction();
// $pts->TaxScheme = $ts;
// $party->PartyTaxScheme[] = $pts;
$party->PartyTaxScheme[] = $pts;
$asp->Party = $party;
@ -1198,6 +1237,10 @@ class Peppol extends AbstractService
$party->Contact = $contact;
$ple = new \InvoiceNinja\EInvoice\Models\Peppol\PartyLegalEntity();
$ple->RegistrationName = $this->invoice->client->present()->name();
$party->PartyLegalEntity[] = $ple;
$acp->Party = $party;
return $acp;

7
tests/Feature/EInvoice/PeppolTest.php
View File

@ -210,6 +210,12 @@ class PeppolTest extends TestCase
$pm = new PaymentMeans();
$pm->PayeeFinancialAccount = $pfa;
$pmc = new \InvoiceNinja\EInvoice\Models\Peppol\CodeType\PaymentMeansCode();
$pmc->value = '59';
$pm->PaymentMeansCode = $pmc;
$einvoice->PaymentMeans[] = $pm;
$stub = new \stdClass();
@ -270,6 +276,7 @@ class PeppolTest extends TestCase
'line_items' => [$item],
'number' => 'DE-'.rand(1000, 100000),
'date' => now()->format('Y-m-d'),
'due_date' => now()->addDays(30)->format('Y-m-d'),
'is_amount_discount' => true,
]);