[CORE-4784] Domain Manager: Expiration notice is based on renew date instead of expiration - Blesta

Details

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

Description

The issue is clearly seen in the code. We fetch services based on renewal date (see plugins/domains/domains_plugin.php around line 1258).

Potential solution: Update plugins/domains/domains_plugin.php around line 1258 from

            $services = $this->Services->getAll(
                ['date_added' => 'DESC'],
                true,
                [],
                [
                    'services' => [
                        'package_group_id' => $settings['domains_package_group'],
                        ['column' => 'date_renews', 'operator' => '>=', 'value' => $start_date],
                        ['column' => 'date_renews', 'operator' => '<=', 'value' => $end_date]
                    ]
                ]
            );

            $domains = $this->Record->select()->
                from('domains_domains')->
                where('expiration_date', '>=', $start_date)->
                where('expiration_date', '<=', $end_date)->
                fetchAll();
            $service_ids = array_values($this->Form->collapseObjectArray($domains, 'service_id', 'service_id'));

            // Fetch all qualifying services
            $services = [];
            if (!empty($service_ids)) {
                $services = $this->Services->getAll(
                    ['date_added' => 'DESC'],
                    true,
                    [],
                    [
                        'services' => [
                            'package_group_id' => $settings['domains_package_group'],
                            ['column' => 'id', 'operator' => 'in', 'value' => $service_ids]
                        ]
                    ]
                );
            }

Activity

Ascending order - Click to sort in descending order

Jonathan Reissmueller created issue - 02/Nov/22 2:54 PM

Jonathan Reissmueller made changes - 02/Nov/22 2:54 PM

Field	Original Value	New Value
Rank		Ranked higher

Jonathan Reissmueller made changes - 02/Nov/22 2:54 PM

Sprint

5.6.0-b1 Sprint x [ 170 ]

Jonathan Reissmueller made changes - 02/Nov/22 2:54 PM

Rank

Ranked higher

Jonathan Reissmueller made changes - 02/Nov/22 2:56 PM

Description

The issue is clearly seen in the code. We fetch services based on renewal date (see plugins/domains/domains_plugin.php around line 1294).

Potential solution: Update plugins/domains/domains_plugin.php around line 1258 from

{code:java}
            $services = $this->Services->getAll(
                ['date_added' => 'DESC'],
                true,
                [],
                [
                    'services' => [
                        'package_group_id' => $settings['domains_package_group'],
                        ['column' => 'date_renews', 'operator' => '>=', 'value' => $start_date],
                        ['column' => 'date_renews', 'operator' => '<=', 'value' => $end_date]
                    ]
                ]
            );
{code}

To

{code:java}
            $domains = $this->Record->select()->
                from('domains_domains')->
                where('expiration_date', '>=', $start_date)->
                where('expiration_date', '<=', $end_date)->
                fetchAll();
            $service_ids = array_values($this->Form->collapseObjectArray($domains, 'service_id', 'service_id'));

            // Fetch all qualifying services
            $services = [];
            if (!empty($service_ids)) {
                $services = $this->Services->getAll(
                    ['date_added' => 'DESC'],
                    true,
                    [],
                    [
                        'services' => [
                            'package_group_id' => $settings['domains_package_group'],
                            ['column' => 'id', 'operator' => 'in', 'value' => $service_ids]
                        ]
                    ]
                );
            }
{code}

The issue is clearly seen in the code. We fetch services based on renewal date (see plugins/domains/domains_plugin.php around line 1258).

Potential solution: Update plugins/domains/domains_plugin.php around line 1258 from

{code:java}
            $services = $this->Services->getAll(
                ['date_added' => 'DESC'],
                true,
                [],
                [
                    'services' => [
                        'package_group_id' => $settings['domains_package_group'],
                        ['column' => 'date_renews', 'operator' => '>=', 'value' => $start_date],
                        ['column' => 'date_renews', 'operator' => '<=', 'value' => $end_date]
                    ]
                ]
            );
{code}

To

{code:java}
            $domains = $this->Record->select()->
                from('domains_domains')->
                where('expiration_date', '>=', $start_date)->
                where('expiration_date', '<=', $end_date)->
                fetchAll();
            $service_ids = array_values($this->Form->collapseObjectArray($domains, 'service_id', 'service_id'));

            // Fetch all qualifying services
            $services = [];
            if (!empty($service_ids)) {
                $services = $this->Services->getAll(
                    ['date_added' => 'DESC'],
                    true,
                    [],
                    [
                        'services' => [
                            'package_group_id' => $settings['domains_package_group'],
                            ['column' => 'id', 'operator' => 'in', 'value' => $service_ids]
                        ]
                    ]
                );
            }
{code}

Jonathan Reissmueller made changes - 02/Nov/22 3:04 PM

Assignee

Jonathan Reissmueller [ jonathan ]

Jonathan Reissmueller made changes - 02/Nov/22 3:04 PM

Status

Open [ 1 ]

In Progress [ 3 ]

Jonathan Reissmueller made changes - 02/Nov/22 5:50 PM

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

Abdy Franco made changes - 02/Nov/22 6:26 PM

Remaining Estimate		0 minutes [ 0 ]
Time Spent		1 hour, 19 minutes [ 4740 ]
Worklog Id	16044 [ 16044 ]

Abdy Franco made changes - 02/Nov/22 6:26 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:

02/Nov/22 2:54 PM

Updated:

02/Nov/22 6:26 PM

Resolved:

02/Nov/22 5:50 PM

Fix Release Date:

15/Nov/22

Time Tracking

Estimated:

Not Specified

Remaining:

Logged:

1h 19m

Agile

Completed Sprint:

5.6.0-b1 Sprint 5 ended 08/Nov/22
View on Board