Fix broken specs from order number refactoring, and improve performance. Fixes #5102
Fix broken specs from order number refactoring, and improve performance. Fixes #5102

dotandbo/spree,yomishra/pce,yomishra/pce,Mayvenn/spree,Mayvenn/spree,dotandbo/spree,dotandbo/spree,Mayvenn/spree,dotandbo/spree,yomishra/pce,Mayvenn/spree