Merge branch 'master' of https://github.com/bailabs/tailpos

ChangeLog.md

@@ -5,4 +5,8 @@
 - Memoized anonymous functions
 
 # Commit 3 [21 Фебраля 2019]
-- PureComponents and Memoized
+- PureComponents and Memoized
+
+# v1.1.0 [22 апреля 2019]
+- Adding edit status in Queue settings
+- Persistence queue settings

android/app/build.gradle

@@ -130,7 +130,7 @@ android {
         multiDexEnabled true
         targetSdkVersion 26
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
         versionCode _VERSION_CODE
         versionName _VERSION_NAME
         ndk {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailpos",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "devDependencies": {
     "babel-eslint": "8.1.0",

src/boot/index.js

@@ -1,6 +1,9 @@
 import config from "./configureStore";
 import app from "./setup";
+import { retrieveSettings } from "../services/storage";
+
 global.Buffer = require("buffer").Buffer;
+
 export default function() {
   const stores = config();
 
@@ -17,6 +20,16 @@ export default function() {
   let itemsLength = stores.itemStore.getLengthItemsFromDb();
   let shiftPromise = stores.shiftStore.getFromDb(20);
   let rolePromise = stores.roleStore.getFromDb(20);
+
+  retrieveSettings().then(item => {
+    if (item) {
+      stores.stateStore.setQueueHost(item.queueHost);
+      if (item.hasTailOrder) {
+        stores.stateStore.toggleTailOrder();
+      }
+    }
+  });
+
   Promise.all([
     favoriteItemPromise,
     itemsLength,

src/container/SettingsContainer/index.js

@@ -1,12 +1,13 @@
 import * as React from "react";
 import { Alert } from "react-native";
-import { Toast } from "native-base";
+import { NavigationActions } from "react-navigation";
 import { observer, inject } from "mobx-react/native";
+import { Toast } from "native-base";
 import BluetoothSerial from "react-native-bluetooth-serial";
-import { NavigationActions } from "react-navigation";
 import { BluetoothStatus } from "react-native-bluetooth-status";
-import { syncObjectValues } from "../../store/PosStore/syncInBackground";
 import Settings from "@screens/Settings";
+import { syncObjectValues } from "../../store/PosStore/syncInBackground";
+import { saveToSettings } from "../../services/storage";
 
 // import { syncData } from "./sync";
 
@@ -724,7 +725,13 @@ export default class SettingsContainer extends React.Component {
   }
 
   onQueueSave = () => {
-    const { setQueueNotEditing } = this.props.stateStore;
+    const {
+      setQueueNotEditing,
+      queueHost,
+      hasTailOrder,
+    } = this.props.stateStore;
+
+    saveToSettings({ queueHost, hasTailOrder });
     setQueueNotEditing();
   };
 

src/services/storage.js

@@ -0,0 +1,12 @@
+import { AsyncStorage } from "react-native";
+
+export const retrieveSettings = () => {
+  return AsyncStorage.getItem("@Settings:Queue").then(
+    item => (item ? JSON.parse(item) : null),
+  );
+};
+
+export const saveToSettings = value => {
+  const valueString = JSON.stringify(value);
+  return AsyncStorage.setItem("@Settings:Queue", valueString);
+};