Handled null trial days on tiers

refs e26c977c66

- handles null trial days in admin and API, sets trial days as 0 for null values

ghost/admin/app/models/tier.js

@@ -14,6 +14,6 @@ export default Model.extend(ValidationEngine, {
     currency: attr('string'),
     monthlyPrice: attr('number'),
     yearlyPrice: attr('number'),
-    trialDays: attr('number'),
+    trialDays: attr('number', {defaultValue: 0}),
     benefits: attr('tier-benefits')
 });

ghost/core/core/server/api/endpoints/utils/serializers/input/tiers.js

@@ -24,7 +24,7 @@ function convertTierInput(input) {
     };
 
     if (labs.isSet('freeTrial')) {
-        converted.trial_days = input.trial_days;
+        converted.trial_days = input.trial_days || 0;
     }
 
     if (input.monthly_price && input.currency) {

ghost/core/test/e2e-api/admin/tiers.test.js

@@ -110,4 +110,20 @@ describe('Tiers API', function () {
 
         assert(updatedTier.visibility === visibility, `The visibility of the Tier should have been updated to ${visibility}`);
     });
+
+    it('Can save with trial_days as null', async function () {
+        const {body: {tiers: [tier]}} = await agent.get('/tiers/?limit=1');
+
+        await agent.put(`/tiers/${tier.id}/`)
+            .body({
+                tiers: [{
+                    trial_days: null
+                }]
+            })
+            .expectStatus(200);
+
+        const {body: {tiers: [updatedTier]}} = await agent.get(`/tiers/${tier.id}/`);
+
+        assert(updatedTier.trial_days === 0, `The trial_days should have been set to 0`);
+    });
 });