Submitted another pull request if someone has a moment to review. https://github.com/solidusio-contrib/solidus_digital/pull/24