Skip to content

Commit

Permalink
Merge branch 'null_coupon_description' of https://github.com/jeffchan…
Browse files Browse the repository at this point in the history
  • Loading branch information
em committed Aug 28, 2013
2 parents 9bab4cf + f9417bb commit 8b3752a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#Recurly.js CHANGELOG

##Version 2.2.5 (Aug 23, 2013)
##Version 2.2.6 (Aug 28, 2013)
- Issue fixed where coupon descriptions could show "null"

##Version 2.2.5 (Aug 28, 2013)
- Added default subscription: quantity option to buildSubscriptionForm

##Version 2.2.4 (Aug 23, 2013)
Expand Down
2 changes: 1 addition & 1 deletion src/js/subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ R.Coupon = {
else if(json.discount_percent)
c.discountRatio = json.discount_percent/100;

c.description = json.description;
c.description = json.description || '';

return c;
}
Expand Down

0 comments on commit 8b3752a

Please sign in to comment.