diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index 172520e9e85a..f2a4e99b5a55 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -4,7 +4,6 @@
@push('head')
@include('portal.ninja2020.components.no-cache')
@@ -47,6 +46,8 @@
diff --git a/routes/api.php b/routes/api.php
index 47f2cfafa547..ddcdc37b718d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -165,6 +165,7 @@ Route::group(['middleware' => ['throttle:api', 'api_db', 'token_auth', 'locale']
Route::post('charts/totals_v2', [ChartController::class, 'totalsV2'])->name('chart.totals_v2');
Route::post('charts/chart_summary_v2', [ChartController::class, 'chart_summaryV2'])->name('chart.chart_summary_v2');
+ Route::post('charts/calculated_fields', [ChartController::class, 'calculatedFields'])->name('chart.calculated_fields');
Route::post('claim_license', [LicenseController::class, 'index'])->name('license.index');
diff --git a/routes/channels.php b/routes/channels.php
index f16a20b9bfc5..9d8de62648d0 100644
--- a/routes/channels.php
+++ b/routes/channels.php
@@ -11,6 +11,13 @@
|
*/
-Broadcast::channel('App.User.{id}', function ($user, $id) {
- return (int) $user->id === (int) $id;
-});
+// Broadcast::channel('App.User.{id}', function ($user, $id) {
+// nlog($id);
+
+// return false;
+// // return (int) $user->id === (int) $id;
+// });
+
+Broadcast::channel('company-{company_key}', function (\App\Models\User $user, string $company_key) {
+ return $user->company()->company_key === $company_key;
+});
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index d1231316b1f2..78ac4dbfe52b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -50,3 +50,5 @@ Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [C
Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Mollie3dsController::class, 'index'])->middleware('domain_db')->name('mollie.3ds_redirect');
Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', [GoCardlessController::class, 'ibpRedirect'])->middleware('domain_db')->name('gocardless.ibp_redirect');
Route::get('.well-known/apple-developer-merchantid-domain-association', [ApplePayDomainController::class, 'showAppleMerchantId']);
+
+Broadcast::routes(['middleware' => ['token_auth']]);
diff --git a/tests/Feature/EInvoice/PeppolTest.php b/tests/Feature/EInvoice/PeppolTest.php
index e7d85b759340..547d688851a7 100644
--- a/tests/Feature/EInvoice/PeppolTest.php
+++ b/tests/Feature/EInvoice/PeppolTest.php
@@ -19,18 +19,19 @@ use Tests\MockAccountData;
use App\DataMapper\InvoiceItem;
use App\DataMapper\ClientSettings;
use App\DataMapper\CompanySettings;
+use App\Factory\CompanyUserFactory;
use InvoiceNinja\EInvoice\EInvoice;
use InvoiceNinja\EInvoice\Symfony\Encode;
use App\Services\EDocument\Standards\Peppol;
use App\Services\EDocument\Standards\FatturaPANew;
use Illuminate\Routing\Middleware\ThrottleRequests;
+use InvoiceNinja\EInvoice\Models\Peppol\PaymentMeans;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use InvoiceNinja\EInvoice\Models\FatturaPA\FatturaElettronica;
use InvoiceNinja\EInvoice\Models\Peppol\BranchType\FinancialInstitutionBranch;
use InvoiceNinja\EInvoice\Models\Peppol\FinancialAccountType\PayeeFinancialAccount;
use InvoiceNinja\EInvoice\Models\FatturaPA\FatturaElettronicaBodyType\FatturaElettronicaBody;
use InvoiceNinja\EInvoice\Models\FatturaPA\FatturaElettronicaHeaderType\FatturaElettronicaHeader;
-use InvoiceNinja\EInvoice\Models\Peppol\PaymentMeans;
/**
* @test
@@ -92,6 +93,12 @@ class PeppolTest extends TestCase
'settings' => $settings,
'e_invoice' => $einvoice,
]);
+
+ $cu = CompanyUserFactory::create($this->user->id, $company->id, $this->account->id);
+ $cu->is_owner = true;
+ $cu->is_admin = true;
+ $cu->is_locked = false;
+ $cu->save();
$client_settings = ClientSettings::defaults();
$client_settings->currency_id = '3';
@@ -206,6 +213,12 @@ class PeppolTest extends TestCase
'e_invoice' => $einvoice,
]);
+ $cu = CompanyUserFactory::create($this->user->id, $company->id, $this->account->id);
+ $cu->is_owner = true;
+ $cu->is_admin = true;
+ $cu->is_locked = false;
+ $cu->save();
+
$client_settings = ClientSettings::defaults();
$client_settings->currency_id = '3';
@@ -301,6 +314,13 @@ class PeppolTest extends TestCase
'account_id' => $this->account->id,
'settings' => $settings,
]);
+
+
+ $cu = CompanyUserFactory::create($this->user->id, $company->id, $this->account->id);
+ $cu->is_owner = true;
+ $cu->is_admin = true;
+ $cu->is_locked = false;
+ $cu->save();
$client_settings = ClientSettings::defaults();
$client_settings->currency_id = '3';
diff --git a/tests/Feature/Import/Wave/WaveTest.php b/tests/Feature/Import/Wave/WaveTest.php
index f8f3edf47fc7..3a194dd0b7d8 100644
--- a/tests/Feature/Import/Wave/WaveTest.php
+++ b/tests/Feature/Import/Wave/WaveTest.php
@@ -196,7 +196,7 @@ class WaveTest extends TestCase
'import_type' => 'waveaccounting',
];
- Cache::put($hash.'-expense', base64_encode($csv), 360);
+ Cache::put($hash.'-invoice', base64_encode($csv), 360);
$csv_importer = new Wave($data, $this->company);
diff --git a/tests/Integration/Einvoice/Storecove/StorecoveTest.php b/tests/Integration/Einvoice/Storecove/StorecoveTest.php
index f37af88946e5..57882e1feb46 100644
--- a/tests/Integration/Einvoice/Storecove/StorecoveTest.php
+++ b/tests/Integration/Einvoice/Storecove/StorecoveTest.php
@@ -11,18 +11,25 @@
namespace Tests\Integration\Einvoice\Storecove;
-use App\DataMapper\ClientSettings;
-use App\Models\Client;
use Tests\TestCase;
+use App\Models\Client;
+use App\Models\Company;
+use App\Models\Invoice;
use Tests\MockAccountData;
+use App\DataMapper\InvoiceItem;
+use App\DataMapper\ClientSettings;
+use App\DataMapper\CompanySettings;
+use App\Services\EDocument\Standards\Peppol;
use Illuminate\Foundation\Testing\DatabaseTransactions;
-
+use InvoiceNinja\EInvoice\Models\Peppol\PaymentMeans;
class StorecoveTest extends TestCase
{
use MockAccountData;
use DatabaseTransactions;
+ private string $routing_id = '';
+
protected function setUp(): void
{
parent::setUp();
@@ -88,7 +95,7 @@ class StorecoveTest extends TestCase
// nlog($r);
// }
-
+/*
public function testGetLegalEntity()
{
@@ -348,7 +355,7 @@ $x = '
$sc->sendDocument($x);
}
-
+*/
public function testCreateCHClient()
{
@@ -390,4 +397,140 @@ $x = '
$this->assertInstanceOf(\App\Models\Client::class, $c);
}
+
+ private function createDEData()
+ {
+
+ $this->routing_id = '290868';
+
+ $settings = CompanySettings::defaults();
+ $settings->company_logo = 'https://pdf.invoicing.co/favicon-v2.png';
+ $settings->website = 'www.invoiceninja.de';
+ $settings->address1 = 'Musterstraße 1';
+ $settings->address2 = 'Etage 2, Büro 3';
+ $settings->city = 'Berlin';
+ $settings->state = 'Berlin';
+ $settings->postal_code = '10115';
+ $settings->phone = '030 1234567';
+ $settings->email = $this->faker->unique()->safeEmail();
+ $settings->country_id = '276'; // Germany's ISO country code
+ $settings->vat_number = 'DE123456789';
+ $settings->id_number = 'HRB 12345';
+ $settings->use_credits_payment = 'always';
+ $settings->timezone_id = '1'; // CET (Central European Time)
+ $settings->entity_send_time = 0;
+ $settings->e_invoice_type = 'PEPPOL';
+ $settings->currency_id = '3';
+
+ $company = Company::factory()->create([
+ 'account_id' => $this->account->id,
+ 'settings' => $settings,
+ ]);
+
+ $this->user->companies()->attach($company->id, [
+ 'account_id' => $this->account->id,
+ 'is_owner' => true,
+ 'is_admin' => 1,
+ 'is_locked' => 0,
+ 'permissions' => '',
+ 'notifications' => CompanySettings::notificationAdminDefaults(),
+ 'settings' => null,
+ ]);
+
+ Client::unguard();
+
+ $c =
+ Client::create([
+ 'company_id' => $company->id,
+ 'user_id' => $this->user->id,
+ 'name' => 'Beispiel Firma GmbH',
+ 'website' => 'https://www.beispiel-firma.de',
+ 'private_notes' => 'Dies sind private Notizen zum Testkunden.',
+ 'balance' => 0,
+ 'paid_to_date' => 0,
+ 'vat_number' => 'DE654321987',
+ 'id_number' => 'HRB 12345', // Typical format for German company registration numbers
+ 'custom_value1' => '2024-07-22 10:00:00',
+ 'custom_value2' => 'blau',
+ 'custom_value3' => 'musterwort',
+ 'custom_value4' => 'test@example.com',
+ 'address1' => 'Musterstraße 123',
+ 'address2' => '2. Etage, Büro 45',
+ 'city' => 'München',
+ 'state' => 'Bayern',
+ 'postal_code' => '80331',
+ 'country_id' => '276', // Germany
+ 'shipping_address1' => 'Musterstraße 123',
+ 'shipping_address2' => '2. Etage, Büro 45',
+ 'shipping_city' => 'München',
+ 'shipping_state' => 'Bayern',
+ 'shipping_postal_code' => '80331',
+ 'shipping_country_id' => '276', // Germany
+ 'settings' => ClientSettings::Defaults(),
+ 'client_hash' => \Illuminate\Support\Str::random(32),
+ 'routing_id' => '',
+ ]);
+
+
+ $item = new InvoiceItem();
+ $item->product_key = "Product Key";
+ $item->notes = "Product Description";
+ $item->cost = 10;
+ $item->quantity = 10;
+ $item->tax_rate1 = 19;
+ $item->tax_name1 = 'mwst';
+
+ $invoice = Invoice::factory()->create([
+ 'company_id' => $company->id,
+ 'user_id' => $this->user->id,
+ 'client_id' => $c->id,
+ 'discount' => 0,
+ 'uses_inclusive_taxes' => false,
+ 'status_id' => 1,
+ 'tax_rate1' => 0,
+ 'tax_name1' => '',
+ 'tax_rate2' => 0,
+ 'tax_rate3' => 0,
+ 'tax_name2' => '',
+ 'tax_name3' => '',
+ 'line_items' => [$item],
+ 'number' => 'DE-'.rand(1000, 100000),
+ 'date' => now()->format('Y-m-d')
+ ]);
+
+ $invoice = $invoice->calc()->getInvoice();
+ $invoice->service()->markSent()->save();
+
+
+ return $invoice;
+
+ }
+
+ public function testDeRules()
+ {
+ $invoice = $this->createDEData();
+
+ $e_invoice = new \InvoiceNinja\EInvoice\Models\Peppol\Invoice();
+
+ $stub = json_decode('{"Invoice":{"Note":"Nooo","PaymentMeans":[{"ID":{"value":"afdasfasdfasdfas"},"PayeeFinancialAccount":{"Name":"PFA-NAME","ID":{"value":"DE89370400440532013000"},"AliasName":"PFA-Alias","AccountTypeCode":{"value":"CHECKING"},"AccountFormatCode":{"value":"IBAN"},"CurrencyCode":{"value":"EUR"},"FinancialInstitutionBranch":{"ID":{"value":"DEUTDEMMXXX"},"Name":"Deutsche Bank"}}}]}}');
+ foreach($stub as $key => $value)
+ $e_invoice->{$key} = $value;
+
+ $invoice->e_invoice = $e_invoice;
+ $invoice->save();
+
+ $this->assertInstanceOf(Invoice::class, $invoice);
+ $this->assertInstanceof(\InvoiceNinja\EInvoice\Models\Peppol\Invoice::class, $e_invoice);
+
+ $p = new Peppol($invoice);
+
+ $p->run();
+ $xml = $p->toXml();
+ nlog($xml);
+ $sc = new \App\Services\EDocument\Gateway\Storecove\Storecove();
+ $sc->sendDocument($xml);
+
+
+ }
+
}
+