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

Invoice & Clients sorting

Browse Source
This commit is contained in:
Peter Papp
2021-05-11 10:09:50 +02:00
parent 1ea8f2ce60
commit a6db642db7
16 changed files with 195 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.php_cs.cache
+1 -1
View File
File diff suppressed because one or more lines are too long
app/Http/Controllers/Admin/DashboardController.php
-1
View File
@@ -1,7 +1,6 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use DB;
use App\Models\User; use App\Models\User;
use ByteUnits\Metric; use ByteUnits\Metric;
use App\Services\StripeService; use App\Services\StripeService;
app/Http/Controllers/Oasis/ClientController.php
+5 -1
View File
@@ -20,8 +20,12 @@ class ClientController extends Controller
*/ */
public function index() public function index()
{ {
$clients = Client::sortable()
->whereUserId(Auth::id())
->get();
return response( return response(
new OasisViewClientCollection(Auth::user()->clients), new OasisViewClientCollection($clients),
200 200
); );
} }
app/Http/Controllers/Oasis/InvoiceController.php
+25 -16
View File
@@ -1,22 +1,21 @@
<?php <?php
namespace App\Http\Controllers\Oasis; namespace App\Http\Controllers\Oasis;
use App\Http\Requests\Oasis\ShareInvoiceRequest;
use App\Http\Resources\Oasis\OasisInvoiceResource;
use Auth; use Auth;
use Illuminate\Http\Request;
use Storage; use Storage;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use App\Models\Oasis\Client; use App\Models\Oasis\Client;
use Illuminate\Http\Request;
use App\Models\Oasis\Invoice; use App\Models\Oasis\Invoice;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use App\Http\Requests\Oasis\ShareInvoiceRequest;
use App\Http\Requests\Oasis\StoreInvoiceRequest; use App\Http\Requests\Oasis\StoreInvoiceRequest;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Resources\Oasis\OasisInvoiceResource;
use App\Http\Resources\Oasis\OasisViewInvoiceResource; use App\Http\Resources\Oasis\OasisViewInvoiceResource;
use App\Http\Resources\Oasis\OasisViewInvoiceCollection; use App\Http\Resources\Oasis\OasisViewInvoiceCollection;
use App\Notifications\Oasis\InvoiceDeliveryNotification; use App\Notifications\Oasis\InvoiceDeliveryNotification;
@@ -28,8 +27,13 @@ class InvoiceController extends Controller
*/ */
public function get_all_regular_invoices() public function get_all_regular_invoices()
{ {
$invoices = Invoice::sortable()
->whereUserId(Auth::id())
->whereInvoiceType('regular-invoice')
->get();
return response( return response(
new OasisViewInvoiceCollection(Auth::user()->regularInvoices), new OasisViewInvoiceCollection($invoices),
200 200
); );
} }
@@ -39,8 +43,13 @@ class InvoiceController extends Controller
*/ */
public function get_all_advance_invoices() public function get_all_advance_invoices()
{ {
$invoices = Invoice::sortable()
->whereUserId(Auth::id())
->whereInvoiceType('advance-invoice')
->get();
return response( return response(
new OasisViewInvoiceCollection(Auth::user()->advanceInvoices), new OasisViewInvoiceCollection($invoices),
200 200
); );
} }
@@ -75,9 +84,9 @@ class InvoiceController extends Controller
*/ */
public function search() public function search()
{ {
$query = remove_accents(request()->input('query')); $results = Invoice::search(
remove_accents(request()->input('query'))
$results = Invoice::search($query) )
->where('user_id', request()->user()->id) ->where('user_id', request()->user()->id)
->where('invoice_type', request()->input('type')) ->where('invoice_type', request()->input('type'))
->get(); ->get();
@@ -205,7 +214,7 @@ class InvoiceController extends Controller
); );
return response( return response(
'Done.', 'Done',
204 204
); );
} }
@@ -231,12 +240,6 @@ class InvoiceController extends Controller
$user = Auth::user(); $user = Auth::user();
return [ return [
'clients' => $user->clients->map(function ($client) {
return [
'label' => $client->name,
'value' => $client->id,
];
}),
'isVatPayer' => $user->invoiceProfile->ic_dph ?? false, 'isVatPayer' => $user->invoiceProfile->ic_dph ?? false,
'latestInvoiceNumber' => $user->regularInvoices->first() 'latestInvoiceNumber' => $user->regularInvoices->first()
? (int) $user->regularInvoices->first()->invoice_number ? (int) $user->regularInvoices->first()->invoice_number
@@ -244,6 +247,12 @@ class InvoiceController extends Controller
'recommendedInvoiceNumber' => $user->regularInvoices->first() 'recommendedInvoiceNumber' => $user->regularInvoices->first()
? (int) $user->regularInvoices->first()->invoice_number + 1 ? (int) $user->regularInvoices->first()->invoice_number + 1
: Carbon::now()->format('Y') . '0001', : Carbon::now()->format('Y') . '0001',
'clients' => $user->clients->map(function ($client) {
return [
'label' => $client->name,
'value' => $client->id,
];
}),
]; ];
} }
app/Http/Controllers/Oasis/InvoiceProfileController.php
-1
View File
@@ -20,7 +20,6 @@ class InvoiceProfileController extends Controller
$user = Auth::user(); $user = Auth::user();
if ($user->invoiceProfile) { if ($user->invoiceProfile) {
return response( return response(
new InvoiceProfileResource($user->invoiceProfile), new InvoiceProfileResource($user->invoiceProfile),
200 200
app/Http/Requests/Oasis/ShareInvoiceRequest.php
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Oasis; namespace App\Http\Requests\Oasis;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
app/Http/Resources/Oasis/OasisInvoiceResource.php
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources\Oasis; namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
app/Http/custom-helpers.php
-1
View File
@@ -76,7 +76,6 @@ function invoice_tax_base($invoice)
'rate' => $item['tax_rate'], 'rate' => $item['tax_rate'],
'total' => $item['price'] * $item['amount'], 'total' => $item['price'] * $item['amount'],
]); ]);
} else { } else {
$bag->map(function ($bagItem) use ($item) { $bag->map(function ($bagItem) use ($item) {
if ($bagItem['rate'] === $item['tax_rate']) { if ($bagItem['rate'] === $item['tax_rate']) {
app/Models/Oasis/Client.php
+7 -1
View File
@@ -3,6 +3,7 @@ namespace App\Models\Oasis;
use App\Models\User; use App\Models\User;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Kyslik\ColumnSortable\Sortable;
use Laravel\Scout\Searchable; use Laravel\Scout\Searchable;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@@ -14,7 +15,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
*/ */
class Client extends Model class Client extends Model
{ {
use HasFactory, Searchable; use HasFactory, Searchable, Sortable;
public $guarded = ['id']; public $guarded = ['id'];
@@ -22,6 +23,11 @@ class Client extends Model
protected $keyType = 'string'; protected $keyType = 'string';
public $sortable = [
'created_at',
'name',
];
/** /**
* Format avatar to full url * Format avatar to full url
* *
app/Models/Oasis/Invoice.php
+8 -2
View File
@@ -1,10 +1,10 @@
<?php <?php
namespace App\Models\Oasis; namespace App\Models\Oasis;
use Carbon\Carbon;
use App\Models\User; use App\Models\User;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Laravel\Scout\Searchable; use Laravel\Scout\Searchable;
use Kyslik\ColumnSortable\Sortable;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use TeamTNT\TNTSearch\Indexer\TNTIndexer; use TeamTNT\TNTSearch\Indexer\TNTIndexer;
@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
class Invoice extends Model class Invoice extends Model
{ {
use HasFactory, Searchable; use HasFactory, Searchable, Sortable;
protected $casts = [ protected $casts = [
'items' => 'array', 'items' => 'array',
@@ -24,6 +24,12 @@ class Invoice extends Model
'id', 'id',
]; ];
public $sortable = [
'invoice_number',
'created_at',
'total_net',
];
public $incrementing = false; public $incrementing = false;
protected $keyType = 'string'; protected $keyType = 'string';
config/custom-language-translations.php
+4 -2
View File
@@ -192,10 +192,10 @@ return [
'in.empty.bill_profile_description' => 'Before your first invoice, please set up your billing profile.', 'in.empty.bill_profile_description' => 'Before your first invoice, please set up your billing profile.',
'in.empty.clients_invoices' => "Client doesn't have any invoices yet.", 'in.empty.clients_invoices' => "Client doesn't have any invoices yet.",
'in.empty.invoice_page_title' => "Create Your First Invoice", 'in.empty.invoice_page_title' => 'Create Your First Invoice',
'in.empty.invoice_page_description' => "It's very easy, just click on the button below.", 'in.empty.invoice_page_description' => "It's very easy, just click on the button below.",
'in.empty.client_page_title' => "Create Your First Client", 'in.empty.client_page_title' => 'Create Your First Client',
'in.form.some_issues' => 'We found some issues in your form. Please check it out and submit again', 'in.form.some_issues' => 'We found some issues in your form. Please check it out and submit again',
'in.form.create_client' => 'Create Client', 'in.form.create_client' => 'Create Client',
@@ -282,4 +282,6 @@ return [
'in.share.type_email' => 'Type email address...', 'in.share.type_email' => 'Type email address...',
'in.share.submit_share' => 'Send Invoice', 'in.share.submit_share' => 'Send Invoice',
'in.share.invoice_sended' => 'Your invoice has been sent successfully', 'in.share.invoice_sended' => 'Your invoice has been sent successfully',
'in.sort_by_net' => 'Sort By Total Net',
'in.sort_by_invoice_number' => 'Sort By Invoice Number',
]; ];
public/mix-manifest.json
+24 -3
View File
@@ -6,7 +6,7 @@
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js?id=9a997811677c9fcc0c6e", "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js?id=9a997811677c9fcc0c6e",
"/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js?id=515118382f7ad5724a54", "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js?id=515118382f7ad5724a54",
"/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js?id=3500df10c19053acd77b", "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js?id=3500df10c19053acd77b",
"/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js?id=7ebb93e8d3cedf069c0b", "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js?id=e04cb058c0e83d3171dc",
"/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js?id=e15b67406596821c2be9", "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js?id=e15b67406596821c2be9",
"/chunks/admin~chunks/oasis/invoices~chunks/platform.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.js?id=5bbc9cca3bfcc01fdc87", "/chunks/admin~chunks/oasis/invoices~chunks/platform.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.js?id=5bbc9cca3bfcc01fdc87",
"/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=1ca47708816a4be47a0a", "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=1ca47708816a4be47a0a",
@@ -57,7 +57,7 @@
"/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=a27824905ee00e5b9d5e", "/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/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/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=b8776f1c1d5b8b0626da",
"/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=d2b607b91b69247bf05c", "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=b64e4b332c1b2fe4155d",
"/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=cb529bbeb676d24b011e", "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=cb529bbeb676d24b011e",
"/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=41015b7ab9210a0e2df6", "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=41015b7ab9210a0e2df6",
"/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=791bf891bb4a384c0890", "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=791bf891bb4a384c0890",
@@ -154,5 +154,26 @@
"/chunks/oasis/invoices.a2e81296c5286a6ab9cf.hot-update.js": "/chunks/oasis/invoices.a2e81296c5286a6ab9cf.hot-update.js", "/chunks/oasis/invoices.a2e81296c5286a6ab9cf.hot-update.js": "/chunks/oasis/invoices.a2e81296c5286a6ab9cf.hot-update.js",
"/chunks/oasis/invoices.3dd500d45303576331bf.hot-update.js": "/chunks/oasis/invoices.3dd500d45303576331bf.hot-update.js", "/chunks/oasis/invoices.3dd500d45303576331bf.hot-update.js": "/chunks/oasis/invoices.3dd500d45303576331bf.hot-update.js",
"/chunks/oasis/invoices.23848caf5faa2c2cd4a3.hot-update.js": "/chunks/oasis/invoices.23848caf5faa2c2cd4a3.hot-update.js", "/chunks/oasis/invoices.23848caf5faa2c2cd4a3.hot-update.js": "/chunks/oasis/invoices.23848caf5faa2c2cd4a3.hot-update.js",
"/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js": "/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js" "/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js": "/chunks/oasis/invoices.0bf75b19f8e77e4eac43.hot-update.js",
"/chunks/oasis/invoices/list.b3a43153ac90cb3cca4a.hot-update.js": "/chunks/oasis/invoices/list.b3a43153ac90cb3cca4a.hot-update.js",
"/js/main.cecf5b73f06061c06bd5.hot-update.js": "/js/main.cecf5b73f06061c06bd5.hot-update.js",
"/chunks/oasis/invoices/list.cecf5b73f06061c06bd5.hot-update.js": "/chunks/oasis/invoices/list.cecf5b73f06061c06bd5.hot-update.js",
"/chunks/oasis/invoices/list.424d115407676741fcdc.hot-update.js": "/chunks/oasis/invoices/list.424d115407676741fcdc.hot-update.js",
"/js/main.66bc5e1fb750efafbd0e.hot-update.js": "/js/main.66bc5e1fb750efafbd0e.hot-update.js",
"/js/main.de282024eb55ef14581a.hot-update.js": "/js/main.de282024eb55ef14581a.hot-update.js",
"/chunks/oasis/invoices/list.7bba12a9911d54749f73.hot-update.js": "/chunks/oasis/invoices/list.7bba12a9911d54749f73.hot-update.js",
"/js/main.161eb537875d969d5b6e.hot-update.js": "/js/main.161eb537875d969d5b6e.hot-update.js",
"/js/main.d880a78c9e4a48feb609.hot-update.js": "/js/main.d880a78c9e4a48feb609.hot-update.js",
"/js/main.a5e4b2ace70bee20a1a0.hot-update.js": "/js/main.a5e4b2ace70bee20a1a0.hot-update.js",
"/js/main.9b066fbed86ecec52dee.hot-update.js": "/js/main.9b066fbed86ecec52dee.hot-update.js",
"/js/main.cc585a2b18a03b71620e.hot-update.js": "/js/main.cc585a2b18a03b71620e.hot-update.js",
"/chunks/oasis/invoices/list.36b8e5b030586fb0d35d.hot-update.js": "/chunks/oasis/invoices/list.36b8e5b030586fb0d35d.hot-update.js",
"/chunks/oasis/invoices/list.07126decb4f904d571aa.hot-update.js": "/chunks/oasis/invoices/list.07126decb4f904d571aa.hot-update.js",
"/chunks/oasis/invoices/list.2d37b25effcf088e4f9c.hot-update.js": "/chunks/oasis/invoices/list.2d37b25effcf088e4f9c.hot-update.js",
"/chunks/oasis/invoices/list.ccf983e1788b1e40ec9c.hot-update.js": "/chunks/oasis/invoices/list.ccf983e1788b1e40ec9c.hot-update.js",
"/chunks/oasis/invoices/list.d279ac45643d3f93208c.hot-update.js": "/chunks/oasis/invoices/list.d279ac45643d3f93208c.hot-update.js",
"/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.645b3154cb8b4cb5bef6.hot-update.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.645b3154cb8b4cb5bef6.hot-update.js",
"/chunks/oasis/invoices/list.c35b17432d1251d93bbb.hot-update.js": "/chunks/oasis/invoices/list.c35b17432d1251d93bbb.hot-update.js",
"/chunks/oasis/invoices/list.b0ff13923b3e0c3e1f3f.hot-update.js": "/chunks/oasis/invoices/list.b0ff13923b3e0c3e1f3f.hot-update.js",
"/chunks/oasis/invoices/list.34473b8481c7f1601ee0.hot-update.js": "/chunks/oasis/invoices/list.34473b8481c7f1601ee0.hot-update.js"
} }
resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue
+29 -2
View File
@@ -44,8 +44,13 @@
<ToolbarGroup> <ToolbarGroup>
<PopoverWrapper> <PopoverWrapper>
<ToolbarButton @click.stop.native="showSortingMenu" source="preview-sorting" :action="$t('actions.sorting_view')" /> <ToolbarButton @click.stop.native="showSortingMenu" source="preview-sorting" :action="$t('actions.sorting_view')" />
<PopoverItem name="desktop-sorting"> <PopoverItem name="desktop-sorting" side="left">
<OptionGroup> <OptionGroup v-if="$isThisLocation(['regular-invoice', 'advance-invoice'])">
<Option @click.native.stop="sort('created_at')" :title="$t('preview_sorting.sort_date')" icon="calendar" />
<Option @click.native.stop="sort('total_net')" :title="$t('in.sort_by_net')" icon="dollar" />
<Option @click.native.stop="sort('invoice_number')" :title="$t('in.sort_by_invoice_number')" icon="file-text" />
</OptionGroup>
<OptionGroup v-if="$isThisLocation('clients')">
<Option @click.native.stop="sort('created_at')" :title="$t('preview_sorting.sort_date')" icon="calendar" /> <Option @click.native.stop="sort('created_at')" :title="$t('preview_sorting.sort_date')" icon="calendar" />
<Option @click.native.stop="sort('name')" :title="$t('preview_sorting.sort_alphabet')" icon="alphabet" /> <Option @click.native.stop="sort('name')" :title="$t('preview_sorting.sort_alphabet')" icon="alphabet" />
</OptionGroup> </OptionGroup>
@@ -113,6 +118,10 @@
data() { data() {
return { return {
query: '', query: '',
filter: {
sort: 'DESC',
field: undefined
}
} }
}, },
watch: { watch: {
@@ -121,6 +130,24 @@
} }
}, },
methods: { methods: {
sort(field) {
this.filter.field = field
// Set sorting direction
if (this.filter.sort === 'DESC')
this.filter.sort = 'ASC'
else if (this.filter.sort === 'ASC')
this.filter.sort = 'DESC'
// Save to localStorage sorting options
localStorage.setItem('sorting-invoices', JSON.stringify({ sort: this.filter.sort, field: this.filter.field }))
// Update sorting state in vuex
this.$store.commit('UPDATE_INVOICE_SORTING')
// Get data using the application location
this.$getInvoiceDataByLocation()
},
createInvoice(type) { createInvoice(type) {
this.$router.push({name: 'CreateInvoice', query: {type: type}}) this.$router.push({name: 'CreateInvoice', query: {type: type}})
}, },
resources/js/components/FilesView/Option.vue
+3
View File
@@ -36,6 +36,7 @@
<box-icon v-if="icon === 'box'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/> <box-icon v-if="icon === 'box'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
<clock-icon v-if="icon === 'clock'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/> <clock-icon v-if="icon === 'clock'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
<send-icon v-if="icon === 'send'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/> <send-icon v-if="icon === 'send'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
<dollar-sign-icon v-if="icon === 'dollar'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
</div> </div>
<div class="text-label group-hover-text-theme" :class="{'text-theme': isActive}"> <div class="text-label group-hover-text-theme" :class="{'text-theme': isActive}">
{{ title }} {{ title }}
@@ -49,6 +50,7 @@
<script> <script>
import AlphabetIcon from '@/components/FilesView/Icons/AlphabetIcon' import AlphabetIcon from '@/components/FilesView/Icons/AlphabetIcon'
import { import {
DollarSignIcon,
UserPlusIcon, UserPlusIcon,
FilePlusIcon, FilePlusIcon,
SendIcon, SendIcon,
@@ -95,6 +97,7 @@ import {
'icon' 'icon'
], ],
components: { components: {
DollarSignIcon,
UserPlusIcon, UserPlusIcon,
FilePlusIcon, FilePlusIcon,
SendIcon, SendIcon,
resources/js/oasis-helpers.js
Vendored
+16
View File
@@ -1,10 +1,26 @@
import i18n from '@/i18n/index' import i18n from '@/i18n/index'
import {debounce} from 'lodash' import {debounce} from 'lodash'
import {events} from './bus' import {events} from './bus'
import store from "./store";
const OasisHelpers = { const OasisHelpers = {
install(Vue) { install(Vue) {
Vue.prototype.$getInvoiceDataByLocation = function () {
let currentLocation = store.getters.currentFolder && store.getters.currentFolder.location
? store.getters.currentFolder.location
: undefined
let actions = {
'regular-invoice': 'getRegularInvoices',
'advance-invoice': 'getAdvanceInvoices',
'clients': 'getClients',
}
this.$store.dispatch(actions[currentLocation])
}
Vue.prototype.$shareInvoice = function (entry) { Vue.prototype.$shareInvoice = function (entry) {
events.$emit('popup:open', { events.$emit('popup:open', {
name: 'share-invoice', name: 'share-invoice',
resources/js/store/modules/oasisInvoices
+20 -12
View File
@@ -2,7 +2,12 @@ import {events} from '@/bus'
import axios from "axios" import axios from "axios"
import Vue from "vue" import Vue from "vue"
const defaultState = {} const defaultState = {
invoiceSorting: {
sort: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).sort : 'DESC',
field: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).field : 'created_at',
},
}
const actions = { const actions = {
getRegularInvoices: ({commit, getters}) => { getRegularInvoices: ({commit, getters}) => {
@@ -15,7 +20,7 @@ const actions = {
}) })
axios axios
.get('/api/oasis/invoices/regular') .get('/api/oasis/invoices/regular' + getters.invoiceSorting.URI)
.then(response => { .then(response => {
commit('LOADING_STATE', {loading: false, data: response.data}) commit('LOADING_STATE', {loading: false, data: response.data})
}) })
@@ -36,7 +41,7 @@ const actions = {
}) })
axios axios
.get('/api/oasis/invoices/advance') .get('/api/oasis/invoices/advance' + getters.invoiceSorting.URI)
.then(response => { .then(response => {
commit('LOADING_STATE', {loading: false, data: response.data}) commit('LOADING_STATE', {loading: false, data: response.data})
}) })
@@ -57,7 +62,7 @@ const actions = {
}) })
axios axios
.get('/api/oasis/clients') .get('/api/oasis/clients' + getters.invoiceSorting.URI)
.then(response => { .then(response => {
commit('LOADING_STATE', {loading: false, data: response.data}) commit('LOADING_STATE', {loading: false, data: response.data})
}) })
@@ -97,17 +102,20 @@ const actions = {
}) })
.catch(() => Vue.prototype.$isSomethingWrong()) .catch(() => Vue.prototype.$isSomethingWrong())
}, },
deleteClient: ({commit, getters}, payload) => { }
//
}, const mutations = {
sendInvoice: ({commit, getters}, payload) => { UPDATE_INVOICE_SORTING(state) {
// state.invoiceSorting.field = JSON.parse(localStorage.getItem('sorting-invoices')).field
state.invoiceSorting.sort = JSON.parse(localStorage.getItem('sorting-invoices')).sort
}, },
} }
const mutations = {} const getters = {
invoiceSorting: (state) => {
const getters = {} return {sorting: state.invoiceSorting, URI: '?sort=' + state.invoiceSorting.field + '&direction=' + state.invoiceSorting.sort}
},
}
export default { export default {
state: defaultState, state: defaultState,