Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-10 01:42:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

New: Add a first version of a Paybox module

Browse Source
This commit is contained in:
Laurent Destailleur
2009-02-16 20:02:03 +00:00
parent c287ed9f98
commit 4df44aec0a
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/contracts.lang
View File

@@ -76,6 +76,7 @@ MoveToAnotherContract=Move service into another contract.
ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ?
PaymentRenewContractId=Renew contract line (number %s)
ExpiredSince=Expired since
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract

1
htdocs/langs/fr_FR/contracts.lang
View File

@@ -76,6 +76,7 @@ MoveToAnotherContract=Déplacer le service vers un autre contrat de ce tiers.
ConfirmMoveToAnotherContract=J'ai choisi le contrat cible et confirme le déplacement du service dans ce contrat.
ConfirmMoveToAnotherContractQuestion=Choisissez vers quel autre contrat de ce même tiers, vous voulez déplacer ce service ?
PaymentRenewContractId=Renouvellement service (numéro %s)
ExpiredSince=Expiré depuis le
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
TypeContact_contrat_internal_SALESREPFOLL=Commercial suivi du contrat

27
htdocs/public/paybox/newpayment.php
View File

@@ -375,6 +375,13 @@ if ($_REQUEST["amount"] == 'contractline')
// $text.='<br>'.$langs->trans("DateEndPlanned").': ';
// $text.=dolibarr_print_date($contractline->date_fin_validite);
//}
if ($contractline->date_fin_validite)
{
//$dateactend = dol_time_plus_duree ($contractline->date_fin_validite, $product->duration_value, $product->duration_unit);
//print ', '.$langs->trans("DateEndPlanned").': '.dolibarr_print_date($contractline->date_fin_validite);
$text.='<br>'.$langs->trans("ExpiredSince").': '.dolibarr_print_date($contractline->date_fin_validite);
}
print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
@@ -382,12 +389,15 @@ if ($_REQUEST["amount"] == 'contractline')
// Quantity
$var=!$var;
print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Quantity");
print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$qty.'</b>';
$label=$langs->trans("Quantity");
$qty=1;
$duration='';
if ($contractline->fk_product)
{
if ($product->duration_value > 0)
if ($product->isservice() && $product->duration_value > 0)
{
$label=$langs->trans("Duration");
// TODO Put this in a global method
if ($product->duration_value > 1)
{
@@ -397,16 +407,11 @@ if ($_REQUEST["amount"] == 'contractline')
{
$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
}
$duration=' ('.$product->duration_value.' '.$dur[$product->duration_unit];
print $duration;
if ($contractline->date_fin_validite)
{
$dateactend = dol_time_plus_duree ($contractline->date_fin_validite, $product->duration_value, $product->duration_unit);
print ', '.$langs->trans("DateEndPlanned").': '.dolibarr_print_date($contractline->date_fin_validite);
}
print ')';
$duration=$product->duration_value.' '.$dur[$product->duration_unit];
}
}
print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
print '<input type="hidden" name="newqty" value="'.$qty.'">';
print '</b></td></tr>'."\n";