fix: None

refactor: Upgrade some packages feat: Added Restore Default Settings
bailabs · Jul 11, 2019 · e3bf219 · e3bf219
1 parent e241962
commit e3bf219
Show file tree

Hide file tree

Showing 11 changed files with 502 additions and 961 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,24 +46,34 @@
     "accounting-js": "^1.1.1",
     "babel-core": "^6.0.0",
     "buffer": "^5.1.0",
+    "cryptiles": "^4.1.2",
     "currencies-symbol": "^1.0.1",
+    "deep-extend": "^0.5.1",
     "email-validator": "^2.0.3",
     "es6-symbol": "^3.1.1",
+    "extend": "^3.0.2",
+    "fstream": "^1.0.12",
+    "handlebars": "^4.1.0",
     "husky": "^1.0.0-rc.2",
     "i": "^0.3.6",
     "install": "^0.11.0",
     "is-float": "^1.0.0",
-    "lodash": "4.17.5",
+    "js-yaml": "^3.13.1",
+    "lodash": "^4.17.11",
+    "mem": "4.0.0",
+    "merge": "^1.2.1",
     "mobx": "^4.2.0",
     "mobx-react": "5.0.0",
     "mobx-state-tree": "2.0.4",
     "money-currencies": "^2015.3.31",
+    "morgan": "^1.9.1",
     "native-base": "^2.4.2",
     "pouchdb-adapter-react-native-sqlite": "^1.0.3",
     "pouchdb-find": "^6.4.3",
     "pouchdb-react-native": "^6.4.1",
     "pouchdb-upsert": "^2.2.0",
     "prettier": "^1.12.1",
+    "randomatic": "^3.0.0",
     "react": "16.3.1",
     "react-native": "^0.55.3",
     "react-native-background-job": "^2.2.0",
@@ -91,6 +101,8 @@
     "react-navigation": "^1.5.11",
     "remote-redux-devtools": "^0.5.12",
     "remotedev-rn-debugger": "^0.8.3",
+    "stringstream": "0.0.6",
+    "tar": "^2.2.2",
     "tiny-esc-pos": "^0.1.7",
     "uuid": "^3.2.1",
     "valid-url": "^1.0.9"

diff --git a/src/container/ListingContainer/index.js b/src/container/ListingContainer/index.js
@@ -459,6 +459,7 @@ export default class ListingContainer extends React.Component {
               ),
             });
             updateLengthObjects(item.category);
+            updateLength();
             changeValue("itemStatus", "idle", "Listing");
             Toast.show({
               text: strings.SuccessfullyAddedNewItem,

diff --git a/src/container/SettingsContainer/index.js b/src/container/SettingsContainer/index.js
@@ -398,7 +398,7 @@ export default class SettingsContainer extends React.Component {
     } else {
       Toast.show({
         text: strings.CompanySettingsSaved,
-        duration: 60000,
+        duration: 3000,
       });
     }
   };
@@ -789,6 +789,25 @@ export default class SettingsContainer extends React.Component {
       });
     }
   };
+  restoreDefault = () => {
+    Alert.alert(
+      strings.RestoreDefault, // title
+      strings.AreYouSureYouWantToRestoreDefaultSettings,
+      [
+        { text: strings.Cancel, style: "cancel" },
+        {
+          text: strings.OK,
+          onPress: () => {
+            this.props.stateStore.restoreDefault();
+            Toast.show({
+              text: strings.DefaultSettingsRestored,
+              duration: 3000,
+            });
+          },
+        },
+      ],
+    );
+  };
   render() {
     strings.setLanguage(currentLanguage().companyLanguage);
     const {
@@ -902,6 +921,7 @@ export default class SettingsContainer extends React.Component {
         setDeviceId={stateStore.setDeviceId}
         isStackItem={stateStore.isStackItem}
         toggleIsStackItem={stateStore.toggleIsStackItem}
+        restoreDefault={this.restoreDefault}
       />
     );
   }

diff --git a/src/store/StateStore/StateStore.js b/src/store/StateStore/StateStore.js
@@ -65,6 +65,16 @@ const StateStore = types
       self.payment_state.push(payment);
       self.settings_state.push(settings);
     },
+
+    restoreDefault() {
+      Object.keys(settings).forEach(function(key) {
+        Object.keys(self.settings_state[0]).forEach(function(key1) {
+          if (key === key1) {
+            self.settings_state[0][key1] = settings[key];
+          }
+        });
+      });
+    },
     setDefaultValues(containerName, objectValue) {
       let containerNameValue = "";
       if (containerName === "Sales") {

diff --git a/src/stories/screens/Settings/index.js b/src/stories/screens/Settings/index.js
@@ -309,7 +309,11 @@ class Settings extends React.Component {
           <Body style={styles.headerBody}>
             <Title>{strings.Settings}</Title>
           </Body>
-          <Right />
+          <Right>
+            <TouchableOpacity onPress={() => this.props.restoreDefault()}>
+              <Title>{strings.RestoreDefault}</Title>
+            </TouchableOpacity>
+          </Right>
         </Header>
         <Grid>
           <Col size={30}>

diff --git a/src/translations/en.js b/src/translations/en.js
@@ -444,4 +444,8 @@ export default {
   UnableToSync: "Unable to sync",
   InvalidUrl: "Invalid URL",
   CompanySettingsSaved: "Company Settings Saved",
+  RestoreDefault: "Restore Default",
+  AreYouSureYouWantToRestoreDefaultSettings:
+    "Are you sure you want to restore default settings?",
+  DefaultSettingsRestored: "Default Settings Restored",
 };
diff --git a/src/translations/fr.js b/src/translations/fr.js
@@ -446,4 +446,8 @@ export default {
   UnableToSync: "Unable to sync",
   InvalidUrl: "Invalid URL",
   CompanySettingsSaved: "Company Settings Saved",
+  RestoreDefault: "Restore Default",
+  AreYouSureYouWantToRestoreDefaultSettings:
+    "Are you sure you want to restore default settings?",
+  DefaultSettingsRestored: "Default Settings Restored",
 };
diff --git a/src/translations/id.js b/src/translations/id.js
@@ -443,4 +443,8 @@ export default {
   UnableToSync: "Unable to sync",
   InvalidUrl: "Invalid URL",
   CompanySettingsSaved: "Company Settings Saved",
+  RestoreDefault: "Restore Default",
+  AreYouSureYouWantToRestoreDefaultSettings:
+    "Are you sure you want to restore default settings?",
+  DefaultSettingsRestored: "Default Settings Restored",
 };
diff --git a/src/translations/pt.js b/src/translations/pt.js
@@ -443,4 +443,8 @@ export default {
   UnableToSync: "Unable to sync",
   InvalidUrl: "Invalid URL",
   CompanySettingsSaved: "Company Settings Saved",
+  RestoreDefault: "Restore Default",
+  AreYouSureYouWantToRestoreDefaultSettings:
+    "Are you sure you want to restore default settings?",
+  DefaultSettingsRestored: "Default Settings Restored",
 };