Skip to content
Snippets Groups Projects
Commit f6ad9d52 authored by chaitanya's avatar chaitanya
Browse files

E_ALL cleanups in Services module

parent 81808223
No related branches found
No related tags found
No related merge requests found
...@@ -422,10 +422,8 @@ function getAssociatedProducts($module, $focus, $seid = '', $refModuleName = fal ...@@ -422,10 +422,8 @@ function getAssociatedProducts($module, $focus, $seid = '', $refModuleName = fal
$product_Detail[1]['final_details']['discount_percentage_final'] = 0; $product_Detail[1]['final_details']['discount_percentage_final'] = 0;
$product_Detail[1]['final_details']['discount_amount_final'] = $discount_amount_final; $product_Detail[1]['final_details']['discount_amount_final'] = $discount_amount_final;
if(isset($focus->column_fields)) { $hdnDiscountPercent = isset($focus->column_fields['hdnDiscountPercent']) ? (float) $focus->column_fields['hdnDiscountPercent'] : 0.0;
$hdnDiscountPercent = (float) $focus->column_fields['hdnDiscountPercent']; $hdnDiscountAmount = isset($focus->column_fields['hdnDiscountAmount']) ? (float) $focus->column_fields['hdnDiscountAmount'] : 0.0;
$hdnDiscountAmount = (float) $focus->column_fields['hdnDiscountAmount'];
}
if(!empty($hdnDiscountPercent)) { if(!empty($hdnDiscountPercent)) {
$finalDiscount = ($subTotal*$discountPercent/100); $finalDiscount = ($subTotal*$discountPercent/100);
......
...@@ -178,13 +178,13 @@ class Products_Record_Model extends Vtiger_Record_Model { ...@@ -178,13 +178,13 @@ class Products_Record_Model extends Vtiger_Record_Model {
} }
} }
$productTaxes = isset($productDetails[1]['taxes']); $productTaxes = isset($productDetails[1]['taxes']) ? $productDetails[1]['taxes'] : array();
if (!empty ($productDetails)) { if (!empty ($productDetails)) {
$taxCount = php7_count($productTaxes); $taxCount = php7_count($productTaxes);
$taxTotal = 0; $taxTotal = 0;
for($i=0; $i<$taxCount; $i++) { for($i=0; $i<$taxCount; $i++) {
$taxValue = isset($productTaxes[$i]['percentage']); $taxValue = isset($productTaxes[$i]['percentage']) ? $productTaxes[$i]['percentage'] : array();
$taxAmount = $totalAfterDiscount * $taxValue / 100; $taxAmount = $totalAfterDiscount * $taxValue / 100;
$taxTotal = $taxTotal + $taxAmount; $taxTotal = $taxTotal + $taxAmount;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment