From b057f50579932a77ed8b189de007aa7b5ef970dd Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 17 Nov 2020 15:54:28 -0800 Subject: [PATCH] Package update for 1.0.10 --- changelog.json => electron/changelog.json | 7 ++++++- electron/ipc-main-handler.js | 2 +- electron/main.js | 11 +---------- package.json | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) rename changelog.json => electron/changelog.json (88%) diff --git a/changelog.json b/electron/changelog.json similarity index 88% rename from changelog.json rename to electron/changelog.json index c935fca..4b7c68b 100644 --- a/changelog.json +++ b/electron/changelog.json @@ -1,7 +1,12 @@ { "1.0.9": { "title": "Release Notes for 1.0.9", - "date": "11/16/2020", + "date": "11/17/2020", "notes": "New Features: \n- Vehicles with mileage under 20,000kms will now be included in Watcher filtering criteria.\n- Savings on OEM parts will always default to the user enter price and override the estimating system price.\n- Wheel related lines will no longer be automatically ignored.\n- Glass related lines will no longer be automatically ignored.\n- Added 'Variance %' statistic to reporting totals.\n- Automatically ignore any lines which have invalid prices from estimating system.\n- Force line inclusion/exclusion - Using “ /rps-exclude” or “/rps” in the Part Number field to force inclusion or exclusion of lines for RPS calculation.\n- Added automatic update checks every 30 minutes.\n\nBug Fixes: \n- Resolved an issue where the updater would not show update progress to some users.\n- Fixed a UI bug during job search that would cause the 'no close date' alert to be incorrectly shown." + }, + "1.0.10": { + "title": "Release Notes for 1.0.10", + "date": "TBD", + "notes": "" } } diff --git a/electron/ipc-main-handler.js b/electron/ipc-main-handler.js index 2d28b1a..a016f03 100644 --- a/electron/ipc-main-handler.js +++ b/electron/ipc-main-handler.js @@ -37,7 +37,7 @@ ipcMain.on(ipcTypes.store.getAll, (event, obj) => { ipcMain.on(ipcTypes.app.toMain.getReleaseNotes, (event, obj) => { const showNotes = store.get("showChangeLog"); if (showNotes) { - const rn = require("../changelog.json")[electronApp.getVersion()]; + const rn = require("./changelog.json")[electronApp.getVersion()]; event.sender.send(ipcTypes.app.toRenderer.setReleaseNotes, rn); } else { event.sender.send(ipcTypes.app.toRenderer.setReleaseNotes, null); diff --git a/electron/main.js b/electron/main.js index 6c71781..034f459 100644 --- a/electron/main.js +++ b/electron/main.js @@ -86,7 +86,7 @@ var menu = Menu.buildFromTemplate([ click() { mainWindow.webContents.send( ipcTypes.app.toRenderer.setReleaseNotes, - require("../changelog.json")[app.getVersion()] + require("./changelog.json")[app.getVersion()] ); }, }, @@ -335,16 +335,7 @@ autoUpdater.on("update-downloaded", (ev, info) => { async function checkForUpdates() { try { log.info("Checking for updates."); - //const result = await autoUpdater.checkForUpdates(); - // const { updateInfo } = result; - - // if (updateInfo.version !== app.getVersion()) { - // mainWindow.webContents.send( - // ipcTypes.app.toRenderer.updateAvailable, - // updateInfo - // ); - // } } catch (error) { log.error("Error while checking for update", error); } diff --git a/package.json b/package.json index 3d30c8f..d6834c1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "ImEX RPS", "author": "ImEX Systems Inc. ", "description": "ImEX RPS", - "version": "1.0.9", + "version": "1.0.10", "main": "electron/main.js", "homepage": "./", "dependencies": {