Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
Fixed saving zero price for onetime billing products in Order/Form

See merge request fronk/thetool!541
This commit is contained in:
Frank Schubert
2024-08-01 11:49:30 +00:00
parent c9a104dade 7085b1b7b3
commit b776505bef
2 changed files with 801 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/Order/OrderController.php
View File

@@ -964,8 +964,8 @@ class OrderController extends mfBaseController {
$product_data['amount'] = (!empty($p['amount'])) ? $p['amount'] : 1;
$product_data["pos"] = ($p["pos"]) ? $p['pos'] : $order->getNewPos();
$product_data["description"] = $p["description"];
$product_data["price"] = Layout::commaToDot($p["price"]);
$product_data["price_setup"] = Layout::commaToDot($p["price_setup"]);
$product_data["price"] = $p["price"] ? Layout::commaToDot($p["price"]) : 0;
$product_data["price_setup"] = $p["price_setup"] ? Layout::commaToDot($p["price_setup"]) : 0;
if($this->me->is("Admin") && $p["price_nne"]) {
$product_data["price_nne"] = Layout::commaToDot($p["price_nne"]);

1601
application/Preorder/Preorder.php
View File

File diff suppressed because it is too large Load Diff