Pickup, pickup availability, service availability, Cash on delivery and minor changes

@jazminschroeder Help me get this change through. if there something missing let me know