lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: jquery payment not stable

Browse Source
This commit is contained in:
Regis Houssin 2011-07-01 16:18:10 +00:00
parent 16947fff89
commit d6d98bfc45
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/ajaxpayment.php
View File

@ -24,7 +24,7 @@
require('../main.inc.php'); require('../main.inc.php');
print_r($_POST); //print_r($_POST);
// Getting the posted keys=>values, sanitize the ones who are from text inputs // Getting the posted keys=>values, sanitize the ones who are from text inputs
// from text inputs : total amount // from text inputs : total amount

58
htdocs/compta/paiement.php
View File

@ -24,7 +24,7 @@
* \file htdocs/compta/paiement.php * \file htdocs/compta/paiement.php
* \ingroup compta * \ingroup compta
* \brief Page to create a payment * \brief Page to create a payment
* \version $Id: paiement.php,v 1.107 2011/07/01 15:19:32 cdelambert Exp $ * \version $Id: paiement.php,v 1.108 2011/07/01 16:18:10 hregis Exp $
*/ */
require('../main.inc.php'); require('../main.inc.php');
@ -272,6 +272,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
jQuery(\'.fieldrequireddyn\').removeClass(\'fieldrequired\'); jQuery(\'.fieldrequireddyn\').removeClass(\'fieldrequired\');
} }
}); });
});
</script>'."\n";
}
if (! empty($conf->global->MAIN_JS_ON_PAYMENT))
{
print "\n".'<script type="text/javascript" language="javascript">';
print 'jQuery(document).ready(function () {
function elemToJson(selector) function elemToJson(selector)
{ {
var subJson = {}; var subJson = {};
@ -299,17 +307,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
for(var key in json) for(var key in json)
{ {
if(key == "result") if(key == "result") {
{
jQuery("#"+key).text(json[key]); jQuery("#"+key).text(json[key]);
if(json[key] < 0) if(json[key] < 0) {
jQuery("#"+key).css("color", "red"); jQuery("#"+key).css("color", "red");
else } else {
jQuery("#"+key).removeAttr("style"); jQuery("#"+key).removeAttr("style");
}else }
{ } else {
form.find("input[name*=\""+key+"\"]").each(function() form.find("input[name*=\""+key+"\"]").each(function() {
{
jQuery(this).attr("value", json[key]); jQuery(this).attr("value", json[key]);
}); });
} }
@ -317,32 +323,26 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}); });
} }
function callToBreakdown(imgSelector) function callToBreakdown(imgSelector) {
{
var form = jQuery("#payment_form"), imgId; var form = jQuery("#payment_form"), imgId;
imgId = imgSelector.attr("id"); imgId = imgSelector.attr("id");
callForResult(imgId); callForResult(imgId);
} }
jQuery(document).ready(function ()
{ jQuery("#payment_form").find("img").click(function() {
jQuery("#payment_form").find("img").click(function()
{
callToBreakdown(jQuery(this)); callToBreakdown(jQuery(this));
}); });
jQuery("#payment_form").find("input[name*=\"amount_\"]").change(function() jQuery("#payment_form").find("input[name*=\"amount_\"]").change(function() {
{
callForResult(); callForResult();
}); });
jQuery("#amountpayment").change(function() jQuery("#amountpayment").change(function() {
{
callForResult(); callForResult();
}); });
}); });
</script>'."\n"; </script>'."\n";
} }
print '<form name="add_paiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print '<form name="add_paiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@ -367,18 +367,18 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<td>'.$langs->trans('Comments').'</td></tr>'; print '<td>'.$langs->trans('Comments').'</td></tr>';
$rowspan=5; $rowspan=5;
if ($conf->use_javascript_ajax) $rowspan++; if (! empty($conf->global->MAIN_JS_ON_PAYMENT)) $rowspan++;
// Payment mode // Payment mode
print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>'; print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
$html->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2); $html->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2);
print "</td>\n"; print "</td>\n";
print '<td rowspan="'.$rowspan.'" valign="top">'; print '<td rowspan="'.$rowspan.'" valign="top">';
print '<textarea name="comment" wrap="soft" cols="60" rows="'.ROWS_4.'">'.(empty($_POST['comment'])?'':$_POST['comment']).'</textarea></td>'; print '<textarea name="comment" wrap="soft" cols="60" rows="'.ROWS_5.'">'.(empty($_POST['comment'])?'':$_POST['comment']).'</textarea></td>';
print '</tr>'; print '</tr>';
// Payment amount // Payment amount
if ($conf->use_javascript_ajax) if (! empty($conf->global->MAIN_JS_ON_PAYMENT))
{ {
print '<tr><td><span class="fieldrequired">'.$langs->trans('AmountPayment').'</span></td>'; print '<tr><td><span class="fieldrequired">'.$langs->trans('AmountPayment').'</span></td>';
print '<td>'; print '<td>';
@ -682,5 +682,5 @@ if (! GETPOST('action'))
$db->close(); $db->close();
llxFooter('$Date: 2011/07/01 15:19:32 $ - $Revision: 1.107 $'); llxFooter('$Date: 2011/07/01 16:18:10 $ - $Revision: 1.108 $');
?> ?>