Skip to content

Commit 996645d

Browse files
committed
Merge branch 'master' of https://github.com/bailabs/tailpos
2 parents ae0abff + 8c5ea5f commit 996645d

File tree

6 files changed

+43
-7
lines changed

6 files changed

+43
-7
lines changed

ChangeLog.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@
55
- Memoized anonymous functions
66

77
# Commit 3 [21 Фебраля 2019]
8-
- PureComponents and Memoized
8+
- PureComponents and Memoized
9+
10+
# v1.1.0 [22 апреля 2019]
11+
- Adding edit status in Queue settings
12+
- Persistence queue settings

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ android {
130130
multiDexEnabled true
131131
targetSdkVersion 26
132132
versionCode 1
133-
versionName "1.0"
133+
versionName "1.1"
134134
versionCode _VERSION_CODE
135135
versionName _VERSION_NAME
136136
ndk {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tailpos",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"private": true,
55
"devDependencies": {
66
"babel-eslint": "8.1.0",

src/boot/index.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import config from "./configureStore";
22
import app from "./setup";
3+
import { retrieveSettings } from "../services/storage";
4+
35
global.Buffer = require("buffer").Buffer;
6+
47
export default function() {
58
const stores = config();
69

@@ -17,6 +20,16 @@ export default function() {
1720
let itemsLength = stores.itemStore.getLengthItemsFromDb();
1821
let shiftPromise = stores.shiftStore.getFromDb(20);
1922
let rolePromise = stores.roleStore.getFromDb(20);
23+
24+
retrieveSettings().then(item => {
25+
if (item) {
26+
stores.stateStore.setQueueHost(item.queueHost);
27+
if (item.hasTailOrder) {
28+
stores.stateStore.toggleTailOrder();
29+
}
30+
}
31+
});
32+
2033
Promise.all([
2134
favoriteItemPromise,
2235
itemsLength,

src/container/SettingsContainer/index.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import * as React from "react";
22
import { Alert } from "react-native";
3-
import { Toast } from "native-base";
3+
import { NavigationActions } from "react-navigation";
44
import { observer, inject } from "mobx-react/native";
5+
import { Toast } from "native-base";
56
import BluetoothSerial from "react-native-bluetooth-serial";
6-
import { NavigationActions } from "react-navigation";
77
import { BluetoothStatus } from "react-native-bluetooth-status";
8-
import { syncObjectValues } from "../../store/PosStore/syncInBackground";
98
import Settings from "@screens/Settings";
9+
import { syncObjectValues } from "../../store/PosStore/syncInBackground";
10+
import { saveToSettings } from "../../services/storage";
1011

1112
// import { syncData } from "./sync";
1213

@@ -724,7 +725,13 @@ export default class SettingsContainer extends React.Component {
724725
}
725726

726727
onQueueSave = () => {
727-
const { setQueueNotEditing } = this.props.stateStore;
728+
const {
729+
setQueueNotEditing,
730+
queueHost,
731+
hasTailOrder,
732+
} = this.props.stateStore;
733+
734+
saveToSettings({ queueHost, hasTailOrder });
728735
setQueueNotEditing();
729736
};
730737

src/services/storage.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { AsyncStorage } from "react-native";
2+
3+
export const retrieveSettings = () => {
4+
return AsyncStorage.getItem("@Settings:Queue").then(
5+
item => (item ? JSON.parse(item) : null),
6+
);
7+
};
8+
9+
export const saveToSettings = value => {
10+
const valueString = JSON.stringify(value);
11+
return AsyncStorage.setItem("@Settings:Queue", valueString);
12+
};

0 commit comments

Comments
 (0)