Merge pull request #24613 from marination/shopping-cart

fix: Shopping cart breaks without Payment Gateway Account