From afab238108b5bfd1699e445370ced1d2d625433a Mon Sep 17 00:00:00 2001
From: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date: Tue, 27 Jan 2015 16:16:11 +0100
Subject: [PATCH] New fields for acquisitions

 - Add new fields to the enhanced acquisitions mode:
   - Price Tax Excluded
   - Tax Rate
   - Price Tax Included

 Price Tax Included and Payment Amount will be automatically prefilled accoring
 to the Price Tax Excluded and Tax Rate values.
---
 ajax_forms/getCostForm.php                   | 30 +++++++++-
 ajax_htmldata/getAcquisitionsDetails.php     | 31 +++++++---
 ajax_processing/submitCost.php               |  6 ++
 css/style.css                                |  3 +
 install/protected/install.sql                |  3 +
 install/update_acquisitions_enhancements.sql |  3 +
 js/forms/costForm.js                         | 59 +++++++++++++++++++-
 7 files changed, 122 insertions(+), 13 deletions(-)
 create mode 100644 install/update_acquisitions_enhancements.sql

diff --git a/ajax_forms/getCostForm.php b/ajax_forms/getCostForm.php
index 8f5bd3f..69914b6 100644
--- a/ajax_forms/getCostForm.php
+++ b/ajax_forms/getCostForm.php
@@ -37,8 +37,8 @@
 		$baseWidth = 345;
 		$numCols = 6;
 		if ($enhancedCostFlag){
-			$baseWidth += 388;
-			$numCols += 5; // year, sub start, sub end, cost details, invoice num
+			$baseWidth += 688;
+			$numCols += 8; // year, sub start, sub end, cost details, invoice num
 		}
 ?>
 		<div id='div_resourceForm'>
@@ -64,6 +64,11 @@
 					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Sub End</td>
 					<?php } ?>
 					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Fund</td>
+					<?php if ($enhancedCostFlag){ ?>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Tax Excl.</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Tax Rate</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Tax Incl.</td>
+					<?php } ?>
 					<td style='vertical-align:top;text-align:left;font-weight:bold;' colspan=2>Payment</td>
 					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Type</td>
 					<?php if ($enhancedCostFlag){ ?>
@@ -88,6 +93,14 @@
 		<td style='vertical-align:top;text-align:left;background:white;'>
 		<input type='text' value='' style='width:60px;' class='changeDefaultWhite changeInput fundName' />
 		</td>
+		<?php if ($enhancedCostFlag){ ?>
+    <td style='vertical-align:top;text-align:left;background:white;'>
+		<input type='text' value='' style='width:60px;' class='changeDefaultWhite changeInput priceTaxExcluded' /></td>
+    <td style='vertical-align:top;text-align:left;background:white;'>
+		<input type='text' value='' style='width:60px;' class='changeDefaultWhite changeInput taxRate' /></td>
+    <td style='vertical-align:top;text-align:left;background:white;'>
+		<input type='text' value='' style='width:60px;' class='changeDefaultWhite changeInput priceTaxIncluded' /></td>
+		<?php } ?>
 		<td style='vertical-align:top;text-align:left;background:white;'>
 		<input type='text' value='' style='width:50px;' class='changeDefaultWhite changeInput paymentAmount' />
 		</td>
@@ -146,12 +159,14 @@
 		</tr>
 	</table>
 	<table class='noBorder smallPadding paymentTable' style='margin:7px 15px 0 15px;'>
+
 <?php
 if (count($paymentArray) > 0){
 	foreach ($paymentArray as $payment){
 ?>
 		<tr>
 		<?php if ($enhancedCostFlag){ ?>
+
 		<td style='vertical-align:top;text-align:left;'>
 		<input type='text' value='<?php echo $payment['year']; ?>' style='width:53px;' class='changeInput year' />
 		</td>
@@ -163,6 +178,17 @@
 		<td style='vertical-align:top;text-align:left;'>
 		<input type='text' value='<?php echo $payment['fundName']; ?>' style='width:60px;' class='changeInput fundName' />
 		</td>
+		<?php if ($enhancedCostFlag){ ?>
+        <td style='vertical-align:top;text-align:left;'>
+		<input type='text' value='<?php echo integer_to_cost($payment['priceTaxExcluded']); ?>' style='width:60px;' class='changeInput priceTaxExcluded' />
+		</td>
+        <td style='vertical-align:top;text-align:left;'>
+		<input type='text' value='<?php echo $payment['taxRate']; ?>' style='width:60px;' class='changeInput taxRate' />
+		</td>
+        <td style='vertical-align:top;text-align:left;'>
+		<input type='text' value='<?php echo integer_to_cost($payment['priceTaxIncluded']); ?>' style='width:60px;' class='changeInput priceTaxIncluded' />
+		</td>
+		<?php } ?>
 		<td style='vertical-align:top;text-align:left;'>
 		<input type='text' value='<?php echo integer_to_cost($payment['paymentAmount']); ?>' style='width:50px;' class='changeInput paymentAmount' />
 		</td>
diff --git a/ajax_htmldata/getAcquisitionsDetails.php b/ajax_htmldata/getAcquisitionsDetails.php
index 798a488..03d675e 100644
--- a/ajax_htmldata/getAcquisitionsDetails.php
+++ b/ajax_htmldata/getAcquisitionsDetails.php
@@ -3,9 +3,9 @@
 	$enhancedCostFlag = ((isset($config->settings->enhancedCostHistory)) && (strtoupper($config->settings->enhancedCostHistory) == 'Y')) ? 1 : 0;
 	$enhancedCostFlag = (strtoupper($config->settings->enhancedCostHistory) == 'Y') ? 1 : 0;
 	if ($enhancedCostFlag){
-		$numCols = 9;
+		$numCols = 12;
 		$tableWidth = 760;
-		$formWidth = 784;
+		$formWidth = 1084;
                 ?>
 		<!-- Hide the helpful links, etc. -->
         	<script>
@@ -180,6 +180,11 @@
 			<th>Sub End</th>
 		<?php } ?>
 			<th>Fund</th>
+		<?php if ($enhancedCostFlag){ ?>
+            <th>Tax Excl.</th>
+            <th>Tax Rate</th>
+            <th>Tax Incl.</th>
+		<?php } ?>
 			<th>Payment</th>
 		<?php if ($enhancedCostFlag && 0){ ?>
 			<th style='text-align: right'>%</th>
@@ -210,11 +215,14 @@
 				$subStart = $payment['subscriptionStartDate'] ? normalize_date($payment['subscriptionStartDate']) : "&nbsp;";
 				$subEnd = $payment['subscriptionEndDate'] ? normalize_date($payment['subscriptionEndDate']) : "&nbsp;";
 				$fundName = $payment['fundName'] ? $payment['fundName'] : "&nbsp;";
-				if (integer_to_cost($payment['paymentAmount'])){
-					$cost = $payment['currencyCode'] . " " . integer_to_cost($payment['paymentAmount']);
-				}else{
-					$cost = "&nbsp;";
-				}
+                $taxRate = $payment['taxRate'] ? $payment['taxRate'] . '&nbsp;%' : "&nbsp;";
+                foreach (Array('priceTaxExcluded', 'priceTaxIncluded', 'paymentAmount') as $amount) { 
+                  if (integer_to_cost($payment[$amount])){
+                    $cost[$amount] = $payment['currencyCode'] . " " . integer_to_cost($payment[$amount]);
+                  }else{
+                    $cost[$amount] = "&nbsp;";
+                  }
+                }
 				$costDetails = $payment['costDetails'] ? $payment['costDetails'] : "&nbsp;";
 				$costNote = $payment['costNote'] ? $payment['costNote'] : "&nbsp;";
 				$invoiceNum = $payment['invoiceNum'] ? $payment['invoiceNum'] : "&nbsp;";
@@ -227,10 +235,15 @@
 				<td <?php echo $classAdd;?>><?php echo $subEnd; ?></td>
 			<?php } ?>
 				<td <?php echo $classAdd;?>><?php echo $fundName; ?></td>
-				<td <?php echo $classAdd;?>><?php echo $cost; ?></td>
 			<?php if ($enhancedCostFlag && 0){ ?>
 				<td <?php echo $classAdd;?> style='text-align: right'><?php echo $payment['amountChange']; ?></td>
-			<?php } ?>
+            <?php } ?>
+            <?php if ($enhancedCostFlag){ ?>
+				<td <?php echo $classAdd;?>><?php echo $cost['priceTaxExcluded']; ?></td>
+                <td <?php echo $classAdd;?>><?php echo $taxRate; ?></td>
+				<td <?php echo $classAdd;?>><?php echo $cost['priceTaxIncluded']; ?></td>
+            <?php } ?>
+				<td <?php echo $classAdd;?>><?php echo $cost['paymentAmount']; ?></td>
 				<td <?php echo $classAdd;?>><?php echo $payment['orderType']; ?></td>
 			<?php if ($enhancedCostFlag){ ?>
 				<td <?php echo $classAdd;?>><?php echo $costDetails; ?></td>
diff --git a/ajax_processing/submitCost.php b/ajax_processing/submitCost.php
index 278bdc4..e06599a 100644
--- a/ajax_processing/submitCost.php
+++ b/ajax_processing/submitCost.php
@@ -12,6 +12,9 @@
 			$subStartArray      = array();  $subStartArray      = explode(':::',$_POST['subStarts']);
 			$subEndArray        = array();  $subEndArray        = explode(':::',$_POST['subEnds']);
 			$fundNameArray      = array();  $fundNameArray      = explode(':::',$_POST['fundNames']);
+            $pteArray           = array();  $pteArray           = explode(':::',$_POST['pricesTaxExcluded']);
+            $taxRateArray       = array();  $taxRateArray       = explode(':::',$_POST['taxRates']);
+            $ptiArray           = array();  $ptiArray           = explode(':::',$_POST['pricesTaxIncluded']);
 			$paymentAmountArray = array();  $paymentAmountArray = explode(':::',$_POST['paymentAmounts']);
 			$currencyCodeArray  = array();  $currencyCodeArray  = explode(':::',$_POST['currencyCodes']);
 			$orderTypeArray     = array();  $orderTypeArray     = explode(':::',$_POST['orderTypes']);
@@ -28,6 +31,9 @@
 					$resourcePayment->subscriptionStartDate = $start;
 					$resourcePayment->subscriptionEndDate   = $end;
 					$resourcePayment->fundName      = $fundNameArray[$key];
+					$resourcePayment->priceTaxExcluded = cost_to_integer($pteArray[$key]);
+					$resourcePayment->taxRate       = $taxRateArray[$key];
+					$resourcePayment->priceTaxIncluded = cost_to_integer($ptiArray[$key]);
 					$resourcePayment->paymentAmount = cost_to_integer($paymentAmountArray[$key]);
 					$resourcePayment->currencyCode  = $currencyCodeArray[$key];
 					$resourcePayment->orderTypeID   = $value;
diff --git a/css/style.css b/css/style.css
index 1b64713..0199dfe 100644
--- a/css/style.css
+++ b/css/style.css
@@ -975,6 +975,9 @@ table.noMargin { border:0px;margin:0px; padding:0px;text-align:center; }
 table.noMargin tr { border:0px;margin:0px; padding:0px; vertical-align:center; }
 table.noMargin td { border:0px;margin:0px; padding:0px; }
 
+table.newPaymentTable td { padding:2px;}
+table.paymentTable td { padding-right:8px;}
+
 
 .formText {font-weight:bold;}
 
diff --git a/install/protected/install.sql b/install/protected/install.sql
index 757096b..2d004d5 100644
--- a/install/protected/install.sql
+++ b/install/protected/install.sql
@@ -403,6 +403,9 @@ CREATE TABLE  `ResourcePayment` (
   `resourceID` int(10) unsigned NOT NULL,
   `fundName` varchar(200) default NULL,
   `selectorLoginID` varchar(45) default NULL,
+  `priceTaxExcluded` int(10) unsigned default NULL,
+  `taxRate` int(10) unsigned default NULL,
+  `priceTaxIncluded` int(10) unsigned default NULL,
   `paymentAmount` int(10) unsigned default NULL,
   `orderTypeID` int(10) unsigned default NULL,
   `currencyCode` varchar(3) NOT NULL,
diff --git a/install/update_acquisitions_enhancements.sql b/install/update_acquisitions_enhancements.sql
new file mode 100644
index 0000000..f03b444
--- /dev/null
+++ b/install/update_acquisitions_enhancements.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ResourcePayment ADD COLUMN `priceTaxExcluded` int(10) unsigned default NULL AFTER selectorLoginID;
+ALTER TABLE ResourcePayment ADD COLUMN `taxRate` int(10) unsigned default NULL AFTER priceTaxExcluded;
+ALTER TABLE ResourcePayment ADD COLUMN `priceTaxIncluded` int(10) unsigned default NULL AFTER taxRate;
diff --git a/js/forms/costForm.js b/js/forms/costForm.js
index 8d5fc7e..f6b512d 100644
--- a/js/forms/costForm.js
+++ b/js/forms/costForm.js
@@ -91,7 +91,26 @@ $(function(){
 	    return false;
 	});
 
-
+  $(".priceTaxExcluded").change(function() {
+    pte = $(this).val();
+    taxRate = $(this).parent().next().children(".taxRate").val();
+    if (pte && taxRate) {
+      amount = parseFloat(pte) + (pte * taxRate / 100);
+      $(this).parent().next().next().children(".priceTaxIncluded").val(amount);
+      $(this).parent().next().next().next().children(".paymentAmount").val(amount);
+    }
+  });
+
+  $(".taxRate").change(function() {
+    taxRate = $(this).val();
+    pte = $(this).parent().prev().children(".priceTaxExcluded").val();
+    if (pte && taxRate) {
+      amount = parseFloat(pte) + (pte * taxRate / 100);
+      $(this).parent().next().children(".priceTaxIncluded").val(amount);
+      $(this).parent().next().next().children(".paymentAmount").val(amount);
+
+    }
+  });
 
 	$(".addPayment").live('click', function () {
 
@@ -99,6 +118,9 @@ $(function(){
 		var ssd       = $('.newPaymentTable').children().children().children().children('.susbcriptionStartDate').val();
 		var sed       = $('.newPaymentTable').children().children().children().children('.susbcriptionEndDate').val();
 		var fName     = $('.newPaymentTable').children().children().children().children('.fundName').val();
+		var pte       = $('.newPaymentTable').children().children().children().children('.priceTaxExcluded').val();
+		var tr        = $('.newPaymentTable').children().children().children().children('.taxRate').val();
+		var pti       = $('.newPaymentTable').children().children().children().children('.priceTaxIncluded').val();
 		var typeID    = $('.newPaymentTable').children().children().children().children('.orderTypeID').val();
 		var detailsID = $('.newPaymentTable').children().children().children().children('.costDetailsID').val();
 		var pAmount   = $('.newPaymentTable').children().children().children().children('.paymentAmount').val();
@@ -147,6 +169,9 @@ $(function(){
 			$('.newPaymentTable').children().children().children().children('.subscriptionStartDate').val('');
 			$('.newPaymentTable').children().children().children().children('.subscriptionEndDate').val('');
 			$('.newPaymentTable').children().children().children().children('.fundName').val('');
+			$('.newPaymentTable').children().children().children().children('.priceTaxExcluded').val('');
+			$('.newPaymentTable').children().children().children().children('.taxRate').val('');
+			$('.newPaymentTable').children().children().children().children('.priceTaxIncluded').val('');
 			$('.newPaymentTable').children().children().children().children('.paymentAmount').val('');
 			$('.newPaymentTable').children().children().children().children('.orderTypeID').val('');
 			$('.newPaymentTable').children().children().children().children('.costDetailsID').val('');
@@ -196,6 +221,21 @@ function submitCostForm(){
 	      fundNameList += $(this).val() + ":::";
 	}); 
 
+	priceTaxExcludedList ='';
+	$(".priceTaxExcluded").each(function(id) {
+	      priceTaxExcludedList += $(this).val() + ":::";
+	}); 
+
+	taxRateList ='';
+	$(".taxRate").each(function(id) {
+	      taxRateList += $(this).val() + ":::";
+	}); 
+
+    priceTaxIncludedList ='';
+	$(".priceTaxIncluded").each(function(id) {
+	      priceTaxIncludedList += $(this).val() + ":::";
+	});
+
 	paymentAmountList ='';
 	$(".paymentAmount").each(function(id) {
 	      paymentAmountList += $(this).val() + ":::";
@@ -237,6 +277,9 @@ function submitCostForm(){
                       subStarts: subStartList,
                       subEnds: subEndList,
                       fundNames: fundNameList,
+                      pricesTaxExcluded: priceTaxExcludedList,
+                      taxRates: taxRateList,
+                      pricesTaxIncluded: priceTaxIncludedList,
                       paymentAmounts: paymentAmountList,
                       currencyCodes: currencyCodeList,
                       orderTypes: orderTypeList,
@@ -275,6 +318,8 @@ function submitCostForm(){
 	var fName = $('.newPaymentTable').children().children().children().children('.fundName').val();
 	var typeID = $('.newPaymentTable').children().children().children().children('.orderTypeID').val();
 	var detailsID = $('.newPaymentTable').children().children().children().children('.costDetailsID').val();
+	var pte = $('.newPaymentTable').children().children().children().children('.priceTaxIncluded').val();
+	var pti = $('.newPaymentTable').children().children().children().children('.priceTaxExcluded').val();
 	var pAmount = $('.newPaymentTable').children().children().children().children('.paymentAmount').val();
 	var cNote = $('.newPaymentTable').children().children().children().children('.costNote').val();
 
@@ -295,7 +340,17 @@ function submitCostForm(){
 		$('#div_errorPayment').html('Error - price is not numeric');
 		myReturn="1";		
 	}
- 	
+
+  if ((pte != '') && (pte != null) && (isAmount(pte) === false)){
+		$('#div_errorPayment').html('Error - Price (tax excluded) is not numeric');
+		myReturn="1";		
+	}
+
+ 	if ((pti != '') && (pti != null) && (isAmount(pti) === false)){
+		$('#div_errorPayment').html('Error - Price (tax included) is not numeric');
+		myReturn="1";		
+	}
+
  	 
  	if (myReturn == "1"){
 		return false;