Reza_ashrafi
/
RnDanovinExpo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed .?

Browse Source
master
Reza_ashrafi 3 years ago
parent d86d4b99af
commit 6978496507
15 changed files with 107 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/screens/DeliveryForm/Address/index.js
  2. 84
      src/screens/DeliveryForm/TransportDate/index.js
  3. 4
      src/screens/DeliveryForm/TransportMethod/index.js
  4. 6
      src/screens/DeliveryForm/index.js
  5. 8
      src/screens/Faq/components/Instance.js
  6. 2
      src/screens/Faq/index.js
  7. 8
      src/screens/Home/components/Blogs.js
  8. 4
      src/screens/Home/components/MyBooks.js
  9. 4
      src/screens/Home/components/Scroll.js
  10. 14
      src/screens/Home/components/Videos.js
  11. 8
      src/screens/Home/index.js
  12. 10
      src/screens/OrderDetails/components/Book.js
  13. 24
      src/screens/OrderDetails/index.js
  14. 14
      src/screens/OrdersFollowUp/components/Order.js
  15. 30
      src/screens/OrdersFollowUp/index.js

10
src/screens/DeliveryForm/Address/index.js
Unescape View File

@ -63,11 +63,11 @@ const Address = ({
), ),
]} ]}
onPress={() => { onPress={() => {
setSelectedItem(address.id); setSelectedItem(address?.id);
active ? {} : update({ userAddressId: address.id, userId }); active ? {} : update({ userAddressId: address?.id, userId });
}} }}
> >
{selectedItem === address.id && loading ? ( {selectedItem === address?.id && loading ? (
<ActivityIndicator size="small" color={Colors.theme1.greenC8} /> <ActivityIndicator size="small" color={Colors.theme1.greenC8} />
) : active ? ( ) : active ? (
<Entypo <Entypo
@ -100,7 +100,7 @@ const Address = ({
}, },
]} ]}
> >
{address.address} {address?.address}
</Text> </Text>
</View> </View>
</Pressable> </Pressable>
@ -110,7 +110,7 @@ const Address = ({
return ( return (
<View style={tw("w-full mt-2")}> <View style={tw("w-full mt-2")}>
<View style={tw("p-0 m-0 flex ")}> <View style={tw("p-0 m-0 flex ")}>
{addresses.map((address, index) => ( {addresses?.map((address, index) => (
<Location <Location
address={address} address={address}
key={index} key={index}

84
src/screens/DeliveryForm/TransportDate/index.js
Unescape View File

@ -20,15 +20,19 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
return ( return (
<Pressable <Pressable
style={[ style={[
tw(`flex flex-row-reverse justify-between items-center w-full px-3 ${mobile ? "py-3" : "py-2"} rounded-sm mt-3`), tw(
`flex flex-row-reverse justify-between items-center w-full px-3 ${
mobile ? "py-3" : "py-2"
} rounded-sm mt-3`
),
{ {
backgroundColor: light ? active backgroundColor: light
? Colors.theme1.greenCF + "15" ? active
: Colors.theme1.grayE3 + "44" : null, ? Colors.theme1.greenCF + "15"
: Colors.theme1.grayE3 + "44"
: null,
borderWidth: 1.5, borderWidth: 1.5,
borderColor: active borderColor: active ? Colors.theme1.greenCF : Colors.theme1.grayE3,
? Colors.theme1.greenCF
: Colors.theme1.grayE3,
}, },
]} ]}
onPress={() => setActiveDate(time)} onPress={() => setActiveDate(time)}
@ -38,40 +42,48 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.tiny : fontSize.xl, fontSize: mobile ? fontSize.tiny : fontSize.xl,
color: active color: active
? light ? Colors.theme1.gray20 : Colors.theme1.greenCF ? light
: light ? Colors.theme1.gray20 : Colors.theme1.white, ? Colors.theme1.gray20
: Colors.theme1.greenCF
: light
? Colors.theme1.gray20
: Colors.theme1.white,
}} }}
> >
{time.time} {time?.time}
</Text> </Text>
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
<View <View
style={[ style={[
tw(`${active ? "bg-green-600" : "bg-gray-600"}`), tw(`${active ? "bg-green-600" : "bg-gray-600"}`),
{ {
height: fontSize.base + 10, height: fontSize.base + 10,
width: 1, width: 1,
marginLeft: 10, marginLeft: 10,
}, },
]} ]}
></View> ></View>
<Text <Text
style={{ style={{
fontFamily: "regular", fontFamily: "regular",
fontSize: mobile ? fontSize.sm : fontSize.base, fontSize: mobile ? fontSize.sm : fontSize.base,
color: active color: active
? light ? Colors.theme1.green20 : Colors.theme1.greenCF ? light
: light ? Colors.theme1.gray20 : Colors.theme1.white, ? Colors.theme1.green20
}} : Colors.theme1.greenCF
> : light
تکمیل ظرفیت ? Colors.theme1.gray20
</Text> : Colors.theme1.white,
</View> }}
>
تکمیل ظرفیت
</Text>
</View>
</Pressable> </Pressable>
); );
}, []); }, []);
return ( return (
<View style={tw(`w-full`)}> <View style={tw(`w-full`)}>
<Text <Text
@ -79,7 +91,7 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
fontSize: mobile ? fontSize.base : fontSize.xl2, fontSize: mobile ? fontSize.base : fontSize.xl2,
fontFamily: "bold", fontFamily: "bold",
color: light ? Colors.theme1.green79 : Colors.theme1.white, color: light ? Colors.theme1.green79 : Colors.theme1.white,
textAlign : ios ? "right" : "auto", textAlign: ios ? "right" : "auto",
}} }}
> >
زمان ارسال را انتخاب کنید. زمان ارسال را انتخاب کنید.
@ -95,7 +107,7 @@ const TransportDate = ({ transportDate, mobile, theme }) => {
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
mobile: state.publicApi.mobile, mobile: state.publicApi.mobile,
theme: state.publicApi.theme theme: state.publicApi.theme,
}); });
const mapDispatchToProps = {}; const mapDispatchToProps = {};

4
src/screens/DeliveryForm/TransportMethod/index.js
Unescape View File

@ -99,7 +99,7 @@ const TransportMethod = ({
: Colors.theme1.white, : Colors.theme1.white,
}} }}
> >
{method.name} {method?.name}
</Text> </Text>
)} )}
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
@ -130,7 +130,7 @@ const TransportMethod = ({
: Colors.theme1.white, : Colors.theme1.white,
}} }}
> >
{separate(method.price) + " " + "تومان"} {separate(method?.price) + " " + "تومان"}
</Text> </Text>
</View> </View>
</Pressable> </Pressable>

6
src/screens/DeliveryForm/index.js
Unescape View File

@ -80,9 +80,9 @@ const DeliveryForm = ({
<View style={tw("w-full flex flex-row mt-5")}> <View style={tw("w-full flex flex-row mt-5")}>
<TransportMethod /> <TransportMethod />
</View> </View>
{factorInfo.transportId === 2 ? ( {factorInfo?.transportId === 2 ? (
<View style={tw("w-full flex flex-row mt-5 mb-5")}> <View style={tw("w-full flex flex-row mt-5 mb-5")}>
<TransportDate transportDate={form.transportDate} /> <TransportDate transportDate={form?.transportDate} />
</View> </View>
) : null} ) : null}
</View> </View>
@ -95,7 +95,7 @@ const DeliveryForm = ({
border={{ color: "#196EC0", width: 0 }} border={{ color: "#196EC0", width: 0 }}
width={"100%"} width={"100%"}
onPress={() => onPress={() =>
factorInfo.transportId && factorInfo.userAddressId factorInfo?.transportId && factorInfo?.userAddressId
? payFactor({ userId }) ? payFactor({ userId })
: asyncAwesomeAlert("خطا", "آدرس یا نحوه ارسال را وارد کنید", { : asyncAwesomeAlert("خطا", "آدرس یا نحوه ارسال را وارد کنید", {
showCancelButton: false, showCancelButton: false,

8
src/screens/Faq/components/Instance.js
Unescape View File

@ -40,9 +40,9 @@ function Instance({ question, selectFaq, mobile, theme }) {
}, },
]} ]}
> >
{question.title} {question?.title}
</Text> </Text>
{question.active ? ( {question?.active ? (
<Entypo <Entypo
name="minus" name="minus"
size={18} size={18}
@ -60,7 +60,7 @@ function Instance({ question, selectFaq, mobile, theme }) {
/> />
)} )}
</View> </View>
{question.active ? ( {question?.active ? (
<View style={tw("w-full flex flex-row-reverse pt-2")}> <View style={tw("w-full flex flex-row-reverse pt-2")}>
<Text <Text
style={[ style={[
@ -75,7 +75,7 @@ function Instance({ question, selectFaq, mobile, theme }) {
tw("text-right flex-1"), tw("text-right flex-1"),
]} ]}
> >
{question.description} {question?.description}
</Text> </Text>
</View> </View>
) : null} ) : null}

2
src/screens/Faq/index.js
Unescape View File

@ -80,7 +80,7 @@ function Faq({
placeholder={"بخشی از پرسش خود را اینجا بنویسید"} placeholder={"بخشی از پرسش خود را اینجا بنویسید"}
/> />
</View> </View>
{search.length ? ( {search?.length ? (
searchResult?.length ? ( searchResult?.length ? (
<FlatList <FlatList
contentContainerStyle={{ paddingBottom: height / 2 }} contentContainerStyle={{ paddingBottom: height / 2 }}

8
src/screens/Home/components/Blogs.js
Unescape View File

@ -30,7 +30,7 @@ const ios = Platform.OS === "ios";
function Blogs({ blogs, mobile, theme }) { function Blogs({ blogs, mobile, theme }) {
return ( return (
<View style={[tw("flex")]}> <View style={[tw("flex")]}>
{blogs.length ? ( {blogs?.length ? (
<> <>
<View style={tw("w-full px-4")}> <View style={tw("w-full px-4")}>
<Header title={"خواندنی‌ها"} route={"Blogs"} /> <Header title={"خواندنی‌ها"} route={"Blogs"} />
@ -40,11 +40,11 @@ function Blogs({ blogs, mobile, theme }) {
horizontal={true} horizontal={true}
inverted={true} inverted={true}
style={[tw("flex flex-row mt-3")]} style={[tw("flex flex-row mt-3")]}
data={blogs.slice(0, 7)} data={blogs?.slice(0, 7)}
renderItem={({ item }) => ( renderItem={({ item }) => (
<Blog blog={item} mobile={mobile} theme={theme} /> <Blog blog={item} mobile={mobile} theme={theme} />
)} )}
keyExtractor={(item) => item.id} keyExtractor={(item) => item?.id}
initialNumToRender={5} initialNumToRender={5}
/> />
</> </>
@ -98,7 +98,7 @@ const Blog = ({ blog, mobile, theme }) => {
}, },
]} ]}
> >
{blog.title} {blog?.title}
</Text> </Text>
<View style={[tw("flex flex-row-reverse justify-between")]}> <View style={[tw("flex flex-row-reverse justify-between")]}>
<View style={tw("flex-row-reverse items-center")}> <View style={tw("flex-row-reverse items-center")}>

4
src/screens/Home/components/MyBooks.js
Unescape View File

@ -20,7 +20,7 @@ import fontSize from "../../../constants/fontSize";
const ios = Platform.OS === "ios"; const ios = Platform.OS === "ios";
function MyBooks({ books, grades, theme }) { function MyBooks({ books, grades, theme }) {
return books?.filter((book) => book.condition >= 2).length ? ( return books?.filter((book) => book?.condition >= 2).length ? (
<View style={[tw("flex w-full mb-5")]}> <View style={[tw("flex w-full mb-5")]}>
<View <View
style={[ style={[
@ -55,7 +55,7 @@ function MyBooks({ books, grades, theme }) {
style={[tw("py-3")]} style={[tw("py-3")]}
horizontal={true} horizontal={true}
inverted={true} inverted={true}
data={books?.filter((book) => book.condition >= 2)} data={books?.filter((book) => book?.condition >= 2)}
renderItem={({ item }) => ( renderItem={({ item }) => (
<Book book={item} grades={grades} theme={theme} /> <Book book={item} grades={grades} theme={theme} />
)} )}

4
src/screens/Home/components/Scroll.js
Unescape View File

@ -28,7 +28,7 @@ function Scroll({ books, mobile }) {
> >
<Image <Image
resizeMode="contain" resizeMode="contain"
source={{ uri: `https://dnvn.ir/api/v1/file/${book.fileIds}` }} source={{ uri: `https://dnvn.ir/api/v1/file/${book?.fileIds}` }}
style={{ width: "100%", height: "100%" }} style={{ width: "100%", height: "100%" }}
/> />
</Pressable> </Pressable>
@ -43,7 +43,7 @@ function Scroll({ books, mobile }) {
{ height: mobile ? 242 : 350, direction: "rtl" }, { height: mobile ? 242 : 350, direction: "rtl" },
]} ]}
> >
{books.slice(0, 14).map((book, index) => ( {books.slice(0, 14)?.map((book, index) => (
<Product book={book} position={Number(index)} key={index} /> <Product book={book} position={Number(index)} key={index} />
))} ))}
</View> </View>

14
src/screens/Home/components/Videos.js
Unescape View File

@ -17,7 +17,7 @@ function Videos({ videos, grades, mobile, theme }) {
return ( return (
<View style={[tw("w-full mb-0")]}> <View style={[tw("w-full mb-0")]}>
<View style={[tw("w-full flex rounded-md pt-2 overflow-hidden")]}> <View style={[tw("w-full flex rounded-md pt-2 overflow-hidden")]}>
{videos.length ? ( {videos?.length ? (
<> <>
<View style={tw("flex px-4")}> <View style={tw("flex px-4")}>
<Header title="دوره‌های ویدئویی شما" route={"VOD"} /> <Header title="دوره‌های ویدئویی شما" route={"VOD"} />
@ -27,7 +27,7 @@ function Videos({ videos, grades, mobile, theme }) {
style={[tw("py-3")]} style={[tw("py-3")]}
horizontal={true} horizontal={true}
inverted={true} inverted={true}
data={videos.slice(0, 7)} data={videos?.slice(0, 7)}
renderItem={({ item }) => ( renderItem={({ item }) => (
<Video <Video
video={item} video={item}
@ -36,7 +36,7 @@ function Videos({ videos, grades, mobile, theme }) {
theme={theme} theme={theme}
/> />
)} )}
keyExtractor={(item) => item.id} keyExtractor={(item) => item?.id}
/> />
</> </>
) : null} ) : null}
@ -53,10 +53,10 @@ const Video = ({ video, mobile, grades, theme }) => {
tw(`flex relative ${mobile ? "mr-4" : "ml-5"}`), tw(`flex relative ${mobile ? "mr-4" : "ml-5"}`),
{ width: mobile ? 200 : 200, height: mobile ? 210 : 210 }, { width: mobile ? 200 : 200, height: mobile ? 210 : 210 },
]} ]}
onPress={() => navigation.navigate("Video", { id: video.id })} onPress={() => navigation.navigate("Video", { id: video?.id })}
> >
<Image <Image
source={{ uri: `https://dnvn.ir/api/v1/file/${video.fileIds}` }} source={{ uri: `https://dnvn.ir/api/v1/file/${video?.fileIds}` }}
// resizeMode="contain" // resizeMode="contain"
style={[ style={[
tw("bg-gray-100"), tw("bg-gray-100"),
@ -77,7 +77,7 @@ const Video = ({ video, mobile, grades, theme }) => {
}, },
]} ]}
> >
{"دوره ویدئویی" + " " + video.name} {"دوره ویدئویی" + " " + video?.name}
</Text> </Text>
<Text <Text
style={[ style={[
@ -91,7 +91,7 @@ const Video = ({ video, mobile, grades, theme }) => {
}, },
]} ]}
> >
{"پایه" + " " + grades[video.gradeId]} {"پایه" + " " + grades[video?.gradeId]}
</Text> </Text>
<View style={tw("absolute bottom-0 left-0 w-full")}> <View style={tw("absolute bottom-0 left-0 w-full")}>
<Progress percent={60} alignItems={"items-end"} /> <Progress percent={60} alignItems={"items-end"} />

8
src/screens/Home/index.js
Unescape View File

@ -47,11 +47,11 @@ const Home = ({
}; };
React.useEffect(() => { React.useEffect(() => {
if (blogs.length === 0) { if (blogs?.length === 0) {
getBlogs(); getBlogs();
} else if (books.length === 0) { } else if (books?.length === 0) {
getBooks({ vod: true }); getBooks({ vod: true });
} else if (userProducts.length === 0) { } else if (userProducts?.length === 0) {
getUserProducts(); getUserProducts();
} }
}, [books, userProducts, blogs]); }, [books, userProducts, blogs]);
@ -77,7 +77,7 @@ const Home = ({
> >
{!mobile ? <View style={tw("mt-5")}></View> : null} {!mobile ? <View style={tw("mt-5")}></View> : null}
<MyBooks books={userProducts} /> <MyBooks books={userProducts} />
{books.length ? ( {books?.length ? (
<View style={tw("px-4 w-full")}> <View style={tw("px-4 w-full")}>
<Header title={"فروشگاه"} route={"Products"} /> <Header title={"فروشگاه"} route={"Products"} />
</View> </View>

10
src/screens/OrderDetails/components/Book.js
Unescape View File

@ -23,7 +23,7 @@ function Book({ book, mobile, grades, theme }) {
<Image <Image
resizeMode="contain" resizeMode="contain"
source={{ source={{
uri: `https://dnvn.ir/api/v1/file/${book.product.book.fileIds}`, uri: `https://dnvn.ir/api/v1/file/${book?.product?.book.fileIds}`,
}} }}
style={[ style={[
tw("rounded-md"), tw("rounded-md"),
@ -46,7 +46,7 @@ function Book({ book, mobile, grades, theme }) {
}, },
]} ]}
> >
{book.product.book.name || " "} {book?.product?.book?.name || " "}
</Text> </Text>
<Text <Text
style={[ style={[
@ -61,7 +61,7 @@ function Book({ book, mobile, grades, theme }) {
}, },
]} ]}
> >
{"پایه" + " " + grades[book.product.book.gradeId]} {"پایه" + " " + grades[book?.product?.book?.gradeId]}
</Text> </Text>
{/* <Text {/* <Text
style={[ style={[
@ -91,7 +91,7 @@ function Book({ book, mobile, grades, theme }) {
}, },
]} ]}
> >
{book.product.count} {book?.product?.count}
</Text> </Text>
<View style={tw("flex flex-row items-center")}> <View style={tw("flex flex-row items-center")}>
<Text <Text
@ -117,7 +117,7 @@ function Book({ book, mobile, grades, theme }) {
}, },
]} ]}
> >
{book.product.price} {book?.product?.price}
</Text> </Text>
</View> </View>
</View> </View>

24
src/screens/OrderDetails/index.js
Unescape View File

@ -43,7 +43,7 @@ const status = {
}; };
function OrderDetails({ mobile, route, theme }) { function OrderDetails({ mobile, route, theme }) {
const { order } = route.params; const { order } = route?.params;
const [position, setPosition] = useState("100%"); const [position, setPosition] = useState("100%");
React.useEffect(() => { React.useEffect(() => {
@ -112,12 +112,12 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{status[order.condition]} {status[order?.condition]}
</Text> </Text>
<View <View
style={[ style={[
tw("h-4 w-4 rounded-full mr-2"), tw("h-4 w-4 rounded-full mr-2"),
{ backgroundColor: colors[order.condition] }, { backgroundColor: colors[order?.condition] },
]} ]}
></View> ></View>
</View> </View>
@ -206,7 +206,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{order.recieverName || " "} {order?.recieverName || " "}
</Text> </Text>
</View> </View>
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
@ -240,7 +240,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{order.recieverPhone || " "} {order?.recieverPhone || " "}
</Text> </Text>
</View> </View>
</View> </View>
@ -272,7 +272,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{"کد تحویل" + " " + order.recieverPostalCode} {"کد تحویل" + " " + order?.recieverPostalCode}
</Text> </Text>
<Text <Text
style={[ style={[
@ -296,7 +296,7 @@ function OrderDetails({ mobile, route, theme }) {
</Text> </Text>
</View> </View>
<View style={tw("w-full flex items-end")}> <View style={tw("w-full flex items-end")}>
{order.userProducts.map((item, index) => ( {order?.userProducts.map((item, index) => (
<Book book={item} key={index} /> <Book book={item} key={index} />
))} ))}
</View> </View>
@ -331,7 +331,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{order.sumPrice + " " + "تومان"} {order?.sumPrice + " " + "تومان"}
</Text> </Text>
</View> </View>
</View> </View>
@ -375,7 +375,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{order.transportPrice + " " + "تومان"} {order?.transportPrice + " " + "تومان"}
</Text> </Text>
</View> </View>
<View style={tw("flex flex-row-reverse")}> <View style={tw("flex flex-row-reverse")}>
@ -408,7 +408,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{order.payPrice + " " + "تومان"} {order?.payPrice + " " + "تومان"}
</Text> </Text>
</View> </View>
</View> </View>
@ -452,7 +452,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{order.transactionId} {order?.transactionId}
</Text> </Text>
</View> </View>
</View> </View>
@ -487,7 +487,7 @@ function OrderDetails({ mobile, route, theme }) {
}, },
]} ]}
> >
{moment(order.payedAt).format("jYYYY/jMM/jDD")} {moment(order?.payedAt)?.format("jYYYY/jMM/jDD")}
</Text> </Text>
</View> </View>
</View> </View>

14
src/screens/OrdersFollowUp/components/Order.js
Unescape View File

@ -67,7 +67,7 @@ function Order({ order, mobile, theme }) {
}, },
]} ]}
> >
{"شماره سفارش:" + " " + order.transactionId} {"شماره سفارش:" + " " + order?.transactionId}
</Text> </Text>
<View style={tw("flex flex-row-reverse items-center")}> <View style={tw("flex flex-row-reverse items-center")}>
<Text <Text
@ -83,12 +83,12 @@ function Order({ order, mobile, theme }) {
}, },
]} ]}
> >
{status[order.condition]} {status[order?.condition]}
</Text> </Text>
<View <View
style={[ style={[
tw("h-4 w-4 rounded-full mr-2"), tw("h-4 w-4 rounded-full mr-2"),
{ backgroundColor: colors[order.condition] }, { backgroundColor: colors[order?.condition] },
]} ]}
></View> ></View>
</View> </View>
@ -96,7 +96,7 @@ function Order({ order, mobile, theme }) {
<View style={tw("w-full flex flex-row-reverse justify-between p-3")}> <View style={tw("w-full flex flex-row-reverse justify-between p-3")}>
<View style={tw("flex ")}> <View style={tw("flex ")}>
<View style={tw("flex flex-row-reverse mb-2")}> <View style={tw("flex flex-row-reverse mb-2")}>
{order.userProducts.map((product, index) => ( {order?.userProducts?.map((product, index) => (
<Image <Image
key={index} key={index}
source={{ source={{
@ -126,7 +126,7 @@ function Order({ order, mobile, theme }) {
}, },
]} ]}
> >
{"کد تحویل:" + " " + order.followCode} {"کد تحویل:" + " " + order?.followCode}
</Text> </Text>
</View> </View>
</View> </View>
@ -144,7 +144,7 @@ function Order({ order, mobile, theme }) {
}, },
]} ]}
> >
{"جمع فاکتور:" + " " + order.payPrice} {"جمع فاکتور:" + " " + order?.payPrice}
</Text> </Text>
<TouchableOpacity <TouchableOpacity
onPress={() => navigation.navigate("Order", { order: order })} onPress={() => navigation.navigate("Order", { order: order })}
@ -199,7 +199,7 @@ function Order({ order, mobile, theme }) {
> >
{"تاریخ سفارش:" + {"تاریخ سفارش:" +
" " + " " +
moment(order.payedAt).format("jYYYY/jMM/jDD")} moment(order?.payedAt)?.format("jYYYY/jMM/jDD")}
</Text> </Text>
</View> </View>
</View> </View>

30
src/screens/OrdersFollowUp/index.js
Unescape View File

@ -67,7 +67,7 @@ function OrdersFollowUp({ orders, getList, theme }) {
contentContainerStyle={styles.contentContainerStyle} contentContainerStyle={styles.contentContainerStyle}
style={styles.container} style={styles.container}
> >
{orders.map((order, index) => ( {orders?.map((order, index) => (
<Order order={order} key={index} /> <Order order={order} key={index} />
))} ))}
</ScrollView> </ScrollView>
@ -105,31 +105,3 @@ const mapDispatchToProps = {
export default connect(mapStateToProps, mapDispatchToProps)(OrdersFollowUp); export default connect(mapStateToProps, mapDispatchToProps)(OrdersFollowUp);
OrdersFollowUp.defaultProps = {
orders: [
{
number: "535353523653",
receiveCode: "300031",
status: 2,
items: [b1Image, b1Image, b1Image, b1Image],
date: "1400/1/12",
cost: "1.240.000",
},
{
number: "535353523653",
receiveCode: "300031",
status: 3,
items: [b1Image, b1Image, b1Image],
date: "1400/1/12",
cost: "1.240.000",
},
{
number: "535353523653",
receiveCode: "300031",
status: 4,
items: [b1Image, b1Image, b1Image],
date: "1400/1/12",
cost: "1.240.000",
},
],
};

Write Preview
Loading…
Cancel
Save