Add price override in react delivery form #4860

CamilleNerriere · 2025-01-24T13:37:43Z

Add override Price and restriction for admin
Create a widget to convert price with/without VAT
Fix issues with Calculate prices
Change range for timeslots in DateRangePicker (10 minutes)
Add autofill address if activated
Add multidropoff only if activated
UX : make all task header clicable to toggle

```javascript fetch('/api/task?groups=task,address,barcode') .then((response) => response.json()) .then((data) => console.log(data)); ```

…y infos

…ivery

…/coopcycle/coopcycle-web into feat/deliveryform-override-price

# Conflicts: # src/Entity/Store.php

src/Api/Resource/TaxRate.php

src/Entity/Delivery.php

src/Action/Delivery/Create.php

features/deliveries.feature

vladimir-8 · 2025-02-10T23:02:40Z

assets/react/controllers/Delivery/DeliveryForm.jsx

@@ -107,6 +107,8 @@ const baseURL = location.protocol + '//' + location.host

 export default function ({ storeId, deliveryId, order }) {

+  console.log(order)


vladimir-8 · 2025-02-10T23:07:35Z

assets/react/controllers/Delivery/DeliveryForm.jsx

-  // Could not figure out why, but sometimes Formik "re-renders" even if the values are the same.
-  // so i store a ref to previous values to avoid re-calculating the price.
-  const previousValues = useRef(initialValues);
+    if (overridePrice && !values.variantName) {


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

vladimir-8 · 2025-02-10T23:11:36Z

assets/react/controllers/Delivery/DeliveryForm.jsx

@@ -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


Better to call isDispatcher

vladimir-8 · 2025-02-10T23:13:38Z

assets/react/controllers/Delivery/DeliveryForm.jsx

                    </div>

                    <div className='order-informations__complete-order'>
                      <Button
                        type="primary"
                        style={{ height: '2.5em' }}
-                        htmlType="submit" disabled={isSubmitting || deliveryId && isAdmin === false}>
+                        htmlType="submit"
+                        disabled={isSubmitting || deliveryId && isAdmin === false}>


It should also be disabled when priceLoading is true, as I understand #4854

vladimir-8 · 2025-02-10T23:17:34Z

cypress/e2e/local-commerce/@admin/create_delivery_as_admin.cy.js

👍

Let's maybe put the test for the new form into a separate folder so it's easier to delete old ones later (I'd suggest keeping one test per file so that cypress re-runs only failed tests on retry)

one test per file is easier to manage in cypress yes

vladimir-8 · 2025-02-10T23:31:16Z

src/Action/Delivery/Create.php

@@ -26,7 +33,30 @@ public function __invoke(Delivery $data)
            throw new ValidationException($errors);
        }

-        $this->pricingManager->createOrder($data);
+        $useArbitraryPrice = $this->authorizationCheckerInterface->isGranted('ROLE_ADMIN') && $data->hasArbitraryPrice();


It should be ROLE_DISPATCHER

vladimir-8 · 2025-02-10T23:34:17Z

src/Action/Delivery/Create.php

+                    'throwException' => false
+                ]);
+
+            } catch (NoRuleMatchedException $e) {


It's not needed, is it? PricingManager does not throw an exception when 'throwException' => false

not needed, it is because I switched between true and false

vladimir-8 · 2025-02-10T23:35:05Z

src/Action/Delivery/Edit.php

+        }
+
+        $order = $data->getOrder();
+        $useArbitraryPrice = $this->authorizationCheckerInterface->isGranted('ROLE_ADMIN') && $data->hasArbitraryPrice();


Same here, it should be ROLE_DISPATCHER

vladimir-8 · 2025-02-10T23:42:02Z

assets/react/controllers/Delivery/DeliveryForm.jsx

Should it always be excl. VAT and then incl. VAT?

vladimir-8 · 2025-02-10T23:46:14Z

assets/react/controllers/Delivery/DeliveryForm.jsx

I have an issue when I select Pre-fill automatically pickup address. It pre-fills the same address in both pickup and dropoff:

The same happens when I open an existing delivery:

thanks for the catch i ll fix this

r0xsh and others added 30 commits January 21, 2025 16:12

feat: allow to pass custom serialization groups via URL

05a0697

```javascript fetch('/api/task?groups=task,address,barcode') .then((response) => response.json()) .then((data) => console.log(data)); ```

start modify barecodes modal

fd4e5a5

clean: inject auth in delivery form

0064f49

add barecodes in new delivery form/ now barecodes Modal fetch deliver…

9c3f4fb

…y infos

remove console.log

55b7307

add translations

cf0ad48

create component override price and begining of its logic for new del…

d93c78a

…ivery

fix css

fdc6094

add override price in edit mode

c5a01db

fix hide new price if new price equal 0

46cc535

add style

3a4c5a7

hide tags for stores

512e362

add translations

0a1bd7e

create VAT price converter widget

2d7d093

add margin

5e09e38

feat: take into account arbitrary price on delivery creation

bb46a8d

fix css, add remove override data

53bad10

Merge branch 'feat/deliveryform-override-price' of https://github.com…

03e1381

…/coopcycle/coopcycle-web into feat/deliveryform-override-price

add validation

7544262

add admin restriction to override price and refactor component

488c887

add name in address select component

7547c94

clean: serialize prefillPickupAddress for store entity

de69878

start add store address preselected

55b5473

merge commit

f75b104

feat: send multiDropEnabled parameter

f46b614

add autofilled store address if option selected

722f3c4

merge commit

71b3dc6

fix calculate price

2c2965f

add larger area to click for toggle and override price checkbox

53fa7d2

set default timeSlots in DateRangePicker with 10' range

edc9f36

Atala requested review from alexsegura and removed request for Atala January 30, 2025 15:36

vladimir-8 and others added 2 commits January 30, 2025 16:51

Merge branch 'master' into feat/deliveryform-override-price

e79fb86

# Conflicts: # src/Entity/Store.php

WIP

0a73058

alexsegura reviewed Jan 31, 2025

View reviewed changes

src/Api/Resource/TaxRate.php Outdated Show resolved Hide resolved

src/Entity/Delivery.php Outdated Show resolved Hide resolved

src/Action/Delivery/Create.php Outdated Show resolved Hide resolved

alexsegura reviewed Jan 31, 2025

View reviewed changes

src/Action/Delivery/Create.php Outdated Show resolved Hide resolved

alexsegura reviewed Jan 31, 2025

View reviewed changes

features/deliveries.feature Outdated Show resolved Hide resolved

features/deliveries.feature Outdated Show resolved Hide resolved

Atala added 2 commits February 7, 2025 11:08

fix: use ArbitraryPrice as input

26a78f8

Merge branch 'master' into feat/deliveryform-override-price

3d1d9b4

Atala force-pushed the feat/deliveryform-override-price branch from 20c3ec2 to 3d1d9b4 Compare February 7, 2025 10:10

Atala added 4 commits February 7, 2025 11:22

clean: small css fixes

a599b7a

fix: tax rate in tests

96b1beb

feat: debounce call to calculate endpoint

7b10b09

enable all cypress tests

49efaba

Atala force-pushed the feat/deliveryform-override-price branch from d8c6985 to 49efaba Compare February 7, 2025 12:17

Atala added 6 commits February 7, 2025 13:41

fix: translate calculate price error message

7d79b98

feat: throw if user is admin and price could not be calculated

c2a9a54

feat: fix behat tests

b3bb9f0

Merge branch 'master' into feat/deliveryform-override-price

a9d9468

fix: arbitrary price can be null

f402ce2

fix: tests

ecf9e7f

Atala linked an issue Feb 10, 2025 that may be closed by this pull request

[React Delivery Form] Show a loader + set button state to loading/blocked when (re)calculating the price #4854

Open

vladimir-8 self-requested a review February 10, 2025 16:38

Atala linked an issue Feb 10, 2025 that may be closed by this pull request

[React Delivery Form] Take into account the "multidropoff enabled" setting #4856

Open

vladimir-8 reviewed Feb 10, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add price override in react delivery form #4860

Add price override in react delivery form #4860

CamilleNerriere commented Jan 24, 2025 •

edited

Loading

vladimir-8 Feb 10, 2025

vladimir-8 Feb 10, 2025

vladimir-8 Feb 10, 2025

vladimir-8 Feb 10, 2025

vladimir-8 Feb 10, 2025

Atala Feb 11, 2025

vladimir-8 Feb 10, 2025

vladimir-8 Feb 10, 2025

Atala Feb 11, 2025

vladimir-8 Feb 10, 2025

vladimir-8 Feb 10, 2025

vladimir-8 Feb 10, 2025

Atala Feb 11, 2025

		@@ -107,6 +107,8 @@ const baseURL = location.protocol + '//' + location.host

		export default function ({ storeId, deliveryId, order }) {

		console.log(order)

Add price override in react delivery form #4860

Are you sure you want to change the base?

Add price override in react delivery form #4860

Conversation

CamilleNerriere commented Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CamilleNerriere commented Jan 24, 2025 •

edited

Loading