Update shop package to be more generalizable
Update checkout view with condition