Revision: 6487
http://care2002.svn.sourceforge.net/care2002/?rev=6487&view=rev
Author: mizuko
Date: 2010-06-30 12:23:59 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/products/products-bestellung.php
care2x/branches/gettext/modules/products/products-ordercatalog.php
care2x/branches/gettext/modules/products/products-orderlist-final.php
care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
Added Paths:
-----------
care2x/branches/gettext/modules/products/products-basket.php
Removed Paths:
-------------
care2x/branches/gettext/modules/products/products-bestellkorb.php
Copied: care2x/branches/gettext/modules/products/products-basket.php (from rev
6485, care2x/branches/gettext/modules/products/products-bestellkorb.php)
===================================================================
--- care2x/branches/gettext/modules/products/products-basket.php
(rev 0)
+++ care2x/branches/gettext/modules/products/products-basket.php
2010-06-30 12:23:59 UTC (rev 6487)
@@ -0,0 +1,131 @@
+<?php
+error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
+require('./roots.php');
+require($root_path.'include/helpers/inc_environment_global.php');
+$lang_tables[]='departments.php';
+define('LANG_FILE','products.php');
+$local_user='ck_prod_order_user';
+require_once($root_path.'include/helpers/inc_front_chain_lang.php');
+///$db->debug=1;
+$thisfile=basename(__FILE__);
+
+if($cat=='pharma'){
+ $dbtable='care_pharma_orderlist';
+ $title=$LDPharmacy;
+}elseif($cat=='medstock'){
+ $dbtable='care_med_orderlist';
+ $title=$LDMedDepot;
+}
+
+// Load the date formatter
+require_once($root_path.'include/helpers/inc_date_format_functions.php');
+// Create department object
+require_once($root_path.'modules/dept_admin/model/class_department.php');
+$dept_obj=new Department;
+
+if(!isset($_SESSION['current_order']))
+ $_SESSION['current_order'] = "";
+
+switch($mode) {
+ case 'add' :
+ $_SESSION['current_order'][] = $_GET;
+ break;
+ case'delete' :
+ unset($_SESSION['current_order'][$_GET['delete_id']]);
+ break;
+ case 'multiadd' :
+ for($i=1;$i<$_GET['maxcount']+1;$i++) {
+ if(isset($_GET['bestellnum'.$i])) {
+ $_SESSION['current_order'][$i]['bestellnum1'] =
$_GET['bestellnum'.$i];
+ $_SESSION['current_order'][$i]['art1'] =
$_GET['art'.$i];
+ $_SESSION['current_order'][$i]['p1'] =
$_GET['pcs'.$i];
+ $_SESSION['current_order'][$i]['idsub1'] =
$_GET['idsub'.$i];
+ }
+ }
+ break;
+}
+
+// Load common icon images
+$img_warn=createComIcon($root_path,'warn.gif','0');
+$img_uparrow=createComIcon($root_path,'uparrowgrnlrg.gif','0');
+$img_info=createComIcon($root_path,'info3.gif','0');
+$img_delete=createComIcon($root_path,'delete2.gif','0');
+?>
+<?php html_rtl($lang); ?>
+<head>
+<?php echo setCharSet(); ?>
+
+<script language=javascript>
+function popinfo(b){
+ urlholder="products-ordercatalog-popinfo.php?sid=<?php echo
"$sid&lang=$lang&userck=$userck"; ?>&keyword="+b+"&mode=search&cat=<?php echo
$cat ?>";
+
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
+}
+
+function resize() {
+ parent.document.getElementById("products").cols = "60%,20%";
+}
+</script>
+
+<script language="javascript"
src="../js/products_validate_order_num.js"></script>
+<?php
+ require($root_path.'include/helpers/inc_js_gethelp.php');
+ require($root_path.'include/helpers/inc_css_a_hilitebu.php');
+?>
+</head>
+<BODY topmargin=5 leftmargin=10 marginwidth=10 marginheight=5 <?php echo
"bgcolor=".$cfg['body_bgcolor']; if (!$cfg['dhtml']){ echo '
link='.$cfg['body_txtcolor'].' alink='.$cfg['body_alink'].'
vlink='.$cfg['body_txtcolor']; } ?>>
+
+<table><tr><td>
+<a href="javascript:gethelp('products.php','catalog','','<?php echo $cat
?>')"><img <?php echo createComIcon($root_path,'frage.gif','0','right') ?>
alt="<?php echo $LDOpenHelp ?>"></a>
+</td><td>
+<a href="javascript:resize()"><img <?php echo
createComIcon($root_path,'r_arrowgrnsm.gif','0'); ?> alt="Zgjero"></a>
+</td></tr></table>
+<font size=2 face="verdana,arial">
+<?php
+ $buff=$dept_obj->LDvar($dept_nr);
+ if(isset($$buff)&&!empty($$buff)) echo $$buff;
+ else echo $dept_obj->FormalName($dept_nr);
+?>
+</font><br>
+<?php
+if($_SESSION['current_order']){
+ $tog=1;
+ echo '<form name="actlist" action="products-orderlist-final.php"
method="post">
+ <font size=2 color="#800000">'.$LDActualOrder.':</font>
+ <font size=1> ('.$LDDate.': ' .
formatDate2Local(date('d-m-Y'),$date_format) . ' '.$LDTime.':
'.str_replace('24','00',convertTimeToLocal(date('H:i:s'))).')</font>
+ <table border=0 cellspacing=1 cellpadding=3 width="100%">
+ <tr class="wardlisttitlerow">';
+ for ($i=0;$i<sizeof($LDcatindex);$i++)
+ echo '<td>'.$LDcatindex[$i].'</td>';
+ echo '</tr>';
+ $i=1;
+ foreach ($_SESSION['current_order'] as $orderVals) {
+ $currID = each($_SESSION['current_order']);
+ if($tog) { echo '<tr class="wardlistrow1">'; $tog=0; }
+ else{ echo '<tr class="wardlistrow2">'; $tog=1; }
+ echo'<td>';
+ echo'
+ <font size=1 color="#000080">'.$i++.'</font></td>
+ <td><font size=1>'.$orderVals['art1'].'</font><input
type="hidden" name="art'.$i.'" value="'.$orderVals['art1'].'"></td>
+ <td><font size=1>'.$orderVals['p1'].'</font><input
type="hidden" name="p'.$i.'" value="'.$orderVals['p1'].'"></td>
+ <td ><font size=1><nobr>X
'.$orderVals['proorder'].'</nobr></font><input type="hidden"
name="proorder'.$i.'" value="'.$orderVals['proorder'].'"></td></td>
+ <td><font size=1>'.$orderVals['bestellnum1'].'</font><input
type="hidden" name="bestellnum'.$i.'"
value="'.$orderVals['bestellnum1'].'"><input type="hidden" name="idsub'.$i.'"
value="'.$orderVals['idsub1'].'"></td>
+ <td><a
href="javascript:popinfo(\''.$orderVals['bestellnum1'].'\')" ><img
'.$img_info.' alt="'.$complete_info.$orderVals['art1'].'"></a></td>
+ <td><a
href="'.$thisfile.URL_APPEND.'&mode=delete&cat='.$cat.'&dept_nr='.$dept_nr.'&idx='.$i.'&userck='.$userck.'&delete_id='.$currID['key'].'"
><img '.$img_delete.' alt="'.$LDRemoveArticle.'"></a></td>
+ </tr>';
+ }
+ echo '</table>
+ <input type="hidden" name="maxnum" value="'.$i.'">
+ <input type="hidden" name="sid" value="'.$sid.'">
+ <input type="hidden" name="lang" value="'.$lang.'">
+ <input type="hidden" name="order_nr" value="'.$order_nr.'">
+ <input type="hidden" name="dept_nr" value="'.$dept_nr.'">
+ <input type="hidden" name="cat" value="'.$cat.'">
+ <input type="hidden" name="userck" value="'.$userck.'">
+ <br><br>
+ <input type="submit" value="'.$LDFinalizeList.'">
+ </form> ';
+}
+?>
+<a name="bottom"></a>
+</body>
+</html>
Deleted: care2x/branches/gettext/modules/products/products-bestellkorb.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellkorb.php
2010-06-30 12:22:18 UTC (rev 6486)
+++ care2x/branches/gettext/modules/products/products-bestellkorb.php
2010-06-30 12:23:59 UTC (rev 6487)
@@ -1,131 +0,0 @@
-<?php
-error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
-require('./roots.php');
-require($root_path.'include/helpers/inc_environment_global.php');
-$lang_tables[]='departments.php';
-define('LANG_FILE','products.php');
-$local_user='ck_prod_order_user';
-require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-///$db->debug=1;
-$thisfile=basename(__FILE__);
-
-if($cat=='pharma'){
- $dbtable='care_pharma_orderlist';
- $title=$LDPharmacy;
-}elseif($cat=='medstock'){
- $dbtable='care_med_orderlist';
- $title=$LDMedDepot;
-}
-
-// Load the date formatter
-require_once($root_path.'include/helpers/inc_date_format_functions.php');
-// Create department object
-require_once($root_path.'modules/dept_admin/model/class_department.php');
-$dept_obj=new Department;
-
-if(!isset($_SESSION['current_order']))
- $_SESSION['current_order'] = "";
-
-switch($mode) {
- case 'add' :
- $_SESSION['current_order'][] = $_GET;
- break;
- case'delete' :
- unset($_SESSION['current_order'][$_GET['delete_id']]);
- break;
- case 'multiadd' :
- for($i=1;$i<$_GET['maxcount']+1;$i++) {
- if(isset($_GET['bestellnum'.$i])) {
- $_SESSION['current_order'][$i]['bestellnum1'] =
$_GET['bestellnum'.$i];
- $_SESSION['current_order'][$i]['art1'] =
$_GET['art'.$i];
- $_SESSION['current_order'][$i]['p1'] =
$_GET['pcs'.$i];
- $_SESSION['current_order'][$i]['idsub1'] =
$_GET['idsub'.$i];
- }
- }
- break;
-}
-
-// Load common icon images
-$img_warn=createComIcon($root_path,'warn.gif','0');
-$img_uparrow=createComIcon($root_path,'uparrowgrnlrg.gif','0');
-$img_info=createComIcon($root_path,'info3.gif','0');
-$img_delete=createComIcon($root_path,'delete2.gif','0');
-?>
-<?php html_rtl($lang); ?>
-<head>
-<?php echo setCharSet(); ?>
-
-<script language=javascript>
-function popinfo(b){
- urlholder="products-ordercatalog-popinfo.php?sid=<?php echo
"$sid&lang=$lang&userck=$userck"; ?>&keyword="+b+"&mode=search&cat=<?php echo
$cat ?>";
-
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
-}
-
-function resize() {
- parent.document.getElementById("products").cols = "60%,20%";
-}
-</script>
-
-<script language="javascript"
src="../js/products_validate_order_num.js"></script>
-<?php
- require($root_path.'include/helpers/inc_js_gethelp.php');
- require($root_path.'include/helpers/inc_css_a_hilitebu.php');
-?>
-</head>
-<BODY topmargin=5 leftmargin=10 marginwidth=10 marginheight=5 <?php echo
"bgcolor=".$cfg['body_bgcolor']; if (!$cfg['dhtml']){ echo '
link='.$cfg['body_txtcolor'].' alink='.$cfg['body_alink'].'
vlink='.$cfg['body_txtcolor']; } ?>>
-
-<table><tr><td>
-<a href="javascript:gethelp('products.php','catalog','','<?php echo $cat
?>')"><img <?php echo createComIcon($root_path,'frage.gif','0','right') ?>
alt="<?php echo $LDOpenHelp ?>"></a>
-</td><td>
-<a href="javascript:resize()"><img <?php echo
createComIcon($root_path,'r_arrowgrnsm.gif','0'); ?> alt="Zgjero"></a>
-</td></tr></table>
-<font size=2 face="verdana,arial">
-<?php
- $buff=$dept_obj->LDvar($dept_nr);
- if(isset($$buff)&&!empty($$buff)) echo $$buff;
- else echo $dept_obj->FormalName($dept_nr);
-?>
-</font><br>
-<?php
-if($_SESSION['current_order']){
- $tog=1;
- echo '<form name="actlist" action="products-orderlist-final.php"
method="post">
- <font size=2 color="#800000">'.$LDActualOrder.':</font>
- <font size=1> ('.$LDDate.': ' .
formatDate2Local(date('d-m-Y'),$date_format) . ' '.$LDTime.':
'.str_replace('24','00',convertTimeToLocal(date('H:i:s'))).')</font>
- <table border=0 cellspacing=1 cellpadding=3 width="100%">
- <tr class="wardlisttitlerow">';
- for ($i=0;$i<sizeof($LDcatindex);$i++)
- echo '<td>'.$LDcatindex[$i].'</td>';
- echo '</tr>';
- $i=1;
- foreach ($_SESSION['current_order'] as $orderVals) {
- $currID = each($_SESSION['current_order']);
- if($tog) { echo '<tr class="wardlistrow1">'; $tog=0; }
- else{ echo '<tr class="wardlistrow2">'; $tog=1; }
- echo'<td>';
- echo'
- <font size=1 color="#000080">'.$i++.'</font></td>
- <td><font size=1>'.$orderVals['art1'].'</font><input
type="hidden" name="art'.$i.'" value="'.$orderVals['art1'].'"></td>
- <td><font size=1>'.$orderVals['p1'].'</font><input
type="hidden" name="p'.$i.'" value="'.$orderVals['p1'].'"></td>
- <td ><font size=1><nobr>X
'.$orderVals['proorder'].'</nobr></font><input type="hidden"
name="proorder'.$i.'" value="'.$orderVals['proorder'].'"></td></td>
- <td><font size=1>'.$orderVals['bestellnum1'].'</font><input
type="hidden" name="bestellnum'.$i.'"
value="'.$orderVals['bestellnum1'].'"><input type="hidden" name="idsub'.$i.'"
value="'.$orderVals['idsub1'].'"></td>
- <td><a
href="javascript:popinfo(\''.$orderVals['bestellnum1'].'\')" ><img
'.$img_info.' alt="'.$complete_info.$orderVals['art1'].'"></a></td>
- <td><a
href="'.$thisfile.URL_APPEND.'&mode=delete&cat='.$cat.'&dept_nr='.$dept_nr.'&idx='.$i.'&userck='.$userck.'&delete_id='.$currID['key'].'"
><img '.$img_delete.' alt="'.$LDRemoveArticle.'"></a></td>
- </tr>';
- }
- echo '</table>
- <input type="hidden" name="maxnum" value="'.$i.'">
- <input type="hidden" name="sid" value="'.$sid.'">
- <input type="hidden" name="lang" value="'.$lang.'">
- <input type="hidden" name="order_nr" value="'.$order_nr.'">
- <input type="hidden" name="dept_nr" value="'.$dept_nr.'">
- <input type="hidden" name="cat" value="'.$cat.'">
- <input type="hidden" name="userck" value="'.$userck.'">
- <br><br>
- <input type="submit" value="'.$LDFinalizeList.'">
- </form> ';
-}
-?>
-<a name="bottom"></a>
-</body>
-</html>
Modified: care2x/branches/gettext/modules/products/products-bestellung.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellung.php
2010-06-30 12:22:18 UTC (rev 6486)
+++ care2x/branches/gettext/modules/products/products-bestellung.php
2010-06-30 12:23:59 UTC (rev 6487)
@@ -43,7 +43,7 @@
// Assign frameset source file
$smarty->assign ( 'sHeaderSource',
"src=\"products-order-header.php?sid=$sid&lang=$lang&cat=$cat&userck=$userck\""
);
-$smarty->assign ( 'sBasketSource',
"src=\"products-bestellkorb.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&itwassent=$itwassent&cat=$cat&userck=$userck\""
);
+$smarty->assign ( 'sBasketSource',
"src=\"products-basket.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&itwassent=$itwassent&cat=$cat&userck=$userck\""
);
$smarty->assign ( 'sCatalogSource',
"src=\"products-ordercatalog.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&cat=$cat&userck=$userck\""
);
$smarty->assign ( 'sBaseFramesetTemplate','products/ordering_frameset.tpl' );
Modified: care2x/branches/gettext/modules/products/products-ordercatalog.php
===================================================================
--- care2x/branches/gettext/modules/products/products-ordercatalog.php
2010-06-30 12:22:18 UTC (rev 6486)
+++ care2x/branches/gettext/modules/products/products-ordercatalog.php
2010-06-30 12:23:59 UTC (rev 6487)
@@ -77,11 +77,11 @@
if(eval("document.curcatform.p"+i+".value")=="") n=1;
else n=eval("document.curcatform.p"+i+".value")
- window.parent.BESTELLKORB.location.href="products-bestellkorb.php<?php
echo URL_REDIRECT_APPEND."&userck=$userck" ?>&dept_nr=<?php echo $dept_nr;
?>&order_nr=<?php echo $order_nr; ?>&mode=add&cat=<?php echo $cat;
?>&maxcount=1&order1=1&bestellnum1="+b+"&p1="+n+"&idsub1="+id+"&art1="+art;
+ window.parent.BESTELLKORB.location.href="products-basket.php<?php echo
URL_REDIRECT_APPEND."&userck=$userck" ?>&dept_nr=<?php echo $dept_nr;
?>&order_nr=<?php echo $order_nr; ?>&mode=add&cat=<?php echo $cat;
?>&maxcount=1&order1=1&bestellnum1="+b+"&p1="+n+"&idsub1="+id+"&art1="+art;
}
function add_update(b) {
- window.parent.BESTELLKORB.location.href="products-bestellkorb.php<?php
echo URL_REDIRECT_APPEND."&userck=$userck" ?>&dept_nr=<?php echo $dept_nr;
?>&order_nr=<?php echo $order_nr; ?>&mode=add&cat=<?php echo $cat;
?>&maxcount=1&order1=1&bestellnum1="+b+"&p1=1";
+ window.parent.BESTELLKORB.location.href="products-basket.php<?php echo
URL_REDIRECT_APPEND."&userck=$userck" ?>&dept_nr=<?php echo $dept_nr;
?>&order_nr=<?php echo $order_nr; ?>&mode=add&cat=<?php echo $cat;
?>&maxcount=1&order1=1&bestellnum1="+b+"&p1=1";
}
function checkform(d) {
@@ -241,7 +241,7 @@
}
if(isset($mode)&&($mode=="multiadd")) {
- echo '<script
language="javascript">window.parent.BESTELLKORB.location.href="products-bestellkorb.php'.URL_REDIRECT_APPEND.'&dept_nr='.$dept_nr.'&order_nr='.$order_nr.'&mode=multiadd&cat='.$cat.'&maxcount='.$maxcount.'&userck='.$userck;
+ echo '<script
language="javascript">window.parent.BESTELLKORB.location.href="products-basket.php'.URL_REDIRECT_APPEND.'&dept_nr='.$dept_nr.'&order_nr='.$order_nr.'&mode=multiadd&cat='.$cat.'&maxcount='.$maxcount.'&userck='.$userck;
for($i=1;$i<=$maxcount;$i++) {
$o="order".$i;
$pc="p".$i;
Modified: care2x/branches/gettext/modules/products/products-orderlist-final.php
===================================================================
--- care2x/branches/gettext/modules/products/products-orderlist-final.php
2010-06-30 12:22:18 UTC (rev 6486)
+++ care2x/branches/gettext/modules/products/products-orderlist-final.php
2010-06-30 12:23:59 UTC (rev 6487)
@@ -261,7 +261,7 @@
<input type="submit" value="'.$LDSendOrderDepo.'">
</form></font><p>
<font face=Verdana,Arial size=2>
- <a
href="products-bestellkorb.php'.URL_APPEND.'&cat='.$cat.'&dept_nr='.$dept_nr.'&order_nr='.$order_nr.'&userck='.$userck.'"
><< '.$LDBack2Edit.'</a></font>
+ <a
href="products-basket.php'.URL_APPEND.'&cat='.$cat.'&dept_nr='.$dept_nr.'&order_nr='.$order_nr.'&userck='.$userck.'"
><< '.$LDBack2Edit.'</a></font>
';
}else{
echo '
Modified: care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
===================================================================
--- care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
2010-06-30 12:22:18 UTC (rev 6486)
+++ care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
2010-06-30 12:23:59 UTC (rev 6487)
@@ -250,7 +250,7 @@
<input type="submit" value="'.$LDSendOrder.'">
</form></font><p>
<font face=Verdana,Arial size=2>
- <a
href="products-bestellkorb.php'.URL_APPEND.'&cat='.$cat.'&dept_nr='.$dept_nr.'&order_nr='.$order_nr.'&userck='.$userck.'"
><< '.$LDBack2Edit.'</a></font>
+ <a
href="products-basket.php'.URL_APPEND.'&cat='.$cat.'&dept_nr='.$dept_nr.'&order_nr='.$order_nr.'&userck='.$userck.'"
><< '.$LDBack2Edit.'</a></font>
';
}else{
echo '
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers
