DEV-68759 - As a consumer I want to change shipping type
* added calculation of the correct shipping price
Merge remote-tracking branch 'origin/develop' into develop