geer-builder 1.2.913 → 1.2.915
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/GProfile.vue +14 -10
- package/package.json +1 -1
package/components/GProfile.vue
CHANGED
|
@@ -38,6 +38,10 @@
|
|
|
38
38
|
<div class="lab" v-if="is_company_ultrapro">Activation Date</div>
|
|
39
39
|
<div class="lab" v-else>Member Since</div>
|
|
40
40
|
</div>
|
|
41
|
+
<div class="group" v-if="expiration_date_display">
|
|
42
|
+
<div class="val">{{ expiration_date_display }}</div>
|
|
43
|
+
<div class="lab">Activated Till</div>
|
|
44
|
+
</div>
|
|
41
45
|
<div class="group">
|
|
42
46
|
<div class="val">{{ prop_user_info.country_code }}</div>
|
|
43
47
|
<div class="lab">Country</div>
|
|
@@ -52,10 +56,6 @@
|
|
|
52
56
|
<div class="lab" v-if="is_company_success">Type of Enrollment</div>
|
|
53
57
|
<div class="lab" v-else>Membership</div>
|
|
54
58
|
</div>
|
|
55
|
-
<div class="group" v-if="expiration_date_display">
|
|
56
|
-
<div class="val">{{ expiration_date_display }}</div>
|
|
57
|
-
<div class="lab">Activated Till</div>
|
|
58
|
-
</div>
|
|
59
59
|
</div>
|
|
60
60
|
|
|
61
61
|
<div class="actions" :style="create_slot ? `grid-template-columns: 1fr 1fr 1fr;` : ``" v-if="prop_user_info.uid !== user_info.uid">
|
|
@@ -97,7 +97,7 @@ import DB_SLOT from '../models/DB_SLOT';
|
|
|
97
97
|
export default
|
|
98
98
|
{
|
|
99
99
|
mixins:[GlobalMixins],
|
|
100
|
-
props: ['hide_name','disable_privilege_card','profile_details','hide_picture','prop_user_info', 'dialog','mode', 'create_slot','is_company_success', 'hide_banner', 'is_company_ultrapro', 'hide_membership', 'hide_rank'],
|
|
100
|
+
props: ['hide_name','disable_privilege_card','profile_details','hide_picture','prop_user_info', 'dialog','mode', 'create_slot','is_company_success', 'hide_banner', 'is_company_ultrapro', 'hide_membership', 'hide_rank', 'enable_expiration'],
|
|
101
101
|
components: { GCard, GCodeVault,GPrivilegeCard },
|
|
102
102
|
filters: { },
|
|
103
103
|
data:() =>
|
|
@@ -112,7 +112,8 @@ export default
|
|
|
112
112
|
show_elms_login:false,
|
|
113
113
|
show_elms_login_test:false,
|
|
114
114
|
show_privilege_card : false,
|
|
115
|
-
secondary_slot_code : ''
|
|
115
|
+
secondary_slot_code : '',
|
|
116
|
+
public_settings: {}
|
|
116
117
|
}),
|
|
117
118
|
async mounted()
|
|
118
119
|
{
|
|
@@ -126,6 +127,7 @@ export default
|
|
|
126
127
|
}
|
|
127
128
|
|
|
128
129
|
let profile = await this.$_getData('public_settings');
|
|
130
|
+
this.public_settings = profile;
|
|
129
131
|
if(profile.hasOwnProperty('show_privilege_card') && profile.show_privilege_card == true) this.show_privilege_card = true;
|
|
130
132
|
if(this.secondary_slot_code) this.show_privilege_card = false;
|
|
131
133
|
if(profile.enable_successflix_product == true)
|
|
@@ -168,11 +170,13 @@ export default
|
|
|
168
170
|
computed: {
|
|
169
171
|
expiration_date_display()
|
|
170
172
|
{
|
|
171
|
-
if (this.slot_info && this.slot_info.length > 0
|
|
173
|
+
if (this.enable_expiration && this.slot_info && this.slot_info.length > 0)
|
|
172
174
|
{
|
|
173
|
-
let
|
|
174
|
-
|
|
175
|
-
|
|
175
|
+
let exp_result = this.$_checkSlotExpirationLocal(this.slot_info[0], this.public_settings);
|
|
176
|
+
if (exp_result.expiration_enabled && exp_result.expiration_date)
|
|
177
|
+
{
|
|
178
|
+
return this.$_formatDate(exp_result.expiration_date);
|
|
179
|
+
}
|
|
176
180
|
}
|
|
177
181
|
return null;
|
|
178
182
|
}
|