Changes as suggested by jasonBau

@cdodge kindly look into the change set as suggested by jasonBau , related to shopping cart checkout flow.

Thanks.