- Invoice sorting refactored

- Frontend build

app/Console/Commands/SetupOasisEnvironment.php

@@ -100,7 +100,7 @@ class SetupOasisEnvironment extends Command
                 ['client_id' => $clients[3]->id],
                 ['client_id' => $clients[4]->id],
                 ['client_id' => $clients[5]->id],
-            ))->count(2)
+            ))->count(8)
             ->create([
                 'user_id' => $user->id,
                 'invoice_type' => 'regular-invoice',
@@ -109,7 +109,7 @@ class SetupOasisEnvironment extends Command
             ]);
 
         $advance_invoices = Invoice::factory(Invoice::class)
-            ->count(2)
+            ->count(6)
             ->state(new Sequence(
                 ['client_id' => $clients[0]->id],
                 ['client_id' => $clients[1]->id],

app/Http/Controllers/Oasis/ClientController.php

@@ -20,7 +20,7 @@ class ClientController extends Controller
      */
     public function index()
     {
-        $clients = Client::sortable()
+        $clients = Client::sortable(['created_at', 'DESC'])
             ->whereUserId(Auth::id())
             ->get();
 

app/Http/Controllers/Oasis/InvoiceController.php

@@ -27,7 +27,7 @@ class InvoiceController extends Controller
      */
     public function get_all_regular_invoices()
     {
-        $invoices = Invoice::sortable()
+        $invoices = Invoice::sortable(['created_at', 'DESC'])
             ->whereUserId(Auth::id())
             ->whereInvoiceType('regular-invoice')
             ->get();
@@ -43,7 +43,7 @@ class InvoiceController extends Controller
      */
     public function get_all_advance_invoices()
     {
-        $invoices = Invoice::sortable()
+        $invoices = Invoice::sortable(['created_at', 'DESC'])
             ->whereUserId(Auth::id())
             ->whereInvoiceType('advance-invoice')
             ->get();

config/custom-language-translations.php

@@ -284,4 +284,6 @@ return [
     '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',
+
+    'in.button_sorting' => 'Sorting',
 ];

public/chunks/setup-wizard.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[64],{oBQg:function(e,t,r){"use strict";r.r(t);var n=r("L2JU");function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var i={name:"SetupWizard",computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach((function(t){c(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},Object(n.b)(["config"])),mounted:function(){"setup-done"===this.config.installation&&this.$router.push({name:"SignIn"})}},u=r("KHd+"),p=Object(u.a)(i,(function(){var e=this.$createElement;return(this._self._c||e)("router-view")}),[],!1,null,null,null);t.default=p.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[69],{oBQg:function(e,t,r){"use strict";r.r(t);var n=r("L2JU");function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var i={name:"SetupWizard",computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach((function(t){c(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},Object(n.b)(["config"])),mounted:function(){"setup-done"===this.config.installation&&this.$router.push({name:"SignIn"})}},u=r("KHd+"),p=Object(u.a)(i,(function(){var e=this.$createElement;return(this._self._c||e)("router-view")}),[],!1,null,null,null);t.default=p.exports}}]);

public/chunks/shared/file-browser.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[55],{"77bE":function(t,e,n){"use strict";n.r(e);var i=n("FdzE"),r=n("yMep"),o=n("LtV2"),a=n("hXay"),s=n("2QtR"),c=n("c4kp"),l=n("CjXH"),u=n("L2JU"),d=n("xCqy");function p(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,i)}return n}function h(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}var v={name:"SharedFileBrowser",components:{TreeMenuNavigator:i.a,ContentSidebar:o.a,DesktopToolbar:r.a,ContentGroup:a.a,ContextMenu:s.a,FileBrowser:c.a,HomeIcon:l.D},computed:function(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?p(Object(n),!0).forEach((function(e){h(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):p(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}({},Object(u.b)(["sharedDetail","navigation","config"]),{navigationTree:function(){return this.navigation?this.navigation[0].folders:void 0}}),data:function(){return{homeDirectory:void 0}},methods:{goHome:function(){this.$store.dispatch("browseShared",[{folder:this.homeDirectory,back:!1,init:!0}])},contextMenu:function(t,e){d.a.$emit("contextMenu:show",t,e)},initFileBrowser:function(){this.homeDirectory={id:this.sharedDetail.item_id,name:this.$t("locations.home"),location:"public"},this.$store.dispatch("getFolderTree"),this.goHome()}},created:function(){var t=this;this.sharedDetail?this.initFileBrowser():this.$store.dispatch("getShareDetail",this.$route.params.token).then((function(){t.initFileBrowser()}))}},f=(n("nvG3"),n("KHd+")),b=Object(f.a)(v,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{attrs:{id:"viewport"},on:{"!contextmenu":function(e){return e.preventDefault(),t.contextMenu(e,void 0)}}},[t.navigationTree&&t.navigationTree.length>=1?n("ContentSidebar",[n("ContentGroup",{attrs:{title:t.$t("sidebar.locations_title")}},[n("div",{staticClass:"menu-list-wrapper vertical"},[n("a",{staticClass:"menu-list-item link",on:{click:t.goHome}},[n("div",{staticClass:"icon"},[n("home-icon",{attrs:{size:"17"}})],1),t._v(" "),n("div",{staticClass:"label"},[t._v("\n                        "+t._s(t.$t("sidebar.home"))+"\n                    ")])])])]),t._v(" "),n("ContentGroup",{staticClass:"navigator",attrs:{title:t.$t("sidebar.navigator_title")}},t._l(t.navigationTree,(function(t){return n("TreeMenuNavigator",{key:t.id,staticClass:"folder-tree",attrs:{depth:0,nodes:t}})})),1)],1):t._e(),t._v(" "),n("div",{attrs:{id:"files-view"}},[n("ContextMenu"),t._v(" "),n("DesktopToolbar"),t._v(" "),n("FileBrowser")],1)],1)}),[],!1,null,null,null);e.default=b.exports},lEpy:function(t,e,n){var i=n("nKEh");"string"==typeof i&&(i=[[t.i,i,""]]);var r={hmr:!0,transform:void 0,insertInto:void 0};n("aET+")(i,r);i.locals&&(t.exports=i.locals)},nKEh:function(t,e,n){(t.exports=n("I1BE")(!1)).push([t.i,"#files-view {\n  font-family: 'Nunito', sans-serif;\n  font-size: 16px;\n  width: 100%;\n  height: 100%;\n  position: relative;\n  min-width: 320px;\n  overflow-x: hidden;\n  padding-left: 15px;\n  padding-right: 15px;\n  overflow-y: hidden;\n}\n",""])},nvG3:function(t,e,n){"use strict";var i=n("lEpy");n.n(i).a}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[72],{"77bE":function(t,e,n){"use strict";n.r(e);var i=n("FdzE"),r=n("yMep"),o=n("LtV2"),a=n("hXay"),s=n("2QtR"),c=n("c4kp"),l=n("CjXH"),u=n("L2JU"),d=n("xCqy");function p(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,i)}return n}function h(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}var v={name:"SharedFileBrowser",components:{TreeMenuNavigator:i.a,ContentSidebar:o.a,DesktopToolbar:r.a,ContentGroup:a.a,ContextMenu:s.a,FileBrowser:c.a,HomeIcon:l.H},computed:function(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?p(Object(n),!0).forEach((function(e){h(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):p(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}({},Object(u.b)(["sharedDetail","navigation","config"]),{navigationTree:function(){return this.navigation?this.navigation[0].folders:void 0}}),data:function(){return{homeDirectory:void 0}},methods:{goHome:function(){this.$store.dispatch("browseShared",[{folder:this.homeDirectory,back:!1,init:!0}])},contextMenu:function(t,e){d.a.$emit("contextMenu:show",t,e)},initFileBrowser:function(){this.homeDirectory={id:this.sharedDetail.item_id,name:this.$t("locations.home"),location:"public"},this.$store.dispatch("getFolderTree"),this.goHome()}},created:function(){var t=this;this.sharedDetail?this.initFileBrowser():this.$store.dispatch("getShareDetail",this.$route.params.token).then((function(){t.initFileBrowser()}))}},f=(n("nvG3"),n("KHd+")),b=Object(f.a)(v,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{attrs:{id:"viewport"},on:{"!contextmenu":function(e){return e.preventDefault(),t.contextMenu(e,void 0)}}},[t.navigationTree&&t.navigationTree.length>=1?n("ContentSidebar",[n("ContentGroup",{attrs:{title:t.$t("sidebar.locations_title")}},[n("div",{staticClass:"menu-list-wrapper vertical"},[n("a",{staticClass:"menu-list-item link",on:{click:t.goHome}},[n("div",{staticClass:"icon"},[n("home-icon",{attrs:{size:"17"}})],1),t._v(" "),n("div",{staticClass:"label"},[t._v("\n                        "+t._s(t.$t("sidebar.home"))+"\n                    ")])])])]),t._v(" "),n("ContentGroup",{staticClass:"navigator",attrs:{title:t.$t("sidebar.navigator_title")}},t._l(t.navigationTree,(function(t){return n("TreeMenuNavigator",{key:t.id,staticClass:"folder-tree",attrs:{depth:0,nodes:t}})})),1)],1):t._e(),t._v(" "),n("div",{attrs:{id:"files-view"}},[n("ContextMenu"),t._v(" "),n("DesktopToolbar"),t._v(" "),n("FileBrowser")],1)],1)}),[],!1,null,null,null);e.default=b.exports},lEpy:function(t,e,n){var i=n("nKEh");"string"==typeof i&&(i=[[t.i,i,""]]);var r={hmr:!0,transform:void 0,insertInto:void 0};n("aET+")(i,r);i.locals&&(t.exports=i.locals)},nKEh:function(t,e,n){(t.exports=n("I1BE")(!1)).push([t.i,"#files-view {\n  font-family: 'Nunito', sans-serif;\n  font-size: 16px;\n  width: 100%;\n  height: 100%;\n  position: relative;\n  min-width: 320px;\n  overflow-x: hidden;\n  padding-left: 15px;\n  padding-right: 15px;\n  overflow-y: hidden;\n}\n",""])},nvG3:function(t,e,n){"use strict";var i=n("lEpy");n.n(i).a}}]);

public/mix-manifest.json

@@ -1,110 +1,93 @@
 {
-    "/js/main.js": "/js/main.js",
-    "/css/app.css": "/css/app.css",
-    "/chunks/admin.js": "/chunks/admin.js?id=c22d3c1a1444a2379087",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=53481b30be995f1e88cc",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=62b552a0492fe95b2223",
-    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~cf616679.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~cf616679.js?id=fd241499c4e3b6a88840",
-    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js?id=dc1abd740ef0db3451a2",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=9f5ea99d0c78f0efb484",
-    "/chunks/admin~chunks/files~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared/file-browser.js?id=6e8f4b2902f25274a2ce",
-    "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=e6e239fa538155e7b439",
-    "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=7e94943976a0aea65e09",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=b8a007c37d41c8046be7",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=1ae1e65bb6a5ed7c3e10",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=7702f37f277478ad66c6",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=04f0cd9719723459b685",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=df765c4489bd194b8f6f",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=73e0af3f075dd4930e6d",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=f5090ab556ecf1598b1f",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=b202ba88807413cd494e",
-    "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js?id=46d89e7310e4babf1999",
-    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~934b6779.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~934b6779.js?id=a6e6609f64172ea3cc16",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=2cddc9ae1515b1d0de31",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=63dc9adc982971f2566f",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=acc6ba7a93681f0d5d64",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=a682d5593f0babefeaca",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=15794a3df34383f66723",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=d332b2ea5c3be779edbf",
-    "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=22bd5db44c72e8de5f5b",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=48dc53ccbd502c2739ec",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=9825336101be68307708",
-    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=9c449e322b1d52b8ad89",
-    "/chunks/database.js": "/chunks/database.js?id=0ddbe198f30d2adb41fd",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6dccc2158cc6278f683d",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=b92c884582bb24b48a18",
-    "/chunks/files.js": "/chunks/files.js?id=af40942fb64ed6bbdd99",
-    "/chunks/files~chunks/platform~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared/file-browser.js?id=8cacfb709649a8e34a1b",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=9c016d93de5832e704a1",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=01a2f683fae06e7b3a47",
-    "/chunks/files~chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js?id=8e64aa7dcf2243d072cf",
-    "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=5e4f31eae3364c4e9976",
-    "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js?id=7a6b6c8b23774249d5b2",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=877a9289b77ac3885042",
-    "/chunks/homepage.js": "/chunks/homepage.js?id=48e0e9b3c870c46218ce",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=aac4a6ec2f451977aea2",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=432dbcaa4cff9f76d093",
-    "/chunks/not-found.js": "/chunks/not-found.js?id=7204a74c2db0ab70149c",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=2453023e69e47062b4b4",
-    "/chunks/pages.js": "/chunks/pages.js?id=99b0fdc98f5a75997fa0",
-    "/chunks/plan.js": "/chunks/plan.js?id=ac3046761e9083aa3053",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=da77c7688bb76f97be36",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=bc623048cdfadc39f6cb",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=fa768f6b79a08d20b270",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=acdf25ff83af7953455a",
-    "/chunks/plans.js": "/chunks/plans.js?id=83fc2cc3cd4b76c8f8f0",
-    "/chunks/platform.js": "/chunks/platform.js?id=5c76065a97657a2852f6",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=758ed84815775c398939",
-    "/chunks/profile.js": "/chunks/profile.js?id=b142ec15a6a9e1208662",
-    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=d0a44ee2cc3e9882c14a",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=e00ee12cde704060e15b",
-    "/chunks/settings.js": "/chunks/settings.js?id=fcc97a29894164e2977c",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=cee0fe6083f790d0d27c",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=6fdc6648fb9be0a53932",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=48820fdca591517e55f8",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=e92c3a86d102cd9e0448",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0c243c68b17ca976d05a",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=22e5c49d5b0a154e1a28",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=c6b88005b133268ed88f",
-    "/chunks/shared.js": "/chunks/shared.js?id=a2c4342bfddd4946cb85",
-    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=3d5c7754d438830a4204",
-    "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=f46e9dc63c1313bc2256",
-    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=e8aedb75df7fe227d693",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=162161aa204ab6931826",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=ce15b1156cf37c0a9703",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=925a01ec7eaf4f404685",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=9de114b8245fffcc6a25",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=90c1aa9431689a89eb3d",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=bad9215b6e9748a63f58",
-    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=0bdf2950a5a73e6e6975",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=e2b1cae53f336b8afc6e",
-    "/chunks/user.js": "/chunks/user.js?id=3090bfd5b85dd1b200ec",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=05fe42b03699dd4cad49",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=076b79488b1b474f1293",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=d5f8e491085bcff94cdc",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=990dabfd8a113fc69b21",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=6c6b339c6b8a653fc522",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=220201792d4379dac7f5",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=99efdd410910267db66e",
-    "/chunks/users.js": "/chunks/users.js?id=d28a9ac62a41f1ca4af8",
-    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js?id=57c854adb91ed9a9d088",
-    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js?id=170765b4fd923b62195c",
-    "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=ca01bfe1656f58710763",
-    "/vendors~chunks/platform~chunks/shared.js": "/vendors~chunks/platform~chunks/shared.js?id=eb141834bc24b72d8e92",
-    "/chunks/platform~chunks/shared.eb29acb348a0324f9f55.hot-update.js": "/chunks/platform~chunks/shared.eb29acb348a0324f9f55.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.d79f14a16b7ed4e0e23f.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.d79f14a16b7ed4e0e23f.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.7ba5f438ed74391bd85b.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.7ba5f438ed74391bd85b.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.08e701f92b43a11a1f17.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.08e701f92b43a11a1f17.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.6a5e8a43f9ed059d2ccf.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.6a5e8a43f9ed059d2ccf.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.07066d7fc0a2a5640278.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.07066d7fc0a2a5640278.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.9ac41deadb7db8d21864.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.9ac41deadb7db8d21864.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.d420323c2369fe526733.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.d420323c2369fe526733.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.1724aa4baeee25c6c5f4.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.1724aa4baeee25c6c5f4.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.e1ceb62905ca310646aa.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.e1ceb62905ca310646aa.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.fc3df8d9594bfd57477b.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.fc3df8d9594bfd57477b.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.bab16c44484c01acfa57.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.bab16c44484c01acfa57.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.536fb459581c938dd60c.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.536fb459581c938dd60c.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.3a22a477aacf3b98c1e7.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.3a22a477aacf3b98c1e7.hot-update.js",
-    "/chunks/admin~chunks/platform.3a22a477aacf3b98c1e7.hot-update.js": "/chunks/admin~chunks/platform.3a22a477aacf3b98c1e7.hot-update.js",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.49a954cdf0c0e32d66fd.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.49a954cdf0c0e32d66fd.hot-update.js"
+    "/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=195bc845f51ce6d36498",
+    "/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=40bff66dbabd620a5c7e",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~40cda2f4.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~40cda2f4.js?id=c3203130039da465a7d3",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=b1b8e6c2481a414ca4f7",
+    "/chunks/files~chunks/oasis/invoices/list~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/shared/file-browser.js?id=8754c1ac780767414ce0",
+    "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js?id=f7ba959865708b74aef5",
+    "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=44a3217593d9f71d702d",
+    "/chunks/admin.js": "/chunks/admin.js?id=a90bf8811291e010df46",
+    "/chunks/dashboard~chunks/dashboard-oasis.js": "/chunks/dashboard~chunks/dashboard-oasis.js?id=aa4de94799f0d6359f96",
+    "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=6863be7ae651919065a9",
+    "/js/main.js": "/js/main.js?id=d6379a33f108c8da5b8d",
+    "/css/app.css": "/css/app.css?id=e9183e52105da8549dfd",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=800a54b12ef6257507d5",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=1c1b83566868a90dd8e9",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=ffdebe1a9e985d043bb1",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=0a30b4f964b30c34ac14",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=5911c461bb12e6809df3",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=2f45b27675d7b2796351",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=5ca619d9d98d0948d457",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=f96b5d5874e7cb2e5a85",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=dfd81d8780a29fae1c51",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=c98df061fd25143ee592",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=56b76453c25a36f8982b",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=faeb0ff087099d2338fb",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=233006f4daf51540a6e5",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=a520d5e05f5f3c889918",
+    "/chunks/dashboard-oasis.js": "/chunks/dashboard-oasis.js?id=ed57d28970e9d25a57c7",
+    "/chunks/database.js": "/chunks/database.js?id=5e8858c96d80facd4158",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=d1c5ca1c79b2debac866",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a14cbd92bd392981cbd0",
+    "/chunks/files.js": "/chunks/files.js?id=f3f80f4ffa9990321a26",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=16a2798ed2eda763f85a",
+    "/chunks/homepage.js": "/chunks/homepage.js?id=172d61f6a78fe8c66bff",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=27becfa27d2c09b54ae5",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=27a853727d4417256b02",
+    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=1147a3c9625cffbf8743",
+    "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=d40682da49cec1a2056c",
+    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=f40590af47d3e87881e8",
+    "/chunks/oasis/invoices/client.js": "/chunks/oasis/invoices/client.js?id=0800ccae10be5349c8de",
+    "/chunks/oasis/invoices/client-detail.js": "/chunks/oasis/invoices/client-detail.js?id=ea9620cce66b649f9125",
+    "/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=77bd22b0313cab88ec61",
+    "/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=27adbe42488c8081359f",
+    "/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=3e52f7809f7e49417ba0",
+    "/chunks/oasis/invoices/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=f946ffc9bf91ad585d96",
+    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=55e5a0f10cd50f73e71a",
+    "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=656ba33790a80c962402",
+    "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=ce165f5e168c74681d5b",
+    "/chunks/oasis/sign-up.js": "/chunks/oasis/sign-up.js?id=265fd13102e82de6c885",
+    "/chunks/oasis/upgrade-billing.js": "/chunks/oasis/upgrade-billing.js?id=62d7e569a508b89efbda",
+    "/chunks/oasis/upgrade-plan.js": "/chunks/oasis/upgrade-plan.js?id=0ff04d189e8012a772a6",
+    "/chunks/oasis/user-create.js": "/chunks/oasis/user-create.js?id=dbbe553b1192f51e3347",
+    "/chunks/oasis/users.js": "/chunks/oasis/users.js?id=90b79a2afd1c1af0de93",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=f461a854720e430167ad",
+    "/chunks/pages.js": "/chunks/pages.js?id=154de6ecf8de75e52986",
+    "/chunks/plan.js": "/chunks/plan.js?id=4017c43bca1e88be52fe",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=3858091e1cb4ccbff2a2",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=59fce90e14b91b926134",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=3d5c890c879c318877ec",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=3aeb7347662acca51436",
+    "/chunks/plans.js": "/chunks/plans.js?id=de86874e55eec9384139",
+    "/chunks/platform.js": "/chunks/platform.js?id=e960062bdcc0f26132a8",
+    "/chunks/profile.js": "/chunks/profile.js?id=b0f4b9f9ded460ba6f0f",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=bcfbccee713a4915aa3d",
+    "/chunks/settings.js": "/chunks/settings.js?id=dd11a55964c72fc86e8f",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=4f258d7ae720f6058cdc",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=cab4472faa901c1bbf0a",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=4b6f61865aad9ce1b901",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=58bbb1d7d4c3b73a46f1",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=7c18021929c42436c232",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=815fd683f57807826ae1",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=d0353ac99122ce69fb7f",
+    "/chunks/shared.js": "/chunks/shared.js?id=66276189545daa439300",
+    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=ddb14efefb1b754beddb",
+    "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=2a90999a1e96c274fbe6",
+    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=d6f870eec2d2b4a4400a",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=79b669b21e0bcd9c69e3",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=188a69077b6b694efcdf",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=a71ab09be65541bfe932",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=bf68567befa1a54e245d",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=fbaf740effbd15eec7ea",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=64448adc4e0e2b541fe7",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=ca1b7f41502c32648d31",
+    "/chunks/user.js": "/chunks/user.js?id=020eaf5a4df86c951c9e",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=49085ae287fd04da6793",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=7d9f71a92cc65984c7d1",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=995a0bf595cd43315779",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=ab6cbcc0968f86cc76ae",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=9991537c31e5be9b7a5e",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=97119b2893b1ca5e2b06",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=11d16c401ebdba04b506",
+    "/chunks/users.js": "/chunks/users.js?id=9181ac549cb36558a19c"
 }

public/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js.LICENSE.txt

@@ -0,0 +1,30 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <http://feross.org>
+ * @license  MIT
+ */
+
+/*! Copyright Twitter Inc. and other contributors. Licensed under MIT */
+
+/**
+ * @licstart The following is the entire license notice for the
+ * Javascript code in this page
+ *
+ * Copyright 2020 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @licend The above is the entire license notice for the
+ * Javascript code in this page
+ */

resources/js/Oasis/Invoices/components/InvoiceActionsMobile.vue

@@ -10,7 +10,7 @@
                 {{ $t('create') }}
             </MobileActionButton>
             <MobileActionButton @click.native="showViewOptions" icon="th-list">
-                {{ $t('preview_sorting.preview_sorting_button') }}
+                {{ $t('in.button_sorting') }}
             </MobileActionButton>
         </div>
     </div>

resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue

@@ -45,15 +45,7 @@
 					<PopoverWrapper>
 						<ToolbarButton @click.stop.native="showSortingMenu" source="preview-sorting" :action="$t('actions.sorting_view')" />
 						<PopoverItem name="desktop-sorting" side="left">
-							<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('name')" :title="$t('preview_sorting.sort_alphabet')" icon="alphabet" />
-							</OptionGroup>
+							<InvoiceSortingOptions />
 						</PopoverItem>
 					</PopoverWrapper>
                     <ToolbarButton @click.native="$store.dispatch('fileInfoToggle')" :class="{'active': isVisibleSidebar }" :action="$t('actions.info_panel')" source="info" />
@@ -64,7 +56,7 @@
 </template>
 
 <script>
-	import FileSortingOptions from '@/components/FilesView/FileSortingOptions'
+	import InvoiceSortingOptions from '@/Oasis/Invoices/components/InvoiceSortingOptions'
 	import {ChevronLeftIcon, MoreHorizontalIcon} from 'vue-feather-icons'
 	import PopoverWrapper from '@/components/Desktop/PopoverWrapper'
 	import ToolbarWrapper from '@/components/Desktop/ToolbarWrapper'
@@ -80,7 +72,7 @@
 	export default {
 		name: 'InvoiceDesktopToolbar',
 		components: {
-			FileSortingOptions,
+			InvoiceSortingOptions,
 			MoreHorizontalIcon,
 			ChevronLeftIcon,
 			ToolbarWrapper,
@@ -118,10 +110,6 @@
 		data() {
 			return {
 				query: '',
-				filter: {
-					sort: 'DESC',
-					field: undefined
-				}
 			}
 		},
 		watch: {
@@ -130,24 +118,6 @@
 			}
 		},
 		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) {
 				this.$router.push({name: 'CreateInvoice', query: {type: type}})
 			},

resources/js/Oasis/Invoices/components/InvoiceSortingMobile.vue

@@ -1,36 +1,23 @@
 <template>
     <MenuMobile name="invoice-sorting">
         <MenuMobileGroup>
-            <OptionGroup>
-				<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" />
-            </OptionGroup>
+			<InvoiceSortingOptions />
         </MenuMobileGroup>
     </MenuMobile>
 </template>
 
 <script>
+import InvoiceSortingOptions from '@/Oasis/Invoices/components/InvoiceSortingOptions'
 import MenuMobileGroup from '@/components/Mobile/MenuMobileGroup'
-import OptionGroup from '@/components/FilesView/OptionGroup'
 import MenuMobile from '@/components/Mobile/MenuMobile'
-import Option from '@/components/FilesView/Option'
-import {mapGetters} from 'vuex'
 
 export default {
     name: 'InvoiceSortingMobile',
     components: {
+		InvoiceSortingOptions,
         MenuMobileGroup,
-        OptionGroup,
         MenuMobile,
         Option,
     },
-    computed: {
-        ...mapGetters([
-            'homeDirectory'
-        ]),
-    },
-    methods: {
-
-    }
 }
 </script>

resources/js/Oasis/Invoices/components/InvoiceSortingOptions.vue

@@ -0,0 +1,85 @@
+<template>
+    <div>
+		<OptionGroup v-if="$isThisLocation(['regular-invoice', 'advance-invoice'])">
+			<Option @click.native.stop="sort('created_at')" :arrow="arrowForCreatedAtField" :title="$t('preview_sorting.sort_date')" icon="calendar" />
+			<Option @click.native.stop="sort('total_net')" :arrow="arrowForTotalNetField" :title="$t('in.sort_by_net')" icon="dollar" />
+			<Option @click.native.stop="sort('invoice_number')" :arrow="arrowForInvoiceNumberField" :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('name')" :title="$t('preview_sorting.sort_alphabet')" icon="alphabet" />
+		</OptionGroup>
+    </div>
+</template>
+
+<script>
+
+import OptionGroup from '@/components/FilesView/OptionGroup'
+import Option from '@/components/FilesView/Option'
+import { ArrowUpIcon } from 'vue-feather-icons'
+import { mapGetters } from 'vuex'
+
+export default {
+    name: 'InvoiceSortingOptions',
+    components: {
+        OptionGroup,
+        ArrowUpIcon,
+        Option,
+    },
+    computed: {
+		arrowForCreatedAtField() {
+			if (this.filter.field !== 'created_at')
+				return undefined
+
+			return this.filter.sort === 'DESC' ? 'up' : 'down'
+		},
+		arrowForTotalNetField() {
+			if (this.filter.field !== 'total_net')
+				return undefined
+
+			return this.filter.sort === 'DESC' ? 'up' : 'down'
+		},
+		arrowForInvoiceNumberField() {
+			if (this.filter.field !== 'invoice_number')
+				return undefined
+
+			return this.filter.sort === 'DESC' ? 'up' : 'down'
+		},
+    },
+    data() {
+        return {
+            filter: {
+                sort: 'DESC',
+                field: 'created_at'
+            }
+        }
+    },
+    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()
+		},
+    },
+    mounted() {
+        let sorting = JSON.parse(localStorage.getItem('sorting-invoices'))
+
+        // Set default sorting if in not setup in LocalStorage
+        this.filter.sort = sorting ? sorting.sort : 'DESC'
+        this.filter.field = sorting ? sorting.field : 'created_at'
+    }
+}
+</script>