From 3774a05edd044a251edeb209a2cb8ca0494ac35f Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Thu, 22 Apr 2021 10:06:31 +0200 Subject: [PATCH] Searching frontend --- app/Console/Commands/SetupDevEnvironment.php | 6 ++-- app/Services/Oasis/OasisDevService.php | 4 +-- app/Traits/Oasis.php | 4 +-- database/factories/Oasis/InvoiceFactory.php | 2 +- ...021_04_21_060812_create_invoices_table.php | 2 +- public/mix-manifest.json | 29 ++++++++++++--- .../js/Oasis/Modules/Invoices/Invoice.vue | 4 +-- .../js/Oasis/Modules/Invoices/Invoices.vue | 10 +++--- .../Invoices/components/InvoiceBrowser.vue | 2 +- .../Invoices/components/InvoiceCreateMenu.vue | 4 +-- .../components/InvoiceDesktopToolbar.vue | 31 +++++++++++++--- .../components/InvoiceFilterMobile.vue | 8 ++--- resources/js/store/modules/oasisInvoices | 35 +++++++++++++++++-- tests/Feature/Oasis/OasisInvoiceTest.php | 10 +++--- 14 files changed, 111 insertions(+), 40 deletions(-) diff --git a/app/Console/Commands/SetupDevEnvironment.php b/app/Console/Commands/SetupDevEnvironment.php index 80eb0bd3..56c7e775 100644 --- a/app/Console/Commands/SetupDevEnvironment.php +++ b/app/Console/Commands/SetupDevEnvironment.php @@ -73,14 +73,14 @@ class SetupDevEnvironment extends Command $this->info('Clearing application cache...'); $this->clear_cache(); + // Oasis demo content generator + resolve(OasisDevService::class)->create_demo_content(); + $this->info('Dispatching jobs...'); $this->call('queue:work', [ '--stop-when-empty' => true, ]); - // Oasis demo content generator - resolve(OasisDevService::class)->create_demo_content(); - $this->info('Everything is done, congratulations! 🥳🥳🥳'); } diff --git a/app/Services/Oasis/OasisDevService.php b/app/Services/Oasis/OasisDevService.php index da97b24b..5bb9ba49 100644 --- a/app/Services/Oasis/OasisDevService.php +++ b/app/Services/Oasis/OasisDevService.php @@ -31,7 +31,7 @@ class OasisDevService ))->count(14) ->create([ 'user_id' => $user->id, - 'invoice_type' => 'regular_invoice' + 'invoice_type' => 'regular-invoice' ]); Invoice::factory(Invoice::class) @@ -45,7 +45,7 @@ class OasisDevService ['client_id' => $clients[5]->id], ))->create([ 'user_id' => $user->id, - 'invoice_type' => 'advance_invoice' + 'invoice_type' => 'advance-invoice' ]); } } \ No newline at end of file diff --git a/app/Traits/Oasis.php b/app/Traits/Oasis.php index aba6f7cb..4f506df4 100644 --- a/app/Traits/Oasis.php +++ b/app/Traits/Oasis.php @@ -25,11 +25,11 @@ trait Oasis public function regularInvoices() { - return $this->hasMany(Invoice::class)->whereInvoiceType('regular_invoice'); + return $this->hasMany(Invoice::class)->whereInvoiceType('regular-invoice'); } public function advanceInvoices() { - return $this->hasMany(Invoice::class)->whereInvoiceType('advance_invoice'); + return $this->hasMany(Invoice::class)->whereInvoiceType('advance-invoice'); } } diff --git a/database/factories/Oasis/InvoiceFactory.php b/database/factories/Oasis/InvoiceFactory.php index 9942dbd6..dfcb10b5 100644 --- a/database/factories/Oasis/InvoiceFactory.php +++ b/database/factories/Oasis/InvoiceFactory.php @@ -28,7 +28,7 @@ class InvoiceFactory extends Factory 'id' => $this->faker->uuid, 'user_id' => $this->faker->uuid, 'client_id' => $this->faker->uuid, - 'invoice_type' => $this->faker->randomElement(['regular_invoice', 'advance_invoice']), + 'invoice_type' => $this->faker->randomElement(['regular-invoice', 'advance-invoice']), 'invoice_number' => $this->faker->numberBetween(2120001, 2120999), 'variable_number' => $this->faker->numberBetween(2120001, 2120999), 'currency' => $this->faker->randomElement(['CZK', 'EUR']), diff --git a/database/migrations/oasis/2021_04_21_060812_create_invoices_table.php b/database/migrations/oasis/2021_04_21_060812_create_invoices_table.php index f349d31b..4a9bda7a 100644 --- a/database/migrations/oasis/2021_04_21_060812_create_invoices_table.php +++ b/database/migrations/oasis/2021_04_21_060812_create_invoices_table.php @@ -18,7 +18,7 @@ class CreateInvoicesTable extends Migration $table->uuid('user_id')->index(); $table->uuid('client_id')->index(); - $table->enum('invoice_type', ['regular_invoice', 'advance_invoice']); + $table->enum('invoice_type', ['regular-invoice', 'advance-invoice']); $table->text('invoice_number')->nullable(); $table->text('variable_number')->nullable(); diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 816e3294..087a8f19 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -52,8 +52,8 @@ "/chunks/invoices.js": "/chunks/invoices.js?id=1deb187f6d3eb1e81ad0", "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=7fc7f9b6f10bdfac770e", "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=a1885dd8814f9eb63a1c", - "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=30278fb5c1b753cf4094", - "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=3f569f48e82c6a309607", + "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=fd5e7aca8897f59cd625", + "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=b94927bd83dae0172ac2", "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=28a7253b6d421716fe94", "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=53d9f2a31b1dd5dad85e", "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js": "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js?id=0c8d1c3cca084baa177f", @@ -204,9 +204,30 @@ "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~707bd579.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~707bd579.js?id=3c49df5afaf5bb1f42f3", "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.ff6244ee2f7e17d2e294.hot-update.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.ff6244ee2f7e17d2e294.hot-update.js", "/chunks/oasis/invoices.ff6244ee2f7e17d2e294.hot-update.js": "/chunks/oasis/invoices.ff6244ee2f7e17d2e294.hot-update.js", - "/chunks/oasis/invoices~chunks/oasis/invoices/list.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.js?id=e558d42270d3546150ed", + "/chunks/oasis/invoices~chunks/oasis/invoices/list.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.js?id=045d3dd7ce573cb7ed11", "/chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js?id=750a1e714440c4f03c2f", "/vendors~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~~c9df84c5.js": "/vendors~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~~c9df84c5.js?id=4d042d0c0d8477a4f7ac", "/vendors~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js?id=11378342c3b6251c133e", - "/chunks/oasis/invoices~chunks/oasis/invoices/list.b6331b0d83b19d605c15.hot-update.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.b6331b0d83b19d605c15.hot-update.js" + "/chunks/oasis/invoices~chunks/oasis/invoices/list.b6331b0d83b19d605c15.hot-update.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.b6331b0d83b19d605c15.hot-update.js", + "/chunks/oasis/invoices/list.5d88a5be6062e7fa4355.hot-update.js": "/chunks/oasis/invoices/list.5d88a5be6062e7fa4355.hot-update.js", + "/chunks/oasis/invoices/list.60219d2d9565d9f33c8e.hot-update.js": "/chunks/oasis/invoices/list.60219d2d9565d9f33c8e.hot-update.js", + "/js/main.59770d8f19d126c20857.hot-update.js": "/js/main.59770d8f19d126c20857.hot-update.js", + "/chunks/oasis/invoices/list.45266dd27efa6308b30c.hot-update.js": "/chunks/oasis/invoices/list.45266dd27efa6308b30c.hot-update.js", + "/js/main.ea73616d0263b7381d92.hot-update.js": "/js/main.ea73616d0263b7381d92.hot-update.js", + "/chunks/oasis/invoices.ea73616d0263b7381d92.hot-update.js": "/chunks/oasis/invoices.ea73616d0263b7381d92.hot-update.js", + "/chunks/oasis/invoices/list.ea73616d0263b7381d92.hot-update.js": "/chunks/oasis/invoices/list.ea73616d0263b7381d92.hot-update.js", + "/chunks/oasis/invoices~chunks/oasis/invoices/list.ea73616d0263b7381d92.hot-update.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.ea73616d0263b7381d92.hot-update.js", + "/chunks/oasis/invoices/list.eb7dc8dac4d97559bcd0.hot-update.js": "/chunks/oasis/invoices/list.eb7dc8dac4d97559bcd0.hot-update.js", + "/js/main.40139f7ba1f89ce571f1.hot-update.js": "/js/main.40139f7ba1f89ce571f1.hot-update.js", + "/chunks/oasis/invoices/list.8aadf09b04d33c69c3f3.hot-update.js": "/chunks/oasis/invoices/list.8aadf09b04d33c69c3f3.hot-update.js", + "/js/main.4ab821360ef654ccd12c.hot-update.js": "/js/main.4ab821360ef654ccd12c.hot-update.js", + "/js/main.7e28417def5250427fd2.hot-update.js": "/js/main.7e28417def5250427fd2.hot-update.js", + "/js/main.e3b0c66de37a9569a86b.hot-update.js": "/js/main.e3b0c66de37a9569a86b.hot-update.js", + "/chunks/oasis/invoices/list.448571d4db8b1c5ce60f.hot-update.js": "/chunks/oasis/invoices/list.448571d4db8b1c5ce60f.hot-update.js", + "/js/main.ca59ebbdd8d1097912a1.hot-update.js": "/js/main.ca59ebbdd8d1097912a1.hot-update.js", + "/chunks/oasis/invoices/list.93390201f6f6f228b850.hot-update.js": "/chunks/oasis/invoices/list.93390201f6f6f228b850.hot-update.js", + "/js/main.4ea5f95a6ebe1bc881ca.hot-update.js": "/js/main.4ea5f95a6ebe1bc881ca.hot-update.js", + "/chunks/oasis/invoices.4ea5f95a6ebe1bc881ca.hot-update.js": "/chunks/oasis/invoices.4ea5f95a6ebe1bc881ca.hot-update.js", + "/chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js": "/chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js", + "/chunks/oasis/invoices~chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js" } diff --git a/resources/js/Oasis/Modules/Invoices/Invoice.vue b/resources/js/Oasis/Modules/Invoices/Invoice.vue index f73c6272..e7b0bff8 100644 --- a/resources/js/Oasis/Modules/Invoices/Invoice.vue +++ b/resources/js/Oasis/Modules/Invoices/Invoice.vue @@ -64,8 +64,8 @@ methods: { goTo(location) { let routes = { - 'invoices': 'getInvoices', - 'advance-invoices': 'getAdvanceInvoices', + 'regular-invoice': 'getRegularInvoices', + 'advance-invoice': 'getAdvanceInvoices', 'clients': 'getClients', } this.$store.dispatch(routes[location]) diff --git a/resources/js/Oasis/Modules/Invoices/Invoices.vue b/resources/js/Oasis/Modules/Invoices/Invoices.vue index 04cb5b62..22443b58 100644 --- a/resources/js/Oasis/Modules/Invoices/Invoices.vue +++ b/resources/js/Oasis/Modules/Invoices/Invoices.vue @@ -4,7 +4,7 @@ - +
@@ -12,7 +12,7 @@ Invoices - +
@@ -85,8 +85,8 @@ methods: { goTo(location) { let routes = { - 'invoices': 'getInvoices', - 'advance-invoices': 'getAdvanceInvoices', + 'regular-invoice': 'getRegularInvoices', + 'advance-invoice': 'getAdvanceInvoices', 'clients': 'getClients', } this.$store.dispatch(routes[location]) @@ -98,7 +98,7 @@ events.$on('fileItem:deselect', () => this.isScaledDown = false) events.$on('mobile-menu:hide', () => this.isScaledDown = false) - this.$store.dispatch('getInvoices') + this.$store.dispatch('getRegularInvoices') } } diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue b/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue index 18d5e88f..95a6441c 100644 --- a/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue +++ b/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue @@ -153,7 +153,7 @@ this.$store.commit('STORE_CURRENT_FOLDER', { name: 'Invoices', id: undefined, - location: 'invoices', + location: 'regular-invoice', }) } } diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceCreateMenu.vue b/resources/js/Oasis/Modules/Invoices/components/InvoiceCreateMenu.vue index bde8b76b..3ccaadd9 100644 --- a/resources/js/Oasis/Modules/Invoices/components/InvoiceCreateMenu.vue +++ b/resources/js/Oasis/Modules/Invoices/components/InvoiceCreateMenu.vue @@ -2,8 +2,8 @@ -