Menu
▾
▴
oscss-commit — SVN Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2013-02-07 14:17:43
|
Revision: 4704
http://oscss.svn.sourceforge.net/oscss/?rev=4704&view=rev
Author: oscim
Date: 2013-02-07 14:17:34 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
correction coquille dans l'affichage popup confimation suppression des cats
ajout regle d'expedition des notification au admin unqiuement les admin actifs
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.delete.gab
branches/2.1.1/catalog/common/classes/notification.php
Modified: branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.delete.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.delete.gab 2013-02-05 16:41:19 UTC (rev 4703)
+++ branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.delete.gab 2013-02-07 14:17:34 UTC (rev 4704)
@@ -9,6 +9,7 @@
@encode UTF-8
*/
global $languages_id;
+
?>
<h3><?php echo __('text info heading delete category'); ?></h3>
@@ -27,7 +28,7 @@
<?php foreach(array_map('trim',explode(',',categories::$cInfo->categories_datatype)) as $row) : ?>
- <?php if ( isset(categories::$cInfo->listcount['childs'][$row]) && categories::$cInfo->listcount['childs'][$row] > 0) : ?>
+ <?php if ( isset(categories::$cInfo->listcount[$row]) && categories::$cInfo->listcount[$row] > 0) : ?>
<h4><?php echo sprintf(__('text delete warning datatypes %1$s number %2$s'), $row, categories::$cInfo->listcount[$row] ) ?></h4>
<p><?php echo tep_draw_checkbox_field('delete_in_cat['.$row.']',"delete_in_cat_".$row, '', false).' '.sprintf(__('text delete datatype %s exe'), $row ) ?></p>
<?php endif; ?>
Modified: branches/2.1.1/catalog/common/classes/notification.php
===================================================================
--- branches/2.1.1/catalog/common/classes/notification.php 2013-02-05 16:41:19 UTC (rev 4703)
+++ branches/2.1.1/catalog/common/classes/notification.php 2013-02-07 14:17:34 UTC (rev 4704)
@@ -35,7 +35,7 @@
*/
protected static function loadConf($key){
$DB=Database::getInstance();
- $r=$DB->query("select * from ".self::TABLE." where chknotif_key='".(string)$key."' " );
+ $r=$DB->query("select * from ".self::TABLE." where chknotif_status > 0 AND chknotif_key='".(string)$key."' " );
if( ! $r->__get('numRows') ){
/**
@@ -75,7 +75,7 @@
$DB->query($sql="INSERT INTO ".self::ADMIN_TABLE_NOTIF." (notif_id,notif_type,user_id,notif_key,notif_data,notif_text, notif_date) VALUES ('',0,'".(int)$item['chknotif_user']."', '".self::$key."','".tep_db_input($data)."','".tep_db_input($message_final['html'])."' ,now() ) " );
if((int)$item['chknotif_uniq'] == 1){
- $r = $DB->query("SELECT admin_id as id FROM ".TABLE_ADMIN." where admin_groups_id='".(int)$item['chknotif_user']."' " );
+ $r = $DB->query("SELECT admin_id as id FROM ".TABLE_ADMIN." where admin_status > 0 AND admin_groups_id='".(int)$item['chknotif_user']."' " );
foreach($r->fetchAllAssoc() as $admin)
if((int)$item['chknotif_user'] !=(int)$admin['id'])
@@ -87,9 +87,9 @@
case 'email':
default:
if((int)$item['chknotif_uniq'] == 0)
- $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_id='".(int)$item['chknotif_user']."' " );
+ $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_status > 0 AND admin_id='".(int)$item['chknotif_user']."' " );
elseif((int)$item['chknotif_uniq'] == 1)
- $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_groups_id='".(int)$item['chknotif_user']."' " );
+ $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_status > 0 AND admin_groups_id='".(int)$item['chknotif_user']."' " );
foreach($r->fetchAllAssoc() as $admin)
if((int)$item['chknotif_user'] !=(int)$admin['id'])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-05 16:41:27
|
Revision: 4703
http://oscss.svn.sourceforge.net/oscss/?rev=4703&view=rev
Author: oscim
Date: 2013-02-05 16:41:19 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
correction coquille genration pdf multi page
correction reliquat recover cart mauvaise appel js
correction listing product et prise en charge des produit publi?\195?\169 uniquement
correction coquille dans la structure des elements de tables supplementaire qui construise requete produit coupl?\195?\169 header tag
Modified Paths:
--------------
branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php
branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/invoice.php
branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/packingslip.php
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/modules/pages/recover_cart_sales.php
branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php
Modified: branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php
===================================================================
--- branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php 2013-02-05 08:30:34 UTC (rev 4702)
+++ branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php 2013-02-05 16:41:19 UTC (rev 4703)
@@ -36,7 +36,7 @@
$hauteur_block = $pdf->DrawTypeAndRef($le_Y , tep_correct_entitie_put_pdf(__('dl print doc type delivery')) , 'BL-'.$obj_shipping->row_id );
- /// add other info
+ /// add other info
$pdf->SetFont($pdf->font,'I',9);
$width = 70 ;
$coor_X = ( $pdf->page_width - $width - $pdf->page_marge );
@@ -54,7 +54,7 @@
/**
EOB -- subheader
*/
-
+
$le_Y=($le_Y+$pdf->line_height);
$hauteur_block= $pdf->line_height ;
//Draw Box for Order Number, Date & Payment method
@@ -67,7 +67,7 @@
$pdf->SetTextColor(0);
$pdf->SetFont($pdf->font,'',8);
- $hauteur_block= ($hauteur_block -1) ; // force min inter height line
+ $hauteur_block= ($hauteur_block -1) ; // force min inter height line
$coor_X = ( ( $pdf->page_width / 2)+( $pdf->block_marge ) );
$le_Y += 2;
$pdf->SetXY( ($coor_X + $pdf->block_padding ) , $le_Y);
@@ -120,7 +120,7 @@
/**
- Block detail delivery
+ Block detail delivery
*/
//Fields Name position
@@ -238,14 +238,51 @@
/* Check for product line overflow*/
$item_count++;
- if ((is_long($item_count / 32) && $i >= 20) || ($i == 20)){
+ $maxligne = 28;
+ if ((is_long($item_count / 32) && $i >= $maxligne) || ($i == $maxligne)){
$pdf->AddPage();
//Fields Name position
$Y_Fields_Name_position = 125;
//Table position, under Fields Name
$Y_Table_Position = 70;
- output_table_heading($Y_Table_Position-$hauteur_block_r);
- if ($i == 20) $item_count = 1;
+// output_table_heading($Y_Table_Position-$hauteur_block_r);
+
+ //First create each Field Name
+ //Gray color filling each Field Name box
+ $pdf->SetFillColor($pdf->bg_color_1);
+ //Bold Font for Field Name
+ $pdf->SetFont($pdf->font,'B',8);
+
+
+ $X_pos = $pdf->page_marge;
+ $Y_Table_Position = $pdf->block_marge;
+ $hauteur_block=5;
+ $pdf->SetXY($X_pos , $Y_Table_Position );
+
+
+ $cell_w = 9;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('dl table heading qty orders')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 9;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('dl table heading qty exedie')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 27;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('dl table heading products model')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $last_rows = $cell_w = ( ($pdf->page_width - $pdf->page_marge ) - $X_pos ) ;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('dl table heading products')),1,0,'C',1);
+
+ $pdf->Ln();
+ if ($i == $maxligne) $item_count = 1;
}
}
}
Modified: branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/invoice.php
===================================================================
--- branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/invoice.php 2013-02-05 08:30:34 UTC (rev 4702)
+++ branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/invoice.php 2013-02-05 16:41:19 UTC (rev 4703)
@@ -23,7 +23,7 @@
$hauteur_block = $pdf->DrawTypeAndRef($le_Y , tep_correct_entitie_put_pdf(__('iv print doc type invoice') ) , 'FA-'.$order->info['orders_prefix'].$order->info['facture_id'] );
- /// add other info
+ /// add other info
$pdf->SetFont($pdf->font,'I',9);
$width = 70 ;
$coor_X = ( $pdf->page_width - $width - $pdf->page_marge );
@@ -231,17 +231,77 @@
$pdf->MultiCell($cell_w,$hauteur_block_r,tep_correct_entitie_put_pdf($currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']), false),1,'R');
/* Check for product line overflow*/
- $item_count++;
- if ((is_long($item_count / 32) && $i >= 20) || ($i == 20)){
+ $item_count++;
+ $maxligne = 20;
+ if ((is_long($item_count / 32) && $i >= $maxligne) || ($i == $maxligne)){
$pdf->AddPage();
//Fields Name position
$Y_Fields_Name_position = 125;
//Table position, under Fields Name
$Y_Table_Position = 70;
- output_table_heading($Y_Table_Position-$hauteur_block_r);
- if ($i == 20) $item_count = 1;
+// output_table_heading($Y_Table_Position-$hauteur_block_r);
+
+
+
+ //First create each Field Name
+ //Gray color filling each Field Name box
+ $pdf->SetFillColor($pdf->bg_color_1);
+ //Bold Font for Field Name
+ $pdf->SetFont($pdf->font,'B',8);
+
+
+ $X_pos = $pdf->page_marge;
+ $Y_Table_Position = $pdf->block_marge;
+ $hauteur_block=5;
+ $pdf->SetXY($X_pos , $Y_Table_Position );
+
+
+ $cell_w = 25;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('iv table heading products model')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 86;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('iv table heading products')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 9;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('iv table heading qty orders')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 20;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('iv table heading price excluding tax')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 20;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('iv table heading price including tax')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 20;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('iv table heading total excluding tax')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 20;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('iv table heading total including tax')),1,0,'C',1);
+ $pdf->Ln();
+
+
+
+
+ if ($i == $maxligne) $item_count = 1;
}
- $Y_Table_Position=$Y_Table_Position+$hauteur_block_r;
+ $Y_Table_Position +=$hauteur_block;
}
@@ -258,9 +318,9 @@
// $pdf->SetFillColor($pdf->bg_color_1);
// $pdf->RoundedRect(6, $le_Y, ($pdf->page_width/2.2) , $hauteur_block, 2, 'DF');
// $pdf->Text(10,($le_Y+6),tep_correct_entitie_put_pdf(sprintf(__('iv entry payment method %s') , $order->info['payment_method'])), 0, 0, 'R');
- $le_Y=($Y_Table_Position+$pdf->block_marge);
- $pdf->SetXY(6, $le_Y);
- $pdf->MultiCell(94,$hauteur_block, tep_correct_entitie_put_pdf(sprintf(__('iv entry payment method %s') , $order->info['payment_method'])) ,1,'L');
+// $le_Y=($Y_Table_Position+$pdf->block_marge);
+// $pdf->SetXY(6, $le_Y);
+// $pdf->MultiCell(94,$hauteur_block, tep_correct_entitie_put_pdf(sprintf(__('iv entry payment method %s') , $order->info['payment_method'])) ,1,'L');
// }
@@ -270,9 +330,9 @@
for ($i = 0, $n = sizeof($order->totals); $i < $n; $i++) {
- $pdf->SetXY(106 , $Y_Table_Position);
+ $pdf->SetXY(46 , $Y_Table_Position);
$temp = substr ($order->totals[$i]['text'],0 ,3);
- $pdf->MultiCell(60,$hauteur_block,tep_correct_entitie_put_pdf($order->totals[$i]['title'],true) ,1,'R');
+ $pdf->MultiCell(120,$hauteur_block,tep_correct_entitie_put_pdf($order->totals[$i]['title'],true) ,1,'R');
$pdf->SetXY(166 , $Y_Table_Position);
$pdf->MultiCell(40,$hauteur_block, tep_correct_entitie_put_pdf($order->totals[$i]['text'],false),1,'R');
@@ -280,25 +340,5 @@
$Y_Table_Position +=5;
}
-/*
-if (isset($_POST) && isset($_POST['show_pay_method'])){
- $DB=Database::getInstance();
- $innum = $orders['orders_prefix'].$orders['orders_id'];
- $orders_comments_query = $DB->query("select comments,date_added from " . TABLE_ORDERS_STATUS_HISTORY . " where orders_id = '$innum' order by date_added");
- if ($orders_comments_query->__get('NumRows')>0) {
- $Y_Table_Position=($Y_Table_Position+$pdf->block_marge);
- while ($orders_comments = $orders_comments_query->fectAssoc()) {
- if(tep_not_null($orders_comments['comments'])){
- $pdf->SetFont($pdf->font,'',10);
- $pdf->SetY($Y_Table_Position);
- $pdf->SetX(6);
- $pdf->MultiCell(35,6,date(TEXT_ORDER_FORMAT, strtotime($orders_comments['date_added'])),0,'C');
- $pdf->SetY($Y_Table_Position);
- $pdf->SetX(41);
- $pdf->MultiCell(100,6,tep_correct_entitie_put_pdf("Comments: " . $orders_comments['comments']),0,'C');
- $Y_Table_Position += 5;
- }
- }
- }
-}*/
+
?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/packingslip.php
===================================================================
--- branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/packingslip.php 2013-02-05 08:30:34 UTC (rev 4702)
+++ branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/packingslip.php 2013-02-05 16:41:19 UTC (rev 4703)
@@ -23,7 +23,7 @@
$hauteur_block = $pdf->DrawTypeAndRef($le_Y , tep_correct_entitie_put_pdf(__('ps print doc type packingslip') ) , 'BC-'.$order->info['orders_prefix'].$order->info['orders_id'] );
- /// add other info
+ /// add other info
$pdf->SetFont($pdf->font,'I',9);
$width = 70 ;
$coor_X = ( $pdf->page_width - $width - $pdf->page_marge );
@@ -106,8 +106,6 @@
$X_pos = $pdf->page_marge;
$pdf->SetXY($X_pos , $Y_Fields_Name_position );
-
-
$cell_w = 9;
$pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('ps table heading qty orders')),1,0,'C',1);
@@ -123,7 +121,6 @@
$last_rows = $cell_w = ( ($pdf->page_width - $pdf->page_marge ) - $X_pos ) ;
$pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('ps table heading products')),1,0,'C',1);
-
$pdf->Ln();
@@ -157,52 +154,86 @@
}
}
}
-// $hauteur_block_r=($nbr_l*$hauteur_block_r);
+ // $hauteur_block_r=($nbr_l*$hauteur_block_r);
- $hauteur_block_r=($nbr_l*$hauteur_block);
+ $hauteur_block_r=($nbr_l*$hauteur_block);
- $X_pos = $pdf->page_marge;
+ $X_pos = $pdf->page_marge;
- $pdf->SetXY( $X_pos , $Y_Table_Position);
+ $pdf->SetXY( $X_pos , $Y_Table_Position);
- $pdf->SetFont($pdf->font,'',7);
+ $pdf->SetFont($pdf->font,'',7);
-// quantite
- $cell_w = 9 ;
- $pdf->MultiCell($cell_w,$hauteur_block_r,$order->products[$i]['qty'],1,'C');
+ // quantite
+ $cell_w = 9 ;
+ $pdf->MultiCell($cell_w,$hauteur_block_r,$order->products[$i]['qty'],1,'C');
- $X_pos +=$cell_w;
- $pdf->SetXY( $X_pos , $Y_Table_Position);
+ $X_pos +=$cell_w;
+ $pdf->SetXY( $X_pos , $Y_Table_Position);
-// modele
- $cell_w = 25 ;
- $pdf->MultiCell($cell_w,$hauteur_block_r,tep_correct_entitie_put_pdf($order->products[$i]['model']),1,'C');
+ // modele
+ $cell_w = 25 ;
+ $pdf->MultiCell($cell_w,$hauteur_block_r,tep_correct_entitie_put_pdf($order->products[$i]['model']),1,'C');
- $X_pos +=$cell_w;
- $pdf->SetXY( $X_pos , $Y_Table_Position);
+ $X_pos +=$cell_w;
+ $pdf->SetXY( $X_pos , $Y_Table_Position);
-// nom product
- $cell_w = $last_rows ;
- $pdf->MultiCell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf($order->products[$i]['name']),1,'L');
+ // nom product
+ $cell_w = $last_rows ;
+ $pdf->MultiCell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf($order->products[$i]['name']),1,'L');
- $Y_Table_Position += $hauteur_block_r;
+ $Y_Table_Position += $hauteur_block_r;
- /* Check for product line overflow*/
- $item_count++;
- if ((is_long($item_count / 32) && $i >= 20) || ($i == 20)){
- $pdf->AddPage();
- //Fields Name position
- $Y_Fields_Name_position = 125;
- //Table position, under Fields Name
- $Y_Table_Position = 70;
- output_table_heading($Y_Table_Position-$hauteur_block_r);
- if ($i == 20) $item_count = 1;
- }
+ /* Check for product line overflow*/
+ $item_count++;
+ $maxligne = 28;
+ if ((is_long($item_count / 32) && $i >= $maxligne) || ($i == $maxligne)){
+ $pdf->AddPage();
+ //Fields Name position
+ $Y_Fields_Name_position = 125;
+ //Table position, under Fields Name
+ $Y_Table_Position = 70;
+// output_table_heading($Y_Table_Position-$hauteur_block_r);
+
+
+ //First create each Field Name
+ //Gray color filling each Field Name box
+ $pdf->SetFillColor($pdf->bg_color_1);
+ //Bold Font for Field Name
+ $pdf->SetFont($pdf->font,'B',8);
+
+
+ $X_pos = $pdf->page_marge;
+ $Y_Table_Position = $pdf->block_marge;
+ $hauteur_block=5;
+ $pdf->SetXY($X_pos , $Y_Table_Position );
+
+ $cell_w = 9;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('ps table heading qty orders')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $cell_w = 25;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('ps table heading products model')),1,0,'C',1);
+
+ $X_pos +=$cell_w;
+ $pdf->SetX($X_pos);
+
+ $last_rows = $cell_w = ( ($pdf->page_width - $pdf->page_marge ) - $X_pos ) ;
+ $pdf->Cell($cell_w,$hauteur_block,tep_correct_entitie_put_pdf(__('ps table heading products')),1,0,'C',1);
+
+ $pdf->Ln();
+ $Y_Table_Position +=$hauteur_block;
+
+
+ if ($i == $maxligne) $item_count = 1;
+ }
}
?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-02-05 08:30:34 UTC (rev 4702)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-02-05 16:41:19 UTC (rev 4703)
@@ -517,7 +517,7 @@
}
elseif(in_array('publied', $array) && !in_array('nopublied', $array) ){
$_SESSION['filters']['expected']['publied'] = 'on';
- self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available <= NOW() ";
+ self::$InitInfo['adjust']['sWhere'] .=" AND ( products_date_available <= NOW() OR products_date_available ='' OR products_date_available IS NULL ) ";
}
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/recover_cart_sales.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/recover_cart_sales.php 2013-02-05 08:30:34 UTC (rev 4702)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/recover_cart_sales.php 2013-02-05 16:41:19 UTC (rev 4703)
@@ -267,19 +267,16 @@
}
-
-
-// var_dump('toto');
-// exit;
-
}
/** public static InterfacedTJsonS */
private static function get_item_action($item){
- return '<span class="view fils fleft">'.
- '<a class="buttonimg fancyView iframe " href="' . tep_href_link(self::FILENAME, 'cID=' . $item['customers_id'] .'&'.recover_cart_sales::RepostDate(). '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE ). '</a>'.
- '</span>';
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ '' ,
+ sprintf( CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'cID=' . $item['customers_id'] .'&'. recover_cart_sales::RepostDate() . '&action=delete') ,'' )
+ );
}
private static function get_item_cart($cart,$item){
@@ -488,9 +485,9 @@
- /**
- @remarks implements InterfaceModule depend
- if module twin in backoffice, report all content install in the other module
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
public function check() {return true;}
public function install() {return true;}
public function remove() {return true;}
@@ -499,7 +496,7 @@
/**
@fn check()
- @brief test if count all var , and keys is equal
+ @brief test if count all var , and keys is equal
@return boolean true/false
*/
function check() { return false; }
@@ -507,7 +504,7 @@
/**
@fn keys()
- @return array all key configuration define by this module
+ @return array all key configuration define by this module
*/
function keys() {
return array();
@@ -515,13 +512,13 @@
/**
@fn install()
- @brief add all configuration
- @note
+ @brief add all configuration
+ @note
- Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
- please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
- if module twin in backoffice, report all content install in the other module
- - Not use language in DB , but function :__()
- for MODULE_TOTO_ST
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
var title MODULE_TOTO_ST_S (small description)
var description MODULE_TOTO_ST_L (long description)
*/
@@ -530,9 +527,9 @@
/**
@fn remove()
@brief delete all configuration
- @note
+ @note
- please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
- - if module twin in backoffice, report all content remove in the other module
+ - if module twin in backoffice, report all content remove in the other module
*/
function remove() { return false; }
}
Modified: branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php 2013-02-05 08:30:34 UTC (rev 4702)
+++ branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php 2013-02-05 16:41:19 UTC (rev 4703)
@@ -60,8 +60,8 @@
/**
@brief Load , adjust and define var environement GetConf master module
- @param $opt array
- type => '' string name type for define return
+ @param $opt array
+ type => '' string name type for define return
languages_id => '' int
*/
public function GetConf($opt){
@@ -98,7 +98,7 @@
case 'tables':
$array['fht'] = " LEFT JOIN " . TABLE_FULL_TAG . " fht ON( fht.page_id=p.products_id AND fht.page_type='product' ) ";
- $array['fhtd'] = " JOIN " . TABLE_FULL_TAG_DESCRIPTION . " fhtd ON( fht.tag_id=fhtd.tag_id AND fhtd.language_id = '".(int)$opt['languages_id']."' ) ";
+ $array['fhtd'] = " LEFT JOIN " . TABLE_FULL_TAG_DESCRIPTION . " fhtd ON( fht.tag_id=fhtd.tag_id AND fhtd.language_id = '".(int)$opt['languages_id']."' ) ";
break;
}
@@ -109,7 +109,7 @@
/**
@brief format db value for this allfields
@param $key string name key
- @param $item array
+ @param $item array
*/
public function formatdbvalue($key,$item){
global $languages_id;
@@ -161,7 +161,7 @@
/**
- @brief action delete product
+ @brief action delete product
*/
public function delete_product($products_id){
$products_query = tep_db_query($sql = "SELECT tag_id FROM " . TABLE_FULL_TAG . " ft WHERE ft.page_type='product' and ft.page_id = '" . (int)$products_id . "' ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-05 11:15:24
|
Revision: 4702
http://oscss.svn.sourceforge.net/oscss/?rev=4702&view=rev
Author: oscim
Date: 2013-02-05 08:30:34 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/core_page/customer.php
Modified: branches/2.1.1/catalog/includes/classes/core_page/customer.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/core_page/customer.php 2013-02-03 09:52:38 UTC (rev 4701)
+++ branches/2.1.1/catalog/includes/classes/core_page/customer.php 2013-02-05 08:30:34 UTC (rev 4702)
@@ -1064,13 +1064,13 @@
*/
static public function search($key, $value,$confimed=false){
$value=tep_db_prepare_input($value);
- $check_query = tep_db_query("select * from " . TABLE_CUSTOMERS . " where ".(($confimed)? ' customers_status = 1 AND ' : '' ) ." ".$key." = '" . tep_db_input($value) . "' LIMIT 1");
+ $check_query = tep_db_query("select customers_id from " . TABLE_CUSTOMERS . " where ".((!$confimed)? ' customers_status = 1 AND ' : '' ) ." ".$key." = '" . tep_db_input($value) . "' LIMIT 1");
if(!(bool)tep_db_num_rows($check_query)) return false;
$_query=$check_query->fetchAssoc();
- return (!isset($_query[$key])?false: $_query['customers_id'] );
+ return $_query['customers_id'];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-03 09:52:45
|
Revision: 4701
http://oscss.svn.sourceforge.net/oscss/?rev=4701&view=rev
Author: oscim
Date: 2013-02-03 09:52:38 +0000 (Sun, 03 Feb 2013)
Log Message:
-----------
correction coquille dans test user exist
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/core_page/customer.php
Modified: branches/2.1.1/catalog/includes/classes/core_page/customer.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/core_page/customer.php 2013-01-30 15:57:41 UTC (rev 4700)
+++ branches/2.1.1/catalog/includes/classes/core_page/customer.php 2013-02-03 09:52:38 UTC (rev 4701)
@@ -144,14 +144,14 @@
/**
* \fn userTestNotExist($email)
- * \brief test user not exist, control by email
+ * \brief test user not exist, control by email , but also not confirmed customers
* @param $email string
* @return boolean
* true if not exist
* false if exists
*/
public function userTestNotExist($email){
- return ((self::search('customers_email_address', $email) > 0)?true : false );
+ return ((self::search('customers_email_address', $email, true) > 0)?true : false );
}
/**
@@ -1059,11 +1059,12 @@
@brief search in db for key and value in tale master customers
@param key col in db
@param value for col
+ @param $confimed boolean for active customers
@return customers_id integer
*/
- static public function search($key, $value){
+ static public function search($key, $value,$confimed=false){
$value=tep_db_prepare_input($value);
- $check_query = tep_db_query("select * from " . TABLE_CUSTOMERS . " where ".$key." = '" . tep_db_input($value) . "' LIMIT 1");
+ $check_query = tep_db_query("select * from " . TABLE_CUSTOMERS . " where ".(($confimed)? ' customers_status = 1 AND ' : '' ) ." ".$key." = '" . tep_db_input($value) . "' LIMIT 1");
if(!(bool)tep_db_num_rows($check_query)) return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-30 15:57:49
|
Revision: 4700
http://oscss.svn.sourceforge.net/oscss/?rev=4700&view=rev
Author: oscim
Date: 2013-01-30 15:57:41 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
coquille sur requete sql
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/order.php
Modified: branches/2.1.1/catalog/common/classes/order.php
===================================================================
--- branches/2.1.1/catalog/common/classes/order.php 2013-01-29 16:38:40 UTC (rev 4699)
+++ branches/2.1.1/catalog/common/classes/order.php 2013-01-30 15:57:41 UTC (rev 4700)
@@ -229,7 +229,7 @@
$subindex = 0;
// $attributes_query = tep_db_query("select products_options_id, products_options_values_id, products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
- $attributes_query = tep_db_query("select , products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
+ $attributes_query = tep_db_query("select products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
if (tep_db_num_rows($attributes_query)) {
while ($attributes = tep_db_fetch_array($attributes_query)) {
$this->products[$index]['attributes'][$subindex] = array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-29 16:38:46
|
Revision: 4699
http://oscss.svn.sourceforge.net/oscss/?rev=4699&view=rev
Author: oscim
Date: 2013-01-29 16:38:40 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
coquille format mysql date strict
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-01-23 15:09:05 UTC (rev 4698)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-01-29 16:38:40 UTC (rev 4699)
@@ -123,7 +123,7 @@
/**
- TODO Couplage avec MLinkto + datatype actif
+ TODO Couplage avec MLinkto + datatype actif
*/
if(DataTypes::is_active('categorie')) {
/// Clean link product to categorie and save new link
@@ -153,10 +153,10 @@
);
}
-
+
/// Separate Pricing Per Customer
$customers_group_query = $DB->query("select customers_group_id, customers_group_name from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id != '0' order by customers_group_id");
// Gets all of the customers groups
@@ -263,7 +263,7 @@
tep_db_free_result($product_query);
/**
- TODO Couplage avec MLinkto + datatype actif
+ TODO Couplage avec MLinkto + datatype actif
*/
if(DataTypes::is_active('categorie')) {
$cat_query = $DB->query("select categories_id from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id='" . (int)tep_db_input($ID) . "' ");
@@ -461,7 +461,7 @@
$DB=Database::getInstance();
//! entretient
- $DB->query("update " . TABLE_PRODUCTS . " set products_date_available = '' where to_days(now()) > to_days(products_date_available)");
+ $DB->query("update " . TABLE_PRODUCTS . " set products_date_available = '1000-01-01 00:00:00' where to_days(now()) > to_days(products_date_available)");
//! Entretient liens avec description
$product_query = $DB->query("SELECT p.products_id FROM " . TABLE_PRODUCTS . " p LEFT OUTER JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd ON p.products_id =pd.products_id WHERE pd.products_id is null");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-23 15:09:13
|
Revision: 4698
http://oscss.svn.sourceforge.net/oscss/?rev=4698&view=rev
Author: oscim
Date: 2013-01-23 15:09:05 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
coquille notification dans les r?\195?\168gles specifique user en mode sql
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/notification.php
Modified: branches/2.1.1/catalog/common/classes/notification.php
===================================================================
--- branches/2.1.1/catalog/common/classes/notification.php 2013-01-22 09:20:45 UTC (rev 4697)
+++ branches/2.1.1/catalog/common/classes/notification.php 2013-01-23 15:09:05 UTC (rev 4698)
@@ -71,7 +71,7 @@
switch($item['chknotif_method']) {
case 'sql' :
- if((int)$item['chknotif_user'] == 0)
+ if((int)$item['chknotif_uniq'] == 0)
$DB->query($sql="INSERT INTO ".self::ADMIN_TABLE_NOTIF." (notif_id,notif_type,user_id,notif_key,notif_data,notif_text, notif_date) VALUES ('',0,'".(int)$item['chknotif_user']."', '".self::$key."','".tep_db_input($data)."','".tep_db_input($message_final['html'])."' ,now() ) " );
if((int)$item['chknotif_uniq'] == 1){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-22 09:20:51
|
Revision: 4697
http://oscss.svn.sourceforge.net/oscss/?rev=4697&view=rev
Author: oscim
Date: 2013-01-22 09:20:45 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
correction gestion listing publied / expected
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-01-22 09:15:29 UTC (rev 4696)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-01-22 09:20:45 UTC (rev 4697)
@@ -513,13 +513,14 @@
if((!in_array('publied', $array) && in_array('nopublied', $array) )|| isset($_GET['expected']) ){
$_SESSION['filters']['expected'] =array();
$_SESSION['filters']['expected']['nopublied'] = 'on';
- self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available >= NOW() ";
+ self::$InitInfo['adjust']['sWhere'] .=" AND ( products_date_available <>'' AND products_date_available >= NOW() ) ";
}
- elseif(in_array('publied', $array) && !in_array('nopublied', $array) )
- self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available <>'' ";
+ elseif(in_array('publied', $array) && !in_array('nopublied', $array) ){
+ $_SESSION['filters']['expected']['publied'] = 'on';
+ self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available <= NOW() ";
+ }
-
/**
@remarks filter based on status
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-22 09:15:36
|
Revision: 4696
http://oscss.svn.sourceforge.net/oscss/?rev=4696&view=rev
Author: oscim
Date: 2013-01-22 09:15:29 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
correction coquille creation produit si 1 seul type produit actif
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-01-16 15:01:14 UTC (rev 4695)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-01-22 09:15:29 UTC (rev 4696)
@@ -761,9 +761,9 @@
if(!tep_action_check('edit', self::FILENAME))
tep_redirect(tep_href_link(self::FILENAME));
- $typeID = (int)tep_db_prepare_input($_POST['products_virtual_type_id']);
+ $typeID = ( (isset($_POST['products_virtual_type_id']) && (int)$_POST['products_virtual_type_id'] > 0 )? (int)tep_db_prepare_input($_POST['products_virtual_type_id']) : 1 );
- $products_id=sqlproduct::create(array('type'=>$typeID, 'language_id'=>$typeID));
+ $products_id=sqlproduct::create(array('type'=>$typeID, 'language_id'=>$languages_id));
tep_redirect(tep_href_link(self::FILENAME, tep_get_all_get_params(array('action','cPath','pID'),false).'pID=' . $products_id.'&action=edit'));
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-16 15:01:23
|
Revision: 4695
http://oscss.svn.sourceforge.net/oscss/?rev=4695&view=rev
Author: oscim
Date: 2013-01-16 15:01:14 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/notification.php
branches/2.1.1/catalog/common/classes/order.php
trunk/language/en_EN/admin/includes/languages/en_EN/modules/cronjob/customers_birthday.txt
Modified: branches/2.1.1/catalog/common/classes/notification.php
===================================================================
--- branches/2.1.1/catalog/common/classes/notification.php 2013-01-03 10:36:44 UTC (rev 4694)
+++ branches/2.1.1/catalog/common/classes/notification.php 2013-01-16 15:01:14 UTC (rev 4695)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 06/04/2012, 17:28
+ @date 15/01/2013, 17:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class notification
@@ -41,9 +41,10 @@
/**
@remarks if not key exits in config , force put master admin
*/
- self::$conf[] = array('chknotif_method' => 'sql',
- 'chknotif_user'=> 1,
- 'chknotif_grp'=> 1,
+ self::$conf[] = array(
+ 'chknotif_method' => 'sql',
+ 'chknotif_user'=> 1,
+ 'chknotif_uniq'=> 1,
);
}
else
@@ -70,11 +71,11 @@
switch($item['chknotif_method']) {
case 'sql' :
- if((int)$item['chknotif_user'] > 0)
+ if((int)$item['chknotif_user'] == 0)
$DB->query($sql="INSERT INTO ".self::ADMIN_TABLE_NOTIF." (notif_id,notif_type,user_id,notif_key,notif_data,notif_text, notif_date) VALUES ('',0,'".(int)$item['chknotif_user']."', '".self::$key."','".tep_db_input($data)."','".tep_db_input($message_final['html'])."' ,now() ) " );
- if((int)$item['chknotif_grp'] > 0){
- $r = $DB->query("SELECT admin_id as id FROM ".TABLE_ADMIN." where admin_groups_id='".(int)$item['chknotif_grp']."' " );
+ if((int)$item['chknotif_uniq'] == 1){
+ $r = $DB->query("SELECT admin_id as id FROM ".TABLE_ADMIN." where admin_groups_id='".(int)$item['chknotif_user']."' " );
foreach($r->fetchAllAssoc() as $admin)
if((int)$item['chknotif_user'] !=(int)$admin['id'])
@@ -85,12 +86,11 @@
case 'email':
default:
- if((int)$item['chknotif_user'] > 0)
- $r=$DB->query("select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_id='".(int)$item['chknotif_user']."' " );
- elseif((int)$item['chknotif_grp'] > 0)
- $r=$DB->query("select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_groups_id='".(int)$item['chknotif_grp']."' " );
+ if((int)$item['chknotif_uniq'] == 0)
+ $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_id='".(int)$item['chknotif_user']."' " );
+ elseif((int)$item['chknotif_uniq'] == 1)
+ $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_groups_id='".(int)$item['chknotif_user']."' " );
-
foreach($r->fetchAllAssoc() as $admin)
if((int)$item['chknotif_user'] !=(int)$admin['id'])
tep_mail($admin['firstname'].' '.$admin['lastname'], $admin['email'], $subjet, $message_final, STORE_OWNER, EMAIL_FROM);
Modified: branches/2.1.1/catalog/common/classes/order.php
===================================================================
--- branches/2.1.1/catalog/common/classes/order.php 2013-01-03 10:36:44 UTC (rev 4694)
+++ branches/2.1.1/catalog/common/classes/order.php 2013-01-16 15:01:14 UTC (rev 4695)
@@ -228,14 +228,20 @@
'exchange_id' => $orders_products['products_exchanged_id'] );
$subindex = 0;
- $attributes_query = tep_db_query("select products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
+// $attributes_query = tep_db_query("select products_options_id, products_options_values_id, products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
+ $attributes_query = tep_db_query("select , products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
if (tep_db_num_rows($attributes_query)) {
while ($attributes = tep_db_fetch_array($attributes_query)) {
- $this->products[$index]['attributes'][$subindex] = array('option' => $attributes['products_options'],
- 'value' => $attributes['products_options_values'],
- 'prefix' => $attributes['price_prefix'],
- 'price' => $attributes['options_values_price']);
+ $this->products[$index]['attributes'][$subindex] = array(
+// 'option_id' => $attributes['products_options_id'],
+// 'value_id' => $attributes['products_options_values_id'],
+
+ 'option' => $attributes['products_options'],
+ 'value' => $attributes['products_options_values'],
+ 'prefix' => $attributes['price_prefix'],
+ 'price' => $attributes['options_values_price']);
+
$subindex++;
}
}
Modified: trunk/language/en_EN/admin/includes/languages/en_EN/modules/cronjob/customers_birthday.txt
===================================================================
--- trunk/language/en_EN/admin/includes/languages/en_EN/modules/cronjob/customers_birthday.txt 2013-01-03 10:36:44 UTC (rev 4694)
+++ trunk/language/en_EN/admin/includes/languages/en_EN/modules/cronjob/customers_birthday.txt 2013-01-16 15:01:14 UTC (rev 4695)
@@ -1,14 +1,26 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 26/03/11, 23:17
+ @version 2.1.1
+ @date 15/01/2013, 23:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-$lang['email subject']="%s Happy Birthday!" ;
-$lang['email content']="Dear %s '. " <br /><br /> "." From our records, we found your birthday That Is On %s. Therefor, we from '. STORE_NAME. " Would like to take this Opportunity wish you Happy Birthday! <br /><br /> MAY ALL YOUR DREAMS ** COMES TRUE! ** <br /> ** And buy more for less money ** <br /> We Hope that this little email Have lighten up your day (a little if not much) :-) <br /> Have a nice day and hope to see you again at '. STORE_NAME. '! <br /><br /><br /> Yours truly, '. STORE_OWNER. "N". STORE_NAME. '-'. HTTP_SERVER. DIR_WS_CATALOG. " <br />" ;
+$lang['@customers_birthday email subject']='Happy Birthday %s!';
+$lang['@customers_birthday email content']='Dear %s,'. "<br /><br />" .
+'From our records, we found that your birthday is on %s. Therefore, we from '.STORE_NAME.' would like take this opportunity to wish you Happy Birthday!!!<br /><br />
+
+ ** MAY ALL YOUR DREAMS COMES TRUE ! **<br />
+ ** and buy more for less money **<br />
+
+We hope that this little email have lighten up your day (a little if not much) :-)<br />
+
+Have a nice day and hope to see you again at '. STORE_NAME .'!<br />
+<br />
+<br />
+Yours truly,
+'.STORE_OWNER . "\n" . STORE_NAME . ' - ' . HTTP_SERVER . DIR_WS_CATALOG . "<br />";
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-03 10:36:51
|
Revision: 4694
http://oscss.svn.sourceforge.net/oscss/?rev=4694&view=rev
Author: oscim
Date: 2013-01-03 10:36:44 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
coquille dans la prise en charge ds extrafields product et checkbox multi
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/ExtraUtility.php
Modified: branches/2.1.1/catalog/common/classes/ExtraUtility.php
===================================================================
--- branches/2.1.1/catalog/common/classes/ExtraUtility.php 2013-01-03 08:23:44 UTC (rev 4693)
+++ branches/2.1.1/catalog/common/classes/ExtraUtility.php 2013-01-03 10:36:44 UTC (rev 4694)
@@ -175,11 +175,15 @@
case 7: // checkbox mutli
case 3: // checkbox
$cnt = 1; /*$name, $id='', $value = '', $parameters = '', $required = false, $type = 'text'*/
+ $input = '<ul>';
foreach($rows->values_list as $k=>$item) {
- $item = trim($item);
- $input .= '<span class="values">'. formUtility::draw_input_field('fields_' . $rows->id . '[' . $k.']','fields_' . $rows->id . '_' . $k, 'on', ( ( !empty($rows->input_value) &&in_array($k, (array)explode(',',$rows->input_value)))?' checked="checked" ': '' ), $rows->required_status , 'checkbox').$item. $flag_r.'</span>';
+ $input .= '<li>';
+ $input .= '<span class="values">'. formUtility::draw_input_field('fields_' . $rows->id . '[' . $k.']','fields_' . $rows->id . '_' . $k, 'on', ( ( !empty($rows->input_value) && in_array($k, (array)explode(',',$rows->input_value)))?' checked="checked" ': '' ), $rows->required_status , 'checkbox').$item. $flag_r.'</span>';
$rows->required_status = 0;
+ $input .= '</li>';
}
+
+ $input .= '</ul>';
$input .= tep_draw_hidden_field('fields_' . $rows->id . '_total' , $cnt);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-03 08:23:50
|
Revision: 4693
http://oscss.svn.sourceforge.net/oscss/?rev=4693&view=rev
Author: oscim
Date: 2013-01-03 08:23:44 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Fix
Modified Paths:
--------------
branches/2.1.1/catalog/install/includes/modele/htaccess.txt
Modified: branches/2.1.1/catalog/install/includes/modele/htaccess.txt
===================================================================
--- branches/2.1.1/catalog/install/includes/modele/htaccess.txt 2013-01-02 22:31:21 UTC (rev 4692)
+++ branches/2.1.1/catalog/install/includes/modele/htaccess.txt 2013-01-03 08:23:44 UTC (rev 4693)
@@ -117,18 +117,18 @@
# rule for error page
RewriteRule ^error/([0-9]*).html index.php?ServerError=$1 [L]
## Datatype - Data_diver## contact
- RewriteRule ^contact.(php|html)$ index.php?d=contact.php&%{QUERY_STRING} [L,QSA]
+ RewriteRule ^contact.(php|html)$ index.php?divers=contact.php&%{QUERY_STRING} [L,QSA]
## panier
- RewriteRule ^shopping_cart.(php|html)$ index.php?d=shopping_cart.php&%{QUERY_STRING} [L,QSA]
+ RewriteRule ^shopping_cart.(php|html)$ index.php?divers=shopping_cart.php&%{QUERY_STRING} [L,QSA]
## Move xxxx.php >> xxx.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- #Mode
+ #Mode
RewriteRule ^([a-zA-Z_]*).(php)$ d/$1/$1.html?&%{QUERY_STRING} [R=301]
-## Datatype - Data_home## Home
+## Datatype - Data_home## Home
- RewriteCond %{QUERY_STRING} =''
+ RewriteCond %{QUERY_STRING} =''
RewriteRule ^(([a-z]{2,3}_[A-Z]{2,3})/|)(index).(php|html)$ /oscss/trunk/catalog/ [R=301]
## Retro-compatibilité
## Account specific pages
@@ -145,40 +145,40 @@
## Datatype - Data_product
-RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/pi/([0-9]*)/(.*).html$ popup_image.php?pID=$2&%{QUERY_STRING} [L]
-RewriteRule ^pi/([0-9]*)/(.*).html$ popup_image.php?pID=$1&%{QUERY_STRING} [L]
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/pi/([0-9]*)/(.*).html$ popup_image.php?pID=$2&%{QUERY_STRING} [L]
+RewriteRule ^pi/([0-9]*)/(.*).html$ popup_image.php?pID=$1&%{QUERY_STRING} [L]
## Datatype - Data_product
-RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/p/([0-9]*)/(.*).html$ index.php?products_id=$2&%{QUERY_STRING} [L]
-RewriteRule ^p/([0-9]*)/(.*).html$ index.php?products_id=$1&%{QUERY_STRING} [L]
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/p/([0-9]*)/(.*).html$ index.php?products_id=$2&%{QUERY_STRING} [L]
+RewriteRule ^p/([0-9]*)/(.*).html$ index.php?products_id=$1&%{QUERY_STRING} [L]
## Datatype - Data_content
-RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/t/([0-9]*)/(.*).html$ index.php?content=$2&%{QUERY_STRING} [L]
-RewriteRule ^t/([0-9]*)/(.*).html$ index.php?content=$1&%{QUERY_STRING} [L]
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/t/([0-9]*)/(.*).html$ index.php?content=$2&%{QUERY_STRING} [L]
+RewriteRule ^t/([0-9]*)/(.*).html$ index.php?content=$1&%{QUERY_STRING} [L]
## Datatype - Data_diver
-RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/d/([A-Za-z0-9_]*)/(.*).html$ index.php?divers=$2&%{QUERY_STRING} [L]
-RewriteRule ^d/([A-Za-z0-9_]*)/(.*).html$ index.php?divers=$1&%{QUERY_STRING} [L]
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/d/([A-Za-z0-9_]*)/(.*).html$ index.php?divers=$2&%{QUERY_STRING} [L]
+RewriteRule ^d/([A-Za-z0-9_]*)/(.*).html$ index.php?divers=$1&%{QUERY_STRING} [L]
## Datatype - Data_categorie
-RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/c/([0-9_]*)/(.*).html$ index.php?cPath=$2&%{QUERY_STRING} [L]
-RewriteRule ^c/([0-9_]*)/(.*).html$ index.php?cPath=$1&%{QUERY_STRING} [L]
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/c/([0-9_]*)/(.*).html$ index.php?cPath=$2&%{QUERY_STRING} [L]
+RewriteRule ^c/([0-9_]*)/(.*).html$ index.php?cPath=$1&%{QUERY_STRING} [L]
## Datatype - Data_manufacturer
-RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$2&%{QUERY_STRING} [L]
-RewriteRule ^m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$1&%{QUERY_STRING} [L]
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$2&%{QUERY_STRING} [L]
+RewriteRule ^m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$1&%{QUERY_STRING} [L]
## Datatype - Data_home
-RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/h/%CHECK_0_%/(.*).html$ %PAGE_REPLACE_0_%?home=$2&%{QUERY_STRING} [L]
-RewriteRule ^h/%CHECK_0_%/(.*).html$ %PAGE_REPLACE_0_%?home=$1&%{QUERY_STRING} [L]
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/h/%CHECK_0_%/(.*).html$ %PAGE_REPLACE_0_%?home=$2&%{QUERY_STRING} [L]
+RewriteRule ^h/%CHECK_0_%/(.*).html$ %PAGE_REPLACE_0_%?home=$1&%{QUERY_STRING} [L]
## Datatype - Data_error
## Datatype - Data_diver
-## Datatype - Data_home
+## Datatype - Data_home
</IfModule>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-02 22:31:27
|
Revision: 4692
http://oscss.svn.sourceforge.net/oscss/?rev=4692&view=rev
Author: oscim
Date: 2013-01-02 22:31:21 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Fix bug valeur de liste dans les extra
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modprodextra.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php 2013-01-02 15:24:57 UTC (rev 4691)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php 2013-01-02 22:31:21 UTC (rev 4692)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 22/02/12, 08:07
+ @date 03/01/2013, 08:07
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class sqlproductsextrafields
@@ -454,6 +454,20 @@
/**
+ @brief
+ @return array product empty
+ */
+ public static function GetNewId($epf_id){
+ $DB=Database::getInstance();
+ $sql="SELECT MAX(value_id) as id FROM " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " a WHERE epf_id ='".(int)$epf_id."' GROUP BY languages_id LIMIT 1 ";
+ $query= $DB->query($sql);
+ $res = $query->fetchAssoc();
+
+ return ( (int) tep_db_prepare_input($res['id']) + 1 );
+ }
+
+
+ /**
@brief create new ligne in table configuration
*/
public static function create($option){
@@ -462,14 +476,11 @@
if(!isset($option['epf_id']))
return 'epf_id';
- $DB=Database::getInstance();
- $sql="SELECT COUNT(*) as id FROM " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " a WHERE epf_id ='".(int)$option['epf_id']."' GROUP BY languages_id ";
- $query = $DB->query($sql);
- $res = $query->fetchAssoc();
+ if(!isset($option['value_id']))
+ $sql_data_array['value_id'] =self::GetNewId($option['epf_id']);
+ else
+ $sql_data_array['value_id'] = (int) tep_db_prepare_input($option['value_id']) ;
-
- $sql_data_array['value_id'] = ( (int) tep_db_prepare_input($res['id']) + 1 );
-
$sql_data_array['epf_id'] = tep_db_prepare_input($option['epf_id']);
$sql_data_array['languages_id'] =(isset($option['languages_id']))? tep_db_prepare_input($option['languages_id']) : 0;
Modified: branches/2.1.1/catalog/admin/includes/modules/configuration/modprodextra.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/configuration/modprodextra.php 2013-01-02 15:24:57 UTC (rev 4691)
+++ branches/2.1.1/catalog/admin/includes/modules/configuration/modprodextra.php 2013-01-02 22:31:21 UTC (rev 4692)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 08/02/2012, 15:38
+ @date 03/01/2013, 15:38
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class modprodextra
@@ -372,7 +372,9 @@
case 'value_insert':
$fields=sqlproductsextrafields::fetch(array('id'=>(int)self::$eid ), true);
- sqlproductsextrafields::fetch(array('id'=> (int)self::$eid ));
+
+ $nid= sqlproductsextrafieldsvalues::GetNewId(self::$eid) ;
+
if($fields->active_value_language) {
$languages = tep_get_languages(false, false);
for ($i=0, $n=sizeof($languages); $i<$n; $i++){
@@ -382,6 +384,7 @@
'languages_id'=> $languages[$i]['id'],
'epf_id' => (int)self::$eid,
'parent_id' => (int)0,
+ 'value_id' => (int)$nid,
);
$r=sqlproductsextrafieldsvalues::create($data_array);
}
@@ -393,6 +396,7 @@
'languages_id'=> 0,
'epf_id' => (int)self::$eid,
'parent_id' => (int)0,
+ 'value_id' => (int)$nid,
);
$r=sqlproductsextrafieldsvalues::create($data_array);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-02 15:25:04
|
Revision: 4691
http://oscss.svn.sourceforge.net/oscss/?rev=4691&view=rev
Author: oscim
Date: 2013-01-02 15:24:57 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
coquille erreur fatal php
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-02 08:35:23 UTC (rev 4690)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-02 15:24:57 UTC (rev 4691)
@@ -127,8 +127,16 @@
if ( tep_mail($mymessage['to_name'], $mymessage['to_email_address'], $mymessage['email_subject'], $message_final, $mymessage['from_email_name'], @$mymessage['from_email_address']) !=false) {
//save mail in email docs
- $HM = HistoryMail::getInstance();
- $mInfo = $HM->AddMail($mail['customers_id'], $mail['customers_firstname'].' '.$mail['customers_lastname'], $mail['customers_email_address', $from, $mail_sent_to , $subject,$content);
+ $HM2 = HistoryMail::getInstance();
+ $HM2->AddMail(
+ $mail['customers_id'],
+ $mail['customers_firstname'].' '.$mail['customers_lastname'] ,
+ $mail['customers_email_address'],
+ $from,
+ $mail_sent_to ,
+ $subject,
+ $content
+ );
$err[]=true;
}
@@ -151,8 +159,6 @@
case 'usemod':
-
-// self::$list
$id = tep_db_prepare_input($_REQUEST['id']);
switch ($_REQUEST['mod']) {
@@ -222,11 +228,9 @@
break;
}
- return false;
}
public function display_view(){
-// $this->check_action(@$_REQUEST['action']);
switch (self::$action) {
case 'view':
$this->load_db_values('');
@@ -239,7 +243,6 @@
default:
return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.create');
}
-
}
/** Specific module */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-02 08:35:33
|
Revision: 4690
http://oscss.svn.sourceforge.net/oscss/?rev=4690&view=rev
Author: oscim
Date: 2013-01-02 08:35:23 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
changement des date des samples
Modified Paths:
--------------
branches/2.1.1/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
Modified: branches/2.1.1/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
===================================================================
--- branches/2.1.1/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2013-01-02 08:34:10 UTC (rev 4689)
+++ branches/2.1.1/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2013-01-02 08:35:23 UTC (rev 4690)
@@ -42,7 +42,7 @@
TRUNCATE TABLE osc_customers_info;
INSERT INTO osc_customers_info (customers_info_id, customers_info_date_of_last_logon, customers_info_number_of_logons, customers_info_date_account_created, customers_info_date_account_last_modified) VALUES
-(1, '2011-07-31 09:07:26', 6, '2011-07-24 12:34:55', '2011-07-24 12:42:20');
+(1, '2012-07-31 09:07:26', 6, '2012-07-24 12:34:55', '2012-07-24 12:42:20');
@@ -50,26 +50,26 @@
TRUNCATE TABLE osc_orders;
INSERT INTO osc_orders (orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value, ip_address, class_payment) VALUES
(4, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
-'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement par chèque', '', '', '', '', '2011-07-24 13:11:36',
-'2011-06-24 12:36:40', 4, NULL, 'EUR', 1.000000, '127.0.0.1','moneyorder'),
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement par chèque', '', '', '', '', '2012-07-24 13:11:36',
+'2012-06-24 12:36:40', 4, NULL, 'EUR', 1.000000, '127.0.0.1','moneyorder'),
(5, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
-'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:34:05',
-'2011-07-24 12:45:35', 4, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2012-07-28 16:34:05',
+'2012-07-24 12:45:35', 4, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
(9, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
-'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2011-07-28
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2012-07-28
15:42:27', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
(10, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
-'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2011-07-28
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2012-07-28
15:50:17', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
(11, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
-'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:35:57',
-'2011-07-28 16:01:14', 3, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2012-07-28 16:35:57',
+'2012-07-28 16:01:14', 3, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
(12, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
-'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:35:37',
-'2011-07-28 16:02:55', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2012-07-28 16:35:37',
+'2012-07-28 16:02:55', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
(13, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
-'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-31 10:19:59',
-'2011-07-31 09:13:14', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod');
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2012-07-31 10:19:59',
+'2012-07-31 09:13:14', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod');
TRUNCATE TABLE osc_orders_products;
INSERT INTO osc_orders_products (orders_products_id, orders_id, products_id, products_model, products_name, products_price, final_price, products_tax, products_quantity) VALUES
@@ -84,19 +84,19 @@
TRUNCATE TABLE osc_orders_status_history;
INSERT INTO osc_orders_status_history (orders_status_history_id, orders_id, orders_status_id, date_added, customer_notified, comments) VALUES
-(5, 4, 1, '2011-07-24 12:36:40', 1, ''),
-(6, 4, 3, '2011-07-24 12:41:11', 1, ''),
-(7, 5, 1, '2011-07-24 12:45:35', 1, ''),
-(13, 4, 4, '2011-07-24 13:12:37', 1, ''),
-(14, 9, 1, '2011-07-28 15:42:27', 1, ''),
-(15, 10, 1, '2011-07-28 15:50:17', 1, ''),
-(16, 11, 1, '2011-07-28 16:01:14', 1, ''),
-(17, 12, 1, '2011-07-28 16:02:55', 1, ''),
-(18, 5, 4, '2011-07-28 16:35:07', 1, ''),
-(19, 12, 2, '2011-07-28 16:35:37', 0, ''),
-(20, 11, 3, '2011-07-28 16:35:57', 0, ''),
-(21, 13, 1, '2011-07-31 09:13:14', 1, ''),
-(22, 13, 2, '2011-07-31 10:19:59', 0, '');
+(5, 4, 1, '2012-07-24 12:36:40', 1, ''),
+(6, 4, 3, '2012-07-24 12:41:11', 1, ''),
+(7, 5, 1, '2012-07-24 12:45:35', 1, ''),
+(13, 4, 4, '2012-07-24 13:12:37', 1, ''),
+(14, 9, 1, '2012-07-28 15:42:27', 1, ''),
+(15, 10, 1, '2012-07-28 15:50:17', 1, ''),
+(16, 11, 1, '2012-07-28 16:01:14', 1, ''),
+(17, 12, 1, '2012-07-28 16:02:55', 1, ''),
+(18, 5, 4, '2012-07-28 16:35:07', 1, ''),
+(19, 12, 2, '2012-07-28 16:35:37', 0, ''),
+(20, 11, 3, '2012-07-28 16:35:57', 0, ''),
+(21, 13, 1, '2012-07-31 09:13:14', 1, ''),
+(22, 13, 2, '2012-07-31 10:19:59', 0, '');
TRUNCATE TABLE osc_orders_total;
INSERT INTO osc_orders_total (orders_total_id, orders_id, title, text, value, class, sort_order) VALUES
@@ -135,7 +135,7 @@
(5, 6, '', '30mm.jpg', 330.2676, NOW(), NULL, 180.00, 1, 2, 4, 2),
(6, 15, 'D40x', 'D40x.jpg', 700.0000, NOW(), NULL, 0.60, 1, 1, 3, 0),
(10, 3, 'E-520', 'olympus-E-520.jpg', 751.6722, NOW(), NULL, 0.00, 1, 2, 0, 2),
-(11, 0, '', 'DSCH9B.jpg', 376.2542, NOW(), '2011-01-01 00:00:00', 0.00, 1, 2, 1, 0),
+(11, 0, '', 'DSCH9B.jpg', 376.2542, NOW(), '2012-01-01 00:00:00', 0.00, 1, 2, 1, 0),
(12, 0, '', 'p_12/iphone-bleu.jpg', 6.44, NOW(), NULL, 0.00, 1, 2, 1, 0),
(13, 0, '', 'p_13/coque-arriere-bleue-electrique-unie-pour-iphone-3g.jpg', 19.56 , NOW(), NULL, 0.00, 1, 2, 1, 0);
@@ -196,21 +196,21 @@
INSERT INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) VALUES
-('Store Pickup Cost', 'MODULE_SHIPPING_SPU_COST', '0.00', 'Preciser le cout', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44', NULL, NULL, 2),
-('Shipping Zone', 'MODULE_SHIPPING_SPU_ZONE', '0', 'If a zone is selected, only enable this shipping method for that zone.', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44',
+('Store Pickup Cost', 'MODULE_SHIPPING_SPU_COST', '0.00', 'Preciser le cout', 6, 0, '1000-01-01 00:00:00', '2012-12-12 11:49:44', NULL, NULL, 2),
+('Shipping Zone', 'MODULE_SHIPPING_SPU_ZONE', '0', 'If a zone is selected, only enable this shipping method for that zone.', 6, 0, '1000-01-01 00:00:00', '2012-12-12 11:49:44',
'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_shipping(', 2),
-('Sort order', 'MODULE_SHIPPING_SPU_SORT_ORDER', '0', 'Preciser un nombre pour le tri', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44', NULL, NULL, 2),
-('choose icon', 'MODULE_SHIPPING_SPU_ICON', '', 'choose icon transporteur', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44', NULL, 'tep_cfg_choose_img(', 2),
+('Sort order', 'MODULE_SHIPPING_SPU_SORT_ORDER', '0', 'Preciser un nombre pour le tri', 6, 0, '1000-01-01 00:00:00', '2012-12-12 11:49:44', NULL, NULL, 2),
+('choose icon', 'MODULE_SHIPPING_SPU_ICON', '', 'choose icon transporteur', 6, 0, '1000-01-01 00:00:00', '2012-12-12 11:49:44', NULL, 'tep_cfg_choose_img(', 2),
('Store Pick Up Zip Code Allowed', 'MODULE_SHIPPING_SPU_ZIP', '01, 07, 26, 38, 42, 69, 74', 'Departement autorisé pour le retrait magasin ? laisser vide si vous ne l''utilisez pas', 6, 0, '1000-01-01
-00:00:00', '2011-12-12 11:49:44', NULL, NULL, 0),
-('Payable à...', 'MODULE_PAYMENT_MONEYORDER_PAYTO', '', 'A qu''elle ordre doit être effectue le paiement ?', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:50:48', NULL, NULL, 2),
-('Ordre de tri', 'MODULE_PAYMENT_MONEYORDER_SORT_ORDER', '0', 'Ordre de tri pour l''affichage (Le plus petit nombre est montré en premier).', 6, 1, '1000-01-01 00:00:00', '2011-12-12 11:50:48', NULL,
+00:00:00', '2012-12-12 11:49:44', NULL, NULL, 0),
+('Payable à...', 'MODULE_PAYMENT_MONEYORDER_PAYTO', '', 'A qu''elle ordre doit être effectue le paiement ?', 6, 0, '1000-01-01 00:00:00', '2012-12-12 11:50:48', NULL, NULL, 2),
+('Ordre de tri', 'MODULE_PAYMENT_MONEYORDER_SORT_ORDER', '0', 'Ordre de tri pour l''affichage (Le plus petit nombre est montré en premier).', 6, 1, '1000-01-01 00:00:00', '2012-12-12 11:50:48', NULL,
NULL, 2),
-('Zone de paiement', 'MODULE_PAYMENT_MONEYORDER_ZONE', '0', 'Permettre seulement cette méthode de paiement pour la zone choisie.', 6, 2, '1000-01-01 00:00:00', '2011-12-12 11:50:48',
+('Zone de paiement', 'MODULE_PAYMENT_MONEYORDER_ZONE', '0', 'Permettre seulement cette méthode de paiement pour la zone choisie.', 6, 2, '1000-01-01 00:00:00', '2012-12-12 11:50:48',
'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_classes(', 2),
-('Etat de la commande', 'MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID', '0', 'Sélectionner l''état de la commande que vous voulez par défault.', 6, 1, '1000-01-01 00:00:00', '2011-12-12 11:50:48',
+('Etat de la commande', 'MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID', '0', 'Sélectionner l''état de la commande que vous voulez par défault.', 6, 1, '1000-01-01 00:00:00', '2012-12-12 11:50:48',
'tep_get_order_status_name', 'tep_cfg_pull_down_order_statuses(', 2),
-('Icone pour ce mode paiement', 'MODULE_PAYMENT_MONEYORDER_ICON', '', 'Choix d''un icone', 6, 5, '1000-01-01 00:00:00', '2011-12-12 11:50:48', NULL, 'tep_cfg_choose_img(', 2);
+('Icone pour ce mode paiement', 'MODULE_PAYMENT_MONEYORDER_ICON', '', 'Choix d''un icone', 6, 5, '1000-01-01 00:00:00', '2012-12-12 11:50:48', NULL, 'tep_cfg_choose_img(', 2);
@@ -220,39 +220,39 @@
INSERT INTO osc_images ( pathkey, path, file, date_added, last_modified, width, height, ext) VALUES
-( '692b75fc6312e428109e1f9312cfa007', 'images/sony.png', 'sony.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
-( 'cba0825cec275d062a22572011c55c48', 'images/D40x.jpg', 'D40x.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 841, 650, 'jpeg'),
-( '1428461c2fbbda057c8cf141de435d45', 'images/DSCH9B.jpg', 'DSCH9B.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 822, 650, 'jpeg'),
-( 'ad9b13002826c62e10ce88bb3325e1fa', 'images/button_css.png', 'button_css.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 80, 15, 'png'),
-( 'fd195081dcd1aa7e55d3409e4c8c2b44', 'images/DMC-TZ3.gif', 'DMC-TZ3.gif', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 737, 451, 'gif'),
-( 'e5667b755cc7ca2cfb446319efb92878', 'images/468x300.jpg', '468x300.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 468, 300, 'jpeg'),
-( '8a84ddf6b907236b8c87f6d50111a397', 'images/photo.png', 'photo.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
-( 'd43807d8efdc590ded970cf6b2df5658', 'images/bridges.png', 'bridges.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
-( '2c35f34d0373c4747c0f14171da4d944', 'images/sigma30.jpg', 'sigma30.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 841, 650, 'jpeg'),
-( '478ca7c72b5a8e8e9dca0ebeca570059', 'images/panasonic.png', 'panasonic.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
-( 'b0bdb156e36066a634457448cb2301cb', 'images/olympus-E-520.jpg', 'olympus-E-520.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 1024, 795, 'jpeg'),
-( '345c0cec9e3b0ea285da9dbbca5ae093', 'images/nikon.png', 'nikon.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
-( '017a443b6093e3b4d138f30179c80354', 'images/DSCH7B.jpg', 'DSCH7B.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 778, 650, 'jpeg'),
-('5a4fce8c868d28990e9d6cf57326a958', 'images/accessoires.png', 'accessoires.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
-( 'b2cd4337bf8d2d0861e478bf7e833d90', 'images/30mm.jpg', '30mm.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 350, 350, 'jpeg'),
-('d55a7ce89f641bd5e39e46f39e2ad559', 'images/sigma.png', 'sigma.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
-( 'acd4ad69d227f17902332bfc3b1ca1e6', 'images/app-photo.png', 'app-photo.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
-( '7d7bd4981e1ab23f18067e40495ecddb', 'images/COOLPIXL15.jpg', 'COOLPIXL15.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 400, 292, 'jpeg'),
-( 'e653824668488c73890a77350cc9c450', 'images/compact.png', 'compact.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
-('d8cf1c5c40870adcddb3f5a5afee2da1', 'images/bridges_et_plus23.png', 'bridges_et_plus23.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
-( '649cbde995d4e82d6f6ef1c686ef7561', 'images/p_12/iphone-aluminium.jpg', 'iphone-aluminium.jpg', '2011-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
-( '81c68028687b103b44c03a7b21f42cf2', 'images/p_12/iphone-vert.jpg', 'iphone-vert.jpg', '2011-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
-( '3153e3a8447b580a8272905d10152713', 'images/p_12/iphone-rose.jpg', 'iphone-rose.jpg', '2011-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
-( '47abc5d5b15bc8ce6e84e342f4b8a9f4', 'images/p_12/iphone-bleu.jpg', 'iphone-bleu.jpg', '2011-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
-( '34b7a7fb61bb4b25f1b410c8a6ac0a87', 'images/p_13/coque-arriere-bordeau-unie-pour-iphone-3g.jpg', 'coque-arriere-bordeau-unie-pour-iphone-3g.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
-( 'ee28019cfd588ef6bc02f04d3d002bc7', 'images/p_13/coque-arriere-blanche-unie-pour-iphone-3g.jpg', 'coque-arriere-blanche-unie-pour-iphone-3g.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
-( 'dea108b9194d7ac9c70ce3b840adbf46', 'images/p_13/coque-arriere-bleue-electrique-unie-pour-iphone-3g.jpg', 'coque-arriere-bleue-electrique-unie-pour-iphone-3g.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 129, 129, 'jpeg'),
-( 'c1a4e711570f3e589f56f2a5a5a4362a', 'images/p_13/coque-arriere-bordeau-unie-pour-iphone-3g_2.jpg', 'coque-arriere-bordeau-unie-pour-iphone-3g_2.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
-( '8de43d827b591ae265f3c6c71e7e3c40', 'images/p_13/coque-arriere-noire-unie-pour-iphone-3g.jpg', 'coque-arriere-noire-unie-pour-iphone-3g.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
-( '001522209aebcddc5ef95598e26722b2', 'images/p_13/coque-arriere-grise-unie-pour-iphone-3g.jpg', 'coque-arriere-grise-unie-pour-iphone-3g.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
-( 'c49ae313c0684502ee35541c1d88af6e', 'images/p_13/coque-arriere-fushia-unie-pour-iphone-3g.jpg', 'coque-arriere-fushia-unie-pour-iphone-3g.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
-( '18d02e616e395feda6123b598b360806', 'images/p_13/coque-arriere-noire-unie-pour-iphone-3g_2.jpg', 'coque-arriere-noire-unie-pour-iphone-3g_2.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
-( 'e05ff8069cc2f06ede64c5dc3180c813', 'images/p_13/coque-arriere-grise-unie-pour-iphone-3g_2.jpg', 'coque-arriere-grise-unie-pour-iphone-3g_2.jpg', '2011-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( '692b75fc6312e428109e1f9312cfa007', 'images/sony.png', 'sony.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
+( 'cba0825cec275d062a22572011c55c48', 'images/D40x.jpg', 'D40x.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 841, 650, 'jpeg'),
+( '1428461c2fbbda057c8cf141de435d45', 'images/DSCH9B.jpg', 'DSCH9B.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 822, 650, 'jpeg'),
+( 'ad9b13002826c62e10ce88bb3325e1fa', 'images/button_css.png', 'button_css.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 80, 15, 'png'),
+( 'fd195081dcd1aa7e55d3409e4c8c2b44', 'images/DMC-TZ3.gif', 'DMC-TZ3.gif', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 737, 451, 'gif'),
+( 'e5667b755cc7ca2cfb446319efb92878', 'images/468x300.jpg', '468x300.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 468, 300, 'jpeg'),
+( '8a84ddf6b907236b8c87f6d50111a397', 'images/photo.png', 'photo.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
+( 'd43807d8efdc590ded970cf6b2df5658', 'images/bridges.png', 'bridges.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
+( '2c35f34d0373c4747c0f14171da4d944', 'images/sigma30.jpg', 'sigma30.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 841, 650, 'jpeg'),
+( '478ca7c72b5a8e8e9dca0ebeca570059', 'images/panasonic.png', 'panasonic.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
+( 'b0bdb156e36066a634457448cb2301cb', 'images/olympus-E-520.jpg', 'olympus-E-520.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 1024, 795, 'jpeg'),
+( '345c0cec9e3b0ea285da9dbbca5ae093', 'images/nikon.png', 'nikon.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
+( '017a443b6093e3b4d138f30179c80354', 'images/DSCH7B.jpg', 'DSCH7B.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 778, 650, 'jpeg'),
+('5a4fce8c868d28990e9d6cf57326a958', 'images/accessoires.png', 'accessoires.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
+( 'b2cd4337bf8d2d0861e478bf7e833d90', 'images/30mm.jpg', '30mm.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 350, 350, 'jpeg'),
+('d55a7ce89f641bd5e39e46f39e2ad559', 'images/sigma.png', 'sigma.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
+( 'acd4ad69d227f17902332bfc3b1ca1e6', 'images/app-photo.png', 'app-photo.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
+( '7d7bd4981e1ab23f18067e40495ecddb', 'images/COOLPIXL15.jpg', 'COOLPIXL15.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 400, 292, 'jpeg'),
+( 'e653824668488c73890a77350cc9c450', 'images/compact.png', 'compact.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
+('d8cf1c5c40870adcddb3f5a5afee2da1', 'images/bridges_et_plus23.png', 'bridges_et_plus23.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 300, 'png'),
+( '649cbde995d4e82d6f6ef1c686ef7561', 'images/p_12/iphone-aluminium.jpg', 'iphone-aluminium.jpg', '2012-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
+( '81c68028687b103b44c03a7b21f42cf2', 'images/p_12/iphone-vert.jpg', 'iphone-vert.jpg', '2012-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
+( '3153e3a8447b580a8272905d10152713', 'images/p_12/iphone-rose.jpg', 'iphone-rose.jpg', '2012-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
+( '47abc5d5b15bc8ce6e84e342f4b8a9f4', 'images/p_12/iphone-bleu.jpg', 'iphone-bleu.jpg', '2012-12-26 23:40:35', '0000-00-00 00:00:00', 143, 121, 'jpeg'),
+( '34b7a7fb61bb4b25f1b410c8a6ac0a87', 'images/p_13/coque-arriere-bordeau-unie-pour-iphone-3g.jpg', 'coque-arriere-bordeau-unie-pour-iphone-3g.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( 'ee28019cfd588ef6bc02f04d3d002bc7', 'images/p_13/coque-arriere-blanche-unie-pour-iphone-3g.jpg', 'coque-arriere-blanche-unie-pour-iphone-3g.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( 'dea108b9194d7ac9c70ce3b840adbf46', 'images/p_13/coque-arriere-bleue-electrique-unie-pour-iphone-3g.jpg', 'coque-arriere-bleue-electrique-unie-pour-iphone-3g.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 129, 129, 'jpeg'),
+( 'c1a4e711570f3e589f56f2a5a5a4362a', 'images/p_13/coque-arriere-bordeau-unie-pour-iphone-3g_2.jpg', 'coque-arriere-bordeau-unie-pour-iphone-3g_2.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( '8de43d827b591ae265f3c6c71e7e3c40', 'images/p_13/coque-arriere-noire-unie-pour-iphone-3g.jpg', 'coque-arriere-noire-unie-pour-iphone-3g.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( '001522209aebcddc5ef95598e26722b2', 'images/p_13/coque-arriere-grise-unie-pour-iphone-3g.jpg', 'coque-arriere-grise-unie-pour-iphone-3g.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( 'c49ae313c0684502ee35541c1d88af6e', 'images/p_13/coque-arriere-fushia-unie-pour-iphone-3g.jpg', 'coque-arriere-fushia-unie-pour-iphone-3g.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( '18d02e616e395feda6123b598b360806', 'images/p_13/coque-arriere-noire-unie-pour-iphone-3g_2.jpg', 'coque-arriere-noire-unie-pour-iphone-3g_2.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
+( 'e05ff8069cc2f06ede64c5dc3180c813', 'images/p_13/coque-arriere-grise-unie-pour-iphone-3g_2.jpg', 'coque-arriere-grise-unie-pour-iphone-3g_2.jpg', '2012-12-26 23:40:37', '0000-00-00 00:00:00', 300, 300, 'jpeg'),
('fdd73a33e2e66ee65f103086575b3f4c', 'images/Olympus-520/E520-back.jpg', 'E520-back.jpg', '2012-03-27 20:46:42', '0000-00-00 00:00:00', 900, 631, 'jpeg'),
('92f9aa2b41c72734d3dadeb07f655258', 'images/Olympus-520/E520.jpg', 'E520.jpg', '2012-03-27 20:46:42', '0000-00-00 00:00:00', 900, 633, 'jpeg'),
('aed3aa2c0d25461fe02e4689785eacc9', 'images/Olympus-520/E520-top.jpg', 'E520-top.jpg', '2012-03-27 20:46:42', '0000-00-00 00:00:00', 900, 700, 'jpeg');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-02 08:34:17
|
Revision: 4689
http://oscss.svn.sourceforge.net/oscss/?rev=4689&view=rev
Author: oscim
Date: 2013-01-02 08:34:10 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
coquille
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt
branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt 2013-01-01 17:06:29 UTC (rev 4688)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt 2013-01-02 08:34:10 UTC (rev 4689)
@@ -1,16 +1,21 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 01/11/11, 20:01
+ @date 02/01/2013, 20:01
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$lang['history text title']="Liste des évènements d'un client" ;
$lang['history text description']="Liste les évènements d'un client" ;
+/* filtre */
+$lang['@history table heading orders count']="nbr de cmd." ;
+
+
+
$lang['history tab']="Suivi" ;
$lang['history table heading type']="Type" ;
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-01 17:06:29 UTC (rev 4688)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-02 08:34:10 UTC (rev 4689)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 07/05/2012, 14:46
+ @date 02/01/2013, 14:46
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class mail
@@ -19,7 +19,7 @@
public static $action;
/**
- @var object detail content page
+ @var object detail content page
*/
public static $list;
/**
@@ -126,24 +126,13 @@
if ( tep_mail($mymessage['to_name'], $mymessage['to_email_address'], $mymessage['email_subject'], $message_final, $mymessage['from_email_name'], @$mymessage['from_email_address']) !=false) {
- //save mail in email docs
- $DF = new DatasFiles;
+ //save mail in email docs
+ $HM = HistoryMail::getInstance();
+ $mInfo = $HM->AddMail($mail['customers_id'], $mail['customers_firstname'].' '.$mail['customers_lastname'], $mail['customers_email_address', $from, $mail_sent_to , $subject,$content);
- $file=$DF->GetDoc('email',$mail['customers_id']);
-
- $res = file_put_contents($file.'.'.'U'.'.'.base64_encode($subject), "From: ".$from." <".$mail_sent_to.">
- To: ".$mail['customers_firstname'].' '.$mail['customers_lastname'] ." <".$mail['customers_email_address'].">
- Subject: =?UTF-8?Q?".utf8_decode($subject)."?=
- Date: ".date(DATE_RFC822)."\r\n".
- "Message-ID: <".md5($content)."@".str_replace(' ','-',STORE_NAME).">
- User-Agent: osCSS-2
- MIME-Version: 1.0
- Content-Type: text/plain; charset=\"UTF-8\" \r\n
- ".$content."\r\n"."\r\n");
-
$err[]=true;
}
- else
+ else
$err[$mymessage['to_email_address']]=false;
}
@@ -208,7 +197,7 @@
public function get_header(){ return false; }
- public static function load_db_values($ID){
+ public static function load_db_values($ID){
switch (self::$action) {
case 'view':
@@ -232,8 +221,8 @@
self::$mInfo->customers =sqlcustomer::fetch(array('id'=>$_GET['cID']), true);
break;
}
-
- return false;
+
+ return false;
}
public function display_view(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-01 17:06:35
|
Revision: 4688
http://oscss.svn.sourceforge.net/oscss/?rev=4688&view=rev
Author: oscim
Date: 2013-01-01 17:06:29 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab
branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
Modified: branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2013-01-01 14:26:27 UTC (rev 4687)
+++ branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2013-01-01 17:06:29 UTC (rev 4688)
@@ -17,6 +17,7 @@
<div id="tabs">
<ul>
<li><a href="#tabs-1"><?php echo __('@featureds tab specification'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('@featureds tab childs'); ?></a></li>
</ul>
<div class="edit">
@@ -78,6 +79,14 @@
<br class="clear" />
</div>
+
+ <div id="tabs-2" class="tabPage">
+
+
+
+ <br class="clear" />
+ </div>
+
</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab 2013-01-01 14:26:27 UTC (rev 4687)
+++ branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab 2013-01-01 17:06:29 UTC (rev 4688)
@@ -19,7 +19,7 @@
<div class="button_nav">
<a class="button" href="<?php echo tep_href_link(FILENAME_CUSTOMERS,'action=noedit&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail customers fiche') ?></a>
<a class="button" href="<?php echo tep_href_link(FILENAME_CUSTOMERS,'action=edit&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail customers edit') ?></a>
- <a class="button " href="<?php echo tep_href_link(mail::FILENAME,'action=create&customers=') ?>"><?php echo __('@mail new message') ?></a>
+ <a class="button " href="<?php echo tep_href_link(mail::FILENAME,'action=create&customers='.mail::$mInfo->customers->email_address) ?>"><?php echo __('@mail new message') ?></a>
</div>
<table class="dataTable">
@@ -34,7 +34,7 @@
<?php foreach(mail::$mInfo->list as $item){ ?>
<tr class="view parent dataTableRow" >
<td><strong><?php echo $item->date; ?></strong></td>
- <td><strong><?php echo $item->sens; ?></strong></td>
+ <td><?php echo $item->sens; ?></td>
<td >
<!-- <span class="view fils fright"> -->
<?php echo $item->linkdoc; ?>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab 2013-01-01 14:26:27 UTC (rev 4687)
+++ branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab 2013-01-01 17:06:29 UTC (rev 4688)
@@ -21,7 +21,7 @@
<div class="box_uniq">
<div class="button_nav">
<a class="button" href="<?php echo tep_href_link(mail::FILENAME,'action=list&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail list message customers') ?></a>
- <a class="button" href="<?php echo tep_href_link(mail::FILENAME,'action=reply&customers='.mail::$mInfo->customers->email_address) ?>"><?php echo __('@mail reply message') ?></a>
+ <a class="button" href="<?php echo tep_href_link(mail::FILENAME,'action=reply&customers='.mail::$mInfo->customers->email_address.'&ID='.$_GET['ID']) ?>"><?php echo __('@mail reply message') ?></a>
</div>
<div class="edit">
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-01 14:26:27 UTC (rev 4687)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-01 17:06:29 UTC (rev 4688)
@@ -212,33 +212,24 @@
switch (self::$action) {
case 'view':
-// $DF = new DatasFiles;
-// $file=$DF->GetDoc('email',$_GET['cID']);
-//
-// self::$mInfo->pathfile = dirname($file).'/'.$_GET['ID'];
-//
-// $tmp = file_get_contents(self::$mInfo->pathfile);
-//
-// $tmp2=explode('Content-Type: text/plain; charset="UTF-8"', $tmp );
-// // var_dump($tmp2[1]);
-// self::$mInfo->content = $tmp2[1];
$HM = HistoryMail::getInstance();
self::$mInfo = new stdClass();
+ $customer = sqlcustomer::fetch(array('id'=>$_GET['cID']), true);
self::$mInfo = $HM->ViewMail($_GET['cID'], $_GET['ID']);
-
self::$mInfo->customers =sqlcustomer::fetch(array('id'=>$_GET['cID']), true);
-// self::$mInfo->content = $tmp->content
-
break;
case 'list':
$HM = HistoryMail::getInstance();
self::$mInfo = new stdClass();
+ $customer = sqlcustomer::fetch(array('id'=>$_GET['cID']));
self::$mInfo->list = $HM->ListUserDir($_GET['cID']);
+
+ self::$mInfo->customers =sqlcustomer::fetch(array('id'=>$_GET['cID']), true);
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-01 14:26:38
|
Revision: 4687
http://oscss.svn.sourceforge.net/oscss/?rev=4687&view=rev
Author: oscim
Date: 2013-01-01 14:26:27 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
ajustement du selecteur d'historisation des mails par client
Modified Paths:
--------------
branches/2.1.1/catalog/install/includes/modele/admin_configure.txt
branches/2.1.1/catalog/install/includes/modele/configure.txt
Modified: branches/2.1.1/catalog/install/includes/modele/admin_configure.txt
===================================================================
--- branches/2.1.1/catalog/install/includes/modele/admin_configure.txt 2013-01-01 14:22:49 UTC (rev 4686)
+++ branches/2.1.1/catalog/install/includes/modele/admin_configure.txt 2013-01-01 14:26:27 UTC (rev 4687)
@@ -124,6 +124,14 @@
$conf['ModPassword'] = 'Classic';
/**
+ @var Define class use for histor*y exchange vs customers
+ Value possible:
+ - internal (file in Documents Dir, no link real email box)
+ - imap (use imap protocol , no file in local)
+ */
+ $conf['HistoryMail'] = 'internal';
+
+ /**
@var max login page test con*nect
block page after nbr login, based on lifetime sessions
*/
Modified: branches/2.1.1/catalog/install/includes/modele/configure.txt
===================================================================
--- branches/2.1.1/catalog/install/includes/modele/configure.txt 2013-01-01 14:22:49 UTC (rev 4686)
+++ branches/2.1.1/catalog/install/includes/modele/configure.txt 2013-01-01 14:26:27 UTC (rev 4687)
@@ -109,3 +109,11 @@
- Sha1 new mode
*/
$conf['ModPassword'] = 'Classic';
+
+ /**
+ @var Define class use for history exchange vs customers
+ Value possible:
+ - internal (file in Documents Dir, no link real email box)
+ - imap (use imap protocol , no file in local)
+ */
+ $conf['HistoryMail'] = 'internal';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-01 14:22:57
|
Revision: 4686
http://oscss.svn.sourceforge.net/oscss/?rev=4686&view=rev
Author: oscim
Date: 2013-01-01 14:22:49 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
correction et FIX bug
correction fr
refonte page mail et mise en oeuvre historisation de base des echanges client vs owner via le backup des mails envoy?\195?\169 et leur manipulation
Ajout d'une class de centralisation pour permettre le choix du mode d'historisation (internal/imap)
Modified Paths:
--------------
branches/2.1.1/catalog/admin/document.php
branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminNotif.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/mail.txt
branches/2.1.1/catalog/admin/includes/modules/account/history.php
branches/2.1.1/catalog/admin/includes/modules/pages/held_orders.php
branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
branches/2.1.1/catalog/common/classes/DatasFiles.php
branches/2.1.1/catalog/common/classes/PHPMailer.php
branches/2.1.1/catalog/document.php
branches/2.1.1/catalog/includes/classes/core_page/contact.php
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/gabarit/mail/
branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.create.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab
branches/2.1.1/catalog/common/classes/HistoryMail.php
branches/2.1.1/catalog/common/modules/core/email/
branches/2.1.1/catalog/common/modules/core/email/history_internal.php
Modified: branches/2.1.1/catalog/admin/document.php
===================================================================
--- branches/2.1.1/catalog/admin/document.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/document.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 03/03/2012, 16:26
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 01/01/2013, 16:16
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -24,7 +25,7 @@
/**
- @remarks Adjust type requete
+ @remarks Adjust type requete
*/
switch((string)$_REQUEST['typ']){
case 'product':
@@ -59,8 +60,19 @@
break;
+ /**
+ @brief Display email content
+ */
+ case 'email':
+ case 'mail':
+ $HM = HistoryMail::getInstance();
+ $mInfo = new stdClass();
+ $mInfo = $HM->ViewMail($_REQUEST['cID'], $_REQUEST['uid']);
+ print $mInfo->content;
+ exit;
+ break;
/**
@brief Traitement des pdf
Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab 2013-01-01 14:22:49 UTC (rev 4686)
@@ -13,6 +13,7 @@
<h4><?php echo __('heading title configuration'); ?></h4>
+<p class="clear InfoText"><?php echo __('intro text configuration'); ?></p>
<div class="button_nav">
<?php printf(CsrtAction::getLink('button_nav', __('image new notification') ), '', tep_href_link(adminNotif::FILENAME, 'action=confignew') ,'' );
Copied: branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.create.gab (from rev 4679, branches/2.1.1/catalog/admin/includes/gabarit/mail.page.gab)
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.create.gab (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.create.gab 2013-01-01 14:22:49 UTC (rev 4686)
@@ -0,0 +1,100 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 07/05/2012, 14:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+
+?>
+<h3><?php echo __('heading title') ?></h3>
+
+<!-- PREVIEW -->
+<?php if (mail::$action == 'preview') : ?>
+ <div class="box_uniq">
+<div class="edit">
+ <?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=send_email_to_user'); ?>
+ <p><?php echo mail::repost() ?></p>
+ <table class="dataTableBase">
+ <tr>
+ <td class="smallText"><strong><?php echo __('text customer'); ?></strong> <?php echo mail::sendto(); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text from'); ?></strong> <?php echo htmlspecialchars(stripslashes($_POST['from'])); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text subject'); ?></strong> <?php echo htmlspecialchars(stripslashes($_POST['subject'])); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text message'); ?></strong><br /><div id="iframe"><?php echo nl2br(strip_tags(stripslashes($_POST['message_form']))); ?></div></td>
+ </tr>
+ </table>
+ <?php echo tep_image_submit('button_send_mail.gif', __('image send email')); ?>
+ </form>
+</div>
+ </div>
+
+<?php else: ?>
+ <!-- FORM -->
+
+ <?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=preview'); ?>
+
+ <div class="box_left">
+ <div class="edit">
+ <fieldset class="block_field">
+ <p class="block_input">
+ <label for="customers_email_address" class="main"><?php echo __('text customer'); ?></label>
+ <?php echo mail::get_list_customers() ?>
+ </p>
+
+ <p class="block_input">
+ <label for="from"><?php echo __('text from'); ?></label>
+ <?php echo tep_draw_input_field('from','', mail::$list->from); ?>
+ </p>
+
+ <p class="block_input">
+ <label for="subject"><?php echo __('text subject'); ?></label>
+ <?php echo tep_draw_input_field('subject','',mail::$list->subject); ?>
+ </p>
+
+ <p class="block_input">
+ <label for="p_format"><?php echo __('text format'); ?></label>
+ <?php echo tep_draw_pull_down_menu('p_format', array(array('id'=>'HTML', 'text'=>'html'),array('id'=>'TEXT', 'text'=>'text')), (isset($_POST['customer']) ? $_POST['customer'] : ''));?>
+ </p>
+
+ <br style="clear:both" />
+ <p class="block_uniq tcenter">
+ <label for="message"><?php echo __('text message'); ?></label>
+ <br style="clear:both" />
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','message_form','800','400',mail::$list->content); ?>
+ </p>
+
+ </fieldset>
+
+ <br class="clear" />
+ </div>
+ </div>
+
+
+ <div class="box_right">
+ <div class="edit">
+
+ <fieldset class="block_field">
+ <p><?php echo __('txt usage code in mail') ?></p>
+ <div class="button_nav">
+ <?php if (mail::$action == 'preview')echo '<a class="button" href="' . tep_href_link(FILENAME_MAIL) . '">' . IMAGE_CANCEL . '</a> '; ?>
+ <?php echo tep_image_submit('button_send_mail.gif', __('image preview')); ?>
+ </div>
+ </fieldset>
+ <br class="clear" />
+ </div>
+ </div>
+
+
+ </form>
+
+<?php endif; ?>
\ No newline at end of file
Added: branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab 2013-01-01 14:22:49 UTC (rev 4686)
@@ -0,0 +1,49 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 07/05/2012, 14:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+
+?>
+
+<div class="box_uniq">
+
+ <h3><?php echo __('@mail heading title list mail for one user') ?></h3>
+
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(FILENAME_CUSTOMERS,'action=noedit&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail customers fiche') ?></a>
+ <a class="button" href="<?php echo tep_href_link(FILENAME_CUSTOMERS,'action=edit&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail customers edit') ?></a>
+ <a class="button " href="<?php echo tep_href_link(mail::FILENAME,'action=create&customers=') ?>"><?php echo __('@mail new message') ?></a>
+</div>
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('@mail table heading date'); ?></th>
+ <th><?php echo __('@mail table heading sens'); ?></th>
+ <th><?php echo __('@mail table heading subject'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(mail::$mInfo->list as $item){ ?>
+ <tr class="view parent dataTableRow" >
+ <td><strong><?php echo $item->date; ?></strong></td>
+ <td><strong><?php echo $item->sens; ?></strong></td>
+ <td >
+<!-- <span class="view fils fright"> -->
+ <?php echo $item->linkdoc; ?>
+<!-- </span> -->
+ </td>
+ </tr>
+ <?php } ?>
+ </tbody>
+ </table>
+</div>
+
+
Added: branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab 2013-01-01 14:22:49 UTC (rev 4686)
@@ -0,0 +1,48 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 01/01/2013, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+
+// $res =
+
+// print_r(mail::$mInfo->customers);
+?>
+<h3><?php echo __('@mail heading title view mail') ?></h3>
+
+
+
+ <div class="box_uniq">
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(mail::FILENAME,'action=list&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail list message customers') ?></a>
+ <a class="button" href="<?php echo tep_href_link(mail::FILENAME,'action=reply&customers='.mail::$mInfo->customers->email_address) ?>"><?php echo __('@mail reply message') ?></a>
+</div>
+
+<div class="edit">
+
+ <table class="" style="width:100%">
+
+ <tr>
+ <td class="smallText"><strong><?php echo __('text from'); ?></strong> <?php echo htmlspecialchars(stripslashes(mail::$mInfo->from)); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text subject'); ?></strong> <?php echo htmlspecialchars(stripslashes(mail::$mInfo->subject)); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text message'); ?></strong><br /><iframe id="iframe" style="width:100%; height:350px" src="<?php echo tep_href_link('document.php','mod=mail&cID='.(int)$_GET['cID'].'&uid='.$_GET['ID'].'') ?>"></iframe></td>
+ </tr>
+
+
+ </table>
+ <?php //echo tep_image_submit('button_send_mail.gif', __('image send email')); ?>
+
+</div>
+ </div>
+
+
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/history.txt 2013-01-01 14:22:49 UTC (rev 4686)
@@ -19,6 +19,7 @@
$lang['history order']="Commande" ;
$lang['history account']="Compte" ;
+$lang['history email']="Email" ;
$lang['history new commande n %s']="Nouvelle commande n°%s" ;
$lang['history last logon']="Dernière connexion" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminNotif.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminNotif.txt 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminNotif.txt 2013-01-01 14:22:49 UTC (rev 4686)
@@ -10,20 +10,28 @@
*/
$lang['heading title']="Notifications métiers" ;
-$lang['heading title configuration']="Régler vos préférences de notifications" ;
+/* User Config */
+ $lang['heading title configuration']="Régler vos préférences de notifications" ;
+ $lang['intro text configuration']="Utiliser le bouton 'Nouvelle notification' pour obtenir des alertes sur les événement de la boutique \n la méthode vous permet de regler le mode de fonctionnement (sql , visible sur la panel d'administration; email pour recevoir un mail) vous pouvez regler un même événement pour plusieurs méthodes\n" ;
-$lang['table heading notif id']="Id" ;
-$lang['table heading type']="type" ;
-$lang['table heading keys']="key" ;
-$lang['table heading name']="link" ;
-$lang['table heading date']="date" ;
-$lang['table heading action']="Action" ;
-$lang['table heading chknotif id']="Id" ;
-$lang['table heading type']="type" ;
-$lang['table heading chknotif_key']="Évènement" ;
-$lang['table heading chknotif_method']="Méthode" ;
-$lang['table heading chknotif_status']="Status" ;
+ $lang['table heading notif id']="Id" ;
+ $lang['table heading type']="type" ;
+ $lang['table heading keys']="key" ;
+ $lang['table heading name']="link" ;
+ $lang['table heading date']="date" ;
+ $lang['table heading action']="Action" ;
+ $lang['table heading chknotif id']="Id" ;
+ $lang['table heading type']="type" ;
+ $lang['table heading chknotif_key']="Évènement" ;
+ $lang['table heading chknotif_method']="Méthode" ;
+ $lang['table heading chknotif_status']="Status" ;
+ $lang['image new notification']="Nouvelle notification" ;
+ $lang['image notification config list']="Configuration" ;
+ $lang['image notification list']="Évènements" ;
+
+/* New Notif User Config */
+
$lang['heading notification view']="Détail notification" ;
$lang['heading config edit']="Édition d'une configuration " ;
$lang['text info key notif']="Action sur : " ;
@@ -32,10 +40,8 @@
$lang['text info content notif']="Contenu : " ;
-$lang['image new notification']="Nouvelle notification" ;
-$lang['image notification config list']="Configuration" ;
-$lang['image notification list']="Évènements" ;
+
$lang['@adminNotif image reload mail']="Relancer" ;
$lang['error in update notification']="Erreur lors de la mise à jour de la notification" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/mail.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/mail.txt 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/mail.txt 2013-01-01 14:22:49 UTC (rev 4686)
@@ -8,6 +8,26 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
+/* list mail for one customers */
+ $lang['@mail heading title list mail for one user']="boite de reception pour de ce client" ;
+
+ $lang['@mail table heading date']="Date" ;
+ $lang['@mail table heading sens']="Sens" ;
+ $lang['@mail table heading subject']="Sujet" ;
+
+ $lang['@mail customers fiche']="Fiche" ;
+ $lang['@mail customers edit']="Edition client" ;
+ $lang['@mail new message']="Ecrire" ;
+
+/* View mail for one customers */
+ $lang['@mail heading title view mail']="Vue email" ;
+
+ $lang['@mail list message customers']="Liste des message de ce client" ;
+ $lang['@mail reply message']="Repondre" ;
+
+
+/* other */
$lang['heading title']="Envoyer un courrier électronique aux clients" ;
$lang['text customer']="Client :" ;
$lang['text subject']="Sujet :" ;
Modified: branches/2.1.1/catalog/admin/includes/modules/account/history.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/account/history.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/modules/account/history.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -153,8 +153,30 @@
$n->type = 'account';
$result[strtotime($row['customers_info_date_account_last_modified'])]=$n;
+
+
+
+
+ switch(self::$action){
+ case 'noedit':
+
+ $HM = HistoryMail::getInstance();
+ $list = $HM->ListUserDir($cID) ;
+ foreach($list as $row){
+
+ $row->text = $row->sens.$row->linkdoc;
+
+
+ $result[strtotime($row->originaldate)]=$row;
+
+ }
+
+ break;
+ }
+
krsort($result);
+
return ($result);
}
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/held_orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/held_orders.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/held_orders.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -171,9 +171,13 @@
$messageStack->add_session(WARNING_ORDER_NOT_UPDATED, 'warning');
}
- tep_redirect(tep_href_link(self::FILENAME, tep_get_all_get_params(array('action')) . 'action=edit'));
+ tep_redirect(tep_href_link(self::FILENAME) );
break;
+
+ /**
+ @remarks transforme held_order to order
+ */
case 'confirm_order':
$oID = tep_db_prepare_input($_GET['oID']);
@@ -184,6 +188,9 @@
tep_redirect(tep_href_link(self::FILENAME));
break;
+ /**
+ @remarks suppression de la pre-commande
+ */
case 'deleteconfirm':
$oID = tep_db_prepare_input($_GET['oID']);
@@ -221,6 +228,12 @@
self::$Id=(int)$_GET['oID'];
self::$oInfo=self::GetDBValue();
break;
+ case 'confirm_order':
+ $oID = tep_db_prepare_input($_GET['oID']);
+
+ tep_confirm_held_order($oID);
+ return ;
+ break;
case 'recup_order':
self::$Id=(int)$_GET['oID'];
self::$oInfo=self::GetDBValue();
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/mail.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/mail.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -22,8 +22,15 @@
@var object detail content page
*/
public static $list;
-
/**
+ @var object $mInfo
+ */
+ public static $mInfo;
+ /**
+ @var object $cInfo detail du client
+ */
+ public static $cInfo;
+ /**
class constructor
*/
public function __construct() {
@@ -42,6 +49,8 @@
switch (self::$action) {
+ case 'view':
+ break;
case 'send_email_to_user':
$err=array();
@@ -115,9 +124,28 @@
- if ( tep_mail($mymessage['to_name'], $mymessage['to_email_address'], $mymessage['email_subject'], $message_final, $mymessage['from_email_name'], @$mymessage['from_email_address']) !=false) $err[]=true;
- else $err[$mymessage['to_email_address']]=false;
+ if ( tep_mail($mymessage['to_name'], $mymessage['to_email_address'], $mymessage['email_subject'], $message_final, $mymessage['from_email_name'], @$mymessage['from_email_address']) !=false) {
+ //save mail in email docs
+ $DF = new DatasFiles;
+
+ $file=$DF->GetDoc('email',$mail['customers_id']);
+
+ $res = file_put_contents($file.'.'.'U'.'.'.base64_encode($subject), "From: ".$from." <".$mail_sent_to.">
+ To: ".$mail['customers_firstname'].' '.$mail['customers_lastname'] ." <".$mail['customers_email_address'].">
+ Subject: =?UTF-8?Q?".utf8_decode($subject)."?=
+ Date: ".date(DATE_RFC822)."\r\n".
+ "Message-ID: <".md5($content)."@".str_replace(' ','-',STORE_NAME).">
+ User-Agent: osCSS-2
+ MIME-Version: 1.0
+ Content-Type: text/plain; charset=\"UTF-8\" \r\n
+ ".$content."\r\n"."\r\n");
+
+ $err[]=true;
+ }
+ else
+ $err[$mymessage['to_email_address']]=false;
+
}
@@ -180,12 +208,58 @@
public function get_header(){ return false; }
- public static function load_db_values($ID){ return false; }
+ public static function load_db_values($ID){
+ switch (self::$action) {
+ case 'view':
+// $DF = new DatasFiles;
+// $file=$DF->GetDoc('email',$_GET['cID']);
+//
+// self::$mInfo->pathfile = dirname($file).'/'.$_GET['ID'];
+//
+// $tmp = file_get_contents(self::$mInfo->pathfile);
+//
+// $tmp2=explode('Content-Type: text/plain; charset="UTF-8"', $tmp );
+// // var_dump($tmp2[1]);
+// self::$mInfo->content = $tmp2[1];
+
+ $HM = HistoryMail::getInstance();
+
+ self::$mInfo = new stdClass();
+ self::$mInfo = $HM->ViewMail($_GET['cID'], $_GET['ID']);
+
+
+ self::$mInfo->customers =sqlcustomer::fetch(array('id'=>$_GET['cID']), true);
+
+// self::$mInfo->content = $tmp->content
+
+ break;
+ case 'list':
+ $HM = HistoryMail::getInstance();
+
+ self::$mInfo = new stdClass();
+ self::$mInfo->list = $HM->ListUserDir($_GET['cID']);
+ break;
+ }
+
+ return false;
+ }
+
public function display_view(){
// $this->check_action(@$_REQUEST['action']);
+ switch (self::$action) {
+ case 'view':
+ $this->load_db_values('');
+ return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.mail.view');
+ break;
+ case 'list':
+ $this->load_db_values('');
+ return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.list');
+ break;
+ default:
+ return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.create');
+ }
- return tep_get_include_contents(self::$code.'.page');
}
/** Specific module */
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -225,9 +225,30 @@
'class'=>'tcenter',
'default'=>true,
),
- 'o.ip_address' => __('orders table heading ip_address'),
- 'o.total_weight' => __('orders table heading total_weight'),
- 'o.facture_id' => __('orders table heading facture_id'),
+ 'o.ip_address' => array(
+ 'sort'=>true,
+// 'alias'=>'orders_status_name',
+ 'text'=> __('orders table heading ip_address'),
+ 'width'=>'10%',
+ 'class'=>'tcenter',
+// 'default'=>true,
+ ),
+ 'o.total_weight' => array(
+ 'sort'=>true,
+// 'alias'=>'orders_status_name',
+ 'text'=> __('orders table heading total_weight'),
+ 'width'=>'10%',
+ 'class'=>'tcenter',
+// 'default'=>true,
+ ),
+ 'o.facture_id' => array(
+ 'sort'=>true,
+// 'alias'=>'orders_status_name',
+ 'text'=> __('orders table heading facture_id'),
+ 'width'=>'10%',
+ 'class'=>'tcenter',
+// 'default'=>true,
+ ),
'o.class_payment' => array(
'sort'=>true,
// 'alias'=>'orders_status_name',
@@ -622,7 +643,12 @@
if (up_status_order($oID, $status , $_POST) ){
// $messageStack->add_session(__('success order updated'), 'success');
- switch($status){
+ /// Adjust process for status
+ if($status>0)
+ $new_st = substr((int)$status,0,1);
+ else
+ $new_st = $status;
+ switch($new_st){
case DEFAULT_ORDERS_STATUS_PAYED:
if( ! _cst_bool('USE_LOCAL_GENERAT_PDF')) {
$_GET['forceajax'] = true;
@@ -630,6 +656,9 @@
$_REQUEST['file_type'] = 'invoice';
self::check_action('pdf');
self::$action=$actions;
+
+ $r = sqlorder::update(array('id'=>$oID, 'status'=>DEFAULT_ORDERS_STATUS_COMPLETED, 'comments'=>__('@orders txt close and numero facture')));
+
}
break;
case DEFAULT_ORDERS_STATUS_ANNULATE:
Modified: branches/2.1.1/catalog/common/classes/DatasFiles.php
===================================================================
--- branches/2.1.1/catalog/common/classes/DatasFiles.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/common/classes/DatasFiles.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -95,6 +95,10 @@
*/
public static function ConvertType($type){
switch($type){
+ case 'mail':
+ case 'email':
+ return 50;
+ break;
case 'client':
case 'customer':
case 'customers':
@@ -177,6 +181,12 @@
$obj->folder = 'delivery';
$obj->ext = 'pdf';
break;
+ case 50:
+ $obj->prefix = 'MAIL';
+ $obj->format = '%1$s-'.date('Ymd.His');//;.'.%3$s';
+ $obj->folder = 'email';
+ $obj->ext = '';
+ break;
}
return $obj;
Added: branches/2.1.1/catalog/common/classes/HistoryMail.php
===================================================================
--- branches/2.1.1/catalog/common/classes/HistoryMail.php (rev 0)
+++ branches/2.1.1/catalog/common/classes/HistoryMail.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -0,0 +1,98 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 01/01/2013, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class HistoryMail
+ @brief This class is manager call for methode in check or generate password proteced
+*/
+
+class HistoryMail {
+ /**
+ @var path childs module
+ */
+ const PATH_CHILDS_MOD = 'modules/core/email/';
+ /**
+ @var Prefix file in childs module
+ */
+ const PREFIX_FILE_CHILDS_MOD = 'history_';
+ /**
+ @var ressource Id current instance
+ */
+ protected static $_instance;
+ /**
+ @var object Childs mod instance
+ */
+ protected static $ChildMod = false;
+
+
+ /**
+ @brief constructor
+ */
+ protected function __construct(){
+ global $conf;
+
+ if(self::$ChildMod !=false) return ;
+
+ $file = self::PREFIX_FILE_CHILDS_MOD.$conf->HistoryMail.'.php';
+
+ if(!file_exists(DIR_FS_CATALOG.DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
+ throw new Exception('Not found file history email module');
+
+ $current = $conf->HistoryMail;
+ require_once(DIR_FS_CATALOG.DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file);
+
+ self::$ChildMod = new $current();
+ }
+
+ /**
+ @brief call current class
+ */
+ public static function getInstance(){
+ if(self::$_instance == null)
+ self::$_instance = new self();
+
+ return self::$_instance;
+ }
+
+ /**
+ @brief Force reset current instance class
+ */
+ public static function resetInstance(){
+ self::$_instance = null;
+ return self::getInstance();
+ }
+
+
+ /**
+ @brief
+ */
+ public function ListUserDir($cid){
+ self::getInstance();
+ return self::$ChildMod->ListUserMail($cid);
+ }
+
+
+ /**
+ @param $cid
+ @param $uid
+ */
+ public function ViewMail($cid,$uid){
+ self::getInstance();
+ return self::$ChildMod->ViewMail($cid,$uid);
+ }
+
+
+ /**
+ @brief
+ */
+ public function AddMail($cid, $to, $toadd, $from, $fromadd , $subject,$content){
+ self::getInstance();
+ return self::$ChildMod->AddMail($cid,$subject, $to, $toadd, $from, $fromadd , $content);
+ }
+}
+?>
Modified: branches/2.1.1/catalog/common/classes/PHPMailer.php
===================================================================
--- branches/2.1.1/catalog/common/classes/PHPMailer.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/common/classes/PHPMailer.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 24/03/11, 08:49
+ @version 2.1.1
+ @date 01/01/2013, 08:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -48,7 +48,6 @@
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
*/
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
class PHPMailer {
@@ -91,13 +90,13 @@
* Sets the From email address for the message.
* @var string
*/
- public $From = 'root@localhost';
+ public $From = EMAIL_FROM;
/**
* Sets the From name of the message.
* @var string
*/
- public $FromName = 'Root User';
+ public $FromName = STORE_OWNER;
/**
* Sets the Sender email (Return-Path) of the message. If not empty,
@@ -709,6 +708,8 @@
* @return bool
*/
protected function SmtpSend($header, $body) {
+/// TODO move dir
+// require_once DIR_FS_DOCUMENT_ROOT . DIR_WS_COMMON . 'modules/core/email/'. $this->PluginDir . 'class.smtp.php';
require_once $this->PluginDir . 'class.smtp.php';
$bad_rcpt = array();
Added: branches/2.1.1/catalog/common/modules/core/email/history_internal.php
===================================================================
--- branches/2.1.1/catalog/common/modules/core/email/history_internal.php (rev 0)
+++ branches/2.1.1/catalog/common/modules/core/email/history_internal.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -0,0 +1,143 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 01/01/2013, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class HistoryMail
+ @brief Thsi class stock and manipule email file saved on local Document dir
+*/
+
+Class internal
+ {
+
+ /**
+ @var name dir in Document dir used by class DatasFiles
+ */
+ private static $typedir = 'email';
+
+
+
+ public function __construct(){
+
+ }
+
+
+
+ /**
+ @param $cid int customers id
+ @param $subject string text subject
+ @param $cid int customers id
+
+ */
+ public static function AddMail($cid, $subject, $to, $toadd, $from, $fromadd , $content){
+
+ /// init DatasFiles for creat all base dir
+ $DF = new DatasFiles;
+
+ // obtain path for current user (based on id user)
+ $file=$DF->GetDoc(self::$typedir ,$cid);
+
+
+ // name file
+ // MAIL-yyyymmdd.hhiiss.(I|U).base64 subject
+ $mailfilename = $file.'.'.'I'.'.'.self::base64_url_encode($subject);
+// var_dump($cid, $subject, $to, $toadd, $from, $fromadd , $content);
+ // create fiel mail
+ $res = file_put_contents($mailfilename, "From: ".$to." <".$toadd.">
+ To: ".$from ." <".$fromadd.">
+ Subject: =?UTF-8?Q?".utf8_decode($subject)."?=
+ Date: ".date(DATE_RFC822)."\r\n".
+ "Message-ID: <".md5($content)."@".str_replace(' ','-',STORE_NAME).">
+ User-Agent: osCSS-2
+ MIME-Version: 1.0
+ Content-Type: text/plain; charset=\"UTF-8\" \r\n
+ ".$content."\r\n"."\r\n");
+// var_dump($mailfilename);
+ return $res;
+ }
+
+ /**
+ @param $cid int customers id
+ @return array( obj, obj , ...)
+ */
+ public function ListUserMail($cid){
+ $result = array();
+
+ // appels des emails
+ $DF = new DatasFiles;
+
+ $file=$DF->GetDoc(self::$typedir,$cid);
+
+ foreach(scan(dirname($file)) as $row){
+
+ if(preg_match('#MAIL-([0-9]{8}).([0-9]{6}).([A-Z]{1}).([a-z0-9]{4,})#i', $row, $match)) {
+
+
+ $date = preg_replace('#([0-9]{4})([0-9]{2})([0-9]{2}).([0-9]{2})([0-9]{2})([0-9]{2})#', '$1-$2-$3 $4:$5:$6', $match[1].'.'.$match[2]);
+
+ $subject = self::base64_url_decode($match[4]);
+
+ $n = new stdClass();
+ $n->originaldate = $date;
+ $n->date = tep_datetime_short($date);
+ $n->type = 'email';
+ $n->sens = $match[3];
+ $n->title = $subject;
+ $n->linkdoc = ' <a class="linkdoc" href="'.tep_href_link(FILENAME_MAIL, 'action=view&cID='.$cid.'&ID='.urlencode($row)).'">'.$subject.'</a> ';
+
+
+ $result[strtotime($date)]=$n;
+ }
+ }
+
+ krsort($result);
+ return $result;
+ }
+
+
+ /**
+ @param $cid int customers id
+ */
+ public static function ViewMail($cid, $uid){
+
+ $DF = new DatasFiles;
+ $file=$DF->GetDoc(self::$typedir,$cid);
+
+ $mInfo = new stdClass();
+ $mInfo->pathfile = dirname($file).'/'.urldecode($uid);
+
+
+ $tmp = file_get_contents($mInfo->pathfile );
+
+ $tmp2=explode('Content-Type: text/plain; charset="UTF-8"', $tmp );
+
+ foreach(explode("\n",$tmp2[0]) as $row){
+ if(preg_match('#.*From:.*([a-z0-9@_.-]*).*<([a-z0-9@_.-]*)>#', $row, $match))
+ $mInfo->from = $match[2];
+ if(preg_match('#.*Subject:(.*)#', $row, $match))
+ $mInfo->subject = $match[1];
+// var_dump( $row);
+ }
+ $mInfo->content = $tmp2[1];
+
+
+ return $mInfo;
+ }
+
+
+
+ private static function base64_url_encode($input) {
+ return strtr(base64_encode($input), '+/=', '-_,');
+ }
+
+ private static function base64_url_decode($input) {
+ return base64_decode(strtr($input, '-_,', '+/='));
+ }
+}
+
+
+?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/document.php
===================================================================
--- branches/2.1.1/catalog/document.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/document.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 03/03/2012, 22:42
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 01/01/2013, 16:16
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -123,7 +123,23 @@
}
break;
+ /**
+ @brief Display email content
+ */
+ case 'email':
+ case 'mail':
+ //! force login
+ if (!tep_session_is_registered('customer_first_name') || !tep_session_is_registered('customer_id'))
+ tep_redirect(FILENAME_DEFAULT);
+ $HM = HistoryMail::getInstance();
+
+ $mInfo = new stdClass();
+ $mInfo = $HM->ViewMail($_REQUEST['cID'], $_REQUEST['uid']);
+
+ print $mInfo->content;
+ exit;
+ break;
}
Modified: branches/2.1.1/catalog/includes/classes/core_page/contact.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/core_page/contact.php 2013-01-01 09:10:13 UTC (rev 4685)
+++ branches/2.1.1/catalog/includes/classes/core_page/contact.php 2013-01-01 14:22:49 UTC (rev 4686)
@@ -91,6 +91,10 @@
$name = $user->customers_lastname.' '.$user->customers_firstname;
$email_address=$user->customers_email_address;
$data .='&customers_id='.$user->customers_id;
+
+ // historyMail
+ $HM = HistoryMail::getInstance();
+ $mInfo = $HM->AddMail($user->customers_id, STORE_OWNER, EMAIL_FROM, $name, $email_address , sprintf(EMAIL_SUBJECT, STORE_NAME) ,$enquiry);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-01-01 09:10:19
|
Revision: 4685
http://oscss.svn.sourceforge.net/oscss/?rev=4685&view=rev
Author: oscim
Date: 2013-01-01 09:10:13 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
control de version sur l'installateur
Modified Paths:
--------------
branches/2.1.1/catalog/install/includes/content/core.base.php
Modified: branches/2.1.1/catalog/install/includes/content/core.base.php
===================================================================
--- branches/2.1.1/catalog/install/includes/content/core.base.php 2012-12-31 13:06:00 UTC (rev 4684)
+++ branches/2.1.1/catalog/install/includes/content/core.base.php 2013-01-01 09:10:13 UTC (rev 4685)
@@ -110,6 +110,10 @@
$path='../';
$this->err=false;
+ if (version_compare(PHP_VERSION, '5.3.0', '<') )
+ exit("Sorry, this version of osCSS will only run on PHP version 5.3 or greater!\n");
+
+
/** Contrôle écriture possible pour la suite */
while ($r=each($this->ctr)){
$type= (preg_match("#/$#i",$r['value'])) ?'rep' : 'file';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-12-31 13:06:06
|
Revision: 4684
http://oscss.svn.sourceforge.net/oscss/?rev=4684&view=rev
Author: oscim
Date: 2012-12-31 13:06:00 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
Fix bug report usage variable du mode de re ecriture sleectionn?\195?\169e
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php
Modified: branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php 2012-12-31 13:04:52 UTC (rev 4683)
+++ branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php 2012-12-31 13:06:00 UTC (rev 4684)
@@ -81,6 +81,8 @@
@brief save page groupe
*/
case 'save_mutli':
+// error_reporting(E_ALL);
+// print_r($_POST);
if(tep_not_null($gID) ){
$list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
@@ -107,7 +109,7 @@
// calculate htaccess
- $this->load_db_values($Id);
+ $this->load_db_values($_POST['configuration']['SEO_REWRITE_TYPE']);
$fp = @fopen(DIR_FS_CATALOG . '.htaccess', 'w+');
fwrite($fp, self::$view_htaccess);
@@ -117,7 +119,7 @@
$messageStack->add_session(__('erreur for rewrite htaccess file, please replace htaccess by new content'), 'error');
}
-
+// exit;
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-12-31 13:04:59
|
Revision: 4683
http://oscss.svn.sourceforge.net/oscss/?rev=4683&view=rev
Author: oscim
Date: 2012-12-31 13:04:52 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
correction erreur dans la regle destin?\195?\169 au htaccess pour les page contact
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php 2012-12-30 21:03:47 UTC (rev 4682)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php 2012-12-31 13:04:52 UTC (rev 4683)
@@ -40,9 +40,9 @@
public $reg_static = array(
'deb' =>"
## contact
- RewriteRule ^contact.(php|%_EXT_%)$ index.php?d=contact.php&%{QUERY_STRING} [L,QSA]
+ RewriteRule ^contact.(php|%_EXT_%).*$ index.php?divers=contact&%{QUERY_STRING} [L,QSA]
## panier
- RewriteRule ^shopping_cart.(php|html)$ index.php?d=shopping_cart.php&%{QUERY_STRING} [L,QSA]
+ RewriteRule ^shopping_cart.(php|html)$ index.php?divers=shopping_cart&%{QUERY_STRING} [L,QSA]
## Move xxxx.php >> xxx.html
RewriteCond %{REQUEST_FILENAME} !-f
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-12-30 21:03:55
|
Revision: 4682
http://oscss.svn.sourceforge.net/oscss/?rev=4682&view=rev
Author: oscim
Date: 2012-12-30 21:03:47 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
coquille dans la class css qui avait une incidence sur le comportement du js
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/held_orders/display_view.recup_order.gab
Modified: branches/2.1.1/catalog/admin/includes/gabarit/held_orders/display_view.recup_order.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/held_orders/display_view.recup_order.gab 2012-12-30 20:07:15 UTC (rev 4681)
+++ branches/2.1.1/catalog/admin/includes/gabarit/held_orders/display_view.recup_order.gab 2012-12-30 21:03:47 UTC (rev 4682)
@@ -1,16 +1,16 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 02/11/10, 18:53
+ @version 2.1.1
+ @date 30/12/2012, 18:53
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
?>
<h3><?php echo __('text info heading confirm order') ?></h3>
-<?php echo tep_draw_form('multi', held_orders::FILENAME, 'oID=' . held_orders::$oInfo->orders_id . '&action=confirm_order', 'post', ' class="fancyView" '); ?>
+<?php echo tep_draw_form('multi', held_orders::FILENAME, 'oID=' . held_orders::$oInfo->orders_id . '&action=confirm_order', 'post'); ?>
<p><?php echo __('text info confirm intro').'<strong>' . held_orders::$oInfo->customers_firstname . ' ' . held_orders::$oInfo->customers_lastname . '</strong>' ?></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-12-30 20:07:27
|
Revision: 4681
http://oscss.svn.sourceforge.net/oscss/?rev=4681&view=rev
Author: oscim
Date: 2012-12-30 20:07:15 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/application_bottom.php
branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
Modified: branches/2.1.1/catalog/admin/includes/application_bottom.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/application_bottom.php 2012-12-30 16:18:29 UTC (rev 4680)
+++ branches/2.1.1/catalog/admin/includes/application_bottom.php 2012-12-30 20:07:15 UTC (rev 4681)
@@ -34,7 +34,7 @@
// Add message line
OSCSS_JSCORE.utils.notif.AddNotif({
- indice:"<?php echo $i++ ?>",
+ indice:"<?php echo time().$i++ ?>",
style:"<?php echo $row['class'] ?>",
message:"<?php echo addslashes($row['text']) ?>",
});
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-12-30 16:18:29 UTC (rev 4680)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-12-30 20:07:15 UTC (rev 4681)
@@ -747,7 +747,7 @@
$query_raw = "select ".$adjust->listfields.", c.customers_id as id from " . TABLE_CUSTOMERS . " c ".
- " LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(c.customers_id =ci.customers_info_id ) ".
+ " JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(c.customers_id =ci.customers_info_id ) ".
" LEFT JOIN " . TABLE_LANGUAGES . " l ON(c.customers_language =l.languages_id ) ";
// " LEFT JOIN " . TABLE_CUSTOMERS_GROUPS . " cg ON(c.customers_group_id = cg.customers_group_id) ";
@@ -773,8 +773,8 @@
/* END Sub module add col */
$query_raw .= " ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' ci.customers_info_date_account_created DESC ');
+// echo $query_raw;
-
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-12-30 16:18:36
|
Revision: 4680
http://oscss.svn.sourceforge.net/oscss/?rev=4680&view=rev
Author: oscim
Date: 2012-12-30 16:18:29 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
correction coquille
Fix bug d'affichage css des messages
Fix bug/incoherance product, content, customers
correction fr customers
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
Modified: branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-12-30 15:47:14 UTC (rev 4679)
+++ branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-12-30 16:18:29 UTC (rev 4680)
@@ -261,7 +261,7 @@
<?php if(products::CheckClassProduct('CLASS_DATE_AVAIBLE')): ?>
<p>
<label class="inline" for="products_date_available" title="<?php echo __('@products text date available help') ?>"><?php echo __('@products text date available'); ?></label>
- <?php echo tep_draw_input_field('products_date_available', '', tep_not_null(products::$Info->products_date_available) ? tep_date_short(products::$Info->products_date_available) : '', ' maxlength="10" size="10" style="min-width:30px;" ') . tep_draw_hidden_field('bt_products_date_available') . ' ' . __('@products display date format'); ?>
+ <?php echo tep_draw_input_field('products_date_available', '',( (tep_not_null(products::$Info->products_date_available) && !in_array(products::$Info->products_date_available, array('0000-00-00 00:00:00', '1000-01-01 00:00:00') ) ) ? tep_date_short(products::$Info->products_date_available) : ''), ' maxlength="10" size="10" style="min-width:30px;" ') . tep_draw_hidden_field('bt_products_date_available') . ' ' . __('@products display date format'); ?>
</p>
<?php endif; ?>
</dd>
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-12-30 15:47:14 UTC (rev 4679)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-12-30 16:18:29 UTC (rev 4680)
@@ -53,13 +53,8 @@
/* bouton */
$lang['@customers image create new customer']="Ajouter un clients" ;
$lang['@customers link rss new customer']="Suivi inscriptions" ;
+ $lang['@customers button vcard']="Vcard" ;
-// $lang['@customers table heading status']="Etat" ;
-// $lang['@customers table heading status']="Etat" ;
-
-
-
-
/* Edit / No edit */
/* Heading */
$lang['heading title']="Clients" ;
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2012-12-30 15:47:14 UTC (rev 4679)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2012-12-30 16:18:29 UTC (rev 4680)
@@ -182,12 +182,14 @@
'alias'=>'added',
'text'=>__('cms_content table heading date_added'),
'width'=>'10%',
+ 'class'=>'tcenter',
);
self::$allfields['c.last_modified'] = array(
'sort'=>true,
'alias'=>'modified',
'text'=>__('cms_content table heading last modified'),
'width'=>'10%',
+ 'class'=>'tcenter',
'default'=>true,
);
@@ -1001,7 +1003,7 @@
if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
elseif($k == 'status') $ord[$k]=self::RowStatus($item);
elseif($k == 'hidden') $ord[$k]=self::RowHidden($item);
- elseif(in_array($k,array('added', 'modified') ) )$ord[$k]=(isset($ord[$k])? tep_date_short($item[$k]) : '' );
+ elseif(in_array($k,array('added', 'modified') ) )$ord[$k]=((isset($item[$k]) && $item[$k] !='1000-01-01 00:00:00' )? tep_date_short($item[$k]) : '' );
else $ord[$k]=$item[$k];
}
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-12-30 15:47:14 UTC (rev 4679)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-12-30 16:18:29 UTC (rev 4680)
@@ -150,23 +150,6 @@
'default'=>true,
'width'=>'15%',
),
-// 'c.customers_lastname' => array(
-// 'sort'=>true,
-// 'alias'=>'lastname',
-// 'text'=>__('@customers table heading lastname'),
-// ),
-// 'c.customers_firstname' => array(
-// 'sort'=>true,
-// 'alias'=>'firstname',
-// 'text'=>__('@customers table heading firstname'),
-// // 'default'=>true,
-// // 'width'=>'18%',
-// ),
- 'c.customers_language' => array(
- 'sort'=>true,
- 'alias'=>'language',
- 'text'=>__('@customers table heading language'),
- ),
);
if (_cst_bool('ACCOUNT_DOB'))
@@ -190,7 +173,7 @@
'alias'=>'fax',
'text'=>__('@customers table heading fax'),
);
- self::$allfields['c.customers_language'] = array(
+ self::$allfields['l.name'] = array(
'sort'=>true,
'alias'=>'language',
'text'=>__('@customers table heading language'),
@@ -503,17 +486,17 @@
else
$gender='Ms' ;
- $vcard_content = "BEGIN:VCARD\r";
+ $vcard_content = "BEGIN:VCARD\r\n";
- $vcard_content .= "N:".$result->lastname.";".$result->firstname.";;;\r";
- $vcard_content .= "FN:".$result->firstname." ".$result->lastname."\r";
- $vcard_content .= "EMAIL:".$result->email_address."\r";
- $vcard_content .= "TEL;type=".$vt.";type=pref:".$result->telephone."\r";
- $vcard_content .= "TEL;type=".$vt.";type=FAX:".$result->fax."\r";
- $vcard_content .= "VERSION:3.0\r";
- $vcard_content .= "END:VCARD";
+ $vcard_content .= "N:".$result->lastname.";".$result->firstname.";;;\r\n";
+ $vcard_content .= "FN:".$result->firstname.".".$result->lastname."\r\n";
+ $vcard_content .= "EMAIL:".$result->email_address."\r\n";
+ $vcard_content .= "TEL;type=".$vt.";type=pref:".$result->telephone."\r\n";
+ $vcard_content .= "TEL;type=".$vt.";type=FAX:".$result->fax."\r\n";
+ $vcard_content .= "VERSION:3.0\r\n";
+ $vcard_content .= "END:VCARD\r\n\r\n";
- header('Content-Disposition: inline; filename="'.$result->lastname.$result->firstname.'.vcf"');
+ header('Content-Disposition: inline; filename="'.$result->lastname.'.'.$result->firstname.'.vcf"');
header('Content-Type: application/x-vcard; charset=utf-8');
echo $vcard_content;
exit;
@@ -764,7 +747,8 @@
$query_raw = "select ".$adjust->listfields.", c.customers_id as id from " . TABLE_CUSTOMERS . " c ".
- " LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(c.customers_id =ci.customers_info_id ) ";
+ " LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(c.customers_id =ci.customers_info_id ) ".
+ " LEFT JOIN " . TABLE_LANGUAGES . " l ON(c.customers_language =l.languages_id ) ";
// " LEFT JOIN " . TABLE_CUSTOMERS_GROUPS . " cg ON(c.customers_group_id = cg.customers_group_id) ";
/* DEB Sub module add table */
@@ -789,6 +773,7 @@
/* END Sub module add col */
$query_raw .= " ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' ci.customers_info_date_account_created DESC ');
+
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
@@ -958,7 +943,7 @@
self::$modules->display_ColumnRowAction($customers['id']) ,
sprintf(CsrtAction::getLink('row_action_right', __('incarner'), 'incarner'), '', tep_catalog_href_link('login.php','osCAdminDirect='.md5($SecuKey.date('d')).'&id='.$customers['id'],'SSL', false ) ,'').
sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'noedit'), '', tep_href_link(self::FILENAME,'cID=' . $customers['id'].'&action=noedit' ),'' ).
-// sprintf(CsrtAction::getLink('row_action_right', __('@customers button vcard'), 'vcard'), '', tep_href_link(self::FILENAME,'cID=' . $customers['id'].'&action=vcard' ) ,'').
+ sprintf(CsrtAction::getLink('row_action_right', __('@customers button vcard'), 'vcard'), '', tep_href_link(self::FILENAME,'cID=' . $customers['id'].'&action=vcard' ) ,'').
sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME,'cID=' . $customers['id'].'&action=edit' ),'' ).
sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'cID=' . $customers['id'].'&action=delete' ) ,'' )
);
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-12-30 15:47:14 UTC (rev 4679)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-12-30 16:18:29 UTC (rev 4680)
@@ -402,10 +402,11 @@
@remarks filter based on language
*/
if(isset($_SESSION['filters'][__CLASS__]['language_id']))
- $new_languages_id = $_SESSION['filters'] [__CLASS__]['language_id'];
+ $new_languages_id = $_SESSION['filters'][__CLASS__]['language_id'];
else
$new_languages_id =$languages_id;
+ $_SESSION['filters']['language_id'] = $_SESSION['filters'][__CLASS__]['language_id'] = $new_languages_id;
/**
@remarks filter based on categorie
@@ -500,8 +501,10 @@
*/
if(isset($_SESSION['filters'][__CLASS__]['expected']))
$_SESSION['filters']['expected'] = $_SESSION['filters'] [__CLASS__]['expected'];
- else
+ else{
$_SESSION['filters']['expected'] =array();
+ $_SESSION['filters']['expected']['publied'] = 'on';
+ }
$array = array();
foreach($_SESSION['filters']['expected'] as $key=>$row)
@@ -510,10 +513,10 @@
if((!in_array('publied', $array) && in_array('nopublied', $array) )|| isset($_GET['expected']) ){
$_SESSION['filters']['expected'] =array();
$_SESSION['filters']['expected']['nopublied'] = 'on';
- self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available IS NOT NULL ";
+ self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available >= NOW() ";
}
elseif(in_array('publied', $array) && !in_array('nopublied', $array) )
- self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available IS NULL ";
+ self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available <>'' ";
@@ -522,8 +525,11 @@
*/
if(isset($_SESSION['filters'][__CLASS__]['status']))
$_SESSION['filters']['status'] = $_SESSION['filters'] [__CLASS__]['status'];
- else
+ else{
$_SESSION['filters']['status'] =array();
+ $_SESSION['filters']['status']['publied'] = 'on';
+ $_SESSION['filters']['status']['nopublied'] = 'on';
+ }
$array = array();
foreach($_SESSION['filters']['status'] as $key=>$row)
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-12-30 15:47:14 UTC (rev 4679)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-12-30 16:18:29 UTC (rev 4680)
@@ -151,7 +151,7 @@
min-width:(@display_max_width * 0.75 ) ;
width:(@display_width * 0.75 ) ;
display:block;
- position: absolute;
+ position: fixed;
margin: 10px 1%;
right: 0;
top:0;
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-12-30 15:47:14 UTC (rev 4679)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-12-30 16:18:29 UTC (rev 4680)
@@ -161,7 +161,7 @@
min-width:(@display_max_width * 0.75 ) ;
width:(@display_width * 0.75 ) ;
display:block;
- position: absolute;
+ position: fixed;
margin: 10px 1%;
right: 0;
top:0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
