diff --git a/Controllers/RvlController.cs b/Controllers/RvlController.cs index de6553a..0da4325 100644 --- a/Controllers/RvlController.cs +++ b/Controllers/RvlController.cs @@ -35,9 +35,9 @@ namespace rockfishCore.Controllers [Required] public bool LicenseExpires { get; set; } [Required] - public long LicenseExpiration { get; set; } + public long LicenseExpirationDate { get; set; } [Required] - public long MaintenanceExpiration { get; set; } + public long MaintenanceExpirationDate { get; set; } [Required] public List Features { get; set; } [Required] @@ -108,8 +108,8 @@ namespace rockfishCore.Controllers newLicense.RegisteredTo = l.RegisteredTo; newLicense.DbId = l.DbId; - newLicense.LicenseExpiration = DateUtil.EpochToDate(l.LicenseExpiration); - newLicense.MaintenanceExpiration = DateUtil.EpochToDate(l.MaintenanceExpiration); + newLicense.LicenseExpiration = DateUtil.EpochToDate(l.LicenseExpirationDate); + newLicense.MaintenanceExpiration = DateUtil.EpochToDate(l.MaintenanceExpirationDate); foreach (dtoLicenseFeature f in l.Features) { newLicense.Features.Add(new RavenKeyFactory.LicenseFeature() { Feature = f.Feature, Count = f.Count }); diff --git a/wwwroot/js/app.ravLicense.js b/wwwroot/js/app.ravLicense.js index 49aa351..9e61391 100644 --- a/wwwroot/js/app.ravLicense.js +++ b/wwwroot/js/app.ravLicense.js @@ -66,7 +66,7 @@ app.ravLicense = (function () { var submitData = app.utilB.objectifyFormDataArray(formData); //clean up the data before submit - +debugger; //submit // alert("STUB submit"); app.api.createRavLicense(submitData, function (res) { @@ -140,7 +140,7 @@ app.ravLicense = (function () { $.gevent.publish("app-show-error", res.msg); } else { $("#registeredTo").val(res.name); - $("#dbId").val(res.dbId); + $("#dbId").val(res.dbid); } }); @@ -171,7 +171,7 @@ app.ravLicense = (function () { .toISOString() .substring(0, 10); $('input[type="date"]').val(oneYearFromNow); - $("#siteid").val(stateMap.id); + $("#siteId").val(stateMap.id); //var oneMonthFromNow = moment().add(1, 'months').toISOString().substring(0, 10); //$('#lockoutDate').val(oneMonthFromNow); diff --git a/wwwroot/js/templates/app.ravLicense.handlebars b/wwwroot/js/templates/app.ravLicense.handlebars index 4726880..6b7cefd 100644 --- a/wwwroot/js/templates/app.ravLicense.handlebars +++ b/wwwroot/js/templates/app.ravLicense.handlebars @@ -20,8 +20,8 @@
- - Support expires +
@@ -32,7 +32,7 @@ Temporary key / expires - +