fixes #6737 - correct 'automatic' amount for subscriptions


Corrects handling of quantity zero, which is used to indicate automatic.
Fixes regression of adding amount back to json.
Removing old TODO; this location is fine.