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...> - 2011-04-04 09:01:36
|
Revision: 3669
http://oscss.svn.sourceforge.net/oscss/?rev=3669&view=rev
Author: oscim
Date: 2011-04-04 09:01:26 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
suite dev extension
Ajout sort des page cms
Modified Paths:
--------------
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php
Modified: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab 2011-04-04 07:34:37 UTC (rev 3668)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab 2011-04-04 09:01:26 UTC (rev 3669)
@@ -10,21 +10,35 @@
*/
?>
-<h3><?php echo __('text info heading sortChilds category'); ?></h3>
+
<div class="box_uniq block_form">
+ <h3><?php echo __('text info heading sortChilds products in category'); ?></h3>
<ul >
<?php foreach(listing_order::$Psort as $sorts ): ?>
<li class="block_input">
<span class="sort fleft">
- <?php echo tep_draw_checkbox_field('listing_order[sort]['.$sorts['id'].']','listing_order_sort_'.$sorts['id'] ,'on',(isset(listing_order::$PsortSelected[$sorts['name']])? true: false) ) .' '.$sorts['text'] ?>
+ <?php echo tep_draw_checkbox_field('listing_order[p][sort]['.$sorts['id'].']','listing_order_sort_'.$sorts['id'] ,'on',(isset(listing_order::$PsortSelected[$sorts['name']])? true: false) ) .' '.$sorts['text'] ?>
</span>
<span class="sortby fright">
- <?php echo tep_draw_input_field('listing_order[sortorder]['.$sorts['id'].']','listing_order_sortorder_'.$sorts['id'], (isset(listing_order::$PsortSelected[$sorts['name']]['sortorder'])? listing_order::$PsortSelected[$sorts['name']]['sortorder']: '0'),' size="3"') ?>
- <?php echo tep_draw_radio_field('listing_order[sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'asc', ((isset(listing_order::$PsortSelected[$sorts['name']]) && listing_order::$PsortSelected[$sorts['name']]['sortby']=='asc')? true: false) ).__('text asc').tep_draw_radio_field('listing_order[sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'desc', ((isset(listing_order::$PsortSelected[$sorts['name']]) && listing_order::$PsortSelected[$sorts['name']]['sortby']=='desc')? true: false)).__('text desc') ?>
+ <?php echo tep_draw_input_field('listing_order[p][sortorder]['.$sorts['id'].']','listing_order_sortorder_'.$sorts['id'], (isset(listing_order::$PsortSelected[$sorts['name']]['sortorder'])? listing_order::$PsortSelected[$sorts['name']]['sortorder']: '0'),' size="3"') ?>
+ <?php echo tep_draw_radio_field('listing_order[p][sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'asc', ((isset(listing_order::$PsortSelected[$sorts['name']]) && listing_order::$PsortSelected[$sorts['name']]['sortby']=='asc')? true: false) ).__('text asc').tep_draw_radio_field('listing_order[p][sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'desc', ((isset(listing_order::$PsortSelected[$sorts['name']]) && listing_order::$PsortSelected[$sorts['name']]['sortby']=='desc')? true: false)).__('text desc') ?>
</span>
</li>
<?php endforeach; ?>
</ul>
-
+ <h3><?php echo __('text info heading sortChilds content in category'); ?></h3>
+ <ul >
+ <?php foreach(listing_order::$Csort as $sorts ): ?>
+ <li class="block_input">
+ <span class="sort fleft">
+ <?php echo tep_draw_checkbox_field('listing_order[c][sort]['.$sorts['id'].']','listing_order_sort_'.$sorts['id'] ,'on',(isset(listing_order::$CsortSelected[$sorts['name']])? true: false) ) .' '.$sorts['text'] ?>
+ </span>
+ <span class="sortby fright">
+ <?php echo tep_draw_input_field('listing_order[c][sortorder]['.$sorts['id'].']','listing_order_sortorder_'.$sorts['id'], (isset(listing_order::$CsortSelected[$sorts['name']]['sortorder'])? listing_order::$CsortSelected[$sorts['name']]['sortorder']: '0'),' size="3"') ?>
+ <?php echo tep_draw_radio_field('listing_order[c][sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'asc', ((isset(listing_order::$CsortSelected[$sorts['name']]) && listing_order::$CsortSelected[$sorts['name']]['sortby']=='asc')? true: false) ).__('text asc').tep_draw_radio_field('listing_order[c][sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'desc', ((isset(listing_order::$CsortSelected[$sorts['name']]) && listing_order::$CsortSelected[$sorts['name']]['sortby']=='desc')? true: false)).__('text desc') ?>
+ </span>
+ </li>
+ <?php endforeach; ?>
+ </ul>
</div>
\ No newline at end of file
Modified: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt 2011-04-04 07:34:37 UTC (rev 3668)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt 2011-04-04 09:01:26 UTC (rev 3669)
@@ -10,18 +10,27 @@
*/
$lang['module acapro listing_order text title']= 'Tri dans les listing';
$lang['module acapro listing_order text description']= 'Option de tri pour les listing';
+
+$lang['text info heading sortChilds products in category']= 'Ordre de tri des produits dans cette categorie';
$lang['tab cat sortchilds']= 'Options Tri';
$lang['txt sortChilds products_quantity']= 'Quantité';
$lang['txt sortChilds products_model']= 'Modele';
$lang['txt sortChilds products_price']= 'Prix';
$lang['txt sortChilds products_date_added']= 'Date d\'ajout';
-$lang['txt sortChilds products_last_modified']= 'Date dernièere modification';
+$lang['txt sortChilds products_last_modified']= 'Date dernière modification';
$lang['txt sortChilds products_date_available']= 'Date disponibilité';
$lang['txt sortChilds products_ordered']= 'Ordre de tri des produits';
+$lang['txt sortChilds products_weight']= 'Poids';
$lang['text asc']= 'Tri Croissant';
$lang['text desc']= 'Tri decroissant';
-$lang['text info heading sortChilds category']= 'Ordre de tri des produtis dans cette categorie';
+
+$lang['text info heading sortChilds content in category']= 'Ordre de tri des page de contenu dans cette categorie';
+$lang['txt sortChilds content_id']= 'Ordre de tri des pages';
+$lang['txt sortChilds content_name']= 'Clef';
+$lang['txt sortChilds date_added']= 'Date d\'ajout';
+$lang['txt sortChilds last_modified']= 'Date dernière modification';
+$lang['txt sortChilds sort_order']= 'Ordre de tri des pages';
?>
\ No newline at end of file
Modified: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php 2011-04-04 07:34:37 UTC (rev 3668)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php 2011-04-04 09:01:26 UTC (rev 3669)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 29/08/10, 21:47
+ @version 2.1.0
+ @date 04/04/11, 09:48
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class listing_order
@@ -15,6 +15,7 @@
ALTER TABLE `osc_categories` ADD `sortchids_products` VARCHAR( 50 ) NOT NULL ,
ADD `sortchids_content` VARCHAR( 50 ) NOT NULL
*/
+error_reporting(E_ALL);
class listing_order
implements InterfaceModule{
/**
@@ -38,7 +39,20 @@
@var array, recup db , selected
*/
public static $PsortSelected=array();
+ /**
+ @var array, list des tri possible pour les content
+ */
+ public static $Csort;
+ /**
+ @var array, exclude champs content
+ */
+ private static $Csort_exclude = array('content_status','content_hidden');
+ /**
+ @var array, recup db , selected content
+ */
+ public static $CsortSelected=array();
+
var $code;
var $title;
var $description;
@@ -72,12 +86,10 @@
$this->load_db_values (0);
$sort ='';
$tsort = array(array());
- foreach($_POST[__CLASS__]['sort'] as $k=>$item){
-// var_dump($item,$_POST[__CLASS__]['sortorder'][$k]);
- if(isset(self::$Psort[$k]) && $_POST[__CLASS__]['sort'][$k] =='on')
- $tsort[(int)$_POST[__CLASS__]['sortorder'][$k]][] =' '.self::$Psort[$k]['sql'].' '. (isset($_POST[__CLASS__]['sortby'][$k]) ? $_POST[__CLASS__]['sortby'][$k] : 'asc').' ,' ;
-
+ foreach($_POST[__CLASS__]['p']['sort'] as $k=>$item){
+ if(isset(self::$Psort[$k]) && $_POST[__CLASS__]['p']['sort'][$k] =='on')
+ $tsort[(int)$_POST[__CLASS__]['p']['sortorder'][$k]][] =' '.self::$Psort[$k]['sql'].' '. (isset($_POST[__CLASS__]['p']['sortby'][$k]) ? $_POST[__CLASS__]['p']['sortby'][$k] : 'asc').' ,' ;
}
ksort($tsort);
@@ -89,6 +101,21 @@
$sql_data_array['sortchids_products'] =substr($sort,0,-1);
+ $sort ='';
+ $tsort = array(array());
+ foreach($_POST[__CLASS__]['c']['sort'] as $k=>$item){
+ if(isset(self::$Csort[$k]) && $_POST[__CLASS__]['c']['sort'][$k] =='on')
+ $tsort[(int)$_POST[__CLASS__]['c']['sortorder'][$k]][] =' '.self::$Csort[$k]['sql'].' '. (isset($_POST[__CLASS__]['c']['sortby'][$k]) ? $_POST[__CLASS__]['c']['sortby'][$k] : 'asc').' ,' ;
+ }
+ ksort($tsort);
+
+ foreach($tsort as $item)
+ for($ii=0,$m=count($item); $ii<$m; $ii++){
+ $sort .=$item[$ii];
+ }
+
+ $sql_data_array['sortchids_content'] =substr($sort,0,-1);
+
return $sql_data_array;
}
@@ -102,15 +129,10 @@
UP db
*/
public static function load_db_values ($cat_id) {
-// $arr ['cat_id'] = $cat_id;
-// $arr=array_merge(array('cat_id'=>$cat_id) ,parent::load_db_values ($cat_id, 'cat') );
-// self::$pInfo->objectInfo($arr);
-// error_reporting(E_ALL);
- $DB=Database::getInstance();
- $DB->query("SELECT * FROM ".TABLE_PRODUCTS." ;");
- $r=$DB->listFields(TABLE_PRODUCTS);
-// var_dump($r);
+ $DB=Database::getInstance();
+ $DB->query("SELECT * FROM ".TABLE_PRODUCTS." ;");
+ $r=$DB->listFields(TABLE_PRODUCTS);
$i=0;
foreach($r as $k=>$v){
@@ -119,6 +141,19 @@
$i++;
}
}
+
+
+ $DB->query("SELECT * FROM ".TABLE_CONTENT." ;");
+ $r=$DB->listFields(TABLE_CONTENT);
+ $i=0;
+ foreach($r as $k=>$v){
+ if(!in_array($v['name'],self::$Csort_exclude)) {
+ self::$Csort[$i]=array('id'=>$i,'name'=>$v['name'], 'sql'=>'c.'.$v['name'], 'text'=> __('txt sortChilds '.$v['name']));
+ $i++;
+ }
+ }
+
+
// print_r(self::$Psort);
// $languages = tep_get_languages();
// $epf_query = tep_db_query($sql="select e.epf_id, e.epf_uses_value_list, e.epf_show_parent_chain, e.epf_size,e.epf_key, l.epf_label, l.languages_id, l.epf_active_for_language, l.epf_label_help from " . TABLE_PRODUCTS_EXTRA_FIELDS . " e join " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l where e.epf_status and l.languages_id='".(int)$languages_id."' and (e.epf_id = l.epf_id) order by e.epf_order");
@@ -145,7 +180,7 @@
/// actuel
if($cat_id>0){
- $res=$DB->query("SELECT sortchids_products FROM ".TABLE_CATEGORIES." WHERE categories_id='".$cat_id."';");
+ $res=$DB->query("SELECT sortchids_products, sortchids_content FROM ".TABLE_CATEGORIES." WHERE categories_id='".$cat_id."';");
$r=$res->fetchAssoc();
$tab=explode(',',$r['sortchids_products']);
$i=0;
@@ -154,6 +189,14 @@
$name=str_replace('p.','',$iret[0]);
self::$PsortSelected[$name]=array('sql'=>$iret[0],'value'=>$name,'sortorder'=>(string)$i++ , 'sortby'=>trim($iret[1]) );
}
+
+ $tab=explode(',',$r['sortchids_content']);
+ $i=0;
+ foreach($tab as $item){
+ $iret=explode(' ',ltrim(rtrim($item)));
+ $name=str_replace('c.','',$iret[0]);
+ self::$CsortSelected[$name]=array('sql'=>$iret[0],'value'=>$name,'sortorder'=>(string)$i++ , 'sortby'=>trim($iret[1]) );
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-04 07:34:48
|
Revision: 3668
http://oscss.svn.sourceforge.net/oscss/?rev=3668&view=rev
Author: oscim
Date: 2011-04-04 07:34:37 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
Ajout des type de produits dans les listing de l'admin , ajout preselecteur de type
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/gabarit/products.listing.gab
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
branches/2.1.0/catalog/admin/includes/modules/pages/products.php
Modified: branches/2.1.0/catalog/admin/includes/gabarit/products.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/products.listing.gab 2011-04-04 06:53:38 UTC (rev 3667)
+++ branches/2.1.0/catalog/admin/includes/gabarit/products.listing.gab 2011-04-04 07:34:37 UTC (rev 3668)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 08/09/10, 16:35
+ @version 2.1.0
+ @date 04/04/11, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -14,6 +15,9 @@
<div class="fleft smallText" style="width:25%">
<?php echo tep_draw_form('goto', products::FILENAME, '', 'get').'<p>'.__('heading title goto') . ' ' . tep_draw_pull_down_menu('cPath', tep_get_category_tree(), products::$cPath, 'onchange="this.form.submit();"').'</p></form>'; ?>
</div>
+<div class="fleft smallText" style="width:25%">
+ <?php echo tep_draw_form('goto2', products::FILENAME, '', 'get').'<p>'.__('heading title type') . ' ' . tep_draw_pull_down_menu('Vtype', tep_get_status_array('products_virtual_types'), products::$Vtype, 'onchange="this.form.submit();"').'</p></form>'; ?>
+ </div>
<div class="navButtons">
<?php
echo '<a class="button" href="' . tep_href_link(FILENAME_FEEDS,'box=low_stock') . '">' . tep_image(DIR_WS_ICONS.'icon_feed.png' , IMAGE_TRACKED_LOW_STOCK,16,16) .IMAGE_TRACKED_LOW_STOCK . '</a>';
@@ -32,6 +36,7 @@
<th style="width:2%;"> </th>
<th style="width:3%" class="tcenter"><?php echo __('table heading id'); ?></th>
<th style="width:3%"><?php echo __('table heading image'); ?></th>
+ <th style="width:10%" class="tcenter"><?php echo __('table heading type'); ?></th>
<th style="width:10%" class="tcenter"><?php echo __('table heading model'); ?></th>
<th style="width:25%" class="tleft"><?php echo __('table heading products'); ?></th>
<th style="width:12%" class="tleft"><?php echo __('table heading categorie'); ?></th>
@@ -46,6 +51,7 @@
<td style="width:2%;"><?php echo tep_draw_hidden_field('xx','xxx','','class="search_init" '); ?></td>
<td style="width:3%"><?php echo tep_draw_input_field('product_id','product_id',__('table heading id'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:3%"><?php echo tep_draw_input_field('products_image','products_image',__('table heading image'),'style="width:100%" class="search_init"'); ?></td>
+ <td style="width:3%" class="tcenter"><?php echo tep_draw_input_field('pv.typeID','pv.typeID',__('table heading type'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:10%" class="tcenter"><?php echo tep_draw_input_field('model','model',__('table heading model'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:25%" class="tleft"><?php echo tep_draw_input_field('p.product_id','pproduct_id',__('table heading products'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:12%" class="tleft"><?php echo tep_draw_input_field('categories_name','categories_name',__('table heading categorie'),'style="width:100%" class="search_init"'); ?></td>
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-04-04 06:53:38 UTC (rev 3667)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-04-04 07:34:37 UTC (rev 3668)
@@ -1,15 +1,17 @@
<?php
/**
@licence GPL 2005-2011 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 23/03/11, 15:47
+ @date 04/04/11, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$lang['heading title']='Produits';
$lang['heading title search']='Rechercher :';
$lang['heading title goto']='Aller à :';
+$lang['heading title type']='Type :';
$lang['table heading id']='ID';
$lang['table heading products']='Produits';
@@ -20,6 +22,7 @@
$lang['table heading status']='Statut';
$lang['table heading stock']='Stock';
$lang['table heading price']='Prix';
+$lang['table heading type']='Type';
$lang['text legend stock']='Stock';
$lang['text legend price']='Prix';
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-04-04 06:53:38 UTC (rev 3667)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-04-04 07:34:37 UTC (rev 3668)
@@ -4,13 +4,14 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.0
- @date 17/03/11, 15:42
+ @date 04/04/11, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
/**
@class products
+ @brief master class for manage and edit products
*/
class products
implements ExtModPage, InterfacedTJsonS, InterfacedInnerHtml{
@@ -77,25 +78,28 @@
public static $cPath;
+ public static $Vtype;
public function __construct(){
self::$code=__CLASS__;
//! active datatable in ajax, precise les GET necessaire
- if(!defined('JSONSTATMENT')) define('JSONSTATMENT', 'mod=page&type='.self::$code.(isset($_GET['expected'])?'&expected=true':'').(isset($_GET['cPath'])?'&cPath='.$_GET['cPath']:''));
+ if(!defined('JSONSTATMENT')) define('JSONSTATMENT', 'mod=page&type='.self::$code.(isset($_GET['expected'])?'&expected=true':'').(isset($_GET['cPath'])?'&cPath='.$_GET['cPath']:'').(isset($_GET['Vtype'])?'&Vtype='.$_GET['Vtype']:''));
//! detail item in ajax
if(!defined('AJAXSTATMENTDETAIL')) define('AJAXSTATMENTDETAIL', 'mod=page&type='.self::$code);
self::$cPath=(isset($_GET['cPath'])? (int)$_GET['cPath'] : 0);
+ self::$Vtype=(isset($_GET['Vtype'])? (int)$_GET['Vtype'] : '');
self::$modules=new productsACA;
self::$modules->set_image_handler();
- // check if the catalog image directory exists
+ // check if the catalog image directory exists
+ global $messageStack;
if (is_dir(DIR_FS_CATALOG_IMAGES)) {
- if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE, 'error');
+ if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(__('error catalog image directory not writeable'), 'error');
}
- else $messageStack->add(ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST, 'error');
+ else $messageStack->add(__('error catalog image directory does not exist'), 'error');
self::$languages = tep_get_languages();
}
@@ -104,7 +108,7 @@
/** public static ExtModPage */
public function check_action($actionss){
- global $languages_id;
+ global $languages_id,$messageStack;
self::$action=$actionss;
$DB=Database::getInstance();
@@ -677,6 +681,7 @@
return array( 'null',
'id',
'image',
+ 'pv.typeID',
'model',
'name',
'categorie',
@@ -691,6 +696,7 @@
return array( 0 =>false,
'products_id'=>true,
'products_image'=>true,
+ 'pv.typeID'=>true,
'products_model'=>true,
'products_name'=>true,
'categories_name'=>false,
@@ -707,9 +713,11 @@
if(self::$cPath>0) self::$DiversInfo['current_category_id']=self::$cPath;
else self::$DiversInfo['current_category_id']=(isset($options['current_category_id'])?$options['current_category_id'] :'');
+ $sta=(!empty(self::$Vtype)? " AND pv.typeID ='".(int)self::$Vtype."' " : '' );
+
$DB=Database::getInstance();
$listing_products=array();
- $sta=$add_tbl='';
+ $add_tbl='';
$cat= (tep_not_null(self::$DiversInfo['current_category_id']))?" and p2c.categories_id = '" . (int)self::$DiversInfo['current_category_id'] . "' " : "" ;
$avenir=(isset($_GET['expected']) && tep_not_null($_GET['expected'])) ? " and p.products_date_available IS NOT NULL " : " and p.products_date_available IS NULL ";
@@ -722,13 +730,14 @@
}
}
- $products_query = "select distinct p.products_id, p.products_image, p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c ".$add_tbl." where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".$cat." ".$avenir." ".$sta." ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
+ $products_query = "select distinct p.products_id, p.products_image, pv.typeID , p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status from " . TABLE_PRODUCTS . " p LEFT JOIN ".TABLE_PRODUCTS_VIRTUAL." pv on(p.products_id = pv.productsID) LEFT JOIN ".TABLE_STATUS." s on(pv.typeID = s.status_id and s.status_type='products_virtual_types' and s.language_id='" . (int)$languages_id . "') , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c ".$add_tbl." where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".$cat." ".$avenir." ".$sta." ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
$products_split = new splitPageResults($page, $rowbyp, $products_query,$query_numrows);
$pq=$DB->query($products_query);
while ($products = tep_db_fetch_array($pq)) {
+ $products['pv.typeID']=(!empty($products['typeID'])? $products['typeID']: '0');
$products['products_image']=(!empty($products['products_image']))
? tep_info_image($products['products_image'], $products['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT)
: tep_info_image(IMAGE_NONEXISTENT, $products['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) ;
@@ -755,7 +764,6 @@
$res[]=$li;
}
-
if(count($res)==0) $res[]= self::emptyResult();
return $res;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-04 06:53:44
|
Revision: 3667
http://oscss.svn.sourceforge.net/oscss/?rev=3667&view=rev
Author: oscim
Date: 2011-04-04 06:53:38 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
Correctio coquille dans la requete sql, lors des recherche avec colonne id ambigus
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-04-04 06:52:11 UTC (rev 3666)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-04-04 06:53:38 UTC (rev 3667)
@@ -459,7 +459,7 @@
public static function tep_get_modele(){
return array( 0 =>false,
- 'categories_id'=>true,
+ 'c.categories_id'=>true,
'categories_image'=>true,
'categories_name'=>true,
'categories_status'=>true,
@@ -470,7 +470,7 @@
private static function emptyResult(){
return array( 'null'=>'',
- 'categories_id'=>'',
+ 'c.categories_id'=>'',
'categories_name'=>'',
'categories_image'=>'',
// 'parent_id',
@@ -496,6 +496,7 @@
$pq=$DB->query($categories_query);
while ($categories = $pq->fetchAssoc()) {
+ $categories['c.categories_id']=$categories['categories_id'];
$categories['categories_image']=(!empty($categories['categories_image'])) ? tep_info_image($categories['categories_image'], $categories['categories_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) : ' N/A';
$categories['categories_status']=self::get_status_categories($categories);
$categories['categories_hidden']=self::get_status_menu($categories);
@@ -658,15 +659,6 @@
public function load_post_values($post){}
-// function repost_values (){
-// }
-
-// public function display_edit($contents){
-// }
-
-// public function display_right_column ($contents, $account_id) {
-// }
-
/**
Call enabled modules that have something to preview
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-04 06:52:22
|
Revision: 3666
http://oscss.svn.sourceforge.net/oscss/?rev=3666&view=rev
Author: oscim
Date: 2011-04-04 06:52:11 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
suppression de la casse dans les recherche avec datatable
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/classes/dataTableJsonStatment.php
Modified: branches/2.1.0/catalog/admin/includes/classes/dataTableJsonStatment.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/classes/dataTableJsonStatment.php 2011-04-04 06:41:38 UTC (rev 3665)
+++ branches/2.1.0/catalog/admin/includes/classes/dataTableJsonStatment.php 2011-04-04 06:52:11 UTC (rev 3666)
@@ -1,15 +1,14 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 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 06/09/10, 20:58
+ @date 04/04/11, 08:51
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class dataTableJsonStatment
-
- gestion des dataTable via ajax, tri, search
+ @brief gestion des dataTable via ajax, tri, search
*/
class dataTableJsonStatment {
@@ -76,7 +75,7 @@
if ( $_REQUEST['sSearch'] != "" ) {
self::$sWhere.= " AND (";
foreach(self::$modele as $col=>$v)
- if(!is_numeric($col) && (bool)$v) self::$sWhere .=" ".$col." LIKE '%".tep_db_input( $_REQUEST['sSearch'] )."%' OR ";
+ if(!is_numeric($col) && (bool)$v) self::$sWhere .=" UPPER(".$col.") LIKE '%".strtoupper(tep_db_input( $_REQUEST['sSearch'] ))."%' OR ";
self::$sWhere = substr(self::$sWhere,0,strlen(self::$sWhere)-3). " ) ";
}
@@ -85,7 +84,7 @@
$i=0;
reset(self::$modele);
foreach(self::$modele as $col=>$v){
- if(tep_not_null($_REQUEST['sSearch_'.$i])) self::$sWhere .=" AND ".$col." LIKE '%".tep_db_input( $_REQUEST['sSearch_'.$i] )."%' ";
+ if(tep_not_null($_REQUEST['sSearch_'.$i])) self::$sWhere .=" AND UPPER(".$col.") LIKE '%".strtoupper(tep_db_input( $_REQUEST['sSearch_'.$i] ))."%' ";
$i++;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-04 06:41:48
|
Revision: 3665
http://oscss.svn.sourceforge.net/oscss/?rev=3665&view=rev
Author: oscim
Date: 2011-04-04 06:41:38 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
correction coquille categories, message alerte reliquat evolution des langue
customer, ajour update last login and count logon
Ajout truncate table dans les options de backup
correction coquille nbr var in db categorie sort child
template coquille html
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/gabarit/backup.listing.gab
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
branches/2.1.0/catalog/admin/includes/modules/pages/backup.php
branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
branches/2.1.0/catalog/includes/classes/page.customer.php
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php
branches/2.1.0/catalog/install/oscss.sql
Modified: branches/2.1.0/catalog/admin/includes/gabarit/backup.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/backup.listing.gab 2011-04-03 15:22:30 UTC (rev 3664)
+++ branches/2.1.0/catalog/admin/includes/gabarit/backup.listing.gab 2011-04-04 06:41:38 UTC (rev 3665)
@@ -1,21 +1,22 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 17/07/10, 16:35
+ @version 2.1.0
+ @date 03/04/11, 19:31
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
?>
<h3><?php echo __('heading title'); ?></h3>
- <div class="button">
+ <div class="button_nav">
<?php if ( (backup::$action != 'backup') ) echo '<a class="button" href="' . tep_href_link(backup::FILENAME, 'action=backup') . '">' . __('image backup') . '</a>'; ?>
<?php if ( (backup::$action != 'restorelocal') && backup::$dir_ok==true ) echo ' <a class="button" href="' . tep_href_link(backup::FILENAME, 'action=restorelocal') . '">' . __('image restore file ext') . '</a>'; ?>
<?php if (defined('DB_LAST_RESTORE')): ?>
- <?php echo TEXT_LAST_RESTORATION . ' ' . DB_LAST_RESTORE . ' <a class="button" href="' .tep_href_link(FILENAME_BACKUP, 'action=forget') . '">' . TEXT_FORGET . '</a>'; ?></td>
+ <?php echo __('text last restoration') . ' ' . DB_LAST_RESTORE . ' <a class="button" href="' .tep_href_link(FILENAME_BACKUP, 'action=forget') . '">' . __('text forget') . '</a>'; ?></td>
<?php endif; ?>
</div>
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2011-04-03 15:22:30 UTC (rev 3664)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2011-04-04 06:41:38 UTC (rev 3665)
@@ -1,11 +1,13 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 30/08/10, 21:39
+ @version 2.1.0
+ @date 03/04/11, 22:08
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
+
*/
$lang['heading title']="Gestionnaire de sauvegarde de la base de données";
$lang['table heading title']="Titre";
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/backup.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/backup.php 2011-04-03 15:22:30 UTC (rev 3664)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/backup.php 2011-04-04 06:41:38 UTC (rev 3665)
@@ -143,6 +143,9 @@
fputs($fp, mb_convert_encoding($schema,mb_detect_encoding($schema),"UTF-8"));
}
+ if (isset($_POST['backup_truncate']) && ($_POST['backup_truncate'] == 'yes'))
+ fputs($fp, mb_convert_encoding('TRUNCATE TABLE '.$table.' ;'. "\n\n",mb_detect_encoding($schema),"UTF-8"));
+
//! data
$rows_query = tep_db_query("select " . implode(',', $table_list) . " from " . $table);
while ($rows = tep_db_fetch_array($rows_query)) {
@@ -411,10 +414,12 @@
$contents[] = array('text' => __('text info new backup'));
$contents[] = array('class' => 'block_input','text' => tep_draw_radio_field('compress', 'no', 'no', true) . ' ' . __('text info use no compression') );
+
if (@file_exists(LOCAL_EXE_ZIP)) $contents[] = array('class' => 'block_input','text' => tep_draw_radio_field('compress', 'zip', 'zip') . ' ' . __('text_info_use_zip'));
if (function_exists('gzopen'))$contents[] = array('class' => 'block_input','text' => tep_draw_radio_field('compress', 'gzip', 'gzip') . ' ' . __('text info use gzip'));
$contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('backup_structure','', 'yes') . ' ' . __('faire un backup integrant la structure des tables'));
+ $contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('backup_truncate','', 'yes') . ' ' . __('ajouter commende pour vider les tables avant de restaurer'));
if (self::$dir_ok == true)
$contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('download','', 'yes') . ' ' . __('text info download only'));
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-04-03 15:22:30 UTC (rev 3664)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-04-04 06:41:38 UTC (rev 3665)
@@ -4,14 +4,18 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.0
- @date 17/03/11, 15:42
+ @date 04/04/11, 08:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
+ @brief manage category and module aca for cat
+*/
+
+
+
+/**
@class categories
-
- gestion des module aca
+ @brief master class edit and manage cat
*/
-
class categories
implements ExtModPage, InterfacedTJsonS{
@@ -77,10 +81,11 @@
self::$cPath=(isset($_GET['cPath'])? (int)$_GET['cPath'] : 0);
// check if the catalog image directory exists
+ global $messageStack;
if (is_dir(DIR_FS_CATALOG_IMAGES)) {
- if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(ERROR_CATALOG_IMAGE_DIRECTORY_NOT_WRITEABLE, 'error');
+ if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(__('error catalog image directory not writeable'), 'error');
}
- else $messageStack->add(ERROR_CATALOG_IMAGE_DIRECTORY_DOES_NOT_EXIST, 'error');
+ else $messageStack->add(__('error catalog image directory does not exist'), 'error');
self::$languages = tep_get_languages();
}
@@ -91,7 +96,7 @@
/** public static ExtModPage */
public function check_action($actionss){
- global $languages_id, $oscss;
+ global $languages_id, $oscss,$messageStack;
self::$action=$actionss;
$DB=Database::getInstance();
Modified: branches/2.1.0/catalog/includes/classes/page.customer.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/page.customer.php 2011-04-03 15:22:30 UTC (rev 3664)
+++ branches/2.1.0/catalog/includes/classes/page.customer.php 2011-04-04 06:41:38 UTC (rev 3665)
@@ -12,7 +12,7 @@
Traitement db select|insert|update du compte membre
Fonction native du noyau deporté dans cette class
*/
-error_reporting(E_ALL);
+
class customer {
/**
@@ -115,7 +115,7 @@
public function detail_long_cust(){
$account_query = tep_db_query("select * from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . $this->customer_id . "'");
$account = tep_db_fetch_array($account_query);
- $this->customer=array_merge((array)$this->customer,(array)$account);
+ return $this->customer=array_merge((array)$this->customer,(array)$account);
}
@@ -978,6 +978,10 @@
// restore cart contents
$cart->restore_contents();
+
+
+ // update logon user
+ $DB->query("UPDATE " . TABLE_CUSTOMERS_INFO . " SET customers_info_date_of_last_logon=NOW() , customers_info_number_of_logons = + 1 WHERE customers_info_id ='".(int)$customer_id."' ");
}
/**
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php 2011-04-03 15:22:30 UTC (rev 3664)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php 2011-04-04 06:41:38 UTC (rev 3665)
@@ -123,6 +123,8 @@
</form>
</div>
<?php endif ; ?>
+
+ </div>
<div class="bottom_prod_box_big"></div>
</div>
</div>
Modified: branches/2.1.0/catalog/install/oscss.sql
===================================================================
--- branches/2.1.0/catalog/install/oscss.sql 2011-04-03 15:22:30 UTC (rev 3664)
+++ branches/2.1.0/catalog/install/oscss.sql 2011-04-04 06:41:38 UTC (rev 3665)
@@ -109,8 +109,8 @@
last_modified datetime default '1000-01-01 00:00:00' null ,
categories_status tinyint(1) NOT NULL default '0',
categories_hidden tinyint(1) NOT NULL default '0',
- sortchids_products varchar( 50 ),
- sortchids_content varchar( 50 ),
+ sortchids_products varchar( 150 ),
+ sortchids_content varchar( 150 ),
PRIMARY KEY (categories_id),
KEY idx_categories_parent_id (parent_id)
) DEFAULT CHARSET=utf8;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-03 15:22:37
|
Revision: 3664
http://oscss.svn.sourceforge.net/oscss/?rev=3664&view=rev
Author: oscim
Date: 2011-04-03 15:22:30 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
correction extension
Modified Paths:
--------------
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab
branches/2.1.0/extensions/LISTING_ORDER_stable/install.xml
Added Paths:
-----------
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php
Removed Paths:
-------------
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/SortChilds.txt
branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/SortChilds.php
Modified: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab 2011-04-03 15:10:05 UTC (rev 3663)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/gabarit/categories.SortChilds.display_edit.gab 2011-04-03 15:22:30 UTC (rev 3664)
@@ -13,14 +13,14 @@
<h3><?php echo __('text info heading sortChilds category'); ?></h3>
<div class="box_uniq block_form">
<ul >
- <?php foreach(SortChilds::$Psort as $sorts ): ?>
+ <?php foreach(listing_order::$Psort as $sorts ): ?>
<li class="block_input">
<span class="sort fleft">
- <?php echo tep_draw_checkbox_field('SortChilds[sort]['.$sorts['id'].']','SortChilds_sort_'.$sorts['id'] ,'on',(isset(SortChilds::$PsortSelected[$sorts['name']])? true: false) ) .' '.$sorts['text'] ?>
+ <?php echo tep_draw_checkbox_field('listing_order[sort]['.$sorts['id'].']','listing_order_sort_'.$sorts['id'] ,'on',(isset(listing_order::$PsortSelected[$sorts['name']])? true: false) ) .' '.$sorts['text'] ?>
</span>
<span class="sortby fright">
- <?php echo tep_draw_input_field('SortChilds[sortorder]['.$sorts['id'].']','SortChilds_sortorder_'.$sorts['id'], (isset(SortChilds::$PsortSelected[$sorts['name']]['sortorder'])? SortChilds::$PsortSelected[$sorts['name']]['sortorder']: '0'),' size="3"') ?>
- <?php echo tep_draw_radio_field('SortChilds[sortby]['.$sorts['id'].']','SortChilds_sortby_'.$sorts['id'], 'asc', ((isset(SortChilds::$PsortSelected[$sorts['name']]) && SortChilds::$PsortSelected[$sorts['name']]['sortby']=='asc')? true: false) ).__('text asc').tep_draw_radio_field('SortChilds[sortby]['.$sorts['id'].']','SortChilds_sortby_'.$sorts['id'], 'desc', ((isset(SortChilds::$PsortSelected[$sorts['name']]) && SortChilds::$PsortSelected[$sorts['name']]['sortby']=='desc')? true: false)).__('text desc') ?>
+ <?php echo tep_draw_input_field('listing_order[sortorder]['.$sorts['id'].']','listing_order_sortorder_'.$sorts['id'], (isset(listing_order::$PsortSelected[$sorts['name']]['sortorder'])? listing_order::$PsortSelected[$sorts['name']]['sortorder']: '0'),' size="3"') ?>
+ <?php echo tep_draw_radio_field('listing_order[sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'asc', ((isset(listing_order::$PsortSelected[$sorts['name']]) && listing_order::$PsortSelected[$sorts['name']]['sortby']=='asc')? true: false) ).__('text asc').tep_draw_radio_field('listing_order[sortby]['.$sorts['id'].']','listing_order_sortby_'.$sorts['id'], 'desc', ((isset(listing_order::$PsortSelected[$sorts['name']]) && listing_order::$PsortSelected[$sorts['name']]['sortby']=='desc')? true: false)).__('text desc') ?>
</span>
</li>
<?php endforeach; ?>
Deleted: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/SortChilds.txt
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/SortChilds.txt 2011-04-03 15:10:05 UTC (rev 3663)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/SortChilds.txt 2011-04-03 15:22:30 UTC (rev 3664)
@@ -1,27 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 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 16/03/11, 18:15
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['module acapro SortChilds text title']= 'Tri dans les listing';
-$lang['module acapro SortChilds text description']= 'Option de tri pour les listing';
-$lang['tab cat sortchilds']= 'Options Tri';
-$lang['txt sortChilds products_quantity']= 'Quantité';
-$lang['txt sortChilds products_model']= 'Modele';
-$lang['txt sortChilds products_price']= 'Prix';
-$lang['txt sortChilds products_date_added']= 'Date d\'ajout';
-$lang['txt sortChilds products_last_modified']= 'Date dernièere modification';
-$lang['txt sortChilds products_date_available']= 'Date disponibilité';
-$lang['txt sortChilds products_ordered']= 'Ordre de tri des produits';
-
-$lang['text asc']= 'Tri Croissant';
-$lang['text desc']= 'Tri decroissant';
-
-$lang['text info heading sortChilds category']= 'Ordre de tri des produtis dans cette categorie';
-
-?>
\ No newline at end of file
Copied: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt (from rev 3660, branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/SortChilds.txt)
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt (rev 0)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/languages/fr_FR/modules/categories/listing_order.txt 2011-04-03 15:22:30 UTC (rev 3664)
@@ -0,0 +1,27 @@
+<?php
+/**
+ @licence GPL 2005-2011 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 16/03/11, 18:15
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['module acapro listing_order text title']= 'Tri dans les listing';
+$lang['module acapro listing_order text description']= 'Option de tri pour les listing';
+$lang['tab cat sortchilds']= 'Options Tri';
+$lang['txt sortChilds products_quantity']= 'Quantité';
+$lang['txt sortChilds products_model']= 'Modele';
+$lang['txt sortChilds products_price']= 'Prix';
+$lang['txt sortChilds products_date_added']= 'Date d\'ajout';
+$lang['txt sortChilds products_last_modified']= 'Date dernièere modification';
+$lang['txt sortChilds products_date_available']= 'Date disponibilité';
+$lang['txt sortChilds products_ordered']= 'Ordre de tri des produits';
+
+$lang['text asc']= 'Tri Croissant';
+$lang['text desc']= 'Tri decroissant';
+
+$lang['text info heading sortChilds category']= 'Ordre de tri des produtis dans cette categorie';
+
+?>
\ No newline at end of file
Deleted: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/SortChilds.php
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/SortChilds.php 2011-04-03 15:10:05 UTC (rev 3663)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/SortChilds.php 2011-04-03 15:22:30 UTC (rev 3664)
@@ -1,191 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 29/08/10, 21:47
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @class SortChilds
-
-sortchids_products
-sortchids_content
-
-ALTER TABLE `osc_categories` ADD `sortchids_products` VARCHAR( 50 ) NOT NULL ,
-ADD `sortchids_content` VARCHAR( 50 ) NOT NULL
-*/
-class SortChilds
- implements InterfaceModule{
- /**
- @param array
- */
- public static $languages = array();
- /**
- @param object
- */
- public static $pInfo;
-
- /**
- @var array, list des tri possible pour les produits
- */
- public static $Psort;
- /**
- @var array, exclude champs
- */
- private static $Psort_exclude = array('products_image','products_tax_class_id','track_stock','products_status','products_id','manufacturers_id');
- /**
- @var array, recup db , selected
- */
- public static $PsortSelected=array();
-
- var $code;
- var $title;
- var $description;
- var $sort_order;
- var $enabled;
-
- /**
- class constructor
- */
- function __construct() {
- global $language,$languages_id;
- $this->code = __CLASS__ ;
- $this->type = 'categories' ;
- $this->title = __('module acapro SortChilds text title');
- $this->description = __('module acapro SortChilds text description');
- $this->sort_order = (defined('MODULE_ACACAT_SORTCHILDS_ORDER'))?MODULE_ACACAT_SORTCHILDS_ORDER : 0;
- $this->enabled = true;
-
- self::$pInfo= new objectInfo (array());
-
- self::$languages= tep_get_languages();
- }
-
-
- /**
- Edition produit
- UP db
- */
- public function insert_table_categories ($sql_data_array,$languages_id) {
-
- $this->load_db_values (0);
- $sort ='';
- $tsort = array(array());
- foreach($_POST[__CLASS__]['sort'] as $k=>$item){
-
-// var_dump($item,$_POST[__CLASS__]['sortorder'][$k]);
- if(isset(self::$Psort[$k]) && $_POST[__CLASS__]['sort'][$k] =='on')
- $tsort[(int)$_POST[__CLASS__]['sortorder'][$k]][] =' '.self::$Psort[$k]['sql'].' '. (isset($_POST[__CLASS__]['sortby'][$k]) ? $_POST[__CLASS__]['sortby'][$k] : 'asc').' ,' ;
-
- }
- ksort($tsort);
-
- foreach($tsort as $item)
- for($ii=0,$m=count($item); $ii<$m; $ii++){
- $sort .=$item[$ii];
- }
-
- $sql_data_array['sortchids_products'] =substr($sort,0,-1);
-
-
- return $sql_data_array;
- }
-
- public function update_table_categories($sql_data_array,$languages_id){
- return $this->insert_table_categories (array(),$languages_id) ;
- }
-
-
- /**
- Edition/affichage produit
- UP db
- */
- public static function load_db_values ($cat_id) {
-// $arr ['cat_id'] = $cat_id;
-// $arr=array_merge(array('cat_id'=>$cat_id) ,parent::load_db_values ($cat_id, 'cat') );
-// self::$pInfo->objectInfo($arr);
-// error_reporting(E_ALL);
- $DB=Database::getInstance();
- $DB->query("SELECT * FROM ".TABLE_PRODUCTS." ;");
- $r=$DB->listFields(TABLE_PRODUCTS);
-
-// var_dump($r);
-
- $i=0;
- foreach($r as $k=>$v){
- if(!in_array($v['name'],self::$Psort_exclude)) {
- self::$Psort[$i]=array('id'=>$i,'name'=>$v['name'], 'sql'=>'p.'.$v['name'], 'text'=> __('txt sortChilds '.$v['name']));
- $i++;
- }
- }
-// print_r(self::$Psort);
-// $languages = tep_get_languages();
-// $epf_query = tep_db_query($sql="select e.epf_id, e.epf_uses_value_list, e.epf_show_parent_chain, e.epf_size,e.epf_key, l.epf_label, l.languages_id, l.epf_active_for_language, l.epf_label_help from " . TABLE_PRODUCTS_EXTRA_FIELDS . " e join " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l where e.epf_status and l.languages_id='".(int)$languages_id."' and (e.epf_id = l.epf_id) order by e.epf_order");
-//
-// $epf = array();
-// // $xfields = array();
-// while ($e = tep_db_fetch_array($epf_query)) { // retrieve all active extra fields for all languages
-// // $field = 'extra_value' . ($e['epf_uses_value_list'] ? '_id' : '') . $e['epf_id'];
-// $epf[] = array('id' => $e['epf_id'],
-// 'label' => $e['epf_label'],
-// 'uses_list' => $e['epf_uses_value_list'],
-// 'show_chain' => $e['epf_show_parent_chain'],
-// 'size' => $e['epf_size'],
-// 'epf_key' => $e['epf_key'],
-// 'language' => $e['languages_id'],
-// 'language_active' => $e['epf_active_for_language'],
-// 'field' => $field,
-// 'label_help' => $e['epf_label_help']);
-// // if (!in_array( $field, $xfields))
-// // $xfields[] = $field; // build list of distinct fields
-// }
-
-
-
- /// actuel
- if($cat_id>0){
- $res=$DB->query("SELECT sortchids_products FROM ".TABLE_CATEGORIES." WHERE categories_id='".$cat_id."';");
- $r=$res->fetchAssoc();
- $tab=explode(',',$r['sortchids_products']);
- $i=0;
- foreach($tab as $item){
- $iret=explode(' ',ltrim(rtrim($item)));
- $name=str_replace('p.','',$iret[0]);
- self::$PsortSelected[$name]=array('sql'=>$iret[0],'value'=>$name,'sortorder'=>(string)$i++ , 'sortby'=>trim($iret[1]) );
- }
- }
-
- }
-
-
- /**
- Test présence et etat valeur forunis
- @param $tableau string products|content
- @param $champs string nom colonne in db
- @param $col string nom colonne tableau
- */
-// public static function checkValue($tableau='products',$champs, $col='value'){
-//
-// foreach()
-// }
-
-
- /**
- Draw
- */
- public function display_edit(&$contents) {
- $contents []=array('title'=> __('tab cat sortchilds'),'text'=>tep_get_include_contents($this->type.'.'.__CLASS__.'.'.__FUNCTION__));
- }
-
-
-/** Force implements InterfaceModule class to define this method */
- function check() { return true; }
- function install() { return false; }
- function remove() { return false; }
- function keys() {
- return array( 'MODULE_ACACAT_SORTCHILDS_SORT_ORDER');
- }
-
-}
-?>
\ No newline at end of file
Copied: branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php (from rev 3660, branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/SortChilds.php)
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php (rev 0)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/catalog/admin/includes/modules/categories/listing_order.php 2011-04-03 15:22:30 UTC (rev 3664)
@@ -0,0 +1,191 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 29/08/10, 21:47
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class listing_order
+
+sortchids_products
+sortchids_content
+
+ALTER TABLE `osc_categories` ADD `sortchids_products` VARCHAR( 50 ) NOT NULL ,
+ADD `sortchids_content` VARCHAR( 50 ) NOT NULL
+*/
+class listing_order
+ implements InterfaceModule{
+ /**
+ @param array
+ */
+ public static $languages = array();
+ /**
+ @param object
+ */
+ public static $pInfo;
+
+ /**
+ @var array, list des tri possible pour les produits
+ */
+ public static $Psort;
+ /**
+ @var array, exclude champs
+ */
+ private static $Psort_exclude = array('products_image','products_tax_class_id','track_stock','products_status','products_id','manufacturers_id');
+ /**
+ @var array, recup db , selected
+ */
+ public static $PsortSelected=array();
+
+ var $code;
+ var $title;
+ var $description;
+ var $sort_order;
+ var $enabled;
+
+ /**
+ class constructor
+ */
+ function __construct() {
+ global $language,$languages_id;
+ $this->code = __CLASS__ ;
+ $this->type = 'categories' ;
+ $this->title = __('module acapro listing_order text title');
+ $this->description = __('module acapro listing_order text description');
+ $this->sort_order = (defined('MODULE_ACACAT_SORTCHILDS_ORDER'))?MODULE_ACACAT_SORTCHILDS_ORDER : 0;
+ $this->enabled = true;
+
+ self::$pInfo= new objectInfo (array());
+
+ self::$languages= tep_get_languages();
+ }
+
+
+ /**
+ Edition produit
+ UP db
+ */
+ public function insert_table_categories ($sql_data_array,$languages_id) {
+
+ $this->load_db_values (0);
+ $sort ='';
+ $tsort = array(array());
+ foreach($_POST[__CLASS__]['sort'] as $k=>$item){
+
+// var_dump($item,$_POST[__CLASS__]['sortorder'][$k]);
+ if(isset(self::$Psort[$k]) && $_POST[__CLASS__]['sort'][$k] =='on')
+ $tsort[(int)$_POST[__CLASS__]['sortorder'][$k]][] =' '.self::$Psort[$k]['sql'].' '. (isset($_POST[__CLASS__]['sortby'][$k]) ? $_POST[__CLASS__]['sortby'][$k] : 'asc').' ,' ;
+
+ }
+ ksort($tsort);
+
+ foreach($tsort as $item)
+ for($ii=0,$m=count($item); $ii<$m; $ii++){
+ $sort .=$item[$ii];
+ }
+
+ $sql_data_array['sortchids_products'] =substr($sort,0,-1);
+
+
+ return $sql_data_array;
+ }
+
+ public function update_table_categories($sql_data_array,$languages_id){
+ return $this->insert_table_categories (array(),$languages_id) ;
+ }
+
+
+ /**
+ Edition/affichage produit
+ UP db
+ */
+ public static function load_db_values ($cat_id) {
+// $arr ['cat_id'] = $cat_id;
+// $arr=array_merge(array('cat_id'=>$cat_id) ,parent::load_db_values ($cat_id, 'cat') );
+// self::$pInfo->objectInfo($arr);
+// error_reporting(E_ALL);
+ $DB=Database::getInstance();
+ $DB->query("SELECT * FROM ".TABLE_PRODUCTS." ;");
+ $r=$DB->listFields(TABLE_PRODUCTS);
+
+// var_dump($r);
+
+ $i=0;
+ foreach($r as $k=>$v){
+ if(!in_array($v['name'],self::$Psort_exclude)) {
+ self::$Psort[$i]=array('id'=>$i,'name'=>$v['name'], 'sql'=>'p.'.$v['name'], 'text'=> __('txt sortChilds '.$v['name']));
+ $i++;
+ }
+ }
+// print_r(self::$Psort);
+// $languages = tep_get_languages();
+// $epf_query = tep_db_query($sql="select e.epf_id, e.epf_uses_value_list, e.epf_show_parent_chain, e.epf_size,e.epf_key, l.epf_label, l.languages_id, l.epf_active_for_language, l.epf_label_help from " . TABLE_PRODUCTS_EXTRA_FIELDS . " e join " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l where e.epf_status and l.languages_id='".(int)$languages_id."' and (e.epf_id = l.epf_id) order by e.epf_order");
+//
+// $epf = array();
+// // $xfields = array();
+// while ($e = tep_db_fetch_array($epf_query)) { // retrieve all active extra fields for all languages
+// // $field = 'extra_value' . ($e['epf_uses_value_list'] ? '_id' : '') . $e['epf_id'];
+// $epf[] = array('id' => $e['epf_id'],
+// 'label' => $e['epf_label'],
+// 'uses_list' => $e['epf_uses_value_list'],
+// 'show_chain' => $e['epf_show_parent_chain'],
+// 'size' => $e['epf_size'],
+// 'epf_key' => $e['epf_key'],
+// 'language' => $e['languages_id'],
+// 'language_active' => $e['epf_active_for_language'],
+// 'field' => $field,
+// 'label_help' => $e['epf_label_help']);
+// // if (!in_array( $field, $xfields))
+// // $xfields[] = $field; // build list of distinct fields
+// }
+
+
+
+ /// actuel
+ if($cat_id>0){
+ $res=$DB->query("SELECT sortchids_products FROM ".TABLE_CATEGORIES." WHERE categories_id='".$cat_id."';");
+ $r=$res->fetchAssoc();
+ $tab=explode(',',$r['sortchids_products']);
+ $i=0;
+ foreach($tab as $item){
+ $iret=explode(' ',ltrim(rtrim($item)));
+ $name=str_replace('p.','',$iret[0]);
+ self::$PsortSelected[$name]=array('sql'=>$iret[0],'value'=>$name,'sortorder'=>(string)$i++ , 'sortby'=>trim($iret[1]) );
+ }
+ }
+
+ }
+
+
+ /**
+ Test présence et etat valeur forunis
+ @param $tableau string products|content
+ @param $champs string nom colonne in db
+ @param $col string nom colonne tableau
+ */
+// public static function checkValue($tableau='products',$champs, $col='value'){
+//
+// foreach()
+// }
+
+
+ /**
+ Draw
+ */
+ public function display_edit(&$contents) {
+ $contents []=array('title'=> __('tab cat sortchilds'),'text'=>tep_get_include_contents($this->type.'.'.__CLASS__.'.'.__FUNCTION__));
+ }
+
+
+/** Force implements InterfaceModule class to define this method */
+ function check() { return true; }
+ function install() { return false; }
+ function remove() { return false; }
+ function keys() {
+ return array( 'MODULE_ACACAT_SORTCHILDS_SORT_ORDER');
+ }
+
+}
+?>
\ No newline at end of file
Modified: branches/2.1.0/extensions/LISTING_ORDER_stable/install.xml
===================================================================
--- branches/2.1.0/extensions/LISTING_ORDER_stable/install.xml 2011-04-03 15:10:05 UTC (rev 3663)
+++ branches/2.1.0/extensions/LISTING_ORDER_stable/install.xml 2011-04-03 15:22:30 UTC (rev 3664)
@@ -10,21 +10,12 @@
</description>
<addfile>
- <file name="admin/includes/modules/categories/SortChilds.php" />
- <file name="admin/includes/gabarit/categories.SortChilds.display_edit.gab" />
+ <file name="admin/includes/modules/categories/listing_order.php" />
+ <file name="admin/includes/gabarit/categories.listing_order.display_edit.gab" />
</addfile>
<addfilelg>
- <file name="admin/includes/languages/%LANGUAGE%/modules/categories/SortChilds.txt" lgref="fr_FR"/>
+ <file name="admin/includes/languages/%LANGUAGE%/modules/categories/listing_order.txt" lgref="fr_FR"/>
</addfilelg>
-
-
- <sql>
- <query><![CDATA[
- ALTER TABLE osc_categories ADD sortchids_products VARCHAR( 50 ) NOT NULL ,
- ALTER TABLE osc_categories ADD sortchids_content VARCHAR( 50 ) NOT NULL
- ]]></query>
- </sql>
-
</contrib>
\ 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...> - 2011-04-03 15:10:11
|
Revision: 3663
http://oscss.svn.sourceforge.net/oscss/?rev=3663&view=rev
Author: oscim
Date: 2011-04-03 15:10:05 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
coquille encapsulation apostrophe
Modified Paths:
--------------
branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
Modified: branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
===================================================================
--- branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-04-03 15:03:48 UTC (rev 3662)
+++ branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-04-03 15:10:05 UTC (rev 3663)
@@ -431,7 +431,7 @@
$lg['RCS_SKIP_DAYS_S']= 'Jours à ignorer';
$lg['RCS_SKIP_DAYS_L']= 'Nombre de jours à ignorer lors d\'une recherche de panier abandonnés.';
$lg['RCS_REPORT_DAYS_S']= 'Rapport /jours résultats des ventes ';
-$lg['RCS_REPORT_DAYS_L']= 'Nombre de jour de vente à prendre en compte dans les rapports d'un compte. Plus il y a de jour, plus la requête SQL est longue !';
+$lg['RCS_REPORT_DAYS_L']= "Nombre de jour de vente à prendre en compte dans les rapports d'un compte. Plus il y a de jour, plus la requête SQL est longue !";
$lg['RCS_INCLUDE_TAX_IN_PRICES_S']= 'Utiliser les taxes calculées';
$lg['RCS_INCLUDE_TAX_IN_PRICES_L']= 'Essayez de calculer les taxes lors de la détermination des prix. Cela ne peut pas être 100% correct suivant l\'emplacement, etc. Peut comporter des erreurs.';
$lg['RCS_USE_FIXED_TAX_IN_PRICES_S']= 'Utiliser les taxes fixes';
@@ -443,9 +443,9 @@
$lg['RCS_EMAIL_FRIENDLY_S']= 'E-Mails amis';
$lg['RCS_EMAIL_FRIENDLY_L']= 'Si cette valeur est sur <strong>true</strong> le nom du client sera utilisé dans le mail de bienvenue. Si la valeur est sur <strong>false</strong> le mail générique sera envoyé.';
$lg['RCS_EMAIL_COPIES_TO_S']= 'Envoyer une copie des E-Mail à';
-$lg['RCS_EMAIL_COPIES_TO_L']= 'Lors des rappels des panier abandonnés vers les clients, envoyer une copie à l'adresse suivante :';
+$lg['RCS_EMAIL_COPIES_TO_L']= "Lors des rappels des panier abandonnés vers les clients, envoyer une copie à l'adresse suivante :";
$lg['RCS_SHOW_ATTRIBUTES_S']= 'Voir les Attributs';
-$lg['RCS_SHOW_ATTRIBUTES_L']= 'Controler l'affichage des attributs de produits.<br />Pour afficher les attributs de vos produits, passez ce paramètre sur <strong>true</strong>.';
+$lg['RCS_SHOW_ATTRIBUTES_L']= "Controler l'affichage des attributs de produits.<br />Pour afficher les attributs de vos produits, passez ce paramètre sur <strong>true</strong>.";
$lg['RCS_CHECK_SESSIONS_S']= 'Ignorer les clients avec session';
$lg['RCS_CHECK_SESSIONS_L']= 'Passer ce paramètre à true si vous souahitez ignorer les utilisateurs avec une session active (probablement en cours d\'achat).<br />Passez ce paramètre à false pour une utilisation normale utilisant moins de ressources.';
$lg['RCS_CURCUST_COLOR_S']= 'Couleur du client';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-03 15:03:55
|
Revision: 3662
http://oscss.svn.sourceforge.net/oscss/?rev=3662&view=rev
Author: oscim
Date: 2011-04-03 15:03:48 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
correction
Modified Paths:
--------------
branches/2.1.0/catalog/includes/languages/fr_FR.php
Modified: branches/2.1.0/catalog/includes/languages/fr_FR.php
===================================================================
--- branches/2.1.0/catalog/includes/languages/fr_FR.php 2011-04-03 09:59:15 UTC (rev 3661)
+++ branches/2.1.0/catalog/includes/languages/fr_FR.php 2011-04-03 15:03:48 UTC (rev 3662)
@@ -177,7 +177,7 @@
define('ERROR_NO_PAYMENT_MODULE_SELECTED', 'Veuillez choisir une méthode de paiement pour votre commande.');
define('CATEGORY_COMPANY', 'Détails sociétés');
-define('CATEGORY_PERSONAL', 'Vos détails personnels');
+define('CATEGORY_PERSONAL', 'Vos informations personnelles');
define('CATEGORY_ADDRESS', 'Votre adresse');
define('CATEGORY_CONTACT', 'Votre adresse');
define('CATEGORY_OPTIONS', 'Options');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-03 09:59:23
|
Revision: 3661
http://oscss.svn.sourceforge.net/oscss/?rev=3661&view=rev
Author: oscim
Date: 2011-04-03 09:59:15 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
correction coquille
Ajout in driver.products, flag for autorise buy products
Amelioration img_ratio
report module.php et products_info du flag action buy
correction du navigation_history (suite)
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab
branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css
branches/2.1.0/catalog/common/classes/image_ratio.php
branches/2.1.0/catalog/includes/classes/driver.product.php
branches/2.1.0/catalog/includes/classes/navigation_history.php
branches/2.1.0/catalog/includes/classes/page.php
branches/2.1.0/catalog/includes/content/product_info.php
branches/2.1.0/catalog/includes/modules/new_products.php
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/module.php
branches/2.1.0/catalog/login.php
Modified: branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab 2011-04-03 09:59:15 UTC (rev 3661)
@@ -213,9 +213,9 @@
</dd>
<dd class="block_input w_90 CategoryView ">
<label for="products_date_available"><?php echo __('txt categories'); ?></label>
- <ul id="cat_list_in_edit">
+ <ul id="cat_list_in_edit" class="ChooseSelect">
<?php foreach(get_cat_list(0) as $v){
- echo '<li>'.tep_decal($v['niveau']).' '. tep_draw_checkbox_field('categories['.$v['categories_id'].']','cat_'.$v['categories_id'], tep_get_generated_category_path_ids($v['categories_id']), (isset(products::$pInfo->categories[$v['categories_id']])?true : false) ).' '.$v['categories_name'].'</li>';
+ echo '<li class="'.(isset(products::$pInfo->categories[$v['categories_id']])? 'selected' : 'noselected').'">'.tep_decal($v['niveau']).' '. tep_draw_checkbox_field('categories['.$v['categories_id'].']','cat_'.$v['categories_id'], tep_get_generated_category_path_ids($v['categories_id']), (isset(products::$pInfo->categories[$v['categories_id']])?true : false) ).' '.$v['categories_name'].'</li>';
}?>
</ul>
</dd>
Modified: branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-04-03 09:59:15 UTC (rev 3661)
@@ -36,6 +36,8 @@
fieldset ul { list-style:none;}
ul.form_radio_inline{display:inline-block;}
.spacer {clear:both;}
+ .noselected{}
+ .selected{background:#f0d4bf;}
/* general class */
.error{ color:red; }
Modified: branches/2.1.0/catalog/common/classes/image_ratio.php
===================================================================
--- branches/2.1.0/catalog/common/classes/image_ratio.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/common/classes/image_ratio.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -11,6 +11,14 @@
*/
class image_ratio {
/**
+ @var
+ */
+ protected static $key;
+ /**
+ @var
+ */
+ protected static $keydim;
+ /**
@var array cache image
*/
protected static $CacheImage=array();
@@ -19,45 +27,57 @@
*/
protected static $_instance;
/**
- @var getimagesize current image
+ @var support type images
*/
- private static $imagedata;
+ private static $types = array (1 => "gif", "jpeg", "png");
/**
- @var getpath cache for thumb
+ @var object param environnement exec
*/
- private static $cachedir;
+ private static $env;
/**
- @var support type images
- */
- private static $types = array (1 => "gif", "jpeg", "png");
-
- /**
PHP 5 Constructor
*/
private function __construct() {
- self::$cachedir = DIR_WS_IMAGES . 'imagecache/';
+ self::$env = new stdClass();
+ self::$env->cachedir = DIR_WS_IMAGES . 'imagecache/';
+
umask(0);
- if (defined('DIR_WS_ADMIN'))
- !is_dir (DIR_FS_ADMIN.self::$cachedir) ? mkdir (DIR_FS_ADMIN.self::$cachedir, 0777) : @chmod (DIR_FS_ADMIN.self::$cachedir, 0777);
+ if (defined('DIR_WS_ADMIN')){
+ self::$env->inadmin=true;
+ !is_dir (DIR_FS_ADMIN.self::$env->cachedir) ? mkdir (DIR_FS_ADMIN.self::$env->cachedir, 0777) : @chmod (DIR_FS_ADMIN.self::$env->cachedir, 0777);
+ }
+ else{
+ self::$env->inadmin=false;
+ }
+ !is_dir (DIR_FS_CATALOG.self::$env->cachedir) ? mkdir (DIR_FS_CATALOG.self::$env->cachedir, 0777) : @chmod (DIR_FS_CATALOG.self::$env->cachedir, 0777);
- !is_dir (DIR_FS_CATALOG.self::$cachedir) ? mkdir (DIR_FS_CATALOG.self::$cachedir, 0777) : @chmod (DIR_FS_CATALOG.self::$cachedir, 0777);
+ self::$env->jpegquality = (defined('JPEG_QUALITY') ? JPEG_QUALITY : 95);
+
+ self::$env->safemode=(!ini_get('safe_mode')? true : false );
+
+ self::$env->Imagick=(class_exists('Imagick')? true : false);
+
+ self::$env->img_required=(bool)_cst_bool('IMAGE_REQUIRED');
+
+ self::$env->img_create=(bool)function_exists('imagecreatetruecolor');
}
public static function getInstance() {
- if(self::$_instance == null) {
- self::$_instance = new self();
- }
- return self::$_instance;
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
}
public static function resetInstance() {
- self::$_instance = null;
- return self::getInstance();
+ self::$_instance = null;
+ return self::getInstance();
}
+// public static function debug(){
+// print_r(self::$CacheImage);
+// }
/**
@fn tep_image($src, $alt = '', $width = '', $height = '', $parameters = '',$mode=false)
@@ -71,35 +91,35 @@
*/
public static function tep_image($src, $alt = '', $width = '', $height = '', $parameters = '',$mode=false) {
self::getInstance();
- $key = md5($src);
- if( ($result=self::checkImg($src, $key)) && is_array($result) ) return $result['error'];
- else $src=$result;
+ self::initCurrent($src,$width,$height);
- $theImg=self::constructImg($src,$key, $alt , $width , $height );
+ if(!isset(self::$CacheImage[self::$key]['conf']['original'])) return self::$CacheImage[self::$key]['conf']['error'];
+ else $src=self::$CacheImage[self::$key]['conf']['original'];
+ $theImg=self::constructImg($src, $alt , $width , $height );
+
$src = $theImg['src'];
$alt = $theImg['alt'];
$width = $theImg['width'];
$height = $theImg['height'];
- $keydim=md5($width . $height);
-
if(is_bool($mode) && $mode){
- if (defined('DIR_WS_ADMIN'))return tep_output_string($src);
+ if (self::$env->inadmin)return tep_output_string($src);
return tep_output_string(tep_get_httpdir().$src);
}
else {
/// if cache return
-// if(isset(self::$CacheImage[$key][__FUNCTION__]) && isset(self::$CacheImage[$key][__FUNCTION__][$keydim]) ) return self::$CacheImage[$key][__FUNCTION__][$keydim];
-// else {
- $image = '<img src="' . (!defined('DIR_WS_ADMIN') ? tep_output_string(tep_get_httpdir().$src) : tep_output_string($src)) . '" alt="' . tep_output_string($alt) . '" ';
- if($mode !='simple') $image .= 'width="' . $width . '" height="' . $height . '"';
- if (tep_not_null($alt)) $image .= ' title="' . tep_output_string($alt) . '"';
+ if( isset(self::$CacheImage[self::$key][self::$keydim]['img']) ) return self::$CacheImage[self::$key][self::$keydim]['img'];
+ else {
+ $image = '<img src="' . (!self::$env->inadmin ? tep_output_string(tep_get_httpdir().$src) : tep_output_string($src)) . '" alt="' . tep_output_string($alt) . '" ';
+ if($mode !='simple') $image .= 'width="' . $theImg['width'] . '" height="' . $theImg['height'] . '"';
+ if (tep_not_null($theImg['alt'])) $image .= ' title="' . tep_output_string($theImg['alt']) . '"';
if (tep_not_null($parameters)) $image .= ' ' . $parameters;
$image .= ' />';
- return self::$CacheImage[$key][__FUNCTION__][$keydim]= $image;
-// }
+
+ return self::$CacheImage[self::$key][self::$keydim]['img']= $image;
+ }
}
}
@@ -113,15 +133,20 @@
*/
public static function get_image($src, $alt = '', $width = '', $height = '') {
self::getInstance();
- $key = md5($src);
+ self::initCurrent($src,$width,$height);
- if( ($result=self::checkImg($src, $key)) && is_array($result) ) return $result['error'];
- else $src=$result;
+ if(!isset(self::$CacheImage[self::$key]['conf']['original'])) return self::$CacheImage[self::$key]['conf']['error'];
+ else $src=self::$CacheImage[self::$key]['conf']['original'];
- return self::constructImg($src,$key, $alt , $width , $height );
+ return self::constructImg($src, $alt , $width , $height );
}
+ private static function initCurrent($src,$width,$height){
+ self::$key = md5($src);
+ self::$keydim=md5($width . $height);
+ self::checkImg($src);
+ }
/**
@brief constructor thumbail
@@ -132,31 +157,35 @@
@param $parameters string
@param $mode bool/string (true=url, false=normal, simple= sans width et height)
*/
- private static function constructImg($src,$key, $alt = '', $width = '', $height = ''){
+ private static function constructImg($src, $alt = '', $width = '', $height = ''){
-// if(isset(self::$CacheImage[$key][__FUNCTION__]) ) return self::$CacheImage[$key][__FUNCTION__];
+ if(isset(self::$CacheImage[self::$key][self::$keydim]) ) return self::$CacheImage[self::$key][self::$keydim];
- global $page;
+ $imgd = self::$CacheImage[self::$key]['conf']['getimagesize'];
- $imagedata = self::$imagedata; //(isset(self::$CacheImage[$key]['getimagesize'])? self::$CacheImage[$key]['getimagesize'] : self::$imagedata );
+ $image_size = self::aspectratio($imgd[0], $imgd[1], $width, $height);
- $image_size = self::aspectratio($imagedata[0], $imagedata[1], $width, $height);
$width = $image_size["width"];
$height = $image_size["height"];
- if (function_exists('imagecreatetruecolor') && $width !=$imagedata[0] && $height != $imagedata[1]) {
- $src=self::thumbfile($src, $width, $height, $imagedata[0], $imagedata[1], $imagedata[2]);
+
+ if (self::$env->img_create && $width !=$imgd[0] && $height != $imgd[1]) {
+ $src=self::thumbfile($src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
+ self::$CacheImage[self::$key][self::$keydim]['thumbfile']='true';
}
+ else{
+ $src=self::CleanPathReturn($src);
+ self::$CacheImage[self::$key][self::$keydim]['thumbfile']='false';
+ }
- $result=array(
- 'src'=>$src,
- 'alt'=>$alt,
- 'width'=>$width,
- 'height'=>$height,
- 'mime'=> $imagedata['mime'],
- );
+ self::$CacheImage[self::$key][self::$keydim]['src']=$src;
+ self::$CacheImage[self::$key][self::$keydim]['alt']=$alt;
+ self::$CacheImage[self::$key][self::$keydim]['width']=$width;
+ self::$CacheImage[self::$key][self::$keydim]['height']=$height;
+ self::$CacheImage[self::$key][self::$keydim]['mime']=$imgd['mime'];
- return self::$CacheImage[$key][__FUNCTION__]=$result;
+
+ return self::$CacheImage[self::$key][self::$keydim];
}
@@ -167,51 +196,62 @@
@param $key string cache key for img
@return boolean/string true if ok / false or string error
*/
- private static function checkImg($src, $key){
+ private static function checkImg($src){
-// if(isset(self::$CacheImage[$key])) return self::$CacheImage[$key][__FUNCTION__];
+ if(isset(self::$CacheImage[self::$key]['conf']['original'])) return ;
$sortie=true;
if(strpos($src, DIR_FS_CATALOG) === false ) $src;
else $src= substr ($src, strlen(DIR_FS_CATALOG));
- if (defined('DIR_WS_ADMIN')){
+ if(strpos($src, DIR_WS_LANGUAGES) >0 ) self::$CacheImage[self::$key]['conf']['dest']='lang';
+ else self::$CacheImage[self::$key]['conf']['dest']='image';
+
+ if (self::$env->inadmin){
+ self::$CacheImage[self::$key]['conf']['mode']='BO';
if(strpos($src, DIR_WS_ADMIN)===false && strpos($src, DIR_WS_CATALOG)===false && file_exists(DIR_FS_ADMIN.$src)) $src_dir = $src;
elseif (strpos($src, DIR_WS_ADMIN) >0 || ( strpos($src, DIR_WS_IMAGES) ==0 && file_exists(DIR_FS_ADMIN.$src) ) ) $src_dir = DIR_FS_ADMIN . $src;
elseif(strpos($src, DIR_WS_CATALOG)===false ) $src_dir = DIR_FS_CATALOG . $src;
else $src_dir = DIR_FS_CATALOG . substr ($src, (strrpos (DIR_WS_CATALOG , '/'))+1);
}
- else $src_dir=$src;
+ else {
+ self::$CacheImage[self::$key]['conf']['mode']='FO';
+ $src_dir=$src;
+ }
if (!@is_file($src_dir) || empty($src_dir)){
- if ( _cst_bool('IMAGE_REQUIRED')) $sortie= '<span class="errorText">Le fichier n\'a pas pu être trouvé sur le serveur !</span>';
+ if (self::$env->img_required) $sortie= '<span class="errorText">'.__('Le fichier n\'a pas pu être trouvé sur le serveur !').'</span>';
$sortie = false;
}
- elseif ( (self::$imagedata = getimagesize($src_dir)) == false || !self::$imagedata[2] || self::$imagedata[2] > 3) {
- self::$CacheImage[$key]['getimagesize']=self::$imagedata ;
- if (empty($alt)) $sortie= '<span class="errorText">Ce format d\'image n\'est pas autorisé !</span>';
- else $sortie ='<span class="errorText" title="'.$src_dir.'">' . tep_output_string($alt) . '!</span>';
+ elseif ( ($imaged = getimagesize($src_dir)) && is_array($imaged) ) {
+
+ if ( !$imaged[2] || $imaged[2] > 3) {
+ if (empty($alt)) $sortie= '<span class="errorText">'.__('Ce format d\'image n\'est pas autorisé !').'</span>';
+ else $sortie ='<span class="errorText" title="'.$src_dir.'">' . tep_output_string($alt) . '!</span>';
+ }
+ else
+ self::$CacheImage[self::$key]['conf']['getimagesize']=$imaged ;
}
- if($sortie !=true) return self::$CacheImage[$key][__FUNCTION__] = array('error'=>$sortie);
- else return self::$CacheImage[$key][__FUNCTION__] = $src_dir;
+
+ if($sortie !=true) self::$CacheImage[self::$key]['conf']['error'] =$sortie;
+ else self::$CacheImage[self::$key]['conf']['original'] = $src_dir;
}
/**
- @package oscss-2
+ @fn self::aspectratio ($width_src , $height_src , $max_width = '', $max_height = '')
+ @brief Redimensionnement des images en conservant leurs proportions
@author Ayatus
- Redimensionnement des images en conservant leurs proportions
- @param
- @a string path.src img
- @a float/empty max width en px
- @a float/empty max height en px
+ @param $width_src string path.src img
+ @param $height_src float/empty max width en px
+ @param $max_width float/empty max height en px
+ @param $max_height float/empty max height en px
@return array (width,height)
*/
private static function aspectratio ($width_src , $height_src , $max_width = '', $max_height = ''){
+// error_reporting(E_ALL);
- error_reporting(E_ALL);
-
!empty ($max_width) && preg_match ('/^[0-9]{1,}$/', $max_width, $regs) && $max_width <= $width_src
? true
: $max_width = $width_src;
@@ -245,34 +285,62 @@
$thumb = $width.'x'.$height.'_'.basename($image).'_'.md5($image).'.'.((self::$types[$format]=="jpeg") ? "jpg" : self::$types[$format]);
- $thumbfile = substr($image,0, strpos($image, DIR_WS_IMAGES) ) . self::$cachedir . $thumb;
- if (file_exists ($thumbfile)) {
- $thumbdata = getimagesize ($thumbfile);
- $thumbdata[0] == $width && $thumbdata[1] == $height ? $iscached = true : $iscached = false;
- if (@filemtime($thumbfile) < @filemtime($image)) $iscached = false;
+ $thumbfile = substr($image,0, strpos($image, DIR_WS_IMAGES) ) . self::$env->cachedir . $thumb;
+
+ if(isset(self::$CacheImage[self::$key][self::$keydim]['thumbfile_cache'])) $iscached = (bool) self::$CacheImage[self::$key][self::$keydim]['thumbfile_cache'];
+ else {
+ if (file_exists ($thumbfile)) {
+ $thumbdata = getimagesize ($thumbfile);
+ $iscached =( $thumbdata[0] == $width && $thumbdata[1] == $height )? true : false;
+ if (@filemtime($thumbfile) < @filemtime($image)) $iscached = false;
+ }
+ else $iscached = false;
+ self::$CacheImage[self::$key][self::$keydim]['thumbfile_cache'] = $iscached;
}
- else $iscached = false;
-
if (!$iscached) $makethumb = ($width_src > $width || $height_scr > $height) ? true : false;
else $makethumb = false;
-
if ($makethumb) $image=self::thumbgd($image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile);
else{
$img=($iscached) ? $thumbfile : $image;
- $ws_=(strpos($img, DIR_WS_CATALOG)===false)?false:true;
- $ws_admin=(defined('DIR_WS_ADMIN') && strpos($img, DIR_WS_ADMIN)===false )?false:true;
- $ws_img=(strpos($img, DIR_WS_IMAGES)===false)?false:true;
+ $image = self::CleanPathReturn($img);
+ }
- $image='';
- if(!$ws_admin && $ws_) $image.=DIR_WS_CATALOG;
- if(defined('DIR_WS_ADMIN') && $ws_admin) $image.=DIR_WS_ADMIN;
- if($ws_img) $image.=DIR_WS_IMAGES;
- $image.=preg_replace('#(.*'.DIR_WS_CATALOG.'){0,1}(.*'.DIR_WS_IMAGES.'){0,1}#i','',$img);
+ return $image;
+ }
+
+
+ /**
+ @brief Clean pathname prev return
+ @param string pathname
+ */
+ private static function CleanPathReturn($img){
+
+ $ws_=(strpos($img, DIR_WS_CATALOG)===false)?false:true;
+ $ws_admin=(self::$env->inadmin && strpos($img, DIR_WS_ADMIN)===false )?false:true;
+ $ws_lg=(strpos($img, DIR_WS_LANGUAGES)===false)?false:true;
+ $ws_img=(strpos($img, DIR_WS_IMAGES)===false)?false:true;
+
+ $image='';
+ $mask='';
+ if(!$ws_admin && $ws_){
+ $image.=DIR_WS_CATALOG;
+ $mask .='(.*'.DIR_WS_CATALOG.'){0,1}';
}
+ if(self::$env->inadmin && $ws_admin) $image.=DIR_WS_ADMIN;
+ if($ws_lg){
+ $image.=DIR_WS_LANGUAGES;
+ $mask .='(.*'.DIR_WS_LANGUAGES.'){0,1}';
+ }
+ elseif($ws_img){
+ $image.=DIR_WS_IMAGES;
+ $mask .='(.*'.DIR_WS_IMAGES.'){0,1}';
+ }
+ $image.=preg_replace('#'.$mask.'#i','',$img);
+
return $image;
}
@@ -293,22 +361,20 @@
Any commercial selling of this script is forbidden.
*/
private static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
- error_reporting(E_ALL);
- $jpegquality = (defined('JPEG_QUALITY') ? JPEG_QUALITY : 95);
-
- if (class_exists('Imagick') && !ini_get('safe_mode')) {
- $thumb = new Imagick($image);
- foreach ($thumb as $frame) {
- $frame->thumbnailImage($width, $height);
- $frame->setImagePage($width, $height, 0, 0);
- }
- if ($format == "jpeg") {
- $thumb->setImageCompression(imagick::COMPRESSION_JPEG);
- $thumb->setImageCompressionQuality($jpegquality);
- }
- $thumb->writeImages($thumbfile, true);
- }
- else {
+// error_reporting(E_ALL);
+// if (self::$env->Imagick && self::$env->safemod ) {
+// $thumb = new Imagick($image);
+// foreach ($thumb as $frame) {
+// $frame->thumbnailImage($width, $height);
+// $frame->setImagePage($width, $height, 0, 0);
+// }
+// if ($format == "jpeg") {
+// $thumb->setImageCompression(imagick::COMPRESSION_JPEG);
+// $thumb->setImageCompressionQuality($jpegquality);
+// }
+// $thumb->writeImages($thumbfile, true);
+// }
+// else {
$image = call_user_func("imagecreatefrom".$format, $image);
$thumb = imagecreatetruecolor ($width, $height);
imagealphablending($thumb, false);
@@ -316,11 +382,11 @@
imagefill($thumb, 0, 0, imagecolorallocatealpha($thumb, 0, 0, 0, 127));
imagecopyresampled ($thumb, $image, 0, 0, 0, 0, $width, $height, $width_src, $height_scr);
- if ($format == "jpeg") call_user_func("image".$format, $thumb, $thumbfile, $jpegquality);
+ if ($format == "jpeg") call_user_func("image".$format, $thumb, $thumbfile, self::$env->jpegquality);
else call_user_func("image".$format, $thumb, $thumbfile);
imagedestroy ($image);
imagedestroy ($thumb);
- }
+// }
return $thumbfile;
}
Modified: branches/2.1.0/catalog/includes/classes/driver.product.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/driver.product.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/includes/classes/driver.product.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -260,6 +260,9 @@
$product['extra']=self::get_extra_product($content['products_id']);
+ // boolean value If buy possible
+ $product['action']['buy']=(!_cst_bool('STOCK_ALLOW_CHECKOUT') && (int)$content['products_quantity']>0 && (int)$content['track_stock']>0)? true : false;
+
/**
module aca
*/
Modified: branches/2.1.0/catalog/includes/classes/navigation_history.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/navigation_history.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/includes/classes/navigation_history.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -52,6 +52,17 @@
return self::getInstance();
}
+ /**
+ @fn $object->set_close();
+ @brief call by close session page. save snapshot
+ */
+ public function set_close(){
+ if (tep_session_is_registered('navigation')){
+ $_SESSION['navigation']->path=$this->path ;
+ $_SESSION['navigation']->snapshot= $this->snapshot ;
+ }
+ }
+
public function reset() {
$this->path = array();
$this->snapshot = array();
Modified: branches/2.1.0/catalog/includes/classes/page.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/page.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/includes/classes/page.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -198,7 +198,7 @@
break;
case 'listing':
case 'listing_cat':
- if (empty($this->page['var']['cPath'])) $suffixe='error';
+ if (!tep_not_null($this->page['var']['cPath'])) $suffixe='error';
else $suffixe='c_'.$this->page['var']['cPath'];
break;
}
@@ -542,7 +542,11 @@
/**
\brief femeture de session
*/
- public function tep_session_close(){ tep_session_close(); }
+ public function tep_session_close(){
+ $navigation=navigation_history::getInstance();
+ $navigation->set_close();
+ tep_session_close();
+}
/**
\brief Force un contenu,qui n'est pas celui herité du fichier de la racine de la boutique
Modified: branches/2.1.0/catalog/includes/content/product_info.php
===================================================================
--- branches/2.1.0/catalog/includes/content/product_info.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/includes/content/product_info.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -70,18 +70,19 @@
<p id="price_master" class="productPrice"><?php echo print_products_price_rv($product_info); ?></p>
</div>
- <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
+ <?php if (_test_bool($product_info['action']['buy'])): ?>
+ <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
- <?php /** Aca Attribute Products */ if(isset($module['attributeManager'])) echo $module['attributeManager']->display_view_master($product_info['products_id']);?>
+ <?php /** Aca Attribute Products */ if(isset($module['attributeManager'])) echo $module['attributeManager']->display_view_master($product_info['products_id']);?>
- <p class="formQt"><?php echo TEXT_PREFIX_QTY.tep_draw_input_field('products_quantity', 'products_quantity', '1', 'size="2"'); ?></p>
- <p class="formBt">
- <input class="submitBt" type="submit" value="<?php echo IMAGE_BUTTON_IN_CART; ?>" />
- </p>
- <p><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']); ?></p>
-</form>
+ <p class="formQt"><?php echo TEXT_PREFIX_QTY.tep_draw_input_field('products_quantity', 'products_quantity', '1', 'size="2"'); ?></p>
+ <p class="formBt">
+ <input class="submitBt" type="submit" value="<?php echo IMAGE_BUTTON_IN_CART; ?>" />
+ </p>
+ <p><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']); ?></p>
+ </form>
+ <?php endif ; ?>
-
<?php if (tep_not_null($product_info['products_url'])) { ?>
<p id="productUrl"><?php echo sprintf(TEXT_MORE_INFORMATION, tep_href_link(FILENAME_REDIRECT, 'action=url&goto=' . urlencode($product_info['products_url']), 'NONSSL', true, false)); ?></p>
<?php } ?>
Modified: branches/2.1.0/catalog/includes/modules/new_products.php
===================================================================
--- branches/2.1.0/catalog/includes/modules/new_products.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/includes/modules/new_products.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -1,20 +1,23 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 16/06/10, 10:48
+ @version 2.1.0
+ @date 03/04/11, 11:48
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
+ @brief module base new products
+ @note
+ function sql , name: sql_ name current file
+ function in_obj_ name: in_obj_ name current file
*/
/**
- Requete du module
- Checherche les nouveauté d'ordre general, ou sur le parent de la catégorie en cours
- @param global
- @p int $new_products_category_id
-
+ @brief Cherche les nouveauté d'ordre general, ou sur le parent de la catégorie en cours
+ Ne recupere que que l'id products
+ @param $new_products_category_id int
+ @return bool false or ressource db
*/
function sql_new_products(){
global $new_products_category_id;
@@ -24,9 +27,9 @@
$languages_id=$page->the_var('languages_id');
if ( (!empty($new_products_category_id)) || ((int)$new_products_category_id == 0) ) {
- $new_products_query = $DB->query($sql="select distinct p.products_id,p.products_quantity,p.products_price, p.products_image,pd.products_name, p.products_tax_class_id, if(s.status, s.specials_new_products_price, p.products_price) as specials_new_products_price from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and p.products_id = pd.products_id and language_id='".$languages_id."' and products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL 30 DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
+ $new_products_query = $DB->query($sql="select distinct p.products_id from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and p.products_id = pd.products_id and language_id='".$languages_id."' and products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL 30 DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
} else {
- $new_products_query = $DB->query($sql="select distinct p.products_id,p.products_quantity, p.products_image, p.products_tax_class_id, if(s.status, s.specials_new_products_price, p.products_price) as products_price from " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and c.parent_id = '" . (int)$new_products_category_id . "' and p.products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL 30 DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
+ $new_products_query = $DB->query($sql="select distinct p.products_id from " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and c.parent_id = '" . (int)$new_products_category_id . "' and p.products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL 30 DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
}
if ($new_products_query->__get('NumRows') > 0) return $new_products_query;
@@ -35,8 +38,8 @@
/**
- Prepa et passage en object du module, affichage dans le gabarit des modules
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
+ @brief Prepa et passage en object du module, affichage dans le gabarit des modules
+ @return array (title, content)
*/
function in_obj_new_products(){
@@ -50,7 +53,9 @@
$p=array();
if( ($res=$page->oscss_modules->_resultsql('new_products')) ==false ) return null;
while ($new_products = $res->fetchAssoc()){
- $p[]=new objectInfo(array_merge($new_products,array('aca'=>$aca_listing->return_db_min($new_products['products_id'])) ) );
+ $pd=product::get_item($new_products['products_id']);
+ $pd->aca=$aca_listing->return_db_min($new_products['products_id']);
+ $p[]=$pd;
}
return new objectInfo(array('title'=>sprintf(__('table heading new products'),constant('NameOf_MONTH_'.date('m')) ), 'content'=>$p ));
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -108,20 +108,21 @@
<?php endif; ?>
</div>
+ <?php if (_test_bool($product_info['action']['buy'])): ?>
+ <div class="action">
+ <?php /** Conserver l'id du formulaire et de ces elements. Le js et les control php peuevent y avoir recours */ ?>
+ <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
- <div class="action">
- <?php /** Conserver l'id du formulaire et de ces elements. Le js et les control php peuevent y avoir recours */ ?>
- <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
+ <?php /** Aca Attribute Products */ if(isset($module['attributeManager'])) echo $module['attributeManager']->display_view_master($product_info['products_id']);?>
- <?php /** Aca Attribute Products */ if(isset($module['attributeManager'])) echo $module['attributeManager']->display_view_master($product_info['products_id']);?>
-
- <p class="formQt"><?php echo TEXT_PREFIX_QTY.tep_draw_input_field('products_quantity', 'products_quantity', '1', 'size="2"'); ?></p>
- <p class="formBt">
- <input class="submitBt addtocart" type="submit" value="<?php echo IMAGE_BUTTON_IN_CART; ?>" />
- </p>
- <p><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']); ?></p>
- </form>
- </div>
+ <p class="formQt"><?php echo TEXT_PREFIX_QTY.tep_draw_input_field('products_quantity', 'products_quantity', '1', 'size="2"'); ?></p>
+ <p class="formBt">
+ <input class="submitBt addtocart" type="submit" value="<?php echo IMAGE_BUTTON_IN_CART; ?>" />
+ </p>
+ <p><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']); ?></p>
+ </form>
+ </div>
+ <?php endif ; ?>
<div class="bottom_prod_box_big"></div>
</div>
</div>
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/module.php
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/module.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/module.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -49,7 +49,7 @@
<div class="prod_details_tab">
<?php if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
- <?php if ($ele->products_quantity >0 ) : ?>
+ <?php if (_test_bool($ele->action['buy'] )) : ?>
<?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->products_id, tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
<p>
<?php echo tep_draw_hidden_field('products_id', $ele->products_id). tep_draw_hidden_field('products_quantity', '1'); ?>
Modified: branches/2.1.0/catalog/login.php
===================================================================
--- branches/2.1.0/catalog/login.php 2011-04-01 16:18:50 UTC (rev 3660)
+++ branches/2.1.0/catalog/login.php 2011-04-03 09:59:15 UTC (rev 3661)
@@ -47,7 +47,7 @@
if (sizeof($navigation->snapshot) > 0) {
$origin_href = tep_href_link($navigation->snapshot['page'], tep_array_to_string($navigation->snapshot['get'], array(tep_session_name())), $navigation->snapshot['mode']);
$navigation->clear_snapshot();
- tep_redirect(tep_href_link($origin_href, '', 'SSL'));
+ tep_redirect($origin_href);
}
else
tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-04-01 16:18:56
|
Revision: 3660
http://oscss.svn.sourceforge.net/oscss/?rev=3660&view=rev
Author: j4k
Date: 2011-04-01 16:18:50 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
Quelques traductions de la page Re?\204?\129cupe?\204?\129ration de panier
Modified Paths:
--------------
branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
Modified: branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
===================================================================
--- branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-04-01 16:00:35 UTC (rev 3659)
+++ branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-04-01 16:18:50 UTC (rev 3660)
@@ -437,7 +437,7 @@
$lg['RCS_USE_FIXED_TAX_IN_PRICES_S']= 'Utiliser les taxes fixes';
$lg['RCS_USE_FIXED_TAX_IN_PRICES_L']= 'Utiliser un taux de taxes fixe lors de la détermination des prix (taux fixé ci-dessous) . Substitution si les taxes utilisées calculées est True.';
$lg['RCS_FIXED_TAX_RATE_S']= 'Taux de taxe fixe';
-$lg['RCS_FIXED_TAX_RATE_L']= 'Le taux de taxe fixe est utilisé lorsque \'Utiliser les taxes fixes\' est sur true et \'Utiliser les taxes calculées\'est sur false.<br />Utilisez des valeurs décimales, ex: 0.10 for 10%.';
+$lg['RCS_FIXED_TAX_RATE_L']= 'Le taux de taxe fixe est utilisé lorsque \'Utiliser les taxes fixes\' est sur true et \'Utiliser les taxes calculées\' est sur false.<br />Utilisez des valeurs décimales, ex: 0.10 for 10%.';
$lg['RCS_EMAIL_TTL_S']= 'Longueur de vie d\'un E-Mail';
$lg['RCS_EMAIL_TTL_L']= 'Nombre de jour à laisser à un email avant de ne plus les afficher comme envoyés.';
$lg['RCS_EMAIL_FRIENDLY_S']= 'E-Mails amis';
@@ -447,22 +447,21 @@
$lg['RCS_SHOW_ATTRIBUTES_S']= 'Voir les Attributs';
$lg['RCS_SHOW_ATTRIBUTES_L']= 'Controler l'affichage des attributs de produits.<br />Pour afficher les attributs de vos produits, passez ce paramètre sur <strong>true</strong>.';
$lg['RCS_CHECK_SESSIONS_S']= 'Ignorer les clients avec session';
-// $lg['RCS_CHECK_SESSIONS_L']= 'If you want the tool to ignore customers with an active session (ie, probably still shopping) set this to <strong>true</strong>.<br />Setting this to <strong>false</strong> will operate in the default manner of ignoring session data & using less resources.';
-$lg['RCS_CHECK_SESSIONS_L']= 'If you want the tool to ignore customers with an active session (ie, probably still shopping) set this to true.<br />Setting this to false will operate in the default manner of ignoring session data & using less resources.';
-$lg['RCS_CURCUST_COLOR_S']= 'Current Customer Color';
-$lg['RCS_CURCUST_COLOR_L']= 'Color for the word/phrase used to notate a current customer<br />A current customer is someone who has purchased items from your store in the past.';
-$lg['RCS_UNCONTACTED_COLOR_S']= 'Uncontacted hilight color';
-$lg['RCS_UNCONTACTED_COLOR_L']= 'Row highlight color for uncontacted customers.<br />An uncontacted customer is one that you have <i>not</i> used this tool to send an email to before.';
-$lg['RCS_CONTACTED_COLOR_S']= 'Contacted hilight color';
-$lg['RCS_CONTACTED_COLOR_L']= 'Row highlight color for contacted customers.<br />An contacted customer is one that you <i>have</i> used this tool to send an email to before.';
+$lg['RCS_CHECK_SESSIONS_L']= 'Passer ce paramètre à true si vous souahitez ignorer les utilisateurs avec une session active (probablement en cours d\'achat).<br />Passez ce paramètre à false pour une utilisation normale utilisant moins de ressources.';
+$lg['RCS_CURCUST_COLOR_S']= 'Couleur du client';
+$lg['RCS_CURCUST_COLOR_L']= 'Couleur utilisé pour afficher un client.<br />Un client est une personne ayant déjà effectué un achat dans le passé dans votre boutique.';
+$lg['RCS_UNCONTACTED_COLOR_S']= 'Couleur du client non contacté';
+$lg['RCS_UNCONTACTED_COLOR_L']= 'Mise en valeur d\'un client non contacté.<br />Indique un client qui n\'a jamais reçu d\'email auparavant.';
+$lg['RCS_CONTACTED_COLOR_S']= 'Couleur du client contacté';
+$lg['RCS_CONTACTED_COLOR_L']= 'Mise en valeur d\'un client contacté.<br />Indique un client qui a déjà reçu d\'email auparavant.';
+
$lg['RCS_MATCHED_ORDER_COLOR_S']= 'Matching Order Hilight';
-// $lg['RCS_MATCHED_ORDER_COLOR_L']= 'Row highlight color for entrees that may have a matching order.<br />An entry will be marked with this color if an order contains one or more of an item in the abandoned cart <strong>and</strong> matches either the cart\'s customer email address or database ID.';
$lg['RCS_MATCHED_ORDER_COLOR_L']= 'Row highlight color for entrees that may have a matching order.<br />An entry will be marked with this color if an order contains one or more of an item in the abandoned cart and matches either the cart\'s customer email address or database ID.';
+
$lg['RCS_SKIP_MATCHED_CARTS_S']= 'Skip Carts w/Matched Orders';
-// $lg['RCS_SKIP_MATCHED_CARTS_L']= 'To ignore carts with an a matching order set this to <strong>true</strong>.<br />Setting this to <strong>false</strong> will cause entries with a matching order to show, along with the matching order\'s status.<br />See documentation for details.';
$lg['RCS_SKIP_MATCHED_CARTS_L']= 'To ignore carts with an a matching order set this to true.<br />Setting this to false will cause entries with a matching order to show, along with the matching order\'s status.<br />See documentation for details.';
$lg['RCS_AUTO_CHECK_S']= 'Autocheck "safe" carts to email';
-// $lg['RCS_AUTO_CHECK_L']= 'To check entries which are most likely safe to email (ie, not existing customers, not previously emailed, etc.) set this to <strong>true</strong>.<br />Setting this to <strong>false</strong> will leave all entries unchecked (must manually check entries to send an email to).';
+
$lg['RCS_AUTO_CHECK_L']= 'To check entries which are most likely safe to email (ie, not existing customers, not previously emailed, etc.) set this to true.<br />Setting this to false will leave all entries unchecked (must manually check entries to send an email to).';
$lg['RCS_CARTS_MATCH_ALL_DATES_S']= 'Match orders from any date';
$lg['RCS_CARTS_MATCH_ALL_DATES_L']= 'If <strong>true</strong> then any order found with a matching item will be considered a matched order.<br />If <strong>false</strong> only orders placed after the abandoned cart are considered.';
@@ -495,7 +494,7 @@
$lg['SHOW_PACK_BUTTONS_S']= 'Montrer les boutons Pack et Unpack';
$lg['SHOW_PACK_BUTTONS_L']= 'Choisir TRUE et les boutons Pack et Unpack seront montrés.';
$lg['USE_LOG_SYSTEM_S']= 'Utilise système Log';
-$lg['USE_LOG_SYSTEM_L']= 'Choisir TRUE et toutes les actions seront logées dans un fichier en répertoire sde auvegarde.';
+$lg['USE_LOG_SYSTEM_L']= 'Choisir TRUE et toutes les actions seront logées dans un fichier en répertoire de sauvegarde.';
$lg['MAX_UPLOADED_FILESIZE_S']= 'Taille maximum de fichier pour l\'upload CIP.';
$lg['MAX_UPLOADED_FILESIZE_L']= 'Réglage taille maximum du fichier en bytes pour le fichier pouvant être upload sur le serveur.';
$lg['TEXT_LINK_FORUM_S']= 'Lien forum';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-04-01 16:00:41
|
Revision: 3659
http://oscss.svn.sourceforge.net/oscss/?rev=3659&view=rev
Author: j4k
Date: 2011-04-01 16:00:35 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
Quelques traductions de la page Re?\204?\129cupe?\204?\129ration de panier
Modified Paths:
--------------
branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
Modified: branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
===================================================================
--- branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-04-01 15:12:39 UTC (rev 3658)
+++ branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-04-01 16:00:35 UTC (rev 3659)
@@ -44,7 +44,7 @@
$lg['EMAIL_FROM_S']= 'Champ \'From\' d\'un Email envoyé';
$lg['EMAIL_FROM_L']= 'L\'adresse Email utilisée pour identifier l\'expéditeur des Emails envoyés par la boutique.';
$lg['STORE_COUNTRY_S']= 'Pays';
-$lg['STORE_COUNTRY_L']= 'Le pays de résidence de la boutique.<br /><br /><strong>Note : Pensez à mettre à jour la zone.</strong>';
+$lg['STORE_COUNTRY_L']= 'Le pays de résidence de la boutique.<br /><strong>Note : Pensez à mettre à jour la zone.</strong>';
$lg['STORE_ZONE_S']= 'Zone';
$lg['STORE_ZONE_L']= 'Zone de la localisation de la boutique.';
$lg['USE_DEFAULT_LANGUAGE_CURRENCY_S']= 'Change langue en fonction devises';
@@ -241,16 +241,16 @@
$lg['PRODINFO_ATTRIBUTE_PLUGIN_S']= 'Affichage des attributs du plugin produit Info';
$lg['PRODINFO_ATTRIBUTE_PLUGIN_L']= 'Le plugin utilisé pour les attributs affichés sur la page d\'informations produit .';
$lg['PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_S']= 'Afficher les attributs rupture de stock';
-// $lg['PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_L']= '<strong>Si True:</strong> Les attributs qui sont en rupture de stock seront affichés. <br /><br /><strong> si False:</strong> Les attributs qui sont en rupture de stock <strong><em>ne seront pas</em></strong>affichés.</strong><br /><br /><strong>True par défaut.</strong>';
+// $lg['PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_L']= '<strong>Si True:</strong> Les attributs qui sont en rupture de stock seront affichés. <br /><strong> si False:</strong> Les attributs qui sont en rupture de stock <strong><em>ne seront pas</em></strong>affichés.</strong><br /><strong>True par défaut.</strong>';
$lg['PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_L']= 'Si True : Les attributs qui sont en rupture de stock seront affichés.<br />Si False : Les attributs qui sont en rupture de stock ne seront pas affichés.<br />True par défaut.';
$lg['PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_S']= 'Attributs rupture de stock';
$lg['PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_L']= 'Contrôle la façon dont les attributs de stock sont marqués lors d\'une rupture de stock .';
$lg['PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_S']= 'Affichage de la ligne Message Stock ';
$lg['PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_L']= '<strong>Si True:</strong> Si une combinaison d\'attributs est sélectionné par le client, une ligne de message informant de cette volonté s\'affichera.';
$lg['PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_S']= 'Liste des attributs des prix actuels.';
-$lg['PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_L']= '<strong>NOTE:</strong></font> N\'affiche un résultat satisfaisant que si vous avez une seule option par produit.<br /><strong> Si True:</strong> Le prix des options sera affiché comme un prix de produit final.<br /><br /><strong> False par défaut.</strong>';
+$lg['PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_L']= '<strong>NOTE:</strong></font> N\'affiche un résultat satisfaisant que si vous avez une seule option par produit.<br /><strong> Si True:</strong> Le prix des options sera affiché comme un prix de produit final.<br /><strong> False par défaut.</strong>';
$lg['PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_S']= 'Affichage table avec information stock';
-$lg['PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_L']= '<strong>Si True:</strong> Un tableau avec les informations sur le stock sera affiché au client. Si le produit n\'a pas tous les attributs de stock suivi, la table ne sera pas affichée.<br /><br /><strong>True par défaut.</strong>';
+$lg['PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_L']= '<strong>Si True:</strong> Un tableau avec les informations sur le stock sera affiché au client. Si le produit n\'a pas tous les attributs de stock suivi, la table ne sera pas affichée.<br /><strong>True par défaut.</strong>';
/// 10 log
$lg['STORE_PAGE_PARSE_TIME_S']= 'Stockage du temps d\'exécution';
@@ -270,7 +270,7 @@
/// 11 catalog options
$lg['COUNTRY_LOCALNAME_S']= 'Afficher le nom local des états/pays';
-$lg['COUNTRY_LOCALNAME_L']= 'Afficher le nom local des états/pays sur create_account?<br /><br />e.G.<br />Deutschland instead of Germany<br />Sverige instead of Sweden';
+$lg['COUNTRY_LOCALNAME_L']= 'Afficher le nom local des états/pays sur create_account?<br />e.G.<br />Deutschland instead of Germany<br />Sverige instead of Sweden';
$lg['AJAX_CART_MODE_S']= '[panier] Utiliser javascript asynchrone';
$lg['AJAX_CART_MODE_L']= 'Utiliser un javascript asynchrone (sans rafraîchissement de la page) pour le panier (modification du panier par l\'utilisateur).';
$lg['LOGIN_SET_SNAPSHOT_S']= 'Se souvenir de la page pour l\'identification par box login ?';
@@ -428,44 +428,44 @@
/// 22 cart recover
$lg['RCS_BASE_DAYS_S']= 'Revu des jours';
$lg['RCS_BASE_DAYS_L']= 'Nombre de jours antérieurs à partir d\'aujourd\'hui pour les cartes abandonnés.';
-$lg['RCS_SKIP_DAYS_S']= 'Skip days';
-$lg['RCS_SKIP_DAYS_L']= 'Number of days to skip when looking for abandoned carts.';
+$lg['RCS_SKIP_DAYS_S']= 'Jours à ignorer';
+$lg['RCS_SKIP_DAYS_L']= 'Nombre de jours à ignorer lors d\'une recherche de panier abandonnés.';
$lg['RCS_REPORT_DAYS_S']= 'Rapport /jours résultats des ventes ';
-$lg['RCS_REPORT_DAYS_L']= 'Number of days the sales results report takes into account. The more days the longer the SQL queries!';
+$lg['RCS_REPORT_DAYS_L']= 'Nombre de jour de vente à prendre en compte dans les rapports d'un compte. Plus il y a de jour, plus la requête SQL est longue !';
$lg['RCS_INCLUDE_TAX_IN_PRICES_S']= 'Utiliser les taxes calculées';
$lg['RCS_INCLUDE_TAX_IN_PRICES_L']= 'Essayez de calculer les taxes lors de la détermination des prix. Cela ne peut pas être 100% correct suivant l\'emplacement, etc. Peut comporter des erreurs.';
-$lg['RCS_USE_FIXED_TAX_IN_PRICES_S']= 'Utiliser des taxes fixes';
+$lg['RCS_USE_FIXED_TAX_IN_PRICES_S']= 'Utiliser les taxes fixes';
$lg['RCS_USE_FIXED_TAX_IN_PRICES_L']= 'Utiliser un taux de taxes fixe lors de la détermination des prix (taux fixé ci-dessous) . Substitution si les taxes utilisées calculées est True.';
$lg['RCS_FIXED_TAX_RATE_S']= 'Taux de taxe fixe';
-$lg['RCS_FIXED_TAX_RATE_L']= 'The fixed tax rate for use when \'Use Fixed tax rate\' is true and \'Use Calculated taxes\' is false.<br /><br />Use decimal values, ie: 0.10 for 10%.';
-$lg['RCS_EMAIL_TTL_S']= 'E-Mail time to live';
-$lg['RCS_EMAIL_TTL_L']= 'Number of days to give for emails before they no longer show as being sent.';
-$lg['RCS_EMAIL_FRIENDLY_S']= 'Friendly E-Mails';
-$lg['RCS_EMAIL_FRIENDLY_L']= 'If <strong>true</strong> then the customer\'s name will be used in the greeting. If <strong>false</strong> then a generic greeting will be used.';
-$lg['RCS_EMAIL_COPIES_TO_S']= 'E-Mail Copies to';
-$lg['RCS_EMAIL_COPIES_TO_L']= 'Lors des rappels des panier abandonnés vers les clients, voulez vous recevoir une copie.';
-$lg['RCS_SHOW_ATTRIBUTES_S']= 'Show Attributes';
-$lg['RCS_SHOW_ATTRIBUTES_L']= 'Controls display of item attributes.<br /><br />Some sites have attributes for their items.<br /><br />Set this to <strong>true</strong> if yours does and you want to show them, otherwise set to <strong>false</strong>.';
-$lg['RCS_CHECK_SESSIONS_S']= 'Ignore Customers with Sessions';
-// $lg['RCS_CHECK_SESSIONS_L']= 'If you want the tool to ignore customers with an active session (ie, probably still shopping) set this to <strong>true</strong>.<br /><br />Setting this to <strong>false</strong> will operate in the default manner of ignoring session data & using less resources.';
+$lg['RCS_FIXED_TAX_RATE_L']= 'Le taux de taxe fixe est utilisé lorsque \'Utiliser les taxes fixes\' est sur true et \'Utiliser les taxes calculées\'est sur false.<br />Utilisez des valeurs décimales, ex: 0.10 for 10%.';
+$lg['RCS_EMAIL_TTL_S']= 'Longueur de vie d\'un E-Mail';
+$lg['RCS_EMAIL_TTL_L']= 'Nombre de jour à laisser à un email avant de ne plus les afficher comme envoyés.';
+$lg['RCS_EMAIL_FRIENDLY_S']= 'E-Mails amis';
+$lg['RCS_EMAIL_FRIENDLY_L']= 'Si cette valeur est sur <strong>true</strong> le nom du client sera utilisé dans le mail de bienvenue. Si la valeur est sur <strong>false</strong> le mail générique sera envoyé.';
+$lg['RCS_EMAIL_COPIES_TO_S']= 'Envoyer une copie des E-Mail à';
+$lg['RCS_EMAIL_COPIES_TO_L']= 'Lors des rappels des panier abandonnés vers les clients, envoyer une copie à l'adresse suivante :';
+$lg['RCS_SHOW_ATTRIBUTES_S']= 'Voir les Attributs';
+$lg['RCS_SHOW_ATTRIBUTES_L']= 'Controler l'affichage des attributs de produits.<br />Pour afficher les attributs de vos produits, passez ce paramètre sur <strong>true</strong>.';
+$lg['RCS_CHECK_SESSIONS_S']= 'Ignorer les clients avec session';
+// $lg['RCS_CHECK_SESSIONS_L']= 'If you want the tool to ignore customers with an active session (ie, probably still shopping) set this to <strong>true</strong>.<br />Setting this to <strong>false</strong> will operate in the default manner of ignoring session data & using less resources.';
$lg['RCS_CHECK_SESSIONS_L']= 'If you want the tool to ignore customers with an active session (ie, probably still shopping) set this to true.<br />Setting this to false will operate in the default manner of ignoring session data & using less resources.';
$lg['RCS_CURCUST_COLOR_S']= 'Current Customer Color';
-$lg['RCS_CURCUST_COLOR_L']= 'Color for the word/phrase used to notate a current customer<br /><br />A current customer is someone who has purchased items from your store in the past.';
+$lg['RCS_CURCUST_COLOR_L']= 'Color for the word/phrase used to notate a current customer<br />A current customer is someone who has purchased items from your store in the past.';
$lg['RCS_UNCONTACTED_COLOR_S']= 'Uncontacted hilight color';
-$lg['RCS_UNCONTACTED_COLOR_L']= 'Row highlight color for uncontacted customers.<br /><br />An uncontacted customer is one that you have <i>not</i> used this tool to send an email to before.';
+$lg['RCS_UNCONTACTED_COLOR_L']= 'Row highlight color for uncontacted customers.<br />An uncontacted customer is one that you have <i>not</i> used this tool to send an email to before.';
$lg['RCS_CONTACTED_COLOR_S']= 'Contacted hilight color';
-$lg['RCS_CONTACTED_COLOR_L']= 'Row highlight color for contacted customers.<br /><br />An contacted customer is one that you <i>have</i> used this tool to send an email to before.';
+$lg['RCS_CONTACTED_COLOR_L']= 'Row highlight color for contacted customers.<br />An contacted customer is one that you <i>have</i> used this tool to send an email to before.';
$lg['RCS_MATCHED_ORDER_COLOR_S']= 'Matching Order Hilight';
-// $lg['RCS_MATCHED_ORDER_COLOR_L']= 'Row highlight color for entrees that may have a matching order.<br /><br />An entry will be marked with this color if an order contains one or more of an item in the abandoned cart <strong>and</strong> matches either the cart\'s customer email address or database ID.';
+// $lg['RCS_MATCHED_ORDER_COLOR_L']= 'Row highlight color for entrees that may have a matching order.<br />An entry will be marked with this color if an order contains one or more of an item in the abandoned cart <strong>and</strong> matches either the cart\'s customer email address or database ID.';
$lg['RCS_MATCHED_ORDER_COLOR_L']= 'Row highlight color for entrees that may have a matching order.<br />An entry will be marked with this color if an order contains one or more of an item in the abandoned cart and matches either the cart\'s customer email address or database ID.';
$lg['RCS_SKIP_MATCHED_CARTS_S']= 'Skip Carts w/Matched Orders';
-// $lg['RCS_SKIP_MATCHED_CARTS_L']= 'To ignore carts with an a matching order set this to <strong>true</strong>.<br /><br />Setting this to <strong>false</strong> will cause entries with a matching order to show, along with the matching order\'s status.<br /><br />See documentation for details.';
+// $lg['RCS_SKIP_MATCHED_CARTS_L']= 'To ignore carts with an a matching order set this to <strong>true</strong>.<br />Setting this to <strong>false</strong> will cause entries with a matching order to show, along with the matching order\'s status.<br />See documentation for details.';
$lg['RCS_SKIP_MATCHED_CARTS_L']= 'To ignore carts with an a matching order set this to true.<br />Setting this to false will cause entries with a matching order to show, along with the matching order\'s status.<br />See documentation for details.';
$lg['RCS_AUTO_CHECK_S']= 'Autocheck "safe" carts to email';
-// $lg['RCS_AUTO_CHECK_L']= 'To check entries which are most likely safe to email (ie, not existing customers, not previously emailed, etc.) set this to <strong>true</strong>.<br /><br />Setting this to <strong>false</strong> will leave all entries unchecked (must manually check entries to send an email to).';
+// $lg['RCS_AUTO_CHECK_L']= 'To check entries which are most likely safe to email (ie, not existing customers, not previously emailed, etc.) set this to <strong>true</strong>.<br />Setting this to <strong>false</strong> will leave all entries unchecked (must manually check entries to send an email to).';
$lg['RCS_AUTO_CHECK_L']= 'To check entries which are most likely safe to email (ie, not existing customers, not previously emailed, etc.) set this to true.<br />Setting this to false will leave all entries unchecked (must manually check entries to send an email to).';
$lg['RCS_CARTS_MATCH_ALL_DATES_S']= 'Match orders from any date';
-$lg['RCS_CARTS_MATCH_ALL_DATES_L']= 'If <strong>true</strong> then any order found with a matching item will be considered a matched order.<br /><br />If <strong>false</strong> only orders placed after the abandoned cart are considered.';
+$lg['RCS_CARTS_MATCH_ALL_DATES_L']= 'If <strong>true</strong> then any order found with a matching item will be considered a matched order.<br />If <strong>false</strong> only orders placed after the abandoned cart are considered.';
$lg['RCS_PENDING_SALE_STATUS_S']= 'Pending sales statuses';
$lg['RCS_PENDING_SALE_STATUS_L']= 'Select the order statuses that can be considered as pending. This information is used to find a succesfull order from the same customer with the same products.';
$lg['RCS_REPORT_EVEN_STYLE_S']= 'Report Even Row Style';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-01 15:12:46
|
Revision: 3658
http://oscss.svn.sourceforge.net/oscss/?rev=3658&view=rev
Author: oscim
Date: 2011-04-01 15:12:39 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
mise a niveau du doc file
Modified Paths:
--------------
branches/2.1.0/doc/Frontoffice/Doxyfile
Modified: branches/2.1.0/doc/Frontoffice/Doxyfile
===================================================================
--- branches/2.1.0/doc/Frontoffice/Doxyfile 2011-04-01 14:14:13 UTC (rev 3657)
+++ branches/2.1.0/doc/Frontoffice/Doxyfile 2011-04-01 15:12:39 UTC (rev 3658)
@@ -3,244 +3,279 @@
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = oscss
-PROJECT_NUMBER = 2.1.0RC
-OUTPUT_DIRECTORY = /var/www/workspace/oscss/doc/Frontoffice/
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = YES
-ALWAYS_DETAILED_SEC = YES
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH = /var/www/workspace/doc/Frontoffice/
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = YES
-QT_AUTOBRIEF = NO
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = oscss
+PROJECT_NUMBER = 2.1.0RC
+OUTPUT_DIRECTORY = /var/www/workspace/oscss/doc/Frontoffice/
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF = YES
+ALWAYS_DETAILED_SEC = YES
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = YES
+STRIP_FROM_PATH = /var/www/workspace/doc/Frontoffice/
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = YES
+QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-OPTIMIZE_FOR_FORTRAN = NO
-OPTIMIZE_OUTPUT_VHDL = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-SIP_SUPPORT = NO
-IDL_PROPERTY_SUPPORT = YES
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-TYPEDEF_HIDES_STRUCT = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
+BUILTIN_STL_SUPPORT = NO
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
+IDL_PROPERTY_SUPPORT = YES
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+TYPEDEF_HIDES_STRUCT = NO
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_GROUP_NAMES = YES
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST = YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = YES
-SHOW_FILES = YES
-SHOW_NAMESPACES = YES
-FILE_VERSION_FILTER =
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = YES
+EXTRACT_ANON_NSPACES = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = YES
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_GROUP_NAMES = YES
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+SHOW_FILES = YES
+SHOW_NAMESPACES = NO
+FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = /var/www/workspace/oscss/catalog/ /var/www/workspace/oscss/catalog/includes/ /var/www/workspace/oscss/catalog/includes/boxes/ /var/www/workspace/oscss/catalog/includes/classes/ /var/www/workspace/oscss/catalog/includes/content/ /var/www/workspace/oscss/catalog/includes/functions/ /var/www/workspace/oscss/catalog/includes/gabarit/ /var/www/workspace/oscss/catalog/includes/languages/ /var/www/workspace/oscss/catalog/includes/modules/ /var/www/workspace/oscss/catalog/includes/rss/ /var/www/workspace/oscss/catalog/includes/languages/fr_FR/ /var/www/workspace/oscss/catalog/common/ /var/www/workspace/oscss/catalog/common/functions/ /var/www/workspace/oscss/catalog/common/fonts/ /var/www/workspace/oscss/catalog/common/classes/ /var/www/workspace/oscss/catalog/common/drivers/ /var/www/workspace/oscss/catalog/includes/local/ /var/www/workspace/oscss/catalog/ext/ /var/www/workspace/oscss/catalog/includes/languages/fr_FR/modules/ /var/www/workspace/oscss/catalog/includes/languages/fr_FR/boxes/ /var/www/workspace/oscss/catalog/includes/languages/fr_FR/rss/ /var/www/workspace/oscss/catalog/includes/modules/products/ /var/www/workspace/oscss/catalog/includes/modules/account/
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.php *.css *.gab *.inc *.txt
-RECURSIVE = NO
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH = /var/www/workspace/oscss/doc/Frontoffice/example/
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
+INPUT = /var/www/workspace/2.1.0/catalog/ \
+ /var/www/workspace/2.1.0/catalog/includes/ \
+ /var/www/workspace/2.1.0/catalog/includes/boxes/ \
+ /var/www/workspace/2.1.0/catalog/includes/classes/ \
+ /var/www/workspace/2.1.0/catalog/includes/content/ \
+ /var/www/workspace/2.1.0/catalog/includes/functions/ \
+ /var/www/workspace/2.1.0/catalog/includes/gabarit/ \
+ /var/www/workspace/2.1.0/catalog/includes/languages/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/ \
+ /var/www/workspace/2.1.0/catalog/includes/triggers/ \
+ /var/www/workspace/2.1.0/catalog/includes/rss/ \
+ /var/www/workspace/2.1.0/catalog/includes/languages/fr_FR/ \
+ /var/www/workspace/2.1.0/catalog/common/ \
+ /var/www/workspace/2.1.0/catalog/common/functions/ \
+ /var/www/workspace/2.1.0/catalog/common/fonts/ \
+ /var/www/workspace/2.1.0/catalog/common/classes/ \
+ /var/www/workspace/2.1.0/catalog/common/drivers/ \
+ /var/www/workspace/2.1.0/catalog/includes/local/ \
+ /var/www/workspace/2.1.0/catalog/ext/ \
+ /var/www/workspace/2.1.0/catalog/includes/languages/fr_FR/modules/ \
+ /var/www/workspace/2.1.0/catalog/includes/languages/fr_FR/boxes/ \
+ /var/www/workspace/2.1.0/catalog/includes/languages/fr_FR/rss/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/products/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/account/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/payment/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/shipping/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/order_total/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/content/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/generic/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/categorie/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/home/ \
+ /var/www/workspace/2.1.0/catalog/includes/modules/checkout_process/
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS = *.php \
+ *.css \
+ *.gab \
+ *.inc \
+ *.txt
+RECURSIVE = NO
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH = /doc/Frontoffice/example/
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = YES
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION = NO
-REFERENCES_LINK_SOURCE = NO
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
+SOURCE_BROWSER = YES
+INLINE_SOURCES = YES
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = NO
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER = /home/aurelien/workspace/oscss/doc/header.html
-HTML_FOOTER = /home/aurelien/workspace/oscss/doc/footer.html
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = NO
-GENERATE_HTMLHELP = NO
-GENERATE_DOCSET = NO
-DOCSET_FEEDNAME = "Doxygen generated docs"
-DOCSET_BUNDLE_ID = org.doxygen.Project
-HTML_DYNAMIC_SECTIONS = YES
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-CHM_INDEX_ENCODING =
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = HIERARCHIES
-TREEVIEW_WIDTH = 250
-FORMULA_FONTSIZE = 10
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER = /home/aurelien/workspace/oscss/doc/header.html
+HTML_FOOTER = /home/aurelien/workspace/oscss/doc/footer.html
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = NO
+GENERATE_HTMLHELP = NO
+GENERATE_DOCSET = NO
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = org.doxygen.Project
+HTML_DYNAMIC_SECTIONS = YES
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+CHM_INDEX_ENCODING =
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = HIERARCHIES
+TREEVIEW_WIDTH = 250
+FORMULA_FONTSIZE = 10
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = YES
-LATEX_HIDE_INDICES = NO
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = YES
+LATEX_HIDE_INDICES = NO
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = YES
+GENERATE_AUTOGEN_DEF = YES
#---------------------------------------------------------------------------
# configuration options related to the Perl module output
#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration::additions related to external references
#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = NO
-PERL_PATH = /usr/bin/perl
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = NO
+PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = NO
-HAVE_DOT = NO
-DOT_FONTNAME = FreeSans
-DOT_FONTPATH =
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = YES
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
+CLASS_DIAGRAMS = NO
+MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = NO
+HAVE_DOT = NO
+DOT_FONTNAME = FreeSans
+DOT_FONTPATH =
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+CALLER_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = YES
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
#---------------------------------------------------------------------------
# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
-SEARCHENGINE = YES
+SEARCHENGINE = YES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-04-01 14:14:19
|
Revision: 3657
http://oscss.svn.sourceforge.net/oscss/?rev=3657&view=rev
Author: j4k
Date: 2011-04-01 14:14:13 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
Coquilles dans les commentaires
Modified Paths:
--------------
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/cfg/init.php
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/template.php
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/cfg/init.php
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/cfg/init.php 2011-04-01 13:52:39 UTC (rev 3656)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/cfg/init.php 2011-04-01 14:14:13 UTC (rev 3657)
@@ -78,8 +78,8 @@
$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
/**
-Les element a placé dans les agabrit de page
+Les element a placé dans les gabarits de page
-Il sont necessairement appelé par $page, ou le code raccourcis de l'object
+Il sont nécessairement appelé par $page, ou le code raccourcis de l'object
*/
?>
\ No newline at end of file
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/template.php
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/template.php 2011-04-01 13:52:39 UTC (rev 3656)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/template.php 2011-04-01 14:14:13 UTC (rev 3657)
@@ -9,7 +9,7 @@
@encode UTF-8
*/
/**
- Refedini les elements visible sur cette page
+ Redéfini les elements visible sur cette page
Ces appel force la configuration defini dans le backoffice. Ces appels ne peuvent avoir lieux que sur des foction d'affichge, et en aucun cas de fonctionnement.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-04-01 13:52:45
|
Revision: 3656
http://oscss.svn.sourceforge.net/oscss/?rev=3656&view=rev
Author: j4k
Date: 2011-04-01 13:52:39 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
Correctifs mineurs de mise en page sur la page produit
Modified Paths:
--------------
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/sample.css
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/sample.css
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/sample.css 2011-04-01 12:06:34 UTC (rev 3655)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/sample.css 2011-04-01 13:52:39 UTC (rev 3656)
@@ -31,7 +31,6 @@
.messageStackError {color: #f18f7e;}
-
#main_container{
width:1000px;
height:auto;
@@ -412,8 +411,8 @@
/* #TotCart ul .ajaxcartSubTotal{position:relative; left:60%;} */
/*---------prod_box----------*/
-#productImagelistMini ul {list-style: none;}
-#productImagelistMini li {display: inline;}
+#productImagesGlb ul {list-style: none;}
+#productImagesGlb li {display: inline;}
.prod_box{
width:173px;
height:auto;
@@ -528,7 +527,7 @@
.product_img_big{ width:170px; padding:5px 0 5px 10px; float:left; }
-.details_big_box{ width:345px; float:left; padding:0 0 0 15px; text-align:left; }
+.details_big_box{ width:215px; float:right; padding:0 15px 0 15px; text-align:left; }
.product_title_big{ color:#ea2222; padding:5px 0 5px 0; font-weight:bold; font-size:14px; }
.specifications{ font-size:12px; font-weight:bold; line-height:18px; }
.thumbs{ padding:8px 5px 8px 5px; border:1px #DFD1D1 solid; margin:3px 0 0 0; }
@@ -540,9 +539,7 @@
div#productOptions {width:300px;text-align:left;position:relative;left:-145px;}
div.action { bottom:0; position:relative; text-align:right; width:200px; float:right}
input[type=submit].addtocart,
-a.addtocart{ width:115px; height:27px; display:block; float:left; background:url(images/addtocart.gif) no-repeat left; padding:0 0 0 33px; text-decoration:none; line-height:27px; color:#1c4a52; border:none; }
-#productInfoBack {position:relative;
-right:260px;}
+a.addtocart{ cursor:pointer;cursor:hand;width:115px; height:27px; display:block; float:left; background:url(images/addtocart.gif) no-repeat left; padding:0 0 0 33px; text-decoration:none; line-height:27px; margin:2em;color:#1c4a52; border:none; }
input[type=submit],
a.navBt{
margin:-6px 2px 0 2px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-04-01 12:06:41
|
Revision: 3655
http://oscss.svn.sourceforge.net/oscss/?rev=3655&view=rev
Author: oscim
Date: 2011-04-01 12:06:34 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
suite coquille listing
amelioration template public base
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css
branches/2.1.0/catalog/includes/classes/page.listing.php
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php
Modified: branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-03-31 23:25:15 UTC (rev 3654)
+++ branches/2.1.0/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-04-01 12:06:34 UTC (rev 3655)
@@ -364,12 +364,15 @@
/* Widget BOX */
#header .adminBlock {width:250px;}
- .box,.graph{width:95%;}
+ .box,
+ .graph{width:95%;}
.adminBlock,.box {float:left;margin:10px;background:#e4e4e4 url(../../../images/back.jpg) repeat-x;}
.adminBlock h3,
.box h3 { margin: 0;height:15px; background:transparent url(img/1/menu_bg.jpg) repeat-x ; padding:0.3em;}
.adminBlock ul,
- .box ul, .box p, .box dl { list-style-type:none; margin:0 0 0 2px; padding:0 10px 10px 0 ;}
+ .box ul,
+ .box p,
+ .box dl { list-style-type:none; margin:0 0 0 2px; padding:0 10px 10px 10px ;}
.box dt {padding-left:10px}
.adminBlock .tirroir { clear:both; color:#000; z-index:99;border:1px solid #dedede;border-left:1px solid #fff; border-right:1px solid #ccc;}
Modified: branches/2.1.0/catalog/includes/classes/page.listing.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/page.listing.php 2011-03-31 23:25:15 UTC (rev 3654)
+++ branches/2.1.0/catalog/includes/classes/page.listing.php 2011-04-01 12:06:34 UTC (rev 3655)
@@ -182,8 +182,9 @@
static private function Exeorderby($sql_sort=''){
$listing_sql = ' order by ';
- $listing_sql .= (tep_not_null(self::$sql_sort)? self::$sql_sort.',' : '').listingUtility::sortby(@$_GET['sort']);
-
+ $sort=listingUtility::sortby(@$_GET['sort']);
+ $listing_sql .= ((strlen(self::$sql_sort)>0 && strlen($sort)>0)? self::$sql_sort.',': self::$sql_sort);
+ $listing_sql .= $sort;
return $listing_sql;
}
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php 2011-03-31 23:25:15 UTC (rev 3654)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/product_info.php 2011-04-01 12:06:34 UTC (rev 3655)
@@ -53,6 +53,9 @@
<div class="prod_box_big">
<div class="top_prod_box_big"></div>
<div class="center_prod_box_big">
+ <div id="productInfoBack" class="navBt">
+ <?php echo '<a class="navBt" href="javascript: history.go(-1)">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
<?php if (tep_not_null($product_info['products_image'])) { ?>
<div id="productImagesGlb" class="product_img_big contentBox">
<div id="productImage">
@@ -70,7 +73,7 @@
<?php } ?>
</div>
<?php /** Liste des images dans la pile des images du produits (toutes les images) */ ?>
- <div id="productImagelistMini contentBox">
+ <div id="productImagelistMini" class="contentBox">
<ul>
<?php if(is_array($page->product->pile_img)) foreach($page->product->pile_img as $img) : ?>
<li>
@@ -118,11 +121,6 @@
</p>
<p><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']); ?></p>
</form>
-
- <div id="productInfoBack" class="navBt">
- <?php echo '<a class="navBt" href="javascript: history.go(-1)">' . IMAGE_BUTTON_BACK . '</a>'; ?>
- </div>
- </div>
</div>
<div class="bottom_prod_box_big"></div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-03-31 23:25:21
|
Revision: 3654
http://oscss.svn.sourceforge.net/oscss/?rev=3654&view=rev
Author: oscim
Date: 2011-03-31 23:25:15 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
coquille listing Erreur format requete sql
Ajout du tri via extenstion dans les listing de produits des categorie enfant de la categorie en cours 'nested'
Modified Paths:
--------------
branches/2.1.0/catalog/includes/classes/page.listing.php
Modified: branches/2.1.0/catalog/includes/classes/page.listing.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/page.listing.php 2011-03-31 17:35:06 UTC (rev 3653)
+++ branches/2.1.0/catalog/includes/classes/page.listing.php 2011-03-31 23:25:15 UTC (rev 3654)
@@ -4,12 +4,9 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.0
- @date 16/03/11, 21:13
+ @date 31/03/11, 20:12
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-
-
-
@Class listing
charge les modules actifs
@@ -134,6 +131,8 @@
}
else
return $listing_sql;
+
+
}
static private function query(){
@@ -172,7 +171,7 @@
$listing_sql = "select distinct p.*, pd.products_name from ".TABLE_V_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
- self::orderby('c.sort_order, ');
+ self::orderby('c.sort_order ');
break;
}
@@ -183,7 +182,7 @@
static private function Exeorderby($sql_sort=''){
$listing_sql = ' order by ';
- $listing_sql .= (tep_not_null(self::$sql_sort)? self::$sql_sort : '').listingUtility::sortby(@$_GET['sort']);
+ $listing_sql .= (tep_not_null(self::$sql_sort)? self::$sql_sort.',' : '').listingUtility::sortby(@$_GET['sort']);
return $listing_sql;
}
@@ -256,7 +255,7 @@
@brief Tri par default, option des categorie Champs sortchids_products & sortchids_content
*/
elseif(tep_not_null($categories->sortchids_products) || tep_not_null($categories->sortchids_content)){
- if( listingData::$type_object=='products' ) $listing_sql .= $categories->sortchids_products.", pd.products_name";
+ if( listingData::$type_object=='products' || listingData::$type_object=='nested' ) $listing_sql .= $categories->sortchids_products.", pd.products_name";
elseif( listingData::$type_object=='pages' ) $listing_sql .= $categories->sortchids_content;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-03-31 17:35:12
|
Revision: 3653
http://oscss.svn.sourceforge.net/oscss/?rev=3653&view=rev
Author: oscim
Date: 2011-03-31 17:35:06 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
correction coquille , boxe mal format?\195?\169
AJout fichier langue erreur
Modified Paths:
--------------
branches/2.1.0/catalog/includes/boxes/shopping_cart_short_ajax.php
branches/2.1.0/catalog/includes/languages/fr_FR/login.php
Modified: branches/2.1.0/catalog/includes/boxes/shopping_cart_short_ajax.php
===================================================================
--- branches/2.1.0/catalog/includes/boxes/shopping_cart_short_ajax.php 2011-03-31 09:36:32 UTC (rev 3652)
+++ branches/2.1.0/catalog/includes/boxes/shopping_cart_short_ajax.php 2011-03-31 17:35:06 UTC (rev 3653)
@@ -8,7 +8,7 @@
*\author oscim <mail aur...@os...> <www http://www.oscim.fr>
*\encode UTF-8
*\file shopping_cart_short_ajax.php
- *\brief the box shopping_cart
+ *\brief the box shopping_cart
*/
global $total_nb_products_with_qty;
$currencies=$page->return_object('currencies');
@@ -20,5 +20,6 @@
$total_nb_products_with_qty += $products[$i]['quantity'];
}
+ $title='<a href="'.tep_href_link(FILENAME_SHOPPING_CART).'">'.__('box heading shopping cart').'</a>';
$array=array('title'=>tep_output_string_protected($title,false,true),'content'=>tep_get_include_contents('box.cart.short'));
?>
Modified: branches/2.1.0/catalog/includes/languages/fr_FR/login.php
===================================================================
--- branches/2.1.0/catalog/includes/languages/fr_FR/login.php 2011-03-31 09:36:32 UTC (rev 3652)
+++ branches/2.1.0/catalog/includes/languages/fr_FR/login.php 2011-03-31 17:35:06 UTC (rev 3653)
@@ -23,7 +23,7 @@
define('TEXT_LOGIN_ERROR', 'Erreur : aucun résultat à cette adresse e-mail et/ou mot de passe.');
define('TEXT_LOGIN_ERROR_ACCOUNT_NOT_CONFIRMED', 'Erreur : Ce compte existe, mais n\'est pas confirmé, Utiliser le liens comptenu dans l\'email que vous avez reçu, penser à verifier dans les emails classés comme spam. %s');
define('TEXT_NEW_SENT_CONFIRM', 'Envoyer un nouvel email de confirmation');
+define('TEXT_LOGIN_ERROR_USER_NOT_EXITS', 'Erreur : aucun résultat à cette adresse e-mail et/ou mot de passe.');
-
?>
\ 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...> - 2011-03-31 09:36:39
|
Revision: 3652
http://oscss.svn.sourceforge.net/oscss/?rev=3652&view=rev
Author: oscim
Date: 2011-03-31 09:36:32 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
correction coquille generation pdf facture / proformat
correction erreur notice appel img ds fpdf
Ajout texte titre proformat
Mise a jour entete de fichier des tempate pdf
Correction coquille sql date finish dans les orders
Ajout order_id dans les info des orders, lors utilisation class order
correction coquille appel navigation lors creation compte client
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt
branches/2.1.0/catalog/admin/includes/modules/pages/batch_print.php
branches/2.1.0/catalog/admin/includes/modules/template_pdf/entete_shop.php
branches/2.1.0/catalog/admin/includes/modules/template_pdf/invoice.php
branches/2.1.0/catalog/admin/includes/modules/template_pdf/labels.php
branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip.php
branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip_and_invoice.php
branches/2.1.0/catalog/common/classes/fpdf.php
branches/2.1.0/catalog/common/classes/order.php
branches/2.1.0/catalog/create_account.php
branches/2.1.0/catalog/install/oscss.sql
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt 2011-03-31 09:36:32 UTC (rev 3652)
@@ -94,6 +94,7 @@
/** UTILISE DANS LES SORTIE PDF NE PAS MODIFIER */
define('PRINT_INVOICE_HEADING', 'Facture');
+define('PRINT_PROFORMAT_HEADING', 'Proformat');
define('PRINT_INVOICE_TEXT', 'Merci de votre commande sur <a href="'.HTTP_SERVER.DIR_WS_CATALOG.'">'.STORE_NAME.'</a>');
define('PRINT_INVOICE', 'Facture');
define('PRINT_PROFORMAT_ORDERNR', 'Proformat n° : ');
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/batch_print.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/batch_print.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/batch_print.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -72,7 +72,7 @@
}
$invoicenumbers=implode(',',$arr_no);
- $type=(isset($_GET['file_type'])) ? $_GET['file_type'].'.php' : $_POST['file_type'] ;
+ $type=(isset($_GET['file_type'])) ? $_GET['file_type'] : $_POST['file_type'] ;
} else {
try{
Modified: branches/2.1.0/catalog/admin/includes/modules/template_pdf/entete_shop.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/template_pdf/entete_shop.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/admin/includes/modules/template_pdf/entete_shop.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -1,14 +1,13 @@
<?php
-/*
- $Id: entete_shop.php, v1.0 08.08.2009 20:15:34 oscim Exp $
-// kate: replace-trailing-space-save true; space-indent on; indent-width 2; mixedindent off; indent-mode cstyle; word-wrap-marker-color #41C2A4
-+-----------------------------------------------------------------------+
-| osCSS Open Source E-commerce |
-+-----------------------------------------------------------------------+
+/**
+ @licence GPL 2005-2011 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 31/03/11, 11:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
- ENCODE UTF-8
-
-
Fichier a laisser vide, entete_shop
*/
?>
Modified: branches/2.1.0/catalog/admin/includes/modules/template_pdf/invoice.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/template_pdf/invoice.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/admin/includes/modules/template_pdf/invoice.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -1,12 +1,13 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-Codev <www http://www.oscss.org>
- @version Rc-3
- @date 20/02/10 10:34
+ @licence GPL 2005-2011 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 31/03/11, 11:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
- UTF-8
*/
$le_Y=0;
$marge_block=3;
@@ -23,12 +24,22 @@
$pdf->Cell(15,.1,'',1,1,'L',1);
$pdf->SetFont('Arial','BI',15);
$pdf->SetTextColor(153,153,153);
- $pdf->Text(22,61.5,tep_correct_entitie_put_pdf(PRINT_INVOICE_HEADING));
- $pdf->SetY(60);
- $pdf->SetDrawColor(153,153,153);
- $pdf->Cell(38);
- $pdf->Cell(160,.1,'',1,1,'L',1);
+ if(tep_not_null($order->info['date_finish'])){
+ $pdf->Text(22,61.5,tep_correct_entitie_put_pdf(PRINT_INVOICE_HEADING));
+ $pdf->SetY(60);
+ $pdf->SetDrawColor(153,153,153);
+ $pdf->Cell(38);
+ $pdf->Cell(160,.1,'',1,1,'L',1);
+ }
+ else {
+ $pdf->Text(22,61.5,tep_correct_entitie_put_pdf(PRINT_PROFORMAT_HEADING));
+ $pdf->SetY(60);
+ $pdf->SetDrawColor(153,153,153);
+ $pdf->Cell(42);
+ $pdf->Cell(152,.1,'',1,1,'L',1);
+ }
+
/**
Block des Adresse client
*/
@@ -78,23 +89,24 @@
$pdf->RoundedRect(6, $le_Y, 192, $hauteur_block, 2, 'DF');
//! proformat
- if(!tep_not_null($order->info['date_finish'])) {
+ if(tep_not_null($order->info['date_finish'])){
//Draw Order Number Text
- $temp = tep_correct_entitie_put_pdf(PRINT_PROFORMAT_ORDERNR);
- $pdf->Text(10,113, $temp . $order->info['orders_prefix'].$orders['orders_id']);
- //Draw Date of Order Text
- $temp = tep_correct_entitie_put_pdf (PRINT_PROFORMAT_DATE);
- $pdf->Text(130,113,$temp . tep_correct_entitie_put_pdf(tep_date_short($order->info['date_purchased'])));
- }
- else {
- //Draw Order Number Text
$temp = tep_correct_entitie_put_pdf(PRINT_INVOICE_ORDERNR);
$pdf->Text(10,113, $temp . $order->info['orders_prefix'].$order->info['facture_id']);
//Draw Date of Order Text
$temp = tep_correct_entitie_put_pdf (PRINT_INVOICE_DATE);
$pdf->Text(130,113,$temp . tep_correct_entitie_put_pdf(tep_date_short($order->info['date_finish'])));
}
+ else{
+ //Draw Order Number Text
+ $temp = tep_correct_entitie_put_pdf(PRINT_PROFORMAT_ORDERNR);
+ $pdf->Text(10,113, $temp . $order->info['orders_prefix'].$order->info['orders_id']);
+ //Draw Date of Order Text
+ $temp = tep_correct_entitie_put_pdf (PRINT_PROFORMAT_DATE);
+ $pdf->Text(130,113,$temp . tep_correct_entitie_put_pdf(tep_date_short($order->info['date_purchased'])));
+ }
+
/**
Method payement
*/
@@ -202,7 +214,7 @@
}
if (isset($_POST) && isset($_POST['show_pay_method'])){
- $innum = $orders['orders_prefix'].$orders['orders_id'];
+ $innum = $order->info['orders_prefix'].$order->info['orders_id'];
$orders_comments_query = tep_db_query("select comments,date_added from " . TABLE_ORDERS_STATUS_HISTORY . " where orders_id = '$innum' order by date_added");
if (tep_db_num_rows($orders_comments_query)) {
$Y_Table_Position=($Y_Table_Position+$marge_block);
Modified: branches/2.1.0/catalog/admin/includes/modules/template_pdf/labels.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/template_pdf/labels.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/admin/includes/modules/template_pdf/labels.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -1,65 +1,73 @@
<?php
-
+/**
+ @licence GPL 2005-2011 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 31/03/11, 11:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
// set paper type and size
// if ($pageloop == "0") {
// $pdf = new Cezpdf(A4,portrait);
// } else {
// $currencies = new currencies();
-//
+//
// $pdf->selectFont(BATCH_PDF_DIR . 'Helvetica.afm');
// $pdf->setFontFamily(BATCH_PDF_DIR . 'Helvetica.afm');
-//
+//
// //How many labels to print on a Page
// define('NUM_COLUMNS', '2');
// define('NUM_ROWS', '8');
// define('NUM_LABELS_PER_PAGE', NUM_ROWS * NUM_COLUMNS);
-//
+//
// //These Determine the Locations of the Labels, I think dimensions are (72 * inches)
// // 2.54cm = 1 inch
// define('LABEL_WIDTH', '284'); //Controls the second column
// define('LABEL_HEIGHT', '96'); // controls the space between the labels
// define('STARTX', '22'); //controls the first column
// define('STARTY', '5'); // controls the space at the top of the file
-//
+//
// //these control the little order_id text
// define('ORDERIDFONTSIZE', '6');
// define('ORDERIDXOFFSET', '20'); //position from the top right corner of label
// define('ORDERIDYOFFSET', '-2');
-//
+//
// define('GENERAL_FONT_SIZE', '14');
// define('GENERAL_LINE_SPACING', '15');
// define('GENERAL_FONT_COLOR', BLACK);
-//
+//
// if ($_POST['pull_status']){ $pull_w_status = " and o.orders_status = ". $_POST['pull_status']; }
// if ($_POST['startpos']){ $startpos = $_POST['startpos']; }
// else { $startpos = 0; }
-// if ($_POST['address']){
+// if ($_POST['address']){
// if ($_POST['address'] == "billing")
// $billing = true;
// else
// $billing = false;
// }
// else { $billing = false; }
-//
+//
// if ($_POST['endpos']){ $endpos = $_POST['endpos']; }
// else { $endpos = NUM_LABELS_PER_PAGE; }
-//
-//
+//
+//
// if (!tep_db_num_rows($orders_query) > 0) { message_handler('NO_ORDERS'); }
-//
-// change_color(GENERAL_FONT_COLOR);
+//
+// change_color(GENERAL_FONT_COLOR);
// for($y = $pdf->ez['pageHeight'] - STARTY; $y > LABEL_HEIGHT - STARTY; $y -= LABEL_HEIGHT) {
-//
-//
+//
+//
// for ($x = STARTX; $x < STARTX + NUM_COLUMNS * LABEL_WIDTH; $x += LABEL_WIDTH){
// if ($startpos <= $pos && $num < $endpos){
-//
+//
// if (print_address($x, $y, $num))
// $num++;
// }
// $pos++;
// }
-//
+//
// // Send fake header to avoid timeout, got this trick from phpMyAdmin
// $time1 = time();
// if ($time1 >= $time0 + 30) {
Modified: branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -1,14 +1,12 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-Codev <www http://www.oscss.org>
- @version Rc-3
- @date 20/02/10 15:42
+ @licence GPL 2005-2011 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 31/03/11, 11:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
-
- UTF-8
-
- Bon de commande
+ @encode UTF-8
*/
$le_Y=0;
Modified: branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip_and_invoice.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip_and_invoice.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/admin/includes/modules/template_pdf/packingslip_and_invoice.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -1,12 +1,12 @@
<?php
-/*
- $Id: Invoice.php, v1.0 08.08.2009 20:15:34 oscim Exp $
-// kate: replace-trailing-space-save true; space-indent on; indent-width 2; mixedindent off; indent-mode cstyle; word-wrap-marker-color #41C2A4
-+-----------------------------------------------------------------------+
-| osCSS Open Source E-commerce |
-+-----------------------------------------------------------------------+
-
- ENCODE UTF-8
+/**
+ @licence GPL 2005-2011 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 31/03/11, 11:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
include ('packingslip.php');
include ('invoice.php');
Modified: branches/2.1.0/catalog/common/classes/fpdf.php
===================================================================
--- branches/2.1.0/catalog/common/classes/fpdf.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/common/classes/fpdf.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -898,7 +898,7 @@
function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
{
//Put an image on the page
- if(!fopen($file,'r')) return null;
+ if(!empty($file) && !@fopen($file,'r')) return null;
if(!isset($this->images[$file]))
{
//First use of this image, get info
Modified: branches/2.1.0/catalog/common/classes/order.php
===================================================================
--- branches/2.1.0/catalog/common/classes/order.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/common/classes/order.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -24,9 +24,9 @@
private static $mode;
/**
- * \fn order($order_id = '', $table = '')
- * @param $order_id int
- * @param $table string
+ * \fn order($order_id = '', $table = '')
+ * @param $order_id int
+ * @param $table string
*/
function order($order_id = '', $table = '') {
$this->info = array();
@@ -60,7 +60,7 @@
}
/**
- * \fn query($order_id)
+ * \fn query($order_id)
* \brief Recuperation d'un command enregsitré
* @param $order_id int
*/
@@ -69,7 +69,7 @@
$order_id = tep_db_prepare_input($order_id);
- $sql="select orders_prefix,customers_id,customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, o.customers_telephone, o.customers_email_address, customers_address_format_id, customers_group_name, 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, currency, currency_value, date_purchased, orders_status, last_modified,ip_address, total_weight,orders_date_finished ".((self::$mode)?" ,facture_id ,holding_origin_id ":'')." from " . self::$tables['ORDERS'] . " o left join " . TABLE_CUSTOMERS . " using(customers_id) left join " . TABLE_CUSTOMERS_GROUPS . " using(customers_group_id) where orders_id = '" . (int)$order_id . "'";
+ $sql="select orders_id,orders_prefix,customers_id,customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, o.customers_telephone, o.customers_email_address, customers_address_format_id, customers_group_name, 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, currency, currency_value, date_purchased, orders_status, last_modified,ip_address, total_weight,orders_date_finished ".((self::$mode)?" ,facture_id ,holding_origin_id ":'')." from " . self::$tables['ORDERS'] . " o left join " . TABLE_CUSTOMERS . " using(customers_id) left join " . TABLE_CUSTOMERS_GROUPS . " using(customers_group_id) where orders_id = '" . (int)$order_id . "'";
$order_query = tep_db_query($sql);
$order = tep_db_fetch_array($order_query);
@@ -89,7 +89,8 @@
$order_status_query = tep_db_query("select status_name as orders_status_name from " . TABLE_STATUS . " where status_type='orders' and status_id = '" . $order['orders_status'] . "' and language_id = '" . (int)$languages_id . "'");
$order_status = tep_db_fetch_array($order_status_query);
- $this->info = array('orders_prefix' => $order['orders_prefix'],
+ $this->info = array('orders_id' => $order['orders_id'],
+ 'orders_prefix' => $order['orders_prefix'],
'currency' => $order['currency'],
'currency_value' => $order['currency_value'],
'payment_method' => $order['payment_method'],
Modified: branches/2.1.0/catalog/create_account.php
===================================================================
--- branches/2.1.0/catalog/create_account.php 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/create_account.php 2011-03-31 09:36:32 UTC (rev 3652)
@@ -76,7 +76,7 @@
$navigation=navigation_history::getInstance();
if (sizeof($navigation->snapshot) > 0) {
$origin_href = tep_href_link($navigation->snapshot['page'], tep_array_to_string($navigation->snapshot['get'], array(tep_session_name())), $navigation->snapshot['mode']);
- $page->navigation->clear_snapshot();
+ $navigation->clear_snapshot();
}
else $origin_href = tep_href_link(FILENAME_DEFAULT);
Modified: branches/2.1.0/catalog/install/oscss.sql
===================================================================
--- branches/2.1.0/catalog/install/oscss.sql 2011-03-30 08:58:07 UTC (rev 3651)
+++ branches/2.1.0/catalog/install/oscss.sql 2011-03-31 09:36:32 UTC (rev 3652)
@@ -733,7 +733,7 @@
last_modified datetime ,
date_purchased datetime ,
orders_status int(5) default '0' not null ,
- orders_date_finished datetime default '1000-01-01 00:00:00' null ,
+ orders_date_finished datetime default NULL ,
currency char(3) ,
currency_value decimal(14,6) ,
ip_address varchar(15) not null ,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-03-30 08:58:14
|
Revision: 3651
http://oscss.svn.sourceforge.net/oscss/?rev=3651&view=rev
Author: oscim
Date: 2011-03-30 08:58:07 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
correction, erreur in construct listing for page content
Modified Paths:
--------------
branches/2.1.0/catalog/includes/classes/page.listing.php
Modified: branches/2.1.0/catalog/includes/classes/page.listing.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/page.listing.php 2011-03-29 15:29:08 UTC (rev 3650)
+++ branches/2.1.0/catalog/includes/classes/page.listing.php 2011-03-30 08:58:07 UTC (rev 3651)
@@ -256,16 +256,17 @@
@brief Tri par default, option des categorie Champs sortchids_products & sortchids_content
*/
elseif(tep_not_null($categories->sortchids_products) || tep_not_null($categories->sortchids_content)){
-// $listing_sql .= ' order by ';
- if( listingData::$type_object=='products' || $category_depth=='products') $listing_sql .= $categories->sortchids_products.", pd.products_name";
- elseif( listingData::$type_object=='pages' || $category_depth=='pages') $listing_sql .= $categories->sortchids_content;
+ if( listingData::$type_object=='products' ) $listing_sql .= $categories->sortchids_products.", pd.products_name";
+ elseif( listingData::$type_object=='pages' ) $listing_sql .= $categories->sortchids_content;
}
/**
*/
- else
- $listing_sql .= 'pd.products_name';
+ else{
+ if( listingData::$type_object=='products' ) $listing_sql .= 'pd.products_name';
+ elseif( listingData::$type_object=='pages' ) $listing_sql .= 'content_name';
+ }
return $listing_sql;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
