-- some more refactor
-- pay on delivery completed