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

Fixes for XInvoice and differniate between Profiles

Browse Source
This commit is contained in:
Lars Kusch 2023-03-13 08:50:37 +01:00
parent a765153642
commit dd49768aef
5 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Console/Commands/SendRemindersCron.php
View File

@ -175,6 +175,9 @@ class SendRemindersCron extends Command
$invoice->calc()->getInvoice()->save();
$invoice->fresh();
$invoice->service()->deletePdf()->save();
if ($invoice->company->use_xinvoice){
$invoice->service()->deleteXInvoice()->save();
}
/* Refresh the client here to ensure the balance is fresh */
$client = $invoice->client;

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

@ -36,7 +36,34 @@ class CreateXInvoice implements ShouldQueue
$invoice = $this->invoice;
$company = $invoice->company;
$client = $invoice->client;
$xrechnung = ZugferdDocumentBuilder::CreateNew(ZugferdProfiles::PROFILE_EN16931);
$profile = "";
switch ($company->xinvoice_type){
case "EN16931":
$profile = ZugferdProfiles::PROFILE_EN16931;
break;
case "XInvoice_2_2":
$profile = ZugferdProfiles::PROFILE_XRECHNUNG_2_2;
break;
case "XInvoice_2_1":
$profile = ZugferdProfiles::PROFILE_XRECHNUNG_2_1;
break;
case "XInvoice_2_0":
$profile = ZugferdProfiles::PROFILE_XRECHNUNG_2;
break;
case "XInvoice_1_0":
$profile = ZugferdProfiles::PROFILE_XRECHNUNG;
break;
case "XInvoice-Extended":
$profile = ZugferdProfiles::PROFILE_EXTENDED;
break;
case "XInvoice-BasicWL":
$profile = ZugferdProfiles::PROFILE_BASICWL;
break;
case "XInvoice-Basic":
$profile = ZugferdProfiles::PROFILE_BASIC;
break;
}
$xrechnung = ZugferdDocumentBuilder::CreateNew($profile);
$xrechnung
->setDocumentInformation($invoice->number, "380", date_create($invoice->date), $invoice->client->getCurrencyCode())

2
app/Jobs/Invoice/ZipInvoices.php
View File

@ -78,7 +78,7 @@ class ZipInvoices implements ShouldQueue
$this->invoices->each(function ($invoice) {
(new CreateEntityPdf($invoice->invitations()->first()))->handle();
if ($this->company->getSetting("create_xinvoice")){
if ($this->company->use_xinvoice){
(new CreateXInvoice($invoice))->handle();
}
});

4
app/Models/Company.php
View File

@ -97,6 +97,8 @@ use Laracasts\Presenter\PresentableTrait;
* @property int $stock_notification
* @property string|null $matomo_url
* @property int|null $matomo_id
* @property bool $use_xinvoice
* @property string $xinvoice_type
* @property int $enabled_expense_tax_rates
* @property int $invoice_task_project
* @property int $report_include_deleted
@ -354,6 +356,8 @@ class Company extends BaseModel
'google_analytics_key',
'matomo_url',
'matomo_id',
'use_xinvoice',
'xinvoice_type',
'client_can_register',
'enable_shop_api',
'invoice_task_timelog',

4
database/migrations/2023_03_13_156872_add_letiweg_id_to_clients_table.php → database/migrations/2023_03_13_156872_add_leitweg_id_to_clients_table.php
View File

@ -17,6 +17,10 @@ return new class extends Migration
Schema::table('clients', function (Blueprint $table) {
$table->string('leitweg_idf')->default(null);
});
Schema::table('companies', function (Blueprint $table) {
$table->boolean('use_xinvoice')->default(false);
$table->string('xinvoice_type')->default("EN16931");
});
}
/**