From e041b5cb606f8be7e7002b41c5289ee5e18ff09f Mon Sep 17 00:00:00 2001 From: Ivan Ray Altomera Date: Mon, 29 Apr 2019 23:52:26 +0800 Subject: [PATCH] feat: description on item listing --- src/container/SalesContainer/index.js | 1 + src/store/PosStore/syncInBackground.js | 2 ++ src/stories/components/EntriesComponent.js | 2 ++ src/stories/components/EntryComponent.js | 6 +++++- src/stories/screens/Sales/index.js | 4 ++++ src/stories/screens/SalesList/index.js | 4 ++++ 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/container/SalesContainer/index.js b/src/container/SalesContainer/index.js index 8a83db8..c5a6ac0 100644 --- a/src/container/SalesContainer/index.js +++ b/src/container/SalesContainer/index.js @@ -848,6 +848,7 @@ export default class SalesContainer extends React.Component { onTakeAwayClick={this.onTakeAwayClick} // has order hasTailOrder={this.props.stateStore.hasTailOrder} + useDescription={this.props.stateStore.useDescription} /> ); diff --git a/src/store/PosStore/syncInBackground.js b/src/store/PosStore/syncInBackground.js index b97001c..3c43679 100644 --- a/src/store/PosStore/syncInBackground.js +++ b/src/store/PosStore/syncInBackground.js @@ -142,6 +142,8 @@ export async function itemSync(itemObject, store) { var objecct_to_add = { name: itemObject.syncObject.name !== null ? itemObject.syncObject.name : "", + description: + itemObject.syncObject.description !== null ? itemObject.syncObject.description : "", soldBy: itemObject.syncObject.stock_uom !== null ? itemObject.syncObject.stock_uom === "Nos" diff --git a/src/stories/components/EntriesComponent.js b/src/stories/components/EntriesComponent.js index bd28de6..7a47221 100644 --- a/src/stories/components/EntriesComponent.js +++ b/src/stories/components/EntriesComponent.js @@ -12,11 +12,13 @@ export default class EntriesComponent extends React.PureComponent { currency={this.props.currency} onPress={this.props.onPressItem} onLongPress={this.props.onLongPressItem} + useDescription={this.props.useDescription} /> ); }; render() { + console.log(this.props.useDescription); return ( - {this.props.value.name} + { + this.props.useDescription + ? this.props.value.description + : this.props.value.name + } diff --git a/src/stories/screens/Sales/index.js b/src/stories/screens/Sales/index.js index 440d952..2c34288 100644 --- a/src/stories/screens/Sales/index.js +++ b/src/stories/screens/Sales/index.js @@ -66,6 +66,7 @@ class Sales extends React.PureComponent { isViewingOrder, onTakeAwayClick, hasTailOrder, + useDescription, } = this.props; return ( @@ -97,6 +98,9 @@ class Sales extends React.PureComponent { itemsLength={itemsLength} categoryLengths={categoryLengths} onLongPressItem={onLongPressItem} + + // Descriptive items + useDescription={useDescription} /> )} diff --git a/src/stories/screens/SalesList/index.js b/src/stories/screens/SalesList/index.js index 83b3e17..4f5a2d3 100644 --- a/src/stories/screens/SalesList/index.js +++ b/src/stories/screens/SalesList/index.js @@ -106,6 +106,9 @@ export default class SalesList extends React.PureComponent { // TextInput onChangeBarcodeScannerInput, + + // Descriptive items + useDescription, } = this.props; return ( @@ -171,6 +174,7 @@ export default class SalesList extends React.PureComponent { onPressItem={this.onPressItem} onLongPressItem={onLongPressItem} onEndReached={this.onItemEndReached} + useDescription={useDescription} />