Fixes in subscriptions. It now passes the tests.
API tests still don't work.
This commit is contained in:
Tomas Bures
parent
e9165838dc
commit
47b8d80c22
16 changed files with 2649 additions and 975 deletions
|
|
@ -2,74 +2,60 @@
|
|||
|
||||
{{#if typeSubscriptionEmail}}
|
||||
<div class="form-group email">
|
||||
<label for="email">{{#translate}}Email Address{{/translate}}</label>
|
||||
<label for="EMAIL">{{#translate}}Email Address{{/translate}}</label>
|
||||
{{#if ../isManagePreferences}}
|
||||
<div class="input-group">
|
||||
<input type="email" name="email" id="email" placeholder="" value="{{../email}}" readonly>
|
||||
<input type="email" name="EMAIL" id="email" placeholder="" value="{{../email}}" readonly>
|
||||
<div class="input-group-addon"><a href="/subscription/{{../lcid}}/manage-address/{{../cid}}">{{#translate}}want to change it?{{/translate}}</a></div>
|
||||
</div>
|
||||
{{else}}
|
||||
<input type="email" name="email" id="email" placeholder="" value="{{../email}}" required>
|
||||
<input type="email" name="EMAIL" id="email" placeholder="" value="{{../email}}" required>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeFirstName}}
|
||||
<div class="form-group first-name">
|
||||
<label for="first-name">{{#translate}}First Name{{/translate}}</label>
|
||||
<input type="text" name="first-name" id="first-name" placeholder="" value="{{../firstName}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeLastName}}
|
||||
<div class="form-group last-name">
|
||||
<label for="last-name">{{#translate}}Last Name{{/translate}}</label>
|
||||
<input type="text" name="last-name" id="last-name" placeholder="" value="{{../lastName}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeText}}
|
||||
<div class="form-group text {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<input type="text" name="{{column}}" value="{{value}}">
|
||||
<div class="form-group text {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<input type="text" name="{{key}}" value="{{value}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeNumber}}
|
||||
<div class="form-group number {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<input type="number" name="{{column}}" value="{{value}}">
|
||||
<div class="form-group number {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<input type="number" name="{{key}}" value="{{value}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeWebsite}}
|
||||
<div class="form-group url {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<input type="url" name="{{column}}" value="{{value}}">
|
||||
<div class="form-group url {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<input type="url" name="{{key}}" value="{{value}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeLongtext}}
|
||||
<div class="form-group longtext {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<textarea rows="3" name="{{column}}">{{value}}</textarea>
|
||||
<div class="form-group longtext {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<textarea rows="3" name="{{key}}">{{value}}</textarea>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeJson}}
|
||||
<div class="form-group json {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<textarea class="gpg-text" rows="3" name="{{column}}" placeholder="{"data":"value"}">{{value}}</textarea>
|
||||
<div class="form-group json {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<textarea class="gpg-text" rows="3" name="{{key}}" placeholder="{"data":"value"}">{{value}}</textarea>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeGpg}}
|
||||
<div class="form-group gpg {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<div class="form-group gpg {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
{{#if ../hasPubkey}}
|
||||
<button class="btn-download-pubkey" type="submit" form="download-pubkey">{{#translate}}Download signature verification key{{/translate}}</button>
|
||||
{{/if}}
|
||||
<textarea class="form-control gpg-text" rows="4" name="{{column}}" placeholder="{{#translate}}Begins with{{/translate}} '-----BEGIN PGP PUBLIC KEY BLOCK-----'">{{value}}</textarea>
|
||||
<textarea class="form-control gpg-text" rows="4" name="{{key}}" placeholder="{{#translate}}Begins with{{/translate}} '-----BEGIN PGP PUBLIC KEY BLOCK-----'">{{value}}</textarea>
|
||||
<span class="help-block">
|
||||
{{#translate}}Insert your GPG public key here to encrypt messages sent to your address{{/translate}} <em>({{#translate}}optional{{/translate}})</em>
|
||||
</span>
|
||||
|
|
@ -77,34 +63,34 @@
|
|||
{{/if}}
|
||||
|
||||
{{#if typeDateUs}}
|
||||
<div class="form-group date fm-date-us {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<input type="text" name="{{column}}" placeholder="MM/DD/YYYY" value="{{value}}">
|
||||
<div class="form-group date fm-date-us {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<input type="text" name="{{key}}" placeholder="MM/DD/YYYY" value="{{value}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeDateEur}}
|
||||
<div class="form-group date fm-date-eur {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<input type="text" name="{{column}}" placeholder="DD/MM/YYYY" value="{{value}}">
|
||||
<div class="form-group date fm-date-eur {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<input type="text" name="{{key}}" placeholder="DD/MM/YYYY" value="{{value}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeBirthdayUs}}
|
||||
<div class="form-group date fm-birthday-us {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<input type="text" name="{{column}}" placeholder="MM/DD" value="{{value}}">
|
||||
<div class="form-group date fm-birthday-us {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<input type="text" name="{{key}}" placeholder="MM/DD" value="{{value}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeBirthdayEur}}
|
||||
<div class="form-group date fm-birthday-eur {{column}}">
|
||||
<label for="{{column}}">{{name}}</label>
|
||||
<input type="text" name="{{column}}" placeholder="DD/MM" value="{{value}}">
|
||||
<div class="form-group date fm-birthday-eur {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<input type="text" name="{{key}}" placeholder="DD/MM" value="{{value}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeDropdown}}
|
||||
{{#if typeDropdownGrouped }}
|
||||
<div class="form-group dropdown {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<select name="{{key}}" class="form-control">
|
||||
|
|
@ -112,29 +98,54 @@
|
|||
–– {{#translate}}Select{{/translate}} ––
|
||||
</option>
|
||||
{{#each options}}
|
||||
<option value="{{column}}" {{#if value}} selected {{/if}}>{{name}}</option>
|
||||
<option value="{{key}}" {{#if value}} selected {{/if}}>{{name}}</option>
|
||||
{{/each}}
|
||||
</select>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeRadio}}
|
||||
{{#if typeRadioGrouped}}
|
||||
<div class="form-group radio {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
{{#each options}}
|
||||
<label class="label-radio">
|
||||
<input type="radio" name="{{../key}}" value="{{column}}" {{#if value}} checked {{/if}}> {{name}}
|
||||
<input type="radio" name="{{../key}}" value="{{key}}" {{#if value}} checked {{/if}}> {{name}}
|
||||
</label>
|
||||
{{/each}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeCheckbox}}
|
||||
{{#if typeCheckboxGrouped}}
|
||||
<div class="form-group checkbox">
|
||||
<label>{{name}}</label>
|
||||
{{#each options}}
|
||||
<label class="label-checkbox">
|
||||
<input type="checkbox" name="{{column}}" value="1" {{#if value}} checked {{/if}}> {{name}}
|
||||
<input type="checkbox" name="{{key}}" value="1" {{#if value}} checked {{/if}}> {{name}}
|
||||
</label>
|
||||
{{/each}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeDropdownEnum }}
|
||||
<div class="form-group dropdown {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
<select name="{{key}}" class="form-control">
|
||||
<option value="">
|
||||
–– {{#translate}}Select{{/translate}} ––
|
||||
</option>
|
||||
{{#each options}}
|
||||
<option value="{{key}}" {{#if value}} selected {{/if}}>{{name}}</option>
|
||||
{{/each}}
|
||||
</select>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if typeRadioEnum}}
|
||||
<div class="form-group radio {{key}}">
|
||||
<label for="{{key}}">{{name}}</label>
|
||||
{{#each options}}
|
||||
<label class="label-radio">
|
||||
<input type="radio" name="{{../key}}" value="{{key}}" {{#if value}} checked {{/if}}> {{name}}
|
||||
</label>
|
||||
{{/each}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
<input type="hidden" name="_csrf" value="{{csrfToken}}">
|
||||
<input type="hidden" name="cid" value="{{cid}}">
|
||||
|
||||
<div class="form-group">
|
||||
<label for="email">{{#translate}}Existing Email Address{{/translate}}</label>
|
||||
<input type="email" name="email" id="email" placeholder="" value="{{email}}" readonly>
|
||||
<div class="form-group email">
|
||||
<label for="EMAIL">{{#translate}}Existing Email Address{{/translate}}</label>
|
||||
<input type="email" name="EMAIL" id="email" placeholder="" value="{{email}}" readonly>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="email-new">{{#translate}}New Email Address{{/translate}}</label>
|
||||
<input type="email" name="email-new" id="email-new" placeholder="{{#translate}}Your new email address{{/translate}}" value="{{email}}">
|
||||
<div class="form-group email">
|
||||
<label for="EMAIL_NEW">{{#translate}}New Email Address{{/translate}}</label>
|
||||
<input type="email" name="EMAIL_NEW" id="email-new" placeholder="{{#translate}}Your new email address{{/translate}}" value="{{email}}">
|
||||
</div>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue