Bump symfony/http-kernel from 5.4.9 to 5.4.20

Bumps [symfony/http-kernel](https://github.com/symfony/http-kernel) from 5.4.9 to 5.4.20. - [Release notes](https://github.com/symfony/http-kernel/releases) - [Changelog](https://github.com/symfony/http-kernel/blob/6.2/CHANGELOG.md) - [Commits](https://github.com/symfony/http-kernel/compare/v5.4.9...v5.4.20) --- updated-dependencies: - dependency-name: symfony/http-kernel dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Fix incorrect invoice creation message (#1109 )
2025-10-28 20:21:10 -04:00 · 2023-02-02 01:53:13 +00:00 · 2022-12-17 18:20:51 +05:30 · 2022-12-17 18:19:49 +05:30
70 changed files with 1812 additions and 1759 deletions
--- a/.github/workflows/uffizzi-build.yml
+++ b/.github/workflows/uffizzi-build.yml
@ -14,8 +14,6 @@ jobs:
    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
@ -33,11 +31,10 @@ jobs:
          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:
+    needs: 
+      - build-application
    name: Build and Push `nginx`
    runs-on: ubuntu-latest
    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
@ -65,6 +62,8 @@ jobs:
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          file: ./uffizzi/nginx/Dockerfile
+          build-args: |
+            BASE_IMAGE=${{ needs.build-application.outputs.tags }}
          cache-from: type=gha
          cache-to: type=gha,mode=max

--- a/app/Console/Commands/CreateTemplateCommand.php
+++ b/app/Console/Commands/CreateTemplateCommand.php
@ -55,7 +55,7 @@ class CreateTemplateCommand extends Command
        copy(public_path("/build/img/PDF/{$type}1.png"), public_path("/build/img/PDF/{$templateName}.png"));
        copy(resource_path("/static/img/PDF/{$type}1.png"), resource_path("/static/img/PDF/{$templateName}.png"));

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

--- a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
+++ b/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
@ -103,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/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.lock
+++ b/composer.lock
@ -4390,25 +4390,30 @@
        },
        {
            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
+            "version": "1.6.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
                "shasum": ""
            },
            "require": {
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                "phpdocumentor/reflection-common": "^2.0"
            },
            "require-dev": {
                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^9.5",
+                "rector/rector": "^0.13.9",
+                "vimeo/psalm": "^4.25"
            },
            "type": "library",
            "extra": {
@ -4434,9 +4439,9 @@
            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
            "support": {
                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
            },
-            "time": "2022-03-15T21:29:03+00:00"
+            "time": "2022-10-14T12:47:21+00:00"
        },
        {
            "name": "phpoption/phpoption",
@ -7666,7 +7671,7 @@
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
@ -7713,7 +7718,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
            },
            "funding": [
                {
@ -7733,16 +7738,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v5.4.9",
+            "version": "v5.4.19",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c116cda1f51c678782768dce89a45f13c949455d"
+                "reference": "438ef3e5e6481244785da3ce8cf8f4e74e7f2822"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d",
-                "reference": "c116cda1f51c678782768dce89a45f13c949455d",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/438ef3e5e6481244785da3ce8cf8f4e74e7f2822",
+                "reference": "438ef3e5e6481244785da3ce8cf8f4e74e7f2822",
                "shasum": ""
            },
            "require": {
@ -7784,7 +7789,7 @@
            "description": "Provides tools to manage errors and ease debugging PHP code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v5.4.9"
+                "source": "https://github.com/symfony/error-handler/tree/v5.4.19"
            },
            "funding": [
                {
@ -7800,20 +7805,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-21T13:57:48+00:00"
+            "time": "2023-01-01T08:32:19+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v6.0.9",
+            "version": "v6.0.19",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "5c85b58422865d42c6eb46f7693339056db098a8"
+                "reference": "2eaf8e63bc5b8cefabd4a800157f0d0c094f677a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5c85b58422865d42c6eb46f7693339056db098a8",
-                "reference": "5c85b58422865d42c6eb46f7693339056db098a8",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2eaf8e63bc5b8cefabd4a800157f0d0c094f677a",
+                "reference": "2eaf8e63bc5b8cefabd4a800157f0d0c094f677a",
                "shasum": ""
            },
            "require": {
@ -7867,7 +7872,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.9"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.19"
            },
            "funding": [
                {
@ -7883,11 +7888,11 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-05T16:45:52+00:00"
+            "time": "2023-01-01T08:36:10+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
@ -7946,7 +7951,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.1"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
            },
            "funding": [
                {
@ -8029,16 +8034,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v5.4.9",
+            "version": "v5.4.20",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522"
+                "reference": "d0435363362a47c14e9cf50663cb8ffbf491875a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522",
-                "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0435363362a47c14e9cf50663cb8ffbf491875a",
+                "reference": "d0435363362a47c14e9cf50663cb8ffbf491875a",
                "shasum": ""
            },
            "require": {
@ -8050,8 +8055,11 @@
            "require-dev": {
                "predis/predis": "~1.0",
                "symfony/cache": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/mime": "^4.4|^5.0|^6.0"
+                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
+                "symfony/mime": "^4.4|^5.0|^6.0",
+                "symfony/rate-limiter": "^5.2|^6.0"
            },
            "suggest": {
                "symfony/mime": "To use the file extension guesser"
@ -8082,7 +8090,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.4.9"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.4.20"
            },
            "funding": [
                {
@ -8098,20 +8106,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-17T15:07:29+00:00"
+            "time": "2023-01-29T11:11:52+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.4.9",
+            "version": "v5.4.20",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8"
+                "reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/34b121ad3dc761f35fe1346d2f15618f8cbf77f8",
-                "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aaeec341582d3c160cc9ecfa8b2419ba6c69954e",
+                "reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e",
                "shasum": ""
            },
            "require": {
@ -8194,7 +8202,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.4.9"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.4.20"
            },
            "funding": [
                {
@ -8210,20 +8218,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-27T07:09:08+00:00"
+            "time": "2023-02-01T08:18:48+00:00"
        },
        {
            "name": "symfony/mime",
-            "version": "v5.4.9",
+            "version": "v5.4.19",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e"
+                "reference": "a858429a9c704edc53fe057228cf9ca282ba48eb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e",
-                "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/a858429a9c704edc53fe057228cf9ca282ba48eb",
+                "reference": "a858429a9c704edc53fe057228cf9ca282ba48eb",
                "shasum": ""
            },
            "require": {
@ -8237,15 +8245,16 @@
                "egulias/email-validator": "~3.0.0",
                "phpdocumentor/reflection-docblock": "<3.2.2",
                "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<4.4"
+                "symfony/mailer": "<4.4",
+                "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6"
            },
            "require-dev": {
-                "egulias/email-validator": "^2.1.10|^3.1",
+                "egulias/email-validator": "^2.1.10|^3.1|^4",
                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
                "symfony/property-access": "^4.4|^5.1|^6.0",
                "symfony/property-info": "^4.4|^5.1|^6.0",
-                "symfony/serializer": "^5.2|^6.0"
+                "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6"
            },
            "type": "library",
            "autoload": {
@ -8277,7 +8286,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.4.9"
+                "source": "https://github.com/symfony/mime/tree/v5.4.19"
            },
            "funding": [
                {
@ -8293,20 +8302,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-21T10:24:18+00:00"
+            "time": "2023-01-09T05:43:46+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                "shasum": ""
            },
            "require": {
@ -8321,7 +8330,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -8359,7 +8368,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
            },
            "funding": [
                {
@ -8375,7 +8384,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-iconv",
@ -8462,16 +8471,16 @@
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "433d05519ce6990bf3530fba6957499d327395c2"
+                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
-                "reference": "433d05519ce6990bf3530fba6957499d327395c2",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
+                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
                "shasum": ""
            },
            "require": {
@ -8483,7 +8492,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -8523,7 +8532,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
            },
            "funding": [
                {
@ -8539,20 +8548,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8"
+                "reference": "639084e360537a19f9ee352433b84ce831f3d2da"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
-                "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da",
+                "reference": "639084e360537a19f9ee352433b84ce831f3d2da",
                "shasum": ""
            },
            "require": {
@ -8566,7 +8575,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -8610,7 +8619,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0"
            },
            "funding": [
                {
@ -8626,20 +8635,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
+                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
                "shasum": ""
            },
            "require": {
@ -8651,7 +8660,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -8694,7 +8703,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
            },
            "funding": [
                {
@ -8710,20 +8719,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                "shasum": ""
            },
            "require": {
@ -8738,7 +8747,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -8777,7 +8786,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
            },
            "funding": [
                {
@ -8793,20 +8802,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-php72",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
+                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
-                "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
+                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
                "shasum": ""
            },
            "require": {
@ -8815,7 +8824,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -8853,7 +8862,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
            },
            "funding": [
                {
@ -8869,20 +8878,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-php73",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
+                "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
-                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
+                "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
                "shasum": ""
            },
            "require": {
@ -8891,7 +8900,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -8932,7 +8941,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0"
            },
            "funding": [
                {
@ -8948,20 +8957,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
                "shasum": ""
            },
            "require": {
@ -8970,7 +8979,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -9015,7 +9024,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
            },
            "funding": [
                {
@ -9031,7 +9040,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-10T07:21:04+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-php81",
@ -9266,16 +9275,16 @@
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v2.5.1",
+            "version": "v2.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
-                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
                "shasum": ""
            },
            "require": {
@ -9329,7 +9338,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
            },
            "funding": [
                {
@ -9345,20 +9354,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-13T20:07:29+00:00"
+            "time": "2022-05-30T19:17:29+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v6.0.9",
+            "version": "v6.0.19",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "df9f03d595aa2d446498ba92fe803a519b2c43cc"
+                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/df9f03d595aa2d446498ba92fe803a519b2c43cc",
-                "reference": "df9f03d595aa2d446498ba92fe803a519b2c43cc",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a",
+                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a",
                "shasum": ""
            },
            "require": {
@ -9414,7 +9423,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.9"
+                "source": "https://github.com/symfony/string/tree/v6.0.19"
            },
            "funding": [
                {
@ -9430,7 +9439,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-22T08:18:02+00:00"
+            "time": "2023-01-01T08:36:10+00:00"
        },
        {
            "name": "symfony/translation",
@ -9529,16 +9538,16 @@
        },
        {
            "name": "symfony/translation-contracts",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "c4183fc3ef0f0510893cbeedc7718fb5cafc9ac9"
+                "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/c4183fc3ef0f0510893cbeedc7718fb5cafc9ac9",
-                "reference": "c4183fc3ef0f0510893cbeedc7718fb5cafc9ac9",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282",
+                "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282",
                "shasum": ""
            },
            "require": {
@ -9587,7 +9596,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.0.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.0.2"
            },
            "funding": [
                {
@ -9603,20 +9612,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2022-06-27T17:10:44+00:00"
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v5.4.9",
+            "version": "v5.4.19",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "af52239a330fafd192c773795520dc2dd62b5657"
+                "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657",
-                "reference": "af52239a330fafd192c773795520dc2dd62b5657",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b",
+                "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b",
                "shasum": ""
            },
            "require": {
@ -9676,7 +9685,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.9"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.19"
            },
            "funding": [
                {
@ -9692,7 +9701,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-21T10:24:18+00:00"
+            "time": "2023-01-16T10:52:33+00:00"
        },
        {
            "name": "theseer/tokenizer",
@ -11856,5 +11865,5 @@
        "php": "^7.4 || ^8.0"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }
--- 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",
@ -48,8 +48,7 @@
    "mini-svg-data-uri": "^1.3.3",
    "moment": "^2.29.1",
    "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/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/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
@ -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,13 +15,6 @@
      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
    "
  >
    <router-link
@ -60,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"
    >
--- 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"
@ -54,7 +50,8 @@
                  focus:outline-none
                  focus:ring-2
                  focus:ring-inset
-                focus:ring-white"
+                  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>
@ -123,13 +116,14 @@
      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
-    dark:border-gray-800
-    dark:bg-gray-800/80"
+    "
  >
    <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,
    }),
--- 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"
@ -130,27 +130,11 @@
        "
      >
        <!-- 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
@ -305,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',
@ -316,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: '',
@ -346,7 +311,6 @@ let filters = reactive({
  from_date: '',
  to_date: '',
  invoice_number: '',
-  tab_status: '',
 })

 const showEmptyScreen = computed(
@ -437,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,
@ -460,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() {
@ -480,6 +463,8 @@ function clearFilter() {
  filters.from_date = ''
  filters.to_date = ''
  filters.invoice_number = ''
+
+  activeTab.value = t('general.all')
 }

 async function removeMultipleInvoices() {
@ -520,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/payments/Create.vue
+++ b/resources/scripts/admin/views/payments/Create.vue
@ -82,9 +82,9 @@
            required
          >
            <BaseCustomerSelectInput
-              v-if="!isLoadingContent"
              v-model="paymentStore.currentPayment.customer_id"
              :content-loading="isLoadingContent"
+              v-if="!isLoadingContent"
              :invalid="v$.currentPayment.customer_id.$error"
              :placeholder="$t('customers.select_a_customer')"
              show-action
@ -423,7 +423,7 @@ function onCustomerChange(customer_id) {
  if (customer_id) {
    let data = {
      customer_id: customer_id,
-      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/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>
@ -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/PreferencesSetting.vue
+++ b/resources/scripts/admin/views/settings/PreferencesSetting.vue
@ -8,11 +8,7 @@
        <BaseInputGroup
          :content-loading="isFetchingInitialData"
          :label="$tc('settings.preferences.currency')"
-          :help-text="
-            isCurrencyDisabled
-              ? $t('settings.preferences.company_currency_unchangeable')
-              : ''
-          "
+          :help-text="$t('settings.preferences.company_currency_unchangeable')"
          :error="v$.currency.$error && v$.currency.$errors[0].$message"
          required
        >
@ -25,7 +21,7 @@
            :searchable="true"
            track-by="name"
            :invalid="v$.currency.$error"
-            :disabled="isCurrencyDisabled"
+            disabled
            class="w-full"
          >
          </BaseMultiselect>
@ -191,7 +187,6 @@ const { t, tm } = useI18n()
 let isSaving = ref(false)
 let isDataSaving = ref(false)
 let isFetchingInitialData = ref(false)
-let isCurrencyDisabled = ref(true)

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

@ -287,14 +282,10 @@ setInitialData()
 async function setInitialData() {
  isFetchingInitialData.value = true
  Promise.all([
-    companyStore.checkCompanyHasCurrencyTransactions(),
    globalStore.fetchCurrencies(),
    globalStore.fetchDateFormats(),
    globalStore.fetchTimeZones(),
  ]).then(([res1]) => {
-    if (res1.data?.has_transactions == false) {
-      isCurrencyDisabled.value = false
-    }
    isFetchingInitialData.value = false
  })
 }
--- a/resources/scripts/components/LightDarkSwitcher.vue
+++ b/resources/scripts/components/LightDarkSwitcher.vue
@ -1,101 +0,0 @@
-<!-- This example requires Tailwind CSS v2.0+ -->
-<script lang="ts" setup>
-import { Switch, SwitchGroup, SwitchLabel } from '@headlessui/vue'
-import { useGlobalStore } from '@/scripts/admin/stores/global'
-import { computed, ref } from 'vue'
-defineProps({
-  showLabel: {
-    type: Boolean,
-    default: true,
-  },
-  vertical: {
-    type: Boolean,
-    default: false,
-  },
-})
-
-const globalStore = useGlobalStore()
-
-const enabled = ref(
-  localStorage.getItem('theme') === 'dark' ||
-    document.documentElement.classList.contains('dark')
-)
-
-globalStore.isDarkModeOn = enabled
-
-function onChange(val) {
-  if (val) {
-    localStorage.theme = 'dark'
-    document.documentElement.classList.add('dark')
-    document.documentElement.style.setProperty('color-scheme', 'dark')
-    globalStore.isDarkModeOn = true
-  } else {
-    localStorage.theme = 'light'
-    document.documentElement.classList.remove('dark')
-    document.documentElement.style.setProperty('color-scheme', 'light')
-    globalStore.isDarkModeOn = false
-  }
-}
-</script>
-
-<template>
-  <div class="w-full flex justify-center">
-    <SwitchGroup
-      as="div"
-      class="flex items-center"
-      :class="vertical ? 'flex-col justify-center' : 'flex-row'"
-    >
-      <Switch
-        v-model="enabled"
-        class="relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:ring-offset-gray-700"
-        :class="[enabled ? 'bg-primary-600' : 'bg-gray-200']"
-        @update:modelValue="onChange"
-      >
-        <span class="sr-only">Use setting</span>
-        <span
-          class="pointer-events-none relative inline-block h-5 w-5 rounded-full bg-white shadow transform ring-0 transition ease-in-out duration-200"
-          :class="[enabled ? 'translate-x-5' : 'translate-x-0']"
-        >
-          <span
-            class="absolute inset-0 h-full w-full flex items-center justify-center transition-opacity"
-            :class="[
-              enabled
-                ? 'opacity-0 ease-out duration-100'
-                : 'opacity-100 ease-in duration-200',
-            ]"
-            aria-hidden="true"
-          >
-            <BaseIcon class="h-3 w-3 text-yellow-500" name="SunIcon" />
-          </span>
-          <span
-            class="absolute inset-0 h-full w-full flex items-center justify-center transition-opacity"
-            :class="[
-              enabled
-                ? 'opacity-100 ease-in duration-200'
-                : 'opacity-0 ease-out duration-100',
-            ]"
-            aria-hidden="true"
-          >
-            <BaseIcon class="h-3 w-3 text-primary-500" name="MoonIcon" />
-          </span>
-        </span>
-      </Switch>
-      <SwitchLabel
-        v-if="showLabel"
-        as="span"
-        class="cursor-pointer"
-        :class="vertical ? 'px-1 text-center mt-2' : 'ml-3'"
-      >
-        <span
-          v-if="enabled"
-          class="text-sm font-medium text-gray-500 dark:text-gray-400"
-        >
-          Dark Mode
-        </span>
-        <span v-else class="text-sm font-medium text-gray-500">
-          Light Mode
-        </span>
-      </SwitchLabel>
-    </SwitchGroup>
-  </div>
-</template>
--- a/resources/scripts/components/base/BaseCustomInput.vue
+++ b/resources/scripts/components/base/BaseCustomInput.vue
@ -126,7 +126,7 @@ onMounted(() => {
 })

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

-  <div v-else :class="computedContainerClass">
-    <date-picker
-      ref="vCalendar"
-      v-model="date"
-      :mode="mode"
-      :is24hr="time24hr"
-      class="w-full"
-      color="indigo"
-      :input-debounce="500"
-      :update-on-input="false"
-      :is-range="false"
-      trim-weeks
-      :is-required="isRequired"
-      :popover="{
-        visibility: disabled ? 'hidden' : 'focus',
-        showDelay: 0,
-        hideDelay: 1,
-      }"
-      :attributes="attrs"
-      :model-config="config"
-      :masks="masks"
-      :locale="global.locale"
-    >
-      <template
-        #default="{ inputValue, inputEvents, togglePopover, hidePopover }"
-      >
-        <!-- calendar icon -->
+  <div v-else :class="computedContainerClass" class="relative flex flex-row">
    <svg
      v-if="showCalendarIcon && !hasIconSlot"
      viewBox="0 0 20 20"
@ -50,7 +24,7 @@
        text-gray-400
        cursor-pointer
      "
-          @click="togglePopover()"
+      @click="onClickDp"
    >
      <path
        fill-rule="evenodd"
@ -61,54 +35,24 @@

    <slot v-if="showCalendarIcon && hasIconSlot" name="icon" />

-        <input
-          :value="inputValue"
+    <FlatPickr
+      ref="dp"
+      v-model="date"
+      v-bind="$attrs"
+      :disabled="disabled"
+      :config="config"
      :class="[defaultInputClass, inputInvalidClass, inputDisabledClass]"
-          readonly
-          v-on="inputEvents"
-          @blur="hidePopover()"
    />
-      </template>
-
-      <template v-if="showExtraOptions" #footer>
-        <div
-          class="bg-gray-100 grid grid-cols-3 gap-2 p-2 border-t rounded-b-lg"
-        >
-          <button type="button" class="extra-button" @click="moveToDate(sourceDate)">
-            {{ global.t('date_picker.same_day') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(7)">
-            {{ global.t('date_picker.within_7_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(15)">
-            {{ global.t('date_picker.within_15_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(30)">
-            {{ global.t('date_picker.within_30_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(45)">
-            {{ global.t('date_picker.within_45_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(60)">
-            {{ global.t('date_picker.within_60_days') }}
-          </button>
-        </div>
-      </template>
-    </date-picker>
  </div>
 </template>

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

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

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

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

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

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

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

-async function moveToDate(_date) {
-  const calendar = vCalendar.value
-  _date = _date ? _date : convertYMDFormat(new Date())
-  date.value = _date
-  // await calendar.move(_date)
-  calendar.hidePopover()
-}
-
-async function withInDays(noOfDays) {
-  if (!noOfDays) return false
-
-  let newDate = moment(props.sourceDate).add(noOfDays, 'days').toDate()
-  newDate = convertYMDFormat(newDate)
-  moveToDate(newDate)
+watch(
+  () => carbonFormat,
+  () => {
+    if (!props.enableTime) {
+      config.altFormat = carbonFormat.value ? carbonFormat.value : 'd M Y'
+    } else {
+      config.altFormat = carbonFormat.value
+        ? `${carbonFormat.value} H:i `
+        : 'd M Y H:i'
    }
+  },
+  { immediate: true }
+)
 </script>
-
-<style scoped>
-.extra-button {
-  @apply bg-primary-500 text-white text-sm font-semibold px-2 py-1 rounded hover:bg-primary-700;
-}
-</style>
--- a/resources/scripts/components/base/BaseModal.vue
+++ b/resources/scripts/components/base/BaseModal.vue
@ -29,21 +29,8 @@
            leave-to="opacity-0"
          >
            <DialogOverlay
-              class="
-              fixed
-              inset-0
-              transition-opacity
-              bg-gray-700
-              bg-opacity-25
-              dark:backdrop-blur-sm
-              dark:bg-gray-900/80
-              "
-            >
-              <BaseDarkHighlight
-                class="!bg-highlight/[.17] !top-1/2 -translate-y-1/2 mt-5 h-96"
-                :class="modalSize"
+              class="fixed inset-0 transition-opacity bg-gray-700 bg-opacity-25"
            />
-            </DialogOverlay>
          </TransitionChild>

          <!-- This element is to trick the browser into centering the modal contents. -->
@ -74,10 +61,6 @@
              my-4
              ${modalSize}
              sm:w-full
-              dark:shadow-glass
-              dark:border
-              dark:border-white/10
-              dark:bg-gray-800/90
              border-t-8 border-solid rounded shadow-xl  border-primary-500`"
            >
              <div
@ -91,8 +74,6 @@
                  text-lg
                  font-medium
                  text-black
-                  dark:text-white
-                  dark:border-gray-600
                  border-b border-gray-200 border-solid
                "
              >
--- a/resources/scripts/components/base/BaseModalFooter.vue
+++ b/resources/scripts/components/base/BaseModalFooter.vue
@ -1,14 +0,0 @@
-<template>
-  <div
-    class="
-      z-0
-      flex
-      justify-end
-      p-4
-      border-t border-gray-200 border-solid
-      dark:border-gray-600
-    "
-  >
-    <slot />
-  </div>
-</template>
--- a/resources/scripts/components/base/BaseTabGroup.vue
+++ b/resources/scripts/components/base/BaseTabGroup.vue
@ -1,10 +1,6 @@
 <template>
  <div>
-    <TabGroup
-      :selected-index="selectedIndex"
-      :default-index="defaultIndex"
-      @change="onChange"
-    >
+    <TabGroup :default-index="defaultIndex" @change="onChange">
      <TabList
        :class="[
          'flex border-b border-grey-light',
@ -58,10 +54,6 @@ const props = defineProps({
    type: Number,
    default: 0,
  },
-  selectedIndex: {
-    type: Number,
-    default: 0,
-  },
  filter: {
    type: String,
    default: null,
@ -75,6 +67,6 @@ const slots = useSlots()
 const tabs = computed(() => slots.default().map((tab) => tab.props))

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

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

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

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

 <body
-    class="h-full overflow-hidden bg-gray-100 dark:bg-gray-900 dark:text-white font-base
+    class="h-full overflow-hidden bg-gray-100 font-base
    @if(isset($current_theme)) theme-{{ $current_theme }} @else theme-{{get_app_setting('admin_portal_theme') ?? 'crater'}} @endif ">

    <!-- Module Scripts -->
@ -38,14 +38,6 @@
    @endforeach

    <script type="module">
-        if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-            document.documentElement.classList.add('dark')
-            document.documentElement.style.setProperty('color-scheme', 'dark');
-        } else {
-            document.documentElement.classList.remove('dark')
-            document.documentElement.style.setProperty('color-scheme', 'light')
-        }
-
        @if(isset($customer_logo))

        window.customer_logo = "/storage/{{$customer_logo}}"
--- a/tailwind.config.js
+++ b/tailwind.config.js
@ -19,7 +19,6 @@ module.exports = {
    './resources/scripts/**/*.js',
    './resources/scripts/**/*.vue',
  ],
-  darkMode: 'class',
  theme: {
    extend: {
      colors: {
--- a/tests/Feature/Admin/EstimateTest.php
+++ b/tests/Feature/Admin/EstimateTest.php
@ -415,31 +415,32 @@ test('update estimate with EUR currency', function () {

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

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

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

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

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

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

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

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

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

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

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

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

-    $invoice_item_assert = collect($invoice2['items'][0])
-        ->only([
-            'invoice_id',
-            'item_id',
-            'name',
-        ])
-        ->toArray();
-
-    $this->assertDatabaseHas('invoice_items', $invoice_item_assert);
-
-    $invoice_tax_assert = collect($invoice2['taxes'][0])
-        ->only([
-            'name',
-            'amount'
-        ])
-        ->toArray();
-
-    $this->assertDatabaseHas('taxes', $invoice_tax_assert);
+    $this->assertDatabaseHas('taxes', [
+        'amount' => $invoice2['taxes'][0]['amount'],
+        'name' => $invoice2['taxes'][0]['name'],
+        'base_amount' => $invoice2['taxes'][0]['base_amount'],
+    ]);
 });
--- a/uffizzi/Dockerfile
+++ b/uffizzi/Dockerfile
@ -11,7 +11,8 @@ RUN apt-get update && apt-get install -y \
    unzip \
    libzip-dev \
    libmagickwand-dev \
-    mariadb-client
+    mariadb-client \
+    npm

 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
@ -45,4 +46,19 @@ RUN chmod -R 775 composer.json composer.lock \
 RUN chown -R $(whoami):$(whoami) /var/log/
 RUN chmod -R 775 /var/log

+# Cleanup manually generated build files
+RUN rm -rf /var/www/public/build
+RUN npm config set user 0
+RUN npm config set unsafe-perm true
+# Frontend bulding
+RUN sed -i 's/DB_CONNECTION=mysql/DB_CONNECTION=sqlite/g' /var/www/.env
+RUN sed -i 's/DB_DATABASE=crater/DB_DATABASE=\/tmp\/crater.sqlite/g' /var/www/.env
+RUN touch /tmp/crater.sqlite
+RUN composer install --no-interaction --prefer-dist
+RUN npm i -f
+RUN npm install --save-dev sass
+RUN export NODE_OPTIONS="--max-old-space-size=4096" && /usr/bin/npx vite build --target=es2020
+RUN sed -i 's/DB_CONNECTION=sqlite/DB_CONNECTION=mysql/g' /var/www/.env
+RUN sed -i 's/DB_DATABASE=\/tmp\/crater.sqlite/DB_DATABASE=crater/g' /var/www/.env
+
 USER crater-user
--- a/uffizzi/nginx/Dockerfile
+++ b/uffizzi/nginx/Dockerfile
@ -1,7 +1,9 @@
+ARG BASE_IMAGE
+
+FROM $BASE_IMAGE as build
 FROM nginx:1.17-alpine

 RUN rm /etc/nginx/conf.d/default.conf

-COPY ./ /var/www
+COPY --from=build /var/www /var/www
 COPY ./uffizzi/nginx/nginx /etc/nginx/conf.d/
-
--- a/yarn.lock
+++ b/yarn.lock