Merge pull request #118 from AndresMorelos/1.30.2

1.30.2

Author: AndresMorelos

app.js

@@ -308,8 +308,7 @@ function setInitialValues() {
       quitAtClose: false,
     },
     invoice: {
-      exportNamingFormat:
-        '{invoiceID}',
+      exportNamingFormat: '{invoiceID}',
       exportDir: os.homedir(),
       template: 'default',
       dateFormat: 'MM/DD/YYYY',
@@ -533,11 +532,26 @@ function migrateData() {
         ...configs,
         invoice: {
           ...configs.invoice,
-          exportNamingFormat:
-            '{invoiceID}',
+          exportNamingFormat: '{invoiceID}',
         },
       };
     },
+    9: (configs) => {
+      // Return current configs if this is the first time install
+      const { defaultLanguage } = configs.general;
+      if (defaultLanguage !== undefined && defaultLanguage === 'esES') {
+        // Update current configs
+        return {
+          ...configs,
+          general: {
+            ...configs.general,
+            defaultLanguage: 'es-ES',
+          },
+        };
+      }
+
+      return configs;
+    },
   };
   // Get the current Config
   const configs = appConfig.getSync();

app/App.jsx

@@ -22,7 +22,7 @@ import { getSecretKey, getLoadEncryptedData } from './reducers/LoginReducer'
 import Login from './containers/Login';
 
 import windowStateKeeper from '../helpers/windowStateKeeper';
-import resize from './helpers/resize'
+import './helpers/resize'
 import { Notify } from '../helpers/notify'
 const ipc = require('electron').ipcRenderer;
 

app/components/form/ItemRow.jsx

@@ -139,9 +139,25 @@ export class ItemRow extends Component {
 
   uploadRowState() {
     const { updateRow, subItems } = this.props;
+    const { subitems: stateSubItems } = this.state;
+
+    const subitemsToAdd = subItems.reduce((acc, item) => {
+      const subitem = stateSubItems.find((subitem) => subitem.id === item.id);
+      if (!subitem) {
+        acc.push(item);
+      }
+
+      if (subitem) {
+        const itemUpdated = Object.assign(subitem, item);
+        acc.push(itemUpdated);
+      }
+
+      return acc;
+    }, []);
+
     updateRow({
       ...this.state,
-      subitems: [...subItems, ...this.state.subitems],
+      subitems: subitemsToAdd,
     });
   }
 

app/components/settings/General.jsx

@@ -105,8 +105,8 @@ class General extends Component {
                 <option value="en">
                   {t('settings:fields:language:en', { lng: 'en' })}
                 </option>
-                <option value="esES">
-                  {t('settings:fields:language:esES', { lng: 'esES' })}
+                <option value="es-ES">
+                  {t('settings:fields:language:es-ES', { lng: 'es-ES' })}
                 </option>
                 <option value="fr">
                   {t('settings:fields:language:fr', { lng: 'fr' })}

app/components/settings/_partials/invoice/Other.jsx

@@ -55,7 +55,7 @@ const Other = function ({
           </ExportDir>
           <span style={{ color: '#757D75', fontSize: '13px' }}>
             {
-              '{invoiceID} {createdAt.month} {createdAt.day} {createdAt.year} {date.month} {date.day} {date.year} {UUID}'
+              '{invoiceID} {createdAt.month} {createdAt.MMMMM} {createdAt.day} {createdAt.year} {date.month} {date.MMMMM} {date.day} {date.year} {UUID}'
             }
           </span>
         </Field>

i18n/de/settings.json

@@ -41,7 +41,7 @@
       "de": "Deutsch",
       "el": "Griechisch",
       "en": "Englisch",
-      "esES": "Spanisch",
+      "es-ES": "Spanisch",
       "fr": "Französisch",
       "id": "Indonesisch",
       "it": "Italienisch",

i18n/en/settings.json

@@ -47,7 +47,7 @@
       "de": "German",
       "el": "Greek",
       "en": "English",
-      "esES": "Spanish",
+      "es-ES": "Spanish",
       "fr": "French",
       "id": "Indonesian",
       "it": "Italian",

i18n/esES/settings.json

@@ -42,7 +42,7 @@
       "de": "German",
       "el": "Greek",
       "en": "English",
-      "esES": "Español",
+      "es-ES": "Español",
       "fr": "French",
       "id": "Indonesian",
       "it": "Italian",

i18n/fr/settings.json

@@ -40,7 +40,7 @@
       "de": "Allemand",
       "el": "Grec",
       "en": "Anglais",
-      "esES": "Espagnol",
+      "es-ES": "Espagnol",
       "fr": "Français",
       "id": "Indonésien",
       "it": "Italien",

i18n/i18n.js

@@ -33,7 +33,7 @@ i18n.use(initReactI18next).init({
     id,
     it,
     sk,
-    esES,
+    'es-ES': esES,
     'ur-PK': urPK,
     vi,
     'zh-CN': zhCN,