Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 19:01:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix duration display for service in list.php

Browse Source
This commit is contained in:
ptibogxiv
2018-08-20 09:52:59 +02:00
committed by GitHub
parent 26d34422b0
commit d5aed3394d
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/product/list.php
View File

@@ -744,22 +744,28 @@ if ($resql)
if (! $i) $totalarray['nbfield']++;
}
// Duration
if (! empty($arrayfields['p.duration']['checked']))
{
print '<td align="center">';
if (preg_match('/([^a-z]+)[a-z]/i',$obj->duration))
// Duration
if (! empty($arrayfields['p.duration']['checked']))
{
if (preg_match('/([^a-z]+)y/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
elseif (preg_match('/([^a-z]+)m/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
elseif (preg_match('/([^a-z]+)w/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek");
elseif (preg_match('/([^a-z]+)d/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
//elseif (preg_match('/([^a-z]+)h/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationHour");
else print $obj->duration;
print '<td align="center">';
$obj->duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1);
$obj->duration_unit = substr($obj->duration,-1);
if ($obj->duration_value > 1)
{
$dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
}
else if ($obj->duration_value > 0)
{
$dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
}
print $obj->duration_value."&nbsp;";
print (! empty($obj->duration_unit) && isset($dur[$obj->duration_unit]) ? $langs->trans($dur[$obj->duration_unit]) : '');
print '</td>';
if (! $i) $totalarray['nbfield']++;
}
print '</td>';
if (! $i) $totalarray['nbfield']++;
}
// Sell price
if (! empty($arrayfields['p.sellprice']['checked']))