QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-05-25 20:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into frontend-performance-improvements

Browse Source
This commit is contained in:
Darko Gjorgjijoski
2025-05-05 02:24:27 +02:00
committed by GitHub
parent 8b49332453 6d14dce668
commit d70c04b841
257 changed files with 30966 additions and 11128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/admin/components/dropdowns/CustomFieldIndexDropdown.vue
View File

@@ -1,7 +1,7 @@
<template>
<BaseDropdown>
<template #activator>
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit customField -->

4
resources/scripts/admin/components/dropdowns/CustomerIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown :content-loading="customerStore.isFetchingViewData">
<template #activator>
<BaseButton v-if="route.name === 'customers.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- Edit Customer -->

4
resources/scripts/admin/components/dropdowns/EstimateIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'estimates.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="text-white" />
</BaseButton>
<BaseIcon v-else class="text-gray-500" name="DotsHorizontalIcon" />
<BaseIcon v-else class="text-gray-500" name="EllipsisHorizontalIcon" />
</template>
<!-- Copy PDF url -->

4
resources/scripts/admin/components/dropdowns/ExpenseCategoryIndexDropdown.vue
View File

@@ -5,9 +5,9 @@
v-if="route.name === 'expenseCategorys.view'"
variant="primary"
>
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit expenseCategory -->

4
resources/scripts/admin/components/dropdowns/ExpenseIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'expenses.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit expense -->

4
resources/scripts/admin/components/dropdowns/InvoiceIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'invoices.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- Edit Invoice -->

4
resources/scripts/admin/components/dropdowns/ItemIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'items.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit item -->

4
resources/scripts/admin/components/dropdowns/NoteIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'notes.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit note -->

4
resources/scripts/admin/components/dropdowns/PaymentIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown :content-loading="contentLoading">
<template #activator>
<BaseButton v-if="route.name === 'payments.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- Copy pdf url -->

4
resources/scripts/admin/components/dropdowns/PaymentModeIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'paymentModes.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit paymentMode -->

4
resources/scripts/admin/components/dropdowns/RecurringInvoiceIndexDropdown.vue
View File

@@ -5,9 +5,9 @@
v-if="route.name === 'recurring-invoices.view'"
variant="primary"
>
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- Edit Recurring Invoice -->

4
resources/scripts/admin/components/dropdowns/RoleIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'roles.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit role -->

4
resources/scripts/admin/components/dropdowns/TaxTypeIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'tax-types.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit tax-type -->

4
resources/scripts/admin/components/dropdowns/UserIndexDropdown.vue
View File

@@ -2,9 +2,9 @@
<BaseDropdown>
<template #activator>
<BaseButton v-if="route.name === 'users.view'" variant="primary">
<BaseIcon name="DotsHorizontalIcon" class="h-5 text-white" />
<BaseIcon name="EllipsisHorizontalIcon" class="h-5 text-white" />
</BaseButton>
<BaseIcon v-else name="DotsHorizontalIcon" class="h-5 text-gray-500" />
<BaseIcon v-else name="EllipsisHorizontalIcon" class="h-5 text-gray-500" />
</template>
<!-- edit user -->

16
resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
View File

@@ -264,22 +264,12 @@ const quantity = computed({
const price = computed({
get: () => {
const price = props.itemData.price
if (parseFloat(price) > 0) {
return price / 100
}
return price
return price / 100
},
set: (newValue) => {
if (parseFloat(newValue) > 0) {
let price = Math.round(newValue * 100)
updateItemAttribute('price', price)
} else {
updateItemAttribute('price', newValue)
}
let price = Math.round(newValue * 100)
updateItemAttribute('price', price)
setDiscount()
},
})

33
resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
View File

@@ -19,12 +19,24 @@
>
<template #singlelabel="{ value }">
<div class="absolute left-3.5">
{{ value.name }} - {{ value.percent }} %
{{ value.name }} -
<template v-if="value.calculation_type === 'fixed'">
<BaseFormatMoney :amount="value.fixed_amount" :currency="currency" />
</template>
<template v-else>
{{ value.percent }} %
</template>
</div>
</template>
<template #option="{ option }">
{{ option.name }} - {{ option.percent }} %
{{ option.name }} -
<template v-if="option.calculation_type === 'fixed'">
<BaseFormatMoney :amount="option.fixed_amount" :currency="currency" />
</template>
<template v-else>
{{ option.percent }} %
</template>
</template>
<template v-if="userStore.hasAbilities(ability)" #action>
@@ -149,7 +161,12 @@ const filteredTypes = computed(() => {
})
const taxAmount = computed(() => {
if (props.discountedTotal && localTax.percent) {
if(localTax.calculation_type === 'fixed') {
return localTax.fixed_amount
}
if (props.discountedTotal) {
const taxPerItemEnabled = props.store[props.storeProp].tax_per_item === 'YES'
const discountPerItemEnabled = props.store[props.storeProp].discount_per_item === 'YES'
if (taxPerItemEnabled && !discountPerItemEnabled){
@@ -191,7 +208,9 @@ if (props.taxData.tax_type_id > 0) {
updateRowTax()
function onSelectTax(val) {
localTax.percent = val.percent
localTax.calculation_type = val.calculation_type
localTax.percent = val.calculation_type === 'percentage' ? val.percent : null
localTax.fixed_amount = val.calculation_type === 'fixed' ? val.fixed_amount : null
localTax.tax_type_id = val.id
localTax.name = val.name
@@ -235,6 +254,11 @@ function removeTax(index) {
}
function getTaxAmount() {
if (localTax.calculation_type === 'fixed') {
return localTax.fixed_amount
}
let total = 0
let discount = 0
const itemTotal = props.discountedTotal
@@ -253,3 +277,4 @@ function getTaxAmount() {
return Math.round((props.discountedTotal * localTax.percent) / 100)
}
</script>

15
resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
View File

@@ -50,7 +50,12 @@
v-else-if="store[storeProp].tax_per_item === 'YES'"
class="m-0 text-sm font-semibold leading-5 text-gray-500 uppercase"
>
{{ tax.name }} - {{ tax.percent }}%
<template v-if="tax.calculation_type === 'percentage'">
{{ tax.name }} - {{ tax.percent }}%
</template>
<template v-else>
{{ tax.name }} - <BaseFormatMoney :amount="tax.fixed_amount" :currency="defaultCurrency" />
</template>
</label>
<BaseContentPlaceholders v-if="isLoading">
@@ -277,6 +282,8 @@ const itemWiseTaxes = computed(() => {
amount: Math.round(tax.amount),
percent: tax.percent,
name: tax.name,
calculation_type: tax.calculation_type,
fixed_amount: tax.fixed_amount
})
}
})
@@ -331,10 +338,12 @@ function selectPercentage() {
function onSelectTax(selectedTax) {
let amount = 0
if (props.store.getSubtotalWithDiscount && selectedTax.percent) {
if (selectedTax.calculation_type === 'percentage' && props.store.getSubtotalWithDiscount && selectedTax.percent) {
amount = Math.round(
(props.store.getSubtotalWithDiscount * selectedTax.percent) / 100
)
} else if (selectedTax.calculation_type === 'fixed') {
amount = selectedTax.fixed_amount
}
let data = {
@@ -344,6 +353,8 @@ function onSelectTax(selectedTax) {
percent: selectedTax.percent,
tax_type_id: selectedTax.id,
amount,
calculation_type: selectedTax.calculation_type,
fixed_amount: selectedTax.fixed_amount
}
props.store.$patch((state) => {
state[props.storeProp].taxes.push({ ...data })

9
resources/scripts/admin/components/estimate-invoice-common/CreateTotalTaxes.vue
View File

@@ -1,8 +1,11 @@
<template>
<div class="flex items-center justify-between w-full mt-2 text-sm">
<label class="font-semibold leading-5 text-gray-500 uppercase">
<label v-if="tax.calculation_type === 'percentage'" class="font-semibold leading-5 text-gray-500 uppercase">
{{ tax.name }} ({{ tax.percent }} %)
</label>
<label v-else class="font-semibold leading-5 text-gray-500 uppercase">
{{ tax.name }} (<BaseFormatMoney :amount="tax.fixed_amount" :currency="currency" />)
</label>
<label class="flex items-center justify-center text-lg text-black">
<BaseFormatMoney :amount="tax.amount" :currency="currency" />
@@ -52,6 +55,10 @@ const emit = defineEmits(['update', 'remove'])
const utils = inject('$utils')
const taxAmount = computed(() => {
if (props.tax.calculation_type === 'fixed') {
return props.tax.fixed_amount;
}
if (props.tax.compound_tax && props.store.getSubtotalWithDiscount) {
return Math.round(
((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) *

2
resources/scripts/admin/components/estimate-invoice-common/ExchangeRateConverter.vue
View File

@@ -10,7 +10,7 @@
<div v-if="hasActiveProvider && isEdit">
<BaseIcon
v-tooltip="{ content: 'Fetch Latest Exchange rate' }"
name="RefreshIcon"
name="ArrowPathIcon"
:class="`h-4 w-4 text-primary-500 cursor-pointer outline-none ${
isFetching
? ' animate-spin rotate-180 cursor-not-allowed pointer-events-none '

14
resources/scripts/admin/components/estimate-invoice-common/SelectTaxPopup.vue
View File

@@ -110,7 +110,12 @@
cursor-pointer
"
>
{{ taxType.percent }} %
<template v-if="taxType.calculation_type === 'fixed'">
<BaseFormatMoney :amount="taxType.fixed_amount" :currency="companyStore.selectedCompanyCurrency" />
</template>
<template v-else>
{{ taxType.percent }} %
</template>
</label>
</div>
</div>
@@ -173,9 +178,11 @@ import { useInvoiceStore } from '@/scripts/admin/stores/invoice'
import { useModalStore } from '@/scripts/stores/modal'
import { useTaxTypeStore } from '@/scripts/admin/stores/tax-type'
import { useUserStore } from '@/scripts/admin/stores/user'
import { useCompanyStore } from '@/scripts/admin/stores/company'
import abilities from '@/scripts/admin/stub/abilities'
import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseFormatMoney from '@/scripts/components/base/BaseFormatMoney.vue'
const props = defineProps({
type: {
@@ -197,10 +204,15 @@ const emit = defineEmits(['select:taxType'])
const modalStore = useModalStore()
const taxTypeStore = useTaxTypeStore()
const userStore = useUserStore()
const companyStore = useCompanyStore()
const { t } = useI18n()
const textSearch = ref(null)
const formatMoney = (amount) => {
return companyStore.formatMoney(amount)
}
const filteredTaxType = computed(() => {
if (textSearch.value) {
return taxTypeStore.taxTypes.filter(function (el) {

4
resources/scripts/admin/components/modal-components/BackupModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="onCancel"
/>
@@ -78,7 +78,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isCreateLoading"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>

4
resources/scripts/admin/components/modal-components/CategoryModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeCategoryModal"
/>
@@ -74,7 +74,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isSaving"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>

4
resources/scripts/admin/components/modal-components/CompanyModal.vue
View File

@@ -5,7 +5,7 @@
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeCompanyModal"
/>
@@ -117,7 +117,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isSaving"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>

8
resources/scripts/admin/components/modal-components/CustomerModal.vue
View File

@@ -9,7 +9,7 @@
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeCustomerModal"
/>
@@ -167,7 +167,7 @@
>
<template #right>
<BaseIcon
:name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
:name="isShowPassword ? 'EyeIcon' : 'EyeSlashIcon'"
class="mr-1 text-gray-500 cursor-pointer"
@click="isShowPassword = !isShowPassword"
/>
@@ -193,7 +193,7 @@
>
<template #right>
<BaseIcon
:name="isShowConfirmPassword ? 'EyeIcon' : 'EyeOffIcon'"
:name="isShowConfirmPassword ? 'EyeIcon' : 'EyeSlashIcon'"
class="mr-1 text-gray-500 cursor-pointer"
@click="isShowConfirmPassword = !isShowConfirmPassword"
/>
@@ -438,7 +438,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isLoading"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>

4
resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue
View File

@@ -9,7 +9,7 @@
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeExchangeRateModal"
/>
@@ -171,7 +171,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isSaving"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>

4
resources/scripts/admin/components/modal-components/FileDiskModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeDiskModal"
/>
@@ -40,7 +40,7 @@
>
<BaseIcon
v-if="!isRequestFire(slotProps)"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
class="w-6 mr-2"
/>

22
resources/scripts/admin/components/modal-components/ItemModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeItemModal"
/>
@@ -107,7 +107,7 @@
type="submit"
>
<template #left="slotProps">
<BaseIcon name="SaveIcon" :class="slotProps.class" />
<BaseIcon name="ArrowDownOnSquareIcon" :class="slotProps.class" />
</template>
{{ itemStore.isEdit ? $t('general.update') : $t('general.save') }}
</BaseButton>
@@ -178,7 +178,7 @@ const taxes = computed({
return {
...tax,
tax_type_id: tax.id,
tax_name: tax.name + ' (' + tax.percent + '%)',
tax_name: tax.name + ' (' + (tax.calculation_type === 'fixed' ? tax.fixed_amount : tax.percent) + (tax.calculation_type === 'fixed' ? companyStore.selectedCompanyCurrency.symbol : '%') + ')',
}
}
}),
@@ -217,7 +217,17 @@ const v$ = useVuelidate(
const getTaxTypes = computed(() => {
return taxTypeStore.taxTypes.map((tax) => {
return { ...tax, tax_name: tax.name + ' (' + tax.percent + '%)' }
const amount = tax.calculation_type === 'fixed'
? new Intl.NumberFormat(undefined, {
style: 'currency',
currency: companyStore.selectedCompanyCurrency.code
}).format(tax.fixed_amount / 100)
: `${tax.percent}%`
return {
...tax,
tax_name: `${tax.name} (${amount})`
}
})
})
@@ -238,8 +248,10 @@ async function submitItemData() {
taxes: itemStore.currentItem.taxes.map((tax) => {
return {
tax_type_id: tax.id,
amount: (price.value * tax.percent) / 100,
amount: tax.calculation_type === 'fixed' ? tax.fixed_amount : (price.value * tax.percent) / 100,
percent: tax.percent,
fixed_amount: tax.fixed_amount,
calculation_type: tax.calculation_type,
name: tax.name,
collective_tax: 0,
}

4
resources/scripts/admin/components/modal-components/ItemUnitModal.vue
View File

@@ -7,7 +7,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeItemUnitModal"
/>
@@ -58,7 +58,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isSaving"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>

2
resources/scripts/admin/components/modal-components/MailTestModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeTestModal"
/>

9
resources/scripts/admin/components/modal-components/NoteModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeNoteModal"
/>
@@ -45,6 +45,11 @@
class="mt-2"
/>
</BaseInputGroup>
<BaseSwitchSection
v-model="noteStore.currentNote.is_default"
:title="$t('settings.customization.notes.is_default')"
:description="$t('settings.customization.notes.is_default_description')"
_ />
<BaseInputGroup
:label="$t('settings.customization.notes.notes')"
@@ -89,7 +94,7 @@
type="submit"
>
<template #left="slotProps">
<BaseIcon name="SaveIcon" :class="slotProps.class" />
<BaseIcon name="ArrowDownOnSquareIcon" :class="slotProps.class" />
</template>
{{ noteStore.isEdit ? $t('general.update') : $t('general.save') }}
</BaseButton>

4
resources/scripts/admin/components/modal-components/PaymentModeModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closePaymentModeModal"
/>
@@ -48,7 +48,7 @@
type="submit"
>
<template #left="slotProps">
<BaseIcon name="SaveIcon" :class="slotProps.class" />
<BaseIcon name="ArrowDownOnSquareIcon" :class="slotProps.class" />
</template>
{{
paymentStore.currentPaymentMode.id

4
resources/scripts/admin/components/modal-components/RolesModal.vue
View File

@@ -5,7 +5,7 @@
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeRolesModal"
/>
@@ -140,7 +140,7 @@
type="submit"
>
<template #left="slotProps">
<BaseIcon name="SaveIcon" :class="slotProps.class" />
<BaseIcon name="ArrowDownOnSquareIcon" :class="slotProps.class" />
</template>
{{ !roleStore.isEdit ? $t('general.save') : $t('general.update') }}
</BaseButton>

4
resources/scripts/admin/components/modal-components/SelectTemplateModal.vue
View File

@@ -4,7 +4,7 @@
<div class="flex justify-between w-full">
{{ modalTitle }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeModal"
/>
@@ -76,7 +76,7 @@
</BaseButton>
<BaseButton variant="primary" @click="chooseTemplate()">
<template #left="slotProps">
<BaseIcon name="SaveIcon" :class="slotProps.class" />
<BaseIcon name="ArrowDownOnSquareIcon" :class="slotProps.class" />
</template>
{{ $t('general.choose') }}
</BaseButton>

4
resources/scripts/admin/components/modal-components/SendEstimateModal.vue
View File

@@ -8,7 +8,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeSendEstimateModal"
/>
@@ -82,7 +82,7 @@
class="mr-3"
@click="submitForm"
>
<BaseIcon v-if="!isLoading" name="PhotographIcon" class="h-5 mr-2" />
<BaseIcon v-if="!isLoading" name="PhotoIcon" class="h-5 mr-2" />
{{ $t('general.preview') }}
</BaseButton>
</div>

4
resources/scripts/admin/components/modal-components/SendInvoiceModal.vue
View File

@@ -8,7 +8,7 @@
<div class="flex justify-between w-full">
{{ modalTitle }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeSendInvoiceModal"
/>
@@ -88,7 +88,7 @@
<BaseIcon
v-if="!isLoading"
:class="slotProps.class"
name="PhotographIcon"
name="PhotoIcon"
/>
</template>
{{ $t('general.preview') }}

4
resources/scripts/admin/components/modal-components/SendPaymentModal.vue
View File

@@ -8,7 +8,7 @@
<div class="flex justify-between w-full">
{{ modalTitle }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeSendPaymentModal"
/>
@@ -88,7 +88,7 @@
<BaseIcon
v-if="!isLoading"
:class="slotProps.class"
name="PhotographIcon"
name="PhotoIcon"
/>
</template>
{{ $t('general.preview') }}

80
resources/scripts/admin/components/modal-components/TaxTypeModal.vue
View File

@@ -7,7 +7,7 @@
<div class="flex justify-between w-full">
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeTaxTypeModal"
/>
@@ -34,12 +34,28 @@
</BaseInputGroup>
<BaseInputGroup
:label="$t('tax_types.tax_type')"
variant="horizontal"
required
>
<BaseSelectInput
v-model="taxTypeStore.currentTaxType.calculation_type"
:options="[
{ id: 'percentage', label: $t('tax_types.percentage') },
{ id: 'fixed', label: $t('tax_types.fixed_amount') }
]"
:allow-empty="false"
value-prop="id"
label-prop="label"
track-by="label"
:searchable="false"
/>
</BaseInputGroup>
<BaseInputGroup
v-if="taxTypeStore.currentTaxType.calculation_type === 'percentage'"
:label="$t('tax_types.percent')"
variant="horizontal"
:error="
v$.currentTaxType.percent.$error &&
v$.currentTaxType.percent.$errors[0].$message
"
required
>
<BaseMoney
@@ -51,13 +67,18 @@
precision: 2,
masked: false,
}"
:invalid="v$.currentTaxType.percent.$error"
class="
relative
w-full
focus:border focus:border-solid focus:border-primary
"
@input="v$.currentTaxType.percent.$touch()"
/>
</BaseInputGroup>
<BaseInputGroup
v-else
:label="$t('tax_types.fixed_amount')"
variant="horizontal"
required
>
<BaseMoney
v-model="fixedAmount"
:currency="defaultCurrency"
/>
</BaseInputGroup>
@@ -105,7 +126,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isSaving"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>
@@ -127,6 +148,8 @@ import { computed, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import Guid from 'guid'
import TaxStub from '@/scripts/admin/stub/abilities'
import { useCompanyStore } from '@/scripts/admin/stores/company'
import {
required,
minLength,
@@ -148,6 +171,8 @@ const taxTypeStore = useTaxTypeStore()
const modalStore = useModalStore()
const notificationStore = useNotificationStore()
const estimateStore = useEstimateStore()
const companyStore = useCompanyStore()
const defaultCurrency = computed(() => companyStore.selectedCompanyCurrency)
const { t, tm } = useI18n()
let isSaving = ref(false)
@@ -162,6 +187,9 @@ const rules = computed(() => {
minLength(3)
),
},
calculation_type: {
required: helpers.withMessage(t('validation.required'), required),
},
percent: {
required: helpers.withMessage(t('validation.required'), required),
between: helpers.withMessage(
@@ -169,6 +197,9 @@ const rules = computed(() => {
between(-100, 100)
),
},
fixed_amount: {
required: helpers.withMessage(t('validation.required'), required),
},
description: {
maxLength: helpers.withMessage(
t('validation.description_maxlength', { count: 255 }),
@@ -206,16 +237,22 @@ async function submitTaxTypeData() {
function SelectTax(taxData) {
let amount = 0
if (estimateStore.getSubtotalWithDiscount && taxData.percent) {
amount = Math.round(
(estimateStore.getSubtotalWithDiscount * taxData.percent) / 100
)
if (estimateStore.getSubtotalWithDiscount) {
if (taxData.calculation_type === 'percentage') {
amount = Math.round(
(estimateStore.getSubtotalWithDiscount * taxData.percent) / 100
)
} else {
amount = taxData.fixed_amount
}
}
let data = {
...TaxStub,
id: Guid.raw(),
name: taxData.name,
calculation_type: taxData.calculation_type,
percent: taxData.percent,
fixed_amount: taxData.fixed_amount,
tax_type_id: taxData.id,
amount,
}
@@ -230,7 +267,9 @@ function selectItemTax(taxData) {
...TaxStub,
id: Guid.raw(),
name: taxData.name,
calculation_type: taxData.calculation_type,
percent: taxData.percent,
fixed_amount: taxData.fixed_amount,
tax_type_id: taxData.id,
}
modalStore.refreshData(data)
@@ -244,4 +283,11 @@ function closeTaxTypeModal() {
v$.value.$reset()
}, 300)
}
const fixedAmount = computed({
get: () => taxTypeStore.currentTaxType.fixed_amount / 100,
set: (value) => {
taxTypeStore.currentTaxType.fixed_amount = Math.round(value * 100)
},
})
</script>

4
resources/scripts/admin/components/modal-components/TaxationAddressModal.vue
View File

@@ -10,7 +10,7 @@
</p>
</div>
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="h-6 w-6 text-gray-500 cursor-pointer"
@click="closeModal"
/>
@@ -103,7 +103,7 @@
<template #left="slotProps">
<BaseIcon
v-if="!isLoading"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
:class="slotProps.class"
/>
</template>

4
resources/scripts/admin/components/modal-components/custom-fields/CustomFieldModal.vue
View File

@@ -5,7 +5,7 @@
{{ modalStore.title }}
<BaseIcon
name="XIcon"
name="XMarkIcon"
class="w-6 h-6 text-gray-500 cursor-pointer"
@click="closeCustomFieldModal"
/>
@@ -201,7 +201,7 @@
<BaseIcon
v-if="!isSaving"
:class="slotProps.class"
name="SaveIcon"
name="ArrowDownOnSquareIcon"
/>
</template>
{{