From 1ce4996a345e92970c0ab4c74d37856cc9e16c71 Mon Sep 17 00:00:00 2001
From: Andrelec1 <teddy.andreotti@supinfo.com>
Date: Tue, 12 Aug 2014 11:34:53 +0200
Subject: [PATCH] finish implement
remove old code and add new one ...
---
htdocs/compta/paiement.php | 45 +++++++------------------------
htdocs/fourn/facture/paiement.php | 4 +--
htdocs/master.inc.php | 2 --
3 files changed, 12 insertions(+), 39 deletions(-)
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 008721ef018..5a36fc91390 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -374,19 +374,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
});
';
- // Add user helper to input amount on invoices
- if (! empty($conf->global->MAIN_JS_ON_PAYMENT) && $facture->type != 2)
- {
- print ' $("#payment_form").find("img").click(function() {
- callForResult(jQuery(this).attr("id"));
- });
-
- $("#amountpayment").change(function() {
- callForResult();
- });';
- }
-
print ' });'."\n";
+ if(!empty($conf->global->FAC_AUTO_FILLJS)){
+ //Add js for AutoFill
+ print ' $(document).ready(function () {';
+ print ' $(".AutoFillAmout").on(\'click touchstart\', function(){
+ $("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value"));
+ });';
+ print ' });'."\n";
+ }
print ' </script>'."\n";
}
@@ -412,7 +408,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<td>'.$langs->trans('Comments').'</td></tr>';
$rowspan=5;
- if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT)) $rowspan++;
// Payment mode
print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
@@ -438,24 +433,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
print "</tr>\n";
- // Payment amount
- if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT))
- {
- print '<tr><td><span class="fieldrequired">'.$langs->trans('AmountPayment').'</span></td>';
- print '<td>';
- if ($action == 'add_paiement')
- {
- print '<input id="amountpayment" name="amountpaymenthidden" size="8" type="text" value="'.(empty($_POST['amountpayment'])?'':$_POST['amountpayment']).'" disabled="disabled">';
- print '<input name="amountpayment" type="hidden" value="'.(empty($_POST['amountpayment'])?'':$_POST['amountpayment']).'">';
- }
- else
- {
- print '<input id="amountpayment" name="amountpayment" size="8" type="text" value="'.(empty($_POST['amountpayment'])?'':$_POST['amountpayment']).'">';
- }
- print '</td>';
- print '</tr>';
- }
-
// Cheque number
print '<tr><td>'.$langs->trans('Numero');
print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
@@ -578,10 +555,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if ($action != 'add_paiement')
{
- if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT))
- {
- print img_picto($langs->trans('AddRemind'),'rightarrow.png','id="'.$objp->facid.'"');
- }
+ if(!empty($conf->global->FAC_AUTO_FILLJS))
+ print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
print '<input type=hidden name="'.$nameRemain.'" value="'.$remaintopay.'">';
print '<input type="text" size="8" name="'.$namef.'" value="'.$_POST[$namef].'">';
}
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 953348dbb49..bc208421fce 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -332,7 +332,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print $langs->trans('Invoices').'<br>';
if(!empty($conf->global->FAC_AUTO_FILLJS)){
- //Addjs for AutoFill
+ //Add js for AutoFill
print "\n".'<script type="text/javascript" language="javascript">';
print ' $(document).ready(function () {';
print ' $(".AutoFillAmout").on(\'click touchstart\', function(){
@@ -382,7 +382,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<td align="center">';
$namef = 'amount_'.$objp->facid;
if(!empty($conf->global->FAC_AUTO_FILLJS))
- print img_picto("Auto fill",'1rightarrow_selected', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->total_ttc - $objp->am)."'"); // TODO ADD lang
+ print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->total_ttc - $objp->am)."'");
print '<input type="text" size="8" name="'.$namef.'" value="'.GETPOST($namef).'">';
print "</td></tr>\n";
$total+=$objp->total_ht;
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 3c2424ed88a..77c730cab20 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -244,8 +244,6 @@ $hookmanager=new HookManager($db);
if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
-// We force feature to help debug
-//$conf->global->MAIN_JS_ON_PAYMENT=0;
// We force FPDF
if (! empty($dolibarr_pdf_force_fpdf)) $conf->global->MAIN_USE_FPDF=$dolibarr_pdf_force_fpdf;
--
GitLab