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

Works on product canvas and templates

Browse Source 
Add possibility to move canvas directory to module directory
This commit is contained in:
Regis Houssin 2010-05-05 09:15:34 +00:00
parent 3c8507cc60
commit 8d49c4df2d
1 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
htdocs/product/fiche.php
View File

@ -638,7 +638,7 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ
$product = $canvas->load_canvas('product',$_GET["canvas"]); $product = $canvas->load_canvas('product',$_GET["canvas"]);
$canvas->assign_values($_GET["action"],$smarty); $canvas->assign_values('create');
$canvas->display_canvas(); $canvas->display_canvas();
} }
@ -661,21 +661,11 @@ if ($_GET["id"] || $_GET["ref"])
$result = $productstatic->getCanvas($_GET["id"],$_GET["ref"]); $result = $productstatic->getCanvas($_GET["id"],$_GET["ref"]);
// 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))
{ {
$classname = 'Product'.ucfirst($productstatic->canvas); $canvas = new Canvas($db,$user);
include_once(DOL_DOCUMENT_ROOT.'/product/canvas/'.$productstatic->canvas.'/product.'.$productstatic->canvas.'.class.php');
$product = new $classname($db);
$result = $product->fetch($productstatic->id,'',$_GET["action"]); $product = $canvas->load_canvas('product',$productstatic->canvas);
$template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/';
if ($product->smarty)
{
$product->assign_smarty_values($smarty, $_GET["action"]);
$smarty->template_dir = $template_dir;
}
} }
llxHeader('',$langs->trans("CardProduct".$product->type)); llxHeader('',$langs->trans("CardProduct".$product->type));
@ -687,19 +677,8 @@ if ($_GET["id"] || $_GET["ref"])
*/ */
if ($_GET["action"] == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer)) if ($_GET["action"] == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
if ($product->smarty) $canvas->assign_values('edit');
{ $canvas->display_canvas();
//$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 * Fiche en mode visu
@ -718,21 +697,8 @@ if ($_GET["id"] || $_GET["ref"])
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';
} }
// Smarty template $canvas->assign_values('view');
if ($product->smarty) $canvas->display_canvas();
{
$smarty->assign('fiche_cursor_prev',$previous_ref);
$smarty->assign('fiche_cursor_next',$next_ref);
$smarty->display($product->canvas.'-view.tpl');
}
// PHP template
else
{
$product->assign_values('view');
include($template_dir.'view.tpl.php');
}
} }
} }
} }