Payment page was built
Waiting for order service
Error page added
Merge branch 'CreditCatds'