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

Works on product canvas and templates

Browse Source
This commit is contained in:
Regis Houssin 2010-05-03 05:47:43 +00:00
parent 5ad77d4f31
commit 244d85a4fe
1 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
htdocs/product/fiche.php
View File

@ -643,7 +643,7 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ
if ($product->smarty) if ($product->smarty)
{ {
$product->assign_smarty_values($smarty, 'create'); $product->assign_smarty_values($smarty, $_GET["action"]);
$smarty->template_dir = $template_dir; $smarty->template_dir = $template_dir;
//$tvaarray = load_tva($db,"tva_tx",$conf->defaulttx,$mysoc,''); //$tvaarray = load_tva($db,"tva_tx",$conf->defaulttx,$mysoc,'');
@ -654,7 +654,7 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ
} }
else else
{ {
$product->assign_values('create'); $product->assign_values($_GET["action"]);
include($template_dir.'create.tpl.php'); include($template_dir.'create.tpl.php');
} }
} }
@ -676,6 +676,8 @@ if ($_GET["id"] || $_GET["ref"])
$productstatic = new Product($db); $productstatic = new Product($db);
$result = $productstatic->getCanvas($_GET["id"],$_GET["ref"]); $result = $productstatic->getCanvas($_GET["id"],$_GET["ref"]);
llxHeader("","",$langs->trans("CardProduct".$product->type));
// Gestion des produits specifiques // Gestion des produits specifiques
if (!empty($productstatic->canvas) && file_exists(DOL_DOCUMENT_ROOT.'/product/canvas/'.$productstatic->canvas.'/product.'.$productstatic->canvas.'.class.php') ) if (!empty($productstatic->canvas) && file_exists(DOL_DOCUMENT_ROOT.'/product/canvas/'.$productstatic->canvas.'/product.'.$productstatic->canvas.'.class.php') )
{ {
@ -686,19 +688,44 @@ if ($_GET["id"] || $_GET["ref"])
$result = $product->fetch($productstatic->id,'',$_GET["action"]); $result = $product->fetch($productstatic->id,'',$_GET["action"]);
$template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/'; $template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/';
}
llxHeader("","",$langs->trans("CardProduct".$product->type)); if ($product->smarty)
{
$product->assign_smarty_values($smarty, $_GET["action"]);
$smarty->template_dir = $template_dir;
}
}
if ( $result ) if ( $result )
{ {
if ($_GET["action"] <> 'edit') /*
* Fiche en mode edition
*/
if ($_GET["action"] == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer))
{
if ($product->smarty)
{
//$tvaarray = load_tva($db,"tva_tx",$conf->defaulttx,$mysoc,'','');
//$smarty->assign('tva_taux_value', $tvaarray['value']);
//$smarty->assign('tva_taux_libelle', $tvaarray['label']);
$smarty->display($product->canvas.'-edit.tpl');
}
else
{
$product->assign_values($_GET["action"]);
include($template_dir.'edit.tpl.php');
}
}
/*
* Fiche en mode visu
*/
else
{ {
$head=product_prepare_head($product, $user); $head=product_prepare_head($product, $user);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type==1?'service':'product'); $picto=($product->type==1?'service':'product');
dol_fiche_head($head, 'card', $titre, 0, $picto); dol_fiche_head($head, 'card', $titre, 0, $picto);
print "\n<!-- CUT HERE -->\n";
// Confirmation de la suppression de la facture // Confirmation de la suppression de la facture
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
@ -707,27 +734,23 @@ if ($_GET["id"] || $_GET["ref"])
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';
} }
print($mesg); // Smarty template
if ($product->smarty)
{
$smarty->assign('fiche_cursor_prev',$previous_ref);
$smarty->assign('fiche_cursor_next',$next_ref);
$product->assign_values('view'); $smarty->display($product->canvas.'-view.tpl');
}
// PHP template
else
{
$product->assign_values('view');
include($template_dir.'view.tpl.php'); include($template_dir.'view.tpl.php');
}
} }
} }
/*
* Fiche en mode edition
*/
if ($_GET["action"] == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer))
{
if ($mesg) {
print '<br><div class="error">'.$mesg.'</div><br>';
}
$product->assign_values('edit');
include($template_dir.'edit.tpl.php');
}
} }
else if (!$_GET["action"] == 'create') else if (!$_GET["action"] == 'create')
{ {