search

RobertSpread / spreadcart

simple plugin to display a cart for the spreadshop everywhere on your domain
1 stars 1 forks source link

bug fixes for product images and apiBasketId #34

Closed jtlapp closed 8 years ago

jtlapp commented 8 years ago

Spreadshirt changed the ID required for product images from element@id to element/properties/product, so reflected this in code; there are circumstances where the SpreadShop cart's apiBasketId is undefined, so now treat the basket as empty without asking spreadshirt for the basket in this case (which would otherwise error); added timestamp to node.js server luanch output

RobertSpread commented 8 years ago

I copy and pasted all changes from your master into this master branch. I hope we are up to date with everything now. Therefore I will close this pull request. If this works out properly, let us use this state of the project and then we have a clean basis for future developement.

jtlapp commented 8 years ago

Thanks Robert. I don't know how to make this a "clean basis." I have attempted to do so several times in the past. Here is what I've been doing. I rebase the temporary branch "sync" rather than my master so that I don't lose my commit history. Any suggestions?

git fetch upstream
git checkout master
git checkout -b sync
git rebase upstream/master
git checkout master
git merge sync
git branch -d sync