Fixed persisting pickup point data in checkout

We fixed two issues related to abandoned cart workflow where pickup point information could be omitted entirely from orders or inadvertently removed during processing.