|
@@ -407,8 +407,8 @@ discard block |
|
|
block discarded – undo |
|
407
|
407
|
'quantity' => $positionData['quantity'] |
|
408
|
408
|
]); |
|
409
|
409
|
$newPositions[] = $position; |
|
410
|
|
- $orderAmount = $orderAmount + $positionData['price']; |
|
411
|
|
- $orderAmountNet = $orderAmountNet + ($positionData['price'] / (1+ (0.01 * $positionData['taxRate']))); |
|
|
410
|
+ $orderAmount = $orderAmount + $positionData['price']; |
|
|
411
|
+ $orderAmountNet = $orderAmountNet + ($positionData['price'] / (1 + (0.01 * $positionData['taxRate']))); |
|
412
|
412
|
} |
|
413
|
413
|
$order->setDetails($newPositions); |
|
414
|
414
|
} |
|
@@ -454,7 +454,7 @@ discard block |
|
|
block discarded – undo |
|
454
|
454
|
$orderId = $this->Request()->getParam('orderId'); |
|
455
|
455
|
$this->registerShopByOrderId($orderId); |
|
456
|
456
|
$order = $this->getOrderById($orderId); |
|
457
|
|
- $value = (float)str_replace(',', '.', $this->Request()->getParam('value')); |
|
|
457
|
+ $value = (float) str_replace(',', '.', $this->Request()->getParam('value')); |
|
458
|
458
|
$service = $this->getService($order); |
|
459
|
459
|
|
|
460
|
460
|
/** @noinspection PhpUndefinedMethodInspection */ |
Please login to merge, or discard this patch.