test green, fixed cart issue for nil
successfully added changing paid orders to complete/cancel
fixed merge conflicts
merged state of paid orders