issue #19550: Rework customer price function to use newer method used in...

... 4.x that returns complex object.