Order status pickup point fix

Fixed issue which caused selected pickup point information to not appear on the order status page, or show out-of-date information in some scenarios.