nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

routes refactoring

Browse Source
This commit is contained in:
Peter Papp
2021-05-13 17:50:42 +02:00
parent 3af8bff13b
commit b4e6561134
16 changed files with 573 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/User.php
View File

@@ -14,11 +14,12 @@ use Illuminate\Support\Facades\Storage;
use Illuminate\Notifications\Notifiable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Makingcg\Invoice\Http\Traits\Invoiceable;
class User extends Authenticatable
{
use Notifiable, Billable, Sortable, HasFactory, HasApiTokens;
use Oasis;
use Oasis, Invoiceable;
protected $guarded = [
'id',

9
composer.json
View File

@@ -10,23 +10,20 @@
"require": {
"php": "^8.0",
"ext-json": "*",
"barryvdh/laravel-snappy": "^0.4.8",
"brianium/paratest": "^6.2",
"cartalyst/stripe-laravel": "^13.1",
"doctrine/dbal": "^2.12.1",
"fideloper/proxy": "^4.4.1",
"friendsofphp/php-cs-fixer": "^2.18",
"fruitcake/laravel-cors": "^2.0.3",
"gabrielelana/byte-units": "^0.5.0",
"guzzlehttp/guzzle": "^7.2.0",
"h4cc/wkhtmltopdf-amd64": "0.12.x",
"intervention/image": "^2.5.1",
"jaybizzle/laravel-crawler-detect": "^1.2",
"kyslik/column-sortable": "^6.4",
"laravel/cashier": "^12.9.1",
"laravel/fortify": "^1.7.7",
"laravel/framework": "^8.30.1",
"laravel/sanctum": "^2.9",
"laravel/sanctum": "^2.11.0",
"laravel/tinker": "^2.6.1",
"laravel/ui": "^3.2.0",
"league/flysystem-aws-s3-v3": "^1.0.29",
@@ -39,6 +36,7 @@
"makingcg/vuefilemanager-invoicing": "dev-master"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.18",
"ext-json": "*",
"barryvdh/laravel-ide-helper": "^2.9",
"facade/ignition": "^2.5.14",
@@ -73,8 +71,7 @@
"database/factories"
],
"files": [
"app/Http/helpers.php",
"app/Http/custom-helpers.php"
"app/Http/helpers.php"
]
},
"autoload-dev": {

1043
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
config/custom-language-translations.php
View File

@@ -286,4 +286,6 @@ return [
'in.sort_by_invoice_number' => 'Sort By Invoice Number',
'in.button_sorting' => 'Sorting',
'in.billing_info' => 'Billing Information',
];

31
public/mix-manifest.json
View File

@@ -50,15 +50,15 @@
"/chunks/invoices.js": "/chunks/invoices.js?id=733a4a9b02203923e96b",
"/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=92a5a7559d95a87b3753",
"/chunks/oasis/invoices/client.js": "/chunks/oasis/invoices/client.js?id=5278e4b3fec7c313b500",
"/chunks/oasis/invoices/client-detail.js": "/chunks/oasis/invoices/client-detail.js?id=f04d993baccf515554db",
"/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=6558d35b1bfe20e8ede6",
"/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=03f1f33852cd4740a50a",
"/chunks/oasis/invoices/client.js": "/chunks/oasis/invoices/client.js?id=623ba4eec8721013b36f",
"/chunks/oasis/invoices/client-detail.js": "/chunks/oasis/invoices/client-detail.js?id=e2db934f6fcb045adcfd",
"/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=7a4df8827b626c83d872",
"/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=a27824905ee00e5b9d5e",
"/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=da39947baccf666a1efc",
"/chunks/oasis/invoices/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=b8776f1c1d5b8b0626da",
"/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=fe9326d4268e817e3c58",
"/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=cb529bbeb676d24b011e",
"/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=221a21718a601c348fff",
"/chunks/oasis/invoices/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=e4331fd98837a9c86634",
"/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=687fecc3ed7edb42ac8d",
"/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=10e92b844417cc78d45e",
"/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=14c791d5a02c82b747e9",
"/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=791bf891bb4a384c0890",
"/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",
@@ -110,5 +110,18 @@
"/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~4509a016.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~4509a016.js?id=ea781ec6ec7cf0645e05",
"/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~66c4fa45.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~66c4fa45.js?id=accf0be7f09c1000b571",
"/vendors~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared/file-browser~~b42d96c6.js": "/vendors~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared/file-browser~~b42d96c6.js?id=a564e3b9054e42dda63f",
"/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=03d3cf785cbafa4d31f0"
"/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=03d3cf785cbafa4d31f0",
"/chunks/oasis/invoices/client.53ce91dbe0456380b75f.hot-update.js": "/chunks/oasis/invoices/client.53ce91dbe0456380b75f.hot-update.js",
"/chunks/oasis/invoices/list.04fa29863bc8da8deeef.hot-update.js": "/chunks/oasis/invoices/list.04fa29863bc8da8deeef.hot-update.js",
"/js/main.1ef1efa38a60d177a7cd.hot-update.js": "/js/main.1ef1efa38a60d177a7cd.hot-update.js",
"/chunks/oasis/invoices/client-detail.1ef1efa38a60d177a7cd.hot-update.js": "/chunks/oasis/invoices/client-detail.1ef1efa38a60d177a7cd.hot-update.js",
"/chunks/oasis/invoices/profile.e3ab9ff4d63ed78a8428.hot-update.js": "/chunks/oasis/invoices/profile.e3ab9ff4d63ed78a8428.hot-update.js",
"/chunks/oasis/invoices.f9aa0151452c385ab22f.hot-update.js": "/chunks/oasis/invoices.f9aa0151452c385ab22f.hot-update.js",
"/chunks/oasis/invoices/client.f9aa0151452c385ab22f.hot-update.js": "/chunks/oasis/invoices/client.f9aa0151452c385ab22f.hot-update.js",
"/chunks/oasis/invoices/client-invoices.f9aa0151452c385ab22f.hot-update.js": "/chunks/oasis/invoices/client-invoices.f9aa0151452c385ab22f.hot-update.js",
"/chunks/oasis/invoices/edit-invoice.696137eb8832304e3bb4.hot-update.js": "/chunks/oasis/invoices/edit-invoice.696137eb8832304e3bb4.hot-update.js",
"/chunks/oasis/invoices.c72f8b81b400bfa88d98.hot-update.js": "/chunks/oasis/invoices.c72f8b81b400bfa88d98.hot-update.js",
"/chunks/oasis/invoices/create-invoice.c72f8b81b400bfa88d98.hot-update.js": "/chunks/oasis/invoices/create-invoice.c72f8b81b400bfa88d98.hot-update.js",
"/chunks/oasis/invoices/profile.c72f8b81b400bfa88d98.hot-update.js": "/chunks/oasis/invoices/profile.c72f8b81b400bfa88d98.hot-update.js",
"/chunks/oasis/invoices/create-invoice.4b1592ddd121ceb23b97.hot-update.js": "/chunks/oasis/invoices/create-invoice.4b1592ddd121ceb23b97.hot-update.js"
}

36
resources/js/Oasis/Invoices/BillingProfile.vue
View File

@@ -16,14 +16,14 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_logo') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="logo" v-slot="{ errors }">
<ImageInput @input="$updateImage('/oasis/invoices/profile', 'logo', profile.logo)" :image="$getImage(profile.logo)" v-model="profile.logo" :error="errors[0]" />
<ImageInput @input="$updateImage('/invoices/profile', 'logo', profile.logo)" :image="$getImage(profile.logo)" v-model="profile.logo" :error="errors[0]" />
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in.form.company_name') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="company" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'company', profile.company)" v-model="profile.company" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'company', profile.company)" v-model="profile.company" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -35,7 +35,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="registration_notes" rules="required" v-slot="{ errors }">
<textarea
rows="2"
@input="$updateText('/oasis/invoices/profile', 'registration_notes', profile.registration_notes)"
@input="$updateText('/invoices/profile', 'registration_notes', profile.registration_notes)"
v-model="profile.registration_notes"
placeholder=""
:class="{'is-error': errors[0]}"
@@ -55,7 +55,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.ico') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ico" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'ico', profile.ico)" v-model="profile.ico" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'ico', profile.ico)" v-model="profile.ico" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -64,7 +64,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.dic') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="dic" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'dic', profile.dic)" v-model="profile.dic" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'dic', profile.dic)" v-model="profile.dic" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -73,7 +73,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.ic_dph') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ic_dph" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'ic_dph', profile.ic_dph)" v-model="profile.ic_dph" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'ic_dph', profile.ic_dph)" v-model="profile.ic_dph" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -87,7 +87,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_address') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="address" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'address', profile.address)" v-model="profile.address" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'address', profile.address)" v-model="profile.address" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -97,7 +97,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_city') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="city" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'city', profile.city)" v-model="profile.city" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'city', profile.city)" v-model="profile.city" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -106,7 +106,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_postal_code') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="postal_code" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'postal_code', profile.postal_code)" v-model="profile.postal_code" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'postal_code', profile.postal_code)" v-model="profile.postal_code" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -116,7 +116,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_country') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="country" rules="required" v-slot="{ errors }">
<SelectInput @input="$updateText('/oasis/invoices/profile', 'country', profile.country)" v-model="profile.country" :default="profile.country" :options="countries" placeholder="" :isError="errors[0]"/>
<SelectInput @input="$updateText('/invoices/profile', 'country', profile.country)" v-model="profile.country" :default="profile.country" :options="countries" placeholder="" :isError="errors[0]"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
@@ -129,7 +129,7 @@
<div class="block-wrapper">
<label>{{ $t('in.form.bank_name') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="bank" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'bank', profile.bank)" v-model="profile.bank" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'bank', profile.bank)" v-model="profile.bank" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -138,7 +138,7 @@
<div class="block-wrapper">
<label>{{ $t('in.form.iban') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="iban" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'iban', profile.iban)" v-model="profile.iban" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'iban', profile.iban)" v-model="profile.iban" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -147,7 +147,7 @@
<div class="block-wrapper">
<label>{{ $t('in.form.swift_code') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="swift" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'swift', profile.swift)" v-model="profile.swift" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'swift', profile.swift)" v-model="profile.swift" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -161,7 +161,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_phone') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="phone" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'phone', profile.phone)" v-model="profile.phone" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'phone', profile.phone)" v-model="profile.phone" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -170,7 +170,7 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_email') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="email" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'email', profile.email)" v-model="profile.email" placeholder="" type="email"
<input @input="$updateText('/invoices/profile', 'email', profile.email)" v-model="profile.email" placeholder="" type="email"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -179,7 +179,7 @@
<div class="block-wrapper">
<label>{{ $t('in.form.author_name') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="author" rules="required" v-slot="{ errors }">
<input @input="$updateText('/oasis/invoices/profile', 'author', profile.author)" v-model="profile.author" placeholder="" type="text"
<input @input="$updateText('/invoices/profile', 'author', profile.author)" v-model="profile.author" placeholder="" type="text"
:class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -188,7 +188,7 @@
<div class="block-wrapper">
<label>{{ $t('in.form.stamp') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="stamp" v-slot="{ errors }">
<ImageInput @input="$updateImage('/oasis/invoices/profile', 'stamp', profile.stamp)" :image="$getImage(profile.stamp)" v-model="profile.stamp" :error="errors[0]" />
<ImageInput @input="$updateImage('/invoices/profile', 'stamp', profile.stamp)" :image="$getImage(profile.stamp)" v-model="profile.stamp" :error="errors[0]" />
</ValidationProvider>
</div>
</div>
@@ -265,7 +265,7 @@
},
methods: {},
created() {
axios.get('/api/oasis/invoices/profile')
axios.get('/api/invoices/profile')
.then(response => {
this.profile = response.data.data.attributes
})

2
resources/js/Oasis/Invoices/BillingProfileSetUp.vue
View File

@@ -260,7 +260,7 @@
// Send request to get user token
axios
.post('/api/oasis/invoices/profile', formData, {
.post('/api/invoices/profile', formData, {
headers: {
'Content-Type': 'multipart/form-data',
}

3
resources/js/Oasis/Invoices/Clients/Client.vue
View File

@@ -74,7 +74,7 @@
},
methods: {
fetchUser() {
axios.get(`/api/oasis/clients/${this.$route.params.id}`)
axios.get(`/api/clients/${this.$route.params.id}`)
.then(response => {
this.client = response.data
})
@@ -111,6 +111,7 @@
border-radius: 12px;
z-index: 1;
position: relative;
object-fit: contain;
&.blurred {
@include blurred-image;

22
resources/js/Oasis/Invoices/Clients/Tabs/ClientDetail.vue
View File

@@ -5,13 +5,13 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_logo') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="avatar" v-slot="{ errors }">
<ImageInput @input="$updateImage(`/oasis/clients/${client.id}`, 'avatar', client.avatar)" v-model="client.avatar" :image="client.avatar" :error="errors[0]" />
<ImageInput @input="$updateImage(`/clients/${client.id}`, 'avatar', client.avatar)" v-model="client.avatar" :image="client.avatar" :error="errors[0]" />
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in_editor.company_name') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="name" rules="required" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'name', client.name)" v-model="client.name" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'name', client.name)" v-model="client.name" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
@@ -21,21 +21,21 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.ico') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ico" rules="required" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'ico', client.ico)" v-model="client.ico" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'ico', client.ico)" v-model="client.ico" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in_editor.dic') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="dic" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'dic', client.dic)" v-model="client.dic" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'dic', client.dic)" v-model="client.dic" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in_editor.ic_dph') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ic_dph" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'ic_dph', client.ic_dph)" v-model="client.ic_dph" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'ic_dph', client.ic_dph)" v-model="client.ic_dph" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
@@ -45,28 +45,28 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_address') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="address" rules="required" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'address', client.address)" v-model="client.address" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'address', client.address)" v-model="client.address" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in_editor.client_city') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="city" rules="required" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'city', client.city)" v-model="client.city" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'city', client.city)" v-model="client.city" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in_editor.client_postal_code') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="postal_code" rules="required" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'postal_code', client.postal_code)" v-model="client.postal_code" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'postal_code', client.postal_code)" v-model="client.postal_code" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in_editor.client_country') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="country" rules="required" v-slot="{ errors }">
<SelectInput @input="$updateText(`/oasis/clients/${client.id}`, 'country', client.country)" v-model="client.country" :default="client.country" :options="countries" placeholder="" :isError="errors[0]" />
<SelectInput @input="$updateText(`/clients/${client.id}`, 'country', client.country)" v-model="client.country" :default="client.country" :options="countries" placeholder="" :isError="errors[0]" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
@@ -76,14 +76,14 @@
<div class="block-wrapper">
<label>{{ $t('in_editor.client_phone') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="phone_number" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'phone_number', client.phone_number)" v-model="client.phone_number" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'phone_number', client.phone_number)" v-model="client.phone_number" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('in_editor.client_email') }} ({{ $t('global.optional') }}):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="email" v-slot="{ errors }">
<input @input="$updateText(`/oasis/clients/${client.id}`, 'email', client.email)" v-model="client.email" placeholder="" type="email" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<input @input="$updateText(`/clients/${client.id}`, 'email', client.email)" v-model="client.email" placeholder="" type="email" :class="{'is-error': errors[0]}" class="focus-border-theme" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>

2
resources/js/Oasis/Invoices/Clients/Tabs/ClientInvoices.vue
View File

@@ -3,7 +3,7 @@
<PageTabGroup>
<DatatableWrapper
@init="isLoading = false"
:api="`/api/oasis/clients/${$route.params.id}/invoices`"
:api="`/api/clients/${$route.params.id}/invoices`"
:paginator="false"
:columns="columns"
class="table"

4
resources/js/Oasis/Invoices/Invoice.vue
View File

@@ -150,7 +150,7 @@
events.$on('action:confirmed', data => {
if (data.operation === 'delete-invoice') {
axios.delete(`/api/oasis/invoices/${data.id}`)
axios.delete(`/api/invoices/${data.id}`)
.then(() => this.goTo(this.currentFolder.location))
.catch(() => this.$isSomethingWrong())
}
@@ -159,7 +159,7 @@
events.$on('action:confirmed', data => {
if (data.operation === 'delete-client') {
axios.delete(`/api/oasis/clients/${data.id}`)
axios.delete(`/api/clients/${data.id}`)
.then(() => this.goTo(this.currentFolder.location))
.catch(() => this.$isSomethingWrong())
}

4
resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue
View File

@@ -615,7 +615,7 @@
// Send request to get user token
axios
.post('/api/oasis/invoices', formData, {
.post('/api/invoices', formData, {
headers: {
'Content-Type': 'multipart/form-data',
}
@@ -690,7 +690,7 @@
mounted() {
this.invoice.invoice_type = this.$route.query.type
axios.get('/api/oasis/invoices/editor')
axios.get('/api/invoices/editor')
.then(response => {
this.isVatPayer = response.data.isVatPayer
this.clients = response.data.clients

6
resources/js/Oasis/Invoices/Invoices/EditInvoice.vue
View File

@@ -509,7 +509,7 @@
// Send request to get user token
axios
.post(`/api/oasis/invoices/${this.$route.params.id}`, formData)
.post(`/api/invoices/${this.$route.params.id}`, formData)
.then(() => {
events.$emit('toaster', {
@@ -560,12 +560,12 @@
}
},
mounted() {
axios.get('/api/oasis/invoices/editor')
axios.get('/api/invoices/editor')
.then(response => {
this.isVatPayer = response.data.isVatPayer
})
axios.get(`/api/oasis/invoices/${this.$route.params.id}`)
axios.get(`/api/invoices/${this.$route.params.id}`)
.then(response => {
this.invoice.invoice_number = response.data.data.attributes.invoice_number
this.invoice.variable_number = response.data.data.attributes.variable_number

2
resources/js/Oasis/Invoices/components/ClientItem.vue
View File

@@ -349,7 +349,7 @@ export default {
}
.image {
object-fit: cover;
object-fit: contain;
user-select: none;
max-width: 100%;
border-radius: 5px;

2
resources/js/Oasis/Invoices/components/ShareInvoicePopup.vue
View File

@@ -86,7 +86,7 @@ export default {
// Send request to get share link
axios
.post(`/api/oasis/invoices/${this.pickedItem.id}/share`,
.post(`/api/invoices/${this.pickedItem.id}/share`,
this.shareOptions
)
.then(() => {

10
resources/js/store/modules/oasisInvoices
View File

@@ -20,7 +20,7 @@ const actions = {
})
axios
.get('/api/oasis/invoices/regular' + getters.invoiceSorting.URI)
.get('/api/invoices/regular' + getters.invoiceSorting.URI)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
})
@@ -41,7 +41,7 @@ const actions = {
})
axios
.get('/api/oasis/invoices/advance' + getters.invoiceSorting.URI)
.get('/api/invoices/advance' + getters.invoiceSorting.URI)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
})
@@ -62,7 +62,7 @@ const actions = {
})
axios
.get('/api/oasis/clients' + getters.invoiceSorting.URI)
.get('/api/clients' + getters.invoiceSorting.URI)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
})
@@ -78,7 +78,7 @@ const actions = {
commit('CHANGE_SEARCHING_STATE', true)
axios
.get('/api/oasis/invoices/search', {
.get('/api/invoices/search', {
params: {
query: query,
type: getters.currentFolder.location,
@@ -94,7 +94,7 @@ const actions = {
commit('CHANGE_SEARCHING_STATE', true)
axios
.get('/api/oasis/clients/search', {
.get('/api/clients/search', {
params: {query: query}
})
.then(response => {