diff --git a/modules/Inventory/models/Record.php b/modules/Inventory/models/Record.php index 7cacae728eb0fb28642d36bfa83303b83a285a49..4a911f428c8839e97811c9f081468e8fe538a801 100644 --- a/modules/Inventory/models/Record.php +++ b/modules/Inventory/models/Record.php @@ -56,26 +56,14 @@ class Inventory_Record_Model extends Vtiger_Record_Model { } function getProducts() { - $numOfCurrencyDecimalPlaces = getCurrencyDecimalPlaces(); + $numOfCurrencyDecimalPlaces = getCurrencyDecimalPlaces(); $relatedProducts = getAssociatedProducts($this->getModuleName(), $this->getEntity()); $productsCount = count($relatedProducts); - //Updating Pre tax total - $preTaxTotal = (float)$relatedProducts[1]['final_details']['hdnSubTotal'] - + (float)$relatedProducts[1]['final_details']['shipping_handling_charge'] - - (float)$relatedProducts[1]['final_details']['discountTotal_final']; - - $relatedProducts[1]['final_details']['preTaxTotal'] = number_format($preTaxTotal, $numOfCurrencyDecimalPlaces,'.',''); - - //Updating Total After Discount - $totalAfterDiscount = (float)$relatedProducts[1]['final_details']['hdnSubTotal'] - - (float)$relatedProducts[1]['final_details']['discountTotal_final']; - - $relatedProducts[1]['final_details']['totalAfterDiscount'] = number_format($totalAfterDiscount, $numOfCurrencyDecimalPlaces,'.',''); - //Updating Tax details $taxtype = $relatedProducts[1]['final_details']['taxtype']; + $subTotal = 0; for ($i=1;$i<=$productsCount; $i++) { $product = $relatedProducts[$i]; $productId = $product['hdnProductId'.$i]; @@ -97,8 +85,26 @@ class Inventory_Record_Model extends Vtiger_Record_Model { } $netPrice = $totalAfterDiscount + $taxTotal; $relatedProducts[$i]['netPrice'.$i] = $netPrice; + $subTotal = $subTotal+$netPrice; } } + + //Updating sub total + $relatedProducts[1]['final_details']['hdnSubTotal'] = $subTotal; + + //Updating Pre tax total + $preTaxTotal = (float)$relatedProducts[1]['final_details']['hdnSubTotal'] + + (float)$relatedProducts[1]['final_details']['shipping_handling_charge'] + - (float)$relatedProducts[1]['final_details']['discountTotal_final']; + + $relatedProducts[1]['final_details']['preTaxTotal'] = number_format($preTaxTotal, $numOfCurrencyDecimalPlaces,'.',''); + + //Updating Total After Discount + $totalAfterDiscount = (float)$relatedProducts[1]['final_details']['hdnSubTotal'] + - (float)$relatedProducts[1]['final_details']['discountTotal_final']; + + $relatedProducts[1]['final_details']['totalAfterDiscount'] = number_format($totalAfterDiscount, $numOfCurrencyDecimalPlaces,'.',''); + return $relatedProducts; }