Merge branch 'dev' of https://git.vergara.tech/Vergara_Tech/zgo into dev.

src/app/language.service.ts

@@ -12,7 +12,7 @@ var Buffer = require('buffer/').Buffer;
 export class LanguageService {
 //
 // URL for test using REST API to local MariaDB database 
-//  private baseURL = 'http://localhost:8080/zgointl';
+//  private baseURL = 'http://192.168.1.18:8080/zgointl';
 //  
 // URL for test using REST API to local MongoDB database 
 //  private baseURL = 'http://localhost:5000/zgointl';
@@ -54,6 +54,8 @@ export class LanguageService {
     // Get component's text data from language database
     //
 	const params = new HttpParams().append('session', this.session!);
+//  console.log("Params -> ");
+//  console.log(params);
 	if (viewName === 'login') {
 		return this.http.get<LanguageData>(this.loginURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
 	} else if (viewName === 'main') {
@@ -71,7 +73,7 @@ export class LanguageService {
 						,{ headers : reqHeaders
 						  , params: params
 						}
-										  );
+					);
 	}
   }  
 }

src/app/settings/settings.component.html

@@ -3,12 +3,12 @@
 
 <div class="container" 
 	 style="margin-top: 10px;
-			height: 520px;
+			height: 700px;
 			margin-left: 10px;
 			margin-right: 10px;">
 	<mat-tab-group mat-tab-align-tabs="start">
 		<mat-tab label="{{ vE.settingsTabMainlbl }}" 
-		         style="height: 400px;">
+		         style="height: 620px;">
 			<div class="container" style="margin-bottom:  20px;">
 				<mat-dialog-content [formGroup]="settingsForm">
 					<mat-form-field  class="settings-field" [style.width.%]="100">
@@ -47,18 +47,22 @@
 						</textarea>
 					</mat-form-field>
 					<table cellspacing="0" style="width: 100%">
+<!--
 						<colgroup>
 							<col span="1" style="width: 20%;">
 							<col span="1" style="width: 40%;">
 							<col span="1" style="width: 40%;">
 						</colgroup>
+-->
 						<tr>
 							<td>
 								<mat-slide-toggle formControlName="useTips" class="settings-toggle" (change)="onChangeTips($event)">
 									{{ vE.settingsUseTips }}
 								</mat-slide-toggle>
 							</td>
-							<td align="center">
+						</tr>
+						<tr>
+							<td >
 								<mat-slide-toggle formControlName="useTax" class="settings-toggle" (change)="onChangeTax($event)">
 									{{ vE.settingsUseTax }}
 								</mat-slide-toggle>
@@ -71,7 +75,9 @@
 										   formControlName="taxRate">
 								</mat-form-field>
 							</td>
-							<td align="center">
+						</tr>
+						<tr>	
+							<td>
 								<mat-slide-toggle formControlName="useVat" class="settings-toggle" (change)="onChangeVat($event)">
 									{{ vE.settingsUseVAT }}
 								</mat-slide-toggle>
@@ -88,11 +94,11 @@
 					</table>
 				</mat-dialog-content>
 			</div>
-
 			<div class="container" 
 			 	 style="display: flex;
 						justify-content: space-between;
-						align-items: center;">
+						align-items: center;
+						margin-top: -20px;">
 				<button mat-raised-button 
 						(click)="close()">
 					{{ vE.settingsCloseBtn }} 
@@ -103,9 +109,11 @@
 					{{ vE.settingsSaveBtn }}
 				</button>
 			</div>
+<!--			
 			<div style="height: 20px;
 						margin-top: 10px;">
 			</div>
+-->						
 		</mat-tab>
 		<mat-tab *ngIf="proVersion"
 		         label="{{ vE.settingsTabIntegrations }}"