diff --git a/fonts/Lucida Sans - Demibold Italic.ttf b/fonts/Lucida Sans - Demibold Italic.ttf deleted file mode 100755 index ec7eda3..0000000 Binary files a/fonts/Lucida Sans - Demibold Italic.ttf and /dev/null differ diff --git a/fonts/Lucida Sans - Demibold Roman.ttf b/fonts/Lucida Sans - Demibold Roman.ttf deleted file mode 100755 index b60ae3e..0000000 Binary files a/fonts/Lucida Sans - Demibold Roman.ttf and /dev/null differ diff --git a/fonts/Lucida Sans - Italic.ttf b/fonts/Lucida Sans - Italic.ttf deleted file mode 100755 index d386b9c..0000000 Binary files a/fonts/Lucida Sans - Italic.ttf and /dev/null differ diff --git a/fonts/Lucida Sans - Regular.ttf b/fonts/Lucida Sans - Regular.ttf deleted file mode 100755 index 358f58d..0000000 Binary files a/fonts/Lucida Sans - Regular.ttf and /dev/null differ diff --git a/fonts/Poppins-Black.ttf b/fonts/Poppins-Black.ttf deleted file mode 100644 index 71c0f99..0000000 Binary files a/fonts/Poppins-Black.ttf and /dev/null differ diff --git a/fonts/Poppins-BlackItalic.ttf b/fonts/Poppins-BlackItalic.ttf deleted file mode 100644 index 7aeb58b..0000000 Binary files a/fonts/Poppins-BlackItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-BoldItalic.ttf b/fonts/Poppins-BoldItalic.ttf deleted file mode 100644 index e61e8e8..0000000 Binary files a/fonts/Poppins-BoldItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-ExtraBold.ttf b/fonts/Poppins-ExtraBold.ttf deleted file mode 100644 index df70936..0000000 Binary files a/fonts/Poppins-ExtraBold.ttf and /dev/null differ diff --git a/fonts/Poppins-ExtraBoldItalic.ttf b/fonts/Poppins-ExtraBoldItalic.ttf deleted file mode 100644 index 14d2b37..0000000 Binary files a/fonts/Poppins-ExtraBoldItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-ExtraLight.ttf b/fonts/Poppins-ExtraLight.ttf deleted file mode 100644 index e76ec69..0000000 Binary files a/fonts/Poppins-ExtraLight.ttf and /dev/null differ diff --git a/fonts/Poppins-ExtraLightItalic.ttf b/fonts/Poppins-ExtraLightItalic.ttf deleted file mode 100644 index 89513d9..0000000 Binary files a/fonts/Poppins-ExtraLightItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-Light.ttf b/fonts/Poppins-Light.ttf deleted file mode 100644 index bc36bcc..0000000 Binary files a/fonts/Poppins-Light.ttf and /dev/null differ diff --git a/fonts/Poppins-LightItalic.ttf b/fonts/Poppins-LightItalic.ttf deleted file mode 100644 index 9e70be6..0000000 Binary files a/fonts/Poppins-LightItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-Medium.ttf b/fonts/Poppins-Medium.ttf deleted file mode 100644 index 6bcdcc2..0000000 Binary files a/fonts/Poppins-Medium.ttf and /dev/null differ diff --git a/fonts/Poppins-MediumItalic.ttf b/fonts/Poppins-MediumItalic.ttf deleted file mode 100644 index be67410..0000000 Binary files a/fonts/Poppins-MediumItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-SemiBold.ttf b/fonts/Poppins-SemiBold.ttf deleted file mode 100644 index 74c726e..0000000 Binary files a/fonts/Poppins-SemiBold.ttf and /dev/null differ diff --git a/fonts/Poppins-SemiBoldItalic.ttf b/fonts/Poppins-SemiBoldItalic.ttf deleted file mode 100644 index 3e6c942..0000000 Binary files a/fonts/Poppins-SemiBoldItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-ThinItalic.ttf b/fonts/Poppins-ThinItalic.ttf deleted file mode 100644 index e26db5d..0000000 Binary files a/fonts/Poppins-ThinItalic.ttf and /dev/null differ diff --git a/fonts/Poppins-Bold.ttf b/fonts/Poppins/Poppins-Bold.ttf similarity index 100% rename from fonts/Poppins-Bold.ttf rename to fonts/Poppins/Poppins-Bold.ttf diff --git a/fonts/Poppins-Italic.ttf b/fonts/Poppins/Poppins-Italic.ttf similarity index 100% rename from fonts/Poppins-Italic.ttf rename to fonts/Poppins/Poppins-Italic.ttf diff --git a/fonts/Poppins-Regular.ttf b/fonts/Poppins/Poppins-Regular.ttf similarity index 100% rename from fonts/Poppins-Regular.ttf rename to fonts/Poppins/Poppins-Regular.ttf diff --git a/fonts/Poppins-Thin.ttf b/fonts/Poppins/Poppins-Thin.ttf similarity index 100% rename from fonts/Poppins-Thin.ttf rename to fonts/Poppins/Poppins-Thin.ttf diff --git a/fonts/Roboto - ThinItalic.ttf b/fonts/Roboto - ThinItalic.ttf deleted file mode 100644 index 07172ff..0000000 Binary files a/fonts/Roboto - ThinItalic.ttf and /dev/null differ diff --git a/fonts/Roboto-Black.ttf b/fonts/Roboto-Black.ttf deleted file mode 100644 index 9002aab..0000000 Binary files a/fonts/Roboto-Black.ttf and /dev/null differ diff --git a/fonts/Roboto-BlackItalic.ttf b/fonts/Roboto-BlackItalic.ttf deleted file mode 100644 index b87e025..0000000 Binary files a/fonts/Roboto-BlackItalic.ttf and /dev/null differ diff --git a/fonts/Roboto-Bold.ttf b/fonts/Roboto-Bold.ttf deleted file mode 100644 index 072b842..0000000 Binary files a/fonts/Roboto-Bold.ttf and /dev/null differ diff --git a/fonts/Roboto-BoldItalic.ttf b/fonts/Roboto-BoldItalic.ttf deleted file mode 100644 index 74919ff..0000000 Binary files a/fonts/Roboto-BoldItalic.ttf and /dev/null differ diff --git a/fonts/Roboto-LightItalic.ttf b/fonts/Roboto-LightItalic.ttf deleted file mode 100644 index 130672a..0000000 Binary files a/fonts/Roboto-LightItalic.ttf and /dev/null differ diff --git a/fonts/Roboto-Medium.ttf b/fonts/Roboto-Medium.ttf deleted file mode 100644 index d0f6e2b..0000000 Binary files a/fonts/Roboto-Medium.ttf and /dev/null differ diff --git a/fonts/Roboto-MediumItalic.ttf b/fonts/Roboto-MediumItalic.ttf deleted file mode 100644 index 6153d48..0000000 Binary files a/fonts/Roboto-MediumItalic.ttf and /dev/null differ diff --git a/fonts/Roboto-Thin.ttf b/fonts/Roboto-Thin.ttf deleted file mode 100644 index 309c22d..0000000 Binary files a/fonts/Roboto-Thin.ttf and /dev/null differ diff --git a/fonts/Roboto-ThinItalic.ttf b/fonts/Roboto-ThinItalic.ttf deleted file mode 100644 index 0b53ba4..0000000 Binary files a/fonts/Roboto-ThinItalic.ttf and /dev/null differ diff --git a/fonts/Roboto/Roboto-Black.ttf b/fonts/Roboto/Roboto-Black.ttf new file mode 100644 index 0000000..0112e7d Binary files /dev/null and b/fonts/Roboto/Roboto-Black.ttf differ diff --git a/fonts/Roboto/Roboto-BlackItalic.ttf b/fonts/Roboto/Roboto-BlackItalic.ttf new file mode 100644 index 0000000..b2c6aca Binary files /dev/null and b/fonts/Roboto/Roboto-BlackItalic.ttf differ diff --git a/fonts/Roboto/Roboto-Bold.ttf b/fonts/Roboto/Roboto-Bold.ttf new file mode 100644 index 0000000..43da14d Binary files /dev/null and b/fonts/Roboto/Roboto-Bold.ttf differ diff --git a/fonts/Roboto/Roboto-BoldItalic.ttf b/fonts/Roboto/Roboto-BoldItalic.ttf new file mode 100644 index 0000000..bcfdab4 Binary files /dev/null and b/fonts/Roboto/Roboto-BoldItalic.ttf differ diff --git a/fonts/Roboto/Roboto-Italic.ttf b/fonts/Roboto/Roboto-Italic.ttf new file mode 100644 index 0000000..1b5eaa3 Binary files /dev/null and b/fonts/Roboto/Roboto-Italic.ttf differ diff --git a/fonts/Roboto/Roboto-Light.ttf b/fonts/Roboto/Roboto-Light.ttf new file mode 100644 index 0000000..e7307e7 Binary files /dev/null and b/fonts/Roboto/Roboto-Light.ttf differ diff --git a/fonts/Roboto/Roboto-LightItalic.ttf b/fonts/Roboto/Roboto-LightItalic.ttf new file mode 100644 index 0000000..2d277af Binary files /dev/null and b/fonts/Roboto/Roboto-LightItalic.ttf differ diff --git a/fonts/Roboto/Roboto-Medium.ttf b/fonts/Roboto/Roboto-Medium.ttf new file mode 100644 index 0000000..ac0f908 Binary files /dev/null and b/fonts/Roboto/Roboto-Medium.ttf differ diff --git a/fonts/Roboto/Roboto-MediumItalic.ttf b/fonts/Roboto/Roboto-MediumItalic.ttf new file mode 100644 index 0000000..fc36a47 Binary files /dev/null and b/fonts/Roboto/Roboto-MediumItalic.ttf differ diff --git a/fonts/Roboto/Roboto-Regular.ttf b/fonts/Roboto/Roboto-Regular.ttf new file mode 100644 index 0000000..ddf4bfa Binary files /dev/null and b/fonts/Roboto/Roboto-Regular.ttf differ diff --git a/fonts/Roboto/Roboto-Thin.ttf b/fonts/Roboto/Roboto-Thin.ttf new file mode 100644 index 0000000..2e0dee6 Binary files /dev/null and b/fonts/Roboto/Roboto-Thin.ttf differ diff --git a/fonts/Roboto/Roboto-ThinItalic.ttf b/fonts/Roboto/Roboto-ThinItalic.ttf new file mode 100644 index 0000000..084f9c0 Binary files /dev/null and b/fonts/Roboto/Roboto-ThinItalic.ttf differ diff --git a/fonts/Roboto_light.ttf b/fonts/Roboto_light.ttf deleted file mode 100644 index 13bf13a..0000000 Binary files a/fonts/Roboto_light.ttf and /dev/null differ diff --git a/iss/wizard.bmp b/iss/wizard.bmp index 4c10967..328cdbe 100644 Binary files a/iss/wizard.bmp and b/iss/wizard.bmp differ diff --git a/setup.iss b/setup.iss index b8af771..1386af6 100644 --- a/setup.iss +++ b/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 -Source: "fonts\Poppins*"; \ - DestDir: "{fonts}"; FontInstall: "Poppins"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\Lucida Sans - *"; \ - DestDir: "{fonts}"; FontInstall: "Lucida Sans"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\Code128B.ttf"; \ - DestDir: "{fonts}"; FontInstall: "Code128B"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\Code128L.ttf"; \ - DestDir: "{fonts}"; FontInstall: "Code128L"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\CCode39.ttf"; \ - DestDir: "{fonts}"; FontInstall: "CCode39"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\Free 3 of 9.ttf"; \ - DestDir: "{fonts}"; FontInstall: "Free 3 of 9"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\Free 3 of 9 Extended.ttf"; \ - DestDir: "{fonts}"; FontInstall: "Free 3 of 9 Extended"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\IDAutomationHC39M.ttf"; \ - DestDir: "{fonts}"; FontInstall: "IDAutomationHC39M"; Flags: onlyifdoesntexist uninsneveruninstall -Source: "fonts\MRV Code39extMA.ttf"; \ - DestDir: "{fonts}"; FontInstall: "MRV Code39extMA"; Flags: onlyifdoesntexist uninsneveruninstall + +; Roboto ToDo: Loop in code to install all fonts into folder +Source: "fonts\Roboto\Roboto-Black.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-Black"; +Source: "fonts\Roboto\Roboto-BlackItalic.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-BlackItalic"; +Source: "fonts\Roboto\Roboto-Bold.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-Bold"; +Source: "fonts\Roboto\Roboto-BoldItalic.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-BoldItalic"; +Source: "fonts\Roboto\Roboto-Italic.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-Italic"; +Source: "fonts\Roboto\Roboto-Light.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-Light"; +Source: "fonts\Roboto\Roboto-LightItalic.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-LightItalic"; +Source: "fonts\Roboto\Roboto-Medium.ttf"; DestDir: "{commonfonts}"; \ + FontInstall: "Roboto-Medium"; +Source: "fonts\Roboto\Roboto-MediumItalic.ttf"; DestDir: "{commonfonts}"; \ + 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; \ No newline at end of file diff --git a/src/main.js b/src/main.js index a4af847..d698154 100755 --- a/src/main.js +++ b/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'