Merge pull request #4274 from saurabh6790/drop-shipping

[fixes] update delivery status