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...> - 2012-04-18 16:04:42
|
Revision: 4270
http://oscss.svn.sourceforge.net/oscss/?rev=4270&view=rev
Author: oscim
Date: 2012-04-18 16:04:30 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Ajout structure de dossier et deport des gabarit et content
Added Paths:
-----------
trunk/dev/GenerCode/ModuleType/Modele/catalog/templates/
trunk/dev/GenerCode/ModuleType/Modele/catalog/templates/defaut/
trunk/dev/GenerCode/ModuleType/Modele/catalog/templates/defaut/includes/
trunk/dev/GenerCode/ModuleType/Modele/catalog/templates/defaut/includes/boxes/
trunk/dev/GenerCode/ModuleType/Modele/catalog/templates/defaut/includes/content/
trunk/dev/GenerCode/ModuleType/Modele/catalog/templates/defaut/includes/gabarit/
trunk/dev/GenerCode/datatype/Modele/catalog/templates/
trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/
trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/includes/
trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/includes/content/
trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/includes/content/_DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/includes/gabarit/
Removed Paths:
-------------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/content/_DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/
Deleted: trunk/dev/GenerCode/datatype/Modele/catalog/includes/content/_DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/content/_DATATYPE_REPLACE_.php 2012-04-18 15:47:40 UTC (rev 4269)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/content/_DATATYPE_REPLACE_.php 2012-04-18 16:04:30 UTC (rev 4270)
@@ -1,36 +0,0 @@
-<?php
-/**
- @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version _CURRENTVERSION_
- @date _CURRENTDATE_
- @author genrated by GenerCode
- @encode UTF-8
-*/
-
-/**
- @remarks local load var
-*/
-$cPath=$page->the_var('cPath');
-$category_depth=$page->the_var('category_depth');
-$annuaire=$page->the_var('annuaire');
-
-?>
-
-<header>
- <h1 class="content title <?php echo $language ;?>"><?php echo ( ($_DATATYPE_REPLACE_->title!=false)? $_DATATYPE_REPLACE_->title : '' ); ?></h1>
-</header>
-
-<div id="_DATATYPE_REPLACE_" class="unqi">
- <?php if($_DATATYPE_REPLACE_->text !=false) : ?>
- <div id="headingCatTxt">
- <?php echo $_DATATYPE_REPLACE_->text; ?>
- </div>
- <?php endif; ?>
-
- <div id="productInfoBack" class="navBt">
- <?php echo '<a class="navBt" href="javascript: history.go(-1)">' . IMAGE_BUTTON_BACK . '</a>'; ?>
- </div>
-
-</div>
\ No newline at end of file
Copied: trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/includes/content/_DATATYPE_REPLACE_.php (from rev 4269, trunk/dev/GenerCode/datatype/Modele/catalog/includes/content/_DATATYPE_REPLACE_.php)
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/includes/content/_DATATYPE_REPLACE_.php (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/templates/defaut/includes/content/_DATATYPE_REPLACE_.php 2012-04-18 16:04:30 UTC (rev 4270)
@@ -0,0 +1,36 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+*/
+
+/**
+ @remarks local load var
+*/
+$cPath=$page->the_var('cPath');
+$category_depth=$page->the_var('category_depth');
+$annuaire=$page->the_var('annuaire');
+
+?>
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo ( ($_DATATYPE_REPLACE_->title!=false)? $_DATATYPE_REPLACE_->title : '' ); ?></h1>
+</header>
+
+<div id="_DATATYPE_REPLACE_" class="unqi">
+ <?php if($_DATATYPE_REPLACE_->text !=false) : ?>
+ <div id="headingCatTxt">
+ <?php echo $_DATATYPE_REPLACE_->text; ?>
+ </div>
+ <?php endif; ?>
+
+ <div id="productInfoBack" class="navBt">
+ <?php echo '<a class="navBt" href="javascript: history.go(-1)">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+
+</div>
\ 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...> - 2012-04-18 15:47:51
|
Revision: 4269
http://oscss.svn.sourceforge.net/oscss/?rev=4269&view=rev
Author: oscim
Date: 2012-04-18 15:47:40 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
force retour false sur la methode set_database(), si la base n'existe pas
Modified Paths:
--------------
trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-18 15:24:45 UTC (rev 4268)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-18 15:47:40 UTC (rev 4269)
@@ -38,7 +38,7 @@
/**
- * Class DB_Mysqlii
+ * Class DB_Mysqli
*
* Driver class for MySQLi databases.
* @copyright Leo Feyer 2005-2010
@@ -181,7 +181,9 @@
protected function set_database($strDatabase)
{
- @$this->resConnection->select_db($strDatabase);
+ if( ! @$this->resConnection->select_db($strDatabase) )
+ return false;
+
@$this->resConnection->set_charset(parent::CHARSET);
return $this->resConnection;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 15:24:56
|
Revision: 4268
http://oscss.svn.sourceforge.net/oscss/?rev=4268&view=rev
Author: oscim
Date: 2012-04-18 15:24:45 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
correction gestion des paths
Modified Paths:
--------------
trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php
trunk/catalog/includes/functions/general.php
Modified: trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php
===================================================================
--- trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php 2012-04-18 14:19:30 UTC (rev 4267)
+++ trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php 2012-04-18 15:24:45 UTC (rev 4268)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 18/12/11, 15:06
+ @date 18/04/2012, 15:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class oscss_boxes
@@ -98,10 +98,14 @@
$filename = DIR_WS_TEMPLATES . $page->page['template'] .'/' . DIR_WS_INCLUDES. '%s'. $name_clean.$page->ext;
- if (page::TestFile(sprintf($filename,'plugins/'))) $path =sprintf($filename,'plugins/');
- elseif (page::TestFile(sprintf($filename,'boxes/'))) $path =sprintf($filename,'boxes/');
- elseif (page::TestFile(DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/'.DIR_WS_BOXES . $name_clean.$page->ext)) $path = (DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME .'/'. DIR_WS_BOXES . $name_clean.$page->ext);
- else return false;
+ if (page::TestFile(sprintf($filename,'plugins/')))
+ $path =sprintf($filename,'plugins/');
+ elseif (page::TestFile(sprintf($filename,'boxes/')))
+ $path =sprintf($filename,'boxes/');
+ elseif (page::TestFile(DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/'.DIR_WS_BOXES . $name_clean.$page->ext))
+ $path = (DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME .'/'. DIR_WS_BOXES . $name_clean.$page->ext);
+ else
+ return false;
if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/boxes/' . $name_clean.$page->ext,true)) !=false) $page->pile_file_lang($path_lg);
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2012-04-18 14:19:30 UTC (rev 4267)
+++ trunk/catalog/includes/functions/general.php 2012-04-18 15:24:45 UTC (rev 4268)
@@ -1044,7 +1044,7 @@
*/
function tep_get_include_contents($filename) {
global $page;
- if ( ($file=page::fix_file(DIR_FS_CATALOG. DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/'. DIR_WS_INCLUDES.'gabarit/'.$filename.'.gab')) != false){
+ if ( ($file=page::fix_file(DIR_WS_INCLUDES.'gabarit/'.$filename.'.gab')) != false){
ob_start();
include $file;
$contents = ob_get_contents();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 14:19:41
|
Revision: 4267
http://oscss.svn.sourceforge.net/oscss/?rev=4267&view=rev
Author: oscim
Date: 2012-04-18 14:19:30 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
deport des dossier content et gabarit ds le template defaut
Added Paths:
-----------
trunk/catalog/templates/defaut/includes/content/
trunk/catalog/templates/defaut/includes/gabarit/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 14:14:30
|
Revision: 4266
http://oscss.svn.sourceforge.net/oscss/?rev=4266&view=rev
Author: oscim
Date: 2012-04-18 14:14:21 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Ajustement des install.xml de trunk sur la nouvelle arboresnance
Modified Paths:
--------------
trunk/dev/GenerCode/datatype/Modele/install.xml
trunk/extensions/ULTIMATEIMAGE_stable/install.xml
Added Paths:
-----------
trunk/extensions/ULTIMATEIMAGE_stable/sql/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/data/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.key.sql
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.sql
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/remove/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/remove/data/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/remove/tables/
trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/remove/tables/osc_products_images.sql
Modified: trunk/dev/GenerCode/datatype/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-18 14:02:49 UTC (rev 4265)
+++ trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-18 14:14:21 UTC (rev 4266)
@@ -26,21 +26,28 @@
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.new.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG__description/display_edit.edit.gab" />
+ <!-- datatype -->
<file name="common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php" />
+
+ <!-- drivers -->
<file name="includes/classes/drivers/data/_DATATYPE_REPLACE_.php" />
- <file name="includes/content/_DATATYPE_REPLACE_.php" />
- <file name="includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab" />
- <file name="includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab" />
- <file name="includes/gabarit/_DATATYPE_REPLACE_/account.display_view.step.0.gab" />
- <file name="includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab" />
-
+ <!-- Module -->
<file name="includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php" />
<file name="includes/modules/account/ac__DATATYPE_REPLACE_.php" />
+ <!-- template -->
+ <file name="includes/templates/defaut/content/_DATATYPE_REPLACE_.php" />
+ <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.box_view.gab" />
+ <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab" />
+ <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.display_view.step.0.gab" />
+ <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab" />
+
+
+
</addfile>
<addfilelg>
Modified: trunk/extensions/ULTIMATEIMAGE_stable/install.xml
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/install.xml 2012-04-18 14:02:49 UTC (rev 4265)
+++ trunk/extensions/ULTIMATEIMAGE_stable/install.xml 2012-04-18 14:14:21 UTC (rev 4266)
@@ -35,17 +35,6 @@
</add2end>
- <sql>
- <query>
- <![CDATA[
- CREATE TABLE IF NOT EXISTS %DB_PREFIX%products_images (
- id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
- products_id INT( 11 ) NOT NULL ,
- products_image_sm VARCHAR( 150 ) NOT NULL ,
- products_image_xl VARCHAR( 100 ) NOT NULL ,
- status tinyint(1) NOT NULL
- ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
- ]]></query>
- <remove_query>DROP TABLE IF EXISTS %DB_PREFIX%products_images;</remove_query>
- </sql>
+ <filesql> </filesql>
+
</contrib>
\ No newline at end of file
Added: trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.key.sql
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.key.sql (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.key.sql 2012-04-18 14:14:21 UTC (rev 4266)
@@ -0,0 +1,6 @@
+
+
+
+ALTER TABLE osc_products_images ADD INDEX idx_products_images (products_id);
+
+ALTER TABLE osc_products_images ADD CONSTRAINT fk_products_images FOREIGN KEY (products_id) REFERENCES osc_products (products_id);
\ No newline at end of file
Added: trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.sql
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.sql (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/install/tables/osc_products_images.sql 2012-04-18 14:14:21 UTC (rev 4266)
@@ -0,0 +1,9 @@
+
+
+CREATE TABLE IF NOT EXISTS osc_products_images (
+ id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+ products_id INT( 11 ) NOT NULL ,
+ products_image_sm VARCHAR( 150 ) NOT NULL ,
+ products_image_xl VARCHAR( 100 ) NOT NULL ,
+ status tinyint(1) NOT NULL
+ ) ;
\ No newline at end of file
Added: trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/remove/tables/osc_products_images.sql
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/remove/tables/osc_products_images.sql (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/sql/mysql/remove/tables/osc_products_images.sql 2012-04-18 14:14:21 UTC (rev 4266)
@@ -0,0 +1,3 @@
+
+
+DROP TABLE IF EXISTS osc_products_images;
\ 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...> - 2012-04-18 14:03:00
|
Revision: 4265
http://oscss.svn.sourceforge.net/oscss/?rev=4265&view=rev
Author: oscim
Date: 2012-04-18 14:02:49 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
deport des dossier content et gabarit ds le template defaut
Removed Paths:
-------------
trunk/catalog/includes/content/
trunk/catalog/includes/gabarit/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 14:02:00
|
Revision: 4264
http://oscss.svn.sourceforge.net/oscss/?rev=4264&view=rev
Author: oscim
Date: 2012-04-18 14:01:49 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Ajustement des chemi npour deport de dossier dans le template par defaut
Modified Paths:
--------------
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/includes/functions/general.php
Modified: trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
===================================================================
--- trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2012-04-18 12:39:32 UTC (rev 4263)
+++ trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2012-04-18 14:01:49 UTC (rev 4264)
@@ -120,7 +120,6 @@
$page->page['type']='none';
-// var_dump(DataTypes::is_type('listing'));
/// obtain type pre-selected by index.php page (Childs datatype_drivers)
if( ($type = DataTypes::GetTypePage()) && $type !=NULL)
@@ -130,33 +129,15 @@
else{
if (isset($_GET['popup'])){
$page->page['type']='popup';
- }/*elseif ($page->page['content']=='index.php' ||$page->page['content']=='home.php' && (empty($_SERVER['QUERY_STRING']) || (isset($_GET['osCsid']) || isset($_GET['divers']) ) )) {
- $page->page['type']='home';
- }*//*elseif ( (!empty($_SERVER['QUERY_STRING']) && isset($_GET['customers_id']) )) {
- $page->page['type']='member';
- $page->page['class']='single';
- }*/elseif (in_array(substr($page->page['content'],0,7), array('account','address')) || in_array(substr(basename($_SERVER['SCRIPT_NAME']),0,-4), array('account','address')) ) {
+ }elseif (in_array(substr($page->page['content'],0,7), array('account','address')) || in_array(substr(basename($_SERVER['SCRIPT_NAME']),0,-4), array('account','address')) ) {
$page->page['type']='account';
}elseif (substr($page->page['content'],0,8) =='checkout') {
$page->page['type']='checkout';
- }/*elseif (substr($page->page['content'],0,7) =='product') {
- $page->page['type']='product';
- $page->page['class']='single';
- }*/elseif (in_array(substr($page->page['content'],0,6) , array('shoppi'))) {
+ }elseif (in_array(substr($page->page['content'],0,6) , array('shoppi'))) {
$page->page['type']='cart';
}elseif (substr($page->page['content'],0,9) =='index_cat') {
$page->page['type']='listing_cat';
- }/*elseif (in_array(substr($page->page['content'],0,6) , array('listin','index_','index.'))) {
- $page->page['type']='listing';
-
- if(isset($page->page['var']['manufacturers']))$page->page['class']='manufactuers';
- elseif(!empty($page->page['var']['cPath'])) $page->page['class']='categories';
- else $page->page['class']='listing';
-
- }*//*elseif (in_array(substr($page->page['content'],0,7) , array('content')) && isset($_GET['content']) ) {
- $page->page['type']='content';
- $page->page['class']='single';
- }*/
+ }
}
parent::$GlobalCache['type_content']=$page->page['type'];
@@ -171,11 +152,11 @@
protected static function GetPageContent() {
global $page;
- $filename = $page->getPathTemplate() . '/includes/content/'. $page->page['content'];
+ $filename = $page->getPathTemplate() . DIR_WS_INCLUDES . '/content/'. $page->page['content'];
if (parent::TestFile($filename)) $page->page['path_content'] = (DIR_WS_TEMPLATES . $page->page['template'] . '/includes/content/'. $page->page['content']);
- elseif (parent::TestFile(DIR_WS_INCLUDES.'content/' . $page->page['content'])) $page->page['path_content'] = (DIR_WS_INCLUDES.'content/' . $page->page['content']);
- else $page->page['path_content'] = (DIR_WS_INCLUDES.'content/404.php' );
+ elseif (parent::TestFile(DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/' . DIR_WS_INCLUDES.'content/' . $page->page['content'])) $page->page['path_content'] = (DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/' . DIR_WS_INCLUDES.'content/' . $page->page['content']);
+ else $page->page['path_content'] = (DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/' . DIR_WS_INCLUDES.'content/404.php' );
return($page->page['path_content']);
}
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2012-04-18 12:39:32 UTC (rev 4263)
+++ trunk/catalog/includes/functions/general.php 2012-04-18 14:01:49 UTC (rev 4264)
@@ -1044,7 +1044,7 @@
*/
function tep_get_include_contents($filename) {
global $page;
- if ( ($file=page::fix_file(DIR_FS_CATALOG.DIR_WS_INCLUDES.'gabarit/'.$filename.'.gab')) != false){
+ if ( ($file=page::fix_file(DIR_FS_CATALOG. DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/'. DIR_WS_INCLUDES.'gabarit/'.$filename.'.gab')) != false){
ob_start();
include $file;
$contents = ob_get_contents();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 12:39:44
|
Revision: 4263
http://oscss.svn.sourceforge.net/oscss/?rev=4263&view=rev
Author: oscim
Date: 2012-04-18 12:39:32 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Suite travail gestion recherche via support datatype
correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/fileUtility.php
trunk/catalog/admin/includes/exts/package/ci_tag.class.php
trunk/catalog/admin/includes/exts/package/tags/addfile.php
trunk/catalog/advanced_search.php
trunk/catalog/common/classes/datatype_drivers/Data_content.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php
trunk/dev/GenerCode/class.GenerCode.php
trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab
trunk/dev/GenerCode/datatype/Modele/readme
trunk/dev/GenerCode/datatype/index.php
Modified: trunk/catalog/admin/includes/classes/fileUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/fileUtility.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/catalog/admin/includes/classes/fileUtility.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -26,6 +26,7 @@
}
/**
+ @brief block process in other class if result in loop process content error
@param bool true, block messageSatck
*/
public static function CfgComport($value){
@@ -153,6 +154,10 @@
/**
@fn _chmod($path, $mod=0777)
+ @brief chmod
+ @param $path absolute path
+ @param $mod
+ @return boolean true for ok or false
*/
public static function _chmod($path, $mod=0777) {
$path=(substr($path,0, strlen(DIR_FS_ADMIN)) == DIR_FS_ADMIN)? $path : DIR_FS_ADMIN.$path;
@@ -168,11 +173,17 @@
/**
*/
- public static function _chown($mypath, $uid, $gid) {
+ public static function _chown($mypath, $uid=0, $gid=0) {
+
+ if($uid ==0)
+ $uid = posix_getuid();
+
while(($file =self::_scandir($d)) !== false) {
if ($file != "." && $file != "..") {
$typepath = $mypath . "/" . $file ;
- if (filetype ($typepath) == 'dir') self::_chown($typepath, $uid, $gid);
+ if (filetype ($typepath) == 'dir')
+ self::_chown($typepath, $uid, $gid);
+
self::_chmod($typepath, $uid);
chgrp($typepath, $gid);
}
@@ -187,10 +198,18 @@
@return boolean true if ok
*/
public static function _copy($src,$dst){
- if(!is_dir($src))
- return copy($src,$dst);
- else {
+ if(!is_dir($src) ){
+ if(!file_exists(dirname($dst)) )
+ self::_mkdir($dst);
+
+ if(!is_writeable($dst))
+ self::_chmod($dst, '0555');
+
+ return copy($src,$dst);
+ }
+ else {
+
if(substr($dst,-1) !='/')
$dst .='/' ;
if(substr($src,-1) !='/')
@@ -199,13 +218,17 @@
foreach(self::_scandir($src) as $file){
if (( $file != '.' ) && ( $file != '..' ) && substr($file,-1) !='~') {
if ( is_dir($src . $file) ){
+
if ( !is_dir($dst . $file) )
self::_mkdir($dst. $file);
+ if(!is_writeable($dst. $file))
+ self::_chmod($dst. $file, 0777);
+
self::_copy($src. $file,$dst. $file);
}
else
- copy($src. $file,$dst . $file);
+ copy($src. $file, $dst . $file);
}
}
return true;
Modified: trunk/catalog/admin/includes/exts/package/ci_tag.class.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/ci_tag.class.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/catalog/admin/includes/exts/package/ci_tag.class.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -319,20 +319,37 @@
return $res;
}
+ /**
+ @brief creation repertoire recursif
+ @param $path absolute path
+ @note CfgComport is true , block if is error
+ */
+ function recursive_mkdir($path) {
- function recursive_mkdir($path) {
+ // block Next process
fileUtility::CfgComport(true);
+
+ // Create dir
if( ($res= fileUtility::_mkdir($path)) && $res ==false) {
+// fileUtility::_chown($path);
+ fileUtility::_chmod($path, 0644);
+ // draw error
foreach(fileUtility::GetError() as $error)
CIP::InProcess($error['text'].dirname($path), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
}
return $res;
}
+ /**
+ @brief supression repertoire recursif
+ @param $path absolute path
+ @note CfgComport is true , block if is error
+ */
function recursive_rmdir($path) {
fileUtility::CfgComport(true);
+
if( ($res= fileUtility::_rmdir($path)) && $res ==false) {
- foreach(fileUtility::GetError() as $error)
+ foreach(fileUtility::GetError() as $error)
CIP::InProcess($error['text'].dirname($path), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
}
return $res;
Modified: trunk/catalog/admin/includes/exts/package/tags/addfile.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addfile.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/catalog/admin/includes/exts/package/tags/addfile.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -25,9 +25,9 @@
extends ContribInstallerBaseTag
implements PackageTags{
- var $tag_name='addfile';
+ public $tag_name='addfile';
- var $params;//array with attributes
+ public $params;//array with attributes
/**
@param array liste des fichier a backup
@@ -101,7 +101,8 @@
$fs_filename=replace_path_admin($this->fs_filename($i));
$path=dirname($fs_filename);
- if(!is_dir($path))parent::recursive_mkdir($path);
+ if(!is_dir($path))
+ parent::recursive_mkdir($path);
if(!is_writable($path)) {
CIP::InProcess('check'.__('write permissins needed text').$path, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
Modified: trunk/catalog/advanced_search.php
===================================================================
--- trunk/catalog/advanced_search.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/catalog/advanced_search.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -67,7 +67,6 @@
if(!isset($_REQUEST['data']))
$_REQUEST['data'] = 'product';
-
/**
@remarks detect type by Get[data]
*/
@@ -76,11 +75,16 @@
$list = $dyntype->FO_load_page('search');
+ $page->add_var_page('childs_gab',$dyntype->listing_sql['gab']);
+
+
$listing_sql = 'SELECT DISTINCT '.$dyntype->listing_sql['col_count'] .' '. $dyntype->listing_sql['tables'] .' '. $dyntype->listing_sql['where'] .' ORDER BY '. $dyntype->listing_sql['sort'];
$listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_SEARCH_RESULTS'), $dyntype->listing_sql['col_count'] );
-// echo $listing_split->sql_query;
+
$listing_query = $DB->query($listing_split->sql_query);
+
+
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -251,7 +251,11 @@
$this->listing_sql['sort'] = " ".$this->p."d.content_title ";
+ /// add input entry in advanced search page forms
+ $this->listing_sql['gab'] = $this->DataType.'/advanced_search.other.input';
+ return $this;
+
break;
default:
$page->init('content.php',$language);
Modified: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -333,20 +333,11 @@
$this->listing_sql['where'] .= "and pa.products_id = p.products_id and pa.options_values_id in (".$str_selected_values.")";
}
-
-/*
- $this->listing_sql['tables'] = " FROM " . TABLE_PRODUCTS . " ".$this->p." ".
- " left join " . TABLE_PRODUCTS_DESCRIPTION . " ".$this->p."d using(products_id) ".
- // " left join " . TABLE_MANUFACTURERS . " m USING(manufacturers_id) ".
- " left join " . TABLE_SPECIALS . " ".$this->p."s USING(products_id) ".
- " left join " . TABLE_PRODUCTS_ATTRIBUTES . " ".$this->p."a using(products_id) ".
- "";*/
-
-// $this->listing_sql['where'] = " WHERE ".$this->p.".products_status = '1' ";
$this->listing_sql['sort'] = " ".$this->p."d.products_name ";
-// $this->listing_sql['base_key'] = "products_id ";
-// $this->listing_sql['col_count'] = " ".$this->p.".products_id ";
+ /// add input entry in advanced search page forms
+ $this->listing_sql['gab'] = $this->DataType.'/advanced_search.other.input';
+
return $this;
break;
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -1,6 +1,6 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@subpackage 2cShopHtml5Oscim
@package osCSS-2 <www http://www.oscss.org>
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@@ -10,13 +10,14 @@
this item search is only product type
*/
+
+global $page;
+
/**
@remarks Load split page , and Load the module with the result of the split
*/
-if (isset($listing_sql) && tep_not_null($listing_sql) ){
- $listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_SEARCH_RESULTS'), 'p.products_id');
- $page->oscss_modules->_add(FILENAME_PRODUCT_LISTING,'center', array('listing_split'=>$listing_split,'listing_query'=>$listing_sql) );
-}
+if (isset($listing_sql) && tep_not_null($listing_sql) )
+ $page->oscss_modules->_add('listing.php','center', array('listing_split'=>$listing_split,'listing_query'=>$listing_sql) );
?>
<header class="main-content">
@@ -30,9 +31,9 @@
<?php /**
@remarks Selecteur du texte
- 1 : Page CMS
- 2 : plugins use prop_ctrl
- 3 : link popup text help
+ 1 : Page CMS
+ 2 : plugins use prop_ctrl
+ 3 : link popup text help
*/ ?>
<?php if( (($conti=tep_get_cms_content('text_search_help', true,
'<header>
@@ -57,72 +58,30 @@
- <?php /**
- @remarks Block draw form
- This search Use GET values
- */ ?>
+ <?php /** @remarks Block draw form base and add childs gab for complet forms. This search Use GET values */ ?>
+ <?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'onsubmit="return check_form(this);"') ;?>
- <?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'onsubmit="return check_form(this);"') ;?>
+ <fieldset class="advancedSearch">
+ <legend><?php echo HEADING_SEARCH_CRITERIA ; ?></legend>
+ <?php echo tep_hide_session_id() ;?>
- <fieldset class="advancedSearch">
- <legend><?php echo HEADING_SEARCH_CRITERIA ; ?></legend>
- <?php echo tep_hide_session_id().tep_draw_hidden_field('search_in_description', '1') ;?>
+ <ul>
+ <li class="BlockRows">
+ <label for="keywords"><?php echo ENTRY_KEYWORDS ; ?></label>
+ <?php echo tep_draw_input_field('keywords', 'keywords','','onfocus="this.value=\'\'"') ; ?>
+ </li>
- <ul>
- <li class="BlockRows">
- <label for="keywords"><?php echo ENTRY_KEYWORDS ; ?></label>
- <?php echo tep_draw_input_field('keywords', 'keywords','','onfocus="this.value=\'\'"') ; ?>
- </li>
+ <?php /// call childs gabarit for add input html value based in datatype
+ echo tep_get_include_contents($page->GetVar('childs_gab')); ?>
- <li class="BlockRows">
- <span class="BlockInput">
- <label for="categories_id"><?php echo ENTRY_CATEGORIES; ?></label>
- <?php echo tep_draw_pull_down_menu('categories_id', 'categories_id', tep_get_categories(array(array('id' => '', 'text' => TEXT_ALL_CATEGORIES)))); ?>
- </span>
+ <li class="BlockRows Button">
+ <?php echo tep_draw_hidden_field('data', tep_db_prepare_input(@$_REQUEST['data']) ) ; ?>
+ <input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_SEARCH; ?>" />
+ </li>
+ </ul>
+ </fieldset>
+ </form>
- <span class="BlockInput">
- <label for="inc_subcat"><?php echo ENTRY_INCLUDE_SUBCATEGORIES; ?></label>
- <?php echo tep_draw_checkbox_field('inc_subcat','inc_subcat', '1', true) ;?>
- </span>
- </li>
-
- <li>
- <label for="manufacturers_id"><?php echo ENTRY_MANUFACTURERS; ?></label>
- <?php echo tep_draw_pull_down_menu('manufacturers_id', 'manufacturers_id', tep_get_manufacturers(array(array('id' => '', 'text' => TEXT_ALL_MANUFACTURERS)))); ?>
- </li>
-
- <li class="BlockRows">
- <span class="BlockInput">
- <label for="pfrom"><?php echo ENTRY_PRICE_FROM; ?></label>
- <?php echo tep_draw_input_field('pfrom','pfrom'); ?>
- </span>
-
- <span class="BlockInput">
- <label for="pto"><?php echo ENTRY_PRICE_TO; ?></label>
- <?php echo tep_draw_input_field('pto','pto'); ?>
- </span>
- </li>
-
-
- <li class="BlockRows">
- <span class="BlockInput">
- <label for="dfrom"><?php echo ENTRY_DATE_FROM; ?></label>
- <?php echo tep_draw_input_field('dfrom','dfrom', DOB_FORMAT_STRING, 'onfocus="this.value=\'\'"'); ?>
- </span>
-
- <span class="BlockInput">
- <label for="dto"><?php echo ENTRY_DATE_TO; ?></label>
- <?php echo tep_draw_input_field('dto','dto', DOB_FORMAT_STRING, 'onfocus="this.value=\'\'"'); ?>
- </span>
- </li>
-
- <li class="BlockRows Button">
- <input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_SEARCH; ?>" />
- </li>
- </ul>
- </fieldset>
- </form>
-
</div>
Modified: trunk/dev/GenerCode/class.GenerCode.php
===================================================================
--- trunk/dev/GenerCode/class.GenerCode.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/dev/GenerCode/class.GenerCode.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -52,14 +52,18 @@
foreach($this->browse($path_mod) as $row){
// escape if not ok
if( ! $this->check_all_right( $row, $current) ){
-var_dump($row);
+// var_dump($row);
continue;
}
if(is_dir($path_mod.$row)) {
mkdir( $this->stringreplace($this->folder . $current. $row) );
+
+ chmod( $this->stringreplace($this->folder . $current. $row), 0777);
+
$this->process($current.$row);
+
}
else {
$res=file_get_contents($path_mod.$row);
@@ -69,6 +73,8 @@
$fp = fopen( $this->stringreplace($this->folder . $current. $row) , 'w');
fputs($fp, $file_contents);
fclose($fp);
+
+ chmod( $this->stringreplace($this->folder . $current. $row) , 0777);
}
}
}
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -92,6 +92,10 @@
*/
function is_type($mode='unique'){
switch(strtolower($mode)){
+ case 'search':
+ if(isset($_GET['data']) && $_GET['data'] == $this->DataType )
+ return true;
+ break;
case 'cpath':
if( isset($_GET['_DATATYPE_REPLACE_']) && is_numeric($_GET['_DATATYPE_REPLACE_']) )
return true;
@@ -191,32 +195,104 @@
$page = page::getInstance();
$DB=Database::getInstance();
- $page->init('_DATATYPE_REPLACE_.php',$language);
- $breadcrumb=$page->return_object('breadcrumb');
- // call transversal load in other modules
- DataTypes::transversal('transversal');
- /** init aca module */
- $aca=$page->new_class('_DATATYPE_REPLACE_',true);
+ switch(strtolower(DataTypes::$CurrentMode)){
+ case 'search':
+ global $keywords, $search_keywords, $pto, $dto, $pfrom, $dfrom;
- if (isset($_GET['action'])) {
- $action=(string)tep_db_prepare_input($_GET['action']);
- if ($aca->check_action('',$action) ) {
- $aca->after_check_action('',$action);
- tep_redirect(tep_href_link('_DATATYPE_REPLACE_.php', tep_get_all_get_params(array('action'))));
+ $this->listing_sql['col_count'] = " ".$this->p."._DATATYPE_REPLACE__id ";
+
+ $this->listing_sql['tables'] = " FROM " . TABLE__DATATYPE_REPLACE_MAJ_ . " ".$this->p." ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION . " ".$this->p."d using(_DATATYPE_REPLACE__id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__TO_CATEGORIES . " ".$this->p."2c using(_DATATYPE_REPLACE__id) ";
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( ".$this->p."2c.categories_id = cat.categories_id and cat.categories_status='1' ) ";
+
+
+ $this->listing_sql['where'] = " WHERE ".$this->p."._DATATYPE_REPLACE__status > 0 AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ";
+
+ if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
+ if (isset($_GET['inc_subcat']) && ($_GET['inc_subcat'] == '1')) {
+ $subcategories_array = array();
+ tep_get_subcategories($subcategories_array, $_GET['categories_id']);
+
+ $this->listing_sql['where'] .= " and ".$this->p."2c._DATATYPE_REPLACE__id = ".$this->p."._DATATYPE_REPLACE__id and ".$this->p."2c._DATATYPE_REPLACE__id = ".$this->p."d._DATATYPE_REPLACE__id and (".$this->p."2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
+
+ for ($i=0, $n=sizeof($subcategories_array); $i<$n; $i++ ) {
+ $this->listing_sql['where'] .= " or ".$this->p."2c.categories_id = '" . (int)$subcategories_array[$i] . "'";
+ }
+
+ $this->listing_sql['where'] .= ")";
+ } else {
+ $this->listing_sql['where'] .= " and ".$this->p."2c._DATATYPE_REPLACE__id = ".$this->p."._DATATYPE_REPLACE__id and ".$this->p."2c._DATATYPE_REPLACE__id = ".$this->p."d._DATATYPE_REPLACE__id and ".$this->p."d.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
+ }
}
- }
- $_DATATYPE_REPLACE_=_DATATYPE_REPLACE_::get_item( (int)$_GET['_DATATYPE_REPLACE_'] );
- $page->add_var_page('_DATATYPE_REPLACE_',$_DATATYPE_REPLACE_);
+ if (isset($search_keywords) && (sizeof($search_keywords) > 0)) {
+ $this->listing_sql['where'] .= " and (";
+ for ($i=0, $n=sizeof($search_keywords); $i<$n; $i++ ) {
+ switch ($search_keywords[$i]) {
+ case '(':
+ case ')':
+ case 'and':
+ case 'or':
+ $this->listing_sql['where'] .= " " . $search_keywords[$i] . " ";
+ break;
+ default:
+ $keyword = tep_db_prepare_input($search_keywords[$i]);
+ $this->listing_sql['where'] .= "(".$this->p."d._DATATYPE_REPLACE__title like '%" . tep_db_input($keyword) . "%' ";
+// if (isset($_GET['search_in_description']) && ($_GET['search_in_description'] == '1'))
+ $this->listing_sql['where'] .= " or ".$this->p."d._DATATYPE_REPLACE__description like '%" . tep_db_input($keyword) . "%'";
+ $this->listing_sql['where'] .= ')';
+ break;
+ }
+ }
+ $this->listing_sql['where'] .= " )";
+ }
- $page->title=$_DATATYPE_REPLACE_->title;
- $breadcrumb->add($_DATATYPE_REPLACE_->title, $_DATATYPE_REPLACE_->href );
+ if (tep_not_null($dfrom)) $this->listing_sql['where'] .= " and ".$this->p.".date_added >= '" . tep_date_raw($dfrom) . "'";
- $page_content = $page->force_content('_DATATYPE_REPLACE_.php');
+ if (tep_not_null($dto)) $this->listing_sql['where'] .= " and ".$this->p.".date_added <= '" . tep_date_raw($dto) . "'";
+
+ $this->listing_sql['sort'] = " ".$this->p."d._DATATYPE_REPLACE__title ";
+
+ /// add input entry in advanced search page forms
+ $this->listing_sql['gab'] = $this->DataType.'/advanced_search.other.input';
+
+ return $this;
+
+ break;
+ default:
+ $page->init('_DATATYPE_REPLACE_.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
+
+ // call transversal load in other modules
+ DataTypes::transversal('transversal');
+
+ /** init aca module */
+ $aca=$page->new_class('_DATATYPE_REPLACE_',true);
+
+ if (isset($_GET['action'])) {
+ $action=(string)tep_db_prepare_input($_GET['action']);
+ if ($aca->check_action('',$action) ) {
+ $aca->after_check_action('',$action);
+ tep_redirect(tep_href_link('_DATATYPE_REPLACE_.php', tep_get_all_get_params(array('action'))));
+ }
+ }
+
+ $_DATATYPE_REPLACE_=_DATATYPE_REPLACE_::get_item( (int)$_GET['_DATATYPE_REPLACE_'] );
+
+ $page->add_var_page('_DATATYPE_REPLACE_',$_DATATYPE_REPLACE_);
+
+ $page->title=$_DATATYPE_REPLACE_->title;
+ $breadcrumb->add($_DATATYPE_REPLACE_->title, $_DATATYPE_REPLACE_->href );
+
+ $page_content = $page->force_content('_DATATYPE_REPLACE_.php');
+ }
+
+
return $page_content;
}
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -82,7 +82,7 @@
/**
- @class productData
+ @class _DATATYPE_REPLACE_Data
Traitement sql des product
*/
class _DATATYPE_REPLACE_Data
@@ -93,16 +93,26 @@
@var $cache array cache result
*/
public static $cache=array();
- //! @p array
+ /**
+ @var array
+ */
public static $opt=array();
-
- //! @p array cache
+ /**
+ @var array cache
+ */
public static $array_data=array();
-
- //! @p string
+ /**
+ @var string
+ */
private static $where_query='';
- //! @p object
+ /**
+ @var object
+ */
protected static $_instance;
+ /**
+ @var array cache
+ */
+ public static $object_data;
/**
*/
@@ -113,7 +123,7 @@
/**
- Prepa donnée sortie
+ @brief Prepa donnée sortie
*/
protected static function statment_query($_DATATYPE_REPLACE__query,$exclude='',$search=''){
@@ -122,32 +132,32 @@
$tabl=$res=array();
while ($_DATATYPE_REPLACE_ = $_DATATYPE_REPLACE__query->fetchAssoc()) {
if (!in_array($_DATATYPE_REPLACE_['name'],$exclude)) {
- $res=$_DATATYPE_REPLACE_;
+ $res=$_DATATYPE_REPLACE_;
- $res['href']=tep_href_link(FILENAME__DATATYPE_REPLACE_MAJ_,'_DATATYPE_REPLACE_=' . $_DATATYPE_REPLACE_['id']);
- $res['key']=$_DATATYPE_REPLACE_['name'];
- $res['original']=$_DATATYPE_REPLACE_['text'];
- $res['images']=array();
+ $res['href']=tep_href_link(FILENAME__DATATYPE_REPLACE_MAJ_,'_DATATYPE_REPLACE_=' . $_DATATYPE_REPLACE_['id']);
+ $res['key']=$_DATATYPE_REPLACE_['name'];
+ $res['original']=$_DATATYPE_REPLACE_['text'];
+ $res['images']=array();
- $product['extra']=self::GetExtraFields($content['products_id']);
+ $product['extra']=self::GetExtraFields($content['products_id']);
- self::$array_data[$_DATATYPE_REPLACE_['id']]=$tabl[$_DATATYPE_REPLACE_['id']]=new objectInfo($res);
- self::$array_data[$_DATATYPE_REPLACE_['id']]->text=self::parse__DATATYPE_REPLACE_($res['text'],$_DATATYPE_REPLACE_['id']);
- self::add_cache($_DATATYPE_REPLACE_['id']);
+ self::$array_data[$_DATATYPE_REPLACE_['id']]=$tabl[$_DATATYPE_REPLACE_['id']]=new objectInfo($res);
+ self::$array_data[$_DATATYPE_REPLACE_['id']]->text=self::parse__DATATYPE_REPLACE_($res['text'],$_DATATYPE_REPLACE_['id']);
+ self::add_cache($_DATATYPE_REPLACE_['id']);
}
}
if((count(self::$array_data)>0))
foreach(self::$array_data as $k=>$_DATATYPE_REPLACE_)
if (!in_array($_DATATYPE_REPLACE_->name,$exclude)) {
- if((!empty($search) && strstr($_DATATYPE_REPLACE_->name,$search) !=false) || empty($search)) $tabl[$_DATATYPE_REPLACE_->id]=$_DATATYPE_REPLACE_;
+ if((!empty($search) && strstr($_DATATYPE_REPLACE_->name,$search) !=false) || empty($search)) $tabl[$_DATATYPE_REPLACE_->id]=$_DATATYPE_REPLACE_;
}
return $tabl;
}
/**
- Ajout constrainte clause where
+ @brief Ajout constrainte clause where
*/
protected static function add_where_query($add){ self::$where_query .=' '.$add; }
@@ -156,7 +166,7 @@
protected static function reset_query() { self::$where_query=''; }
/**
- Requeteur
+ @brief Requeteur
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
$query="SELECT _DATATYPE_REPLACE__title AS title, c._DATATYPE_REPLACE__id AS id, cd._DATATYPE_REPLACE__title AS name, _DATATYPE_REPLACE__description AS text, c.date_added as date_added
@@ -171,7 +181,7 @@
}
/**
- Extract img et complete cache avec img extraites
+ @brief Extract img et complete cache avec img extraites
*/
private static function extract_img($id,$_DATATYPE_REPLACE_,$pattern){
preg_match_all($pattern, $_DATATYPE_REPLACE_, $images);
@@ -180,7 +190,7 @@
}
/**
- Parse _DATATYPE_REPLACE_ texte
+ @brief Parse _DATATYPE_REPLACE_ texte
Fucntion qui permet de prendre en charge des element contenu dans la description du cms.
*/
private static function parse__DATATYPE_REPLACE_($_DATATYPE_REPLACE_,$id){
@@ -198,12 +208,12 @@
preg_match_all($pattern, $sortie, $replace,PREG_OFFSET_CAPTURE);
foreach($replace as $item){
if(isset($item[0][0])){
- $i= (string)$item[0][0];
- if($i =='') break;
- $re = substr( $i, 2 , strlen($i)-4) ;
- if($re !='' && tep_cst_define($re) !=false){
- $sortie = preg_replace("/%_".$re."_%/",tep_cst_define($re) , $sortie );
- }
+ $i= (string)$item[0][0];
+ if($i =='') break;
+ $re = substr( $i, 2 , strlen($i)-4) ;
+ if($re !='' && tep_cst_define($re) !=false){
+ $sortie = preg_replace("/%_".$re."_%/",tep_cst_define($re) , $sortie );
+ }
}
}
@@ -224,12 +234,9 @@
}
/**
- Function recuperation des page associé a une cat
-
- @author oscim <mail a...@os... /><web http://www.oscim.fr /> - OscssTeam
- @param
- @a int l'id de la categorie courante ou null
- @a array tableau d'exclusion
+ @brief Function recuperation des page associé a une cat
+ @param $current_category_id int l'id de la categorie courante ou null
+ @param $exclude array tableau d'exclusion
*/
public static function get__DATATYPE_REPLACE__in_cat($current_category_id=0, $exclude='',$option=''){
global $languages_id;
@@ -243,11 +250,13 @@
return self::statment_query($_DATATYPE_REPLACE__query,$exclude);
}
+
/**
- Appel item
- @param
- @a string _DATATYPE_REPLACE__name le nom du titre
- @a array tableau d'exclusion
+ @brief Appel item
+ @param $id string _DATATYPE_REPLACE__name le nom du titre
+ @param $search string critere for search
+ @param $exclude array tableau d'exclusion
+ @param $option array tableau d'option
*/
public static function get_query($id='',$search='',$exclude='',$option=array()){
global $languages_id;
@@ -403,20 +412,20 @@
)
)
*/
- public static function GetExtraFields($product_id, $key=''){
+ public static function GetExtraFields($_id, $key=''){
$array= array();
- if(isset(self::$object_data[(int)$product_id]) && isset(self::$object_data[(int)$product_id]->extra) && empty($key) )$array= self::$object_data[(int)$product_id]->extra;
+ if(isset(self::$object_data[(int)$_id]) && isset(self::$object_data[(int)$_id]->extra) && empty($key) )$array= self::$object_data[(int)$_id]->extra;
else {
$DB=Database::getInstance();
$array=array();
- $sql = "SELECT e.epf_id, e.epf_input_type,e.epf_key, epf_show_in_listing, epf_advanced_search, e.epf_active_value_language , l.epf_label, l.epf_format as input_format, p2epf._DATATYPE_REPLACE__extra_fields_value as value FROM " . TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " p2epf , " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " e JOIN " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_LABELS . " l ON e.epf_id = l.epf_id WHERE p2epf._DATATYPE_REPLACE__extra_fields_id=e.epf_id AND _DATATYPE_REPLACE__id = '" . (int)$product_id . "' AND l.languages_id='".self::$lg_id."' AND epf_special_mod='".$key."' " ;
+ $sql = "SELECT e.epf_id, e.epf_input_type,e.epf_key, epf_show_in_listing, epf_advanced_search, e.epf_active_value_language , l.epf_label, l.epf_format as input_format, p2epf._DATATYPE_REPLACE__extra_fields_value as value FROM " . TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " p2epf , " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " e JOIN " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_LABELS . " l ON e.epf_id = l.epf_id WHERE p2epf._DATATYPE_REPLACE__extra_fields_id=e.epf_id AND _DATATYPE_REPLACE__id = '" . (int)$_id . "' AND l.languages_id='".self::$lg_id."' AND epf_special_mod='".$key."' " ;
$epf_query = $DB->query($sql);
while( $e = $epf_query->fetchAssoc() ) {
- $val = $DB->query( $sql ="SELECT p2epf._DATATYPE_REPLACE__extra_fields_value as value FROM " . TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " p2epf WHERE p2epf._DATATYPE_REPLACE__extra_fields_id=".$e['epf_id']." AND _DATATYPE_REPLACE__id = '" . (int)$product_id . "' AND languages_id='". (($e['epf_active_value_language']==1)? self::$lg_id : 0)."' ");
+ $val = $DB->query( $sql ="SELECT p2epf._DATATYPE_REPLACE__extra_fields_value as value FROM " . TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " p2epf WHERE p2epf._DATATYPE_REPLACE__extra_fields_id=".$e['epf_id']." AND _DATATYPE_REPLACE__id = '" . (int)$_id . "' AND languages_id='". (($e['epf_active_value_language']==1)? self::$lg_id : 0)."' ");
$result = $val->fetchAssoc();
switch((int)$e['epf_input_type'] ) {
@@ -455,8 +464,8 @@
}
- if(!isset(self::$object_data[(int)$product_id]))self::$object_data[(int)$product_id]=new objectInfo(array());
- self::$object_data[(int)$product_id]->extra = $array;
+ if(!isset(self::$object_data[(int)$_id]))self::$object_data[(int)$_id]=new objectInfo(array());
+ self::$object_data[(int)$_id]->extra = $array;
}
return $array;
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab 2012-04-18 12:39:32 UTC (rev 4263)
@@ -7,21 +7,28 @@
@date _CURRENTDATE_
@author genrated by GenerCode
@encode UTF-8
- *\dir includes/gabarit/
- *\file
+ @dir includes/gabarit/
+ @brief Sub section for products input fields in search page
+
*/
global $language,$customer_id;
-// print_r(ac__DATATYPE_REPLACE_::$current);
?>
-<div class="rowaction">
- <a href="<?php echo ac__DATATYPE_REPLACE_::href_link('add'); ?>"><?php echo __('ac__DATATYPE_REPLACE_ box action add'); ?></a>
-</div>
-<div class="contentBox myOrders">
- <div class="contentBox overview">
- <ul>
- <li><?php ?></li>
- </ul>
- </div>
-</div>
\ No newline at end of file
+
+ <li>
+ <label for="manufacturers_id"><?php echo ENTRY_MANUFACTURERS; ?></label>
+ <?php echo tep_draw_pull_down_menu('manufacturers_id', 'manufacturers_id', tep_get_manufacturers(array(array('id' => '', 'text' => TEXT_ALL_MANUFACTURERS)))); ?>
+ </li>
+
+ <li class="BlockRows">
+ <span class="BlockInput">
+ <label for="pfrom"><?php echo ENTRY_PRICE_FROM; ?></label>
+ <?php echo tep_draw_input_field('pfrom','pfrom'); ?>
+ </span>
+
+ <span class="BlockInput">
+ <label for="pto"><?php echo ENTRY_PRICE_TO; ?></label>
+ <?php echo tep_draw_input_field('pto','pto'); ?>
+ </span>
+ </li>
Modified: trunk/dev/GenerCode/datatype/Modele/readme
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/readme 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/dev/GenerCode/datatype/Modele/readme 2012-04-18 12:39:32 UTC (rev 4263)
@@ -59,4 +59,11 @@
- placer ce dossier dans le dossier contribution de votre shop, et mettez a jour vos sources afin de voir ce nouveau paquet.
- apres installation
- il est necessaire d'activer ce datatype en ajoutant sont nom dans PUBLIC_PAGE_TYPE, contenu dan sla tabel configuration
- - d'ajouter '_DATATYPE_REPLACE_' dans le tableau "$RootListing" de common/classes/datatype_drivers/Data_categorie.php
\ No newline at end of file
+ - d'ajouter '_DATATYPE_REPLACE_' dans le tableau "$RootListing" de common/classes/datatype_drivers/Data_categorie.php
+
+
+
+
+
+Note usage et modifications utlterieure
+ - Centraliser l'ensmeble de gabarit public dans un sous dossier du non du datatype
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/index.php
===================================================================
--- trunk/dev/GenerCode/datatype/index.php 2012-04-18 11:56:46 UTC (rev 4262)
+++ trunk/dev/GenerCode/datatype/index.php 2012-04-18 12:39:32 UTC (rev 4263)
@@ -71,7 +71,7 @@
$this->conf = $conf;
- $this->folder = $conf->curent .'/'. strtoupper($conf->name).'_'.$conf->level.'/';
+ $this->folder = $conf->curent .''. strtoupper($conf->name).'_'.$conf->level.'/';
if(!file_exists($this->folder) || !is_dir($this->folder)) {
mkdir($this->folder);
@@ -80,6 +80,8 @@
$this->process();
+ chmod($this->folder , 0777);
+
echo 'le dossier creer ce situe : ' . $this->folder;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 11:56:57
|
Revision: 4262
http://oscss.svn.sourceforge.net/oscss/?rev=4262&view=rev
Author: oscim
Date: 2012-04-18 11:56:46 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Report en sous dossier des gabarit html specifique par datatype
Added Paths:
-----------
trunk/catalog/includes/gabarit/product/
trunk/catalog/includes/gabarit/product/advanced_search.other.input.gab
Added: trunk/catalog/includes/gabarit/product/advanced_search.other.input.gab
===================================================================
--- trunk/catalog/includes/gabarit/product/advanced_search.other.input.gab (rev 0)
+++ trunk/catalog/includes/gabarit/product/advanced_search.other.input.gab 2012-04-18 11:56:46 UTC (rev 4262)
@@ -0,0 +1,61 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 19/04/2012 , 15:20:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @dir includes/gabarit/
+ @brief Sub section for products input fields in search page
+
+*/
+global $language,$customer_id;
+
+?>
+
+
+ <li class="BlockRows">
+ <span class="BlockInput">
+ <label for="categories_id"><?php echo ENTRY_CATEGORIES; ?></label>
+ <?php echo tep_draw_pull_down_menu('categories_id', 'categories_id', tep_get_categories(array(array('id' => '', 'text' => TEXT_ALL_CATEGORIES)))); ?>
+ </span>
+ </li>
+ <li class="BlockRows">
+ <span class="nowrap" style=" white-space: nowrap;">
+ <label for="inc_subcat"><?php echo ENTRY_INCLUDE_SUBCATEGORIES; ?></label>
+ <?php echo tep_draw_checkbox_field('inc_subcat','inc_subcat', '1', true, 'style=" white-space: nowrap;"') ;?>
+ </span>
+ </li>
+
+
+ <li>
+ <label for="manufacturers_id"><?php echo ENTRY_MANUFACTURERS; ?></label>
+ <?php echo tep_draw_pull_down_menu('manufacturers_id', 'manufacturers_id', tep_get_manufacturers(array(array('id' => '', 'text' => TEXT_ALL_MANUFACTURERS)))); ?>
+ </li>
+
+ <li class="BlockRows">
+ <span class="BlockInput">
+ <label for="pfrom"><?php echo ENTRY_PRICE_FROM; ?></label>
+ <?php echo tep_draw_input_field('pfrom','pfrom'); ?>
+ </span>
+
+ <span class="BlockInput">
+ <label for="pto"><?php echo ENTRY_PRICE_TO; ?></label>
+ <?php echo tep_draw_input_field('pto','pto'); ?>
+ </span>
+ </li>
+
+ <li class="BlockRows">
+ <span class="BlockInput">
+ <label for="dfrom"><?php echo ENTRY_DATE_FROM; ?></label>
+ <?php echo tep_draw_input_field('dfrom','dfrom', DOB_FORMAT_STRING, 'onfocus="this.value=\'\'"'); ?>
+ </span>
+ </li>
+ <li class="BlockRows">
+ <span class="BlockInput">
+ <label for="dto"><?php echo ENTRY_DATE_TO; ?></label>
+ <?php echo tep_draw_input_field('dto','dto', DOB_FORMAT_STRING, 'onfocus="this.value=\'\'"'); ?>
+ </span>
+ </li>
\ 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...> - 2012-04-18 09:01:32
|
Revision: 4261
http://oscss.svn.sourceforge.net/oscss/?rev=4261&view=rev
Author: oscim
Date: 2012-04-18 09:01:22 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Correction coquille
Ajustement modele GenerCode Datatype
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/products/desc_base.php
trunk/catalog/common/classes/DataTypes.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/install.xml
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.sql
Modified: trunk/catalog/admin/includes/modules/products/desc_base.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/desc_base.php 2012-04-18 08:16:06 UTC (rev 4260)
+++ trunk/catalog/admin/includes/modules/products/desc_base.php 2012-04-18 09:01:22 UTC (rev 4261)
@@ -118,7 +118,7 @@
if(empty($product_id)) $m=__('enregistrer votre produit pour acceder à ces options ');
else {
/// use master gabarit
- $m= MGabCont::CallGab('edit',__FUNCTION__,'products/'.__CLASS__);
+ $m= MGabCont::CallGab('edit',__FUNCTION__,'products/'.__CLASS__);
}
$contents []=array('title'=> __('Description') ,'text'=> $m);
}
Modified: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php 2012-04-18 08:16:06 UTC (rev 4260)
+++ trunk/catalog/common/classes/DataTypes.php 2012-04-18 09:01:22 UTC (rev 4261)
@@ -71,7 +71,7 @@
$childclass = self::PREFIX.trim($test) ;
- include_once(self::$env->path_childs . $childclass. '.php' );
+ @include_once(self::$env->path_childs . $childclass. '.php' );
if(!class_exists($childclass)) continue;
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php 2012-04-18 08:16:06 UTC (rev 4260)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php 2012-04-18 09:01:22 UTC (rev 4261)
@@ -81,7 +81,6 @@
/**
@brief Edition produit
- UP db
*/
function insert_table__DATATYPE_REPLACE__description ($language_id) {
$myarray=array(
@@ -94,7 +93,6 @@
/**
@brief Edition produit
- UP db
*/
function update_table__DATATYPE_REPLACE__description ($language_id) {
$myarray= $this->insert_table__DATATYPE_REPLACE__description ($language_id);
@@ -131,14 +129,15 @@
/**
*/
- function display_edit(&$contents, $product_id) {
+ function display_edit(&$contents, $_id) {
global $oscss;
$languages = tep_get_languages();
- if(empty($product_id)) $m=__('enregistrer votre produit pour acceder à ces options ');
+ if(empty($_GET['cID']))
+ $m=__('enregistrer votre _DATATYPE_REPLACE_ pour acceder à ces options ');
else {
/// use master gabarit
- $m= MGabCont::CallGab('edit',__FUNCTION__,'_DATATYPE_REPLACE_/'.__CLASS__);
+ $m= MGabCont::CallGab('edit',__FUNCTION__,$this->type.'s/'.__CLASS__);
}
$contents []=array('title'=> __('_DATATYPE_REPLACE_ tab title description') ,'text'=> $m);
}
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php 2012-04-18 08:16:06 UTC (rev 4260)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php 2012-04-18 09:01:22 UTC (rev 4261)
@@ -261,7 +261,7 @@
if (count(self::$cache)>0) self::add_where_query(' AND c._DATATYPE_REPLACE__id NOT IN ('.self::in_cache().') ');
//! soit id soit sherach name key
- self::add_where_query((tep_not_null($id) && is_numeric($id) ? " AND c._DATATYPE_REPLACE__id = '" . $id . "' ": (!empty($search)?" AND _DATATYPE_REPLACE__name LIKE '%" . tep_db_input($search) . "%' ":'') ));
+ self::add_where_query((tep_not_null($id) && is_numeric($id) ? " AND c._DATATYPE_REPLACE__id = '" . $id . "' ": (!empty($search)?" AND cd._DATATYPE_REPLACE__title LIKE '%" . tep_db_input($search) . "%' ":'') ));
$_DATATYPE_REPLACE__query = $DB->query($sql=self::cstr_query((string)@$option['orderby'],@$option['limit'],(array)@$option) );
@@ -345,7 +345,7 @@
self::reset_query();
$DB=Database::getInstance();
self::$lg_id=(int)$languages_id;
- self::add_where_query(" AND _DATATYPE_REPLACE__name NOT LIKE 'Page_%' ");
+ self::add_where_query(" AND cd._DATATYPE_REPLACE__title NOT LIKE 'Page_%' ");
$sql=self::cstr_query(" c.date_added DESC ", $max);
$_DATATYPE_REPLACE__query = $DB->query($sql);
Modified: trunk/dev/GenerCode/datatype/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-18 08:16:06 UTC (rev 4260)
+++ trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-18 09:01:22 UTC (rev 4261)
@@ -32,7 +32,15 @@
<file name="includes/content/_DATATYPE_REPLACE_.php" />
+ <file name="includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab" />
+ <file name="includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab" />
+ <file name="includes/gabarit/_DATATYPE_REPLACE_/account.display_view.step.0.gab" />
+ <file name="includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab" />
+
<file name="includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php" />
+ <file name="includes/modules/account/ac__DATATYPE_REPLACE_.php" />
+
+
</addfile>
<addfilelg>
@@ -40,7 +48,9 @@
<file name="admin/includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/>
-<!-- <file name="includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/> -->
+
+ <file name="includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/>
+ <file name="includes/languages/%LANGUAGE%/modules/account/ac__DATATYPE_REPLACE_.txt" lgref="fr_FR"/>
</addfilelg>
<add2endlg>
Modified: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql 2012-04-18 08:16:06 UTC (rev 4260)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql 2012-04-18 09:01:22 UTC (rev 4261)
@@ -10,6 +10,6 @@
epf_format varchar(64) NOT NULL,
epf_unity_type_id int(11) NOT NULL,
epf_unity_id int(11) NOT NULL,
- PRIMARY KEY (epf_id,languages_id),
+ PRIMARY KEY (epf_id,languages_id)
) ;
Modified: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.sql 2012-04-18 08:16:06 UTC (rev 4260)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.sql 2012-04-18 09:01:22 UTC (rev 4261)
@@ -9,6 +9,5 @@
parent_id int(10) unsigned NOT NULL DEFAULT '0',
sort_order int(11) NOT NULL DEFAULT '0',
epf_value varchar(64) DEFAULT NULL,
- PRIMARY KEY (value_id,epf_id,languages_id),
--- KEY IDX_EPF (value_id,epf_id,languages_id)
+ PRIMARY KEY (value_id,epf_id,languages_id)
) CHARSET=utf8 ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 08:16:17
|
Revision: 4260
http://oscss.svn.sourceforge.net/oscss/?rev=4260&view=rev
Author: oscim
Date: 2012-04-18 08:16:06 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/oscss_cstr.php
Modified: trunk/catalog/admin/includes/classes/oscss_cstr.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_cstr.php 2012-04-18 06:32:06 UTC (rev 4259)
+++ trunk/catalog/admin/includes/classes/oscss_cstr.php 2012-04-18 08:16:06 UTC (rev 4260)
@@ -138,7 +138,7 @@
*/
public function _add_ext($name_object, $path){
if(is_dir($path) && self::TestFile($path.$name_object.'/oscss_init.php') ) {
- include($path.$name_object.'/oscss_init.php');
+ include_once($path.$name_object.'/oscss_init.php');
$this->add_obj($name_object.'_oscss');
} else die(_('Error extenion introuvable'));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 06:32:18
|
Revision: 4259
http://oscss.svn.sourceforge.net/oscss/?rev=4259&view=rev
Author: oscim
Date: 2012-04-18 06:32:06 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Suite tarvail GenerCode
Ajustement et developpement
Modified Paths:
--------------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab
trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE_.sql
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/
trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.key.sql
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.key.sql
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.key.sql
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_categories.key.sql
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.key.sql
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab 2012-04-17 20:46:47 UTC (rev 4258)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab 2012-04-18 06:32:06 UTC (rev 4259)
@@ -1,21 +1,21 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 15/04/2012, 22:44
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
*\dir includes/gabarit/
*\file
*/
global $language,$customer_id;
-// print_r(ac_annuaire::$current);
+// print_r(ac__DATATYPE_REPLACE_::$current);
?>
<div class="rowaction">
- <a href="<?php echo ac_annuaire::href_link('add'); ?>"><?php echo __('ac_annuaire box action add'); ?></a>
+ <a href="<?php echo ac__DATATYPE_REPLACE_::href_link('add'); ?>"><?php echo __('ac__DATATYPE_REPLACE_ box action add'); ?></a>
</div>
<div class="contentBox myOrders">
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab 2012-04-17 20:46:47 UTC (rev 4258)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab 2012-04-18 06:32:06 UTC (rev 4259)
@@ -1,33 +1,33 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 15/04/2012, 22:44
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
*/
global $language,$customer_id,$entry;
?>
<div id="adressBookProcess">
- <?php /** Retour d'erreur checkup sur la boutique */ $page->messageStack->_draw('ac_annuaire'); ?>
+ <?php /** Retour d'erreur checkup sur la boutique */ $page->messageStack->_draw('ac__DATATYPE_REPLACE_'); ?>
- <?php echo tep_draw_form('ac_annuaire',(isset($_GET['id']) ? ac_annuaire::href_link('edit','id='.(int)$_GET['id']) : ac_annuaire::href_link('add') ), 'post'); ?>
+ <?php echo tep_draw_form('ac__DATATYPE_REPLACE_',(isset($_GET['id']) ? ac__DATATYPE_REPLACE_::href_link('edit','id='.(int)$_GET['id']) : ac__DATATYPE_REPLACE_::href_link('add') ), 'post'); ?>
$result->gabarit
- <?php echo tep_get_include_contents(ac_annuaire::$current->gabarit) ?>
+ <?php echo tep_get_include_contents(ac__DATATYPE_REPLACE_::$current->gabarit) ?>
<div class="navBt">
<?php if(isset($_GET['id'])) echo tep_draw_hidden_field('id', (int)$_GET['id']) ;?>
- <?php echo '<a class="navBt" href="' . ac_annuaire::href_link(). '">' . __('ac_annuaire action abandons') . '</a>'; ?>
+ <?php echo '<a class="navBt" href="' . ac__DATATYPE_REPLACE_::href_link(). '">' . __('ac__DATATYPE_REPLACE_ action abandons') . '</a>'; ?>
<input class="submitBt" id="send" type="submit" value="<?php echo IMAGE_BUTTON_UPDATE; ?>" />
</div>
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab 2012-04-17 20:46:47 UTC (rev 4258)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab 2012-04-18 06:32:06 UTC (rev 4259)
@@ -1,13 +1,13 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 15/04/2012, 22:44
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief Sub gabarit for draw Step 0 form for add new entry in annuaire
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @brief Sub gabarit for draw Step 0 form for add new entry in _DATATYPE_REPLACE_
*/
global $language,$customer_id,$entry;
@@ -17,7 +17,7 @@
<fieldset>
<p>
- <label><?php echo __('ac_annuaire add step_0 input ') ?><label>
+ <label><?php echo __('ac__DATATYPE_REPLACE_ add step_0 input ') ?><label>
<?php if(isset($_GET['id'])) echo tep_draw_hidden_field('id', (int)$_GET['id']) ;?>
</p>
</fieldset>
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab 2012-04-17 20:46:47 UTC (rev 4258)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab 2012-04-18 06:32:06 UTC (rev 4259)
@@ -1,44 +1,44 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 15/04/2012, 22:44
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
*\dir includes/gabarit/
*\file
- *\brief display module ac_annuaire list address,
+ *\brief display module ac__DATATYPE_REPLACE_ list address,
*
- * template html for function display_view in class ac_annuaire
+ * template html for function display_view in class ac__DATATYPE_REPLACE_
*/
global $language,$customer_id;
-// print_r(ac_annuaire::$current);
+// print_r(ac__DATATYPE_REPLACE_::$current);
?>
<div id="addressBook">
<?php /* Retour d'erreur checkup sur la boutique */ $page->messageStack->_draw('addressbook'); ?>
- <?php if (count(ac_annuaire::$current) > 0): ?>
+ <?php if (count(ac__DATATYPE_REPLACE_::$current) > 0): ?>
<table>
<thead>
<tr>
- <th><?php echo __('ac_annuaire table heading title'); ?></th>
- <th><?php echo __('ac_annuaire table heading date'); ?></th>
- <th><?php echo __('ac_annuaire table heading action'); ?></th>
+ <th><?php echo __('ac__DATATYPE_REPLACE_ table heading title'); ?></th>
+ <th><?php echo __('ac__DATATYPE_REPLACE_ table heading date'); ?></th>
+ <th><?php echo __('ac__DATATYPE_REPLACE_ table heading action'); ?></th>
</tr>
</thead>
<tbody>
- <?php foreach(ac_annuaire::$current as $row): /*print_r($row);*/ ?>
+ <?php foreach(ac__DATATYPE_REPLACE_::$current as $row): /*print_r($row);*/ ?>
<tr>
<td><a href="<?php echo $row->href ?>"><?php echo $row->title ?></a></td>
<td><?php echo tep_date_short($row->date_added) ?></td>
<td>
- <a href="<?php echo ac_annuaire::href_link('edit','id='.$row->id) ?>">edit</a>
- <a href="<?php echo ac_annuaire::href_link('offline','id='.$row->id) ?>">offline</a>
+ <a href="<?php echo ac__DATATYPE_REPLACE_::href_link('edit','id='.$row->id) ?>">edit</a>
+ <a href="<?php echo ac__DATATYPE_REPLACE_::href_link('offline','id='.$row->id) ?>">offline</a>
</td>
</tr>
<?php endforeach; ?>
@@ -50,8 +50,8 @@
<div class="navBt">
<?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
- <?php /*if (tep_count_customer_ac_annuaire_entries() < MAX_ADDRESS_BOOK_ENTRIES) { ?>
- <?php echo '<a class="navBt" href="' . ac_annuaire::href_link('add','') . '">' . IMAGE_BUTTON_ADD_ADDRESS . '</a>'; ?>
+ <?php /*if (tep_count_customer_ac__DATATYPE_REPLACE__entries() < MAX_ADDRESS_BOOK_ENTRIES) { ?>
+ <?php echo '<a class="navBt" href="' . ac__DATATYPE_REPLACE_::href_link('add','') . '">' . IMAGE_BUTTON_ADD_ADDRESS . '</a>'; ?>
<?php } */?>
</div>
</div>
\ No newline at end of file
Added: trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php 2012-04-18 06:32:06 UTC (rev 4259)
@@ -0,0 +1,13 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @note not delete item in public module. this reserved in admin panel
+*/
+
+?>
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php 2012-04-17 20:46:47 UTC (rev 4258)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php 2012-04-18 06:32:06 UTC (rev 4259)
@@ -7,10 +7,10 @@
@date _CURRENTDATE_
@author genrated by GenerCode
@encode UTF-8
- @note not delete in public module. this reserved in admin panel
+ @note not delete item in public module. this reserved in admin panel
*/
-class ac_annuaire
+class ac__DATATYPE_REPLACE_
extends
AbstractAccount
implements
@@ -54,7 +54,7 @@
$this->type =self::$type;
$this->title = __('module aca address book text title');
$this->description = __('module aca address book text description') ;
- $this->sort_order = (defined('MODULE_ACA_ADDRESS_BOOK_SORT_ORDER')) ? MODULE_ACA_ADDRESS_BOOK_SORT_ORDER : 0;
+ $this->sort_order = (defined('MODULE_ACA__DATATYPE_REPLACE_MAJ__SORT_ORDER')) ? MODULE_ACA__DATATYPE_REPLACE_MAJ__SORT_ORDER : 0;
$this->enabled = true;
@@ -79,12 +79,12 @@
self::$action = 'ab_page';
- define('TABLE_ANNUAIRE_TO_CUSTOMERS', DB_TABLE_PREFIX.'annuaire_to_customers');
+ define('TABLE__DATATYPE_REPLACE_MAJ__TO_CUSTOMERS', DB_TABLE_PREFIX.'_DATATYPE_REPLACE__to_customers');
// define all menu
// report in config this modules
- define('MAX_DISPLAY_ANNUAIRE_ACCOUNT_LISTING', '10');
+ define('MAX_DISPLAY__DATATYPE_REPLACE_MAJ__ACCOUNT_LISTING', '10');
}
public function get_header($action=''){}
@@ -114,17 +114,17 @@
// }
- $page->messageStack->add('addressbook', __('SUCCESS_ADDRESS_BOOK_ENTRY_UPDATED'), 'success');
+// $page->messageStack->add('addressbook', __('SUCCESS__DATATYPE_REPLACE_MAJ__ENTRY_UPDATED'), 'success');
// }
break;
case 'deleteconfirm':
- if(!isset($_GET['delete']) || !is_numeric($_GET['delete']) ) return false;
-/** ADD control addresse defaut */
-
- tep_db_query("delete from " . TABLE_ADDRESS_BOOK . " where ac_annuaire_id = '" . (int)$_GET['delete'] . "' and customers_id = '" . (int)$customer_id . "'");
-
- $page->messageStack->add_session('addressbook', __('SUCCESS_ADDRESS_BOOK_ENTRY_DELETED'), 'success');
+// if(!isset($_GET['delete']) || !is_numeric($_GET['delete']) ) return false;
+//
+//
+// tep_db_query("delete from " . TABLE__DATATYPE_REPLACE_MAJ_ . " where ac__DATATYPE_REPLACE__id = '" . (int)$_GET['delete'] . "' and customers_id = '" . (int)$customer_id . "'");
+//
+// $page->messageStack->add_session('addressbook', __('SUCCESS__DATATYPE_REPLACE_MAJ__ENTRY_DELETED'), 'success');
break;
}
@@ -134,16 +134,16 @@
/**
*/
public function after_check_action ($action) {
- if($action=='new') tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL'));
+// if($action=='new') tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL'));
}
/**
*/
public function update_table_account () {
- //! This function returns an array with variables to update into TABLE_ADDRESS_BOOK
+ //! This function returns an array with variables to update into TABLE__DATATYPE_REPLACE_MAJ_
$sql_data_array=$this->sql_data_array;
-// tep_db_perform(TABLE_ADDRESS_BOOK, $this->cInfo->sql_data_array, 'update', "customers_id = '" . (int)$_GET['cID'] . "' and ac_annuaire_id = '" . (int)$this->cInfo->customers_default_address_id . "'");
+// tep_db_perform(TABLE__DATATYPE_REPLACE_MAJ_, $this->cInfo->sql_data_array, 'update', "customers_id = '" . (int)$_GET['cID'] . "' and ac__DATATYPE_REPLACE__id = '" . (int)$this->cInfo->customers_default_address_id . "'");
return array();
}
@@ -189,18 +189,18 @@
*/
case 'ab_page':
- $sql="SELECT c.annuaire_id AS id, c.date_added as date_added ".
- " FROM " . TABLE_ANNUAIRE_TO_CUSTOMERS . " ctc ".
- " LEFT JOIN " . TABLE_ANNUAIRE . " c ON(c.annuaire_id = ctc.annuaire_id )
- WHERE ctc.customers_id = '" . (int)$customer_id . "' " . DataForceStatus(" AND c.annuaire_status = '1' ") . " " ;
+ $sql="SELECT c._DATATYPE_REPLACE__id AS id, c.date_added as date_added ".
+ " FROM " . TABLE__DATATYPE_REPLACE_MAJ__TO_CUSTOMERS . " ctc ".
+ " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ_ . " c ON(c._DATATYPE_REPLACE__id = ctc._DATATYPE_REPLACE__id )
+ WHERE ctc.customers_id = '" . (int)$customer_id . "' " . DataForceStatus(" AND c._DATATYPE_REPLACE__status = '1' ") . " " ;
- self::$history_split = new splitPageResults($sql, MAX_DISPLAY_ANNUAIRE_ACCOUNT_LISTING);
+ self::$history_split = new splitPageResults($sql, MAX_DISPLAY__DATATYPE_REPLACE_MAJ__ACCOUNT_LISTING);
$_query = $DB->query(self::$history_split->sql_query);
$result = array();
foreach($_query->fetchAllAssoc() as $row){
- $n = annuaire::get_item($row['id']);
+ $n = _DATATYPE_REPLACE_::get_item($row['id']);
$n->date_added = tep_date_short($row['date_added']);
$result[]=$n;
@@ -214,14 +214,14 @@
@remarks calcul for widget in account master page
*/
default:
- $query="SELECT c.annuaire_id AS id, c.date_added as date_added ".
- " FROM " . TABLE_ANNUAIRE_TO_CUSTOMERS . " ctc ".
- " LEFT JOIN " . TABLE_ANNUAIRE . " c ON(c.annuaire_id = ctc.annuaire_id )
- WHERE ctc.customers_id = '" . (int)$customer_id . "' " . DataForceStatus(" AND c.annuaire_status = '1' ") . " LIMIT 1 " ;
+ $query="SELECT c._DATATYPE_REPLACE__id AS id, c.date_added as date_added ".
+ " FROM " . TABLE__DATATYPE_REPLACE_MAJ__TO_CUSTOMERS . " ctc ".
+ " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ_ . " c ON(c._DATATYPE_REPLACE__id = ctc._DATATYPE_REPLACE__id )
+ WHERE ctc.customers_id = '" . (int)$customer_id . "' " . DataForceStatus(" AND c._DATATYPE_REPLACE__status = '1' ") . " LIMIT 1 " ;
$result = $DB->query($query);
$tp= $result->fetchAssoc();
- self::$current =annuaire::get_item($tp['id']);
+ self::$current =_DATATYPE_REPLACE_::get_item($tp['id']);
}
@@ -254,7 +254,7 @@
switch(self::$action){
default:
- $v['title']=__("ac_annuaire menu myaccount link manage");
+ $v['title']=__("ac__DATATYPE_REPLACE_ menu myaccount link manage");
$v['href']= self::href_link(); //tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.self::$type.'&aca_action=display_view', 'SSL');
return new objectInfo( array(
'type'=>'menu',
@@ -312,7 +312,7 @@
self::$account = $page->_call('customer','the_customer');
- $v['title']=(isset($_GET['id'])? __("ac_annuaire page edit") : __("ac_annuaire page add") );
+ $v['title']=(isset($_GET['id'])? __("ac__DATATYPE_REPLACE_ page edit") : __("ac__DATATYPE_REPLACE_ page add") );
$v['content']=tep_output_string_protected(tep_get_include_contents($forcepath.'/'.self::$type.'.'.__FUNCTION__.'.edit'),false,true);
return new objectInfo( $v );
break;
@@ -325,7 +325,7 @@
$customer_id=$page->the_var('customer_id');
$this->load_db_values($customer_id);
- $v['title']=__("ac_annuaire page view");
+ $v['title']=__("ac__DATATYPE_REPLACE_ page view");
$v['content']=tep_output_string_protected(tep_get_include_contents($forcepath.'/'.self::$type.'.'.__FUNCTION__.'.page'),false,true);
return new objectInfo( $v );
break;
@@ -334,7 +334,7 @@
@remarks widget in account master page
*/
default:
- $v['title']=__("ac_annuaire widget view");
+ $v['title']=__("ac__DATATYPE_REPLACE_ widget view");
$v['href']= self::href_link();
$v['content']=tep_output_string_protected(tep_get_include_contents($forcepath.'/'.self::$type.'.'.'box_view'),false,true);
return new objectInfo(array(
Modified: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE_.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE_.sql 2012-04-17 20:46:47 UTC (rev 4258)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE_.sql 2012-04-18 06:32:06 UTC (rev 4259)
@@ -8,7 +8,9 @@
_DATATYPE_REPLACE__status int(1) NOT NULL,
_DATATYPE_REPLACE__hidden int(1) NOT NULL,
date_added datetime DEFAULT '1000-01-01 00:00:00',
+ user_added int(11) NOT NULL DEFAULT '0',
last_modified datetime DEFAULT '1000-01-01 00:00:00',
+ user_modified int(11) NOT NULL DEFAULT '0',
sort_order varchar(2) NOT NULL DEFAULT '0',
PRIMARY KEY (_DATATYPE_REPLACE__id)
) CHARSET=utf8 ;
Added: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.key.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.key.sql (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.key.sql 2012-04-18 06:32:06 UTC (rev 4259)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc__DATATYPE_REPLACE__description ADD INDEX idx__DATATYPE_REPLACE__description (categories_id);
+ALTER TABLE osc__DATATYPE_REPLACE__description ADD INDEX idx__DATATYPE_REPLACE__description_lg (language_id);
+
+ALTER TABLE osc__DATATYPE_REPLACE__description ADD CONSTRAINT fk__DATATYPE_REPLACE__description FOREIGN KEY (categories_id) REFERENCES osc_categories (categories_id);
+ALTER TABLE osc__DATATYPE_REPLACE__description ADD CONSTRAINT fk__DATATYPE_REPLACE__description_lg FOREIGN KEY (language_id) REFERENCES osc_languages (languages_id);
Added: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.key.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.key.sql (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.key.sql 2012-04-18 06:32:06 UTC (rev 4259)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_labels ADD INDEX idx__DATATYPE_REPLACE__extra_fields_labels_lgid (languages_id);
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_labels ADD INDEX idx__DATATYPE_REPLACE__epf_id (epf_id);
+
+
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_labels ADD CONSTRAINT fk_osc__DATATYPE_REPLACE__extra_fields_labels_lgid FOREIGN KEY (languages_id) REFERENCES osc_languages (languages_id);
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_labels ADD CONSTRAINT fk_osc__DATATYPE_REPLACE__extra_fields_labels_id FOREIGN KEY (epf_id) REFERENCES osc__DATATYPE_REPLACE__extra_fields (epf_id);
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql 2012-04-17 20:46:47 UTC (rev 4258)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql 2012-04-18 06:32:06 UTC (rev 4259)
@@ -2,7 +2,7 @@
-- Structure de la table osc__DATATYPE_REPLACE__extra_fields_labels
--
-CREATE TABLE IF NOT EXISTS osc_annuaire_extra_fields_labels(
+CREATE TABLE IF NOT EXISTS osc__DATATYPE_REPLACE__extra_fields_labels(
epf_id int(10) unsigned NOT NULL,
languages_id int(11) NOT NULL,
epf_label varchar(64) DEFAULT NULL,
Added: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.key.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.key.sql (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.key.sql 2012-04-18 06:32:06 UTC (rev 4259)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_values ADD INDEX idx__DATATYPE_REPLACE__extra_fields_labels_lgid (languages_id);
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_values ADD INDEX idx__DATATYPE_REPLACE__epf_id (epf_id);
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_values ADD INDEX idx__DATATYPE_REPLACE__value_id (value_id);
+
+
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_values ADD CONSTRAINT fk_osc__DATATYPE_REPLACE__extra_fields_values_lgid FOREIGN KEY (languages_id) REFERENCES osc_languages (languages_id);
+ALTER TABLE osc__DATATYPE_REPLACE__extra_fields_values ADD CONSTRAINT fk_osc__DATATYPE_REPLACE__extra_fields_values_epf_id FOREIGN KEY (epf_id) REFERENCES osc__DATATYPE_REPLACE__extra_fields (epf_id);
\ No newline at end of file
Added: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_categories.key.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_categories.key.sql (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_categories.key.sql 2012-04-18 06:32:06 UTC (rev 4259)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc__DATATYPE_REPLACE__to_categories ADD INDEX idx__DATATYPE_REPLACE__to_categories (categories_id);
+ALTER TABLE osc__DATATYPE_REPLACE__to_categories ADD INDEX idx__DATATYPE_REPLACE__to_categories_lk (_DATATYPE_REPLACE__id);
+
+ALTER TABLE osc__DATATYPE_REPLACE__to_categories ADD CONSTRAINT fk__DATATYPE_REPLACE__to_categories FOREIGN KEY (categories_id) REFERENCES osc_categories (categories_id);
+ALTER TABLE osc__DATATYPE_REPLACE__to_categories ADD CONSTRAINT fk__DATATYPE_REPLACE__to_categories_lg FOREIGN KEY (_DATATYPE_REPLACE__id) REFERENCES osc__DATATYPE_REPLACE_ (_DATATYPE_REPLACE__id);
Added: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.key.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.key.sql (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.key.sql 2012-04-18 06:32:06 UTC (rev 4259)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+ALTER TABLE osc__DATATYPE_REPLACE__to_customers ADD INDEX idx__DATATYPE_REPLACE__to_customers (customers_id);
+ALTER TABLE osc__DATATYPE_REPLACE__to_customers ADD INDEX idx__DATATYPE_REPLACE__to_customers_lk (_DATATYPE_REPLACE__id);
+
+ALTER TABLE osc__DATATYPE_REPLACE__to_customers ADD CONSTRAINT fk__DATATYPE_REPLACE__to_customers FOREIGN KEY (customers_id) REFERENCES osc_customers (customers_id);
+ALTER TABLE osc__DATATYPE_REPLACE__to_customers ADD CONSTRAINT fk__DATATYPE_REPLACE__to_customers_lg FOREIGN KEY (_DATATYPE_REPLACE__id) REFERENCES osc__DATATYPE_REPLACE_ (_DATATYPE_REPLACE__id);
\ 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...> - 2012-04-17 21:25:10
|
Revision: 4258
http://oscss.svn.sourceforge.net/oscss/?rev=4258&view=rev
Author: oscim
Date: 2012-04-17 20:46:47 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php 2012-04-17 20:45:43 UTC (rev 4257)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php 2012-04-17 20:46:47 UTC (rev 4258)
@@ -506,12 +506,53 @@
-/** Interface module */
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
function remove() { return false; }
- function keys() { return false; }
}
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php 2012-04-17 20:45:43 UTC (rev 4257)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php 2012-04-17 20:46:47 UTC (rev 4258)
@@ -90,10 +90,53 @@
return array(new objectInfo($v));
}
-/** implements InterfaceModule depend */
- public function check() {}
- public function install() {}
- public function remove() {}
- public function keys() {}
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
}
?>
\ 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...> - 2012-04-17 20:45:53
|
Revision: 4257
http://oscss.svn.sourceforge.net/oscss/?rev=4257&view=rev
Author: oscim
Date: 2012-04-17 20:45:43 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab
Added: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab 2012-04-17 20:45:43 UTC (rev 4257)
@@ -0,0 +1,27 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ *\dir includes/gabarit/
+ *\file
+*/
+global $language,$customer_id;
+
+// print_r(ac_annuaire::$current);
+?>
+<div class="rowaction">
+ <a href="<?php echo ac_annuaire::href_link('add'); ?>"><?php echo __('ac_annuaire box action add'); ?></a>
+</div>
+<div class="contentBox myOrders">
+
+ <div class="contentBox overview">
+ <ul>
+ <li><?php ?></li>
+ </ul>
+ </div>
+</div>
\ No newline at end of file
Added: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab 2012-04-17 20:45:43 UTC (rev 4257)
@@ -0,0 +1,36 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $language,$customer_id,$entry;
+
+?>
+<div id="adressBookProcess">
+ <?php /** Retour d'erreur checkup sur la boutique */ $page->messageStack->_draw('ac_annuaire'); ?>
+
+
+ <?php echo tep_draw_form('ac_annuaire',(isset($_GET['id']) ? ac_annuaire::href_link('edit','id='.(int)$_GET['id']) : ac_annuaire::href_link('add') ), 'post'); ?>
+
+
+ $result->gabarit
+
+ <?php echo tep_get_include_contents(ac_annuaire::$current->gabarit) ?>
+
+
+ <div class="navBt">
+ <?php if(isset($_GET['id'])) echo tep_draw_hidden_field('id', (int)$_GET['id']) ;?>
+
+
+ <?php echo '<a class="navBt" href="' . ac_annuaire::href_link(). '">' . __('ac_annuaire action abandons') . '</a>'; ?>
+ <input class="submitBt" id="send" type="submit" value="<?php echo IMAGE_BUTTON_UPDATE; ?>" />
+ </div>
+
+ </form>
+
+</div>
\ No newline at end of file
Added: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab 2012-04-17 20:45:43 UTC (rev 4257)
@@ -0,0 +1,25 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief Sub gabarit for draw Step 0 form for add new entry in annuaire
+*/
+global $language,$customer_id,$entry;
+
+?>
+<div id="step_0">
+
+
+ <fieldset>
+ <p>
+ <label><?php echo __('ac_annuaire add step_0 input ') ?><label>
+ <?php if(isset($_GET['id'])) echo tep_draw_hidden_field('id', (int)$_GET['id']) ;?>
+ </p>
+ </fieldset>
+
+</div>
\ No newline at end of file
Added: trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab 2012-04-17 20:45:43 UTC (rev 4257)
@@ -0,0 +1,57 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ *\dir includes/gabarit/
+ *\file
+ *\brief display module ac_annuaire list address,
+ *
+ * template html for function display_view in class ac_annuaire
+*/
+global $language,$customer_id;
+
+
+// print_r(ac_annuaire::$current);
+?>
+<div id="addressBook">
+
+ <?php /* Retour d'erreur checkup sur la boutique */ $page->messageStack->_draw('addressbook'); ?>
+ <?php if (count(ac_annuaire::$current) > 0): ?>
+
+ <table>
+ <thead>
+ <tr>
+ <th><?php echo __('ac_annuaire table heading title'); ?></th>
+ <th><?php echo __('ac_annuaire table heading date'); ?></th>
+ <th><?php echo __('ac_annuaire table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(ac_annuaire::$current as $row): /*print_r($row);*/ ?>
+ <tr>
+ <td><a href="<?php echo $row->href ?>"><?php echo $row->title ?></a></td>
+ <td><?php echo tep_date_short($row->date_added) ?></td>
+ <td>
+ <a href="<?php echo ac_annuaire::href_link('edit','id='.$row->id) ?>">edit</a>
+ <a href="<?php echo ac_annuaire::href_link('offline','id='.$row->id) ?>">offline</a>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+ <?php endif; ?>
+
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ <?php /*if (tep_count_customer_ac_annuaire_entries() < MAX_ADDRESS_BOOK_ENTRIES) { ?>
+ <?php echo '<a class="navBt" href="' . ac_annuaire::href_link('add','') . '">' . IMAGE_BUTTON_ADD_ADDRESS . '</a>'; ?>
+ <?php } */?>
+ </div>
+</div>
\ 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...> - 2012-04-17 20:44:55
|
Revision: 4256
http://oscss.svn.sourceforge.net/oscss/?rev=4256&view=rev
Author: oscim
Date: 2012-04-17 20:44:49 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/gabarit/_DATATYPE_REPLACE_/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-17 20:41:47
|
Revision: 4255
http://oscss.svn.sourceforge.net/oscss/?rev=4255&view=rev
Author: oscim
Date: 2012-04-17 20:41:37 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/
trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php
Added: trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/account/ac__DATATYPE_REPLACE_.php 2012-04-17 20:41:37 UTC (rev 4255)
@@ -0,0 +1,437 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @note not delete in public module. this reserved in admin panel
+*/
+
+class ac_annuaire
+ extends
+ AbstractAccount
+ implements
+ InterfaceModule
+ ,InterfaceAccount
+ {
+
+ /**
+ @var array
+ */
+ public static $account;
+ /**
+ @var array
+ */
+ public static $current;
+ /**
+ @var numeric
+ */
+ public static $count;
+ /**
+ @var array
+ */
+ public static $history_split;
+ /**
+ @var string
+ */
+ public static $display_view_form_title;
+ /**
+ @var string action
+ */
+ public static $action ='';
+ /**
+ @var string
+ */
+ public static $type ='account';
+
+ /**
+ */
+ function __construct(){
+ $this->code =__CLASS__;
+ $this->type =self::$type;
+ $this->title = __('module aca address book text title');
+ $this->description = __('module aca address book text description') ;
+ $this->sort_order = (defined('MODULE_ACA_ADDRESS_BOOK_SORT_ORDER')) ? MODULE_ACA_ADDRESS_BOOK_SORT_ORDER : 0;
+ $this->enabled = true;
+
+
+ $this->sql_data_array=array();
+ $this->cInfo = new objectInfo(array());
+
+ $page=page::getInstance();
+ $page->new_class('javascript');
+
+ /// script validate js
+ $page->javascript->add_framework("ext/jquery/jquery.min.js");
+ $page->javascript->add_script("ext/jquery/jquery.validate.min.js", array('sort'=>30));
+
+ /// call js view last time
+ $file=DIR_WS_INCLUDES.'js/'.__CLASS__.'.js.php';
+ if( ($file=page::fix_file($file)) && $file !=false ) $page->javascript->add_script($file, array('sort'=>30));
+
+ if(isset($_GET['action']))
+ self::$action = tep_db_prepare_input($_GET['action']);
+
+ if(empty(self::$action) && isset($_GET['aca_action']))
+ self::$action = 'ab_page';
+
+
+ define('TABLE_ANNUAIRE_TO_CUSTOMERS', DB_TABLE_PREFIX.'annuaire_to_customers');
+ // define all menu
+
+
+ // report in config this modules
+ define('MAX_DISPLAY_ANNUAIRE_ACCOUNT_LISTING', '10');
+ }
+
+ public function get_header($action=''){}
+
+ /**
+ * \fn check_action($action)
+ * \brief Action exe
+ * @param $action string la var d'action
+ * @p $cID int recupere le Session[]
+ */
+ public function check_action($action) {
+// var_dump($action);
+ if(tep_not_null($action)) self::$action = $action;
+// if ($action != 'process') return false;
+ if (!tep_session_is_registered('customer_id')) return false;
+
+ global $page;
+ $customer_id=$page->the_var('customer_id');
+
+ switch (self::$action) {
+
+ case 'update':
+ case 'new':
+
+
+// tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)$customer_id . "'");
+// }
+
+
+ $page->messageStack->add('addressbook', __('SUCCESS_ADDRESS_BOOK_ENTRY_UPDATED'), 'success');
+// }
+ break;
+
+ case 'deleteconfirm':
+ if(!isset($_GET['delete']) || !is_numeric($_GET['delete']) ) return false;
+/** ADD control addresse defaut */
+
+ tep_db_query("delete from " . TABLE_ADDRESS_BOOK . " where ac_annuaire_id = '" . (int)$_GET['delete'] . "' and customers_id = '" . (int)$customer_id . "'");
+
+ $page->messageStack->add_session('addressbook', __('SUCCESS_ADDRESS_BOOK_ENTRY_DELETED'), 'success');
+ break;
+ }
+
+ return true;
+ }
+
+ /**
+ */
+ public function after_check_action ($action) {
+ if($action=='new') tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL'));
+ }
+
+ /**
+ */
+ public function update_table_account () {
+
+ //! This function returns an array with variables to update into TABLE_ADDRESS_BOOK
+ $sql_data_array=$this->sql_data_array;
+// tep_db_perform(TABLE_ADDRESS_BOOK, $this->cInfo->sql_data_array, 'update', "customers_id = '" . (int)$_GET['cID'] . "' and ac_annuaire_id = '" . (int)$this->cInfo->customers_default_address_id . "'");
+
+ return array();
+ }
+
+ /**
+ */
+ public function load_db_values($cID) {
+ global $page, $languages_id;
+ $customer_id=$page->the_var('customer_id');
+ $DB=Database::getInstance();
+
+ switch(self::$action){
+
+ /**
+ @remarks calcul add/edit forms in page module
+ */
+ case 'ab_add':
+ case 'ab_edit':
+ if (!isset($_GET['step']) )
+ $step = 'step.0';
+ else
+ $step = 'step.'.(int)$_GET['step'].'';
+
+ $active_check = (isset($_POST)? true : false);
+
+ $result = new stdClass();
+ $result->gabarit = substr(__CLASS__, 3).'/'.self::$type.'.'.__FUNCTION__.'.edit' . $step;
+
+ if($active_check)
+ switch($step){
+ case 'step.1':
+ break;
+ case 'step.0':
+ default:
+ }
+
+
+
+ self::$current =$result;
+ break;
+ /**
+ @remarks calcul for listing in master page module
+ */
+ case 'ab_page':
+
+ $sql="SELECT c.annuaire_id AS id, c.date_added as date_added ".
+ " FROM " . TABLE_ANNUAIRE_TO_CUSTOMERS . " ctc ".
+ " LEFT JOIN " . TABLE_ANNUAIRE . " c ON(c.annuaire_id = ctc.annuaire_id )
+ WHERE ctc.customers_id = '" . (int)$customer_id . "' " . DataForceStatus(" AND c.annuaire_status = '1' ") . " " ;
+
+ self::$history_split = new splitPageResults($sql, MAX_DISPLAY_ANNUAIRE_ACCOUNT_LISTING);
+ $_query = $DB->query(self::$history_split->sql_query);
+ $result = array();
+
+ foreach($_query->fetchAllAssoc() as $row){
+
+ $n = annuaire::get_item($row['id']);
+ $n->date_added = tep_date_short($row['date_added']);
+
+ $result[]=$n;
+ }
+
+ krsort($result);
+ self::$current =$result;
+ break;
+
+ /**
+ @remarks calcul for widget in account master page
+ */
+ default:
+ $query="SELECT c.annuaire_id AS id, c.date_added as date_added ".
+ " FROM " . TABLE_ANNUAIRE_TO_CUSTOMERS . " ctc ".
+ " LEFT JOIN " . TABLE_ANNUAIRE . " c ON(c.annuaire_id = ctc.annuaire_id )
+ WHERE ctc.customers_id = '" . (int)$customer_id . "' " . DataForceStatus(" AND c.annuaire_status = '1' ") . " LIMIT 1 " ;
+
+ $result = $DB->query($query);
+ $tp= $result->fetchAssoc();
+ self::$current =annuaire::get_item($tp['id']);
+ }
+
+
+ /**
+ @remarks use link listing for construct requetes
+ */
+
+ }
+
+ public function repost_values () {
+ // Repost all values that are not arrays
+ foreach ($this->pInfo as $key=>$val) {
+ if (!is_array($this->pInfo[$key])) echo "\n".tep_draw_hidden_field($this->code .'['.$key.']', stripslashes($val))."\n";
+
+ }
+ }
+
+
+
+
+ /**
+ @fn CstrMenu()
+ @brief Prepare menu
+ */
+ public function CstrMenu(){
+ global $page;
+ $customer_id=$page->the_var('customer_id');
+// $this->load_db_values($customer_id);
+
+
+ switch(self::$action){
+ default:
+ $v['title']=__("ac_annuaire menu myaccount link manage");
+ $v['href']= self::href_link(); //tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.self::$type.'&aca_action=display_view', 'SSL');
+ return new objectInfo( array(
+ 'type'=>'menu',
+ 'pile'=>'myaccount',
+ 'conteneur'=>array(new objectInfo($v))
+ ));
+ }
+ }
+
+
+
+ /**
+ * \fn display_view($pID='')
+ * \brief Affiche Block edit/modif reviews
+ * @param $pID int id products
+ * @p $customer_id int current
+ */
+ public function display_view($pID=''){
+ global $page;
+ $customer_id=$page->the_var('customer_id');
+ $this->load_db_values($customer_id);
+
+ $forcepath = substr(__CLASS__, 3);
+
+ switch(self::$action){
+
+ /**
+ @remarks action offline forms in page module
+ */
+ case 'ab_offline':
+ global $page,$language, $navigation,$entry;
+
+ $customer_id=$page->the_var('customer_id');
+ $this->load_db_values($customer_id);
+ self::$account = $page->_call('customer','the_customer');
+
+ self::$display_view_form_title=__('HEADING_TITLE_DELETE_ENTRY');
+
+ if (isset($_GET['id'])) $entry=(!isset($_POST['firstname']))? $this->cInfo->adress_book[$_GET['id']] : $_POST;
+ elseif(isset($_POST['firstname']))$entry= $_POST;
+
+ return new objectInfo(array('title'=>self::$display_view_form_title,'content'=>tep_output_string_protected(tep_get_include_contents($forcepath.'/'.self::$type.'.'.__FUNCTION__.'.offline'),false,true))) ;
+ break;
+
+ /**
+ @remarks action add/edit forms in page module
+ @note in this html gabarit, the call sub html gabarit for curent step
+ */
+ case 'ab_add':
+ case 'ab_edit':
+ global $page,$language, $navigation,$entry;
+
+ $customer_id=$page->the_var('customer_id');
+ $this->load_db_values($customer_id);
+ self::$account = $page->_call('customer','the_customer');
+
+
+ $v['title']=(isset($_GET['id'])? __("ac_annuaire page edit") : __("ac_annuaire page add") );
+ $v['content']=tep_output_string_protected(tep_get_include_contents($forcepath.'/'.self::$type.'.'.__FUNCTION__.'.edit'),false,true);
+ return new objectInfo( $v );
+ break;
+
+ /**
+ @remarks listing in master page module
+ */
+ case 'ab_page':
+ self::$account = $page->_call('customer','the_customer');
+ $customer_id=$page->the_var('customer_id');
+ $this->load_db_values($customer_id);
+
+ $v['title']=__("ac_annuaire page view");
+ $v['content']=tep_output_string_protected(tep_get_include_contents($forcepath.'/'.self::$type.'.'.__FUNCTION__.'.page'),false,true);
+ return new objectInfo( $v );
+ break;
+
+ /**
+ @remarks widget in account master page
+ */
+ default:
+ $v['title']=__("ac_annuaire widget view");
+ $v['href']= self::href_link();
+ $v['content']=tep_output_string_protected(tep_get_include_contents($forcepath.'/'.self::$type.'.'.'box_view'),false,true);
+ return new objectInfo(array(
+ 'type'=>'box',
+ 'conteneur'=>array(new objectInfo( $v ))
+ ));
+
+ }
+ }
+
+
+
+ /**
+ @brief internal link
+ @param classic action
+ @param other paams by strign GET format
+ @return href
+ */
+ static function href_link($action='', $params=''){
+ $base = 'aca_mod='.__CLASS__.'&aca_type='.self::$type.'&aca_action=';
+ switch ($action) {
+
+ /**
+ @remarks action forms in page module
+ */
+ case 'offline':
+ case 'edit':
+ $base .='display_view&action=ab_'.$action.'&'.$params;
+ break;
+
+ /**
+ @remarks listing in master page module
+ */
+ case 'page':
+ $base .='display_view';
+ break;
+
+ /**
+ @remarks widget in account master page
+ */
+ default:
+ $base .='display_view'. ((!empty($action))?'&action=ab_'.$action : '');
+ }
+
+
+ return tep_href_link(FILENAME_ACCOUNT, $base, 'SSL');
+ }
+
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+
+?>
\ 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...> - 2012-04-17 13:51:23
|
Revision: 4254
http://oscss.svn.sourceforge.net/oscss/?rev=4254&view=rev
Author: oscim
Date: 2012-04-17 13:51:14 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Modification de l'arborescance et deport des boxes dans le dossier template/defaut
Ce nouveau dossier va ainsi ce completer des element structurel d'affichage et de sortie. L'ordonnancement des sur-charge n'est pas modifi?\195?\169 .
Added Paths:
-----------
trunk/catalog/templates/defaut/
trunk/catalog/templates/defaut/includes/
trunk/catalog/templates/defaut/includes/boxes/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-17 13:50:44
|
Revision: 4253
http://oscss.svn.sourceforge.net/oscss/?rev=4253&view=rev
Author: oscim
Date: 2012-04-17 13:50:33 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Ajutstement chemin dans les configures
Modified Paths:
--------------
trunk/catalog/install/includes/modele/admin_configure.txt
trunk/catalog/install/includes/modele/configure.txt
Modified: trunk/catalog/install/includes/modele/admin_configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/admin_configure.txt 2012-04-17 13:49:32 UTC (rev 4252)
+++ trunk/catalog/install/includes/modele/admin_configure.txt 2012-04-17 13:50:33 UTC (rev 4253)
@@ -82,6 +82,8 @@
// Template System files
define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
define('DIR_WS_TEMPLATES', DIR_WS_CATALOG . 'templates/');
+ define('DEFAULT_TEMPLATE_NAME', 'defaut');
+
define('DIR_WS_CATALOG_DOWNLOAD', DIR_WS_CATALOG . 'download/');
// Common
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2012-04-17 13:49:32 UTC (rev 4252)
+++ trunk/catalog/install/includes/modele/configure.txt 2012-04-17 13:50:33 UTC (rev 4253)
@@ -72,6 +72,7 @@
// Template System files
define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
define('DIR_WS_TEMPLATES', 'templates/');
+ define('DEFAULT_TEMPLATE_NAME', 'defaut');
// Common
define('DIR_WS_COMMON', 'common/');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-17 13:49:43
|
Revision: 4252
http://oscss.svn.sourceforge.net/oscss/?rev=4252&view=rev
Author: oscim
Date: 2012-04-17 13:49:32 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Ajutement changement de path pour les boxes
Modified Paths:
--------------
trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php
Modified: trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php
===================================================================
--- trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php 2012-04-17 13:44:00 UTC (rev 4251)
+++ trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php 2012-04-17 13:49:32 UTC (rev 4252)
@@ -59,8 +59,8 @@
if($cache && OSCSS_DEBUG == false){
$cache = page::GetCacheVar();
if(!isset($cache['boxes'][self::$_key])) {
- include($path);
- page::AddCacheVar('boxes',self::$_key,$array);
+ include($path);
+ page::AddCacheVar('boxes',self::$_key,$array);
}
else $array=$cache['boxes'][self::$_key];
}
@@ -83,10 +83,12 @@
*/
private function boxes($file_to_display,$type='std',$opt) {
global $page, $PHP_SELF, $request_type,$language, $lang;
+
$name_clean=(strchr($file_to_display,'.')==$page->ext)? substr($file_to_display,0,strlen($file_to_display)-4) :$file_to_display ;
+
if (!is_array($opt)) $opt=array();
- /* Force une taille d'image par defaut pour les images, si aucunne n'est pr�cis� */
+ /* Force une taille d'image par defaut pour les images, si aucunne n'est precise */
if (!isset($opt['img'])) $opt['img']=array('width'=>$page->the_var('SIDEBAR_IMG_WIDTH'),'height'=>$page->the_var('SIDEBAR_IMG_HEIGHT'));
if (!isset($opt['img']['width'])) $opt['img']['width']=$page->the_var('SIDEBAR_IMG_WIDTH');
if (!isset($opt['img']['height'])) $opt['img']['height']=$page->the_var('SIDEBAR_IMG_HEIGHT');
@@ -98,7 +100,7 @@
if (page::TestFile(sprintf($filename,'plugins/'))) $path =sprintf($filename,'plugins/');
elseif (page::TestFile(sprintf($filename,'boxes/'))) $path =sprintf($filename,'boxes/');
- elseif (page::TestFile(DIR_WS_BOXES . $name_clean.$page->ext)) $path = (DIR_WS_BOXES . $name_clean.$page->ext);
+ elseif (page::TestFile(DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/'.DIR_WS_BOXES . $name_clean.$page->ext)) $path = (DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME .'/'. DIR_WS_BOXES . $name_clean.$page->ext);
else return false;
if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/boxes/' . $name_clean.$page->ext,true)) !=false) $page->pile_file_lang($path_lg);
@@ -125,7 +127,7 @@
global $page, $PHP_SELF, $request_type, $lang;
if (!is_array($opt)) $opt=array();
- /** Force une taille d'image par defaut pour les images, si aucunne n'est pr�cis� */
+ /** Force une taille d'image par defaut pour les images, si aucunne n'est precise */
if (!isset($opt['img'])) $opt['img']=array('width'=>$page->the_var('SIDEBAR_IMG_WIDTH'),'height'=>$page->the_var('SIDEBAR_IMG_HEIGHT'));
if (!isset($opt['img']['width'])) $opt['img']['width']=$page->the_var('SIDEBAR_IMG_WIDTH');
if (!isset($opt['img']['height'])) $opt['img']['height']=$page->the_var('SIDEBAR_IMG_HEIGHT');
@@ -157,24 +159,30 @@
if(!empty($type) && !empty($boxe)) {
$key=(strchr($boxe,'.')==$page->ext)? substr($boxe,0,strlen($boxe)-4) :$boxe ;
+
if (isset($page->page['boxes'][$type]) && isset($page->page['boxes']['list'][$key]) && isset($page->page['boxes'][$type][$key]) && $page->page['boxes'][$type][$key] !='false')
return $page->page['boxes']['list'][$key]->path;
- else return false;
+
+ else
+ return false;
}
elseif(!empty($type) && empty($boxe)){
if( isset($page->page['boxes'][$type]) ){
- foreach($page->page['boxes']['sort'] as $k=>$v)
- if(isset($page->page['boxes'][$type][$k]))$s[$k]=$page->page['boxes']['list'][$k];
- return $s;
+ foreach($page->page['boxes']['sort'] as $k=>$v)
+ if(isset($page->page['boxes'][$type][$k]))$s[$k]=$page->page['boxes']['list'][$k];
+ return $s;
}
else return array();
}
elseif(empty($type) && !empty($boxe)) {
$key=(strchr($boxe,'.')==$page->ext)? substr($boxe,0,strlen($boxe)-4) :$boxe ;
- if (isset($page->page['boxes']['std'][$key]) && $page->page['boxes']['std'][$key] !='false') return $page->page['boxes']['list'][$key]->path;
+ if (isset($page->page['boxes']['std'][$key]) && $page->page['boxes']['std'][$key] !='false')
+ return $page->page['boxes']['list'][$key]->path;
+
foreach($page->page['boxes']['sort'] as $k=>$v)
- if (isset($page->page['boxes'][$k][$key]) && $page->page['boxes'][$k][$key] !='false') return $page->page['boxes']['list'][$key]->path;
+ if (isset($page->page['boxes'][$k][$key]) && $page->page['boxes'][$k][$key] !='false')
+ return $page->page['boxes']['list'][$key]->path;
// while($r=each($page->page['boxes'])){
// if (isset($page->page['boxes'][$r['key']][$key]) && $page->page['boxes'][$r['key']][$key] !='false') return $page->page['boxes']['list'][$key]->path;
// }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-17 13:44:10
|
Revision: 4251
http://oscss.svn.sourceforge.net/oscss/?rev=4251&view=rev
Author: oscim
Date: 2012-04-17 13:44:00 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Modification de l'arborescance et deport des boxes dans le dossier template/defaut
Ce nouveau dossier va ainsi ce completer des element structurel d'affichage et de sortie. L'ordonnancement des sur-charge n'est pas modifi?\195?\169 .
Removed Paths:
-------------
trunk/catalog/includes/boxes/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-17 12:42:46
|
Revision: 4250
http://oscss.svn.sourceforge.net/oscss/?rev=4250&view=rev
Author: oscim
Date: 2012-04-17 12:42:34 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
suppression gabarit deport?\195?\169
Removed Paths:
-------------
trunk/catalog/includes/gabarit/history.display_view.gab
Deleted: trunk/catalog/includes/gabarit/history.display_view.gab
===================================================================
--- trunk/catalog/includes/gabarit/history.display_view.gab 2012-04-17 12:37:11 UTC (rev 4249)
+++ trunk/catalog/includes/gabarit/history.display_view.gab 2012-04-17 12:42:34 UTC (rev 4250)
@@ -1,71 +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.1
- @date 16/12/11, 21:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief This listing orders for module account/history
-*/
-global $language,$customer_id;
-?>
-<div class="main-history">
-
- <?php if (count(history::$current) > 0): ?>
-
- <?php foreach(history::$current as $row): ?>
- <dl class="orderHistory">
- <dt>
- <?php echo __('history text order number') . $row->orders_prefix.$row->orders_id; ?>
-
- </dt>
- <dd>
- <?php echo __('history text order status') . $row->orders_status_name; ?>
- </dd>
- <dd>
- <?php echo __('history text order date') . $row->date_purchased ;?>
- </dd>
- <dd>
- <?php echo $order_type . tep_output_string_protected($order_name); ?>
- </dd>
- <dd>
- <?php echo __('history text order products') . $row->count_products ;?>
- </dd>
- <dd>
- <?php echo __('history text order cost') . strip_tags($row->order_total); ?>
- </dd>
- <dd>
- <span class="linkView">
- <a class="navBtMini" href="<?php echo $row->linkView ?>" >
- <?php echo __('history small image button view'); ?>
- </a>
- </span>
- <?php if($row->linkPdf !=false): ?>
- <!-- pdf link -->
- <span class="linkPdf">
- <a class="linkPdf" href="<?php echo $row->linkPdf ?>">
- <?php echo __('history pdf link') ?>
- </a>
- </span>
- <?php endif ?>
- </dd>
- </dl>
- <?php endforeach; ?>
-
- <div id="splitPageBottom" class="split">
- <p class="sP1"><?php echo history::$history_split->display_count(__('history text display number of orders %s')); ?></p>
- <p class="sP2"><?php echo __('history text result page') . ' ' . history::$history_split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></p>
- </div>
-
- <?php else : ?>
- <p class="infoText"><?php echo TEXT_NO_PURCHASES; ?></p>
- <?php endif; ?>
-
-
- <div class="navBt">
- <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
- </div>
-
-</div>
\ 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...> - 2012-04-17 12:37:23
|
Revision: 4249
http://oscss.svn.sourceforge.net/oscss/?rev=4249&view=rev
Author: oscim
Date: 2012-04-17 12:37:11 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Mise a niveau du code
deport gabarit history
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php
trunk/catalog/admin/includes/modules/pages/services.php
trunk/catalog/admin/includes/modules/pages/shipping.php
trunk/catalog/includes/languages/fr_FR/modules/account/history.txt
trunk/catalog/includes/modules/account/address_book.php
trunk/catalog/includes/modules/account/history.php
trunk/catalog/includes/modules/products/desc_base.php
Added Paths:
-----------
trunk/catalog/includes/gabarit/history/account.display_view.page.gab
Modified: trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php 2012-04-17 12:05:58 UTC (rev 4248)
+++ trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php 2012-04-17 12:37:11 UTC (rev 4249)
@@ -487,12 +487,54 @@
}
-/** Interface module */
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
function remove() { return false; }
- function keys() { return false; }
}
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/services.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/services.php 2012-04-17 12:05:58 UTC (rev 4248)
+++ trunk/catalog/admin/includes/modules/pages/services.php 2012-04-17 12:37:11 UTC (rev 4249)
@@ -789,13 +789,54 @@
return self::FILENAME;
}
- /**
- @depend InterfaceModule
- */
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
function remove() { return false; }
- function keys() { return false; }
}
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/shipping.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/shipping.php 2012-04-17 12:05:58 UTC (rev 4248)
+++ trunk/catalog/admin/includes/modules/pages/shipping.php 2012-04-17 12:37:11 UTC (rev 4249)
@@ -779,13 +779,54 @@
return self::FILENAME;
}
- /**
- @depend InterfaceModule
- */
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
function remove() { return false; }
- function keys() { return false; }
}
?>
\ No newline at end of file
Added: trunk/catalog/includes/gabarit/history/account.display_view.page.gab
===================================================================
--- trunk/catalog/includes/gabarit/history/account.display_view.page.gab (rev 0)
+++ trunk/catalog/includes/gabarit/history/account.display_view.page.gab 2012-04-17 12:37:11 UTC (rev 4249)
@@ -0,0 +1,72 @@
+<?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.1
+ @date 16/12/11, 21:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief This listing orders for module account/history
+*/
+global $language,$customer_id;
+?>
+<div class="main-history">
+
+ <?php if (count(history::$current) > 0): ?>
+
+
+ <table>
+ <thead>
+ <tr>
+ <th><?php echo __('history table heading order number'); ?></th>
+ <th><?php echo __('history table heading order status'); ?></th>
+ <th><?php echo __('history table heading order date'); ?></th>
+ <th><?php echo __('history table heading order products'); ?></th>
+ <th><?php echo __('history table heading order cost'); ?></th>
+ <th><?php echo __('history table heading order action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(history::$current as $row): ?>
+ <tr>
+ <td><?php echo $row->orders_prefix.$row->orders_id; ?></td>
+ <td><?php echo $row->orders_status_name; ?></td>
+ <td><?php echo $row->date_purchased ; ?></td>
+ <td><?php echo $row->count_products; ?></td>
+ <td><?php echo strip_tags($row->order_total); ?></td>
+ <td>
+ <span class="linkView">
+ <a class="navBtMini" href="<?php echo $row->linkView ?>" >
+ <?php echo __('history small image button view'); ?>
+ </a>
+ </span>
+ <?php if($row->linkPdf !=false): ?>
+ <!-- pdf link -->
+ <span class="linkPdf">
+ <a class="linkPdf" href="<?php echo $row->linkPdf ?>">
+ <?php echo __('history pdf link') ?>
+ </a>
+ </span>
+ <?php endif ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+ <div id="splitPageBottom" class="split">
+ <p class="sP1"><?php echo history::$history_split->display_count(__('history text display number of orders %s')); ?></p>
+ <p class="sP2"><?php echo __('history text result page') . ' ' . history::$history_split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></p>
+ </div>
+
+ <?php else : ?>
+ <p class="infoText"><?php echo __('history no resultat orders'); ?></p>
+ <?php endif; ?>
+
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+
+</div>
\ No newline at end of file
Modified: trunk/catalog/includes/languages/fr_FR/modules/account/history.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/modules/account/history.txt 2012-04-17 12:05:58 UTC (rev 4248)
+++ trunk/catalog/includes/languages/fr_FR/modules/account/history.txt 2012-04-17 12:37:11 UTC (rev 4249)
@@ -4,28 +4,32 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 15/04/2012, 22:44
+ @date 16/04/2012, 22:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-// $lang['history tab']="Voir mes anciennes commandes" ;
+ /* Bouton/liens */
+ $lang['history small image button view']="Afficher" ;
+ $lang['history pdf link']="Pdf" ;
-$lang['history widget view']="Toutes mes commandes" ;
+ /* Widget */
+ $lang['history widget view']="Toutes mes commandes" ;
-$lang['history heading listing']="Historique des Commandes" ;
-$lang['history text order number']="Numéro de commande : " ;
-$lang['history text order status']="Statut de la commande : " ;
-$lang['history text order date']="Date de la commande : " ;
-$lang['history text order products']="Produit(s) : " ;
-$lang['history text order cost']="Coût de la commande : " ;
+ /* Pleine page */
+ $lang['history heading listing']="Historique des Commandes" ;
+ $lang['history table heading order number']="Numéro" ;
+ $lang['history table heading order status']="Etat" ;
+ $lang['history table heading order date']="Date" ;
+ $lang['history table heading order products']="Produit(s)" ;
+ $lang['history table heading order cost']="Coût" ;
+ $lang['history table heading order action']="" ;
-$lang['history small image button view']="Afficher" ;
-$lang['history pdf link']="Pdf" ;
+ $lang['history text display number of orders %s']="Affichage de la page %s" ;
+ $lang['history text result page']="Nombre de pages " ;
+ $lang['history no resultat orders']="Aucunes commandes " ;
-$lang['history text result %s']="result %s" ;
-
?>
\ No newline at end of file
Modified: trunk/catalog/includes/modules/account/address_book.php
===================================================================
--- trunk/catalog/includes/modules/account/address_book.php 2012-04-17 12:05:58 UTC (rev 4248)
+++ trunk/catalog/includes/modules/account/address_book.php 2012-04-17 12:37:11 UTC (rev 4249)
@@ -363,11 +363,54 @@
-/** implements InterfaceModule depend */
- public function check() {}
- public function install() {}
- public function remove() {}
- public function keys() {}
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
}
?>
\ No newline at end of file
Modified: trunk/catalog/includes/modules/account/history.php
===================================================================
--- trunk/catalog/includes/modules/account/history.php 2012-04-17 12:05:58 UTC (rev 4248)
+++ trunk/catalog/includes/modules/account/history.php 2012-04-17 12:37:11 UTC (rev 4249)
@@ -186,7 +186,7 @@
return new objectInfo(array(
'title'=>__("history heading listing"),
- 'content'=> tep_output_string_protected(tep_get_include_contents(__CLASS__.'.'.__FUNCTION__),false,true)
+ 'content'=> tep_output_string_protected(tep_get_include_contents(__CLASS__.'/'.$this->type.'.'.__FUNCTION__.'.page'),false,true)
) );
break;
default:
@@ -218,11 +218,54 @@
-/** implements InterfaceModule depend */
- public function check() {}
- public function install() {}
- public function remove() {}
- public function keys() {}
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
}
?>
\ No newline at end of file
Modified: trunk/catalog/includes/modules/products/desc_base.php
===================================================================
--- trunk/catalog/includes/modules/products/desc_base.php 2012-04-17 12:05:58 UTC (rev 4248)
+++ trunk/catalog/includes/modules/products/desc_base.php 2012-04-17 12:37:11 UTC (rev 4249)
@@ -93,10 +93,53 @@
return array(new objectInfo($v));
}
-/** implements InterfaceModule depend */
- public function check() {}
- public function install() {}
- public function remove() {}
- public function keys() {}
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array();
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
}
?>
\ 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...> - 2012-04-17 12:06:09
|
Revision: 4248
http://oscss.svn.sourceforge.net/oscss/?rev=4248&view=rev
Author: oscim
Date: 2012-04-17 12:05:58 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
correction coquille visuel et text fr manquant
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt
Modified: trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab 2012-04-17 09:17:57 UTC (rev 4247)
+++ trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab 2012-04-17 12:05:58 UTC (rev 4248)
@@ -4,19 +4,17 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 02/03/2012, 20:48
+ @date 16/04/2012, 20:48
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
global $oscss;
?>
-<h3><?php echo __('heading title') ?></h3>
+<h3><?php echo __('heading title '.((newsletters::$action == 'edit')?'edit' : 'new') ) ?></h3>
<?php echo tep_draw_form('newsletter', newsletters::FILENAME, 'action='.((newsletters::$action == 'edit')?'update' : 'insert') , 'post' ); ?>
<div class="box_left">
- <p><?php if (newsletters::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', newsletters::$nID); ?></p>
-
<div id="tabs">
<ul>
<li><a href="#tabs-1"><?php echo __('text tab content') ?></a></li>
@@ -34,7 +32,7 @@
<p class="block_input">
<label for="title" title="<?php echo __('text newsletter title help') ; ?>"> <?php echo __('text newsletter title') . tep_image(DIR_WS_ICONS.'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('title', '', newsletters::$nInfo->title, '', true); ?>
+ <?php echo tep_draw_input_field('title', '', newsletters::$nInfo->title, ' style="width:80%"', true); ?>
</p>
<div class="block_input">
@@ -59,15 +57,13 @@
<fieldset class="block_field">
<legend><?php echo __('text newsletter module'); ?></legend>
<p class="block_input">
- <label for="module" title="<?php echo __('text newsletter module help') ; ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_help.gif'); ?> </label>
- <?php echo tep_draw_pull_down_menu('module', newsletters::list_module_newsletters(), newsletters::$nInfo->module); ?>
+ <?php echo tep_draw_pull_down_menu('module', newsletters::list_module_newsletters(), newsletters::$nInfo->module, ' title="'.__('text newsletter module help').'" '); ?>
</p>
</fieldset>
<fieldset class="block_field">
<legend><?php echo __('text newsletter modele'); ?></legend>
<p class="block_input">
- <label for="module" title="<?php echo __('text newsletter modele help') ; ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_help.gif'); ?> </label>
- <?php echo tep_draw_pull_down_menu('modele_id', newsletters::list_modele_newsletters(), newsletters::$nInfo->modele_id); ?>
+ <?php echo tep_draw_pull_down_menu('modele_id', newsletters::list_modele_newsletters(), newsletters::$nInfo->modele_id, ' title="'.__('text newsletter modele help').'" '); ?>
</p>
</fieldset>
@@ -92,6 +88,7 @@
<div class="button_nav">
<?php echo ((newsletters::$action == 'new') ? tep_image_submit('button_save.gif', IMAGE_SAVE) : tep_image_submit('button_update.gif', IMAGE_UPDATE));
echo '<a class="button" href="' . tep_href_link(newsletters::FILENAME) . '">' . IMAGE_CANCEL . '</a>'; ?>
+<?php if (newsletters::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', newsletters::$nID); ?>
</div>
</div>
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt 2012-04-17 09:17:57 UTC (rev 4247)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt 2012-04-17 12:05:58 UTC (rev 4248)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 02/03/2012, 16:05
+ @date 16/04/2012, 16:05
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -49,8 +49,14 @@
$lang['text inline newsletter moyn view_online']="Moyenne ouvert en ligne :";
/* Edit */
+ $lang['heading title edit']="Editer un bulletin d'informations" ;
+ $lang['heading title new']="Créer un bulletin d'informations" ;
$lang['text tab content']="Edition";
$lang['text tab module']="Apercu";
+
+ $lang['text newsletter modele']="Choix du modèle";
+ $lang['text newsletter modele help']="Le modèle correspond à la mise en forme de votre bulletin";
+ $lang['not use modele']="Ne pas utiliser de modèle";
$lang['text newsletter replace']="Remplacement ";
$lang['text newsletter replace in mail']="Vous pouver utiliser les mot clefs ci-dessous, ils seront remplacés par leur valeur";
$lang['type tag text user']="les tags associé aux clients";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-17 09:18:08
|
Revision: 4247
http://oscss.svn.sourceforge.net/oscss/?rev=4247&view=rev
Author: oscim
Date: 2012-04-17 09:17:57 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Suppression des widget obsolete
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastmodified.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastnews.txt
trunk/catalog/admin/includes/widget/orderLastmodified.php
trunk/catalog/admin/includes/widget/orderLastnews.php
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastmodified.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastmodified.txt 2012-04-17 09:17:32 UTC (rev 4246)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastmodified.txt 2012-04-17 09:17:57 UTC (rev 4247)
@@ -1,17 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 0203/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['orderLastmodified box title']="Les dernière commandes modifiées" ;
-$lang['orderLastmodified box reference']="Réf." ;
-$lang['orderLastmodified box docs']="Doc." ;
-$lang['orderLastmodified box customers']="Clients" ;
-$lang['orderLastmodified box date']="date" ;
-$lang['orderLastmodified box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastnews.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastnews.txt 2012-04-17 09:17:32 UTC (rev 4246)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastnews.txt 2012-04-17 09:17:57 UTC (rev 4247)
@@ -1,17 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 0203/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['orderLastnews box title']="Les nouvelles commandes" ;
-$lang['orderLastnews box reference']="Réf." ;
-$lang['orderLastnews box docs']="Doc." ;
-$lang['orderLastnews box customers']="Clients" ;
-$lang['orderLastnews box date']="date" ;
-$lang['orderLastnews box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/orderLastmodified.php
===================================================================
--- trunk/catalog/admin/includes/widget/orderLastmodified.php 2012-04-17 09:17:32 UTC (rev 4246)
+++ trunk/catalog/admin/includes/widget/orderLastmodified.php 2012-04-17 09:17:57 UTC (rev 4247)
@@ -1,43 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 0203/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT o.*, status_name FROM " . TABLE_ORDERS . " o LEFT JOIN " . TABLE_STATUS . " s ON(s.status_id=o.orders_status AND status_type='orders' AND language_id = '" . $languages_id . "') ORDER BY last_modified DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-?>
-<div id="orderLastmodified" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('orderLastmodified box title'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('orderLastmodified box reference'); ?></th>
- <th><?php echo __('orderLastmodified box docs'); ?></th>
- <th><?php echo __('orderLastmodified box customers'); ?></th>
- <th><?php echo __('orderLastmodified box date'); ?></th>
- <th><?php echo __('orderLastmodified box status'); ?></th>
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td><strong><a href="<?php echo tep_href_link(FILENAME_ORDERS, 'oID='.$row['orders_id'].'&action=edit') ?>"><?php echo $row['orders_prefix'].$row['orders_id'] ?></strong></td>
- <td>
- <?php if(( $filepath=$datadocs->GetDoc('packingslip', $row['orders_id'] )) && file_exists($filepath)): ?>
- <a href="<?php echo tep_href_link('document.php', 'mod=packingslip&id='. $row['orders_id']) ?>"><?php echo basename($filepath) ?></a>
- <?php endif; ?>
- </td>
- <td style="width:200px;"><?php echo tep_customers_row_action($row['customers_id'], array()) ?></td>
- <td><?php echo tep_date_short($row['last_modified']) ?></td>
- <td><?php echo $row['status_name'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/orderLastnews.php
===================================================================
--- trunk/catalog/admin/includes/widget/orderLastnews.php 2012-04-17 09:17:32 UTC (rev 4246)
+++ trunk/catalog/admin/includes/widget/orderLastnews.php 2012-04-17 09:17:57 UTC (rev 4247)
@@ -1,43 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 0203/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT o.*, status_name FROM " . TABLE_ORDERS . " o LEFT JOIN " . TABLE_STATUS . " s ON(s.status_id=o.orders_status AND status_type='orders' AND language_id = '" . $languages_id . "') ORDER BY date_purchased DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-?>
-<div id="orderLastnews" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('orderLastnews box title'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('orderLastnews box reference'); ?></th>
- <th><?php echo __('orderLastnews box docs'); ?></th>
- <th><?php echo __('orderLastnews box customers'); ?></th>
- <th><?php echo __('orderLastnews box date'); ?></th>
- <th><?php echo __('orderLastnews box status'); ?></th>
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td><strong><a href="<?php echo tep_href_link(FILENAME_ORDERS, 'oID='.$row['orders_id'].'&action=edit') ?>"><?php echo $row['orders_prefix'].$row['orders_id'] ?></strong></td>
- <td>
- <?php if(( $filepath=$datadocs->GetDoc('packingslip', $row['orders_id'] )) && file_exists($filepath)): ?>
- <a href="<?php echo tep_href_link('document.php', 'mod=packingslip&id='. $row['orders_id']) ?>"><?php echo basename($filepath) ?></a>
- <?php endif; ?>
- </td>
- <td style="width:200px;"><?php echo tep_customers_row_action($row['customers_id'], array()) ?></td>
- <td><?php echo tep_date_short($row['date_purchased']) ?></td>
- <td><?php echo $row['status_name'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ 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...> - 2012-04-17 09:17:43
|
Revision: 4246
http://oscss.svn.sourceforge.net/oscss/?rev=4246&view=rev
Author: oscim
Date: 2012-04-17 09:17:32 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Centralisation des widget des dernieres commandes
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/widget/orderLast.txt
trunk/catalog/admin/includes/widget/orderLast.php
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-16 19:07:22 UTC (rev 4245)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-17 09:17:32 UTC (rev 4246)
@@ -144,7 +144,7 @@
</left>
<right>
<widget class="graph" querystring="Sales">salesStats</widget>
- <widget>orderLastnews</widget>
+ <widget>orderLast</widget>
</right>
</home>
@@ -174,14 +174,12 @@
<orders>
<left>
- <widget>orderLastnews</widget>
+ <widget>orderLast</widget>
<widget>orderLastshipp</widget>
<widget>orderLastinvoice</widget>
- <widget>orderStats</widget>
</left>
<right>
<widget class="graph" querystring="Sales">salesStats</widget>
- <widget>orderLastmodified</widget>
<widget>orderLastservice</widget>
</right>
@@ -198,22 +196,20 @@
<shipping>
<left>
- <widget>orderLastnews</widget>
<widget>orderLastshipp</widget>
</left>
<right>
- <widget class="graph" querystring="Sales">salesStats</widget>
+ <widget>orderLast</widget>
</right>
</shipping>
<services>
<left>
- <widget>orderLastnews</widget>
<widget>orderLastservice</widget>
</left>
<right>
- <widget class="graph" querystring="Sales">salesStats</widget>
+ <widget>orderLast</widget>
</right>
</services>
Added: trunk/catalog/admin/includes/languages/fr_FR/widget/orderLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/orderLast.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/orderLast.txt 2012-04-17 09:17:32 UTC (rev 4246)
@@ -0,0 +1,22 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 0203/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['orderLast box title']="Commandes" ;
+
+$lang['orderLast tab added']="Nouvelles" ;
+$lang['orderLast tab updated']="Modifiées" ;
+
+
+$lang['orderLast box reference']="Réf." ;
+$lang['orderLast box docs']="Doc." ;
+$lang['orderLast box customers']="Clients" ;
+$lang['orderLast box date']="date" ;
+$lang['orderLast box status']="Etat" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/widget/orderLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/orderLast.php (rev 0)
+++ trunk/catalog/admin/includes/widget/orderLast.php 2012-04-17 09:17:32 UTC (rev 4246)
@@ -0,0 +1,89 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 0203/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $conf;
+
+$_query = tep_db_query("SELECT o.*, status_name FROM " . TABLE_ORDERS . " o LEFT JOIN " . TABLE_STATUS . " s ON(s.status_id=o.orders_status AND status_type='orders' AND language_id = '" . $languages_id . "') ORDER BY date_purchased DESC LIMIT ".$conf->widget_max_line);
+
+$_query2 = tep_db_query("SELECT o.*, status_name FROM " . TABLE_ORDERS . " o LEFT JOIN " . TABLE_STATUS . " s ON(s.status_id=o.orders_status AND status_type='orders' AND language_id = '" . $languages_id . "') ORDER BY last_modified DESC LIMIT ".$conf->widget_max_line);
+
+
+$add = ( !$_query->__get('numRows') ) ? false : true ;
+$up = ( !$_query2->__get('numRows') ) ? false : true ;
+
+
+if( !$up && !$add )
+ return false;
+
+$datadocs=new DatasFiles;
+?>
+<div id="orderLast" class="<?php echo $widg['class'] ?>">
+<h3><?php echo __('orderLast box title'); ?></h3>
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('orderLast tab added'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('orderLast tab updated'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('orderLast box reference'); ?></th>
+ <th><?php echo __('orderLast box docs'); ?></th>
+ <th><?php echo __('orderLast box customers'); ?></th>
+ <th><?php echo __('orderLast box date'); ?></th>
+ <th><?php echo __('orderLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_ORDERS, 'oID='.$row['orders_id'].'&action=edit') ?>"><?php echo $row['orders_prefix'].$row['orders_id'] ?></strong></td>
+ <td class="tcenter">
+ <?php if(( $filepath=$datadocs->GetDoc('packingslip', $row['orders_id'] )) && file_exists($filepath)): ?>
+ <a href="<?php echo tep_href_link('document.php', 'mod=packingslip&id='. $row['orders_id']) ?>"><?php echo basename($filepath) ?></a>
+ <?php endif; ?>
+ </td>
+ <td style="width:200px;"><?php echo tep_customers_row_action($row['customers_id'], array()) ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['date_purchased']) ?></td>
+ <td class="tcenter"><?php echo $row['status_name'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+
+ <div id="tabs-2" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('orderLast box reference'); ?></th>
+ <th><?php echo __('orderLast box docs'); ?></th>
+ <th><?php echo __('orderLast box customers'); ?></th>
+ <th><?php echo __('orderLast box date'); ?></th>
+ <th><?php echo __('orderLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query2->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_ORDERS, 'oID='.$row['orders_id'].'&action=edit') ?>"><?php echo $row['orders_prefix'].$row['orders_id'] ?></strong></td>
+ <td class="tcenter">
+ <?php if(( $filepath=$datadocs->GetDoc('packingslip', $row['orders_id'] )) && file_exists($filepath)): ?>
+ <a href="<?php echo tep_href_link('document.php', 'mod=packingslip&id='. $row['orders_id']) ?>"><?php echo basename($filepath) ?></a>
+ <?php endif; ?>
+ </td>
+ <td style="width:200px;"><?php echo tep_customers_row_action($row['customers_id'], array()) ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['last_modified']) ?></td>
+ <td class="tcenter"><?php echo $row['status_name'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+ </div>
+</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
