Bump guzzlehttp/psr7 from 2.3.0 to 2.5.0

Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 2.3.0 to 2.5.0. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/2.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/2.3.0...2.5.0) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Adds Zip to the required PHP Extension check (#1146 )
2025-10-28 04:01:10 -04:00 · 2023-04-19 19:48:42 +00:00 · 2023-02-19 11:42:34 +05:30 · 2022-12-17 18:20:51 +05:30 · 2022-12-17 18:19:49 +05:30
40 changed files with 1495 additions and 1402 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,3 +17,4 @@ Homestead.yaml
 /public/docs
 /.scribe
 !storage/fonts/.gitkeep
+.DS_Store
--- 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
@ -1841,22 +1841,22 @@
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "2.3.0",
+            "version": "2.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee"
+                "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee",
-                "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
+                "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
                "shasum": ""
            },
            "require": {
                "php": "^7.2.5 || ^8.0",
                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
                "ralouphie/getallheaders": "^3.0"
            },
            "provide": {
@ -1864,17 +1864,18 @@
                "psr/http-message-implementation": "1.0"
            },
            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
            },
            "suggest": {
                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                }
            },
            "autoload": {
@ -1936,7 +1937,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.3.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.5.0"
            },
            "funding": [
                {
@ -1952,7 +1953,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-06-09T08:26:02+00:00"
+            "time": "2023-04-17T16:11:26+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
@ -5215,21 +5216,21 @@
        },
        {
            "name": "psr/http-factory",
-            "version": "1.0.1",
+            "version": "1.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "e616d01114759c4c489f93b099585439f795fe35"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35",
                "shasum": ""
            },
            "require": {
                "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
            },
            "type": "library",
            "extra": {
@ -5249,7 +5250,7 @@
            "authors": [
                {
                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                }
            ],
            "description": "Common interfaces for PSR-7 HTTP message factories",
@ -5264,31 +5265,31 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
            },
-            "time": "2019-04-30T12:38:16+00:00"
+            "time": "2023-04-10T20:10:41+00:00"
        },
        {
            "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                }
            },
            "autoload": {
@ -5317,9 +5318,9 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/1.1"
            },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:50:52+00:00"
        },
        {
            "name": "psr/log",
@ -11856,5 +11857,5 @@
        "php": "^7.4 || ^8.0"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }
--- a/config/installer.php
+++ b/config/installer.php
@ -27,6 +27,7 @@ return [
            'tokenizer',
            'JSON',
            'cURL',
+            'zip',
        ],
        'apache' => [
            'mod_rewrite',
--- 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/custom-fields/CreateCustomFields.vue
+++ b/resources/scripts/admin/components/custom-fields/CreateCustomFields.vue
@ -64,7 +64,7 @@ function mergeExistingValues() {
  if (props.isEdit) {
    props.store[props.storeProp].fields.forEach((field) => {
      const existingIndex = props.store[props.storeProp].customFields.findIndex(
-        (f) => f.id == field.custom_field_id
+        (f) => f.id === field.custom_field_id
      )

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

--- a/resources/scripts/admin/components/modal-components/CompanyModal.vue
+++ b/resources/scripts/admin/components/modal-components/CompanyModal.vue
@ -48,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')"
@ -148,7 +130,7 @@

 <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/layouts/LayoutBasic.vue
+++ b/resources/scripts/admin/layouts/LayoutBasic.vue
@ -12,8 +12,6 @@
      class="h-screen h-screen-ios overflow-y-auto md:pl-56 xl:pl-64 min-h-0"
    >
      <div class="pt-16 pb-16">
-        <h1>Testing</h1>
-
        <router-view />
      </div>
    </main>
--- a/resources/scripts/admin/layouts/LayoutInstallation.vue
+++ b/resources/scripts/admin/layouts/LayoutInstallation.vue
@ -1,6 +1,5 @@
 <template>
  <div class="h-screen overflow-y-auto text-base">
-    <h1>Testing</h1>
    <NotificationRoot />

    <div class="container mx-auto px-4">
--- a/resources/scripts/admin/layouts/LayoutLogin.vue
+++ b/resources/scripts/admin/layouts/LayoutLogin.vue
@ -93,9 +93,6 @@
        >
          {{ pageHeading }}
        </h1>
-
-        <h1>Testing</h1>
-
        <p
          class="
            hidden
--- 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/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/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,108 +7,52 @@
    />
  </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"
+  <div v-else :class="computedContainerClass" class="relative flex flex-row">
+    <svg
+      v-if="showCalendarIcon && !hasIconSlot"
+      viewBox="0 0 20 20"
+      fill="currentColor"
+      class="
+        absolute
+        w-4
+        h-4
+        mx-2
+        my-2.5
+        text-sm
+        not-italic
+        font-black
+        text-gray-400
+        cursor-pointer
+      "
+      @click="onClickDp"
    >
-      <template
-        #default="{ inputValue, inputEvents, togglePopover, hidePopover }"
-      >
-        <!-- calendar icon -->
-        <svg
-          v-if="showCalendarIcon && !hasIconSlot"
-          viewBox="0 0 20 20"
-          fill="currentColor"
-          class="
-            absolute
-            w-4
-            h-4
-            mx-2
-            my-2.5
-            text-sm
-            not-italic
-            font-black
-            text-gray-400
-            cursor-pointer
-          "
-          @click="togglePopover()"
-        >
-          <path
-            fill-rule="evenodd"
-            d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
-            clip-rule="evenodd"
-          ></path>
-        </svg>
+      <path
+        fill-rule="evenodd"
+        d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
+        clip-rule="evenodd"
+      ></path>
+    </svg>

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

-        <input
-          :value="inputValue"
-          :class="[defaultInputClass, inputInvalidClass, inputDisabledClass]"
-          readonly
-          v-on="inputEvents"
-          @blur="hidePopover()"
-        />
-      </template>
-
-      <template v-if="showExtraOptions" #footer>
-        <div
-          class="bg-gray-100 grid grid-cols-3 gap-2 p-2 border-t rounded-b-lg"
-        >
-          <button type="button" class="extra-button" @click="moveToDate(sourceDate)">
-            {{ global.t('date_picker.same_day') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(7)">
-            {{ global.t('date_picker.within_7_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(15)">
-            {{ global.t('date_picker.within_15_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(30)">
-            {{ global.t('date_picker.within_30_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(45)">
-            {{ global.t('date_picker.within_45_days') }}
-          </button>
-
-          <button type="button" class="extra-button" @click="withInDays(60)">
-            {{ global.t('date_picker.within_60_days') }}
-          </button>
-        </div>
-      </template>
-    </date-picker>
+    <FlatPickr
+      ref="dp"
+      v-model="date"
+      v-bind="$attrs"
+      :disabled="disabled"
+      :config="config"
+      :class="[defaultInputClass, inputInvalidClass, inputDisabledClass]"
+    />
  </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/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/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/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
dependabot[bot]	e3ed12f8ed	Bump guzzlehttp/psr7 from 2.3.0 to 2.5.0 Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 2.3.0 to 2.5.0. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/2.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/2.3.0...2.5.0) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-19 19:48:42 +00:00
Adam Patterson	05d5ce26fd	Adds Zip to the required PHP Extension check (#1146 ) * Ignore .DS_Store * Checks for required ZIP extension	2023-02-19 11:42:34 +05:30
bananabendera	393fe20010	Fix incorrect invoice creation message (#1109 ) Creation message now includes the views disk in its path.	2022-12-17 18:20:51 +05:30
Aramayis	57bdbd2897	feat: front-end files bulding (#1098 ) Co-authored-by: Aramayis <>	2022-12-17 18:19:49 +05:30