search

RobertSpread / spreadcart

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

added stateHandler callback for client use #21

Closed jtlapp closed 8 years ago

jtlapp commented 8 years ago

Just a simple change. There is now a stateHandler config var that optionally takes a function to be called whenever the first item is added to the cart or the last is removed. When the first item is added, the function receives a URL to the checkout page. This allows the hosting site to provide a checkout link outside of our shopping cart. You can see it in operation at http://Jopodia.com

RobertSpread commented 8 years ago

there is a merge conflict I need to check. Currently I am not able to merge

jtlapp commented 8 years ago

How do you look at the conflicts? I don't see them. I suspect it has something to do with having reverted commits.

jtlapp commented 8 years ago

This stackoverflow says that merge conflicts have to be resolved from the command line and suggests doing that from a side branch. I'll cancel this pull request and see if I can do this myself.

http://stackoverflow.com/questions/26096829/git-conflicts-in-pull-requests

jtlapp commented 8 years ago

Yeah, that was the problem. It complained anywhere I changed code that had been reverted. I don't think it understood that the reverted code was older code within the same branch.