Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs

Browse Source
This commit is contained in:
Lars Kusch 2023-04-05 11:41:26 +02:00
parent 3239431faa
commit fd72b1dce5
1 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
app/Jobs/Invoice/CreateXInvoice.php
View File

@ -40,7 +40,7 @@ class CreateXInvoice implements ShouldQueue
$company = $invoice->company; $company = $invoice->company;
$client = $invoice->client; $client = $invoice->client;
$profile = ""; $profile = "";
switch ($company->xinvoice_type){ switch ($company->xinvoice_type) {
case "EN16931": case "EN16931":
$profile = ZugferdProfiles::PROFILE_EN16931; $profile = ZugferdProfiles::PROFILE_EN16931;
break; break;
@ -66,7 +66,7 @@ class CreateXInvoice implements ShouldQueue
$profile = ZugferdProfiles::PROFILE_BASIC; $profile = ZugferdProfiles::PROFILE_BASIC;
break; break;
} }
$xrechnung = ZugferdDocumentBuilder::CreateNew($profile); $xrechnung = ZugferdDocumentBuilder::CreateNew($profile);
$xrechnung $xrechnung
->setDocumentInformation($invoice->number, "380", date_create($invoice->date), $invoice->client->getCurrencyCode()) ->setDocumentInformation($invoice->number, "380", date_create($invoice->date), $invoice->client->getCurrencyCode())
@ -76,19 +76,18 @@ class CreateXInvoice implements ShouldQueue
->setDocumentBuyer($client->name, $client->number) ->setDocumentBuyer($client->name, $client->number)
->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, $client->country->iso_3166_2) ->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, $client->country->iso_3166_2)
->setDocumentBuyerReference($client->leitweg_id) ->setDocumentBuyerReference($client->leitweg_id)
->setDocumentBuyerContact($client->primary_contact()->first()->first_name." ".$client->primary_contact()->first()->last_name, "", $client->primary_contact()->first()->phone, "", $client->primary_contact()->first()->email) ->setDocumentBuyerContact($client->primary_contact()->first()->first_name . " " . $client->primary_contact()->first()->last_name, "", $client->primary_contact()->first()->phone, "", $client->primary_contact()->first()->email)
->addDocumentPaymentTerm(ctrans("texts.xinvoice_payable", ['payeddue' => date_create($invoice->date)->diff(date_create($invoice->due_date))->format("%d"), 'paydate' => $invoice->due_date])); ->addDocumentPaymentTerm(ctrans("texts.xinvoice_payable", ['payeddue' => date_create($invoice->date)->diff(date_create($invoice->due_date))->format("%d"), 'paydate' => $invoice->due_date]));
if (!empty($invoice->public_notes)){ if (!empty($invoice->public_notes)) {
$xrechnung->addDocumentNote($invoice->public_notes); $xrechnung->addDocumentNote($invoice->public_notes);
} }
if(!empty($invoice->po_number)){ if (!empty($invoice->po_number)) {
$xrechnung->setDocumentBuyerOrderReferencedDocument($invoice->po_number); $xrechnung->setDocumentBuyerOrderReferencedDocument($invoice->po_number);
} }
if (str_contains($company->getSetting('vat_number'), "/")){ if (str_contains($company->getSetting('vat_number'), "/")) {
$xrechnung->addDocumentSellerTaxRegistration("FC", $company->getSetting('vat_number')); $xrechnung->addDocumentSellerTaxRegistration("FC", $company->getSetting('vat_number'));
} } else {
else {
$xrechnung->addDocumentSellerTaxRegistration("VA", $company->getSetting('vat_number')); $xrechnung->addDocumentSellerTaxRegistration("VA", $company->getSetting('vat_number'));
} }
@ -96,77 +95,70 @@ class CreateXInvoice implements ShouldQueue
//Create line items and calculate taxes //Create line items and calculate taxes
foreach ($invoice->line_items as $index => $item){ foreach ($invoice->line_items as $index => $item) {
$xrechnung->addNewPosition($index) $xrechnung->addNewPosition($index)
->setDocumentPositionProductDetails($item->notes) ->setDocumentPositionProductDetails($item->notes)
->setDocumentPositionGrossPrice($item->gross_line_total) ->setDocumentPositionGrossPrice($item->gross_line_total)
->setDocumentPositionNetPrice($item->line_total); ->setDocumentPositionNetPrice($item->line_total);
if (isset($item->task_id)){ if (isset($item->task_id)) {
$xrechnung->setDocumentPositionQuantity($item->quantity, "HUR"); $xrechnung->setDocumentPositionQuantity($item->quantity, "HUR");
} } else {
else{
$xrechnung->setDocumentPositionQuantity($item->quantity, "H87"); $xrechnung->setDocumentPositionQuantity($item->quantity, "H87");
} }
// According to european law, each line item can only have one tax rate // According to european law, each line item can only have one tax rate
if (!empty($item->tax_name1)){ if (!empty($item->tax_name1)) {
$xrechnung->addDocumentPositionTax(getTaxType($item->tax_name1), 'VAT', $item->tax_rate1); $xrechnung->addDocumentPositionTax(getTaxType($item->tax_name1), 'VAT', $item->tax_rate1);
} } elseif (!empty($item->tax_name2)) {
elseif (!empty($item->tax_name2)){
$xrechnung->addDocumentPositionTax(getTaxType($item->tax_name2), 'VAT', $item->tax_rate2); $xrechnung->addDocumentPositionTax(getTaxType($item->tax_name2), 'VAT', $item->tax_rate2);
} } elseif (!empty($item->tax_name3)) {
elseif (!empty($item->tax_name3)){
$xrechnung->addDocumentPositionTax(getTaxType($item->tax_name3), 'VAT', $item->tax_rate3); $xrechnung->addDocumentPositionTax(getTaxType($item->tax_name3), 'VAT', $item->tax_rate3);
} } else {
else{
nlog("Can't add correct tax position"); nlog("Can't add correct tax position");
} }
if (!empty($invoice->tax_name1)){ if (!empty($invoice->tax_name1)) {
$xrechnung->addDocumentPositionTax(getTaxType($invoice->tax_name1), 'VAT', $invoice->tax_rate1); $xrechnung->addDocumentPositionTax(getTaxType($invoice->tax_name1), 'VAT', $invoice->tax_rate1);
} } elseif (!empty($invoice->tax_name2)) {
elseif (!empty($invoice->tax_name2)){
$xrechnung->addDocumentPositionTax(getTaxType($invoice->tax_name2), 'VAT', $invoice->tax_rate2); $xrechnung->addDocumentPositionTax(getTaxType($invoice->tax_name2), 'VAT', $invoice->tax_rate2);
} } elseif (!empty($invoice->tax_name3)) {
elseif (!empty($invoice->tax_name3)){
$xrechnung->addDocumentPositionTax(getTaxType($invoice->tax_name3), 'VAT', $item->tax_rate3); $xrechnung->addDocumentPositionTax(getTaxType($invoice->tax_name3), 'VAT', $item->tax_rate3);
} else{ } else {
nlog("Can't add correct tax position");} nlog("Can't add correct tax position");
} }
if ($invoice->isPartial()){
$xrechnung->setDocumentSummation($invoice->amount, $invoice->amount-$invoice->balance, $invoicingdata->getSubTotal(), $invoicingdata->getTotalSurcharges(), $invoicingdata->getTotalDiscount(), $invoicingdata->getSubTotal(), $invoicingdata->getItemTotalTaxes(), null, $invoice->partial);
} else {
$xrechnung->setDocumentSummation($invoice->amount, $invoice->amount-$invoice->balance, $invoicingdata->getSubTotal(), $invoicingdata->getTotalSurcharges(), $invoicingdata->getTotalDiscount(), $invoicingdata->getSubTotal(), $invoicingdata->getItemTotalTaxes(), null, 0.0);
} }
foreach ($invoicingdata->getTaxMap() as $item){
if ($invoice->isPartial()) {
$xrechnung->setDocumentSummation($invoice->amount, $invoice->amount - $invoice->balance, $invoicingdata->getSubTotal(), $invoicingdata->getTotalSurcharges(), $invoicingdata->getTotalDiscount(), $invoicingdata->getSubTotal(), $invoicingdata->getItemTotalTaxes(), null, $invoice->partial);
} else {
$xrechnung->setDocumentSummation($invoice->amount, $invoice->amount - $invoice->balance, $invoicingdata->getSubTotal(), $invoicingdata->getTotalSurcharges(), $invoicingdata->getTotalDiscount(), $invoicingdata->getSubTotal(), $invoicingdata->getItemTotalTaxes(), null, 0.0);
}
foreach ($invoicingdata->getTaxMap() as $item) {
$tax = explode(" ", $item["name"]); $tax = explode(" ", $item["name"]);
$xrechnung->addDocumentTax(getTaxType(""), "VAT", $item["total"]/(explode("%", end($tax))[0]/100), $item["total"], explode("%", end($tax))[0]); $xrechnung->addDocumentTax(getTaxType(""), "VAT", $item["total"] / (explode("%", end($tax))[0] / 100), $item["total"], explode("%", end($tax))[0]);
// TODO: Add correct tax type within getTaxType // TODO: Add correct tax type within getTaxType
} }
foreach ($invoicingdata->getTotalTaxMap() as $item){ foreach ($invoicingdata->getTotalTaxMap() as $item) {
$tax = explode(" ", $item["name"]); $tax = explode(" ", $item["name"]);
$xrechnung->addDocumentTax(getTaxType(""), "VAT", $item["total"]/(explode("%", end($tax))[0]/100), $item["total"], explode("%", end($tax))[0]); $xrechnung->addDocumentTax(getTaxType(""), "VAT", $item["total"] / (explode("%", end($tax))[0] / 100), $item["total"], explode("%", end($tax))[0]);
// TODO: Add correct tax type within getTaxType // TODO: Add correct tax type within getTaxType
} }
$disk = config('filesystems.default'); $disk = config('filesystems.default');
if(!Storage::exists($client->xinvoice_filepath($invoice->invitations->first()))){ if (!Storage::exists($client->xinvoice_filepath($invoice->invitations->first()))) {
Storage::makeDirectory($client->xinvoice_filepath($invoice->invitations->first())); Storage::makeDirectory($client->xinvoice_filepath($invoice->invitations->first()));
} }
$xrechnung->writeFile(Storage::disk($disk)->path($client->xinvoice_filepath($invoice->invitations->first()) . $invoice->getFileName("xml"))); $xrechnung->writeFile(Storage::disk($disk)->path($client->xinvoice_filepath($invoice->invitations->first()) . $invoice->getFileName("xml")));
if ($this->alterpdf){ if ($this->alterpdf) {
if ($this->custompdfpath != ""){ if ($this->custompdfpath != "") {
$pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, $this->custompdfpath); $pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, $this->custompdfpath);
$pdfBuilder->generateDocument(); $pdfBuilder->generateDocument();
$pdfBuilder->saveDocument($this->custompdfpath); $pdfBuilder->saveDocument($this->custompdfpath);
} } else {
else { $filepath_pdf = $client->invoice_filepath($invoice->invitations->first()) . $invoice->getFileName();
$filepath_pdf = $client->invoice_filepath($invoice->invitations->first()).$invoice->getFileName();
$file = Storage::disk($disk)->exists($filepath_pdf); $file = Storage::disk($disk)->exists($filepath_pdf);
if ($file) { if ($file) {
$pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, Storage::disk($disk)->path($filepath_pdf)); $pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, Storage::disk($disk)->path($filepath_pdf));
@ -175,41 +167,41 @@ class CreateXInvoice implements ShouldQueue
} }
} }
} }
return $client->invoice_filepath($invoice->invitations->first()).$invoice->getFileName("xml"); return $client->invoice_filepath($invoice->invitations->first()) . $invoice->getFileName("xml");
} }
}
private function getTaxType(string $name) private function getTaxType(string $name): string
{ {
$taxtype = ""; $taxtype = "";
switch ($name){ switch ($name) {
case "ZeroRate": case "ZeroRate":
$taxtype = "Z"; $taxtype = "Z";
break; break;
case "Tax Exempt": case "Tax Exempt":
$taxtype = "E"; $taxtype = "E";
break; break;
case "Reversal of tax liabilty": case "Reversal of tax liabilty":
$taxtype = "AE"; $taxtype = "AE";
break; break;
case "intra-community delivery": case "intra-community delivery":
$taxtype = "K"; $taxtype = "K";
break; break;
case "Out of EU": case "Out of EU":
$taxtype = "G"; $taxtype = "G";
break; break;
case "Outside the tax scope": case "Outside the tax scope":
$taxtype = "O"; $taxtype = "O";
break; break;
case "Canary Islands": case "Canary Islands":
$taxtype = "L"; $taxtype = "L";
break; break;
case "Ceuta / Melila": case "Ceuta / Melila":
$taxtype = "M"; $taxtype = "M";
break; break;
default: default:
$taxtype = "S"; $taxtype = "S";
break; break;
}
return $taxtype;
} }
return $taxtype;
} }