Compare commits

...

5 Commits

Author SHA1 Message Date
8fb18ae000 Remove geopicker for now
All checks were successful
continuous-integration/drone/push Build is passing
2024-02-26 11:40:27 +01:00
0e1d640a42 make courier field required for dispatches
All checks were successful
continuous-integration/drone/push Build is passing
2024-02-26 00:26:04 +05:00
ac9b63a33a add sales point / exhibition place to retailers (#7)
All checks were successful
continuous-integration/drone/push Build is passing
2024-02-25 19:58:24 +05:00
ac387d41ad add courier fields (#10)
All checks were successful
continuous-integration/drone/push Build is passing
2024-02-25 19:52:11 +05:00
2654b4a9c4 add type of transporrt to dispatch 2024-02-25 19:41:00 +05:00
5 changed files with 74 additions and 10 deletions

View File

@ -10,10 +10,35 @@ const Couriers: CollectionConfig = {
}, },
fields: [ fields: [
{ {
name: 'name', // required name: 'name',
type: 'text', // required type: 'text',
required: true, required: true,
}, },
{
name: 'startingPoint',
label: 'Traveling from',
type: 'text', // TODO use geopicker here
},
{
name: 'destination',
label: 'Traveling to',
type: 'text' // TODO user geopicker here
},
{
name: 'departureDate',
label: 'Departure date',
type: 'date'
},
{
name: 'arrivalDate',
label: 'Arrival date',
type: 'date'
},
{
name: 'weightAllowance',
label: 'Weight Allowance (KG)',
type: 'number'
}
], ],
}; };

View File

@ -32,11 +32,35 @@ const Dispatches: CollectionConfig = {
relationTo: 'retailers', relationTo: 'retailers',
hasMany: false, hasMany: false,
}, },
{
name: 'typeOfTransportation',
type: 'select',
hasMany: true,
options: [
{
label: 'Air',
value: 'air'
},
{
label: 'Car',
value: 'car'
},
{
label: 'Train',
value: 'train'
},
{
label: 'Boat',
value: 'boat'
}
]
},
{ {
name: 'courier', name: 'courier',
type: 'relationship', type: 'relationship',
relationTo: 'couriers', relationTo: 'couriers',
hasMany: false, hasMany: false,
required: true
}, },
{ {
name: 'timeSensitive', name: 'timeSensitive',
@ -68,4 +92,4 @@ const Dispatches: CollectionConfig = {
], ],
}; };
export default Dispatches; export default Dispatches;

View File

@ -15,7 +15,12 @@ const Makers: CollectionConfig = {
type: 'text', // required type: 'text', // required
required: true, required: true,
}, },
geoPickerField, //geoPickerField, is a bit broken right now
{
name: 'location',
type: 'point',
label: 'Location',
},
{ {
name: 'products', // required name: 'products', // required
type: 'relationship', // required type: 'relationship', // required

View File

@ -24,6 +24,11 @@ const Retailers: CollectionConfig = {
type: 'relationship', // required type: 'relationship', // required
relationTo: 'products', // required relationTo: 'products', // required
hasMany: true, hasMany: true,
},
{
name: 'salesPoint',
type: 'text',
label: 'Where do you plan to sell/exhibit products?'
} }
], ],
}; };

View File

@ -3,8 +3,9 @@ import { useField } from 'payload/components/forms';
export const GeoPicker: React.FC<{ path: string }> = ({ path }) => { export const GeoPicker: React.FC<{ path: string }> = ({ path }) => {
const { value, setValue } = useField<string>({ path }); const { value, setValue } = useField<string>({ path });
const [longitude, setLongitude] = React.useState(value[0]); const [longitude, setLongitude] = React.useState(value[0] || 0);
const [latitude, setLatitude] = React.useState(value[1]); const [latitude, setLatitude] = React.useState(value[1] || 0);
const [error, setError] = React.useState("")
const handleCityEnter = async (e) => { const handleCityEnter = async (e) => {
if (e.key === 'Enter') { if (e.key === 'Enter') {
@ -19,8 +20,9 @@ export const GeoPicker: React.FC<{ path: string }> = ({ path }) => {
setLongitude(lon); setLongitude(lon);
setValue([lon, lat]); setValue([lon, lat]);
} }
} catch (error) { } catch (err) {
console.error('Error fetching geolocation:', error); setError(e)
console.error('Error fetching geolocation:', e);
} }
} }
}; };
@ -46,6 +48,9 @@ export const GeoPicker: React.FC<{ path: string }> = ({ path }) => {
placeholder="Enter city to get coordinates" placeholder="Enter city to get coordinates"
/> />
</div> </div>
{error != "" &&
<p>{error}</p>
}
<div className="field-type point"> <div className="field-type point">
<ul className='point__wrap'> <ul className='point__wrap'>
<li> <li>