Revert "Revert "shop delivery""

This reverts commit b5f682dc42c46581a3f6bc8ce5151c8e92f2a78b.