Incorrect Checkout Flow Using PayPal Express Checkout

[brittainmark]

Describe the bug If I put an item in the cart then click express checkout. I am taken to the paypal page. I complete the paypal page, and I am returned to the checkout_payment. If I complete the checkout_paymant page I am then sent to the checkout_shipping page. The process then follows the normal route through checkout_payment then checkout_confirmation etc.

Version Zen Cart version: 1.5.8

To Reproduce Steps to reproduce/demonstrate the behavior:

1. Put item in cart without loging in.
2. Click on paypal express checkout.
3. login to paypal and pay for item
4. On return you are in the in the checkout_payment page with all the shipping etc calculated.
5. Click continue. You are sent to the checkout_shipping page.

Expected behavior At step 5 you should be sent to the checkout_confirmation page.

[brittainmark]

@lat9 just loaded your latest version, this issue still exists.

You might need to have already brought something using the same paypal account to see it.

This issue is caused by the $_SESSION['cartID'] being set to blank by line 2837 $_SESSION['cart']->restore_contents();