Bump moment from 2.29.1 to 2.29.4

Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 11:41:09 -04:00 · 2022-07-08 03:12:50 +00:00
196 changed files with 4361 additions and 4177 deletions
--- a/.github/workflows/uffizzi-build.yml
+++ b/.github/workflows/uffizzi-build.yml
@ -1,162 +0,0 @@
-name: Build PR Image
-on:
-  pull_request:
-    types: [opened,synchronize,reopened,closed]
-
-jobs:
-
-  build-application:
-    name: Build and Push `application`
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
-    outputs:
-      tags: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Generate UUID image name
-        id: uuid
-        run: echo "UUID_TAG_APP=$(uuidgen)" >> $GITHUB_ENV
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: registry.uffizzi.com/${{ env.UUID_TAG_APP }}
-          tags: type=raw,value=60d
-      - name: Build and Push Image to registry.uffizzi.com ephemeral registry
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          context: ./
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          file: ./uffizzi/Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-
-  build-nginx:
-    name: Build and Push `nginx`
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
-    outputs:
-      tags: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Generate UUID image name
-        id: uuid
-        run: echo "UUID_TAG_NGINX=$(uuidgen)" >> $GITHUB_ENV
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: registry.uffizzi.com/${{ env.UUID_TAG_NGINX }}
-          tags: type=raw,value=60d
-      - name: Build and Push Image to Uffizzi ephemeral registry
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          context: ./
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          file: ./uffizzi/nginx/Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-
-  build-crond:
-    name: Build and Push `crond`
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
-    outputs:
-      tags: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Generate UUID image name
-        id: uuid
-        run: echo "UUID_TAG_CROND=$(uuidgen)" >> $GITHUB_ENV
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: registry.uffizzi.com/${{ env.UUID_TAG_CROND }}
-          tags: type=raw,value=60d
-      - name: Build and Push Image to registry.uffizzi.com ephemeral registry
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          context: ./
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          file: ./uffizzi/crond/Dockerfile      
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-
-
-  render-compose-file:
-    name: Render Docker Compose File
-    # Pass output of this workflow to another triggered by `workflow_run` event.
-    runs-on: ubuntu-latest
-    outputs:
-      compose-file-cache-key: ${{ steps.hash.outputs.hash }}
-    needs: 
-      - build-application
-      - build-nginx
-      - build-crond
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Render Compose File
-        run: |
-          APP_IMAGE=$(echo ${{ needs.build-application.outputs.tags }})
-          export APP_IMAGE
-          NGINX_IMAGE=$(echo ${{ needs.build-nginx.outputs.tags }})
-          export NGINX_IMAGE
-          CROND_IMAGE=$(echo ${{ needs.build-crond.outputs.tags }})
-          export CROND_IMAGE
-          # Render simple template from environment variables.
-          envsubst < ./uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml
-          cat docker-compose.rendered.yml
-      - name: Upload Rendered Compose File as Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: preview-spec
-          path: docker-compose.rendered.yml
-          retention-days: 2
-      - name: Serialize PR Event to File
-        run:  |
-          cat << EOF > event.json
-          ${{ toJSON(github.event) }} 
-          
-          EOF
-      - name: Upload PR Event as Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: preview-spec
-          path: event.json
-          retention-days: 2
-
-  delete-preview:
-    name: Call for Preview Deletion
-    runs-on: ubuntu-latest
-    if: ${{ github.event.action == 'closed' }}
-    steps:
-      # If this PR is closing, we will not render a compose file nor pass it to the next workflow.
-      - name: Serialize PR Event to File
-        run: echo '${{ toJSON(github.event) }}' > event.json
-      - name: Upload PR Event as Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: preview-spec
-          path: event.json
-          retention-days: 2
-
--- a/.github/workflows/uffizzi-preview.yml
+++ b/.github/workflows/uffizzi-preview.yml
@ -1,84 +0,0 @@
-name: Deploy Uffizzi Preview
-
-on:
-  workflow_run:
-    workflows:
-      - "Build PR Image"
-    types:
-      - completed
-
-
-jobs:
-  cache-compose-file:
-    name: Cache Compose File
-    runs-on: ubuntu-latest
-    outputs:
-      compose-file-cache-key: ${{ env.COMPOSE_FILE_HASH }}
-      pr-number: ${{ env.PR_NUMBER }}
-    steps:
-      - name: 'Download artifacts'
-        # Fetch output (zip archive) from the workflow run that triggered this workflow.
-        uses: actions/github-script@v6
-        with:
-          script: |
-            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: context.payload.workflow_run.id,
-            });
-            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "preview-spec"
-            })[0];
-            let download = await github.rest.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            let fs = require('fs');
-            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview-spec.zip`, Buffer.from(download.data));
-      - name: 'Unzip artifact'
-        run: unzip preview-spec.zip
-      - name: Read Event into ENV
-        run: |
-          echo 'EVENT_JSON<<EOF' >> $GITHUB_ENV
-          cat event.json >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
-      - name: Hash Rendered Compose File
-        id: hash
-        # If the previous workflow was triggered by a PR close event, we will not have a compose file artifact.
-        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
-        run: echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_ENV
-      - name: Cache Rendered Compose File
-        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
-        uses: actions/cache@v3
-        with:
-          path: docker-compose.rendered.yml
-          key: ${{ env.COMPOSE_FILE_HASH }}
-
-      - name: Read PR Number From Event Object
-        id: pr
-        run: echo "PR_NUMBER=${{ fromJSON(env.EVENT_JSON).number }}" >> $GITHUB_ENV
-
-      - name: DEBUG - Print Job Outputs
-        if: ${{ runner.debug }}
-        run: |
-          echo "PR number: ${{ env.PR_NUMBER }}"
-          echo "Compose file hash: ${{ env.COMPOSE_FILE_HASH }}"
-          cat event.json
-  deploy-uffizzi-preview:
-    name: Use Remote Workflow to Preview on Uffizzi
-    needs:
-      - cache-compose-file
-    uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2.6.1
-    with:
-      # If this workflow was triggered by a PR close event, cache-key will be an empty string
-      # and this reusable workflow will delete the preview deployment.
-      compose-file-cache-key: ${{ needs.cache-compose-file.outputs.compose-file-cache-key }}
-      compose-file-cache-path: docker-compose.rendered.yml
-      server: https://app.uffizzi.com/
-      pr-number: ${{ needs.cache-compose-file.outputs.pr-number }}
-    permissions:
-      contents: read
-      pull-requests: write
-      id-token: write
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM php:8.1-fpm
+FROM php:7.4-fpm

 # Arguments defined in docker-compose.yml
 ARG user
--- a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
+++ b/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
@ -103,7 +103,6 @@ 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,7 +104,6 @@ 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');

@ -142,7 +141,6 @@ 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,7 +24,6 @@ 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/Controllers/V1/Admin/Report/CustomerSalesReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
@ -2,25 +2,24 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use PDF;
 use Carbon\Carbon;
+use Crater\Http\Controllers\Controller;
 use Crater\Models\Company;
-use Crater\Models\Currency;
+use Crater\Models\CompanySetting;
 use Crater\Models\Customer;
 use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
 use Illuminate\Support\Facades\App;
-use Crater\Http\Controllers\Controller;
+use PDF;

 class CustomerSalesReportController extends Controller
 {
    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
-     */
+    * Handle the incoming request.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @param  string  $hash
+    * @return \Illuminate\Http\JsonResponse
+    */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -57,7 +56,6 @@ class CustomerSalesReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));

        $colors = [
            'primary_text_color',
@ -82,7 +80,6 @@ class CustomerSalesReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
-            'currency' => $currency,
        ]);

        $pdf = PDF::loadView('app.pdf.reports.sales-customers');
--- a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php
@ -2,25 +2,24 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Company;
-use Crater\Models\Expense;
-use Crater\Models\Currency;
-use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
-use Illuminate\Support\Facades\App;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\Expense;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use PDF;

 class ExpensesReportController extends Controller
 {
    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
-     */
+    * Handle the incoming request.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @param  string  $hash
+    * @return \Illuminate\Http\JsonResponse
+    */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -44,7 +43,6 @@ class ExpensesReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));

        $colors = [
            'primary_text_color',
@ -68,7 +66,6 @@ class ExpensesReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
-            'currency' => $currency,
        ]);
        $pdf = PDF::loadView('app.pdf.reports.expenses');

--- a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php
@ -2,25 +2,24 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Company;
-use Crater\Models\Currency;
-use Illuminate\Http\Request;
-use Crater\Models\InvoiceItem;
-use Crater\Models\CompanySetting;
-use Illuminate\Support\Facades\App;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\InvoiceItem;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use PDF;

 class ItemSalesReportController extends Controller
 {
    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
-     */
+    * Handle the incoming request.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @param  string  $hash
+    * @return \Illuminate\Http\JsonResponse
+    */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -44,7 +43,6 @@ class ItemSalesReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));

        $colors = [
            'primary_text_color',
@ -68,7 +66,6 @@ class ItemSalesReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
-            'currency' => $currency,
        ]);
        $pdf = PDF::loadView('app.pdf.reports.sales-items');

--- a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
@ -2,26 +2,25 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use PDF;
 use Carbon\Carbon;
+use Crater\Http\Controllers\Controller;
 use Crater\Models\Company;
+use Crater\Models\CompanySetting;
 use Crater\Models\Expense;
 use Crater\Models\Payment;
-use Crater\Models\Currency;
 use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
 use Illuminate\Support\Facades\App;
-use Crater\Http\Controllers\Controller;
+use PDF;

 class ProfitLossReportController extends Controller
 {
    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
-     */
+    * Handle the incoming request.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @param  string  $hash
+    * @return \Illuminate\Http\JsonResponse
+    */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -50,8 +49,6 @@ class ProfitLossReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
-

        $colors = [
            'primary_text_color',
@ -77,7 +74,6 @@ class ProfitLossReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
-            'currency' => $currency,
        ]);
        $pdf = PDF::loadView('app.pdf.reports.profit-loss');

--- a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php
@ -2,25 +2,24 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Tax;
-use Crater\Models\Company;
-use Crater\Models\Currency;
-use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
-use Illuminate\Support\Facades\App;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\Tax;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use PDF;

 class TaxSummaryReportController extends Controller
 {
    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
-     */
+    * Handle the incoming request.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @param  string  $hash
+    * @return \Illuminate\Http\JsonResponse
+    */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -45,8 +44,6 @@ class TaxSummaryReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
-

        $colors = [
            'primary_text_color',
@ -71,7 +68,6 @@ class TaxSummaryReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
-            'currency' => $currency,
        ]);

        $pdf = PDF::loadView('app.pdf.reports.tax-summary');
--- a/app/Http/Requests/CompaniesRequest.php
+++ b/app/Http/Requests/CompaniesRequest.php
@ -3,6 +3,7 @@
 namespace Crater\Http\Requests;

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

 class CompaniesRequest extends FormRequest
@ -33,10 +34,6 @@ class CompaniesRequest extends FormRequest
            'currency' => [
                'required'
            ],
-            'slug' => [
-                'required',
-                Rule::unique('companies')
-            ],
            'address.name' => [
                'nullable',
            ],
@ -71,11 +68,11 @@ class CompaniesRequest extends FormRequest
    {
        return collect($this->validated())
            ->only([
-                'name',
-                'slug'
+                'name'
            ])
            ->merge([
-                'owner_id' => $this->user()->id
+                'owner_id' => $this->user()->id,
+                'slug' => Str::slug($this->name)
            ])
            ->toArray();
    }
--- a/app/Http/Requests/CompanyRequest.php
+++ b/app/Http/Requests/CompanyRequest.php
@ -30,8 +30,7 @@ class CompanyRequest extends FormRequest
                Rule::unique('companies')->ignore($this->header('company'), 'id'),
            ],
            'slug' => [
-                'required',
-                Rule::unique('companies')->ignore($this->header('company'), 'id'),
+                'nullable'
            ],
            '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->notes,
+            'notes' => $this->getNotes(),
            '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->notes,
+            'notes' => $this->getNotes(),
            '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 ?? 1,
+            'currency' => request()->currency ?? 13,
            'time_zone' => 'Asia/Kolkata',
            'language' => 'en',
            'fiscal_year' => '1-12',
--- a/app/Models/Estimate.php
+++ b/app/Models/Estimate.php
@ -483,8 +483,7 @@ class Estimate extends Model implements HasMedia
            '{ESTIMATE_DATE}' => $this->formattedEstimateDate,
            '{ESTIMATE_EXPIRY_DATE}' => $this->formattedExpiryDate,
            '{ESTIMATE_NUMBER}' => $this->estimate_number,
-            '{PDF_LINK}' => $this->estimatePdfUrl,
-            '{TOTAL_AMOUNT}' => format_money_pdf($this->total, $this->customer->currency)
+            '{ESTIMATE_REF_NUMBER}' => $this->reference_number,
        ];
    }

--- 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', 'local');
+            $expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
        }

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

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

        if ($request->customFields) {
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@ -187,6 +187,16 @@ 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', [
@ -224,40 +234,6 @@ 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);
@ -273,11 +249,17 @@ 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'));
        }
@ -669,9 +651,7 @@ class Invoice extends Model implements HasMedia
            '{INVOICE_DATE}' => $this->formattedInvoiceDate,
            '{INVOICE_DUE_DATE}' => $this->formattedDueDate,
            '{INVOICE_NUMBER}' => $this->invoice_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)
+            '{INVOICE_REF_NUMBER}' => $this->reference_number,
        ];
    }

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

--- a/composer.json
+++ b/composer.json
@ -38,7 +38,7 @@
    "barryvdh/laravel-ide-helper": "^2.6",
    "beyondcode/laravel-dump-server": "^1.0",
    "facade/ignition": "^2.3.6",
-    "friendsofphp/php-cs-fixer": "^3.8",
+    "friendsofphp/php-cs-fixer": "^3.0",
    "fakerphp/faker": "^1.9.1",
    "mockery/mockery": "^1.3.1",
    "nunomaduro/collision": "^5.0",
@ -81,10 +81,7 @@
  "config": {
    "optimize-autoloader": true,
    "preferred-install": "dist",
-    "sort-packages": true,
-    "allow-plugins": {
-      "pestphp/pest-plugin": true
-    }
+    "sort-packages": true
  },
  "extra": {
    "laravel": {
--- a/composer.lock
+++ b/composer.lock
--- a/database/seeders/CountriesTableSeeder.php
+++ b/database/seeders/CountriesTableSeeder.php
@ -170,7 +170,7 @@ class CountriesTableSeeder extends Seeder
        ['id' => 152,'code' => 'NR','name' => "Nauru",'phonecode' => 674],
        ['id' => 153,'code' => 'NP','name' => "Nepal",'phonecode' => 977],
        ['id' => 154,'code' => 'AN','name' => "Netherlands Antilles",'phonecode' => 599],
-        ['id' => 155,'code' => 'NL','name' => "Netherlands",'phonecode' => 31],
+        ['id' => 155,'code' => 'NL','name' => "Netherlands The",'phonecode' => 31],
        ['id' => 156,'code' => 'NC','name' => "New Caledonia",'phonecode' => 687],
        ['id' => 157,'code' => 'NZ','name' => "New Zealand",'phonecode' => 64],
        ['id' => 158,'code' => 'NI','name' => "Nicaragua",'phonecode' => 505],
--- a/package-lock.json
+++ b/package-lock.json
@ -214,6 +214,23 @@
      "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.32.0",
+      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.32.0.tgz",
+      "integrity": "sha512-7EvBnbBfS1aynfLRmBFcuumHNGjKxnNkO47rorFBktqDYHwo7Yw6pfDW2iqq0R8r7i7XiJEdWPvvEgQAiDrx3A=="
+    },
+    "@tailwindcss/aspect-ratio": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.0.tgz",
+      "integrity": "sha512-WJu0I4PpqNPuutpaA9zDUq2JXR+lorZ7PbLcKNLmb6GL9/HLfC7w3CRsMhJF4BbYd/lkY6CfXOvkYpuGnZfkpQ==",
+      "dev": true
+    },
    "@tailwindcss/forms": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz",
@ -223,6 +240,22 @@
        "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.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.3.tgz",
+      "integrity": "sha512-Cn4MufL/xiTh2Npw26xiL7gP3GFkJH+zWM8DAm/NNEr4gF5N9D6gY9zMNNQUu27m8g0IIk665BUuoU92wVUBkA==",
+      "dev": true,
+      "requires": {
+        "lodash.castarray": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.merge": "^4.6.2"
+      }
+    },
    "@tiptap/core": {
      "version": "2.0.0-beta.99",
      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.0.0-beta.99.tgz",
@ -386,6 +419,11 @@
      "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.31",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-2.0.0-beta.31.tgz",
+      "integrity": "sha512-gSJqi57piiMPc2r6WEkXv7ZgQIogigsRUhmlnZC/7s3zzOvjXrexWnV0Ctt/9A7BKcM7OHMykpZyoewvk6QRTw=="
+    },
    "@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",
@ -537,6 +575,12 @@
        "@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",
@ -558,6 +602,70 @@
        "@vue/shared": "3.2.4"
      }
    },
+    "@vue/compiler-sfc": {
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
+      "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.37",
+        "@vue/compiler-dom": "3.2.37",
+        "@vue/compiler-ssr": "3.2.37",
+        "@vue/reactivity-transform": "3.2.37",
+        "@vue/shared": "3.2.37",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7",
+        "postcss": "^8.1.10",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "@babel/parser": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz",
+          "integrity": "sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==",
+          "dev": true
+        },
+        "@vue/compiler-core": {
+          "version": "3.2.37",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
+          "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
+          "dev": true,
+          "requires": {
+            "@babel/parser": "^7.16.4",
+            "@vue/shared": "3.2.37",
+            "estree-walker": "^2.0.2",
+            "source-map": "^0.6.1"
+          }
+        },
+        "@vue/compiler-dom": {
+          "version": "3.2.37",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
+          "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
+          "dev": true,
+          "requires": {
+            "@vue/compiler-core": "3.2.37",
+            "@vue/shared": "3.2.37"
+          }
+        },
+        "@vue/compiler-ssr": {
+          "version": "3.2.37",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
+          "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
+          "dev": true,
+          "requires": {
+            "@vue/compiler-dom": "3.2.37",
+            "@vue/shared": "3.2.37"
+          }
+        },
+        "@vue/shared": {
+          "version": "3.2.37",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
+          "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==",
+          "dev": true
+        }
+      }
+    },
    "@vue/compiler-ssr": {
      "version": "3.2.19",
      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz",
@ -607,6 +715,45 @@
        "@vue/shared": "3.2.4"
      }
    },
+    "@vue/reactivity-transform": {
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
+      "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.37",
+        "@vue/shared": "3.2.37",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      },
+      "dependencies": {
+        "@babel/parser": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz",
+          "integrity": "sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==",
+          "dev": true
+        },
+        "@vue/compiler-core": {
+          "version": "3.2.37",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
+          "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
+          "dev": true,
+          "requires": {
+            "@babel/parser": "^7.16.4",
+            "@vue/shared": "3.2.37",
+            "estree-walker": "^2.0.2",
+            "source-map": "^0.6.1"
+          }
+        },
+        "@vue/shared": {
+          "version": "3.2.37",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
+          "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==",
+          "dev": true
+        }
+      }
+    },
    "@vue/ref-transform": {
      "version": "3.2.19",
      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz",
@ -677,6 +824,44 @@
      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz",
      "integrity": "sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg=="
    },
+    "@vuelidate/components": {
+      "version": "1.1.22",
+      "resolved": "https://registry.npmjs.org/@vuelidate/components/-/components-1.1.22.tgz",
+      "integrity": "sha512-Iqr1Teylh0/cIXfn0XzVMrvrJhFfpmjdhRfCvUfyEWIN0E47WBR8uy/qUjwnfJM8FbdCgcZF2LLwEF7sA5rj4A==",
+      "requires": {
+        "@vuelidate/core": "^2.0.0-alpha.42"
+      }
+    },
+    "@vuelidate/core": {
+      "version": "2.0.0-alpha.42",
+      "resolved": "https://registry.npmjs.org/@vuelidate/core/-/core-2.0.0-alpha.42.tgz",
+      "integrity": "sha512-yLp5/5IkwNZP8214TqEuexlFLGoEZybEad2OZu/heOYPnERm6tgiWHZltc0USCuQ1JVZ2EJuPRHmqMl/G/N7tw==",
+      "requires": {
+        "vue-demi": "^0.12.0"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.12.5",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz",
+          "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q=="
+        }
+      }
+    },
+    "@vuelidate/validators": {
+      "version": "2.0.0-alpha.30",
+      "resolved": "https://registry.npmjs.org/@vuelidate/validators/-/validators-2.0.0-alpha.30.tgz",
+      "integrity": "sha512-XH0oIU1+6bTZ1Kd1RNf7AMDsAahj1hUjLhbFUIrDhKIUKMFvG4658pqYATePNqhAegENFA+RDAPhsDXV/MB2wQ==",
+      "requires": {
+        "vue-demi": "^0.12.0"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.12.5",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz",
+          "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q=="
+        }
+      }
+    },
    "@vueuse/core": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-6.0.0.tgz",
@ -1240,6 +1425,174 @@
        }
      }
    },
+    "esbuild": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.48.tgz",
+      "integrity": "sha512-w6N1Yn5MtqK2U1/WZTX9ZqUVb8IOLZkZ5AdHkT6x3cHDMVsYWC7WPdiLmx19w3i4Rwzy5LqsEMtVihG3e4rFzA==",
+      "dev": true,
+      "requires": {
+        "esbuild-android-64": "0.14.48",
+        "esbuild-android-arm64": "0.14.48",
+        "esbuild-darwin-64": "0.14.48",
+        "esbuild-darwin-arm64": "0.14.48",
+        "esbuild-freebsd-64": "0.14.48",
+        "esbuild-freebsd-arm64": "0.14.48",
+        "esbuild-linux-32": "0.14.48",
+        "esbuild-linux-64": "0.14.48",
+        "esbuild-linux-arm": "0.14.48",
+        "esbuild-linux-arm64": "0.14.48",
+        "esbuild-linux-mips64le": "0.14.48",
+        "esbuild-linux-ppc64le": "0.14.48",
+        "esbuild-linux-riscv64": "0.14.48",
+        "esbuild-linux-s390x": "0.14.48",
+        "esbuild-netbsd-64": "0.14.48",
+        "esbuild-openbsd-64": "0.14.48",
+        "esbuild-sunos-64": "0.14.48",
+        "esbuild-windows-32": "0.14.48",
+        "esbuild-windows-64": "0.14.48",
+        "esbuild-windows-arm64": "0.14.48"
+      }
+    },
+    "esbuild-android-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.48.tgz",
+      "integrity": "sha512-3aMjboap/kqwCUpGWIjsk20TtxVoKck8/4Tu19rubh7t5Ra0Yrpg30Mt1QXXlipOazrEceGeWurXKeFJgkPOUg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-android-arm64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.48.tgz",
+      "integrity": "sha512-vptI3K0wGALiDq+EvRuZotZrJqkYkN5282iAfcffjI5lmGG9G1ta/CIVauhY42MBXwEgDJkweiDcDMRLzBZC4g==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.48.tgz",
+      "integrity": "sha512-gGQZa4+hab2Va/Zww94YbshLuWteyKGD3+EsVon8EWTWhnHFRm5N9NbALNbwi/7hQ/hM1Zm4FuHg+k6BLsl5UA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-arm64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.48.tgz",
+      "integrity": "sha512-bFjnNEXjhZT+IZ8RvRGNJthLWNHV5JkCtuOFOnjvo5pC0sk2/QVk0Qc06g2PV3J0TcU6kaPC3RN9yy9w2PSLEA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.48.tgz",
+      "integrity": "sha512-1NOlwRxmOsnPcWOGTB10JKAkYSb2nue0oM1AfHWunW/mv3wERfJmnYlGzL3UAOIUXZqW8GeA2mv+QGwq7DToqA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-arm64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.48.tgz",
+      "integrity": "sha512-gXqKdO8wabVcYtluAbikDH2jhXp+Klq5oCD5qbVyUG6tFiGhrC9oczKq3vIrrtwcxDQqK6+HDYK8Zrd4bCA9Gw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-32": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.48.tgz",
+      "integrity": "sha512-ghGyDfS289z/LReZQUuuKq9KlTiTspxL8SITBFQFAFRA/IkIvDpnZnCAKTCjGXAmUqroMQfKJXMxyjJA69c/nQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.48.tgz",
+      "integrity": "sha512-vni3p/gppLMVZLghI7oMqbOZdGmLbbKR23XFARKnszCIBpEMEDxOMNIKPmMItQrmH/iJrL1z8Jt2nynY0bE1ug==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.48.tgz",
+      "integrity": "sha512-+VfSV7Akh1XUiDNXgqgY1cUP1i2vjI+BmlyXRfVz5AfV3jbpde8JTs5Q9sYgaoq5cWfuKfoZB/QkGOI+QcL1Tw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.48.tgz",
+      "integrity": "sha512-3CFsOlpoxlKPRevEHq8aAntgYGYkE1N9yRYAcPyng/p4Wyx0tPR5SBYsxLKcgPB9mR8chHEhtWYz6EZ+H199Zw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-mips64le": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.48.tgz",
+      "integrity": "sha512-cs0uOiRlPp6ymknDnjajCgvDMSsLw5mST2UXh+ZIrXTj2Ifyf2aAP3Iw4DiqgnyYLV2O/v/yWBJx+WfmKEpNLA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-ppc64le": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.48.tgz",
+      "integrity": "sha512-+2F0vJMkuI0Wie/wcSPDCqXvSFEELH7Jubxb7mpWrA/4NpT+/byjxDz0gG6R1WJoeDefcrMfpBx4GFNN1JQorQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-riscv64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.48.tgz",
+      "integrity": "sha512-BmaK/GfEE+5F2/QDrIXteFGKnVHGxlnK9MjdVKMTfvtmudjY3k2t8NtlY4qemKSizc+QwyombGWTBDc76rxePA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-s390x": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.48.tgz",
+      "integrity": "sha512-tndw/0B9jiCL+KWKo0TSMaUm5UWBLsfCKVdbfMlb3d5LeV9WbijZ8Ordia8SAYv38VSJWOEt6eDCdOx8LqkC4g==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-netbsd-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.48.tgz",
+      "integrity": "sha512-V9hgXfwf/T901Lr1wkOfoevtyNkrxmMcRHyticybBUHookznipMOHoF41Al68QBsqBxnITCEpjjd4yAos7z9Tw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-openbsd-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.48.tgz",
+      "integrity": "sha512-+IHf4JcbnnBl4T52egorXMatil/za0awqzg2Vy6FBgPcBpisDWT2sVz/tNdrK9kAqj+GZG/jZdrOkj7wsrNTKA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-sunos-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.48.tgz",
+      "integrity": "sha512-77m8bsr5wOpOWbGi9KSqDphcq6dFeJyun8TA+12JW/GAjyfTwVtOnN8DOt6DSPUfEV+ltVMNqtXUeTeMAxl5KA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-32": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.48.tgz",
+      "integrity": "sha512-EPgRuTPP8vK9maxpTGDe5lSoIBHGKO/AuxDncg5O3NkrPeLNdvvK8oywB0zGaAZXxYWfNNSHskvvDgmfVTguhg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.48.tgz",
+      "integrity": "sha512-YmpXjdT1q0b8ictSdGwH3M8VCoqPpK1/UArze3X199w6u8hUx3V8BhAi1WjbsfDYRBanVVtduAhh2sirImtAvA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-arm64": {
+      "version": "0.14.48",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.48.tgz",
+      "integrity": "sha512-HHaOMCsCXp0rz5BT2crTka6MPWVno121NKApsGs/OIW5QC0ggC69YMGs1aJct9/9FSUF4A1xNE/cLvgB5svR4g==",
+      "dev": true,
+      "optional": true
+    },
    "escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@ -1947,12 +2300,24 @@
      "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",
@ -2039,9 +2404,9 @@
      "dev": true
    },
    "moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
    },
    "ms": {
      "version": "2.1.2",
@ -2205,6 +2570,22 @@
      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
      "dev": true
    },
+    "pinia": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.14.tgz",
+      "integrity": "sha512-0nPuZR4TetT/WcLN+feMSjWJku3SQU7dBbXC6uw+R6FLQJCsg+/0pzXyD82T1FmAYe0lsx+jnEDQ1BLgkRKlxA==",
+      "requires": {
+        "@vue/devtools-api": "^6.1.4",
+        "vue-demi": "*"
+      },
+      "dependencies": {
+        "@vue/devtools-api": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.0.tgz",
+          "integrity": "sha512-pF1G4wky+hkifDiZSWn8xfuLOJI1ZXtuambpBEYaf7Xaf6zC/pM29rvAGpd3qaGXnr4BAXU1Pxz/VfvBGwexGA=="
+        }
+      }
+    },
    "postcss": {
      "version": "8.4.5",
      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
@ -2508,6 +2889,15 @@
        "glob": "^7.1.3"
      }
    },
+    "rollup": {
+      "version": "2.75.7",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",
+      "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==",
+      "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",
@ -2668,6 +3058,12 @@
        "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",
@ -2934,12 +3330,86 @@
      "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.5",
+          "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+          "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
+        }
+      }
+    },
    "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.13",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.13.tgz",
+      "integrity": "sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==",
+      "dev": true,
+      "requires": {
+        "esbuild": "^0.14.27",
+        "fsevents": "~2.3.2",
+        "postcss": "^8.4.13",
+        "resolve": "^1.22.0",
+        "rollup": "^2.59.0"
+      },
+      "dependencies": {
+        "is-core-module": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+          "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+          "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.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+          "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",
@ -3002,6 +3472,11 @@
        "@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.5.0",
+    "@headlessui/vue": "^1.4.0",
    "@heroicons/vue": "^1.0.1",
    "@popperjs/core": "^2.9.2",
    "@stripe/stripe-js": "^1.21.2",
@ -46,10 +46,9 @@
    "lodash": "^4.17.13",
    "maska": "^1.4.6",
    "mini-svg-data-uri": "^1.3.3",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
    "pinia": "^2.0.4",
-    "v-calendar": "3.0.0-alpha.8",
-    "v-money3": "3.16.1",
+    "v-money3": "^3.13.5",
    "v-tooltip": "^4.0.0-alpha.1",
    "vue": "^3.2.0-beta.5",
    "vue-flatpickr-component": "^9.0.3",
--- a/resources/scripts/admin/components/CopyInputField.vue
+++ b/resources/scripts/admin/components/CopyInputField.vue
@ -7,7 +7,6 @@
      py-2
      rounded-lg
      bg-opacity-40 bg-gray-300
-      dark:bg-gray-700 dark:border-gray-600
      whitespace-nowrap
      flex-col
      mt-1
@ -20,7 +19,6 @@
        text-sm
        font-medium
        text-black
-        dark:text-white
        truncate
        select-all select-color
      "
--- a/resources/scripts/admin/components/SelectNotePopup.vue
+++ b/resources/scripts/admin/components/SelectNotePopup.vue
@ -91,7 +91,6 @@
                        leading-tight
                        text-gray-700
                        cursor-pointer
-                        dark:text-gray-400
                      "
                    >
                      {{ note.name }}
--- a/resources/scripts/admin/components/charts/LineChart.vue
+++ b/resources/scripts/admin/components/charts/LineChart.vue
@ -6,17 +6,8 @@

 <script setup>
 import Chart from 'chart.js'
-import {
-  ref,
-  reactive,
-  computed,
-  onMounted,
-  watchEffect,
-  inject,
-  watch,
-} from 'vue'
+import { ref, reactive, computed, onMounted, watchEffect, inject } from 'vue'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
-import { useGlobalStore } from '@/scripts/admin/stores/global'

 const utils = inject('utils')

@ -53,11 +44,9 @@ const props = defineProps({
  },
 })

-const isDarkModeOn = document.documentElement.classList.contains('dark')
 let myLineChart = null
 const graph = ref(null)
 const companyStore = useCompanyStore()
-const globalStore = useGlobalStore()
 const defaultCurrency = computed(() => {
  return companyStore.selectedCompanyCurrency
 })
@ -71,14 +60,6 @@ watchEffect(() => {
  }
 })

-watch(
-  () => globalStore.isDarkModeOn,
-  () => {
-    myLineChart.reset()
-    updateColors()
-  }
-)
-
 onMounted(() => {
  let context = graph.value.getContext('2d')
  let options = reactive({
@ -100,8 +81,6 @@ onMounted(() => {
    },
  })

-  const salesColor = globalStore.isDarkModeOn ? '#ffffff' : '#040405'
-
  let data = reactive({
    labels: props.labels,
    datasets: [
@ -110,16 +89,16 @@ onMounted(() => {
        fill: false,
        lineTension: 0.3,
        backgroundColor: 'rgba(230, 254, 249)',
-        borderColor: salesColor,
+        borderColor: '#040405',
        borderCapStyle: 'butt',
        borderDash: [],
        borderDashOffset: 0.0,
        borderJoinStyle: 'miter',
-        pointBorderColor: salesColor,
+        pointBorderColor: '#040405',
        pointBackgroundColor: '#fff',
        pointBorderWidth: 1,
        pointHoverRadius: 5,
-        pointHoverBackgroundColor: salesColor,
+        pointHoverBackgroundColor: '#040405',
        pointHoverBorderColor: 'rgba(220,220,220,1)',
        pointHoverBorderWidth: 2,
        pointRadius: 4,
@ -215,12 +194,4 @@ function update() {
    lazy: true,
  })
 }
-
-function updateColors() {
-  const newColor = globalStore.isDarkModeOn ? '#ffffff' : '#040405'
-
-  myLineChart.data.datasets[0].borderColor = newColor
-  myLineChart.data.datasets[0].pointBorderColor = newColor
-  myLineChart.data.datasets[0].pointHoverBackgroundColor = newColor
-}
 </script>
--- a/resources/scripts/admin/components/currency-exchange-rate/ExchangeRateBulkUpdate.vue
+++ b/resources/scripts/admin/components/currency-exchange-rate/ExchangeRateBulkUpdate.vue
@ -50,11 +50,21 @@
          </BaseInputGroup>
        </template>
      </ValidateEach>
-      <BaseModalFooter>
+      <div
+        slot="footer"
+        class="
+          z-0
+          flex
+          justify-end
+          mt-4
+          pt-4
+          border-t border-gray-200 border-solid border-modal-bg
+        "
+      >
        <BaseButton :loading="isSaving" variant="primary" type="submit">
          {{ $t('general.save') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseCard>
 </template>
--- 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/dropdowns/CustomFieldIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/CustomFieldIndexDropdown.vue
@ -7,12 +7,11 @@
    <!-- edit customField  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.EDIT_CUSTOM_FIELDS)"
-      v-slot="slotProps"
      @click="editCustomField(row.id)"
    >
      <BaseIcon
        name="PencilIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.edit') }}
    </BaseDropdownItem>
@ -20,12 +19,11 @@
    <!-- delete customField  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_CUSTOM_FIELDS)"
-      v-slot="slotProps"
      @click="removeCustomField(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/CustomerIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/CustomerIndexDropdown.vue
@ -12,10 +12,10 @@
      v-if="userStore.hasAbilities(abilities.EDIT_CUSTOMER)"
      :to="`/admin/customers/${row.id}/edit`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="PencilIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
@ -29,10 +29,10 @@
      "
      :to="`customers/${row.id}/view`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="EyeIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.view') }}
      </BaseDropdownItem>
@ -41,12 +41,11 @@
    <!-- Delete Customer  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_CUSTOMER)"
-      v-slot="slotProps"
      @click="removeCustomer(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/EstimateIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/EstimateIndexDropdown.vue
@ -10,12 +10,11 @@
    <!-- Copy PDF url  -->
    <BaseDropdownItem
      v-if="route.name === 'estimates.view'"
-      v-slot="slotProps"
      @click="copyPdfUrl"
    >
      <BaseIcon
        name="LinkIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.copy_pdf_url') }}
    </BaseDropdownItem>
@ -25,10 +24,10 @@
      v-if="userStore.hasAbilities(abilities.EDIT_ESTIMATE)"
      :to="`/admin/estimates/${row.id}/edit`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="PencilIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
@ -37,12 +36,11 @@
    <!-- Delete Estimate  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_ESTIMATE)"
-      v-slot="slotProps"
      @click="removeEstimate(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
@ -55,10 +53,10 @@
      "
      :to="`estimates/${row.id}/view`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="EyeIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.view') }}
      </BaseDropdownItem>
@ -67,12 +65,11 @@
    <!-- Convert into Invoice  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
-      v-slot="slotProps"
      @click="convertInToinvoice(row.id)"
    >
      <BaseIcon
        name="DocumentTextIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('estimates.convert_to_invoice') }}
    </BaseDropdownItem>
@ -84,12 +81,11 @@
        route.name !== 'estimates.view' &&
        userStore.hasAbilities(abilities.SEND_ESTIMATE)
      "
-      v-slot="slotProps"
      @click="onMarkAsSent(row.id)"
    >
      <BaseIcon
        name="CheckCircleIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('estimates.mark_as_sent') }}
    </BaseDropdownItem>
@ -101,21 +97,20 @@
        route.name !== 'estimates.view' &&
        userStore.hasAbilities(abilities.SEND_ESTIMATE)
      "
-      v-slot="slotProps"
      @click="sendEstimate(row)"
    >
      <BaseIcon
        name="PaperAirplaneIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('estimates.send_estimate') }}
    </BaseDropdownItem>

    <!-- Resend Estimate -->
-    <BaseDropdownItem v-if="canResendEstimate(row)" v-slot="slotProps"  @click="sendEstimate(row)">
+    <BaseDropdownItem v-if="canResendEstimate(row)" @click="sendEstimate(row)">
      <BaseIcon
        name="PaperAirplaneIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('estimates.resend_estimate') }}
    </BaseDropdownItem>
@ -126,12 +121,11 @@
        row.status !== 'ACCEPTED' &&
        userStore.hasAbilities(abilities.EDIT_ESTIMATE)
      "
-      v-slot="slotProps"
      @click="onMarkAsAccepted(row.id)"
    >
      <BaseIcon
        name="CheckCircleIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('estimates.mark_as_accepted') }}
    </BaseDropdownItem>
@ -142,12 +136,11 @@
        row.status !== 'REJECTED' &&
        userStore.hasAbilities(abilities.EDIT_ESTIMATE)
      "
-      v-slot="slotProps"
      @click="onMarkAsRejected(row.id)"
    >
      <BaseIcon
        name="XCircleIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('estimates.mark_as_rejected') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/ExpenseCategoryIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/ExpenseCategoryIndexDropdown.vue
@ -13,12 +13,11 @@
    <!-- edit expenseCategory  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.EDIT_EXPENSE)"
-      v-slot="slotProps"
      @click="editExpenseCategory(row.id)"
    >
      <BaseIcon
        name="PencilIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.edit') }}
    </BaseDropdownItem>
@ -26,12 +25,11 @@
    <!-- delete expenseCategory  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_EXPENSE)"
-      v-slot="slotProps"
      @click="removeExpenseCategory(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/ExpenseIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/ExpenseIndexDropdown.vue
@ -12,10 +12,10 @@
      v-if="userStore.hasAbilities(abilities.EDIT_EXPENSE)"
      :to="`/admin/expenses/${row.id}/edit`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="PencilIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
@ -24,12 +24,11 @@
    <!-- delete expense  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_EXPENSE)"
-      v-slot="slotProps"
      @click="removeExpense(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/InvoiceIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/InvoiceIndexDropdown.vue
@ -12,20 +12,20 @@
      v-if="userStore.hasAbilities(abilities.EDIT_INVOICE)"
      :to="`/admin/invoices/${row.id}/edit`"
    >
-      <BaseDropdownItem v-show="row.allow_edit" v-slot="slotProps">
+      <BaseDropdownItem v-show="row.allow_edit">
        <BaseIcon
          name="PencilIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
    </router-link>

    <!-- Copy PDF url  -->
-    <BaseDropdownItem v-if="route.name === 'invoices.view'" v-slot="slotProps" @click="copyPdfUrl">
+    <BaseDropdownItem v-if="route.name === 'invoices.view'" @click="copyPdfUrl">
      <BaseIcon
        name="LinkIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.copy_pdf_url') }}
    </BaseDropdownItem>
@ -38,29 +38,29 @@
      "
      :to="`/admin/invoices/${row.id}/view`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="EyeIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.view') }}
      </BaseDropdownItem>
    </router-link>

    <!-- Send Invoice Mail  -->
-    <BaseDropdownItem v-if="canSendInvoice(row)" v-slot="slotProps" @click="sendInvoice(row)">
+    <BaseDropdownItem v-if="canSendInvoice(row)" @click="sendInvoice(row)">
      <BaseIcon
        name="PaperAirplaneIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('invoices.send_invoice') }}
    </BaseDropdownItem>

    <!-- Resend Invoice -->
-    <BaseDropdownItem v-if="canReSendInvoice(row)" v-slot="slotProps" @click="sendInvoice(row)">
+    <BaseDropdownItem v-if="canReSendInvoice(row)" @click="sendInvoice(row)">
      <BaseIcon
        name="PaperAirplaneIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('invoices.resend_invoice') }}
    </BaseDropdownItem>
@ -69,21 +69,20 @@
    <router-link :to="`/admin/payments/${row.id}/create`">
      <BaseDropdownItem
        v-if="row.status == 'SENT' && route.name !== 'invoices.view'"
-        v-slot="slotProps"
      >
        <BaseIcon
          name="CreditCardIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('invoices.record_payment') }}
      </BaseDropdownItem>
    </router-link>

    <!-- Mark as sent Invoice -->
-    <BaseDropdownItem v-if="canSendInvoice(row)" v-slot="slotProps" @click="onMarkAsSent(row.id)">
+    <BaseDropdownItem v-if="canSendInvoice(row)" @click="onMarkAsSent(row.id)">
      <BaseIcon
        name="CheckCircleIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('invoices.mark_as_sent') }}
    </BaseDropdownItem>
@ -91,12 +90,11 @@
    <!-- Clone Invoice into new invoice  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
-      v-slot="slotProps"
      @click="cloneInvoiceData(row)"
    >
      <BaseIcon
        name="DocumentTextIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('invoices.clone_invoice') }}
    </BaseDropdownItem>
@ -104,12 +102,11 @@
    <!--  Delete Invoice  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_INVOICE)"
-      v-slot="slotProps"
      @click="removeInvoice(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/ItemIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/ItemIndexDropdown.vue
@ -12,8 +12,11 @@
      v-if="userStore.hasAbilities(abilities.EDIT_ITEM)"
      :to="`/admin/items/${row.id}/edit`"
    >
-      <BaseDropdownItem v-slot="slotProps">
-        <BaseIcon name="PencilIcon" :class="slotProps.class" />
+      <BaseDropdownItem>
+        <BaseIcon
+          name="PencilIcon"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
+        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
    </router-link>
@ -21,10 +24,12 @@
    <!-- delete item  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_ITEM)"
-      v-slot="slotProps"
      @click="removeItem(row.id)"
    >
-      <BaseIcon name="TrashIcon" :class="slotProps.class" />
+      <BaseIcon
+        name="TrashIcon"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
+      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
  </BaseDropdown>
--- a/resources/scripts/admin/components/dropdowns/NoteIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/NoteIndexDropdown.vue
@ -10,12 +10,11 @@
    <!-- edit note  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.MANAGE_NOTE)"
-      v-slot="slotProps"
      @click="editNote(row.id)"
    >
      <BaseIcon
        name="PencilIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.edit') }}
    </BaseDropdownItem>
@ -23,12 +22,11 @@
    <!-- delete note  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.MANAGE_NOTE)"
-      v-slot="slotProps"
      @click="removeNote(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/PaymentIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/PaymentIndexDropdown.vue
@ -8,31 +8,30 @@
    </template>

    <!-- Copy pdf url  -->
-    <BaseDropdownItem
+    <BaseDropdown-item
      v-if="
        route.name === 'payments.view' &&
        userStore.hasAbilities(abilities.VIEW_PAYMENT)
      "
-      v-slot="slotProps"
      class="rounded-md"
      @click="copyPdfUrl"
    >
      <BaseIcon
        name="LinkIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.copy_pdf_url') }}
-    </BaseDropdownItem>
+    </BaseDropdown-item>

    <!-- edit payment  -->
    <router-link
      v-if="userStore.hasAbilities(abilities.EDIT_PAYMENT)"
      :to="`/admin/payments/${row.id}/edit`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="PencilIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
@ -46,10 +45,10 @@
      "
      :to="`/admin/payments/${row.id}/view`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="EyeIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.view') }}
      </BaseDropdownItem>
@ -62,12 +61,11 @@
        route.name !== 'payments.view' &&
        userStore.hasAbilities(abilities.SEND_PAYMENT)
      "
-      v-slot="slotProps"
      @click="sendPayment(row)"
    >
      <BaseIcon
        name="PaperAirplaneIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('payments.send_payment') }}
    </BaseDropdownItem>
@ -75,12 +73,11 @@
    <!-- delete payment  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_PAYMENT)"
-      v-slot="slotProps"
      @click="removePayment(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/PaymentModeIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/PaymentModeIndexDropdown.vue
@ -8,19 +8,19 @@
    </template>

    <!-- edit paymentMode  -->
-    <BaseDropdownItem v-slot="slotProps"  @click="editPaymentMode(row.id)">
+    <BaseDropdownItem @click="editPaymentMode(row.id)">
      <BaseIcon
        name="PencilIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.edit') }}
    </BaseDropdownItem>

    <!-- delete paymentMode  -->
-    <BaseDropdownItem v-slot="slotProps"  @click="removePaymentMode(row.id)">
+    <BaseDropdownItem @click="removePaymentMode(row.id)">
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/RecurringInvoiceIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/RecurringInvoiceIndexDropdown.vue
@ -15,10 +15,10 @@
      v-if="userStore.hasAbilities(abilities.EDIT_RECURRING_INVOICE)"
      :to="`/admin/recurring-invoices/${row.id}/edit`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="PencilIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
@ -32,10 +32,10 @@
      "
      :to="`recurring-invoices/${row.id}/view`"
    >
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="EyeIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.view') }}
      </BaseDropdownItem>
@ -44,12 +44,11 @@
    <!-- Delete Recurring Invoice  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_RECURRING_INVOICE)"
-      v-slot="slotProps"
      @click="removeMultipleRecurringInvoices(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/RoleIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/RoleIndexDropdown.vue
@ -10,12 +10,11 @@
    <!-- edit role  -->
    <BaseDropdownItem
      v-if="userStore.currentUser.is_owner"
-      v-slot="slotProps"
      @click="editRole(row.id)"
    >
      <BaseIcon
        name="PencilIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.edit') }}
    </BaseDropdownItem>
@ -23,12 +22,11 @@
    <!-- delete role  -->
    <BaseDropdownItem
      v-if="userStore.currentUser.is_owner"
-      v-slot="slotProps"
      @click="removeRole(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/TaxTypeIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/TaxTypeIndexDropdown.vue
@ -10,12 +10,11 @@
    <!-- edit tax-type  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.EDIT_TAX_TYPE)"
-      v-slot="slotProps"
      @click="editTaxType(row.id)"
    >
      <BaseIcon
        name="PencilIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.edit') }}
    </BaseDropdownItem>
@ -23,12 +22,11 @@
    <!-- delete tax-type  -->
    <BaseDropdownItem
      v-if="userStore.hasAbilities(abilities.DELETE_TAX_TYPE)"
-      v-slot="slotProps"
      @click="removeTaxType(row.id)"
    >
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/dropdowns/UserIndexDropdown.vue
+++ b/resources/scripts/admin/components/dropdowns/UserIndexDropdown.vue
@ -9,20 +9,20 @@

    <!-- edit user  -->
    <router-link :to="`/admin/users/${row.id}/edit`">
-      <BaseDropdownItem v-slot="slotProps">
+      <BaseDropdownItem>
        <BaseIcon
          name="PencilIcon"
-          :class="slotProps.class"
+          class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
        />
        {{ $t('general.edit') }}
      </BaseDropdownItem>
    </router-link>

    <!-- delete user  -->
-    <BaseDropdownItem v-slot="slotProps" @click="removeUser(row.id)">
+    <BaseDropdownItem @click="removeUser(row.id)">
      <BaseIcon
        name="TrashIcon"
-        :class="slotProps.class"
+        class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
      />
      {{ $t('general.delete') }}
    </BaseDropdownItem>
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
@ -17,7 +17,18 @@
            <td class="px-5 py-4 text-left align-top">
              <div class="flex justify-start">
                <div
-                  class="flex items-center justify-center w-5 h-5 mt-2 mr-2 text-gray-300 cursor-move  handle"
+                  class="
+                    flex
+                    items-center
+                    justify-center
+                    w-5
+                    h-5
+                    mt-2
+                    text-gray-300
+                    cursor-move
+                    handle
+                    mr-2
+                  "
                >
                  <DragIcon />
                </div>
@ -97,7 +108,7 @@

                          <BaseIcon
                            name="ChevronDownIcon"
-                            class="w-4 h-4 ml-1 text-gray-500"
+                            class="w-4 h-4 text-gray-500 ml-1"
                          />
                        </span>
                      </BaseButton>
@ -144,7 +155,7 @@
              <BaseContentPlaceholders v-if="loading">
                <BaseContentPlaceholdersText
                  :lines="1"
-                  class="w-24 h-8 border rounded-md"
+                  class="w-24 h-8 rounded-md border"
                />
              </BaseContentPlaceholders>

@ -164,7 +175,6 @@
                :ability="abilities.CREATE_INVOICE"
                :store="store"
                :store-prop="storeProp"
-                :discount="discount"
                @update="updateTax"
              />
            </td>
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
@ -30,13 +30,24 @@
        <template v-if="userStore.hasAbilities(ability)" #action>
          <button
            type="button"
-            class="flex items-center justify-center w-full px-2 py-2 bg-gray-200 border-none outline-none cursor-pointer "
+            class="
+              flex
+              items-center
+              justify-center
+              w-full
+              px-2
+              cursor-pointer
+              py-2
+              bg-gray-200
+              border-none
+              outline-none
+            "
            @click="openTaxModal"
          >
            <BaseIcon name="CheckCircleIcon" class="h-5 text-primary-400" />

            <label
-              class="ml-2 text-sm leading-none cursor-pointer text-primary-400"
+              class="ml-2 text-sm leading-none text-primary-400 cursor-pointer"
              >{{ $t('invoices.add_new_tax') }}</label
            >
          </button>
@ -104,10 +115,6 @@ const props = defineProps({
    type: Number,
    default: 0,
  },
-  discountedTotal: {
-    type: Number,
-    default: 0,
-  },
  currency: {
    type: [Object, String],
    required: true,
@ -146,19 +153,19 @@ const filteredTypes = computed(() => {
 })

 const taxAmount = computed(() => {
-  if (localTax.compound_tax && props.discountedTotal) {
-    return ((props.discountedTotal + props.totalTax) * localTax.percent) / 100
+  if (localTax.compound_tax && props.total) {
+    return ((props.total + props.totalTax) * localTax.percent) / 100
  }

-  if (props.discountedTotal && localTax.percent) {
-    return (props.discountedTotal * localTax.percent) / 100
+  if (props.total && localTax.percent) {
+    return (props.total * localTax.percent) / 100
  }

  return 0
 })

 watch(
-  () => props.discountedTotal,
+  () => props.total,
  () => {
    updateRowTax()
  }
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateNotesField.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateNotesField.vue
@ -5,7 +5,7 @@
    >
      <SelectNotePopup :type="type" @select="onSelectNote" />
    </div>
-    <label class="text-gray-800 font-medium mb-4 text-sm dark:text-gray-300">
+    <label class="text-gray-800 font-medium mb-4 text-sm">
      {{ $t('invoices.notes') }}
    </label>
    <BaseCustomInput
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
@ -34,9 +34,7 @@
          items-center
          justify-center
          m-0
-          text-lg
-          text-black
-          dark:text-white
+          text-lg text-black
          uppercase
        "
      >
@ -73,9 +71,7 @@
          items-center
          justify-center
          m-0
-          text-lg
-          text-black
-          dark:text-white
+          text-lg text-black
          uppercase
        "
      >
@ -102,7 +98,7 @@
      <BaseContentPlaceholders v-if="isLoading">
        <BaseContentPlaceholdersText
          :lines="1"
-          class="w-24 h-8 border rounded-md"
+          class="w-24 h-8 rounded-md border"
        />
      </BaseContentPlaceholders>
      <div v-else class="flex" style="width: 140px" role="group">
@ -118,7 +114,7 @@
        <BaseDropdown position="bottom-end">
          <template #activator>
            <BaseButton
-              class="p-2 rounded-none rounded-tr-md rounded-br-md"
+              class="rounded-tr-md rounded-br-md p-2 rounded-none"
              type="button"
              variant="white"
            >
@ -131,7 +127,7 @@

                <BaseIcon
                  name="ChevronDownIcon"
-                  class="w-4 h-4 ml-1 text-gray-500"
+                  class="w-4 h-4 text-gray-500 ml-1"
                />
              </span>
            </BaseButton>
@ -208,7 +204,14 @@
      </BaseContentPlaceholders>
      <label
        v-else
-        class="flex items-center justify-center text-lg uppercase  text-primary-400"
+        class="
+          flex
+          items-center
+          justify-center
+          text-lg
+          uppercase
+          text-primary-400
+        "
      >
        <BaseFormatMoney :amount="store.getTotal" :currency="defaultCurrency" />
      </label>
@ -331,7 +334,6 @@ function selectPercentage() {

 function onSelectTax(selectedTax) {
  let amount = 0
-
  if (selectedTax.compound_tax && props.store.getSubtotalWithDiscount) {
    amount = Math.round(
      ((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) *
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateTotalTaxes.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateTotalTaxes.vue
@ -1,18 +1,9 @@
 <template>
  <div class="flex items-center justify-between w-full mt-2 text-sm">
-    <label class="font-semibold leading-5 text-gray-500 uppercase dark:text-gray-300">
+    <label class="font-semibold leading-5 text-gray-500 uppercase">
      {{ tax.name }} ({{ tax.percent }} %)
    </label>
-    <label
-      class="
-        flex
-        items-center
-        justify-center
-        text-lg
-        text-black
-        dark:text-white
-      "
-    >
+    <label class="flex items-center justify-center text-lg text-black">
      <BaseFormatMoney :amount="tax.amount" :currency="currency" />

      <BaseIcon
--- a/resources/scripts/admin/components/estimate-invoice-common/SelectTaxPopup.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/SelectTaxPopup.vue
@ -96,7 +96,6 @@
                          leading-tight
                          text-gray-700
                          cursor-pointer
-                          dark:text-gray-300
                        "
                      >
                        {{ taxType.name }}
@ -109,7 +108,6 @@
                          font-semibold
                          text-gray-700
                          cursor-pointer
-                          dark:text-gray-300
                        "
                      >
                        {{ taxType.percent }} %
--- a/resources/scripts/admin/components/estimate-invoice-common/SelectTemplateButton.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/SelectTemplateButton.vue
@ -1,6 +1,6 @@
 <template>
  <div>
-    <label class="flex text-gray-800 font-medium text-sm mb-2 dark:text-gray-300">
+    <label class="flex text-gray-800 font-medium text-sm mb-2">
      {{ $t('general.select_template') }}
      <span class="text-sm text-red-500"> *</span>
    </label>
--- a/resources/scripts/admin/components/modal-components/BackupModal.vue
+++ b/resources/scripts/admin/components/modal-components/BackupModal.vue
@ -57,7 +57,9 @@
          </BaseInputGroup>
        </BaseInputGrid>
      </div>
-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -82,7 +84,7 @@
          </template>
          {{ $t('general.create') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/CategoryModal.vue
+++ b/resources/scripts/admin/components/modal-components/CategoryModal.vue
@ -47,7 +47,15 @@
        </BaseInputGrid>
      </div>

-      <BaseModalFooter>
+      <div
+        class="
+          z-0
+          flex
+          justify-end
+          p-4
+          border-t border-gray-200 border-solid border-modal-bg
+        "
+      >
        <BaseButton
          type="button"
          variant="primary-outline"
@ -72,7 +80,7 @@
          </template>
          {{ categoryStore.isEdit ? $t('general.update') : $t('general.save') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/CompanyModal.vue
+++ b/resources/scripts/admin/components/modal-components/CompanyModal.vue
@ -48,24 +48,6 @@
            />
          </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')"
@ -116,7 +98,7 @@
        </BaseInputGrid>
      </div>

-       <BaseModalFooter>
+      <div class="z-0 flex justify-end p-4 bg-gray-50 border-modal-bg">
        <BaseButton
          class="mr-3 text-sm"
          variant="primary-outline"
@ -141,14 +123,14 @@
          </template>
          {{ $t('general.save') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>

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

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

-const slugValidator = (value) => {
-  return value == slugify(value)
-}
 const rules = {
  newCompanyForm: {
    name: {
@ -193,17 +171,6 @@ 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),
@ -276,7 +243,6 @@ async function submitCompanyData() {

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

@ -291,24 +257,4 @@ 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/components/modal-components/CustomerModal.vue
+++ b/resources/scripts/admin/components/modal-components/CustomerModal.vue
@ -122,7 +122,7 @@
          <BaseTab :title="$t('customers.portal_access')">
            <BaseInputGrid class="col-span-5 lg:col-span-4">
              <div class="md:col-span-2">
-                <p class="text-sm text-gray-500 dark:text-gray-300">
+                <p class="text-sm text-gray-500">
                  {{ $t('customers.portal_access_text') }}
                </p>

@ -425,7 +425,9 @@
        </BaseTabGroup>
      </div>

-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3 text-sm"
          type="button"
@ -445,7 +447,7 @@
          </template>
          {{ $t('general.save') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/DeleteCompanyModal.vue
+++ b/resources/scripts/admin/components/modal-components/DeleteCompanyModal.vue
@ -38,7 +38,7 @@
        </BaseInputGroup>
      </div>

-      <BaseModalFooter>
+      <div class="z-0 flex justify-end p-4 bg-gray-50 border-modal-bg">
        <BaseButton
          class="mr-3 text-sm"
          variant="primary-outline"
@ -63,7 +63,7 @@
          </template>
          {{ $t('general.delete') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue
+++ b/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue
@ -150,7 +150,9 @@
          @Remove="removeUsedSelectedCurrencies"
        />
      </div>
-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -177,7 +179,7 @@
            exchangeRateStore.isEdit ? $t('general.update') : $t('general.save')
          }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/FileDiskModal.vue
+++ b/resources/scripts/admin/components/modal-components/FileDiskModal.vue
@ -20,7 +20,15 @@
        @submit="createNewDisk"
      >
        <template #default="slotProps">
-          <BaseModalFooter>
+          <div
+            class="
+              z-0
+              flex
+              justify-end
+              p-4
+              border-t border-solid border-gray-light
+            "
+          >
            <BaseButton
              class="mr-3 text-sm"
              variant="primary-outline"
@ -44,7 +52,7 @@

              {{ $t('general.save') }}
            </BaseButton>
-          </BaseModalFooter>
+          </div>
        </template>
      </component>
    </div>
--- a/resources/scripts/admin/components/modal-components/ItemModal.vue
+++ b/resources/scripts/admin/components/modal-components/ItemModal.vue
@ -89,7 +89,9 @@
            </BaseInputGroup>
          </BaseInputGrid>
        </div>
-        <BaseModalFooter>
+        <div
+          class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+        >
          <BaseButton
            class="mr-3"
            variant="primary-outline"
@ -109,7 +111,7 @@
            </template>
            {{ itemStore.isEdit ? $t('general.update') : $t('general.save') }}
          </BaseButton>
-        </BaseModalFooter>
+        </div>
      </form>
    </div>
  </BaseModal>
--- a/resources/scripts/admin/components/modal-components/ItemUnitModal.vue
+++ b/resources/scripts/admin/components/modal-components/ItemUnitModal.vue
@ -31,7 +31,15 @@
        </BaseInputGroup>
      </div>

-      <BaseModalFooter>
+      <div
+        class="
+          z-0
+          flex
+          justify-end
+          p-4
+          border-t border-gray-200 border-solid border-modal-bg
+        "
+      >
        <BaseButton
          type="button"
          variant="primary-outline"
@ -58,7 +66,7 @@
            itemStore.isItemUnitEdit ? $t('general.update') : $t('general.save')
          }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/MailTestModal.vue
+++ b/resources/scripts/admin/components/modal-components/MailTestModal.vue
@ -62,7 +62,9 @@
          </BaseInputGroup>
        </BaseInputGrid>
      </div>
-     <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          variant="primary-outline"
          type="button"
@ -82,7 +84,7 @@
          </template>
          {{ $t('general.send') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/NoteModal.vue
+++ b/resources/scripts/admin/components/modal-components/NoteModal.vue
@ -63,7 +63,16 @@
          </BaseInputGroup>
        </BaseInputGrid>
      </div>
-     <BaseModalFooter>
+      <div
+        class="
+          z-0
+          flex
+          justify-end
+          px-4
+          py-4
+          border-t border-solid border-gray-light
+        "
+      >
        <BaseButton
          class="mr-2"
          variant="primary-outline"
@ -84,7 +93,7 @@
          </template>
          {{ noteStore.isEdit ? $t('general.update') : $t('general.save') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/PaymentModeModal.vue
+++ b/resources/scripts/admin/components/modal-components/PaymentModeModal.vue
@ -29,7 +29,9 @@
        </BaseInputGroup>
      </div>

-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          variant="primary-outline"
          class="mr-3"
@ -54,7 +56,7 @@
              : $t('general.save')
          }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/RolesModal.vue
+++ b/resources/scripts/admin/components/modal-components/RolesModal.vue
@ -72,7 +72,7 @@
        </div>
      </div>

-      <div class="border-t border-gray-200 dark:border-gray-600 py-3">
+      <div class="border-t border-gray-200 py-3">
        <div
          class="
            grid grid-cols-1
@ -89,7 +89,7 @@
            :key="gIndex"
            class="flex flex-col space-y-1"
          >
-            <p class="text-sm text-gray-500 dark:text-gray-200 border-b dark:border-gray-600 pb-1 mb-2">
+            <p class="text-sm text-gray-500 border-b border-gray-200 pb-1 mb-2">
              {{ gIndex }}
            </p>
            <div
@ -116,7 +116,15 @@
          </span>
        </div>
      </div>
-      <BaseModalFooter>
+      <div
+        class="
+          z-0
+          flex
+          justify-end
+          p-4
+          border-t border-solid border--200 border-modal-bg
+        "
+      >
        <BaseButton
          class="mr-3 text-sm"
          variant="primary-outline"
@ -136,7 +144,7 @@
          </template>
          {{ !roleStore.isEdit ? $t('general.save') : $t('general.update') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/SelectTemplateModal.vue
+++ b/resources/scripts/admin/components/modal-components/SelectTemplateModal.vue
@ -70,7 +70,7 @@
      </div>
    </div>

-    <BaseModalFooter>
+    <div class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid">
      <BaseButton class="mr-3" variant="primary-outline" @click="closeModal">
        {{ $t('general.cancel') }}
      </BaseButton>
@ -80,7 +80,7 @@
        </template>
        {{ $t('general.choose') }}
      </BaseButton>
-    </BaseModalFooter>
+    </div>
  </BaseModal>
 </template>

--- a/resources/scripts/admin/components/modal-components/SendEstimateModal.vue
+++ b/resources/scripts/admin/components/modal-components/SendEstimateModal.vue
@ -62,7 +62,9 @@
          </BaseInputGroup>
        </BaseInputGrid>
      </div>
-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -83,7 +85,7 @@
          <BaseIcon v-if="!isLoading" name="PhotographIcon" class="h-5 mr-2" />
          {{ $t('general.preview') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
    <div v-else>
      <div class="my-6 mx-4 border border-gray-200 relative">
@ -104,7 +106,9 @@
        ></iframe>
      </div>

-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -123,7 +127,7 @@
          <BaseIcon v-if="!isLoading" name="PaperAirplaneIcon" class="mr-2" />
          {{ $t('general.send') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </div>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/SendInvoiceModal.vue
+++ b/resources/scripts/admin/components/modal-components/SendInvoiceModal.vue
@ -65,7 +65,9 @@
          </BaseInputGroup>
        </BaseInputGrid>
      </div>
-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -91,7 +93,7 @@
          </template>
          {{ $t('general.preview') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
    <div v-else>
      <div class="my-6 mx-4 border border-gray-200 relative">
@ -112,7 +114,9 @@
          style="min-height: 500px"
        ></iframe>
      </div>
-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -136,7 +140,7 @@
          />
          {{ $t('general.send') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </div>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/SendPaymentModal.vue
+++ b/resources/scripts/admin/components/modal-components/SendPaymentModal.vue
@ -65,7 +65,9 @@
          </BaseInputGroup>
        </BaseInputGrid>
      </div>
-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -91,7 +93,7 @@
          </template>
          {{ $t('general.preview') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
    <div v-else>
      <div class="my-6 mx-4 border border-gray-200 relative">
@ -112,7 +114,9 @@
          style="min-height: 500px"
        ></iframe>
      </div>
-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3"
          variant="primary-outline"
@ -136,7 +140,7 @@
          />
          {{ $t('general.send') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </div>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/TaxTypeModal.vue
+++ b/resources/scripts/admin/components/modal-components/TaxTypeModal.vue
@ -90,7 +90,15 @@
          </BaseInputGroup>
        </BaseInputGrid>
      </div>
-      <BaseModalFooter>
+      <div
+        class="
+          z-0
+          flex
+          justify-end
+          p-4
+          border-t border-solid border--200 border-modal-bg
+        "
+      >
        <BaseButton
          class="mr-3 text-sm"
          variant="primary-outline"
@ -114,7 +122,7 @@
          </template>
          {{ taxTypeStore.isEdit ? $t('general.update') : $t('general.save') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/TaxationAddressModal.vue
+++ b/resources/scripts/admin/components/modal-components/TaxationAddressModal.vue
@ -87,7 +87,9 @@
        </BaseInputGrid>
      </div>

-      <BaseModalFooter>
+      <div
+        class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
+      >
        <BaseButton
          class="mr-3 text-sm"
          type="button"
@ -107,7 +109,7 @@
          </template>
          {{ $t('general.save') }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/custom-fields/CustomFieldModal.vue
+++ b/resources/scripts/admin/components/modal-components/custom-fields/CustomFieldModal.vue
@ -172,7 +172,15 @@
        </div>
      </div>

-      <BaseModalFooter>
+      <div
+        class="
+          z-0
+          flex
+          justify-end
+          p-4
+          border-t border-solid border-gray-light border-modal-bg
+        "
+      >
        <BaseButton
          class="mr-3"
          type="button"
@ -199,7 +207,7 @@
            !customFieldStore.isEdit ? $t('general.save') : $t('general.update')
          }}
        </BaseButton>
-      </BaseModalFooter>
+      </div>
    </form>
  </BaseModal>
 </template>
--- a/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue
@ -153,7 +153,7 @@
          <BaseSwitch v-model="set_as_default" class="flex" />
        </div>
        <div class="ml-4 right">
-          <p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
+          <p class="p-0 mb-1 text-base leading-snug text-black box-title">
            {{ $t('settings.disk.is_default') }}
          </p>
        </div>
--- a/resources/scripts/admin/components/modal-components/disks/DropboxDisk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/DropboxDisk.vue
@ -132,7 +132,7 @@
          <BaseSwitch v-model="set_as_default" class="flex" />
        </div>
        <div class="ml-4 right">
-          <p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
+          <p class="p-0 mb-1 text-base leading-snug text-black box-title">
            {{ $t('settings.disk.is_default') }}
          </p>
        </div>
--- a/resources/scripts/admin/components/modal-components/disks/LocalDisk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/LocalDisk.vue
@ -63,7 +63,7 @@
        </div>

        <div class="ml-4 right">
-          <p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
+          <p class="p-0 mb-1 text-base leading-snug text-black box-title">
            {{ $t('settings.disk.is_default') }}
          </p>
        </div>
--- a/resources/scripts/admin/components/modal-components/disks/S3Disk.vue
+++ b/resources/scripts/admin/components/modal-components/disks/S3Disk.vue
@ -134,7 +134,7 @@
          <BaseSwitch v-model="set_as_default" class="flex" />
        </div>
        <div class="ml-4 right">
-          <p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
+          <p class="p-0 mb-1 text-base leading-snug text-black box-title">
            {{ $t('settings.disk.is_default') }}
          </p>
        </div>
--- a/resources/scripts/admin/layouts/partials/TheSiteHeader.vue
+++ b/resources/scripts/admin/layouts/partials/TheSiteHeader.vue
@ -15,17 +15,8 @@
      bg-gradient-to-r
      from-primary-500
      to-primary-400
-      dark:from-gray-700/70 dark:to-gray-800/70
-      bg-primary-500
-      dark:bg-transparent
-      dark:backdrop-blur-xl
-      dark:shadow-glass
-      dark:border
-      dark:border-white/10
    "
  >
-    <BaseDarkHighlight />
-
    <router-link
      to="/admin/dashboard"
      class="
@ -62,7 +53,6 @@
        cursor-pointer
        md:hidden md:ml-0
        hover:bg-gray-100
-        dark:bg-gray-800 dark:border-gray-500 dark:border
      "
      @click.prevent="onToggle"
    >
@ -74,7 +64,7 @@
        v-if="hasCreateAbilities"
        class="relative hidden float-left m-0 md:block"
      >
-        <BaseDropdown width-class="w-48" >
+        <BaseDropdown width-class="w-48">
          <template #activator>
            <div
              class="
@ -88,21 +78,19 @@
                bg-white
                rounded
                md:h-9 md:w-9
-                dark:bg-gray-700 dark:border-gray-500 dark:border
              "
            >
-              <BaseIcon name="PlusIcon" class="w-5 h-5 text-gray-600 dark:text-white" />
+              <BaseIcon name="PlusIcon" class="w-5 h-5 text-gray-600" />
            </div>
          </template>

          <router-link to="/admin/invoices/create">
            <BaseDropdownItem
              v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
-              v-slot="slotProps"
            >
              <BaseIcon
                name="DocumentTextIcon"
-                :class="slotProps.class"
+                class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
                aria-hidden="true"
              />
              {{ $t('invoices.new_invoice') }}
@ -111,11 +99,10 @@
          <router-link to="/admin/estimates/create">
            <BaseDropdownItem
              v-if="userStore.hasAbilities(abilities.CREATE_ESTIMATE)"
-              v-slot="slotProps"
            >
              <BaseIcon
                name="DocumentIcon"
-                :class="slotProps.class"
+                class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
                aria-hidden="true"
              />
              {{ $t('estimates.new_estimate') }}
@ -125,11 +112,10 @@
          <router-link to="/admin/customers/create">
            <BaseDropdownItem
              v-if="userStore.hasAbilities(abilities.CREATE_CUSTOMER)"
-              v-slot="slotProps"
            >
              <BaseIcon
                name="UserIcon"
-                :class="slotProps.class"
+                class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
                aria-hidden="true"
              />
              {{ $t('customers.new_customer') }}
@ -157,25 +143,25 @@
          <template #activator>
            <img
              :src="previewAvatar"
-              class="block w-8 h-8 rounded md:h-9 md:w-9 object-cover"
+              class="block w-8 h-8 rounded md:h-9 md:w-9"
            />
          </template>

          <router-link to="/admin/settings/account-settings">
-            <BaseDropdownItem v-slot="slotProps">
+            <BaseDropdownItem>
              <BaseIcon
                name="CogIcon"
-                :class="slotProps.class"
+                class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
                aria-hidden="true"
              />
              {{ $t('navigation.settings') }}
            </BaseDropdownItem>
          </router-link>

-          <BaseDropdownItem v-slot="slotProps" @click="logout">
+          <BaseDropdownItem @click="logout">
            <BaseIcon
              name="LogoutIcon"
-              :class="slotProps.class"
+              class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
              aria-hidden="true"
            />
            {{ $t('navigation.logout') }}
--- a/resources/scripts/admin/layouts/partials/TheSiteSidebar.vue
+++ b/resources/scripts/admin/layouts/partials/TheSiteSidebar.vue
@ -15,9 +15,7 @@
        leave-from="opacity-100"
        leave-to="opacity-0"
      >
-        <DialogOverlay
-          class="fixed inset-0 bg-gray-600 bg-opacity-75 dark:bg-gray-900/90"
-        />
+        <DialogOverlay class="fixed inset-0 bg-gray-600 bg-opacity-75" />
      </TransitionChild>

      <TransitionChild
@ -29,9 +27,7 @@
        leave-from="translate-x-0"
        leave-to="-translate-x-full"
      >
-        <div
-          class="relative flex flex-col flex-1 w-full max-w-xs bg-white dark:bg-gray-800"
-        >
+        <div class="relative flex flex-col flex-1 w-full max-w-xs bg-white">
          <TransitionChild
            as="template"
            enter="ease-in-out duration-300"
@ -44,17 +40,18 @@
            <div class="absolute top-0 right-0 pt-2 -mr-12">
              <button
                class="
-                flex
-                items-center
-                justify-center
-                w-10
-                h-10
-                ml-1
-                rounded-full
-                focus:outline-none
-                focus:ring-2
-                focus:ring-inset
-                focus:ring-white"
+                  flex
+                  items-center
+                  justify-center
+                  w-10
+                  h-10
+                  ml-1
+                  rounded-full
+                  focus:outline-none
+                  focus:ring-2
+                  focus:ring-inset
+                  focus:ring-white
+                "
                @click="globalStore.setSidebarVisibility(false)"
              >
                <span class="sr-only">Close sidebar</span>
@ -85,8 +82,8 @@
                :to="item.link"
                :class="[
                  hasActiveUrl(item.link)
-                    ? 'text-primary-500 border-primary-500 bg-gray-100 dark:shadow-glass dark:backdrop-blur-xl dark:hover:bg-gray-700  dark:bg-gray-700/50 dark:text-primary-400 dark:font-medium'
-                    : 'text-black dark:text-gray-300',
+                    ? 'text-primary-500 border-primary-500 bg-gray-100 '
+                    : 'text-black',
                  'cursor-pointer px-0 pl-4 py-3 border-transparent flex items-center border-l-4 border-solid text-sm not-italic font-medium',
                ]"
                @click="globalStore.setSidebarVisibility(false)"
@ -103,10 +100,6 @@
                />
                {{ $t(item.title) }}
              </router-link>
-              <LightDarkSwitch
-                :show-label="false"
-                class="absolute right-6 top-6 !w-auto"
-              />
            </nav>
          </div>
        </div>
@ -120,16 +113,17 @@
  <!-- DESKTOP MENU -->
  <div
    class="
-    hidden
-    w-56
-    h-screen
-    bg-white
-    border-r border-gray-200 border-solid
-    xl:w-64
-    md:fixed md:flex md:flex-col md:inset-y-0
-    pt-16
-    dark:border-gray-800
-    dark:bg-gray-800/80"
+      hidden
+      w-56
+      h-screen
+      pb-32
+      overflow-y-auto
+      bg-white
+      border-r border-gray-200 border-solid
+      xl:w-64
+      md:fixed md:flex md:flex-col md:inset-y-0
+      pt-16
+    "
  >
    <div
      v-for="menu in globalStore.menuGroups"
@ -142,8 +136,8 @@
        :to="item.link"
        :class="[
          hasActiveUrl(item.link)
-            ? 'text-primary-500 border-primary-500 bg-gray-100 dark:border-primary-400 dark:shadow-glass dark:backdrop-blur-xl dark:hover:bg-gray-700 dark:bg-gray-700/50 dark:text-primary-400 dark:font-medium'
-            : 'text-black dark:hover:bg-transparent dark:hover:text-white dark:text-gray-300',
+            ? 'text-primary-500 border-primary-500 bg-gray-100 '
+            : 'text-black',
          'cursor-pointer px-0 pl-6 hover:bg-gray-50 py-3 group flex items-center border-l-4 border-solid border-transparent text-sm not-italic font-medium',
        ]"
      >
@ -151,8 +145,8 @@
          :name="item.icon"
          :class="[
            hasActiveUrl(item.link)
-              ? 'text-primary-500 group-hover:text-primary-500 dark:text-primary-400 dark:group-hover:text-primary-500 '
-              : 'text-gray-400 group-hover:text-black dark:text-gray-400 dark:group-hover:text-white',
+              ? 'text-primary-500 group-hover:text-primary-500 '
+              : 'text-gray-400 group-hover:text-black',
            'mr-4 shrink-0 h-5 w-5 ',
          ]"
        />
@ -160,9 +154,6 @@
        {{ $t(item.title) }}
      </router-link>
    </div>
-    <LightDarkSwitch
-      class="absolute bottom-0 py-4 border-t border-gray-200 dark:border-gray-700"
-    />
  </div>
 </template>

@ -178,7 +169,6 @@ import {

 import { useRoute } from 'vue-router'
 import { useGlobalStore } from '@/scripts/admin/stores/global'
-import LightDarkSwitch from '@/scripts/components/LightDarkSwitcher.vue'

 const route = useRoute()
 const globalStore = useGlobalStore()
--- a/resources/scripts/admin/stores/company.js
+++ b/resources/scripts/admin/stores/company.js
@ -184,20 +184,6 @@ 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/stores/global.js
+++ b/resources/scripts/admin/stores/global.js
@ -34,7 +34,6 @@ export const useGlobalStore = (useWindow = false) => {
      isAppLoaded: false,
      isSidebarOpen: false,
      areCurrenciesLoading: false,
-      isDarkModeOn: false,

      downloadReport: null,
    }),
@ -71,8 +70,8 @@ export const useGlobalStore = (useWindow = false) => {
              moduleStore.apiToken = response.data.global_settings.api_token
              moduleStore.enableModules = response.data.modules

-              // company store
-              companyStore.companies = response.data.companies
+                // company store
+                companyStore.companies = response.data.companies
              companyStore.selectedCompany = response.data.current_company
              companyStore.setSelectedCompany(response.data.current_company)
              companyStore.selectedCompanySettings =
--- a/resources/scripts/admin/views/customers/Create.vue
+++ b/resources/scripts/admin/views/customers/Create.vue
@ -171,7 +171,7 @@

          <BaseInputGrid class="col-span-5 lg:col-span-4">
            <div class="md:col-span-2">
-              <p class="text-sm text-gray-500 dark:text-gray-300">
+              <p class="text-sm text-gray-500">
                {{ $t('customers.portal_access_text') }}
              </p>

--- a/resources/scripts/admin/views/customers/partials/CustomerInfo.vue
+++ b/resources/scripts/admin/views/customers/partials/CustomerInfo.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="pt-6 mt-5 border-t border-solid lg:pt-8 md:pt-4 border-gray-200 dark:border-gray-600">
+  <div class="pt-6 mt-5 border-t border-solid lg:pt-8 md:pt-4 border-gray-200">
    <!-- Basic Info -->
    <BaseHeading>
      {{ $t('customers.basic_info') }}
--- a/resources/scripts/admin/views/dashboard/DashboardChart.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardChart.vue
@ -2,23 +2,8 @@
  <div>
    <div
      v-if="dashboardStore.isDashboardDataLoaded"
-      class="
-        grid
-        grid-cols-10
-        mt-8
-        bg-white
-        rounded shadow
-        dark:text-white
-        dark:backdrop-blur-xl
-        dark:shadow-glass
-        dark:border
-        dark:bg-opacity-70
-        dark:border-white/10
-        dark:bg-gray-800
-        relative
-      "
+      class="grid grid-cols-10 mt-8 bg-white rounded shadow"
    >
-      <BaseDarkHighlight />
      <!-- Chart -->
      <div
        class="
@ -69,7 +54,6 @@
          lg:border-t-0 lg:text-right lg:col-span-3
          xl:col-span-2
          lg:grid-cols-1
-          dark:border-white/10
        "
      >
        <div class="p-6">
@ -112,7 +96,15 @@
          </span>
          <br />
          <span
-            class="block mt-1 text-xl font-semibold leading-8 lg:text-2xl text-red-400"
+            class="
+              block
+              mt-1
+              text-xl
+              font-semibold
+              leading-8
+              lg:text-2xl
+              text-red-400
+            "
          >
            <BaseFormatMoney
              :amount="dashboardStore.totalExpenses"
@ -124,10 +116,8 @@
          class="
            col-span-3
            p-6
-            border-t
-            border-gray-200 border-solid
+            border-t border-gray-200 border-solid
            lg:col-span-1
-            dark:border-white/10
          "
        >
          <span class="text-xs leading-5 lg:text-sm">
@ -142,7 +132,7 @@
              font-semibold
              leading-8
              lg:text-2xl
-              text-primary-500 dark:text-primary-400
+              text-primary-500
            "
          >
            <BaseFormatMoney
--- a/resources/scripts/admin/views/dashboard/DashboardChartPlaceholder.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardChartPlaceholder.vue
@ -1,6 +1,6 @@
 <template>
  <BaseContentPlaceholders
-    class="grid grid-cols-10 mt-8 bg-white rounded shadow dark:bg-gray-800"
+    class="grid grid-cols-10 mt-8 bg-white rounded shadow"
  >
    <!-- Chart -->
    <div
@ -29,7 +29,6 @@
        text-center
        border-t border-l border-gray-200 border-solid
        lg:border-t-0 lg:text-right lg:col-span-3
-        dark:border-gray-600
        xl:col-span-2
        lg:grid-cols-1
      "
@ -78,7 +77,6 @@
          col-span-3
          p-6
          border-t border-gray-200 border-solid
-          dark:border-gray-600
          lg:justify-end lg:items-end lg:col-span-1
        "
      >
--- a/resources/scripts/admin/views/dashboard/DashboardStatsItem.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardStatsItem.vue
@ -12,24 +12,18 @@
      hover:bg-gray-50
      xl:p-4
      lg:col-span-2
-      dark:backdrop-blur-xl
-      dark:shadow-glass
-      dark:border
-      dark:border-white/10
-      dark:bg-gray-800/70
    "
    :class="{ 'lg:!col-span-3': large }"
    :to="route"
  >
    <div>
-      <span class="text-xl font-semibold leading-tight text-black xl:text-3xl dark:text-white">
+      <span class="text-xl font-semibold leading-tight text-black xl:text-3xl">
        <slot />
      </span>
-      <span class="block mt-1 text-sm leading-tight text-gray-500 xl:text-lg dark:text-gray-300">
+      <span class="block mt-1 text-sm leading-tight text-gray-500 xl:text-lg">
        {{ label }}
      </span>
    </div>
-    <BaseDarkHighlight class="!bg-highlight/[.17] !top-5" />
    <div class="flex items-center">
      <component :is="iconComponent" class="w-10 h-10 xl:w-12 xl:h-12" />
    </div>
--- a/resources/scripts/admin/views/dashboard/DashboardStatsPlaceholder.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardStatsPlaceholder.vue
@ -1,7 +1,7 @@
 <template>
  <BaseContentPlaceholders
    :rounded="true"
-    class="relative flex justify-between w-full p-3 bg-white rounded shadow lg:col-span-3 xl:p-4 dark:bg-gray-800"
+    class="relative flex justify-between w-full p-3 bg-white rounded shadow lg:col-span-3 xl:p-4"
  >
    <div>
      <BaseContentPlaceholdersText
--- a/resources/scripts/admin/views/dashboard/DashboardStatsSmPlaceholder.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardStatsSmPlaceholder.vue
@ -12,7 +12,6 @@
      shadow
      lg:col-span-2
      xl:p-4
-      dark:bg-gray-800
    "
  >
    <div>
--- a/resources/scripts/admin/views/estimates/Index.vue
+++ b/resources/scripts/admin/views/estimates/Index.vue
@ -130,7 +130,6 @@
          mt-5
          list-none
          border-b-2 border-gray-200 border-solid
-          dark:border-gray-600
        "
      >
        <!-- Tabs -->
--- a/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue
+++ b/resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue
@ -32,8 +32,6 @@
          :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,24 +34,6 @@
          />
        </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="
@ -75,7 +57,9 @@
            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"
@ -160,9 +144,9 @@
 </template>

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

 const companyForm = reactive({
  name: null,
-  slug: null,
  address: {
    address_street_1: '',
    address_street_2: '',
@ -205,28 +188,10 @@ 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: {
@ -284,24 +249,4 @@ 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="invoiceStatus"
+          :options="status"
          searchable
          :placeholder="$t('general.select_a_status')"
          @update:modelValue="setActiveTab"
@ -127,31 +127,14 @@
          mt-5
          list-none
          border-b-2 border-gray-200 border-solid
-          dark:border-gray-600
        "
      >
        <!-- Tabs -->
-        <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 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>

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

-const invoiceStatus = ref([
+const status = ref([
  {
    label: 'Status',
-    options: ['DRAFT', 'SENT', 'VIEWED', 'COMPLETED'],
+    options: ['DRAFT', 'DUE', 'SENT', 'VIEWED', 'COMPLETED'],
  },
  {
    label: 'Paid Status',
@ -317,29 +300,10 @@ const invoiceStatus = 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: '',
@ -347,7 +311,6 @@ let filters = reactive({
  from_date: '',
  to_date: '',
  invoice_number: '',
-  tab_status: '',
 })

 const showEmptyScreen = computed(
@ -438,7 +401,6 @@ 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,
@ -461,9 +423,29 @@ async function fetchData({ page, filter, sort }) {
  }
 }

-function changeTabStatus(val, index) {
-  filters.tab_status = val['tab-status']
-  selectedIndex.value = index
+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 setFilters() {
@ -481,6 +463,8 @@ function clearFilter() {
  filters.from_date = ''
  filters.to_date = ''
  filters.invoice_number = ''
+
+  activeTab.value = t('general.all')
 }

 async function removeMultipleInvoices() {
@ -521,21 +505,39 @@ function toggleFilter() {
 function setActiveTab(val) {
  switch (val) {
    case 'DRAFT':
-      selectedIndex.value = 1
+      activeTab.value = t('general.draft')
+      break
+    case 'SENT':
+      activeTab.value = t('general.sent')
+      break
+
+    case 'DUE':
+      activeTab.value = t('general.due')
      break

-    case 'SENT':
-    case 'VIEWED':
    case 'COMPLETED':
+      activeTab.value = t('invoices.completed')
+      break
+
    case 'PAID':
-      selectedIndex.value = 2
+      activeTab.value = t('invoices.paid')
      break

    case 'UNPAID':
+      activeTab.value = t('invoices.unpaid')
+      break
+
    case 'PARTIALLY_PAID':
-      selectedIndex.value = 3
+      activeTab.value = t('invoices.partially_paid')
+      break
+
+    case 'VIEWED':
+      activeTab.value = t('invoices.viewed')
+      break
+
+    default:
+      activeTab.value = t('general.all')
      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,8 +32,6 @@
          :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/modules/Index.vue
+++ b/resources/scripts/admin/views/modules/Index.vue
@ -53,7 +53,7 @@
          </div>
        </div>
        <div v-else class="mt-24">
-          <label class="flex items-center justify-center text-gray-500 dark:text-gray-300">
+          <label class="flex items-center justify-center text-gray-500">
            {{ $t('modules.no_modules_installed') }}
          </label>
        </div>
@ -61,10 +61,10 @@
    </div>

    <BaseCard v-else class="mt-6">
-      <h6 class="text-gray-900 text-lg font-medium dark:text-white">
+      <h6 class="text-gray-900 text-lg font-medium">
        {{ $t('modules.connect_installation') }}
      </h6>
-      <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
+      <p class="mt-1 text-sm text-gray-500">
        {{
          $t('modules.api_token_description', {
            url: globalStore.config.base_url.replace(/^http:\/\//, ''),
--- 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
@ -215,7 +215,7 @@
            <SelectNotePopup type="Payment" @select="onSelectNote" />
          </div>

-          <label class="mb-4 text-sm font-medium text-gray-800 dark:text-gray-300">
+          <label class="mb-4 text-sm font-medium text-gray-800">
            {{ $t('estimates.notes') }}
          </label>

@ -423,7 +423,7 @@ function onCustomerChange(customer_id) {
  if (customer_id) {
    let data = {
      customer_id: customer_id,
-      tab_status: 'DUE',
+      status: 'DUE',
      limit: 'all',
    }

@ -446,11 +446,7 @@ 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/recurring-invoices/Index.vue
+++ b/resources/scripts/admin/views/recurring-invoices/Index.vue
@ -121,7 +121,6 @@
          mt-5
          list-none
          border-b-2 border-gray-200 border-solid
-          dark:border-gray-600
        "
      >
        <!-- Tabs -->
--- a/resources/scripts/admin/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
+++ b/resources/scripts/admin/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
@ -16,11 +16,11 @@
      </div>

      <div class="ml-2">
-        <p class="p-0 mb-1 leading-snug text-left text-black dark:text-white">
+        <p class="p-0 mb-1 leading-snug text-left text-black">
          {{ $t('recurring_invoices.send_automatically') }}
        </p>
        <p
-          class="p-0 m-0 text-xs leading-tight text-left text-gray-500 dark:text-gray-400"
+          class="p-0 m-0 text-xs leading-tight text-left text-gray-500"
          style="max-width: 480px"
        >
          {{ $t('recurring_invoices.send_automatically_desc') }}
--- a/resources/scripts/admin/views/settings/BackupSetting.vue
+++ b/resources/scripts/admin/views/settings/BackupSetting.vue
@ -51,14 +51,14 @@
            </div>
          </template>

-          <BaseDropdownItem v-slot="slotProps" @click="onDownloadBckup(row.data)">
-            <BaseIcon name="CloudDownloadIcon" :class="slotProps.class" />
+          <BaseDropdownItem @click="onDownloadBckup(row.data)">
+            <BaseIcon name="CloudDownloadIcon" class="mr-3 text-gray-600" />

            {{ $t('general.download') }}
          </BaseDropdownItem>

-          <BaseDropdownItem v-slot="slotProps" @click="onRemoveBackup(row.data)">
-            <BaseIcon name="TrashIcon" :class="slotProps.class" />
+          <BaseDropdownItem @click="onRemoveBackup(row.data)">
+            <BaseIcon name="TrashIcon" class="mr-3 text-gray-600" />
            {{ $t('general.delete') }}
          </BaseDropdownItem>
        </BaseDropdown>
--- a/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
+++ b/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
@ -28,19 +28,6 @@
          />
        </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>
@ -113,10 +100,10 @@

      <div v-if="companyStore.companies.length !== 1" class="py-5">
        <BaseDivider class="my-4" />
-        <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">
+        <h3 class="text-lg leading-6 font-medium text-gray-900">
          {{ $tc('settings.company_info.delete_company') }}
        </h3>
-        <div class="mt-2 max-w-xl text-sm text-gray-500 dark:text-gray-400">
+        <div class="mt-2 max-w-xl text-sm text-gray-500">
          <p>
            {{ $tc('settings.company_info.delete_company_description') }}
          </p>
@ -173,7 +160,6 @@ let isSaving = ref(false)

 const companyForm = reactive({
  name: null,
-  slug: null,
  logo: null,
  address: {
    address_street_1: '',
@ -207,14 +193,7 @@ const rules = computed(() => {
    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 }),
+        t('validation.name_min_length'),
        minLength(3)
      ),
    },
--- a/resources/scripts/admin/views/settings/CustomFieldsSetting.vue
+++ b/resources/scripts/admin/views/settings/CustomFieldsSetting.vue
@ -27,7 +27,7 @@
    >
      <template #cell-name="{ row }">
        {{ row.data.name }}
-        <span class="text-xs text-gray-500 dark:text-gray-400"> ({{ row.data.slug }})</span>
+        <span class="text-xs text-gray-500"> ({{ row.data.slug }})</span>
      </template>

      <template #cell-is_required="{ row }">
@ -60,7 +60,7 @@
        <CustomFieldDropdown
          :row="row.data"
          :table="table"
-          :load-data="refreshTable" 
+          :load-data="refreshTable"
        />
      </template>
    </BaseTable>
--- a/resources/scripts/admin/views/settings/ExchangeRateProviderSetting.vue
+++ b/resources/scripts/admin/views/settings/ExchangeRateProviderSetting.vue
@ -7,7 +7,7 @@
          {{ $t('settings.menu_title.exchange_rate') }}
        </h6>
        <p
-          class="mt-2 text-sm leading-snug text-left text-gray-500 dark:text-gray-400"
+          class="mt-2 text-sm leading-snug text-left text-gray-500"
          style="max-width: 680px"
        >
          {{ $t('settings.exchange_rate.providers_description') }}
--- a/Show More
+++ b/Show More