Update config files to fix billing UI isssues

temp
Oshani Silva 2 years ago committed by Inosh Perara
parent d21782160a
commit cc98f6a881

@ -198,7 +198,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
conn = this.getConnection();
String sql = "SELECT DM_DEVICE.ID AS DEVICE_ID, DEVICE_IDENTIFICATION, DESCRIPTION, DM_DEVICE.NAME AS DEVICE_NAME, DM_DEVICE_TYPE.NAME AS DEVICE_TYPE,\n" +
"DM_ENROLMENT.ID AS ENROLMENT_ID, DATE_OF_ENROLMENT,OWNER, OWNERSHIP,IS_TRANSFERRED, STATUS, DATE_OF_LAST_UPDATE, LAST_BILLED_DATE,\n" +
"TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, CURDATE()) as DAYS_SINCE_ENROLLED FROM DM_DEVICE JOIN DM_ENROLMENT\n" +
"TIMESTAMPDIFF(DAY, DATE_OF_ENROLMENT, CURDATE()) as DAYS_SINCE_ENROLLED FROM DM_DEVICE JOIN DM_ENROLMENT\n" +
"ON (DM_DEVICE.ID = DM_ENROLMENT.DEVICE_ID) JOIN DM_DEVICE_TYPE ON (DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID) WHERE DM_ENROLMENT.TENANT_ID=?";
stmt = conn.prepareStatement(sql);
stmt.setInt(1, tenantId);

@ -26,9 +26,9 @@
<LoginCacheCapacity>10000</LoginCacheCapacity>
<Billing>
<HideBillGenerationInSuperTenant>false</HideBillGenerationInSuperTenant>
<HideBillGenerationInSubTenant>false</HideBillGenerationInSubTenant>
<HideBillGenerationInSubTenant>true</HideBillGenerationInSubTenant>
<HideTotalCalculationInSuperTenant>false</HideTotalCalculationInSuperTenant>
<HideTotalCalculationInSubTenant>false</HideTotalCalculationInSubTenant>
<HideTotalCalculationInSubTenant>true</HideTotalCalculationInSubTenant>
<HideDomainSelectionInSuperTenant>false</HideDomainSelectionInSuperTenant>
<HideDomainSelectionInSubTenant>true</HideDomainSelectionInSubTenant>
</Billing>
@ -209,6 +209,8 @@
<Scope>perm:windows:lock-reset</Scope>
<Scope>perm:windows:reboot</Scope>
<Scope>perm:windows:location</Scope>
<Scope>perm:admin:tenant:view</Scope>
<Scope>perm:admin:metadata:view</Scope>
</Scopes>
<SSOConfiguration>
<Issuer>device-mgt</Issuer>

@ -35,6 +35,39 @@
<LoginCacheCapacity>10000</LoginCacheCapacity>
{% endif %}
<Billing>
{% if mdm_ui_conf.hide_bill_generation_in_super_tenant is defined %}
<HideBillGenerationInSuperTenant>{{mdm_ui_conf.hide_bill_generation_in_super_tenant}}</HideBillGenerationInSuperTenant>
{% else %}
<HideBillGenerationInSuperTenant>false</HideBillGenerationInSuperTenant>
{% endif %}
{% if mdm_ui_conf.hide_bill_generation_in_sub_tenant is defined %}
<HideBillGenerationInSubTenant>{{mdm_ui_conf.hide_bill_generation_in_sub_tenant}}</HideBillGenerationInSubTenant>
{% else %}
<HideBillGenerationInSubTenant>true</HideBillGenerationInSubTenant>
{% endif %}
{% if mdm_ui_conf.hide_total_calculation_in_super_tenant is defined %}
<HideTotalCalculationInSuperTenant>{{mdm_ui_conf.hide_total_calculation_in_super_tenant}}</HideTotalCalculationInSuperTenant>
{% else %}
<HideTotalCalculationInSuperTenant>false</HideTotalCalculationInSuperTenant>
{% endif %}
{% if mdm_ui_conf.hide_total_calculation_in_sub_tenant is defined %}
<HideTotalCalculationInSubTenant>{{mdm_ui_conf.hide_total_calculation_in_sub_tenant}}</HideTotalCalculationInSubTenant>
{% else %}
<HideTotalCalculationInSubTenant>true</HideTotalCalculationInSubTenant>
{% endif %}
{% if mdm_ui_conf.hide_domain_selection_in_super_tenant is defined %}
<HideDomainSelectionInSuperTenant>{{mdm_ui_conf.hide_domain_selection_in_super_tenant}}</HideDomainSelectionInSuperTenant>
{% else %}
<HideDomainSelectionInSuperTenant>false</HideDomainSelectionInSuperTenant>
{% endif %}
{% if mdm_ui_conf.hide_domain_selection_in_sub_tenant is defined %}
<HideDomainSelectionInSubTenant>{{mdm_ui_conf.hide_domain_selection_in_sub_tenant}}</HideDomainSelectionInSubTenant>
{% else %}
<HideDomainSelectionInSubTenant>true</HideDomainSelectionInSubTenant>
{% endif %}
</Billing>
<AppRegistration>
<Tags>
{% if mdm_ui_conf.app_registration.tags is defined %}
@ -231,6 +264,8 @@
<Scope>perm:windows:lock-reset</Scope>
<Scope>perm:windows:reboot</Scope>
<Scope>perm:windows:location</Scope>
<Scope>perm:admin:tenant:view</Scope>
<Scope>perm:admin:metadata:view</Scope>
<Scope>perm:android:authenticate-account</Scope>
{% if mdm_ui_conf.scopes is defined %}
{%- for scope in mdm_ui_conf.scopes -%}

Loading…
Cancel
Save