test frontend build

Merge branch 'uffizzi-feat-1' of https://github.com/daramayis/f-crater into daramayis-uffizzi-feat-1
Merge branch 'master' of https://github.com/bytefury/crater
2025-10-31 05:31:10 -04:00 · 2022-12-17 17:43:01 +05:30 · 2022-12-17 17:41:09 +05:30 · 2022-12-13 11:38:49 +05:30 · 2022-11-30 23:32:53 +04:00 · 2022-10-17 12:48:24 +05:30
40 changed files with 1365 additions and 1958 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,5 +16,4 @@ Homestead.yaml
 .gitkeep
 /public/docs
 /.scribe
-!storage/fonts/.gitkeep
-.DS_Store
+!storage/fonts/.gitkeep
--- a/app/Console/Commands/CreateTemplateCommand.php
+++ b/app/Console/Commands/CreateTemplateCommand.php
@ -55,7 +55,7 @@ class CreateTemplateCommand extends Command
        copy(public_path("/build/img/PDF/{$type}1.png"), public_path("/build/img/PDF/{$templateName}.png"));
        copy(resource_path("/static/img/PDF/{$type}1.png"), resource_path("/static/img/PDF/{$templateName}.png"));

-        $path = resource_path("views/app/pdf/{$type}/{$templateName}.blade.php");
+        $path = resource_path("app/pdf/{$type}/{$templateName}.blade.php");
        $type = ucfirst($type);
        $this->info("{$type} Template created successfully at ".$path);

--- a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
+++ b/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
@ -103,6 +103,7 @@ class CustomerStatsController extends Controller
        )
            ->whereCompany()
            ->whereCustomer($customer->id)
+            ->where('status', '<>', Invoice::STATUS_DRAFT)
            ->sum('total');
        $totalReceipts = Payment::whereBetween(
            'payment_date',
--- a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
+++ b/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
@ -104,6 +104,7 @@ class DashboardController extends Controller
            'invoice_date',
            [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
        )
+            ->where('status', '<>', Invoice::STATUS_DRAFT)
            ->whereCompany()
            ->sum('base_total');

@ -141,6 +142,7 @@ class DashboardController extends Controller
        $recent_due_invoices = Invoice::with('customer')
            ->whereCompany()
            ->where('base_due_amount', '>', 0)
+            ->where('status', '<>', Invoice::STATUS_DRAFT)
            ->take(5)
            ->latest()
            ->get();
--- a/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php
+++ b/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php
@ -24,6 +24,7 @@ class InvoicesController extends Controller
        $limit = $request->has('limit') ? $request->limit : 10;

        $invoices = Invoice::whereCompany()
+            ->whereTabFilters($request->tab_status)
            ->join('customers', 'customers.id', '=', 'invoices.customer_id')
            ->applyFilters($request->all())
            ->select('invoices.*', 'customers.name')
--- a/app/Http/Requests/CompaniesRequest.php
+++ b/app/Http/Requests/CompaniesRequest.php
@ -3,7 +3,6 @@
 namespace Crater\Http\Requests;

 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;

 class CompaniesRequest extends FormRequest
@ -34,6 +33,10 @@ class CompaniesRequest extends FormRequest
            'currency' => [
                'required'
            ],
+            'slug' => [
+                'required',
+                Rule::unique('companies')
+            ],
            'address.name' => [
                'nullable',
            ],
@ -68,11 +71,11 @@ class CompaniesRequest extends FormRequest
    {
        return collect($this->validated())
            ->only([
-                'name'
+                'name',
+                'slug'
            ])
            ->merge([
-                'owner_id' => $this->user()->id,
-                'slug' => Str::slug($this->name)
+                'owner_id' => $this->user()->id
            ])
            ->toArray();
    }
--- a/app/Http/Requests/CompanyRequest.php
+++ b/app/Http/Requests/CompanyRequest.php
@ -30,7 +30,8 @@ class CompanyRequest extends FormRequest
                Rule::unique('companies')->ignore($this->header('company'), 'id'),
            ],
            'slug' => [
-                'nullable'
+                'required',
+                Rule::unique('companies')->ignore($this->header('company'), 'id'),
            ],
            'address.country_id' => [
                'required',
--- a/app/Http/Resources/EstimateResource.php
+++ b/app/Http/Resources/EstimateResource.php
@ -23,7 +23,7 @@ class EstimateResource extends JsonResource
            'reference_number' => $this->reference_number,
            'tax_per_item' => $this->tax_per_item,
            'discount_per_item' => $this->discount_per_item,
-            'notes' => $this->getNotes(),
+            'notes' => $this->notes,
            'discount' => $this->discount,
            'discount_type' => $this->discount_type,
            'discount_val' => $this->discount_val,
--- a/app/Http/Resources/PaymentResource.php
+++ b/app/Http/Resources/PaymentResource.php
@ -18,7 +18,7 @@ class PaymentResource extends JsonResource
            'id' => $this->id,
            'payment_number' => $this->payment_number,
            'payment_date' => $this->payment_date,
-            'notes' => $this->getNotes(),
+            'notes' => $this->notes,
            'amount' => $this->amount,
            'unique_hash' => $this->unique_hash,
            'invoice_id' => $this->invoice_id,
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@ -217,7 +217,7 @@ class Company extends Model implements HasMedia
            'estimate_billing_address_format' => $billingAddressFormat,
            'payment_company_address_format' => $companyAddressFormat,
            'payment_from_customer_address_format' => $paymentFromCustomerAddress,
-            'currency' => request()->currency ?? 13,
+            'currency' => request()->currency ?? 1,
            'time_zone' => 'Asia/Kolkata',
            'language' => 'en',
            'fiscal_year' => '1-12',
--- a/app/Models/Estimate.php
+++ b/app/Models/Estimate.php
@ -483,7 +483,8 @@ class Estimate extends Model implements HasMedia
            '{ESTIMATE_DATE}' => $this->formattedEstimateDate,
            '{ESTIMATE_EXPIRY_DATE}' => $this->formattedExpiryDate,
            '{ESTIMATE_NUMBER}' => $this->estimate_number,
-            '{ESTIMATE_REF_NUMBER}' => $this->reference_number,
+            '{PDF_LINK}' => $this->estimatePdfUrl,
+            '{TOTAL_AMOUNT}' => format_money_pdf($this->total, $this->customer->currency)
        ];
    }

--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@ -240,7 +240,7 @@ class Expense extends Model implements HasMedia
        }

        if ($request->hasFile('attachment_receipt')) {
-            $expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
+            $expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts', 'local');
        }

        if ($request->customFields) {
@ -262,12 +262,12 @@ class Expense extends Model implements HasMedia
            ExchangeRateLog::addExchangeRateLog($this);
        }

-        if (isset($request->is_attachment_receipt_removed) && (bool) $request->is_attachment_receipt_removed) {
+        if (isset($request->is_attachment_receipt_removed) && $request->is_attachment_receipt_removed == "true") {
            $this->clearMediaCollection('receipts');
        }
        if ($request->hasFile('attachment_receipt')) {
            $this->clearMediaCollection('receipts');
-            $this->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
+            $this->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts', 'local');
        }

        if ($request->customFields) {
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@ -187,16 +187,6 @@ class Invoice extends Model implements HasMedia
        return Carbon::parse($this->invoice_date)->format($dateFormat);
    }

-    public function scopeWhereStatus($query, $status)
-    {
-        return $query->where('invoices.status', $status);
-    }
-
-    public function scopeWherePaidStatus($query, $status)
-    {
-        return $query->where('invoices.paid_status', $status);
-    }
-
    public function scopeWhereDueStatus($query, $status)
    {
        return $query->whereIn('invoices.paid_status', [
@ -234,6 +224,40 @@ class Invoice extends Model implements HasMedia
        $query->orderBy($orderByField, $orderBy);
    }

+    public function scopeWhereStatus($query, $status)
+    {
+        return $query->where('invoices.status', $status);
+    }
+
+    public function scopeWherePaidStatus($query, $status)
+    {
+        return $query->where('invoices.paid_status', $status);
+    }
+
+    public function scopeWhereTabFilters($query, $status)
+    {
+        if ($status == "DRAFT") {
+            return $query->where('invoices.status', $status);
+        }
+
+        if ($status == "SENT") {
+            return $query->whereIn('invoices.status', [
+                self::STATUS_SENT,
+                self::STATUS_VIEWED,
+                self::STATUS_COMPLETED
+            ]);
+        }
+
+        if ($status == 'DUE') {
+            return $query->whereIn('invoices.paid_status', [
+                self::STATUS_UNPAID,
+                self::STATUS_PARTIALLY_PAID,
+            ]);
+        }
+
+        return ;
+    }
+
    public function scopeApplyFilters($query, array $filters)
    {
        $filters = collect($filters);
@ -249,17 +273,11 @@ class Invoice extends Model implements HasMedia
                $filters->get('status') == self::STATUS_PAID
            ) {
                $query->wherePaidStatus($filters->get('status'));
-            } elseif ($filters->get('status') == 'DUE') {
-                $query->whereDueStatus($filters->get('status'));
            } else {
                $query->whereStatus($filters->get('status'));
            }
        }

-        if ($filters->get('paid_status')) {
-            $query->wherePaidStatus($filters->get('status'));
-        }
-
        if ($filters->get('invoice_id')) {
            $query->whereInvoice($filters->get('invoice_id'));
        }
@ -651,7 +669,9 @@ class Invoice extends Model implements HasMedia
            '{INVOICE_DATE}' => $this->formattedInvoiceDate,
            '{INVOICE_DUE_DATE}' => $this->formattedDueDate,
            '{INVOICE_NUMBER}' => $this->invoice_number,
-            '{INVOICE_REF_NUMBER}' => $this->reference_number,
+            '{PDF_LINK}' => $this->invoicePdfUrl,
+            '{DUE_AMOUNT}' => format_money_pdf($this->due_amount, $this->customer->currency),
+            '{TOTAL_AMOUNT}' => format_money_pdf($this->total, $this->customer->currency)
        ];
    }

--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@ -435,7 +435,8 @@ class Payment extends Model implements HasMedia
            '{PAYMENT_DATE}' => $this->formattedPaymentDate,
            '{PAYMENT_MODE}' => $this->paymentMethod ? $this->paymentMethod->name : null,
            '{PAYMENT_NUMBER}' => $this->payment_number,
-            '{PAYMENT_AMOUNT}' => $this->reference_number,
+            '{PDF_LINK}' => $this->paymentPdfUrl,
+            '{PAYMENT_AMOUNT}' => format_money_pdf($this->amount, $this->customer->currency)
        ];
    }

--- a/config/installer.php
+++ b/config/installer.php
@ -27,7 +27,6 @@ return [
            'tokenizer',
            'JSON',
            'cURL',
-            'zip',
        ],
        'apache' => [
            'mod_rewrite',
--- a/package-lock.json
+++ b/package-lock.json
@ -65,13 +65,6 @@
        "to-fast-properties": "^2.0.0"
      }
    },
-    "@esbuild/linux-loong64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
-      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
-      "dev": true,
-      "optional": true
-    },
    "@eslint/eslintrc": {
      "version": "0.4.3",
      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@ -221,23 +214,6 @@
      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz",
      "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ=="
    },
-    "@rvxlab/tailwind-plugin-ios-full-height": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@rvxlab/tailwind-plugin-ios-full-height/-/tailwind-plugin-ios-full-height-1.1.0.tgz",
-      "integrity": "sha512-jPIxXn0raN/YTk8nXesqM+JbS2WWd5XaUk/MbaAgVDDPyYtsPfeN3B26xIhSa2oE2+JB66tegPUMSOmixzroXg==",
-      "dev": true
-    },
-    "@stripe/stripe-js": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.48.0.tgz",
-      "integrity": "sha512-Kw2BRXk6z/wnTU9m2IJOhxJNrx9xzmpFSbk6D/Z0x6LJntMafiHeHFag2PvSF30O2quMb1UUdWsnZqGVDruZww=="
-    },
-    "@tailwindcss/aspect-ratio": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.2.tgz",
-      "integrity": "sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==",
-      "dev": true
-    },
    "@tailwindcss/forms": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz",
@ -247,35 +223,6 @@
        "mini-svg-data-uri": "^1.2.3"
      }
    },
-    "@tailwindcss/line-clamp": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.1.tgz",
-      "integrity": "sha512-pNr0T8LAc3TUx/gxCfQZRe9NB2dPEo/cedPHzUGIPxqDMhgjwNm6jYxww4W5l0zAsAddxr+XfZcqttGiFDgrGg=="
-    },
-    "@tailwindcss/typography": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.9.tgz",
-      "integrity": "sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==",
-      "dev": true,
-      "requires": {
-        "lodash.castarray": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.merge": "^4.6.2",
-        "postcss-selector-parser": "6.0.10"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-          "dev": true,
-          "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
-          }
-        }
-      }
-    },
    "@tiptap/core": {
      "version": "2.0.0-beta.99",
      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.0.0-beta.99.tgz",
@ -439,11 +386,6 @@
      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-2.0.0-beta.13.tgz",
      "integrity": "sha512-0EtAwuRldCAoFaL/iXgkRepEeOd55rPg5N4FQUN1xTwZT7PDofukP0DG/2jff/Uj17x4uTaJAa9qlFWuNnDvjw=="
    },
-    "@tiptap/extension-text-align": {
-      "version": "2.0.0-beta.220",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-2.0.0-beta.220.tgz",
-      "integrity": "sha512-xUYhozdJA0UVLxlrxYLHLhwDYD5oDDiy0omAzFKAyRRtHAkNSPot7Vp7UJW2M0R6XHIQDMFEopxKQNJMBTRk3w=="
-    },
    "@tiptap/starter-kit": {
      "version": "2.0.0-beta.97",
      "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.97.tgz",
@ -595,12 +537,6 @@
        "@types/prosemirror-transform": "*"
      }
    },
-    "@vitejs/plugin-vue": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz",
-      "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==",
-      "dev": true
-    },
    "@vue/compiler-core": {
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.4.tgz",
@ -622,70 +558,6 @@
        "@vue/shared": "3.2.4"
      }
    },
-    "@vue/compiler-sfc": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz",
-      "integrity": "sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.47",
-        "@vue/compiler-dom": "3.2.47",
-        "@vue/compiler-ssr": "3.2.47",
-        "@vue/reactivity-transform": "3.2.47",
-        "@vue/shared": "3.2.47",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
-        "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "@babel/parser": {
-          "version": "7.21.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-          "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
-          "dev": true
-        },
-        "@vue/compiler-core": {
-          "version": "3.2.47",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
-          "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==",
-          "dev": true,
-          "requires": {
-            "@babel/parser": "^7.16.4",
-            "@vue/shared": "3.2.47",
-            "estree-walker": "^2.0.2",
-            "source-map": "^0.6.1"
-          }
-        },
-        "@vue/compiler-dom": {
-          "version": "3.2.47",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz",
-          "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==",
-          "dev": true,
-          "requires": {
-            "@vue/compiler-core": "3.2.47",
-            "@vue/shared": "3.2.47"
-          }
-        },
-        "@vue/compiler-ssr": {
-          "version": "3.2.47",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz",
-          "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==",
-          "dev": true,
-          "requires": {
-            "@vue/compiler-dom": "3.2.47",
-            "@vue/shared": "3.2.47"
-          }
-        },
-        "@vue/shared": {
-          "version": "3.2.47",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz",
-          "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==",
-          "dev": true
-        }
-      }
-    },
    "@vue/compiler-ssr": {
      "version": "3.2.19",
      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz",
@ -735,45 +607,6 @@
        "@vue/shared": "3.2.4"
      }
    },
-    "@vue/reactivity-transform": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz",
-      "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.47",
-        "@vue/shared": "3.2.47",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
-      },
-      "dependencies": {
-        "@babel/parser": {
-          "version": "7.21.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-          "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
-          "dev": true
-        },
-        "@vue/compiler-core": {
-          "version": "3.2.47",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
-          "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==",
-          "dev": true,
-          "requires": {
-            "@babel/parser": "^7.16.4",
-            "@vue/shared": "3.2.47",
-            "estree-walker": "^2.0.2",
-            "source-map": "^0.6.1"
-          }
-        },
-        "@vue/shared": {
-          "version": "3.2.47",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz",
-          "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==",
-          "dev": true
-        }
-      }
-    },
    "@vue/ref-transform": {
      "version": "3.2.19",
      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz",
@ -844,44 +677,6 @@
      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz",
      "integrity": "sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg=="
    },
-    "@vuelidate/components": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@vuelidate/components/-/components-1.2.3.tgz",
-      "integrity": "sha512-QE+oSzJVYZUfYcIAsM+QCrB3xRJoesFzUTNtfuYbhWfdMmTHxA9YtKuKWlTsR1nK8+SmHMJROIG8PnL77ZLSuQ==",
-      "requires": {
-        "@vuelidate/core": "^2.0.0"
-      }
-    },
-    "@vuelidate/core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@vuelidate/core/-/core-2.0.0.tgz",
-      "integrity": "sha512-xIFgdQlScO0aaSZ0wTGPJh8YcTMNAj5veI8yPgiAyxOT+GV7vNQFiU1vpYWCL4cklkkhYvRRSC2OEX7YOZNmPQ==",
-      "requires": {
-        "vue-demi": "^0.13.11"
-      },
-      "dependencies": {
-        "vue-demi": {
-          "version": "0.13.11",
-          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
-          "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="
-        }
-      }
-    },
-    "@vuelidate/validators": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@vuelidate/validators/-/validators-2.0.0.tgz",
-      "integrity": "sha512-fQQcmDWfz7pyH5/JPi0Ng2GEgNK1pUHn/Z/j5rG/Q+HwhgIXvJblTPcZwKOj1ABL7V4UVuGKECvZCDHNGOwdrg==",
-      "requires": {
-        "vue-demi": "^0.13.11"
-      },
-      "dependencies": {
-        "vue-demi": {
-          "version": "0.13.11",
-          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
-          "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="
-        }
-      }
-    },
    "@vueuse/core": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-6.0.0.tgz",
@ -1445,175 +1240,6 @@
        }
      }
    },
-    "esbuild": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
-      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
-      "dev": true,
-      "requires": {
-        "@esbuild/linux-loong64": "0.14.54",
-        "esbuild-android-64": "0.14.54",
-        "esbuild-android-arm64": "0.14.54",
-        "esbuild-darwin-64": "0.14.54",
-        "esbuild-darwin-arm64": "0.14.54",
-        "esbuild-freebsd-64": "0.14.54",
-        "esbuild-freebsd-arm64": "0.14.54",
-        "esbuild-linux-32": "0.14.54",
-        "esbuild-linux-64": "0.14.54",
-        "esbuild-linux-arm": "0.14.54",
-        "esbuild-linux-arm64": "0.14.54",
-        "esbuild-linux-mips64le": "0.14.54",
-        "esbuild-linux-ppc64le": "0.14.54",
-        "esbuild-linux-riscv64": "0.14.54",
-        "esbuild-linux-s390x": "0.14.54",
-        "esbuild-netbsd-64": "0.14.54",
-        "esbuild-openbsd-64": "0.14.54",
-        "esbuild-sunos-64": "0.14.54",
-        "esbuild-windows-32": "0.14.54",
-        "esbuild-windows-64": "0.14.54",
-        "esbuild-windows-arm64": "0.14.54"
-      }
-    },
-    "esbuild-android-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
-      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-android-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
-      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
-      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
-      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
-      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
-      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
-      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
-      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
-      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
-      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
-      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-ppc64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
-      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-riscv64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
-      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-s390x": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
-      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-netbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
-      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-openbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
-      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-sunos-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
-      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
-      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
-      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
-      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
-      "dev": true,
-      "optional": true
-    },
    "escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@ -2321,24 +1947,12 @@
      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
    },
-    "lodash.castarray": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
-      "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
-      "dev": true
-    },
    "lodash.clonedeep": {
      "version": "4.5.0",
      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
      "dev": true
    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
-      "dev": true
-    },
    "lodash.merge": {
      "version": "4.6.2",
      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@ -2413,9 +2027,9 @@
      }
    },
    "minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
      "dev": true
    },
    "modern-normalize": {
@ -2591,22 +2205,6 @@
      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
      "dev": true
    },
-    "pinia": {
-      "version": "2.0.32",
-      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.32.tgz",
-      "integrity": "sha512-8Tw4OrpCSJ028UUyp0gYPP/wyjigLoEceuO/x1G+FlHVf73337e5vLm4uDmrRIoBG1hvaed/eSHnrCFjOc4nkA==",
-      "requires": {
-        "@vue/devtools-api": "^6.5.0",
-        "vue-demi": "*"
-      },
-      "dependencies": {
-        "@vue/devtools-api": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
-          "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
-        }
-      }
-    },
    "postcss": {
      "version": "8.4.5",
      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
@ -2910,15 +2508,6 @@
        "glob": "^7.1.3"
      }
    },
-    "rollup": {
-      "version": "2.77.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz",
-      "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==",
-      "dev": true,
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
    "rope-sequence": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.2.tgz",
@ -3079,12 +2668,6 @@
        "has-flag": "^3.0.0"
      }
    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
    "table": {
      "version": "6.7.2",
      "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
@ -3351,86 +2934,12 @@
      "resolved": "https://registry.npmjs.org/v-money3/-/v-money3-3.16.1.tgz",
      "integrity": "sha512-U0GjmdybvEwfxCpZiTUbKugSglJbX6wxlyMeg0YJdLTAKlnjMRDph3hpNJlTlg5Gs8MQRpDVdaLysBjV749HLg=="
    },
-    "v-tooltip": {
-      "version": "4.0.0-beta.17",
-      "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-4.0.0-beta.17.tgz",
-      "integrity": "sha512-d7v/6KEXQOtcj3NT3Z1LpbDv8SBh8JgbsD+3s/zGIGCxiXC2SoVW6wGV4X0MlCo97PiosibcSe+VKbFiy4AKnQ==",
-      "requires": {
-        "@popperjs/core": "^2.11.0",
-        "vue-resize": "^2.0.0-alpha.1"
-      },
-      "dependencies": {
-        "@popperjs/core": {
-          "version": "2.11.6",
-          "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-          "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
-        }
-      }
-    },
    "v8-compile-cache": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
      "dev": true
    },
-    "vite": {
-      "version": "2.9.15",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.15.tgz",
-      "integrity": "sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==",
-      "dev": true,
-      "requires": {
-        "esbuild": "^0.14.27",
-        "fsevents": "~2.3.2",
-        "postcss": "^8.4.13",
-        "resolve": "^1.22.0",
-        "rollup": ">=2.59.0 <2.78.0"
-      },
-      "dependencies": {
-        "is-core-module": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-          "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-          "dev": true,
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "nanoid": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-          "dev": true
-        },
-        "postcss": {
-          "version": "8.4.21",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
-          "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
-          "dev": true,
-          "requires": {
-            "nanoid": "^3.3.4",
-            "picocolors": "^1.0.0",
-            "source-map-js": "^1.0.2"
-          }
-        },
-        "resolve": {
-          "version": "1.22.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-          "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        },
-        "source-map-js": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-          "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-          "dev": true
-        }
-      }
-    },
    "vue": {
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.4.tgz",
@ -3493,11 +3002,6 @@
        "@vue/devtools-api": "^6.0.0-beta.7"
      }
    },
-    "vue-resize": {
-      "version": "2.0.0-alpha.1",
-      "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz",
-      "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg=="
-    },
    "vue-router": {
      "version": "4.0.11",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.11.tgz",
--- a/package.json
+++ b/package.json
@ -27,7 +27,7 @@
    "vite": "^2.6.1"
  },
  "dependencies": {
-    "@headlessui/vue": "^1.4.0",
+    "@headlessui/vue": "^1.5.0",
    "@heroicons/vue": "^1.0.1",
    "@popperjs/core": "^2.9.2",
    "@stripe/stripe-js": "^1.21.2",
@ -48,7 +48,8 @@
    "mini-svg-data-uri": "^1.3.3",
    "moment": "^2.29.1",
    "pinia": "^2.0.4",
-    "v-money3": "^3.13.5",
+    "v-calendar": "3.0.0-alpha.8",
+    "v-money3": "3.16.1",
    "v-tooltip": "^4.0.0-alpha.1",
    "vue": "^3.2.0-beta.5",
    "vue-flatpickr-component": "^9.0.3",
--- a/resources/scripts/admin/components/custom-fields/CreateCustomFields.vue
+++ b/resources/scripts/admin/components/custom-fields/CreateCustomFields.vue
@ -64,7 +64,7 @@ function mergeExistingValues() {
  if (props.isEdit) {
    props.store[props.storeProp].fields.forEach((field) => {
      const existingIndex = props.store[props.storeProp].customFields.findIndex(
-        (f) => f.id === field.custom_field_id
+        (f) => f.id == field.custom_field_id
      )

      if (existingIndex > -1) {
--- a/resources/scripts/admin/components/custom-fields/types/DateTimeType.vue
+++ b/resources/scripts/admin/components/custom-fields/types/DateTimeType.vue
@ -9,7 +9,7 @@ import { computed } from 'vue'
 const props = defineProps({
  modelValue: {
    type: String,
-    default: moment().format('YYYY-MM-DD hh:MM'),
+    default: moment().format('YYYY-MM-DD HH:mm'),
  },
 })

--- a/resources/scripts/admin/components/modal-components/CompanyModal.vue
+++ b/resources/scripts/admin/components/modal-components/CompanyModal.vue
@ -48,6 +48,24 @@
            />
          </BaseInputGroup>

+          <BaseInputGroup
+            :label="$tc('settings.company_info.company_slug')"
+            :help-text="$t('settings.company_info.company_slug_help_text')"
+            :error="
+              v$.newCompanyForm.slug.$error &&
+              v$.newCompanyForm.slug.$errors[0].$message
+            "
+            :content-loading="isFetchingInitialData"
+            required
+          >
+            <BaseInput
+              v-model="newCompanyForm.slug"
+              :invalid="v$.newCompanyForm.slug.$error"
+              :content-loading="isFetchingInitialData"
+              @input="v$.newCompanyForm.slug.$touch()"
+            />
+          </BaseInputGroup>
+
          <BaseInputGroup
            :content-loading="isFetchingInitialData"
            :label="$tc('settings.company_info.country')"
@ -130,7 +148,7 @@

 <script setup>
 import { useModalStore } from '@/scripts/stores/modal'
-import { computed, onMounted, ref, reactive } from 'vue'
+import { computed, onMounted, ref, reactive, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { required, minLength, helpers } from '@vuelidate/validators'
 import { useVuelidate } from '@vuelidate/core'
@ -152,6 +170,7 @@ let companyLogoName = ref(null)

 const newCompanyForm = reactive({
  name: null,
+  slug: null,
  currency: '',
  address: {
    country_id: null,
@ -162,6 +181,9 @@ const modalActive = computed(() => {
  return modalStore.active && modalStore.componentName === 'CompanyModal'
 })

+const slugValidator = (value) => {
+  return value == slugify(value)
+}
 const rules = {
  newCompanyForm: {
    name: {
@ -171,6 +193,17 @@ const rules = {
        minLength(3)
      ),
    },
+    slug: {
+      required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+      slugValidator: helpers.withMessage(
+        t('validation.invalid_slug'),
+        slugValidator
+      ),
+    },
    address: {
      country_id: {
        required: helpers.withMessage(t('validation.required'), required),
@ -243,6 +276,7 @@ async function submitCompanyData() {

 function resetNewCompanyForm() {
  newCompanyForm.name = ''
+  newCompanyForm.slug = ''
  newCompanyForm.currency = ''
  newCompanyForm.address.country_id = ''

@ -257,4 +291,24 @@ function closeCompanyModal() {
    v$.value.$reset()
  }, 300)
 }
+
+// watcher for if change company name then auto fill company slug value
+watch(
+  () => newCompanyForm.name,
+  (currentValue) => {
+    newCompanyForm.slug = slugify(currentValue)
+  }
+)
+
+function slugify(string) {
+  return string
+    .toString()
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^\w\-]+/g, '')
+    .replace(/\-\-+/g, '-')
+    .replace(/^-+/, '')
+    .replace(/-+$/, '')
+}
 </script>
--- a/resources/scripts/admin/layouts/LayoutBasic.vue
+++ b/resources/scripts/admin/layouts/LayoutBasic.vue
@ -12,6 +12,8 @@
      class="h-screen h-screen-ios overflow-y-auto md:pl-56 xl:pl-64 min-h-0"
    >
      <div class="pt-16 pb-16">
+        <h1>Testing</h1>
+
        <router-view />
      </div>
    </main>
--- a/resources/scripts/admin/layouts/LayoutInstallation.vue
+++ b/resources/scripts/admin/layouts/LayoutInstallation.vue
@ -1,5 +1,6 @@
 <template>
  <div class="h-screen overflow-y-auto text-base">
+    <h1>Testing</h1>
    <NotificationRoot />

    <div class="container mx-auto px-4">
--- a/resources/scripts/admin/layouts/LayoutLogin.vue
+++ b/resources/scripts/admin/layouts/LayoutLogin.vue
@ -93,6 +93,9 @@
        >
          {{ pageHeading }}
        </h1>
+
+        <h1>Testing</h1>
+
        <p
          class="
            hidden
--- a/resources/scripts/admin/stores/company.js
+++ b/resources/scripts/admin/stores/company.js
@ -184,6 +184,20 @@ export const useCompanyStore = (useWindow = false) => {
      setDefaultCurrency(data) {
        this.defaultCurrency = data.currency
      },
+
+      checkCompanyHasCurrencyTransactions() {
+        return new Promise((resolve, reject) => {
+          axios
+            .get(`/api/v1/company/has-transactions`)
+            .then((response) => {
+              resolve(response)
+            })
+            .catch((err) => {
+              handleError(err)
+              reject(err)
+            })
+        })
+      },
    },
  })()
 }
--- a/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue
+++ b/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue
@ -32,6 +32,8 @@
          :content-loading="isLoading"
          :calendar-button="true"
          calendar-button-icon="calendar"
+          :show-extra-options="true"
+          :source-date="estimateStore.newEstimate.estimate_date"
        />
      </BaseInputGroup>

--- a/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
+++ b/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
@ -34,6 +34,24 @@
          />
        </BaseInputGroup>

+        <BaseInputGroup
+          :label="$tc('wizard.company_slug')"
+          :help-text="$t('wizard.company_slug_help_text')"
+          :error="
+            v$.companyForm.slug.$error &&
+            v$.companyForm.slug.$errors[0].$message
+          "
+          required
+        >
+          <BaseInput
+            v-model="companyForm.slug"
+            :invalid="v$.companyForm.slug.$error"
+            type="text"
+            name="slug"
+            @input="v$.companyForm.slug.$touch()"
+          />
+        </BaseInputGroup>
+
        <BaseInputGroup
          :label="$t('wizard.country')"
          :error="
@ -57,9 +75,7 @@
            track-by="name"
          />
        </BaseInputGroup>
-      </div>

-      <div class="grid grid-cols-1 gap-4 mb-4 md:grid-cols-2 md:mb-6">
        <BaseInputGroup :label="$t('wizard.state')">
          <BaseInput
            v-model="companyForm.address.state"
@ -144,9 +160,9 @@
 </template>

 <script setup>
-import { ref, computed, onMounted, reactive } from 'vue'
+import { ref, computed, onMounted, reactive, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { required, maxLength, helpers } from '@vuelidate/validators'
+import { required, minLength, maxLength, helpers } from '@vuelidate/validators'
 import { useVuelidate } from '@vuelidate/core'
 import { useGlobalStore } from '@/scripts/admin/stores/global'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
@ -162,6 +178,7 @@ let logoFileName = ref(null)

 const companyForm = reactive({
  name: null,
+  slug: null,
  address: {
    address_street_1: '',
    address_street_2: '',
@ -188,10 +205,28 @@ onMounted(async () => {
  })?.id
 })

+const slugValidator = (value) => {
+  return value == slugify(value)
+}
 const rules = {
  companyForm: {
    name: {
      required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+    },
+    slug: {
+      required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+      slugValidator: helpers.withMessage(
+        t('validation.invalid_slug'),
+        slugValidator
+      ),
    },
    address: {
      country_id: {
@ -249,4 +284,24 @@ async function next() {
    emit('next', 7)
  }
 }
+
+// watcher for if change company name then auto fill company slug value
+watch(
+  () => companyForm.name,
+  (currentValue) => {
+    companyForm.slug = slugify(currentValue)
+  }
+)
+
+function slugify(string) {
+  return string
+    .toString()
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^\w\-]+/g, '')
+    .replace(/\-\-+/g, '-')
+    .replace(/^-+/, '')
+    .replace(/-+$/, '')
+}
 </script>
--- a/resources/scripts/admin/views/invoices/Index.vue
+++ b/resources/scripts/admin/views/invoices/Index.vue
@ -56,7 +56,7 @@
        <BaseMultiselect
          v-model="filters.status"
          :groups="true"
-          :options="status"
+          :options="invoiceStatus"
          searchable
          :placeholder="$t('general.select_a_status')"
          @update:modelValue="setActiveTab"
@ -130,11 +130,27 @@
        "
      >
        <!-- 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.due')" filter="DUE" />
+        <BaseTabGroup
+          class="-mb-5"
+          :selected-index="selectedIndex"
+          @change="changeTabStatus"
+        >
+          <BaseTab
+            :title="invoiceTabStatus[0].title"
+            :tab-status="invoiceTabStatus[0].value"
+          />
+          <BaseTab
+            :title="invoiceTabStatus[1].title"
+            :tab-status="invoiceTabStatus[1].value"
+          />
+          <BaseTab
+            :title="invoiceTabStatus[2].title"
+            :tab-status="invoiceTabStatus[2].value"
+          />
+          <BaseTab
+            :title="invoiceTabStatus[3].title"
+            :tab-status="invoiceTabStatus[3].value"
+          />
        </BaseTabGroup>

        <BaseDropdown
@ -289,10 +305,10 @@ const utils = inject('$utils')
 const table = ref(null)
 const showFilters = ref(false)

-const status = ref([
+const invoiceStatus = ref([
  {
    label: 'Status',
-    options: ['DRAFT', 'DUE', 'SENT', 'VIEWED', 'COMPLETED'],
+    options: ['DRAFT', 'SENT', 'VIEWED', 'COMPLETED'],
  },
  {
    label: 'Paid Status',
@ -300,10 +316,29 @@ const status = ref([
  },
  ,
 ])
+
+const invoiceTabStatus = {
+  0: {
+    title: t('general.all'),
+    value: '',
+  },
+  1: {
+    title: t('general.draft'),
+    value: 'DRAFT',
+  },
+  2: {
+    title: t('general.sent'),
+    value: 'SENT',
+  },
+  3: {
+    title: t('general.due'),
+    value: 'DUE',
+  },
+}
 const isRequestOngoing = ref(true)
-const activeTab = ref('general.draft')
 const router = useRouter()
 const userStore = useUserStore()
+const selectedIndex = ref(0)

 let filters = reactive({
  customer_id: '',
@ -311,6 +346,7 @@ let filters = reactive({
  from_date: '',
  to_date: '',
  invoice_number: '',
+  tab_status: '',
 })

 const showEmptyScreen = computed(
@ -401,6 +437,7 @@ async function fetchData({ page, filter, sort }) {
    from_date: filters.from_date,
    to_date: filters.to_date,
    invoice_number: filters.invoice_number,
+    tab_status: filters.tab_status,
    orderByField: sort.fieldName || 'created_at',
    orderBy: sort.order || 'desc',
    page,
@ -423,29 +460,9 @@ async function fetchData({ page, filter, sort }) {
  }
 }

-function setStatusFilter(val) {
-  if (activeTab.value == val.title) {
-    return true
-  }
-
-  activeTab.value = val.title
-
-  switch (val.title) {
-    case t('general.draft'):
-      filters.status = 'DRAFT'
-      break
-    case t('general.sent'):
-      filters.status = 'SENT'
-      break
-
-    case t('general.due'):
-      filters.status = 'DUE'
-      break
-
-    default:
-      filters.status = ''
-      break
-  }
+function changeTabStatus(val, index) {
+  filters.tab_status = val['tab-status']
+  selectedIndex.value = index
 }

 function setFilters() {
@ -463,8 +480,6 @@ function clearFilter() {
  filters.from_date = ''
  filters.to_date = ''
  filters.invoice_number = ''
-
-  activeTab.value = t('general.all')
 }

 async function removeMultipleInvoices() {
@ -505,39 +520,21 @@ function toggleFilter() {
 function setActiveTab(val) {
  switch (val) {
    case 'DRAFT':
-      activeTab.value = t('general.draft')
+      selectedIndex.value = 1
      break
+
    case 'SENT':
-      activeTab.value = t('general.sent')
-      break
-
-    case 'DUE':
-      activeTab.value = t('general.due')
-      break
-
+    case 'VIEWED':
    case 'COMPLETED':
-      activeTab.value = t('invoices.completed')
-      break
-
    case 'PAID':
-      activeTab.value = t('invoices.paid')
+      selectedIndex.value = 2
      break

    case 'UNPAID':
-      activeTab.value = t('invoices.unpaid')
-      break
-
    case 'PARTIALLY_PAID':
-      activeTab.value = t('invoices.partially_paid')
-      break
-
-    case 'VIEWED':
-      activeTab.value = t('invoices.viewed')
-      break
-
-    default:
-      activeTab.value = t('general.all')
+      selectedIndex.value = 3
      break
  }
+  filters.tab_status = invoiceTabStatus[selectedIndex.value].value
 }
 </script>
--- a/resources/scripts/admin/views/invoices/create/InvoiceCreateBasicFields.vue
+++ b/resources/scripts/admin/views/invoices/create/InvoiceCreateBasicFields.vue
@ -32,6 +32,8 @@
          :content-loading="isLoading"
          :calendar-button="true"
          calendar-button-icon="calendar"
+          :show-extra-options="true"
+          :source-date="invoiceStore.newInvoice.invoice_date"
        />
      </BaseInputGroup>

--- a/resources/scripts/admin/views/payments/Create.vue
+++ b/resources/scripts/admin/views/payments/Create.vue
@ -82,9 +82,9 @@
            required
          >
            <BaseCustomerSelectInput
+              v-if="!isLoadingContent"
              v-model="paymentStore.currentPayment.customer_id"
              :content-loading="isLoadingContent"
-              v-if="!isLoadingContent"
              :invalid="v$.currentPayment.customer_id.$error"
              :placeholder="$t('customers.select_a_customer')"
              show-action
@ -423,7 +423,7 @@ function onCustomerChange(customer_id) {
  if (customer_id) {
    let data = {
      customer_id: customer_id,
-      status: 'DUE',
+      tab_status: 'DUE',
      limit: 'all',
    }

@ -446,7 +446,11 @@ function onCustomerChange(customer_id) {
          paymentStore.currentPayment.selectedCustomer = res2.data.data
          paymentStore.currentPayment.customer = res2.data.data
          paymentStore.currentPayment.currency = res2.data.data.currency
-          if(isEdit.value && !customerStore.editCustomer && paymentStore.currentPayment.customer_id) {
+          if (
+            isEdit.value &&
+            !customerStore.editCustomer &&
+            paymentStore.currentPayment.customer_id
+          ) {
            customerStore.editCustomer = res2.data.data
          }
        }
--- a/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
+++ b/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
@ -28,6 +28,19 @@
          />
        </BaseInputGroup>

+        <BaseInputGroup
+          :label="$tc('settings.company_info.company_slug')"
+          :help-text="$t('settings.company_info.company_slug_help_text')"
+          :error="v$.slug.$error && v$.slug.$errors[0].$message"
+          required
+        >
+          <BaseInput
+            v-model="companyForm.slug"
+            :invalid="v$.slug.$error"
+            @blur="v$.slug.$touch()"
+          />
+        </BaseInputGroup>
+
        <BaseInputGroup :label="$tc('settings.company_info.phone')">
          <BaseInput v-model="companyForm.address.phone" />
        </BaseInputGroup>
@ -160,6 +173,7 @@ let isSaving = ref(false)

 const companyForm = reactive({
  name: null,
+  slug: null,
  logo: null,
  address: {
    address_street_1: '',
@ -193,7 +207,14 @@ const rules = computed(() => {
    name: {
      required: helpers.withMessage(t('validation.required'), required),
      minLength: helpers.withMessage(
-        t('validation.name_min_length'),
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+    },
+    slug: {
+      required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
        minLength(3)
      ),
    },
--- a/resources/scripts/admin/views/settings/PreferencesSetting.vue
+++ b/resources/scripts/admin/views/settings/PreferencesSetting.vue
@ -8,7 +8,11 @@
        <BaseInputGroup
          :content-loading="isFetchingInitialData"
          :label="$tc('settings.preferences.currency')"
-          :help-text="$t('settings.preferences.company_currency_unchangeable')"
+          :help-text="
+            isCurrencyDisabled
+              ? $t('settings.preferences.company_currency_unchangeable')
+              : ''
+          "
          :error="v$.currency.$error && v$.currency.$errors[0].$message"
          required
        >
@ -21,7 +25,7 @@
            :searchable="true"
            track-by="name"
            :invalid="v$.currency.$error"
-            disabled
+            :disabled="isCurrencyDisabled"
            class="w-full"
          >
          </BaseMultiselect>
@ -187,6 +191,7 @@ const { t, tm } = useI18n()
 let isSaving = ref(false)
 let isDataSaving = ref(false)
 let isFetchingInitialData = ref(false)
+let isCurrencyDisabled = ref(true)

 const settingsForm = reactive({ ...companyStore.selectedCompanySettings })

@ -282,10 +287,14 @@ setInitialData()
 async function setInitialData() {
  isFetchingInitialData.value = true
  Promise.all([
+    companyStore.checkCompanyHasCurrencyTransactions(),
    globalStore.fetchCurrencies(),
    globalStore.fetchDateFormats(),
    globalStore.fetchTimeZones(),
  ]).then(([res1]) => {
+    if (res1.data?.has_transactions == false) {
+      isCurrencyDisabled.value = false
+    }
    isFetchingInitialData.value = false
  })
 }
--- a/resources/scripts/components/base/BaseCustomInput.vue
+++ b/resources/scripts/components/base/BaseCustomInput.vue
@ -126,7 +126,7 @@ onMounted(() => {
 })

 const value = computed({
-  get: () => props.modelValue,
+  get: () => (props.modelValue ? props.modelValue : ''),
  set: (value) => {
    emit('update:modelValue', value)
  },
@ -195,7 +195,9 @@ async function getFields() {
          { label: 'Date', value: 'INVOICE_DATE' },
          { label: 'Due Date', value: 'INVOICE_DUE_DATE' },
          { label: 'Number', value: 'INVOICE_NUMBER' },
-          { label: 'Ref Number', value: 'INVOICE_REF_NUMBER' },
+          { label: 'PDF Link', value: 'PDF_LINK' },
+          { label: 'Due Amount', value: 'DUE_AMOUNT' },
+          { label: 'Total Amount', value: 'TOTAL_AMOUNT' },
          ...invoiceFields.value.map((i) => ({
            label: i.label,
            value: i.slug,
@ -211,7 +213,8 @@ async function getFields() {
          { label: 'Date', value: 'ESTIMATE_DATE' },
          { label: 'Expiry Date', value: 'ESTIMATE_EXPIRY_DATE' },
          { label: 'Number', value: 'ESTIMATE_NUMBER' },
-          { label: 'Ref Number', value: 'ESTIMATE_REF_NUMBER' },
+          { label: 'PDF Link', value: 'PDF_LINK' },
+          { label: 'Total Amount', value: 'TOTAL_AMOUNT' },
          ...estimateFields.value.map((i) => ({
            label: i.label,
            value: i.slug,
@ -228,6 +231,7 @@ async function getFields() {
          { label: 'Number', value: 'PAYMENT_NUMBER' },
          { label: 'Mode', value: 'PAYMENT_MODE' },
          { label: 'Amount', value: 'PAYMENT_AMOUNT' },
+          { label: 'PDF Link', value: 'PDF_LINK' },
          ...paymentFields.value.map((i) => ({
            label: i.label,
            value: i.slug,
--- a/resources/scripts/components/base/BaseDatePicker.vue
+++ b/resources/scripts/components/base/BaseDatePicker.vue
@ -7,52 +7,108 @@
    />
  </BaseContentPlaceholders>

-  <div v-else :class="computedContainerClass" class="relative flex flex-row">
-    <svg
-      v-if="showCalendarIcon && !hasIconSlot"
-      viewBox="0 0 20 20"
-      fill="currentColor"
-      class="
-        absolute
-        w-4
-        h-4
-        mx-2
-        my-2.5
-        text-sm
-        not-italic
-        font-black
-        text-gray-400
-        cursor-pointer
-      "
-      @click="onClickDp"
-    >
-      <path
-        fill-rule="evenodd"
-        d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
-        clip-rule="evenodd"
-      ></path>
-    </svg>
-
-    <slot v-if="showCalendarIcon && hasIconSlot" name="icon" />
-
-    <FlatPickr
-      ref="dp"
+  <div v-else :class="computedContainerClass">
+    <date-picker
+      ref="vCalendar"
      v-model="date"
-      v-bind="$attrs"
-      :disabled="disabled"
-      :config="config"
-      :class="[defaultInputClass, inputInvalidClass, inputDisabledClass]"
-    />
+      :mode="mode"
+      :is24hr="time24hr"
+      class="w-full"
+      color="indigo"
+      :input-debounce="500"
+      :update-on-input="false"
+      :is-range="false"
+      trim-weeks
+      :is-required="isRequired"
+      :popover="{
+        visibility: disabled ? 'hidden' : 'focus',
+        showDelay: 0,
+        hideDelay: 1,
+      }"
+      :attributes="attrs"
+      :model-config="config"
+      :masks="masks"
+      :locale="global.locale"
+    >
+      <template
+        #default="{ inputValue, inputEvents, togglePopover, hidePopover }"
+      >
+        <!-- calendar icon -->
+        <svg
+          v-if="showCalendarIcon && !hasIconSlot"
+          viewBox="0 0 20 20"
+          fill="currentColor"
+          class="
+            absolute
+            w-4
+            h-4
+            mx-2
+            my-2.5
+            text-sm
+            not-italic
+            font-black
+            text-gray-400
+            cursor-pointer
+          "
+          @click="togglePopover()"
+        >
+          <path
+            fill-rule="evenodd"
+            d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
+            clip-rule="evenodd"
+          ></path>
+        </svg>
+
+        <slot v-if="showCalendarIcon && hasIconSlot" name="icon" />
+
+        <input
+          :value="inputValue"
+          :class="[defaultInputClass, inputInvalidClass, inputDisabledClass]"
+          readonly
+          v-on="inputEvents"
+          @blur="hidePopover()"
+        />
+      </template>
+
+      <template v-if="showExtraOptions" #footer>
+        <div
+          class="bg-gray-100 grid grid-cols-3 gap-2 p-2 border-t rounded-b-lg"
+        >
+          <button type="button" class="extra-button" @click="moveToDate(sourceDate)">
+            {{ global.t('date_picker.same_day') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(7)">
+            {{ global.t('date_picker.within_7_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(15)">
+            {{ global.t('date_picker.within_15_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(30)">
+            {{ global.t('date_picker.within_30_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(45)">
+            {{ global.t('date_picker.within_45_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(60)">
+            {{ global.t('date_picker.within_60_days') }}
+          </button>
+        </div>
+      </template>
+    </date-picker>
  </div>
 </template>

 <script type="text/babel" setup>
-import FlatPickr from 'vue-flatpickr-component'
-import 'flatpickr/dist/flatpickr.css'
+import { Calendar, DatePicker } from 'v-calendar'
+import 'v-calendar/dist/style.css'
 import { computed, reactive, watch, ref, useSlots } from 'vue'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
-
-const dp = ref(null)
+import moment from 'moment'

 const props = defineProps({
  modelValue: {
@ -90,36 +146,31 @@ const props = defineProps({
  defaultInputClass: {
    type: String,
    default:
-      'font-base pl-8 py-2 outline-none focus:ring-primary-400 focus:outline-none focus:border-primary-400 block w-full sm:text-sm border-gray-200 rounded-md text-black',
+      'border-2 font-base pl-8 py-2 outline-none focus:ring-primary-400 focus:outline-none focus:border-primary-400 block w-full sm:text-sm border-gray-200 rounded-md text-black',
  },
  time24hr: {
    type: Boolean,
    default: false,
  },
+  isRequired: {
+    type: Boolean,
+    default: false,
+  },
+  showExtraOptions: {
+    type: Boolean,
+    default: false,
+  },
+  sourceDate: {
+    type: [String, Date],
+    default: () => new Date(),
+  }
 })

 const emit = defineEmits(['update:modelValue'])
-
 const slots = useSlots()
-
 const companyStore = useCompanyStore()
-
-let config = reactive({
-  altInput: true,
-  enableTime: props.enableTime,
-  time_24hr: props.time24hr,
-})
-
-const date = computed({
-  get: () => props.modelValue,
-  set: (value) => {
-    emit('update:modelValue', value)
-  },
-})
-
-const carbonFormat = computed(() => {
-  return companyStore.selectedCompanySettings?.carbon_date_format
-})
+const { global } = window.i18n
+const vCalendar = ref(null)

 const hasIconSlot = computed(() => {
  return !!slots.icon
@ -135,7 +186,6 @@ const inputInvalidClass = computed(() => {
  if (props.invalid) {
    return 'border-red-400 ring-red-400 focus:ring-red-400 focus:border-red-400'
  }
-
  return ''
 })

@ -143,35 +193,97 @@ const inputDisabledClass = computed(() => {
  if (props.disabled) {
    return 'border border-solid rounded-md outline-none input-field box-border-2 base-date-picker-input placeholder-gray-400 bg-gray-200 text-gray-600 border-gray-200'
  }
-
  return ''
 })

-function onClickDp(params) {
-  dp.value.fp.open()
+// to convert YYYY-MM-DD | YYYY-MM-DD HH:mm format
+function convertYMDFormat(date) {
+  let format = props.enableTime ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD'
+  return date ? moment(date).format(format) : date
 }

-watch(
-  () => props.enableTime,
-  (val) => {
-    if (props.enableTime) {
-      config.enableTime = props.enableTime
-    }
+const date = computed({
+  get: () => props.modelValue,
+  set: (value) => {
+    emit('update:modelValue', value)
  },
-  { immediate: true }
-)
+})
+
+const mode = computed(() => {
+  return props.enableTime ? 'dateTime' : 'date'
+})
+
+const config = reactive({
+  type: 'string',
+  mask: 'YYYY-MM-DD', // Uses 'iso' if missing
+  //timeAdjust: '00:00:00',
+})
+
+const masks = reactive({
+  input: null,
+  inputDateTime: null,
+  inputDateTime24hr: null,
+})
+
+const attrs = reactive([
+  {
+    dates: new Date(),
+    highlight: {
+      fillMode: 'outline',
+    },
+    /* popover: {
+      label: 'Today Date',
+      visibility: 'hover',
+    }, */
+  },
+])
+
+const carbonFormat = computed(() => {
+  return companyStore.selectedCompanySettings?.moment_date_format
+})

 watch(
  () => carbonFormat,
  () => {
    if (!props.enableTime) {
-      config.altFormat = carbonFormat.value ? carbonFormat.value : 'd M Y'
+      masks.input = carbonFormat.value ? carbonFormat.value : 'DD MMM YYYY'
+      config.mask = 'YYYY-MM-DD'
    } else {
-      config.altFormat = carbonFormat.value
-        ? `${carbonFormat.value} H:i `
-        : 'd M Y H:i'
+      let timeFormat = 'HH:mm'
+      if (props.time24hr) {
+        masks.inputDateTime24hr = carbonFormat.value
+          ? `${carbonFormat.value} ${timeFormat}`
+          : `DD MMM YYYY ${timeFormat}`
+      } else {
+        masks.inputDateTime = carbonFormat.value
+          ? `${carbonFormat.value} ${timeFormat}`
+          : `DD MMM YYYY ${timeFormat}`
+      }
+      config.mask = `YYYY-MM-DD ${timeFormat}`
    }
  },
  { immediate: true }
 )
+
+async function moveToDate(_date) {
+  const calendar = vCalendar.value
+  _date = _date ? _date : convertYMDFormat(new Date())
+  date.value = _date
+  // await calendar.move(_date)
+  calendar.hidePopover()
+}
+
+async function withInDays(noOfDays) {
+  if (!noOfDays) return false
+
+  let newDate = moment(props.sourceDate).add(noOfDays, 'days').toDate()
+  newDate = convertYMDFormat(newDate)
+  moveToDate(newDate)
+}
 </script>
+
+<style scoped>
+.extra-button {
+  @apply bg-primary-500 text-white text-sm font-semibold px-2 py-1 rounded hover:bg-primary-700;
+}
+</style>
--- a/resources/scripts/components/base/BaseTabGroup.vue
+++ b/resources/scripts/components/base/BaseTabGroup.vue
@ -1,6 +1,10 @@
 <template>
  <div>
-    <TabGroup :default-index="defaultIndex" @change="onChange">
+    <TabGroup
+      :selected-index="selectedIndex"
+      :default-index="defaultIndex"
+      @change="onChange"
+    >
      <TabList
        :class="[
          'flex border-b border-grey-light',
@ -54,6 +58,10 @@ const props = defineProps({
    type: Number,
    default: 0,
  },
+  selectedIndex: {
+    type: Number,
+    default: 0,
+  },
  filter: {
    type: String,
    default: null,
@ -67,6 +75,6 @@ const slots = useSlots()
 const tabs = computed(() => slots.default().map((tab) => tab.props))

 function onChange(d) {
-  emit('change', tabs.value[d])
+  emit('change', tabs.value[d], d)
 }
 </script>
--- a/resources/scripts/helpers/use-popper.js
+++ b/resources/scripts/helpers/use-popper.js
@ -7,12 +7,12 @@ export function usePopper(options) {
  let popper = ref(null)

  onMounted(() => {
-    watchEffect(onInvalidate => {
+    watchEffect((onInvalidate) => {
      if (!container.value) return
      if (!activator.value) return

      let containerEl = container.value.el || container.value
-      let activatorEl = activator.value.el || activator.value
+      let activatorEl = activator.value.$el || activator.value

      if (!(activatorEl instanceof HTMLElement)) return
      if (!(containerEl instanceof HTMLElement)) return
--- a/resources/scripts/locales/en.json
+++ b/resources/scripts/locales/en.json
@ -863,6 +863,8 @@
    "company_info": {
      "company_info": "Company info",
      "company_name": "Company Name",
+      "company_slug": "Company Slug",
+      "company_slug_help_text": "A unique URL friendly name for your company (It will appear on Customer Portal URL)",
      "company_logo": "Company Logo",
      "section_description": "Information about your company that will be displayed on invoices, estimates and other documents created by Crater.",
      "phone": "Phone",
@ -1324,6 +1326,8 @@
    "company_info": "Company Information",
    "company_info_desc": "This information will be displayed on invoices. Note that you can edit this later on settings page.",
    "company_name": "Company Name",
+    "company_slug": "Company Slug",
+    "company_slug_help_text": "A unique URL friendly name for your company (It will appear on Customer Portal URL)",
    "company_logo": "Company Logo",
    "logo_preview": "Logo Preview",
    "preferences": "Company Preferences",
@ -1454,7 +1458,8 @@
    "at_least_one_ability": "Please select atleast one Permission.",
    "valid_driver_key": "Please enter a valid {driver} key.",
    "valid_exchange_rate": "Please enter a valid exchange rate.",
-    "company_name_not_same": "Company name must match with given name."
+    "company_name_not_same": "Company name must match with given name.",
+    "invalid_slug": "Invalid Slug"
  },
  "errors": {
    "starter_plan": "This feature is available on Starter plan and onwards!",
@ -1522,5 +1527,13 @@
  "pdf_bill_to": "Bill to,",
  "pdf_ship_to": "Ship to,",
  "pdf_received_from": "Received from:",
-  "pdf_tax_label": "Tax"
+  "pdf_tax_label": "Tax",
+  "date_picker": {
+    "same_day": "Same Day",
+    "within_7_days": "Within 7 Days",
+    "within_15_days": "Within 15 Days",
+    "within_30_days": "Within 30 Days",
+    "within_45_days": "Within 45 Days",
+    "within_60_days": "Within 60 Days"
+  }
 }
--- a/tests/Feature/Admin/EstimateTest.php
+++ b/tests/Feature/Admin/EstimateTest.php
@ -415,32 +415,31 @@ test('update estimate with EUR currency', function () {

    $response = putJson('api/v1/estimates/'.$estimate->id, $estimate2);

-    $this->assertDatabaseHas('estimates', [
-        'id' => $estimate['id'],
-        'template_name' => $estimate2['template_name'],
-        'estimate_number' => $estimate2['estimate_number'],
-        'discount_type' => $estimate2['discount_type'],
-        'discount_val' => $estimate2['discount_val'],
-        'sub_total' => $estimate2['sub_total'],
-        'discount' => $estimate2['discount'],
-        'customer_id' => $estimate2['customer_id'],
-        'total' => $estimate2['total'],
-        'tax' => $estimate2['tax'],
-        'exchange_rate' => $estimate2['exchange_rate'],
-        'base_discount_val' => $estimate2['base_discount_val'],
-        'base_sub_total' => $estimate2['base_sub_total'],
-        'base_total' => $estimate2['base_total'],
-        'base_tax' => $estimate2['base_tax'],
-    ]);
+    $estimate_assert = collect($estimate2)
+        ->only([
+            'id',
+            'template_name',
+            'estimate_number',
+            'discount_type',
+            'discount_val',
+            'sub_total',
+            'discount',
+            'customer_id',
+            'total',
+            'tax'
+        ])
+        ->toArray();

-    $this->assertDatabaseHas('estimate_items', [
-        'estimate_id' => $estimate2['items'][0]['estimate_id'],
-        'exchange_rate' => $estimate2['items'][0]['exchange_rate'],
-        'base_price' => $estimate2['items'][0]['base_price'],
-        'base_discount_val' => $estimate2['items'][0]['base_discount_val'],
-        'base_tax' => $estimate2['items'][0]['base_tax'],
-        'base_total' => $estimate2['items'][0]['base_total'],
-    ]);
+    $this->assertDatabaseHas('estimates', $estimate_assert);
+
+    $estimate_item_assert = collect($estimate2['items'][0])
+        ->only([
+            'estimate_id',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('estimate_items', $estimate_item_assert);

    $response->assertStatus(200);
 });
--- a/tests/Feature/Admin/ExpenseTest.php
+++ b/tests/Feature/Admin/ExpenseTest.php
@ -37,13 +37,15 @@ test('create expense', function () {

    postJson('api/v1/expenses', $expense)->assertStatus(201);

-    $this->assertDatabaseHas('expenses', [
-        'notes' => $expense['notes'],
-        'expense_category_id' => $expense['expense_category_id'],
-        'amount' => $expense['amount'],
-        'exchange_rate' => $expense['exchange_rate'],
-        'base_amount' => $expense['base_amount'],
-    ]);
+    $expense = collect($expense)
+        ->only([
+            'notes',
+            'expense_category_id',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('expenses', $expense);
 });

 test('store validates using a form request', function () {
@ -146,11 +148,13 @@ test('update expense with EUR currency', function () {

    putJson('api/v1/expenses/'.$expense->id, $expense2)->assertOk();

-    $this->assertDatabaseHas('expenses', [
-        'id' => $expense->id,
-        'expense_category_id' => $expense2['expense_category_id'],
-        'amount' => $expense2['amount'],
-        'exchange_rate' => $expense2['exchange_rate'],
-        'base_amount' => $expense2['base_amount'],
-    ]);
+    $expense2 = collect($expense2)
+        ->only([
+            'id',
+            'expense_category_id',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('expenses', $expense2);
 });
--- a/tests/Feature/Admin/InvoiceTest.php
+++ b/tests/Feature/Admin/InvoiceTest.php
@ -9,7 +9,6 @@ use Crater\Models\Tax;
 use Crater\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
-
 use function Pest\Laravel\getJson;
 use function Pest\Laravel\postJson;
 use function Pest\Laravel\putJson;
@ -431,31 +430,36 @@ test('update invoice with EUR currency', function () {

    putJson('api/v1/invoices/'.$invoice->id, $invoice2)->assertOk();

-    $this->assertDatabaseHas('invoices', [
-        'id' => $invoice['id'],
-        'invoice_number' => $invoice2['invoice_number'],
-        'sub_total' => $invoice2['sub_total'],
-        'total' => $invoice2['total'],
-        'tax' => $invoice2['tax'],
-        'discount' => $invoice2['discount'],
-        'customer_id' => $invoice2['customer_id'],
-        'template_name' => $invoice2['template_name'],
-        'exchange_rate' => $invoice2['exchange_rate'],
-        'base_total' => $invoice2['base_total'],
-    ]);
+    $invoice_assert = collect($invoice2)
+        ->only([
+            'invoice_number',
+            'template_name',
+            'sub_total',
+            'total',
+            'tax',
+            'discount',
+            'customer_id',
+        ])
+        ->toArray();

-    $this->assertDatabaseHas('invoice_items', [
-        'invoice_id' => $invoice2['items'][0]['invoice_id'],
-        'item_id' => $invoice2['items'][0]['item_id'],
-        'name' => $invoice2['items'][0]['name'],
-        'exchange_rate' => $invoice2['items'][0]['exchange_rate'],
-        'base_price' => $invoice2['items'][0]['base_price'],
-        'base_total' => $invoice2['items'][0]['base_total'],
-    ]);
+    $this->assertDatabaseHas('invoices', $invoice_assert);

-    $this->assertDatabaseHas('taxes', [
-        'amount' => $invoice2['taxes'][0]['amount'],
-        'name' => $invoice2['taxes'][0]['name'],
-        'base_amount' => $invoice2['taxes'][0]['base_amount'],
-    ]);
+    $invoice_item_assert = collect($invoice2['items'][0])
+        ->only([
+            'invoice_id',
+            'item_id',
+            'name',
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('invoice_items', $invoice_item_assert);
+
+    $invoice_tax_assert = collect($invoice2['taxes'][0])
+        ->only([
+            'name',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('taxes', $invoice_tax_assert);
 });
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Mohit Panjwani	5a8e30d748	test frontend build	2022-12-17 17:43:01 +05:30
Mohit Panjwani	e0e9aff6d1	Merge branch 'uffizzi-feat-1' of https://github.com/daramayis/f-crater into daramayis-uffizzi-feat-1	2022-12-17 17:41:09 +05:30
Mohit Panjwani	98196194e2	Merge branch 'master' of https://github.com/bytefury/crater	2022-12-13 11:38:49 +05:30
Aramayis	abc66dd768	feat: front-end files bulding	2022-11-30 23:32:53 +04:00
Mohit Panjwani	df04fd9e53	Merge branch 'master' of https://github.com/bytefury/crater	2022-10-17 12:48:24 +05:30
Mohit Panjwani	189c51cdf4	Merge branch 'master' of https://github.com/bytefury/crater	2022-06-15 20:39:16 +05:30
Mohit Panjwani	bd5f0fe5cf	Merge branch 'v-calendar' into 'master' apply v-calendar See merge request mohit.panjvani/crater-web!1468	2022-04-01 10:24:57 +00:00
Asif Takavala	787619b907	add v-calendar	2022-04-01 10:24:56 +00:00
Mohit Panjwani	fd70ab9a99	Merge branch 'fix-expense-receipt-delete-issue' into 'master' Fix expense receipt delete issue while update See merge request mohit.panjvani/crater-web!1477	2022-04-01 10:24:20 +00:00
harshjagad20	33315638df	Fix expense receipt delete issue while update	2022-04-01 15:51:12 +05:30
Mohit Panjwani	bba14bf51a	Merge branch 'master'	2022-04-01 12:04:06 +05:30
Mohit Panjwani	ea41989034	Merge branch 'fix-expense-receipt-issue' into 'master' fix expense receipt issue See merge request mohit.panjvani/crater-web!1473	2022-03-30 09:02:56 +00:00
Harsh Jagad	3f3f83a00a	fix expense receipt issue	2022-03-30 09:02:56 +00:00
Mohit Panjwani	adc5962071	Merge branch 'fix-invoice-status-issue' into 'master' Fix invoice status issue See merge request mohit.panjvani/crater-web!1470	2022-03-30 07:38:38 +00:00
Harsh Jagad	c4c00002d7	Fix invoice status issue	2022-03-30 07:38:38 +00:00
Mohit Panjwani	a7c1e12db6	Merge branch 'new-custom-fields' into 'master' added "Due Amount, Total Amount and PDF Link" new custom fields See merge request mohit.panjvani/crater-web!1464	2022-03-30 07:35:53 +00:00
Asif Takavala	32949d1eec	added "Due Amount, Total Amount and PDF Link" new custom fields	2022-03-30 07:35:53 +00:00
Mohit Panjwani	7718f77f3d	Merge branch 'master' of https://github.com/bytefury/crater	2022-03-29 13:16:03 +05:30
Mohit Panjwani	a9e54981bf	Merge branch 'fix-minor-issues' into 'master' Fix minor issues See merge request mohit.panjvani/crater-web!1469	2022-03-21 06:45:14 +00:00
asift798	ef35293f8a	update company slug help text	2022-03-21 12:13:05 +05:30
asift798	5c63770b6b	added unique validation and help text for company slug field	2022-03-21 12:04:17 +05:30
Mohit Panjwani	d130e20c92	Merge branch 'fix-default-custom-value' into 'master' fixed "Custom fields always set to default value" See merge request mohit.panjvani/crater-web!1471	2022-03-16 06:04:21 +00:00
asift798	586fb1ae10	fixed "Custom fields always set to default value"	2022-03-16 11:28:08 +05:30
asift798	20c2502e31	added company slug	2022-03-14 17:45:58 +05:30
asift798	0e31f85c18	change company currency if it does not have any transaction.	2022-03-14 12:55:38 +05:30
harshjagad20	e7301eb7a3	Fix minor issues	2022-03-14 11:54:13 +05:30