Resolved issue with incorrect pickup point information in orders

We fixed a regression that occurred on July 26, which resulted in pickup point information being included in the order even when the buyer initially chose a pickup point during checkout but later switched to a different shipping method.