Compare commits

..

4 Commits

Author SHA1 Message Date
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
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
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
57bdbd2897 feat: front-end files bulding (#1098)
Co-authored-by: Aramayis <>
2022-12-17 18:19:49 +05:30
186 changed files with 2326 additions and 2674 deletions

View File

@ -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

3
.gitignore vendored
View File

@ -16,4 +16,5 @@ Homestead.yaml
.gitkeep
/public/docs
/.scribe
!storage/fonts/.gitkeep
!storage/fonts/.gitkeep
.DS_Store

View File

@ -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);

View File

@ -103,7 +103,6 @@ class CustomerStatsController extends Controller
)
->whereCompany()
->whereCustomer($customer->id)
->where('status', '<>', Invoice::STATUS_DRAFT)
->sum('total');
$totalReceipts = Payment::whereBetween(
'payment_date',

View File

@ -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();

View File

@ -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')

View File

@ -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();
}

View File

@ -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',

View File

@ -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,

View File

@ -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,

View File

@ -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',

View File

@ -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,
];
}

View File

@ -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) {

View File

@ -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,
];
}

View File

@ -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,
];
}

57
composer.lock generated
View File

@ -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"
}

View File

@ -27,6 +27,7 @@ return [
'tokenizer',
'JSON',
'cURL',
'zip',
],
'apache' => [
'mod_rewrite',

View File

@ -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",

View File

@ -7,7 +7,6 @@
py-2
rounded-lg
bg-opacity-40 bg-gray-300
dark:bg-gray-700 dark:border-gray-600
whitespace-nowrap
flex-col
mt-1
@ -20,7 +19,6 @@
text-sm
font-medium
text-black
dark:text-white
truncate
select-all select-color
"

View File

@ -91,7 +91,6 @@
leading-tight
text-gray-700
cursor-pointer
dark:text-gray-400
"
>
{{ note.name }}

View File

@ -6,17 +6,8 @@
<script setup>
import Chart from 'chart.js'
import {
ref,
reactive,
computed,
onMounted,
watchEffect,
inject,
watch,
} from 'vue'
import { ref, reactive, computed, onMounted, watchEffect, inject } from 'vue'
import { useCompanyStore } from '@/scripts/admin/stores/company'
import { useGlobalStore } from '@/scripts/admin/stores/global'
const utils = inject('utils')
@ -53,11 +44,9 @@ const props = defineProps({
},
})
const isDarkModeOn = document.documentElement.classList.contains('dark')
let myLineChart = null
const graph = ref(null)
const companyStore = useCompanyStore()
const globalStore = useGlobalStore()
const defaultCurrency = computed(() => {
return companyStore.selectedCompanyCurrency
})
@ -71,14 +60,6 @@ watchEffect(() => {
}
})
watch(
() => globalStore.isDarkModeOn,
() => {
myLineChart.reset()
updateColors()
}
)
onMounted(() => {
let context = graph.value.getContext('2d')
let options = reactive({
@ -100,8 +81,6 @@ onMounted(() => {
},
})
const salesColor = globalStore.isDarkModeOn ? '#ffffff' : '#040405'
let data = reactive({
labels: props.labels,
datasets: [
@ -110,16 +89,16 @@ onMounted(() => {
fill: false,
lineTension: 0.3,
backgroundColor: 'rgba(230, 254, 249)',
borderColor: salesColor,
borderColor: '#040405',
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: salesColor,
pointBorderColor: '#040405',
pointBackgroundColor: '#fff',
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: salesColor,
pointHoverBackgroundColor: '#040405',
pointHoverBorderColor: 'rgba(220,220,220,1)',
pointHoverBorderWidth: 2,
pointRadius: 4,
@ -215,12 +194,4 @@ function update() {
lazy: true,
})
}
function updateColors() {
const newColor = globalStore.isDarkModeOn ? '#ffffff' : '#040405'
myLineChart.data.datasets[0].borderColor = newColor
myLineChart.data.datasets[0].pointBorderColor = newColor
myLineChart.data.datasets[0].pointHoverBackgroundColor = newColor
}
</script>

View File

@ -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>

View File

@ -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) {

View File

@ -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'),
},
})

View File

@ -7,12 +7,11 @@
<!-- edit customField -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.EDIT_CUSTOM_FIELDS)"
v-slot="slotProps"
@click="editCustomField(row.id)"
>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -20,12 +19,11 @@
<!-- delete customField -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_CUSTOM_FIELDS)"
v-slot="slotProps"
@click="removeCustomField(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -12,10 +12,10 @@
v-if="userStore.hasAbilities(abilities.EDIT_CUSTOMER)"
:to="`/admin/customers/${row.id}/edit`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -29,10 +29,10 @@
"
:to="`customers/${row.id}/view`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="EyeIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.view') }}
</BaseDropdownItem>
@ -41,12 +41,11 @@
<!-- Delete Customer -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_CUSTOMER)"
v-slot="slotProps"
@click="removeCustomer(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -10,12 +10,11 @@
<!-- Copy PDF url -->
<BaseDropdownItem
v-if="route.name === 'estimates.view'"
v-slot="slotProps"
@click="copyPdfUrl"
>
<BaseIcon
name="LinkIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.copy_pdf_url') }}
</BaseDropdownItem>
@ -25,10 +24,10 @@
v-if="userStore.hasAbilities(abilities.EDIT_ESTIMATE)"
:to="`/admin/estimates/${row.id}/edit`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -37,12 +36,11 @@
<!-- Delete Estimate -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_ESTIMATE)"
v-slot="slotProps"
@click="removeEstimate(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>
@ -55,10 +53,10 @@
"
:to="`estimates/${row.id}/view`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="EyeIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.view') }}
</BaseDropdownItem>
@ -67,12 +65,11 @@
<!-- Convert into Invoice -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
v-slot="slotProps"
@click="convertInToinvoice(row.id)"
>
<BaseIcon
name="DocumentTextIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('estimates.convert_to_invoice') }}
</BaseDropdownItem>
@ -84,12 +81,11 @@
route.name !== 'estimates.view' &&
userStore.hasAbilities(abilities.SEND_ESTIMATE)
"
v-slot="slotProps"
@click="onMarkAsSent(row.id)"
>
<BaseIcon
name="CheckCircleIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('estimates.mark_as_sent') }}
</BaseDropdownItem>
@ -101,21 +97,20 @@
route.name !== 'estimates.view' &&
userStore.hasAbilities(abilities.SEND_ESTIMATE)
"
v-slot="slotProps"
@click="sendEstimate(row)"
>
<BaseIcon
name="PaperAirplaneIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('estimates.send_estimate') }}
</BaseDropdownItem>
<!-- Resend Estimate -->
<BaseDropdownItem v-if="canResendEstimate(row)" v-slot="slotProps" @click="sendEstimate(row)">
<BaseDropdownItem v-if="canResendEstimate(row)" @click="sendEstimate(row)">
<BaseIcon
name="PaperAirplaneIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('estimates.resend_estimate') }}
</BaseDropdownItem>
@ -126,12 +121,11 @@
row.status !== 'ACCEPTED' &&
userStore.hasAbilities(abilities.EDIT_ESTIMATE)
"
v-slot="slotProps"
@click="onMarkAsAccepted(row.id)"
>
<BaseIcon
name="CheckCircleIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('estimates.mark_as_accepted') }}
</BaseDropdownItem>
@ -142,12 +136,11 @@
row.status !== 'REJECTED' &&
userStore.hasAbilities(abilities.EDIT_ESTIMATE)
"
v-slot="slotProps"
@click="onMarkAsRejected(row.id)"
>
<BaseIcon
name="XCircleIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('estimates.mark_as_rejected') }}
</BaseDropdownItem>

View File

@ -13,12 +13,11 @@
<!-- edit expenseCategory -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.EDIT_EXPENSE)"
v-slot="slotProps"
@click="editExpenseCategory(row.id)"
>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -26,12 +25,11 @@
<!-- delete expenseCategory -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_EXPENSE)"
v-slot="slotProps"
@click="removeExpenseCategory(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -12,10 +12,10 @@
v-if="userStore.hasAbilities(abilities.EDIT_EXPENSE)"
:to="`/admin/expenses/${row.id}/edit`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -24,12 +24,11 @@
<!-- delete expense -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_EXPENSE)"
v-slot="slotProps"
@click="removeExpense(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -12,20 +12,20 @@
v-if="userStore.hasAbilities(abilities.EDIT_INVOICE)"
:to="`/admin/invoices/${row.id}/edit`"
>
<BaseDropdownItem v-show="row.allow_edit" v-slot="slotProps">
<BaseDropdownItem v-show="row.allow_edit">
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
</router-link>
<!-- Copy PDF url -->
<BaseDropdownItem v-if="route.name === 'invoices.view'" v-slot="slotProps" @click="copyPdfUrl">
<BaseDropdownItem v-if="route.name === 'invoices.view'" @click="copyPdfUrl">
<BaseIcon
name="LinkIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.copy_pdf_url') }}
</BaseDropdownItem>
@ -38,29 +38,29 @@
"
:to="`/admin/invoices/${row.id}/view`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="EyeIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.view') }}
</BaseDropdownItem>
</router-link>
<!-- Send Invoice Mail -->
<BaseDropdownItem v-if="canSendInvoice(row)" v-slot="slotProps" @click="sendInvoice(row)">
<BaseDropdownItem v-if="canSendInvoice(row)" @click="sendInvoice(row)">
<BaseIcon
name="PaperAirplaneIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('invoices.send_invoice') }}
</BaseDropdownItem>
<!-- Resend Invoice -->
<BaseDropdownItem v-if="canReSendInvoice(row)" v-slot="slotProps" @click="sendInvoice(row)">
<BaseDropdownItem v-if="canReSendInvoice(row)" @click="sendInvoice(row)">
<BaseIcon
name="PaperAirplaneIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('invoices.resend_invoice') }}
</BaseDropdownItem>
@ -69,21 +69,20 @@
<router-link :to="`/admin/payments/${row.id}/create`">
<BaseDropdownItem
v-if="row.status == 'SENT' && route.name !== 'invoices.view'"
v-slot="slotProps"
>
<BaseIcon
name="CreditCardIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('invoices.record_payment') }}
</BaseDropdownItem>
</router-link>
<!-- Mark as sent Invoice -->
<BaseDropdownItem v-if="canSendInvoice(row)" v-slot="slotProps" @click="onMarkAsSent(row.id)">
<BaseDropdownItem v-if="canSendInvoice(row)" @click="onMarkAsSent(row.id)">
<BaseIcon
name="CheckCircleIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('invoices.mark_as_sent') }}
</BaseDropdownItem>
@ -91,12 +90,11 @@
<!-- Clone Invoice into new invoice -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
v-slot="slotProps"
@click="cloneInvoiceData(row)"
>
<BaseIcon
name="DocumentTextIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('invoices.clone_invoice') }}
</BaseDropdownItem>
@ -104,12 +102,11 @@
<!-- Delete Invoice -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_INVOICE)"
v-slot="slotProps"
@click="removeInvoice(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -12,8 +12,11 @@
v-if="userStore.hasAbilities(abilities.EDIT_ITEM)"
:to="`/admin/items/${row.id}/edit`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseIcon name="PencilIcon" :class="slotProps.class" />
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
</router-link>
@ -21,10 +24,12 @@
<!-- delete item -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_ITEM)"
v-slot="slotProps"
@click="removeItem(row.id)"
>
<BaseIcon name="TrashIcon" :class="slotProps.class" />
<BaseIcon
name="TrashIcon"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>
</BaseDropdown>

View File

@ -10,12 +10,11 @@
<!-- edit note -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.MANAGE_NOTE)"
v-slot="slotProps"
@click="editNote(row.id)"
>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -23,12 +22,11 @@
<!-- delete note -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.MANAGE_NOTE)"
v-slot="slotProps"
@click="removeNote(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -8,31 +8,30 @@
</template>
<!-- Copy pdf url -->
<BaseDropdownItem
<BaseDropdown-item
v-if="
route.name === 'payments.view' &&
userStore.hasAbilities(abilities.VIEW_PAYMENT)
"
v-slot="slotProps"
class="rounded-md"
@click="copyPdfUrl"
>
<BaseIcon
name="LinkIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.copy_pdf_url') }}
</BaseDropdownItem>
</BaseDropdown-item>
<!-- edit payment -->
<router-link
v-if="userStore.hasAbilities(abilities.EDIT_PAYMENT)"
:to="`/admin/payments/${row.id}/edit`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -46,10 +45,10 @@
"
:to="`/admin/payments/${row.id}/view`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="EyeIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.view') }}
</BaseDropdownItem>
@ -62,12 +61,11 @@
route.name !== 'payments.view' &&
userStore.hasAbilities(abilities.SEND_PAYMENT)
"
v-slot="slotProps"
@click="sendPayment(row)"
>
<BaseIcon
name="PaperAirplaneIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('payments.send_payment') }}
</BaseDropdownItem>
@ -75,12 +73,11 @@
<!-- delete payment -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_PAYMENT)"
v-slot="slotProps"
@click="removePayment(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

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

View File

@ -15,10 +15,10 @@
v-if="userStore.hasAbilities(abilities.EDIT_RECURRING_INVOICE)"
:to="`/admin/recurring-invoices/${row.id}/edit`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -32,10 +32,10 @@
"
:to="`recurring-invoices/${row.id}/view`"
>
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="EyeIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.view') }}
</BaseDropdownItem>
@ -44,12 +44,11 @@
<!-- Delete Recurring Invoice -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_RECURRING_INVOICE)"
v-slot="slotProps"
@click="removeMultipleRecurringInvoices(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -10,12 +10,11 @@
<!-- edit role -->
<BaseDropdownItem
v-if="userStore.currentUser.is_owner"
v-slot="slotProps"
@click="editRole(row.id)"
>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -23,12 +22,11 @@
<!-- delete role -->
<BaseDropdownItem
v-if="userStore.currentUser.is_owner"
v-slot="slotProps"
@click="removeRole(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

@ -10,12 +10,11 @@
<!-- edit tax-type -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.EDIT_TAX_TYPE)"
v-slot="slotProps"
@click="editTaxType(row.id)"
>
<BaseIcon
name="PencilIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.edit') }}
</BaseDropdownItem>
@ -23,12 +22,11 @@
<!-- delete tax-type -->
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.DELETE_TAX_TYPE)"
v-slot="slotProps"
@click="removeTaxType(row.id)"
>
<BaseIcon
name="TrashIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
/>
{{ $t('general.delete') }}
</BaseDropdownItem>

View File

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

View File

@ -5,7 +5,7 @@
>
<SelectNotePopup :type="type" @select="onSelectNote" />
</div>
<label class="text-gray-800 font-medium mb-4 text-sm dark:text-gray-300">
<label class="text-gray-800 font-medium mb-4 text-sm">
{{ $t('invoices.notes') }}
</label>
<BaseCustomInput

View File

@ -29,16 +29,7 @@
<label
v-else
class="
flex
items-center
justify-center
m-0
text-lg
text-black
dark:text-white
uppercase
"
class="flex items-center justify-center m-0 text-lg text-black uppercase "
>
<BaseFormatMoney
:amount="store.getSubTotal"
@ -68,16 +59,7 @@
<label
v-else-if="store[storeProp].tax_per_item === 'YES'"
class="
flex
items-center
justify-center
m-0
text-lg
text-black
dark:text-white
uppercase
"
class="flex items-center justify-center m-0 text-lg text-black uppercase "
>
<BaseFormatMoney :amount="tax.amount" :currency="defaultCurrency" />
</label>
@ -184,15 +166,7 @@
</div>
<div
class="
flex
items-center
justify-between
w-full
pt-2
mt-5
border-t border-gray-200 border-solid
"
class="flex items-center justify-between w-full pt-2 mt-5 border-t border-gray-200 border-solid "
>
<BaseContentPlaceholders v-if="isLoading">
<BaseContentPlaceholdersText :lines="1" class="w-16 h-5" />

View File

@ -1,18 +1,9 @@
<template>
<div class="flex items-center justify-between w-full mt-2 text-sm">
<label class="font-semibold leading-5 text-gray-500 uppercase dark:text-gray-300">
<label class="font-semibold leading-5 text-gray-500 uppercase">
{{ tax.name }} ({{ tax.percent }} %)
</label>
<label
class="
flex
items-center
justify-center
text-lg
text-black
dark:text-white
"
>
<label class="flex items-center justify-center text-lg text-black">
<BaseFormatMoney :amount="tax.amount" :currency="currency" />
<BaseIcon

View File

@ -96,7 +96,6 @@
leading-tight
text-gray-700
cursor-pointer
dark:text-gray-300
"
>
{{ taxType.name }}
@ -109,7 +108,6 @@
font-semibold
text-gray-700
cursor-pointer
dark:text-gray-300
"
>
{{ taxType.percent }} %

View File

@ -1,6 +1,6 @@
<template>
<div>
<label class="flex text-gray-800 font-medium text-sm mb-2 dark:text-gray-300">
<label class="flex text-gray-800 font-medium text-sm mb-2">
{{ $t('general.select_template') }}
<span class="text-sm text-red-500"> *</span>
</label>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -122,7 +122,7 @@
<BaseTab :title="$t('customers.portal_access')">
<BaseInputGrid class="col-span-5 lg:col-span-4">
<div class="md:col-span-2">
<p class="text-sm text-gray-500 dark:text-gray-300">
<p class="text-sm text-gray-500">
{{ $t('customers.portal_access_text') }}
</p>
@ -425,7 +425,9 @@
</BaseTabGroup>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3 text-sm"
type="button"
@ -445,7 +447,7 @@
</template>
{{ $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -1,8 +1,8 @@
<template>
<div class="h-screen overflow-y-auto text-base dark:bg-gray-800/80 dark:text-white">
<div class="h-screen overflow-y-auto text-base">
<NotificationRoot />
<div class="container px-4 mx-auto">
<div class="container mx-auto px-4">
<router-view />
</div>
</div>

View File

@ -15,17 +15,8 @@
bg-gradient-to-r
from-primary-500
to-primary-400
dark:from-gray-700/70 dark:to-gray-800/70
bg-primary-500
dark:bg-transparent
dark:backdrop-blur-xl
dark:shadow-glass
dark:border
dark:border-white/10
"
>
<BaseDarkHighlight />
<router-link
to="/admin/dashboard"
class="
@ -62,7 +53,6 @@
cursor-pointer
md:hidden md:ml-0
hover:bg-gray-100
dark:bg-gray-800 dark:border-gray-500 dark:border
"
@click.prevent="onToggle"
>
@ -74,7 +64,7 @@
v-if="hasCreateAbilities"
class="relative hidden float-left m-0 md:block"
>
<BaseDropdown width-class="w-48" >
<BaseDropdown width-class="w-48">
<template #activator>
<div
class="
@ -88,21 +78,19 @@
bg-white
rounded
md:h-9 md:w-9
dark:bg-gray-700 dark:border-gray-500 dark:border
"
>
<BaseIcon name="PlusIcon" class="w-5 h-5 text-gray-600 dark:text-white" />
<BaseIcon name="PlusIcon" class="w-5 h-5 text-gray-600" />
</div>
</template>
<router-link to="/admin/invoices/create">
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
v-slot="slotProps"
>
<BaseIcon
name="DocumentTextIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
aria-hidden="true"
/>
{{ $t('invoices.new_invoice') }}
@ -111,11 +99,10 @@
<router-link to="/admin/estimates/create">
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.CREATE_ESTIMATE)"
v-slot="slotProps"
>
<BaseIcon
name="DocumentIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
aria-hidden="true"
/>
{{ $t('estimates.new_estimate') }}
@ -125,11 +112,10 @@
<router-link to="/admin/customers/create">
<BaseDropdownItem
v-if="userStore.hasAbilities(abilities.CREATE_CUSTOMER)"
v-slot="slotProps"
>
<BaseIcon
name="UserIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
aria-hidden="true"
/>
{{ $t('customers.new_customer') }}
@ -162,20 +148,20 @@
</template>
<router-link to="/admin/settings/account-settings">
<BaseDropdownItem v-slot="slotProps">
<BaseDropdownItem>
<BaseIcon
name="CogIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
aria-hidden="true"
/>
{{ $t('navigation.settings') }}
</BaseDropdownItem>
</router-link>
<BaseDropdownItem v-slot="slotProps" @click="logout">
<BaseDropdownItem @click="logout">
<BaseIcon
name="LogoutIcon"
:class="slotProps.class"
class="w-5 h-5 mr-3 text-gray-400 group-hover:text-gray-500"
aria-hidden="true"
/>
{{ $t('navigation.logout') }}

View File

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

View File

@ -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)
})
})
},
},
})()
}

View File

@ -34,7 +34,6 @@ export const useGlobalStore = (useWindow = false) => {
isAppLoaded: false,
isSidebarOpen: false,
areCurrenciesLoading: false,
isDarkModeOn: false,
downloadReport: null,
}),
@ -71,8 +70,8 @@ export const useGlobalStore = (useWindow = false) => {
moduleStore.apiToken = response.data.global_settings.api_token
moduleStore.enableModules = response.data.modules
// company store
companyStore.companies = response.data.companies
// company store
companyStore.companies = response.data.companies
companyStore.selectedCompany = response.data.current_company
companyStore.setSelectedCompany(response.data.current_company)
companyStore.selectedCompanySettings =

View File

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

View File

@ -1,5 +1,5 @@
<template>
<div class="pt-6 mt-5 border-t border-solid lg:pt-8 md:pt-4 border-gray-200 dark:border-gray-600">
<div class="pt-6 mt-5 border-t border-solid lg:pt-8 md:pt-4 border-gray-200">
<!-- Basic Info -->
<BaseHeading>
{{ $t('customers.basic_info') }}

View File

@ -2,23 +2,8 @@
<div>
<div
v-if="dashboardStore.isDashboardDataLoaded"
class="
grid
grid-cols-10
mt-8
bg-white
rounded shadow
dark:text-white
dark:backdrop-blur-xl
dark:shadow-glass
dark:border
dark:bg-opacity-70
dark:border-white/10
dark:bg-gray-800
relative
"
class="grid grid-cols-10 mt-8 bg-white rounded shadow"
>
<BaseDarkHighlight />
<!-- Chart -->
<div
class="
@ -69,7 +54,6 @@
lg:border-t-0 lg:text-right lg:col-span-3
xl:col-span-2
lg:grid-cols-1
dark:border-white/10
"
>
<div class="p-6">
@ -112,7 +96,15 @@
</span>
<br />
<span
class="block mt-1 text-xl font-semibold leading-8 lg:text-2xl text-red-400"
class="
block
mt-1
text-xl
font-semibold
leading-8
lg:text-2xl
text-red-400
"
>
<BaseFormatMoney
:amount="dashboardStore.totalExpenses"
@ -124,10 +116,8 @@
class="
col-span-3
p-6
border-t
border-gray-200 border-solid
border-t border-gray-200 border-solid
lg:col-span-1
dark:border-white/10
"
>
<span class="text-xs leading-5 lg:text-sm">
@ -142,7 +132,7 @@
font-semibold
leading-8
lg:text-2xl
text-primary-500 dark:text-primary-400
text-primary-500
"
>
<BaseFormatMoney

View File

@ -1,6 +1,6 @@
<template>
<BaseContentPlaceholders
class="grid grid-cols-10 mt-8 bg-white rounded shadow dark:bg-gray-800"
class="grid grid-cols-10 mt-8 bg-white rounded shadow"
>
<!-- Chart -->
<div
@ -29,7 +29,6 @@
text-center
border-t border-l border-gray-200 border-solid
lg:border-t-0 lg:text-right lg:col-span-3
dark:border-gray-600
xl:col-span-2
lg:grid-cols-1
"
@ -78,7 +77,6 @@
col-span-3
p-6
border-t border-gray-200 border-solid
dark:border-gray-600
lg:justify-end lg:items-end lg:col-span-1
"
>

View File

@ -12,24 +12,18 @@
hover:bg-gray-50
xl:p-4
lg:col-span-2
dark:backdrop-blur-xl
dark:shadow-glass
dark:border
dark:border-white/10
dark:bg-gray-800/70
"
:class="{ 'lg:!col-span-3': large }"
:to="route"
>
<div>
<span class="text-xl font-semibold leading-tight text-black xl:text-3xl dark:text-white">
<span class="text-xl font-semibold leading-tight text-black xl:text-3xl">
<slot />
</span>
<span class="block mt-1 text-sm leading-tight text-gray-500 xl:text-lg dark:text-gray-300">
<span class="block mt-1 text-sm leading-tight text-gray-500 xl:text-lg">
{{ label }}
</span>
</div>
<BaseDarkHighlight class="!bg-highlight/[.17] !top-5" />
<div class="flex items-center">
<component :is="iconComponent" class="w-10 h-10 xl:w-12 xl:h-12" />
</div>

View File

@ -1,7 +1,7 @@
<template>
<BaseContentPlaceholders
:rounded="true"
class="relative flex justify-between w-full p-3 bg-white rounded shadow lg:col-span-3 xl:p-4 dark:bg-gray-800"
class="relative flex justify-between w-full p-3 bg-white rounded shadow lg:col-span-3 xl:p-4"
>
<div>
<BaseContentPlaceholdersText

View File

@ -12,7 +12,6 @@
shadow
lg:col-span-2
xl:p-4
dark:bg-gray-800
"
>
<div>

View File

@ -130,7 +130,6 @@
mt-5
list-none
border-b-2 border-gray-200 border-solid
dark:border-gray-600
"
>
<!-- Tabs -->

View File

@ -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>

View File

@ -7,7 +7,7 @@
<div class="mb-6">
<div
v-if="phpSupportInfo"
class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 lg:gap-24 sm:gap-4 dark:border-white/10"
class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 lg:gap-24 sm:gap-4"
>
<div class="col-span-2 text-sm">
{{
@ -32,7 +32,7 @@
<div
v-for="(requirement, index) in requirements"
:key="index"
class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 dark:border-gray-600 lg:gap-24 sm:gap-4"
class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 lg:gap-24 sm:gap-4"
>
<div class="col-span-2 text-sm">
{{ index }}

View File

@ -8,7 +8,12 @@
<div
v-for="(permission, index) in 3"
:key="index"
class="grid grid-flow-row grid-cols-3 border border-gray-200 lg:gap-24 sm:gap-4 dark:border-gray-600"
class="
grid grid-flow-row grid-cols-3
lg:gap-24
sm:gap-4
border border-gray-200
"
>
<BaseContentPlaceholdersText :lines="1" class="col-span-4 p-3" />
</div>
@ -24,7 +29,7 @@
<div
v-for="(permission, index) in permissions"
:key="index"
class="border border-gray-200 dark:border-gray-600"
class="border border-gray-200"
>
<div class="grid grid-flow-row grid-cols-3 lg:gap-24 sm:gap-4">
<div class="col-span-2 p-3">
@ -33,11 +38,11 @@
<div class="p-3 text-right">
<span
v-if="permission.isSet"
class="inline-block w-4 h-4 ml-3 mr-2 bg-green-500 rounded-full"
class="inline-block w-4 h-4 ml-3 mr-2 rounded-full bg-green-500"
/>
<span
v-else
class="inline-block w-4 h-4 ml-3 mr-2 bg-red-500 rounded-full"
class="inline-block w-4 h-4 ml-3 mr-2 rounded-full bg-red-500"
/>
<span>{{ permission.permission }}</span>
</div>

View File

@ -2,6 +2,7 @@
<BaseWizardStep
:title="$t('wizard.database.database')"
:description="$t('wizard.database.desc')"
step-container="w-full p-8 mb-8 bg-white border border-gray-200 border-solid rounded md:w-full"
>
<component
:is="databaseData.database_connection"

View File

@ -18,18 +18,18 @@
</BaseInputGroup>
</div>
<p class="mt-4 mb-0 text-sm text-gray-600 dark:text-white">Notes:</p>
<ul class="w-full text-gray-600 list-disc list-inside dark:text-gray-300">
<p class="mt-4 mb-0 text-sm text-gray-600">Notes:</p>
<ul class="w-full text-gray-600 list-disc list-inside">
<li class="text-sm leading-8">
App domain should not contain
<b class="inline-block px-1 bg-gray-100 rounded-md dark:bg-gray-400 dark:text-gray-600">https://</b> or
<b class="inline-block px-1 bg-gray-100 rounded-md dark:bg-gray-400 dark:text-gray-600">http</b> in front of
<b class="inline-block px-1 bg-gray-100 rounded-sm">https://</b> or
<b class="inline-block px-1 bg-gray-100 rounded-sm">http</b> in front of
the domain.
</li>
<li class="text-sm leading-8">
If you're accessing the website on a different port, please mention the
port. For example:
<b class="inline-block px-1 bg-gray-100 rounded-md dark:bg-gray-400 dark:text-gray-600">localhost:8080</b>
<b class="inline-block px-1 bg-gray-100">localhost:8080</b>
</li>
</ul>

View File

@ -2,6 +2,7 @@
<BaseWizardStep
:title="$t('wizard.company_info')"
:description="$t('wizard.company_info_desc')"
step-container="bg-white border border-gray-200 border-solid mb-8 md:w-full p-8 rounded w-full"
>
<form action="" @submit.prevent="next">
<div class="grid grid-cols-1 mb-4 md:grid-cols-2 md:mb-6">
@ -33,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="
@ -74,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"
@ -159,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'
@ -177,7 +162,6 @@ let logoFileName = ref(null)
const companyForm = reactive({
name: null,
slug: null,
address: {
address_street_1: '',
address_street_2: '',
@ -204,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: {
@ -283,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>

View File

@ -2,6 +2,7 @@
<BaseWizardStep
:title="$t('wizard.preferences')"
:description="$t('wizard.preferences_desc')"
step-container="bg-white border border-gray-200 border-solid mb-8 md:w-full p-8 rounded w-full"
>
<form action="" @submit.prevent="next">
<div>

View File

@ -56,7 +56,7 @@
<BaseMultiselect
v-model="filters.status"
:groups="true"
:options="invoiceStatus"
:options="status"
searchable
:placeholder="$t('general.select_a_status')"
@update:modelValue="setActiveTab"
@ -127,31 +127,14 @@
mt-5
list-none
border-b-2 border-gray-200 border-solid
dark:border-gray-600
"
>
<!-- Tabs -->
<BaseTabGroup
class="-mb-5"
:selected-index="selectedIndex"
@change="changeTabStatus"
>
<BaseTab
:title="invoiceTabStatus[0].title"
:tab-status="invoiceTabStatus[0].value"
/>
<BaseTab
:title="invoiceTabStatus[1].title"
:tab-status="invoiceTabStatus[1].value"
/>
<BaseTab
:title="invoiceTabStatus[2].title"
:tab-status="invoiceTabStatus[2].value"
/>
<BaseTab
:title="invoiceTabStatus[3].title"
:tab-status="invoiceTabStatus[3].value"
/>
<BaseTabGroup class="-mb-5" @change="setStatusFilter">
<BaseTab :title="$t('general.all')" filter="" />
<BaseTab :title="$t('general.draft')" filter="DRAFT" />
<BaseTab :title="$t('general.sent')" filter="SENT" />
<BaseTab :title="$t('general.due')" filter="DUE" />
</BaseTabGroup>
<BaseDropdown
@ -306,10 +289,10 @@ const utils = inject('$utils')
const table = ref(null)
const showFilters = ref(false)
const invoiceStatus = ref([
const status = ref([
{
label: 'Status',
options: ['DRAFT', 'SENT', 'VIEWED', 'COMPLETED'],
options: ['DRAFT', 'DUE', 'SENT', 'VIEWED', 'COMPLETED'],
},
{
label: 'Paid Status',
@ -317,29 +300,10 @@ const invoiceStatus = ref([
},
,
])
const invoiceTabStatus = {
0: {
title: t('general.all'),
value: '',
},
1: {
title: t('general.draft'),
value: 'DRAFT',
},
2: {
title: t('general.sent'),
value: 'SENT',
},
3: {
title: t('general.due'),
value: 'DUE',
},
}
const isRequestOngoing = ref(true)
const activeTab = ref('general.draft')
const router = useRouter()
const userStore = useUserStore()
const selectedIndex = ref(0)
let filters = reactive({
customer_id: '',
@ -347,7 +311,6 @@ let filters = reactive({
from_date: '',
to_date: '',
invoice_number: '',
tab_status: '',
})
const showEmptyScreen = computed(
@ -438,7 +401,6 @@ async function fetchData({ page, filter, sort }) {
from_date: filters.from_date,
to_date: filters.to_date,
invoice_number: filters.invoice_number,
tab_status: filters.tab_status,
orderByField: sort.fieldName || 'created_at',
orderBy: sort.order || 'desc',
page,
@ -461,9 +423,29 @@ async function fetchData({ page, filter, sort }) {
}
}
function changeTabStatus(val, index) {
filters.tab_status = val['tab-status']
selectedIndex.value = index
function setStatusFilter(val) {
if (activeTab.value == val.title) {
return true
}
activeTab.value = val.title
switch (val.title) {
case t('general.draft'):
filters.status = 'DRAFT'
break
case t('general.sent'):
filters.status = 'SENT'
break
case t('general.due'):
filters.status = 'DUE'
break
default:
filters.status = ''
break
}
}
function setFilters() {
@ -481,6 +463,8 @@ function clearFilter() {
filters.from_date = ''
filters.to_date = ''
filters.invoice_number = ''
activeTab.value = t('general.all')
}
async function removeMultipleInvoices() {
@ -521,21 +505,39 @@ function toggleFilter() {
function setActiveTab(val) {
switch (val) {
case 'DRAFT':
selectedIndex.value = 1
activeTab.value = t('general.draft')
break
case 'SENT':
activeTab.value = t('general.sent')
break
case 'DUE':
activeTab.value = t('general.due')
break
case 'SENT':
case 'VIEWED':
case 'COMPLETED':
activeTab.value = t('invoices.completed')
break
case 'PAID':
selectedIndex.value = 2
activeTab.value = t('invoices.paid')
break
case 'UNPAID':
activeTab.value = t('invoices.unpaid')
break
case 'PARTIALLY_PAID':
selectedIndex.value = 3
activeTab.value = t('invoices.partially_paid')
break
case 'VIEWED':
activeTab.value = t('invoices.viewed')
break
default:
activeTab.value = t('general.all')
break
}
filters.tab_status = invoiceTabStatus[selectedIndex.value].value
}
</script>

View File

@ -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>

View File

@ -53,7 +53,7 @@
</div>
</div>
<div v-else class="mt-24">
<label class="flex items-center justify-center text-gray-500 dark:text-gray-300">
<label class="flex items-center justify-center text-gray-500">
{{ $t('modules.no_modules_installed') }}
</label>
</div>
@ -61,10 +61,10 @@
</div>
<BaseCard v-else class="mt-6">
<h6 class="text-gray-900 text-lg font-medium dark:text-white">
<h6 class="text-gray-900 text-lg font-medium">
{{ $t('modules.connect_installation') }}
</h6>
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
<p class="mt-1 text-sm text-gray-500">
{{
$t('modules.api_token_description', {
url: globalStore.config.base_url.replace(/^http:\/\//, ''),

View File

@ -82,9 +82,9 @@
required
>
<BaseCustomerSelectInput
v-if="!isLoadingContent"
v-model="paymentStore.currentPayment.customer_id"
:content-loading="isLoadingContent"
v-if="!isLoadingContent"
:invalid="v$.currentPayment.customer_id.$error"
:placeholder="$t('customers.select_a_customer')"
show-action
@ -215,7 +215,7 @@
<SelectNotePopup type="Payment" @select="onSelectNote" />
</div>
<label class="mb-4 text-sm font-medium text-gray-800 dark:text-gray-300">
<label class="mb-4 text-sm font-medium text-gray-800">
{{ $t('estimates.notes') }}
</label>
@ -423,7 +423,7 @@ function onCustomerChange(customer_id) {
if (customer_id) {
let data = {
customer_id: customer_id,
tab_status: 'DUE',
status: 'DUE',
limit: 'all',
}
@ -446,11 +446,7 @@ function onCustomerChange(customer_id) {
paymentStore.currentPayment.selectedCustomer = res2.data.data
paymentStore.currentPayment.customer = res2.data.data
paymentStore.currentPayment.currency = res2.data.data.currency
if (
isEdit.value &&
!customerStore.editCustomer &&
paymentStore.currentPayment.customer_id
) {
if(isEdit.value && !customerStore.editCustomer && paymentStore.currentPayment.customer_id) {
customerStore.editCustomer = res2.data.data
}
}

View File

@ -121,7 +121,6 @@
mt-5
list-none
border-b-2 border-gray-200 border-solid
dark:border-gray-600
"
>
<!-- Tabs -->

View File

@ -16,11 +16,11 @@
</div>
<div class="ml-2">
<p class="p-0 mb-1 leading-snug text-left text-black dark:text-white">
<p class="p-0 mb-1 leading-snug text-left text-black">
{{ $t('recurring_invoices.send_automatically') }}
</p>
<p
class="p-0 m-0 text-xs leading-tight text-left text-gray-500 dark:text-gray-400"
class="p-0 m-0 text-xs leading-tight text-left text-gray-500"
style="max-width: 480px"
>
{{ $t('recurring_invoices.send_automatically_desc') }}

View File

@ -51,14 +51,14 @@
</div>
</template>
<BaseDropdownItem v-slot="slotProps" @click="onDownloadBckup(row.data)">
<BaseIcon name="CloudDownloadIcon" :class="slotProps.class" />
<BaseDropdownItem @click="onDownloadBckup(row.data)">
<BaseIcon name="CloudDownloadIcon" class="mr-3 text-gray-600" />
{{ $t('general.download') }}
</BaseDropdownItem>
<BaseDropdownItem v-slot="slotProps" @click="onRemoveBackup(row.data)">
<BaseIcon name="TrashIcon" :class="slotProps.class" />
<BaseDropdownItem @click="onRemoveBackup(row.data)">
<BaseIcon name="TrashIcon" class="mr-3 text-gray-600" />
{{ $t('general.delete') }}
</BaseDropdownItem>
</BaseDropdown>

View File

@ -28,19 +28,6 @@
/>
</BaseInputGroup>
<BaseInputGroup
:label="$tc('settings.company_info.company_slug')"
:help-text="$t('settings.company_info.company_slug_help_text')"
:error="v$.slug.$error && v$.slug.$errors[0].$message"
required
>
<BaseInput
v-model="companyForm.slug"
:invalid="v$.slug.$error"
@blur="v$.slug.$touch()"
/>
</BaseInputGroup>
<BaseInputGroup :label="$tc('settings.company_info.phone')">
<BaseInput v-model="companyForm.address.phone" />
</BaseInputGroup>
@ -113,10 +100,10 @@
<div v-if="companyStore.companies.length !== 1" class="py-5">
<BaseDivider class="my-4" />
<h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">
<h3 class="text-lg leading-6 font-medium text-gray-900">
{{ $tc('settings.company_info.delete_company') }}
</h3>
<div class="mt-2 max-w-xl text-sm text-gray-500 dark:text-gray-400">
<div class="mt-2 max-w-xl text-sm text-gray-500">
<p>
{{ $tc('settings.company_info.delete_company_description') }}
</p>
@ -173,7 +160,6 @@ let isSaving = ref(false)
const companyForm = reactive({
name: null,
slug: null,
logo: null,
address: {
address_street_1: '',
@ -207,14 +193,7 @@ const rules = computed(() => {
name: {
required: helpers.withMessage(t('validation.required'), required),
minLength: helpers.withMessage(
t('validation.name_min_length', { count: 3 }),
minLength(3)
),
},
slug: {
required: helpers.withMessage(t('validation.required'), required),
minLength: helpers.withMessage(
t('validation.name_min_length', { count: 3 }),
t('validation.name_min_length'),
minLength(3)
),
},

View File

@ -27,7 +27,7 @@
>
<template #cell-name="{ row }">
{{ row.data.name }}
<span class="text-xs text-gray-500 dark:text-gray-400"> ({{ row.data.slug }})</span>
<span class="text-xs text-gray-500"> ({{ row.data.slug }})</span>
</template>
<template #cell-is_required="{ row }">
@ -60,7 +60,7 @@
<CustomFieldDropdown
:row="row.data"
:table="table"
:load-data="refreshTable"
:load-data="refreshTable"
/>
</template>
</BaseTable>

View File

@ -7,7 +7,7 @@
{{ $t('settings.menu_title.exchange_rate') }}
</h6>
<p
class="mt-2 text-sm leading-snug text-left text-gray-500 dark:text-gray-400"
class="mt-2 text-sm leading-snug text-left text-gray-500"
style="max-width: 680px"
>
{{ $t('settings.exchange_rate.providers_description') }}

View File

@ -45,30 +45,27 @@
<BaseDropdownItem
v-if="!row.data.set_as_default"
v-slot="slotProps"
@click="setDefaultDiskData(row.data.id)"
>
<BaseIcon :class="slotProps.class" name="CheckCircleIcon" />
<BaseIcon class="mr-3 tetx-gray-600" name="CheckCircleIcon" />
{{ $t('settings.disk.set_default_disk') }}
</BaseDropdownItem>
<BaseDropdownItem
v-if="row.data.type !== 'SYSTEM'"
v-slot="slotProps"
@click="openEditDiskModal(row.data)"
>
<BaseIcon name="PencilIcon" :class="slotProps.class" />
<BaseIcon name="PencilIcon" class="mr-3 text-gray-600" />
{{ $t('general.edit') }}
</BaseDropdownItem>
<BaseDropdownItem
v-if="row.data.type !== 'SYSTEM' && !row.data.set_as_default"
v-slot="slotProps"
@click="removeDisk(row.data.id)"
>
<BaseIcon name="TrashIcon" :class="slotProps.class" />
<BaseIcon name="TrashIcon" class="mr-3 text-gray-600" />
{{ $t('general.delete') }}
</BaseDropdownItem>
</BaseDropdown>

View File

@ -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
})
}

View File

@ -4,14 +4,23 @@
:description="$t('settings.update_app.description')"
>
<div class="pb-8 ml-0">
<label
class="text-sm not-italic font-medium input-label dark:text-gray-300"
>
<label class="text-sm not-italic font-medium input-label">
{{ $t('settings.update_app.current_version') }}
</label>
<div
class="box-border flex w-16 p-3 my-2 text-sm text-gray-600 bg-gray-200 border border-gray-200 border-solid dark:bg-gray-600 dark:text-gray-200 dark:border-gray-500 rounded-md version"
class="
box-border
flex
w-16
p-3
my-2
text-sm text-gray-600
bg-gray-200
border border-gray-200 border-solid
rounded-md
version
"
>
{{ currentVersion }}
</div>
@ -33,20 +42,20 @@
{{ $t('settings.update_app.avail_update') }}
</BaseHeading>
<div class="rounded-md bg-primary-50 p-4 mb-3 dark:bg-gray-600">
<div class="rounded-md bg-primary-50 p-4 mb-3">
<div class="flex">
<div class="shrink-0">
<BaseIcon
name="InformationCircleIcon"
class="h-5 w-5 text-primary-400 dark:text-primary-300"
class="h-5 w-5 text-primary-400"
aria-hidden="true"
/>
</div>
<div class="ml-3">
<h3 class="text-sm font-medium text-primary-800 dark:text-primary-300">
<h3 class="text-sm font-medium text-primary-800">
{{ $t('general.note') }}
</h3>
<div class="mt-2 text-sm text-primary-700 dark:text-primary-400">
<div class="mt-2 text-sm text-primary-700">
<p>
{{ $t('settings.update_app.update_warning') }}
</p>
@ -66,20 +75,26 @@
w-16
p-3
my-2
text-sm
text-gray-600 bg-gray-200
text-sm text-gray-600
bg-gray-200
border border-gray-200 border-solid
rounded-md
version
dark:bg-gray-600 dark:text-gray-200
dark:border-gray-500
"
>
{{ updateData.version }}
</div>
<div
class="pl-5 mt-4 mb-8 text-sm leading-snug text-gray-500 update-description"
class="
pl-5
mt-4
mb-8
text-sm
leading-snug
text-gray-500
update-description
"
style="white-space: pre-wrap; max-width: 480px"
v-html="description"
></div>
@ -135,7 +150,14 @@
<li
v-for="step in updateSteps"
:key="step.stepUrl"
class="flex justify-between w-full py-3 border-b border-gray-200 border-solid last:border-b-0"
class="
flex
justify-between
w-full
py-3
border-b border-gray-200 border-solid
last:border-b-0
"
>
<p class="m-0 text-sm leading-8">{{ $t(step.translationKey) }}</p>
<div class="flex flex-row items-center">

Some files were not shown because too many files have changed in this diff Show More