Fix: use session's customer groups correctly

[se09deluca]

Previously saved customerGroups are not used

This occurs because the condition present in the second if is always true when the previous one is false and the latest return instruction is never reached.
This always involves using the default customerGroup, ignoring customer groups from the session.

public function initCustomerGroups()
{
    $groupHandles = collect(
        $this->sessionManager->get(
            $this->getSessionKey().'_customer_groups'
        )
    );

    if ($this->customerGroups?->count()) {
        if (! $groupHandles) {
            return $this->setCustomerGroups(
                $this->customerGroups
            );
        }

        return $this->customerGroups;
    }

    if (! $this->customerGroups?->count()) {
        return $this->setCustomerGroups(
            collect([
                CustomerGroup::getDefault(),
            ])
        );
    }

    return $this->setCustomerGroups(
        CustomerGroup::whereIn('handle', $groupHandles)->get()
    );
}

this PR uses the $groupHandles (session's customer group) to initialise the current customer groups, if something is present, otherwise it uses the default one.

public function initCustomerGroups()
{
    $groupHandles = collect(
        $this->sessionManager->get(
            $this->getSessionKey().'_customer_groups'
        )
    );

    if ($this->customerGroups?->count()) {
        if (! $groupHandles) {
            return $this->setCustomerGroups(
                $this->customerGroups
            );
        }

        return $this->customerGroups;
    }

    if (count($groupHandles) > 0) {
        return $this->customerGroups = CustomerGroup::whereIn('handle', $groupHandles)->get();
    }

    return $this->setCustomerGroups(
        collect([
            CustomerGroup::getDefault(),
        ])
    );
}

PS: the if (count($groupHandles) > 0) doesn't use the setCustomerGroups method because the session already contain those values, overwriting them is useless.

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
lunar-docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 11, 2024 9:28am

[alecritson]

Good spot and thanks for the PR :)