Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Lars Kusch 2023-04-03 21:00:47 +02:00
parent 1c339cd208
commit 73ac25072f
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
namespace App\Jobs\Invoice;
use App\Models\Invoice;
use App\Models\Country;
use horstoeko\zugferd\ZugferdDocumentBuilder;
use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
use horstoeko\zugferd\ZugferdProfiles;
@ -69,20 +70,20 @@ class CreateXInvoice implements ShouldQueue
->setDocumentInformation($invoice->number, "380", date_create($invoice->date), $invoice->client->getCurrencyCode())
->addDocumentNote($invoice->public_notes)
->setDocumentSupplyChainEvent(date_create($invoice->date))
// ->setDocumentSeller($company->name)
->setDocumentSellerAddress($company->address1, "", "", $company->postal_code, $company->city, $company->country->country->iso_3166_2)
->setDocumentSeller($company->getSetting('name'))
->setDocumentSellerAddress($company->getSetting("address1"), "", "", $company->getSetting("postal_code"), $company->getSetting("city"), "Germany") //Country::query()->where('id', $company->getSetting("country_id"))->first()
->setDocumentBuyer($client->name, $client->number)
->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, $client->country->country->iso_3166_2)
->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, "Germany") // $client->country->country->iso_3166_2
->setDocumentBuyerReference($client->leitweg_id)
->setDocumentBuyerContact($client->primary_contact->first_name." ".$client->primary_contact->last_name, "", $client->primary_contact->phone, "", $client->primary_contact->email)
//->setDocumentBuyerContact($client->primary_contact()->first_name." ".$client->primary_contact->last_name, "", $client->primary_contact->phone, "", $client->primary_contact->email)
->setDocumentBuyerOrderReferencedDocument($invoice->po_number)
->addDocumentPaymentTerm(ctrans("texts.xinvoice_payable", ['payeddue' => date_create($invoice->date)->diff(date_create($invoice->due_date))->format("%d"), 'paydate' => $invoice->due_date]));
if (str_contains($company->vat_number, "/")){
$xrechnung->addDocumentSellerTaxRegistration("FC", $company->vat_number);
if (str_contains($company->getSetting('vat_number'), "/")){
$xrechnung->addDocumentSellerTaxRegistration("FC", $company->getSetting('vat_number'));
}
else {
$xrechnung->addDocumentSellerTaxRegistration("VA", $company->vat_number);
$xrechnung->addDocumentSellerTaxRegistration("VA", $company->getSetting('vat_number'));
}
// Create line items and calculate taxes
$taxtype1 = "";
@ -286,18 +287,21 @@ class CreateXInvoice implements ShouldQueue
if ($taxnet_3 > 0) {
$xrechnung->addDocumentTax($taxtype3, "VAT", $taxnet_3, $taxamount_3, $invoice->tax_rate3);
}
$xrechnung->writeFile(explode(".", $client->xinvoice_filepath($invoice->invitations->first()))[0] . "-xinvoice.xml");
$filepath_pdf = $client->invoice_filepath($invoice->invitations->first());
$disk = config('filesystems.default');
if(!Storage::exists($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")));
$filepath_pdf = $client->invoice_filepath($invoice->invitations->first()).$invoice->getFileName();
$file = Storage::disk($disk)->exists($filepath_pdf);
if ($file) {
$pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, $filepath_pdf);
$pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, Storage::disk($disk)->path($filepath_pdf));
$pdfBuilder->generateDocument();
$pdfBuilder->saveDocument($client->invoice_filepath($invoice->invitations->first()));
$pdfBuilder->saveDocument(Storage::disk($disk)->path($filepath_pdf));
}
return explode(".", $client->invoice_filepath($invoice->invitations->first()))[0] . "-xinvoice.xml";
return $client->invoice_filepath($invoice->invitations->first()).$invoice->getFileName("xml");
}
private function getItemTaxable($item, $invoice_total): float
{

4
app/Services/Invoice/GetInvoiceXInvoice.php
View File

@ -38,9 +38,7 @@ class GetInvoiceXInvoice extends AbstractService
$invitation = $this->invoice->invitations->first();
}
$path = $this->invoice->client->xinvoice_filepath($invitation);
$file_path = $path.$this->invoice->numberFormatter().'-xinvoice.xml';
$file_path = $this->invoice->client->xinvoice_filepath($this->invoice->invitations->first()). $this->invoice->getFileName("xml");
// $disk = 'public';
$disk = config('filesystems.default');

2
database/migrations/2023_03_13_156872_add_leitweg_id_to_clients_table.php
View File

@ -15,7 +15,7 @@ return new class extends Migration
{
Schema::table('clients', function (Blueprint $table) {
$table->string('leitweg_idf')->default(null);
$table->string('leitweg_id')->default(null);
});
Schema::table('companies', function (Blueprint $table) {
$table->boolean('use_xinvoice')->default(false);