From ce3db7d0c6ad4a299383343e335a4aa49d37398b Mon Sep 17 00:00:00 2001
From: Sanchit Sharma <38894210+sanchits2003@users.noreply.github.com>
Date: Fri, 18 Feb 2022 12:26:27 +1100
Subject: [PATCH 1/2] Update readme.md (#802)

Fix API Documentation URL
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 66a9fd62..b94d4ac2 100644
--- a/readme.md
+++ b/readme.md
@@ -22,7 +22,7 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
 - [Installation Steps](https://docs.craterapp.com/installation.html)
 - [User Guide](https://docs.craterapp.com/)
 - [Developer Guide](https://docs.craterapp.com/developer-guide.html)
-- [API Documentation](https://docs.craterapp.com/api-documentation.html)
+- [API Documentation](https://api-docs.craterapp.com)
 
 ## Download
 

From bed05fc21fca52b317b07271e4d8bce2541052e2 Mon Sep 17 00:00:00 2001
From: Mwikala Kangwa <hello@mwikala.co.uk>
Date: Sat, 19 Feb 2022 04:29:37 +0000
Subject: [PATCH 2/2] Arrange Invoice, Recurring Invoices and Estimate Tab
 groups for a more natural flow (#803)

---
 resources/scripts/admin/views/estimates/Index.vue          | 2 +-
 resources/scripts/admin/views/invoices/Index.vue           | 6 +++---
 resources/scripts/admin/views/recurring-invoices/Index.vue | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/scripts/admin/views/estimates/Index.vue b/resources/scripts/admin/views/estimates/Index.vue
index f566031c..4ac22cd8 100644
--- a/resources/scripts/admin/views/estimates/Index.vue
+++ b/resources/scripts/admin/views/estimates/Index.vue
@@ -134,9 +134,9 @@
       >
         <!-- Tabs -->
         <BaseTabGroup class="-mb-5" @change="setStatusFilter">
+          <BaseTab :title="$t('general.all')" filter="" />
           <BaseTab :title="$t('general.draft')" filter="DRAFT" />
           <BaseTab :title="$t('general.sent')" filter="SENT" />
-          <BaseTab :title="$t('general.all')" filter="" />
         </BaseTabGroup>
 
         <BaseDropdown
diff --git a/resources/scripts/admin/views/invoices/Index.vue b/resources/scripts/admin/views/invoices/Index.vue
index 5a7f8ce5..d0cba28c 100644
--- a/resources/scripts/admin/views/invoices/Index.vue
+++ b/resources/scripts/admin/views/invoices/Index.vue
@@ -131,10 +131,10 @@
       >
         <!-- Tabs -->
         <BaseTabGroup class="-mb-5" @change="setStatusFilter">
-          <BaseTab :title="$t('general.draft')" filter="DRAFT" />
-          <BaseTab :title="$t('general.due')" filter="DUE" />
-          <BaseTab :title="$t('general.sent')" filter="SENT" />
           <BaseTab :title="$t('general.all')" filter="" />
+          <BaseTab :title="$t('general.draft')" filter="DRAFT" />
+          <BaseTab :title="$t('general.sent')" filter="SENT" />
+          <BaseTab :title="$t('general.due')" filter="DUE" />
         </BaseTabGroup>
 
         <BaseDropdown
diff --git a/resources/scripts/admin/views/recurring-invoices/Index.vue b/resources/scripts/admin/views/recurring-invoices/Index.vue
index 0af79302..7e6f9ee3 100644
--- a/resources/scripts/admin/views/recurring-invoices/Index.vue
+++ b/resources/scripts/admin/views/recurring-invoices/Index.vue
@@ -129,9 +129,9 @@
           :default-index="currentStatusIndex"
           @change="setStatusFilter"
         >
+          <BaseTab :title="$t('recurring_invoices.all')" filter="ALL" />
           <BaseTab :title="$t('recurring_invoices.active')" filter="ACTIVE" />
           <BaseTab :title="$t('recurring_invoices.on_hold')" filter="ON_HOLD" />
-          <BaseTab :title="$t('recurring_invoices.all')" filter="ALL" />
         </BaseTabGroup>
 
         <BaseDropdown