refs #4974 Changes in fonts

setup.iss

@@ -1,6 +1,6 @@
 
 #define MyAppName "Verdnatura"
-#define MyAppVersion "4"
+#define MyAppVersion "5"
 #define MyAppPublisher "Verdnatura"
 #define MyAppURL "https://www.verdnatura.es/"
 
@@ -54,26 +54,58 @@ Source: "icons\*"; \
   DestDir: "{app}\icons"; Flags: ignoreversion
 Source: "ocx\*"; \
   DestDir: {sys}; Flags: onlyifdoesntexist regserver 32bit
-Source: "fonts\Roboto*"; \
+
-  DestDir: "{fonts}"; FontInstall: "Roboto"; Flags: onlyifdoesntexist uninsneveruninstall
+; Roboto                     ToDo: Loop in code to install all fonts into folder
-Source: "fonts\Poppins*"; \
+Source: "fonts\Roboto\Roboto-Black.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "Poppins"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-Black";
-Source: "fonts\Lucida Sans - *"; \
+Source: "fonts\Roboto\Roboto-BlackItalic.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "Lucida Sans"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-BlackItalic"; 
-Source: "fonts\Code128B.ttf"; \
+Source: "fonts\Roboto\Roboto-Bold.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "Code128B"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-Bold"; 
-Source: "fonts\Code128L.ttf"; \
+Source: "fonts\Roboto\Roboto-BoldItalic.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "Code128L"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-BoldItalic"; 
-Source: "fonts\CCode39.ttf"; \
+Source: "fonts\Roboto\Roboto-Italic.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "CCode39"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-Italic"; 
-Source: "fonts\Free 3 of 9.ttf"; \
+Source: "fonts\Roboto\Roboto-Light.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "Free 3 of 9"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-Light"; 
-Source: "fonts\Free 3 of 9 Extended.ttf"; \
+Source: "fonts\Roboto\Roboto-LightItalic.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "Free 3 of 9 Extended"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-LightItalic"; 
-Source: "fonts\IDAutomationHC39M.ttf"; \
+Source: "fonts\Roboto\Roboto-Medium.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "IDAutomationHC39M"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-Medium"; 
-Source: "fonts\MRV Code39extMA.ttf"; \
+Source: "fonts\Roboto\Roboto-MediumItalic.ttf"; DestDir: "{commonfonts}"; \
-  DestDir: "{fonts}"; FontInstall: "MRV Code39extMA"; Flags: onlyifdoesntexist uninsneveruninstall
+  FontInstall: "Roboto-MediumItalic"; 
+Source: "fonts\Roboto\Roboto-Regular.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Roboto-Regular"; 
+Source: "fonts\Roboto\Roboto-Thin.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Roboto-Thin"; 
+Source: "fonts\Roboto\Roboto-ThinItalic.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Roboto-ThinItalic"; 
+
+; Poppins
+Source: "fonts\Poppins\Poppins-Regular.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Poppins-Regular.ttf"; 
+Source: "fonts\Poppins\Poppins-Thin.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Poppins-Thin"; 
+Source: "fonts\Poppins\Poppins-Bold.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Poppins-Bold"; 
+Source: "fonts\Poppins\Poppins-Italic.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Poppins-Italic"; 
+
+; Codes
+Source: "fonts\Code128B.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Code128B"; Flags: onlyifdoesntexist uninsneveruninstall
+Source: "fonts\Code128L.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Code128L"; Flags: onlyifdoesntexist uninsneveruninstall
+Source: "fonts\CCode39.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "CCode39"; Flags: onlyifdoesntexist uninsneveruninstall
+Source: "fonts\Free 3 of 9.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Free 3 of 9"; Flags: onlyifdoesntexist uninsneveruninstall
+Source: "fonts\Free 3 of 9 Extended.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "Free 3 of 9 Extended"; Flags: onlyifdoesntexist uninsneveruninstall
+Source: "fonts\IDAutomationHC39M.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "IDAutomationHC39M"; Flags: onlyifdoesntexist uninsneveruninstall
+Source: "fonts\MRV Code39extMA.ttf"; DestDir: "{commonfonts}"; \
+  FontInstall: "MRV Code39extMA"; Flags: onlyifdoesntexist uninsneveruninstall
 
 [Tasks]
 Name: "desktopicon"; \
@@ -147,8 +179,7 @@ Name: "{group}\Library"; \
   FileName: "{app}\vn-access.hta"; \
   WorkingDir: "{app}"
 
-;Desktop icons
+; Desktop icons
-
 Name: "{commondesktop}\Terminal Punto Venta"; \
   Parameters: "tpv"; \
   Components: tpv; \
@@ -200,7 +231,6 @@ Name: "{commondesktop}\Library"; \
   Tasks: desktopicon
    
 [Code]
-
 procedure InstallExe;
 var
   StatusText: String;
@@ -241,10 +271,10 @@ begin
     begin
       MsgBox(CurrentFilename +' installation failed with code: ' + IntToStr(ResultCode) + '.',
         mbError, MB_OK);
-      WizardForm.Close;       
+      WizardForm.Close;
     end;
   finally
     WizardForm.StatusLabel.Caption := StatusText;
     WizardForm.ProgressGauge.Style := npbstNormal;
   end;
-end;
+end;

src/main.js

@@ -59,20 +59,19 @@ var App = {
 		this.disableUi(false);
 	},
 	onLoad: function() {
+		
 		// Initializes the global variables
 		var split = Verdnatura.commandLine.match(/(?:[^\s"]+|"[^"]*")+/g);
 		if (split.length > 1)
 			this.module = split[1].replace(/^"+|"+$/g, '');
 		if (!this.module)
 			this.module = Conf.defaultModule;
-
 		this.appDir = this.getEnv('ProgramFiles') +'\\'+ Conf.appName;
 		this.moduleDir = this.shell.SpecialFolders('AppData') +'\\'+ Conf.appName;
 		this.compressFile = this.getEnv('TEMP') +'\\'+ this.module +'.7z';
 		this.certFile = this.appDir +'\\cacert.pem';
 		this.lockFile = this.moduleDir +'\\' + this.module +'.ldb';
 		this.mdbFile = this.moduleDir +'\\' + this.module +'.mdb';
-
 		var defaultDsName = this.formatDatasource(Conf.defaultDatasource);
 		var mdbDsName = this.mdbGetValue(
 			'SELECT dsName FROM TblConfig',
@@ -145,7 +144,6 @@ var App = {
 				selectDatarouce.options.add(option[y])
 			}
 		}
-		
 		// In case old general odbc (REMOVE IN VERSION 5)
 		if (this.dsName == 'verdnatura') {
 			this.dsName = Conf.defaultDatasource;
@@ -430,13 +428,15 @@ var App = {
 			);
 			if (!localVersion)
 				localVersion = false;
+
 			// Determines if should download
 			!localVersion || res.version === false || localVersion != res.version
 				? lastVersion = res.version
 				: lastVersion = null;
 		}
+
+		// Check if there is a new version, and if there is, download it
 		if (lastVersion) {
-			// Check if there is a new version, and if there is, download it
 			this.disableUi(true, _('Updating'));
 			var remoteFile = lastVersion
 				? '.archive/'+ this.module +'/'+ lastVersion +'.7z'