Add price override in react delivery form #4860
There are no files selected for viewing
|
There was a problem hiding this comment. I have an issue when I select
The same happens when I open an existing delivery:
There was a problem hiding this comment. thanks for the catch i ll fix this |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| import React, { useCallback, useEffect, useState } from 'react' | ||
| import { Button } from 'antd' | ||
| import { Formik, Form, FieldArray } from 'formik' | ||
| import { antdLocale } from '../../../../js/app/i18n' | ||
| import { ConfigProvider } from 'antd' | ||
| import moment from 'moment' | ||
|
|
||
| import Map from '../../../../js/app/components/delivery-form/Map.js' | ||
| import Spinner from '../../../../js/app/components/core/Spinner.js' | ||
| import BarcodesModal from '../BarcodesModal.jsx' | ||
| import ShowPrice from '../../../../js/app/components/delivery-form/ShowPrice.js' | ||
| import Task from '../../../../js/app/components/delivery-form/Task.js' | ||
|
|
||
| import { PhoneNumberUtil } from 'google-libphonenumber' | ||
| import { getCountry } from '../../../../js/app/i18n' | ||
|
|
@@ -18,8 +18,8 @@ import { parsePhoneNumberFromString } from 'libphonenumber-js' | |
|
|
||
|
|
||
| import "./DeliveryForm.scss" | ||
| import _ from 'lodash' | ||
|
|
||
|
|
||
| /** used in case of phone validation */ | ||
| const phoneUtil = PhoneNumberUtil.getInstance(); | ||
|
|
@@ -107,6 +107,8 @@ const baseURL = location.protocol + '//' + location.host | |
|
|
||
| export default function ({ storeId, deliveryId, order }) { | ||
|
|
||
| console.log(order) | ||
|
|
||
|
|
||
| // This variable is used to test the store role and restrictions. We need to have it passed as prop to make it work. | ||
| const isAdmin = true | ||
|
|
||
|
There was a problem hiding this comment. Better to call |
||
|
|
@@ -124,18 +126,20 @@ export default function ({ storeId, deliveryId, order }) { | |
| tasks: [ | ||
| pickupSchema, | ||
| dropoffSchema, | ||
| ], | ||
| }) | ||
| const [isLoading, setIsLoading] = useState(Boolean(deliveryId)) | ||
| const [overridePrice, setOverridePrice] = useState(false) | ||
| const [priceLoading, setPriceLoading] = useState(false) | ||
|
|
||
|
|
||
| let deliveryPrice | ||
|
|
||
| if (deliveryId && order) { | ||
| const orderInfos = JSON.parse(order) | ||
| deliveryPrice = {exVAT: +orderInfos.total, VAT: +orderInfos.total - +orderInfos.taxTotal,} | ||
| } | ||
|
|
||
| const { t } = useTranslation() | ||
|
|
||
| const validate = (values) => { | ||
|
|
@@ -170,12 +174,13 @@ export default function ({ storeId, deliveryId, order }) { | |
| } | ||
| } | ||
|
|
||
|
|
||
| if (overridePrice && !values.variantName) { | ||
| errors.variantName = t("DELIVERY_FORM_ERROR_VARIANT_NAME") | ||
|
There was a problem hiding this comment. The behaviour in the old form is to allow an empty product name (as a way to remove the custom name and generate a default name). I think it's good to keep that behaviour at least
|
||
| } | ||
|
|
||
| return Object.keys(errors.tasks).length > 0 || errors.variantName ? errors : {}; | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| const deliveryURL = `${baseURL}/api/deliveries/${deliveryId}?groups=barcode,address,delivery` | ||
|
|
@@ -213,8 +218,6 @@ export default function ({ storeId, deliveryId, order }) { | |
| } | ||
| }) | ||
|
|
||
| setInitialValues(delivery.response) | ||
| setTrackingLink(delivery.response.trackingUrl) | ||
| setAddresses(addresses.response['hydra:member']) | ||
|
|
@@ -261,11 +264,23 @@ export default function ({ storeId, deliveryId, order }) { | |
| const createOrEditADelivery = async (deliveryId) => { | ||
| const url = getUrl(deliveryId); | ||
| const method = deliveryId ? 'put' : 'post'; | ||
|
|
||
| let data = { | ||
| store: storeDeliveryInfos['@id'], | ||
| tasks: values.tasks | ||
| } | ||
|
|
||
| if (values.variantIncVATPrice && values.variantName) { | ||
| data = { | ||
| ...data, | ||
| arbitraryPrice: { | ||
| variantPrice: values.variantIncVATPrice, | ||
| variantName: values.variantName | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return await httpClient[method](url, data); | ||
| } | ||
|
|
||
| const {response, error} = await createOrEditADelivery(deliveryId) | ||
|
|
@@ -299,73 +314,50 @@ export default function ({ storeId, deliveryId, order }) { | |
| }, [storeDeliveryInfos]) | ||
|
|
||
|
|
||
| const getPrice = _.debounce( | ||
| (values) => { | ||
|
|
||
| const tasksCopy = structuredClone(values.tasks) | ||
| const tasksWithoutId = tasksCopy.map(task => { | ||
| if (task["@id"]) { | ||
| delete task["@id"] | ||
| } | ||
| return task | ||
| }) | ||
|
|
||
| const infos = { | ||
| store: storeDeliveryInfos["@id"], | ||
| tasks: tasksWithoutId, | ||
| }; | ||
|
|
||
| const calculatePrice = async () => { | ||
|
|
||
| setPriceLoading(true) | ||
|
|
||
| const url = `${baseURL}/api/retail_prices/calculate` | ||
| const { response, error } = await httpClient.post(url, infos) | ||
|
|
||
| if (error) { | ||
| setPriceError({ isPriceError: true, priceErrorMessage: error.response.data['hydra:description'] }) | ||
| setCalculatePrice(0) | ||
| } | ||
|
|
||
| if (response) { | ||
| setCalculatePrice(response) | ||
| setPriceError({ isPriceError: false, priceErrorMessage: ' ' }) | ||
| } | ||
|
|
||
| setPriceLoading(false) | ||
|
|
||
| } | ||
|
|
||
| if (values.tasks.every(task => task.address.streetAddress)) { | ||
| calculatePrice() | ||
| } | ||
|
|
||
| }, | ||
| 1000 | ||
| ) | ||
|
|
||
| return ( | ||
| isLoading ? | ||
|
|
@@ -384,8 +376,8 @@ export default function ({ storeId, deliveryId, order }) { | |
| {({ values, isSubmitting }) => { | ||
|
|
||
| useEffect(() => { | ||
| if(!overridePrice && !deliveryId) getPrice(values) | ||
| }, [values.tasks, overridePrice, deliveryId]); | ||
|
|
||
| return ( | ||
| <Form > | ||
|
|
@@ -433,18 +425,27 @@ export default function ({ storeId, deliveryId, order }) { | |
| addresses={addresses} | ||
| storeId={storeId} | ||
| storeDeliveryInfos={storeDeliveryInfos} | ||
| onRemove={arrayHelpers.remove} | ||
| showRemoveButton={originalIndex > 1} | ||
| packages={storePackages} | ||
| isAdmin={isAdmin} | ||
| tags={tags} | ||
| /> | ||
| </div> | ||
| ); | ||
| })} | ||
|
|
||
| {storeDeliveryInfos.multiDropEnabled ? <div | ||
| className="new-order__dropoffs__add p-4 border mb-4"> | ||
| <p>{t('DELIVERY_FORM_MULTIDROPOFF')}</p> | ||
| <Button | ||
| disabled={false} | ||
| onClick={() => { | ||
| arrayHelpers.push(dropoffSchema) | ||
| }}> | ||
| {t('DELIVERY_FORM_ADD_DROPOFF')} | ||
| </Button> | ||
| </div> : null} | ||
| </div> | ||
| </div> | ||
| )} | ||
|
|
@@ -472,57 +473,26 @@ export default function ({ storeId, deliveryId, order }) { | |
| /> | ||
| </div> | ||
|
|
||
| <div className='order-informations__total-price border-top border-bottom pt-3 mb-4'> | ||
| <ShowPrice | ||
| isAdmin={isAdmin} | ||
| deliveryId={deliveryId} | ||
| deliveryPrice={deliveryPrice} | ||
| calculatedPrice={calculatedPrice} | ||
| setCalculatePrice={setCalculatePrice} | ||
| priceError={priceError} | ||
| setOverridePrice={setOverridePrice} | ||
| overridePrice={overridePrice} | ||
| priceLoading={priceLoading} | ||
| /> | ||
| </div> | ||
|
|
||
| <div className='order-informations__complete-order'> | ||
| <Button | ||
| type="primary" | ||
| style={{ height: '2.5em' }} | ||
| htmlType="submit" | ||
| disabled={isSubmitting || deliveryId && isAdmin === false}> | ||
| {t("DELIVERY_FORM_SUBMIT")} | ||
|
There was a problem hiding this comment. It should also be disabled when |
||
| </Button> | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should it always be excl. VAT and then incl. VAT?