Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delivery form pricing #1884

Draft
wants to merge 35 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
7186c13
Refactor NewDelivery to functional component
Pierre-LHOSTE May 28, 2024
22dd3b6
Refactor NewDelivery to functional component
Pierre-LHOSTE May 28, 2024
a6c54b9
Add fetching timeSlots and choices
Pierre-LHOSTE Jun 6, 2024
9daef77
Update select timeSlot button style
Pierre-LHOSTE Jun 6, 2024
9ad7c82
Add and use react-native-picker-select
Pierre-LHOSTE Jun 18, 2024
935225f
Fix useEffect and update styles
Pierre-LHOSTE Jun 18, 2024
48059e4
Update styles
Pierre-LHOSTE Jun 19, 2024
c9726f9
Reset TimeSlotSelector value when changes
Pierre-LHOSTE Jun 19, 2024
c045f1c
fix: Reset TimeSlotSelector value when changes
Pierre-LHOSTE Jun 19, 2024
7a7cc40
fix: Update background color in NewDeliveryForm
Pierre-LHOSTE Jun 22, 2024
110d7ba
Move phone & contact to first page & making first page form
Pierre-LHOSTE Jun 27, 2024
d3aca29
Update props to pass all data
Pierre-LHOSTE Jul 1, 2024
8235be9
Add SafeArea & VStack
Pierre-LHOSTE Jul 1, 2024
044014e
Add ModalFormWrapper component for reusable modal form layout
Pierre-LHOSTE Jul 1, 2024
043ee07
Add error text for address
Pierre-LHOSTE Jul 1, 2024
2ef6fbd
Add custom weight input
Pierre-LHOSTE Jul 2, 2024
a38189e
Refactor FormInput, update colors and styles
Pierre-LHOSTE Jul 4, 2024
1f31226
Refactor delivery obj
Pierre-LHOSTE Jul 25, 2024
be67c5f
Update Yoga
Pierre-LHOSTE Jul 25, 2024
fd9d3d5
Add businessName
Pierre-LHOSTE Jul 30, 2024
6b5f897
Add packages render & improve styles
Pierre-LHOSTE Jul 30, 2024
1efbc1e
Fix saved address select
Pierre-LHOSTE Jul 31, 2024
f1ffd0c
Add "Next" button translation
Pierre-LHOSTE Jul 31, 2024
b07b061
Change description to comments
Pierre-LHOSTE Aug 6, 2024
23d530a
Add placeholder, search for client, scrolling and change "description…
Pierre-LHOSTE Aug 7, 2024
6af3a06
Some little fixes
Pierre-LHOSTE Aug 17, 2024
0fca28b
Refactor props
Pierre-LHOSTE Aug 19, 2024
3350663
Convert AddressAutocomplete component
Pierre-LHOSTE Aug 28, 2024
6da0490
Add timeSlots and choices default
Pierre-LHOSTE Sep 11, 2024
765bb25
Fix tests error
Pierre-LHOSTE Sep 11, 2024
4c7e244
Fix tests error
Pierre-LHOSTE Sep 11, 2024
65fa20a
Fix #1866
Pierre-LHOSTE Sep 20, 2024
dfef2a7
Add loadPackages
Pierre-LHOSTE Sep 20, 2024
c07f2ff
Fix
Pierre-LHOSTE Sep 20, 2024
d9a26a0
Add pricing page
Pierre-LHOSTE Sep 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,7 @@ SPEC CHECKSUMS:
StripePaymentSheet: a25d920bb3bb5e2580696476482dc7df9cb5e4e2
StripePaymentsUI: 66088abec88754bbdd522ef227dfdbb2265a653e
StripeUICore: b193c7d35e9cd1b04bc9ed4a6fb8c548fcee83fa
Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7
Yoga: 9e6a04eacbd94f97d94577017e9f23b3ab41cf6c
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

PODFILE CHECKSUM: d949c9fd9c4ce5f3ec67d52ca1f4a1ca13072560
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"react-native-modal-selector": "^2.1.2",
"react-native-pager-view": "^6.3.3",
"react-native-payment-icons": "^1.0.11",
"react-native-picker-select": "^9.1.3",
"react-native-pin-screen": "git+https://[email protected]/coopcycle/react-native-pin-screen.git#1.0.3",
"react-native-reanimated": "^3.12.1",
"react-native-safe-area-context": "^4.10.7",
Expand Down
10 changes: 8 additions & 2 deletions src/components/AddressAutocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import { AbortController } from 'abortcontroller-polyfill/dist/cjs-ponyfill';
import axios from 'axios';
import Fuse from 'fuse.js';
import _ from 'lodash';
import { Icon, Text, useColorMode, useColorModeValue } from 'native-base';
import {
Icon,
Input,
Text,
useColorMode,
useColorModeValue,
} from 'native-base';
import PropTypes from 'prop-types';
import qs from 'qs';
import React, { Component } from 'react';
Expand Down Expand Up @@ -407,7 +413,7 @@ class AddressAutocomplete extends Component {
return (
<View style={styles.textInput}>
<View style={styles.textInput}>
<TextInput
<Input
{...props}
style={[props.style, { flex: 1 }]}
onFocus={this.onTextInputFocus.bind(this)}
Expand Down
42 changes: 42 additions & 0 deletions src/components/AddressAutocomplete/components/PostCodeButton.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { Icon, Text } from 'native-base';
import React from 'react';
import { TouchableOpacity } from 'react-native';
import 'react-native-get-random-values';
import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';

export default function PostCodeButton({ postcode, onPress }) {
return (
<TouchableOpacity
style={{
flexDirection: 'row',
alignItems: 'center',
paddingLeft: 10,
paddingRight: 10,
paddingVertical: 5,
position: 'absolute',
right: 0,
top: 0,
bottom: 0,
backgroundColor: '#0984e3',
borderTopRightRadius: 20,
borderBottomRightRadius: 20,
}}
onPress={onPress}>
<Text
style={{
marginRight: 10,
fontWeight: '700',
fontSize: 16,
color: 'white',
fontFamily: 'RobotoMono-Regular',
}}>
{postcode}
</Text>
<Icon
as={FontAwesome5}
name="times"
style={{ fontSize: 18, color: 'white' }}
/>
</TouchableOpacity>
);
}
Loading
Loading