Fix : wrong value in VolumeUnits steps when creating a new rule

assets/css/utils.scss

@@ -92,3 +92,15 @@ li > a.text-danger // very specific selector for bootstrap dropdown
   -ms-user-select: none; /* IE 10 and IE 11 */
   user-select: none; /* Standard syntax */
 }
+
+/* Chrome, Safari, Edge, Opera */
+input::-webkit-outer-spin-button.no-number-input-arrow,
+input::-webkit-inner-spin-button.no-number-input-arrow {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* Firefox */
+input[type=number].no-number-input-arrow {
+  -moz-appearance: textfield;
+}

js/app/components/PriceRangeEditor.js

@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react'
+import React, { useState, useRef, useEffect } from 'react'
 import { getCurrencySymbol } from '../i18n'
 import { useTranslation } from 'react-i18next'
 
@@ -75,22 +75,30 @@ export default ({ defaultValue, onChange }) => {
 
   const stepEl = useRef(null)
   const thresholdEl = useRef(null)
+  const initialLoad = useRef(true)
+
+  useEffect(() => {
+    if (!initialLoad.current) {
+      onChange({
+        attribute,
+        price: price,
+        step,
+        threshold,
+      })
+    } else {
+      initialLoad.current = false
+    }
+  }, [price, threshold, attribute, step])
 
   return (
     <div>
       <label className="mr-2">
         <input type="number" size="4"
           defaultValue={ price / 100 } min="0" step=".001"
-          className="form-control d-inline-block"
+          className="form-control d-inline-block no-number-input-arrow"
           style={{ width: '80px' }}
           onChange={ e => {
             setPrice(e.target.value * 100)
-            onChange({
-              attribute,
-              price: e.target.value * 100,
-              step,
-              threshold,
-            })
           }} />
         <span className="ml-2">{ getCurrencySymbol() }</span>
       </label>
@@ -102,26 +110,26 @@ export default ({ defaultValue, onChange }) => {
           style={{ width: '80px' }}
           onChange={ e => {
             setStep(multiplyIfNeeded(e.target.value, unit))
-            onChange({
-              attribute,
-              price,
-              step: multiplyIfNeeded(e.target.value, unit),
-              threshold: multiplyIfNeeded(thresholdEl.current.value, e.target.value),
-            })
           }} />
         <select
           className="form-control d-inline-block align-top ml-2"
           style={{ width: '70px' }}
           defaultValue={ attributeToUnit(attribute) }
           onChange={ e => {
-            setUnit(e.target.value)
             setAttribute(unitToAttribute(e.target.value))
-            onChange({
-              attribute: unitToAttribute(e.target.value),
-              price,
-              step: multiplyIfNeeded(stepEl.current.value, e.target.value),
-              threshold: multiplyIfNeeded(thresholdEl.current.value, e.target.value),
-            })
+
+            const newUnit = e.target.value
+            const prevUnit = unit
+
+            if (newUnit === 'vu' && prevUnit !== 'vu') {
+              setStep(step / 1000)
+              setThreshold(threshold / 1000)
+            } else if (newUnit !== 'vu' && prevUnit === 'vu') {
+              setStep(step * 1000)
+              setThreshold(threshold * 1000)
+            }
+
+            setUnit(e.target.value)
           }}>
           <option value="km">km</option>
           <option value="kg">kg</option>
@@ -136,12 +144,6 @@ export default ({ defaultValue, onChange }) => {
           style={{ width: '80px' }}
           onChange={ e => {
             setThreshold(multiplyIfNeeded(e.target.value, unit))
-            onChange({
-              attribute,
-              price,
-              step,
-              threshold: multiplyIfNeeded(e.target.value, unit),
-            })
           }} />
         <span className="ml-2">
           <UnitLabel unit={ unit } />

src/Doctrine/EventSubscriber/TaskSubscriber.php

@@ -224,6 +224,7 @@ private function handleStateChangesForTasks(EntitymanagerInterface $em, array $t
                     continue;
                 }
 
+                // if all tasks of a delivery are cancelled, cancel the linked order
                 $tasks = $delivery->getTasks();
                 $cancelOrder = true;
                 foreach ($tasks as $task) {
@@ -233,7 +234,8 @@ private function handleStateChangesForTasks(EntitymanagerInterface $em, array $t
                     }
                 }
 
-                if ($cancelOrder && $order->getState() !== OrderInterface::STATE_CANCELLED) {
+                // do not cancel order if order is "refused"
+                if ($cancelOrder && $order->getState() !== OrderInterface::STATE_CANCELLED && $order->getState() !== OrderInterface::STATE_REFUSED) {
                     $this->orderManager->cancel($order, 'All tasks were cancelled');
                     $em->flush();
                 }