Merge pull request #90 from AndresMorelos/v1.20.0

V1.20.0

Author: AndresMorelos

app.js

@@ -154,13 +154,21 @@ function createMainWindow() {
   mainWindow.on('close', (event) => {
     event.preventDefault();
     if (isDev || forceDevtools) mainWindow.webContents.closeDevTools();
-    app.isHidden = true;
-    if (process.platform !== 'darwin') {
-      mainWindow.setSkipTaskbar(true);
+
+    const needCloseApp =
+      appConfig.getSync('general.quitAtClose') || false;
+
+    if (!needCloseApp) {
+      app.isHidden = true;
+      if (process.platform !== 'darwin') {
+        mainWindow.setSkipTaskbar(true);
+      } else {
+        app.dock.hide();
+      }
+      mainWindow.hide();
     } else {
-      app.dock.hide();
+      app.quit();
     }
-    mainWindow.hide();
   });
 }
 
@@ -298,6 +306,7 @@ function setInitialValues() {
       lastCheck: Date.now(),
       enableMetrics: true,
       openAtLogin: true,
+      quitAtClose: false,
     },
     invoice: {
       exportDir: os.homedir(),
@@ -481,8 +490,8 @@ function migrateData() {
     },
     6: (configs) => {
       // Return current configs if this is the first time install
-      const { trayIcon, enableMetrics } = configs.general;
-      if (trayIcon !== undefined && enableMetrics !== undefined) {
+      const { openAtLogin } = configs.general;
+      if (openAtLogin !== undefined) {
         return configs;
       }
 
@@ -495,6 +504,22 @@ function migrateData() {
         },
       };
     },
+    7: (configs) => {
+      // Return current configs if this is the first time install
+      const { quitAtClose } = configs.general;
+      if (quitAtClose !== undefined) {
+        return configs;
+      }
+
+      // Update current configs
+      return {
+        ...configs,
+        general: {
+          ...configs.general,
+          quitAtClose: false,
+        },
+      };
+    },
   };
   // Get the current Config
   const configs = appConfig.getSync();

app/components/settings/General.jsx

@@ -38,6 +38,7 @@ class General extends Component {
       trayIcon,
       enableMetrics,
       openAtLogin,
+      quitAtClose,
     } = this.state;
     return (
       <div>
@@ -213,13 +214,13 @@ class General extends Component {
           <div className="col-md-3">
             <div className="pageItem">
               <label className="itemLabel">
-                {t('settings:fields:sendMetricsAnon')}
+                {t('settings:fields:quitAtClose')}
               </label>
               <label className="switch">
                 <input
-                  name="enableMetrics"
+                  name="quitAtClose"
                   type="checkbox"
-                  checked={enableMetrics}
+                  checked={quitAtClose}
                   onChange={this.handleInputChange}
                 />
                 <span className="slider round" />

i18n/en/settings.json

@@ -20,6 +20,7 @@
     "trayIcon": "Menu Bar Icon",
     "sendMetricsAnon": "Send App Metrics Anonymously",
     "openAtLogin": "Open at Login",
+    "quitAtClose": "Quit at Close",
     "mute": "Mute",
     "autoCheckUpdate": {
       "name": "Auto Check for Update",

i18n/esES/settings.json

@@ -17,6 +17,7 @@
     "requiredFields": "Campos requeridos",
     "sound": "Sonido",
     "mute": "Silenciar",
+    "quitAtClose": "Salir al cerrar",
     "autoCheckUpdate": {
       "name": "Buscar actualizaciones automáticamente",
       "daily": "Diariamente (Recomendado)",

i18n/nl/form.json

@@ -1,5 +1,6 @@
 {
   "header": {
+    "contactEdit": "Contact aanpassen",
     "new": "Nieuwe factuur aanmaken",
     "edit": "Factuur bewerken",
     "btns": {
@@ -20,6 +21,12 @@
       "quantity": "Aantal",
       "add": "Nieuw item toevoegen"
     },
+    "paymentItems": {
+      "name": "Voorschot",
+      "description": "Beschrijving",
+      "value": "Bedrag",
+      "add": "Voeg een voorschot toe"
+    },
     "recipient": {
       "name": "Ontvanger",
       "select": "Selecteer",

i18n/nl/invoices.json

@@ -7,7 +7,9 @@
     "invoiceID": "Factuurnummer",
     "createdDate": "Gemaakt op",
     "dueDate": "Vervaldatum",
-    "total": "Totaal Bedrag"
+    "total": "Totaal Bedrag",
+    "prepaid": "Voorschot",
+    "remaining": "Resterend bedrag"
   },
   "status": {
     "pending": "In behandeling",

i18n/nl/messages.json

@@ -8,6 +8,7 @@
   },
   "contact": {
     "saved": "Uw contactpersoon is met succes opgeslagen",
+    "updated": "Contact succesvol aangepast",
     "deleted": "Uw contactpersoon is met succes verwijderd"
   },
   "settings": {

i18n/nl/settings.json

@@ -19,6 +19,8 @@
     "sound": "Geluid",
     "trayIcon": "Menubalkitem",
     "sendMetricsAnon": "Stuur App Metrics Anoniem",
+    "openAtLogin": "Open at Login",
+    "quitAtClose": "Quit at Close",
     "mute": "Dempen",
     "autoCheckUpdate": {
       "name": "Check automatisch voor updates",

i18n/nl/tour.json

@@ -7,7 +7,7 @@
   "slides": {
     "welcome": {
       "heading": "👋 Hallo",
-      "description": "Bedankt voor het proberen van Invoncify. Graag laten wij zien hoe u een verbluffend factuur maakt met slechts 4 eenvoudige stappen"
+      "description": "Bedankt voor het proberen van Invoncify. Graag laten wij zien hoe u een verbluffende factuur maakt met slechts 4 eenvoudige stappen"
     },
     "create": {
       "heading": "Stap 1. Aanmaken",

i18n/ro/form.json

@@ -1,5 +1,6 @@
 {
   "header": {
+    "contactEdit": "Editare contact",
     "new": "Creează o factură nouă",
     "edit": "Editează factură",
     "btns": {
@@ -20,6 +21,12 @@
       "quantity": "Cantitate",
       "add": "Adaugă un element nou"
     },
+    "paymentItems": {
+      "name": "Preplăți",
+      "description": "Descriere",
+      "value": "Valoare",
+      "add": "Adaugă un element nou de preplată"
+    },
     "recipient": {
       "name": "Destinatar",
       "select": "Selectează",