fixed merch prices and merch check layout #1717
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 'Lanyard' = 5 | ||
| 'Wristband' = 1 | ||
| 'MAGnet (indoor)' = 2 | ||
| 'MAGnet (outdoor)' = 4 |
There was a problem hiding this comment.
I hope everyone appreciates the "MAGnet" pun.
|
Gonna merge this now so I can deploy to staging. Any changes people want can be made in a separate PR, probably before it gets pushed to production (I'm not currently planning on doing a push to production until later this evening). |
EliAndrewC
added a commit
that referenced
this pull request
Feb 16, 2016
fixed merch prices and merch check layout
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Three fixes here:
I set the merch prices for this year. We really need to move this out of
development-defaults,inibut that's where it's always been, and fixing that is out of scope for this PR. (I'm hoping to get Dom to tackle The Final Puppetization magfest-archive/ubersystem-puppet#28 in the next couple of months and then we'd get that for free.)I fixed a minor display bug with the "Check Merch" button on the merch page. We now property listify all of the "number of things you get" cases (nothing, 1 thing, 2 things, many things).
Most seriously, there was a bug in the merch code that we never noticed because it only triggers when two items in your store cost the same thing, This didn't happen for MagClassic, but it's totally a thing for us. I fixed the
pricesfeature inconfig.pyso this is no longer an issue.