-
diff --git a/resources/js/router.js b/resources/js/router.js
index 47fe9c7a..3c35b004 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -86,11 +86,21 @@ const routesOasis = [
name: 'InvoicesList',
path: '/invoice/invoices',
component: () =>
- import(/* webpackChunkName: "chunks/oasis/invoices/list" */ './Oasis/Modules/Invoices/Invoices'),
+ import(/* webpackChunkName: "chunks/oasis/invoices/list" */ './Oasis/Modules/Invoices/InvoicesView'),
meta: {
requiresAuth: true,
title: 'Invoices'
},
+ },
+ {
+ name: 'InvoicesProfile',
+ path: '/invoice/profile',
+ component: () =>
+ import(/* webpackChunkName: "chunks/oasis/invoices/profile" */ './Oasis/Modules/Invoices/BillingProfile'),
+ meta: {
+ requiresAuth: true,
+ title: 'Billing Profile'
+ },
}
]
},
diff --git a/resources/views/oasis/invoices/invoice.blade.php b/resources/views/oasis/invoices/invoice.blade.php
index bbdf4957..4a9dfeb1 100644
--- a/resources/views/oasis/invoices/invoice.blade.php
+++ b/resources/views/oasis/invoices/invoice.blade.php
@@ -27,8 +27,10 @@
- {{--TODO: klientske logo--}}
-
 }})
+ {{--TODO: pridat textove logo--}}
+ @if($user->invoiceProfile->logo)
+
 }})
+ @endif
{{ $user->invoiceProfile->email }}
{{ $user->invoiceProfile->phone }}
@@ -275,10 +277,14 @@
@endif
- @if(is_route('invoice-debug'))
-
 }})
+ @if(is_route('invoice-debug') && $user->invoiceProfile->stamp)
+
@endif
- {{--
 }})
--}}
+
+ @if(! is_route('invoice-debug') && $user->invoiceProfile->stamp)
+
 }})
+ @endif
+
Faktúru vystavil: {{ $invoice->user['author'] }}
diff --git a/routes/oasis.php b/routes/oasis.php
index 4b21ade0..8fefea98 100644
--- a/routes/oasis.php
+++ b/routes/oasis.php
@@ -31,6 +31,7 @@ Route::group(['middleware' => 'api', 'prefix' => '/api/oasis'], function () {
Route::post('/', [InvoiceController::class, 'store']);
+ Route::get('/profile', [InvoiceProfileController::class, 'show']);
Route::post('/profile', [InvoiceProfileController::class, 'store']);
Route::patch('/profile', [InvoiceProfileController::class, 'update']);
});
diff --git a/storage/demo/oasis/stamp.png b/storage/demo/oasis/stamp.png
new file mode 100644
index 00000000..9fff66a5
Binary files /dev/null and b/storage/demo/oasis/stamp.png differ
diff --git a/tests/Feature/Oasis/OasisInvoiceProfileTest.php b/tests/Feature/Oasis/OasisInvoiceProfileTest.php
index f8ef457d..39eef6ea 100644
--- a/tests/Feature/Oasis/OasisInvoiceProfileTest.php
+++ b/tests/Feature/Oasis/OasisInvoiceProfileTest.php
@@ -14,6 +14,26 @@ class OasisInvoiceProfileTest extends TestCase
{
use DatabaseMigrations;
+ /**
+ * @test
+ */
+ public function it_get_user_invoice_profile()
+ {
+ $user = User::factory(User::class)
+ ->create(['role' => 'user']);
+
+ $profile = InvoiceProfile::factory(InvoiceProfile::class)
+ ->create(['user_id' => $user->id]);
+
+ Sanctum::actingAs($user);
+
+ $this->getJson('/api/oasis/invoices/profile')
+ ->assertStatus(200)
+ ->assertJsonFragment([
+ 'company' => $profile->company,
+ ]);
+ }
+
/**
* @test
*/
@@ -30,24 +50,28 @@ class OasisInvoiceProfileTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/oasis/invoices/profile', [
- 'logo' => $image,
- 'stamp' => $image,
'company' => 'VueFileManager Inc.',
- 'email' => 'howdy@hi5ve.digital',
+ 'registration_notes' => 'Some registration notes',
+ 'logo' => $image,
+
'ico' => '11111111',
'dic' => '11111111',
'ic_dph' => 'SK20002313123',
- 'registration_notes' => 'Some registration notes',
- 'author' => 'John Doe',
+
'address' => 'Does 11',
'state' => 'Slovakia',
'city' => 'Bratislava',
'postal_code' => '04001',
'country' => 'SK',
- 'phone' => '+421950123456',
+
'bank' => 'Fio Banka',
'iban' => 'SK20000054236423624',
'swift' => 'FIOZXXX',
+
+ 'phone' => '+421950123456',
+ 'email' => 'howdy@hi5ve.digital',
+ 'author' => 'John Doe',
+ 'stamp' => $image,
])->assertStatus(201)
->assertJsonFragment([
'company' => 'VueFileManager Inc.',
diff --git a/tests/Feature/Oasis/OasisInvoiceTest.php b/tests/Feature/Oasis/OasisInvoiceTest.php
index 68fef82c..c6529031 100644
--- a/tests/Feature/Oasis/OasisInvoiceTest.php
+++ b/tests/Feature/Oasis/OasisInvoiceTest.php
@@ -292,16 +292,15 @@ class OasisInvoiceTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/oasis/invoices', [
- 'invoice_type' => 'regular-invoice',
- 'invoice_number' => '2120001',
- 'variable_number' => '2120001',
- 'items' => $this->items,
- 'discount_type' => 'percent',
- 'discount_rate' => 10,
- 'delivery_at' => Carbon::now()->addWeek(),
- 'store_client' => true,
- 'send_invoice' => true,
-
+ 'invoice_type' => 'regular-invoice',
+ 'invoice_number' => '2120001',
+ 'variable_number' => '2120001',
+ 'items' => $this->items,
+ 'discount_type' => 'percent',
+ 'discount_rate' => 10,
+ 'delivery_at' => Carbon::now()->addWeek(),
+ 'store_client' => true,
+ 'send_invoice' => true,
'client' => 'others',
'client_avatar' => null,
'client_name' => 'VueFileManager Inc.',
@@ -350,16 +349,15 @@ class OasisInvoiceTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/oasis/invoices', [
- 'invoice_type' => 'regular-invoice',
- 'invoice_number' => '2120001',
- 'variable_number' => '2120001',
- 'items' => $this->items,
- 'discount_type' => 'percent',
- 'discount_rate' => 10,
- 'delivery_at' => Carbon::now()->addWeek(),
- 'store_client' => false,
- 'send_invoice' => false,
-
+ 'invoice_type' => 'regular-invoice',
+ 'invoice_number' => '2120001',
+ 'variable_number' => '2120001',
+ 'items' => $this->items,
+ 'discount_type' => 'percent',
+ 'discount_rate' => 10,
+ 'delivery_at' => Carbon::now()->addWeek(),
+ 'store_client' => false,
+ 'send_invoice' => false,
'client' => 'others',
'client_avatar' => null,
'client_name' => 'VueFileManager Inc.',
@@ -409,16 +407,15 @@ class OasisInvoiceTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/oasis/invoices', [
- 'invoice_type' => 'regular-invoice',
- 'invoice_number' => '2120001',
- 'variable_number' => '2120001',
- 'items' => $this->items,
- 'discount_type' => 'percent',
- 'discount_rate' => 10,
- 'delivery_at' => Carbon::now()->addWeek(),
- 'store_client' => false,
- 'send_invoice' => true,
-
+ 'invoice_type' => 'regular-invoice',
+ 'invoice_number' => '2120001',
+ 'variable_number' => '2120001',
+ 'items' => $this->items,
+ 'discount_type' => 'percent',
+ 'discount_rate' => 10,
+ 'delivery_at' => Carbon::now()->addWeek(),
+ 'store_client' => false,
+ 'send_invoice' => true,
'client' => 'others',
'client_name' => 'VueFileManager Inc.',
'client_email' => 'howdy@hi5ve.digital',