[CORE-4237] Vat tax exempt status not always set properly - Blesta

Details

Type: Bug
Status: Closed
Priority: Major
Resolution: Fixed
Affects Version/s: None
Fix Version/s: 5.1.0-b1
Component/s: None
Labels:
None

Description

To reproduce:

Enable vat validation
Create a client without a vat id
Edit the client to use a valid vat id and a different country than the one they were created with
Revisit the edit page and see that the client is not marked as tax exempt

The reason this bug occurs is that the Clients model looks at the client's country to validate the tax_id setting, but it does so while in a transaction and thus fetches the previous country and not the newly submitted one. To fix this we'll need to resave the tax_id after the country change has been commited.

To resolve:

In Clients::setSettings() change

        if (
            $company_settings['enable_eu_vat'] == 'true'
            && $company_settings['tax_exempt_eu_vat'] == 'true'
            && isset($vars['tax_exempt'])
            && isset($vars['tax_id'])
            && in_array($client->country, $europe_tax->getCountries())
        ) {

        if (
            $company_settings['enable_eu_vat'] == 'true'
            && $company_settings['tax_exempt_eu_vat'] == 'true'
            && isset($vars['tax_id'])
            && in_array($client->country, $europe_tax->getCountries())
        ) {

In AdminClients::edit() change

                // Success, commit
                $this->Clients->commit();

                $this->flashMessage('message', Language::_('AdminClients.!success.client_updated', true));
                $this->redirect($this->base_uri . 'clients/view/' . $client->id . '/');

                // Success, commit
                $this->Clients->commit();
                if (isset($settings['tax_id'])) {
                    $this->Clients->setSettings(
                        $client->id,
                        ['tax_id' => $settings['tax_id']],
                        ['tax_id', 'tax_exempt']
                    );
                }

                $this->flashMessage('message', Language::_('AdminClients.!success.client_updated', true));
                $this->redirect($this->base_uri . 'clients/view/' . $client->id . '/');

In ClientMain::edit() change

                // Success, commit
                $this->Clients->commit();

                $this->flashMessage('message', Language::_('ClientMain.!success.client_updated', true));
                $this->redirect($this->base_uri);

                // Success, commit
                $this->Clients->commit();
                if (isset($new_client_settings['tax_id'])) {
                    $this->Clients->setSettings(
                        $this->client->id,
                        ['tax_id' => $new_client_settings['tax_id']],
                        ['tax_id', 'tax_exempt']
                    );
                }

                $this->flashMessage('message', Language::_('ClientMain.!success.client_updated', true));
                $this->redirect($this->base_uri);

In Clients::create() change

            // Success, commit
            $this->commit();

            $client = $this->get($client_id);

            // Success, commit
            $this->commit();

            if (isset($vars['settings']['tax_id'])) {
                $this->setSettings(
                    $vars['client_id'],
                    ['tax_id' => $vars['settings']['tax_id']],
                    ['tax_id', 'tax_exempt']
                );
            }

            $client = $this->get($client_id);

Activity

Ascending order - Click to sort in descending order

Jonathan Reissmueller created issue - 27/Apr/21 5:53 PM

Jonathan Reissmueller made changes - 27/Apr/21 5:53 PM

Field	Original Value	New Value
Rank		Ranked higher

Jonathan Reissmueller made changes - 27/Apr/21 5:56 PM

Rank

Ranked higher

Jonathan Reissmueller made changes - 27/Apr/21 6:09 PM

Description

To reproduce:
* Enable vat validation
* Create a client without a vat id
* Edit the client to use a valid vat id and a different country than the one they were created with
* Revisit the edit page and see that the client is not marked as tax exempt

The reason this bug occurs is that the Clients model looks at the client's country to validate the tax_id setting, but it does so while in a transaction and thus fetches the previous country and not the newly submitted one. To fix this we'll need to resave the tax_id after the country change has been commited.

To resolve:

In Clients::setSettings() change
{code:java}
        if (
            $company_settings['enable_eu_vat'] == 'true'
            && $company_settings['tax_exempt_eu_vat'] == 'true'
            && isset($vars['tax_exempt'])
            && isset($vars['tax_id'])
            && in_array($client->country, $europe_tax->getCountries())
        ) {
{code}
To
{code:java}
        if (
            $company_settings['enable_eu_vat'] == 'true'
            && $company_settings['tax_exempt_eu_vat'] == 'true'
            && isset($vars['tax_id'])
            && in_array($client->country, $europe_tax->getCountries())
        ) {
{code}

In AdminClients::edit() change
{code:java}
                // Success, commit
                $this->Clients->commit();

                $this->flashMessage('message', Language::_('AdminClients.!success.client_updated', true));
                $this->redirect($this->base_uri . 'clients/view/' . $client->id . '/');
{code}
To
{code:java}
                // Success, commit
                $this->Clients->commit();
                if (isset($settings['tax_id'])) {
                    $this->Clients->setSettings(
                        $client->id,
                        ['tax_id' => $settings['tax_id']],
                        ['tax_id', 'tax_exempt']
                    );
                }

                $this->flashMessage('message', Language::_('AdminClients.!success.client_updated', true));
                $this->redirect($this->base_uri . 'clients/view/' . $client->id . '/');
{code}

In ClientMain::edit() change
{code:java}
                // Success, commit
                $this->Clients->commit();

                $this->flashMessage('message', Language::_('ClientMain.!success.client_updated', true));
                $this->redirect($this->base_uri);
{code}
To
{code:java}
                // Success, commit
                $this->Clients->commit();
                if (isset($new_client_settings['tax_id'])) {
                    $this->Clients->setSettings(
                        $this->client->id,
                        ['tax_id' => $new_client_settings['tax_id']],
                        ['tax_id', 'tax_exempt']
                    );
                }

                $this->flashMessage('message', Language::_('ClientMain.!success.client_updated', true));
                $this->redirect($this->base_uri);
{code}

Jonathan Reissmueller made changes - 28/Apr/21 12:51 PM

Sprint

5.1.0 Sprint 5 [ 132 ]

Jonathan Reissmueller made changes - 28/Apr/21 12:51 PM

Rank

Ranked higher

Jonathan Reissmueller made changes - 30/Apr/21 6:06 PM

Status

Open [ 1 ]

In Progress [ 3 ]

Jonathan Reissmueller made changes - 30/Apr/21 6:25 PM

Status	In Progress [ 3 ]	In Review [ 5 ]
Resolution		Fixed [ 1 ]

Jonathan Reissmueller made changes - 03/May/21 11:00 AM

Remaining Estimate		0 minutes [ 0 ]
Time Spent		16 minutes [ 960 ]
Worklog Id	14902 [ 14902 ]

Jonathan Reissmueller made changes - 04/May/21 3:18 PM

Status

In Review [ 5 ]

Closed [ 6 ]

People

Assignee:

Jonathan Reissmueller

Reporter:

Jonathan Reissmueller

Votes:

0 Vote for this issue

Watchers:

1 Start watching this issue

Dates

Created:

27/Apr/21 5:53 PM

Updated:

04/May/21 3:18 PM

Resolved:

30/Apr/21 6:25 PM

Fix Release Date:

8/Jun/21

Time Tracking

Estimated:

Not Specified

Remaining:

Logged:

16m

Agile

Completed Sprint:

5.1.0 Sprint 5 ended 18/May/21
View on Board