QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-07 05:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Tax included (#370)

Browse Source 
* feat: Tax included

* Added a toggle switch in tax settings to enable the feature.
* Database migration adding tax_included field into estimates, invoices
  and recurring invoices table.
* Toggle switch to enable and store the tax_included by estimates,
  invoices and recurring invoices.
* In case of tax included enabled, total taxes will be recalculated and
  the invoices, estimates and recurring invoices total won't be sum with
  taxes.
* Apply tax included when discount_per_item/tax_per_item item is enabled.
* Custom component to show the net total when tax included is enabled.
* Update invoice and estimates pdfs with net total.

* chore: Tax included by default

A switch button inside the tax settings to enable the tax included by
default in invoices, estimates and recurring invoices.
This commit is contained in:
Fabio Ribeiro
2025-08-28 10:28:24 +02:00
committed by GitHub
parent 08e1bb2e22
commit d69a56e2d5
32 changed files with 582 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,6 +169,9 @@ const taxAmount = computed(() => {
if (taxPerItemEnabled && !discountPerItemEnabled){
return getTaxAmount()
}
if (props.store[props.storeProp].tax_included) {
return Math.round(props.discountedTotal - (props.discountedTotal / (1 + (localTax.percent / 100))))
}
return (props.discountedTotal * localTax.percent) / 100
}
return 0
@@ -261,6 +264,7 @@ function getTaxAmount() {
const itemTotal = props.discountedTotal
const modelDiscount = props.store[props.storeProp].discount ? props.store[props.storeProp].discount : 0
const type = props.store[props.storeProp].discount_type
let discountedTotal = props.discountedTotal
if (modelDiscount > 0) {
props.store[props.storeProp].items.forEach((_i) => {
total += _i.total
@@ -268,10 +272,14 @@ function getTaxAmount() {
const proportion = (itemTotal / total).toFixed(2)
discount = type === 'fixed' ? modelDiscount * 100 : (total * modelDiscount) / 100
const itemDiscount = Math.round(discount * proportion)
const discounted = itemTotal - itemDiscount
return Math.round((discounted * localTax.percent) / 100)
discountedTotal = itemTotal - itemDiscount
}
return Math.round((props.discountedTotal * localTax.percent) / 100)
if (props.store[props.storeProp].tax_included) {
return Math.round(discountedTotal - (discountedTotal / (1 + (localTax.percent / 100))))
}
return Math.round((discountedTotal * localTax.percent) / 100)
}
</script>

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

@@ -1,4 +1,27 @@
<template>
<!-- Tax Included -->
<div
v-if="companyStore.selectedCompanySettings.tax_included === 'YES'"
class="
flex
items-center
justify-end
w-full
px-6
text-base
border border-b-0 border-gray-200 border-solid
cursor-pointer
text-primary-400
bg-white
"
>
<BaseSwitchSection
v-model="taxIncludedField"
:title="$t('settings.tax_types.tax_included')"
:store="store"
:store-prop="storeProp"
/>
</div>
<table class="text-center item-table min-w-full">
<colgroup>
<col style="width: 40%; min-width: 280px" />
@@ -191,4 +214,14 @@ const defaultCurrency = computed(() => {
return companyStore.selectedCompanyCurrency
}
})
const taxIncludedField = computed({
get: () => {
return props.store[props.storeProp].tax_included
},
set: async (value) => {
props.store[props.storeProp].tax_included = value
},
})
</script>

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

@@ -38,6 +38,17 @@
</label>
</div>
<div
v-if="store[storeProp].tax_per_item === 'YES'"
>
<NetTotal
:currency="currency"
:store="store"
:storeProp="storeProp"
:isLoading="isLoading"
/>
</div>
<div
v-for="tax in itemWiseTaxes"
:key="tax.tax_type_id"
@@ -135,6 +146,21 @@
</div>
</div>
<div
v-if="
store[storeProp].tax_per_item === 'NO' ||
store[storeProp].tax_per_item === null
"
class="flex items-center justify-between w-full mt-2"
>
<NetTotal
:currency="currency"
:store="store"
:storeProp="storeProp"
:isLoading="isLoading"
/>
</div>
<div
v-if="
store[storeProp].tax_per_item === 'NO' ||
@@ -149,6 +175,7 @@
:taxes="taxes"
:currency="currency"
:store="store"
:storeProp="storeProp"
@remove="removeTax"
@update="updateTax"
/>
@@ -198,6 +225,7 @@
<script setup>
import { computed, inject, ref, watch } from 'vue'
import Guid from 'guid'
import NetTotal from './NetTotal.vue'
import Tax from './CreateTotalTaxes.vue'
import TaxStub from '@/scripts/admin/stub/abilities'
import SelectTaxPopup from './SelectTaxPopup.vue'

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

@@ -42,6 +42,10 @@ const props = defineProps({
type: Object,
default: null,
},
storeProp: {
type: String,
default: '',
},
data: {
type: String,
default: '',
@@ -64,6 +68,13 @@ const taxAmount = computed(() => {
100
)
}
if (props.store.getSubtotalWithDiscount && props.tax.percent && props.store[props.storeProp].tax_included) {
return Math.round(
props.store.getSubtotalWithDiscount - (
props.store.getSubtotalWithDiscount / (1 + (props.tax.percent / 100))
)
)
}
if (props.store.getSubtotalWithDiscount && props.tax.percent) {
return Math.round(
(props.store.getSubtotalWithDiscount * props.tax.percent) / 100
@@ -81,6 +92,13 @@ watchEffect(() => {
}
})
watch(
() => props.store[props.storeProp].tax_included,
(val) => {
updateTax()
}, { deep: true },
)
function updateTax() {
emit('update', {
...props.tax,

54
resources/scripts/admin/components/estimate-invoice-common/NetTotal.vue Normal file
View File

@@ -0,0 +1,54 @@
<template>
<div
v-if="store[storeProp].tax_included"
class="flex items-center justify-between w-full"
>
<BaseContentPlaceholders v-if="isLoading">
<BaseContentPlaceholdersText :lines="1" class="w-16 h-5" />
</BaseContentPlaceholders>
<label
v-else
class="text-sm font-semibold leading-5 text-gray-500 uppercase"
>
{{ $t('estimates.net_total') }}
</label>
<BaseContentPlaceholders v-if="isLoading">
<BaseContentPlaceholdersText :lines="1" class="w-16 h-5" />
</BaseContentPlaceholders>
<label
v-else
class="flex items-center justify-center m-0 text-lg text-black uppercase "
>
<BaseFormatMoney
:amount="store.getNetTotal"
:currency="currency"
/>
</label>
</div>
</template>
<script setup>
import BaseContentPlaceholdersText from '@/scripts/components/base/BaseContentPlaceholdersText.vue'
import BaseContentPlaceholders from '@/scripts/components/base/BaseContentPlaceholders.vue'
import BaseFormatMoney from '@/scripts/components/base/BaseFormatMoney.vue'
const props = defineProps({
store: {
type: Object,
default: null,
},
storeProp: {
type: String,
default: '',
},
currency: {
type: [Object, String],
default: '',
},
isLoading: {
type: Boolean,
default: false,
},
})
</script>

71
resources/scripts/admin/stores/estimate.js vendored
View File

@@ -44,6 +44,9 @@ export const useEstimateStore = (useWindow = false) => {
return a + b['total']
}, 0)
},
getNetTotal() {
return this.getSubtotalWithDiscount - this.getTotalTax
},
getTotalSimpleTax() {
return _.sumBy(this.newEstimate.taxes, function (tax) {
if (!tax.compound_tax) {
@@ -79,6 +82,9 @@ export const useEstimateStore = (useWindow = false) => {
},
getTotal() {
if (this.newEstimate.tax_included) {
return this.getSubtotalWithDiscount
}
return this.getSubtotalWithDiscount + this.getTotalTax
},
@@ -149,7 +155,7 @@ export const useEstimateStore = (useWindow = false) => {
resolve(response)
})
.catch((err) => {
console.log(err);
console.log(err)
handleError(err)
reject(err)
})
@@ -160,20 +166,19 @@ export const useEstimateStore = (useWindow = false) => {
Object.assign(this.newEstimate, estimate)
if (this.newEstimate.tax_per_item === 'YES') {
this.newEstimate.items.forEach((_i) => {
if (_i.taxes && !_i.taxes.length){
if (_i.taxes && !_i.taxes.length) {
_i.taxes.push({ ...taxStub, id: Guid.raw() })
}
})
}
if (this.newEstimate.discount_per_item === 'YES') {
this.newEstimate.items.forEach((_i, index) => {
if (_i.discount_type === 'fixed'){
if (_i.discount_type === 'fixed') {
this.newEstimate.items[index].discount = _i.discount / 100
}
})
}
else {
if (this.newEstimate.discount_type === 'fixed'){
} else {
if (this.newEstimate.discount_type === 'fixed') {
this.newEstimate.discount = this.newEstimate.discount / 100
}
}
@@ -182,19 +187,23 @@ export const useEstimateStore = (useWindow = false) => {
setCustomerAddresses(customer) {
const customer_business = customer.customer_business
if (customer_business?.billing_address){
this.newEstimate.customer.billing_address = customer_business.billing_address
if (customer_business?.billing_address) {
this.newEstimate.customer.billing_address =
customer_business.billing_address
}
if (customer_business?.shipping_address){
this.newEstimate.customer.shipping_address = customer_business.shipping_address
if (customer_business?.shipping_address) {
this.newEstimate.customer.shipping_address =
customer_business.shipping_address
}
},
addSalesTaxUs() {
const taxTypeStore = useTaxTypeStore()
let salesTax = { ...taxStub }
let found = this.newEstimate.taxes.find((_t) => _t.name === 'Sales Tax' && _t.type === 'MODULE')
let found = this.newEstimate.taxes.find(
(_t) => _t.name === 'Sales Tax' && _t.type === 'MODULE',
)
if (found) {
for (const key in found) {
if (Object.prototype.hasOwnProperty.call(salesTax, key)) {
@@ -202,10 +211,10 @@ export const useEstimateStore = (useWindow = false) => {
}
}
salesTax.id = found.tax_type_id
console.log(salesTax, 'salesTax');
console.log(salesTax, 'salesTax')
taxTypeStore.taxTypes.push(salesTax)
console.log(taxTypeStore.taxTypes);
console.log(taxTypeStore.taxTypes)
}
},
@@ -261,7 +270,7 @@ export const useEstimateStore = (useWindow = false) => {
.post(`/api/v1/estimates/delete`, id)
.then((response) => {
let index = this.estimates.findIndex(
(estimate) => estimate.id === id
(estimate) => estimate.id === id,
)
this.estimates.splice(index, 1)
@@ -288,7 +297,7 @@ export const useEstimateStore = (useWindow = false) => {
.then((response) => {
this.selectedEstimates.forEach((estimate) => {
let index = this.estimates.findIndex(
(_est) => _est.id === estimate.id
(_est) => _est.id === estimate.id,
)
this.estimates.splice(index, 1)
})
@@ -313,7 +322,7 @@ export const useEstimateStore = (useWindow = false) => {
.put(`/api/v1/estimates/${data.id}`, data)
.then((response) => {
let pos = this.estimates.findIndex(
(estimate) => estimate.id === response.data.data.id
(estimate) => estimate.id === response.data.data.id,
)
this.estimates[pos] = response.data.data
const notificationStore = useNotificationStore()
@@ -355,7 +364,7 @@ export const useEstimateStore = (useWindow = false) => {
.post(`/api/v1/estimates/${data.id}/status`, data)
.then((response) => {
let pos = this.estimates.findIndex(
(estimate) => estimate.id === data.id
(estimate) => estimate.id === data.id,
)
if (this.estimates[pos]) {
this.estimates[pos].status = 'ACCEPTED'
@@ -402,7 +411,7 @@ export const useEstimateStore = (useWindow = false) => {
.post(`/api/v1/estimates/${data.id}/status`, data)
.then((response) => {
let pos = this.estimates.findIndex(
(estimate) => estimate.id === data.id
(estimate) => estimate.id === data.id,
)
if (this.estimates[pos]) {
this.estimates[pos].status = 'SENT'
@@ -570,17 +579,26 @@ export const useEstimateStore = (useWindow = false) => {
if (!isEdit) {
await notesStore.fetchNotes()
this.newEstimate.notes = notesStore.getDefaultNoteForType('Estimate')?.notes
this.newEstimate.notes =
notesStore.getDefaultNoteForType('Estimate')?.notes
this.newEstimate.tax_per_item =
companyStore.selectedCompanySettings.tax_per_item
this.newEstimate.sales_tax_type = companyStore.selectedCompanySettings.sales_tax_type
this.newEstimate.sales_tax_address_type = companyStore.selectedCompanySettings.sales_tax_address_type
this.newEstimate.sales_tax_type =
companyStore.selectedCompanySettings.sales_tax_type
this.newEstimate.sales_tax_address_type =
companyStore.selectedCompanySettings.sales_tax_address_type
this.newEstimate.discount_per_item =
companyStore.selectedCompanySettings.discount_per_item
this.newEstimate.estimate_date = moment().format('YYYY-MM-DD')
if (companyStore.selectedCompanySettings.estimate_set_expiry_date_automatically === 'YES') {
if (
companyStore.selectedCompanySettings
.estimate_set_expiry_date_automatically === 'YES'
) {
this.newEstimate.expiry_date = moment()
.add(companyStore.selectedCompanySettings.estimate_expiry_date_days, 'days')
.add(
companyStore.selectedCompanySettings.estimate_expiry_date_days,
'days',
)
.format('YYYY-MM-DD')
}
} else {
@@ -607,9 +625,10 @@ export const useEstimateStore = (useWindow = false) => {
}
this.setTemplate(this.templates[0].name)
this.newEstimate.template_name =
userStore.currentUserSettings.default_estimate_template ?
userStore.currentUserSettings.default_estimate_template : this.newEstimate.template_name
this.newEstimate.template_name = userStore.currentUserSettings
.default_estimate_template
? userStore.currentUserSettings.default_estimate_template
: this.newEstimate.template_name
}
if (isEdit) {

58
resources/scripts/admin/stores/invoice.js vendored
View File

@@ -51,6 +51,10 @@ export const useInvoiceStore = (useWindow = false) => {
}, 0)
},
getNetTotal() {
return this.getSubtotalWithDiscount - this.getTotalTax
},
getTotalSimpleTax() {
return _.sumBy(this.newInvoice.taxes, function (tax) {
if (!tax.compound_tax) {
@@ -86,6 +90,9 @@ export const useInvoiceStore = (useWindow = false) => {
},
getTotal() {
if (this.newInvoice.tax_included) {
return this.getSubtotalWithDiscount
}
return this.getSubtotalWithDiscount + this.getTotalTax
},
@@ -160,8 +167,7 @@ export const useInvoiceStore = (useWindow = false) => {
if (_i.discount_type === 'fixed')
this.newInvoice.items[index].discount = _i.discount / 100
})
}
else {
} else {
if (this.newInvoice.discount_type === 'fixed')
this.newInvoice.discount = this.newInvoice.discount / 100
}
@@ -171,16 +177,20 @@ export const useInvoiceStore = (useWindow = false) => {
const customer_business = customer.customer_business
if (customer_business?.billing_address)
this.newInvoice.customer.billing_address = customer_business.billing_address
this.newInvoice.customer.billing_address =
customer_business.billing_address
if (customer_business?.shipping_address)
this.newInvoice.customer.shipping_address = customer_business.shipping_address
this.newInvoice.customer.shipping_address =
customer_business.shipping_address
},
addSalesTaxUs() {
const taxTypeStore = useTaxTypeStore()
let salesTax = { ...taxStub }
let found = this.newInvoice.taxes.find((_t) => _t.name === 'Sales Tax' && _t.type === 'MODULE')
let found = this.newInvoice.taxes.find(
(_t) => _t.name === 'Sales Tax' && _t.type === 'MODULE',
)
if (found) {
for (const key in found) {
if (Object.prototype.hasOwnProperty.call(salesTax, key)) {
@@ -237,7 +247,7 @@ export const useInvoiceStore = (useWindow = false) => {
.post(`/api/v1/invoices/delete`, id)
.then((response) => {
let index = this.invoices.findIndex(
(invoice) => invoice.id === id
(invoice) => invoice.id === id,
)
this.invoices.splice(index, 1)
@@ -261,7 +271,7 @@ export const useInvoiceStore = (useWindow = false) => {
.then((response) => {
this.selectedInvoices.forEach((invoice) => {
let index = this.invoices.findIndex(
(_inv) => _inv.id === invoice.id
(_inv) => _inv.id === invoice.id,
)
this.invoices.splice(index, 1)
})
@@ -286,7 +296,7 @@ export const useInvoiceStore = (useWindow = false) => {
.put(`/api/v1/invoices/${data.id}`, data)
.then((response) => {
let pos = this.invoices.findIndex(
(invoice) => invoice.id === response.data.data.id
(invoice) => invoice.id === response.data.data.id,
)
this.invoices[pos] = response.data.data
@@ -328,7 +338,7 @@ export const useInvoiceStore = (useWindow = false) => {
.post(`/api/v1/invoices/${data.id}/status`, data)
.then((response) => {
let pos = this.invoices.findIndex(
(invoices) => invoices.id === data.id
(invoices) => invoices.id === data.id,
)
if (this.invoices[pos]) {
@@ -493,26 +503,35 @@ export const useInvoiceStore = (useWindow = false) => {
}
let editActions = []
if (!isEdit) {
await notesStore.fetchNotes()
this.newInvoice.notes = notesStore.getDefaultNoteForType('Invoice')?.notes
this.newInvoice.notes =
notesStore.getDefaultNoteForType('Invoice')?.notes
this.newInvoice.tax_per_item =
companyStore.selectedCompanySettings.tax_per_item
this.newInvoice.sales_tax_type = companyStore.selectedCompanySettings.sales_tax_type
this.newInvoice.sales_tax_address_type = companyStore.selectedCompanySettings.sales_tax_address_type
this.newInvoice.sales_tax_type =
companyStore.selectedCompanySettings.sales_tax_type
this.newInvoice.sales_tax_address_type =
companyStore.selectedCompanySettings.sales_tax_address_type
this.newInvoice.discount_per_item =
companyStore.selectedCompanySettings.discount_per_item
let dateFormat = 'YYYY-MM-DD';
let dateFormat = 'YYYY-MM-DD'
if (companyStore.selectedCompanySettings.invoice_use_time === 'YES') {
dateFormat += ' HH:mm'
}
this.newInvoice.invoice_date = moment().format(dateFormat)
if (companyStore.selectedCompanySettings.invoice_set_due_date_automatically === 'YES') {
if (
companyStore.selectedCompanySettings
.invoice_set_due_date_automatically === 'YES'
) {
this.newInvoice.due_date = moment()
.add(companyStore.selectedCompanySettings.invoice_due_date_days, 'days')
.add(
companyStore.selectedCompanySettings.invoice_due_date_days,
'days',
)
.format('YYYY-MM-DD')
}
} else {
@@ -539,9 +558,10 @@ export const useInvoiceStore = (useWindow = false) => {
if (res3.data) {
this.setTemplate(this.templates[0].name)
this.newInvoice.template_name =
userStore.currentUserSettings.default_invoice_template ?
userStore.currentUserSettings.default_invoice_template : this.newInvoice.template_name
this.newInvoice.template_name = userStore.currentUserSettings
.default_invoice_template
? userStore.currentUserSettings.default_invoice_template
: this.newInvoice.template_name
}
}
if (isEdit) {

108
resources/scripts/admin/stores/recurring-invoice.js vendored
View File

@@ -37,17 +37,56 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
},
frequencies: [
{ label: global.t('recurring_invoices.frequency.every_minute'), value: '* * * * *' },
{ label: global.t('recurring_invoices.frequency.every_30_minute'), value: '*/30 * * * *' },
{ label: global.t('recurring_invoices.frequency.every_hour'), value: '0 * * * *' },
{ label: global.t('recurring_invoices.frequency.every_2_hour'), value: '0 */2 * * *' },
{ label: global.t('recurring_invoices.frequency.every_day_at_midnight'), value: '0 0 * * *' },
{ label: global.t('recurring_invoices.frequency.every_week'), value: '0 0 * * 0' },
{ label: global.t('recurring_invoices.frequency.every_15_days_at_midnight'), value: '0 5 */15 * *' },
{ label: global.t('recurring_invoices.frequency.on_the_first_day_of_every_month_at_midnight'), value: '0 0 1 * *' },
{ label: global.t('recurring_invoices.frequency.every_6_month'), value: '0 0 1 */6 *' },
{ label: global.t('recurring_invoices.frequency.every_year_on_the_first_day_of_january_at_midnight'), value: '0 0 1 1 *' },
{ label: global.t('recurring_invoices.frequency.custom'), value: 'CUSTOM' },
{
label: global.t('recurring_invoices.frequency.every_minute'),
value: '* * * * *',
},
{
label: global.t('recurring_invoices.frequency.every_30_minute'),
value: '*/30 * * * *',
},
{
label: global.t('recurring_invoices.frequency.every_hour'),
value: '0 * * * *',
},
{
label: global.t('recurring_invoices.frequency.every_2_hour'),
value: '0 */2 * * *',
},
{
label: global.t('recurring_invoices.frequency.every_day_at_midnight'),
value: '0 0 * * *',
},
{
label: global.t('recurring_invoices.frequency.every_week'),
value: '0 0 * * 0',
},
{
label: global.t(
'recurring_invoices.frequency.every_15_days_at_midnight',
),
value: '0 5 */15 * *',
},
{
label: global.t(
'recurring_invoices.frequency.on_the_first_day_of_every_month_at_midnight',
),
value: '0 0 1 * *',
},
{
label: global.t('recurring_invoices.frequency.every_6_month'),
value: '0 0 1 */6 *',
},
{
label: global.t(
'recurring_invoices.frequency.every_year_on_the_first_day_of_january_at_midnight',
),
value: '0 0 1 1 *',
},
{
label: global.t('recurring_invoices.frequency.custom'),
value: 'CUSTOM',
},
],
}),
@@ -60,6 +99,10 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
)
},
getNetTotal() {
return this.getSubtotalWithDiscount - this.getTotalTax
},
getTotalSimpleTax() {
return _.sumBy(this.newRecurringInvoice.taxes, function (tax) {
if (!tax.compound_tax) {
@@ -95,6 +138,9 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
},
getTotal() {
if (this.newRecurringInvoice.tax_included) {
return this.getSubtotalWithDiscount
}
return this.getSubtotalWithDiscount + this.getTotalTax
},
},
@@ -174,7 +220,7 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
})
let pos = this.recurringInvoices.findIndex(
(invoice) => invoice.id === response.data.data.id
(invoice) => invoice.id === response.data.data.id,
)
this.recurringInvoices[pos] = response.data.data
@@ -240,7 +286,7 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
.post(`/api/v1/recurring-invoices/delete`, id)
.then((response) => {
let index = this.recurringInvoices.findIndex(
(invoice) => invoice.id === id
(invoice) => invoice.id === id,
)
this.recurringInvoices.splice(index, 1)
resolve(response)
@@ -265,7 +311,7 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
.then((response) => {
this.selectedRecurringInvoices.forEach((invoice) => {
let index = this.recurringInvoices.findIndex(
(_inv) => _inv.id === invoice.id
(_inv) => _inv.id === invoice.id,
)
this.recurringInvoices.splice(index, 1)
})
@@ -305,7 +351,7 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
this.selectAllField = false
} else {
let allInvoiceIds = this.recurringInvoices.map(
(invoice) => invoice.id
(invoice) => invoice.id,
)
this.selectedRecurringInvoices = allInvoiceIds
this.selectAllField = true
@@ -351,13 +397,16 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
// on create
if (!isEdit) {
await notesStore.fetchNotes()
this.newRecurringInvoice.notes = notesStore.getDefaultNoteForType('Invoice')?.notes
this.newRecurringInvoice.notes =
notesStore.getDefaultNoteForType('Invoice')?.notes
this.newRecurringInvoice.tax_per_item =
companyStore.selectedCompanySettings.tax_per_item
this.newRecurringInvoice.discount_per_item =
companyStore.selectedCompanySettings.discount_per_item
this.newRecurringInvoice.sales_tax_type = companyStore.selectedCompanySettings.sales_tax_type
this.newRecurringInvoice.sales_tax_address_type = companyStore.selectedCompanySettings.sales_tax_address_type
this.newRecurringInvoice.sales_tax_type =
companyStore.selectedCompanySettings.sales_tax_type
this.newRecurringInvoice.sales_tax_address_type =
companyStore.selectedCompanySettings.sales_tax_address_type
this.newRecurringInvoice.starts_at = moment().format('YYYY-MM-DD')
this.newRecurringInvoice.next_invoice_date = moment()
.add(7, 'days')
@@ -399,7 +448,7 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
this.isFetchingInitialSettings = false
})
.catch((err) => {
console.log(err);
console.log(err)
handleError(err)
})
},
@@ -407,7 +456,9 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
addSalesTaxUs() {
const taxTypeStore = useTaxTypeStore()
let salesTax = { ...TaxStub }
let found = this.newRecurringInvoice.taxes.find((_t) => _t.name === 'Sales Tax' && _t.type === 'MODULE')
let found = this.newRecurringInvoice.taxes.find(
(_t) => _t.name === 'Sales Tax' && _t.type === 'MODULE',
)
if (found) {
for (const key in found) {
if (Object.prototype.hasOwnProperty.call(salesTax, key)) {
@@ -424,14 +475,15 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
},
setSelectedFrequency() {
let data = this.frequencies.find(
(frequency) => {
return frequency.value === this.newRecurringInvoice.frequency
}
)
data ? this.newRecurringInvoice.selectedFrequency = data
: this.newRecurringInvoice.selectedFrequency = { label: 'Custom', value: 'CUSTOM' }
let data = this.frequencies.find((frequency) => {
return frequency.value === this.newRecurringInvoice.frequency
})
data
? (this.newRecurringInvoice.selectedFrequency = data)
: (this.newRecurringInvoice.selectedFrequency = {
label: 'Custom',
value: 'CUSTOM',
})
},
resetSelectedNote() {

1
resources/scripts/admin/stub/estimate.js vendored
View File

@@ -8,6 +8,7 @@ export default function () {
customer: null,
template_name: '',
tax_per_item: null,
tax_included: false,
sales_tax_type: null,
sales_tax_address_type: null,
discount_per_item: null,

1
resources/scripts/admin/stub/invoice.js vendored
View File

@@ -20,6 +20,7 @@ export default function () {
sub_total: 0,
total: 0,
tax_per_item: null,
tax_included: false,
sales_tax_type: null,
sales_tax_address_type: null,
discount_per_item: null,

8
resources/scripts/admin/views/estimates/create/EstimateCreate.vue
View File

@@ -249,6 +249,14 @@ customFieldStore.resetCustomFields()
v$.value.$reset
estimateStore.fetchEstimateInitialSettings(isEdit.value)
watch(
() => companyStore.selectedCompanySettings?.tax_included_by_default,
(newVal) => {
estimateStore.newEstimate.tax_included = newVal === 'YES'
},
{immediate: true}
)
async function submitForm() {
v$.value.$touch()

8
resources/scripts/admin/views/invoices/create/InvoiceCreate.vue
View File

@@ -253,6 +253,14 @@ watch(
}
)
watch(
() => companyStore.selectedCompanySettings?.tax_included_by_default,
(newVal) => {
invoiceStore.newInvoice.tax_included = newVal === 'YES'
},
{immediate: true}
)
async function submitForm() {
v$.value.$touch()

8
resources/scripts/admin/views/recurring-invoices/create/RecurringInvoiceCreate.vue
View File

@@ -277,6 +277,14 @@ watch(
}
)
watch(
() => companyStore.selectedCompanySettings?.tax_included_by_default,
(newVal) => {
recurringInvoiceStore.newRecurringInvoice.tax_included = newVal === 'YES'
},
{immediate: true}
)
async function submitForm() {
v$.value.$touch()

70
resources/scripts/admin/views/settings/TaxTypesSetting.vue
View File

@@ -52,6 +52,21 @@
:title="$t('settings.tax_types.tax_per_item')"
:description="$t('settings.tax_types.tax_setting_description')"
/>
<BaseDivider class="mt-8 mb-2" />
<BaseSwitchSection
v-model="taxIncludedField"
:title="$t('settings.tax_types.tax_included')"
:description="$t('settings.tax_types.tax_included_description')"
/>
<BaseSwitchSection
v-if="taxIncludedField"
v-model="taxIncludedByDefaultField"
:title="$t('settings.tax_types.tax_included_by_default')"
:description="$t('settings.tax_types.tax_included_by_default_description')"
/>
</div>
</BaseSettingCard>
</template>
@@ -139,6 +154,61 @@ const taxPerItemField = computed({
},
})
const taxIncludedSettings = reactive({
tax_included: 'NO',
tax_included_by_default: 'NO',
})
utils.mergeSettings(taxIncludedSettings, {
...companyStore.selectedCompanySettings,
})
const taxIncludedField = computed({
get: () => {
return taxIncludedSettings.tax_included === 'YES'
},
set: async (newValue) => {
const value = newValue ? 'YES' : 'NO'
taxIncludedSettings.tax_included = value
if (!newValue) {
taxIncludedSettings.tax_included_by_default = 'NO'
}
let data = {
settings: {
...taxIncludedSettings,
},
}
await companyStore.updateCompanySettings({
data,
message: 'general.setting_updated',
})
},
})
const taxIncludedByDefaultField = computed({
get: () => {
return taxIncludedSettings.tax_included_by_default === 'YES'
},
set: async (newValue) => {
const value = newValue ? 'YES' : 'NO'
taxIncludedSettings.tax_included_by_default = value
let data = {
settings: {
tax_included_by_default: taxIncludedSettings.tax_included_by_default,
},
}
await companyStore.updateCompanySettings({
data,
message: 'general.setting_updated',
})
},
})
function hasAtleastOneAbility() {
return userStore.hasAbilities([
abilities.DELETE_TAX_TYPE,