search

RobertSpread / spreadcart

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

Now builds cart in portions as becomes possible + minor fixes #18

Closed jtlapp closed 8 years ago

jtlapp commented 8 years ago

(1) Now builds the empty-basket notice and spreadcart icon upon page load, but only builds the "filled" portion of the cart upon getting a valid apiBasketId, which happens at least by the time an item is added to the cart.

(2) Fixed failure to update quantity upon adding to cart, which problem I introduced with the last pull request.

(3) Removed shadow from shopping cart edge. I think frills really ought to be added by the user, without having to be removed to be replaced with something else the user prefers, as I'm having to do.

(4) Defaulted demo index.html to spreadCartIcon -- forgot to do that with the last checkin.

RobertSpread commented 8 years ago

Amazing!

jtlapp commented 8 years ago

It would be amazing if I could manage a checkin that didn't also break something.

RobertSpread commented 8 years ago

well, we are work in progress. Let us change the world one step at a time!

jtlapp commented 8 years ago

Robert, the commit history shows that you pulled these changes into the repository and even shows the correct deltas, but your master branch does not have any of these changes. I can't figure out what happened. Trying to merge your latest fix into my local copy screwed things up because you're missing this pull.

jtlapp commented 8 years ago

I found the problem. Your commit "Merge remote-tracking branch 'origin/master'" undid all of my changes, but I don't know why. My changes appear in the repository at at the time of the pull and vanish at the time of this commit.

RobertSpread commented 8 years ago

Damn. I should have pulled and merged locally before my last commit. Do you have an idea on how to straigthen this out?

jtlapp commented 8 years ago

Git forever gives me headaches. Since it's already been pushed, probably the best thing to do is first to copy off your changes for you to manually re-apply, and then to do a "git revert SHA", using the SHA of the commit that you want to reverse. "git revert" creates a new commit that reverses the named commit.

I think that if I push my changes again -- the alternative -- we'll end up with all sorts of conflicts requiring resolution.

jtlapp commented 8 years ago

I should qualify all that. I'm no git guru, and there may be a better way.

RobertSpread commented 8 years ago

I will ask one of the developers around me ;)