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-12 20:54:18
|
Revision: 4220
http://oscss.svn.sourceforge.net/oscss/?rev=4220&view=rev
Author: oscim
Date: 2012-04-12 20:54:12 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Suite amelioration widget, centralisation des panneau associ?\195?\169 adminuser
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersLast.txt
trunk/catalog/admin/includes/widget/AdminUsersLast.php
Added: trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersLast.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersLast.txt 2012-04-12 20:54:12 UTC (rev 4220)
@@ -0,0 +1,23 @@
+<?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 02/03/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['AdminUsersLast heading']="Utilisateurs privé" ;
+
+$lang['AdminUsersLast tab added']="Creer" ;
+$lang['AdminUsersLast tab updated']="Modifié" ;
+
+
+$lang['AdminUsersLast box reference']="Réf." ;
+$lang['AdminUsersLast box title']="Nom" ;
+$lang['AdminUsersLast box date']="Crées le" ;
+$lang['AdminUsersLast box date up']="Modifiés le" ;
+$lang['AdminUsersLast box status']="Etat" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/widget/AdminUsersLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/AdminUsersLast.php (rev 0)
+++ trunk/catalog/admin/includes/widget/AdminUsersLast.php 2012-04-12 20:54:12 UTC (rev 4220)
@@ -0,0 +1,73 @@
+<?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 02/03/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $languages_id, $conf;
+
+
+$_query = tep_db_query("SELECT *, CONCAT(admin_firstname , ' ', admin_lastname) as name, admin_created as date FROM " . TABLE_ADMIN_USERS . " n ORDER BY admin_created DESC LIMIT ".$conf->widget_max_line);
+
+$_query2 = tep_db_query("SELECT *, CONCAT(admin_firstname , ' ', admin_lastname) as name, admin_modified as date FROM " . TABLE_ADMIN_USERS . " n WHERE admin_modified >'2000' ORDER BY admin_modified DESC LIMIT ".$conf->widget_max_line);
+
+$add = ( !$_query->__get('numRows') ) ? false : true ;
+$up = ( !$_query2->__get('numRows') ) ? false : true ;
+
+if( !$up && !$add )
+ return false;
+
+?>
+<div id="AdminUsersLast" class="<?php echo $widg['class'] ?>">
+<h3><?php echo __('AdminUsersLast heading'); ?></h3>
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('AdminUsersLast tab added'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('AdminUsersLast tab updated'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('AdminUsersLast box reference'); ?></th>
+ <th><?php echo __('AdminUsersLast box title'); ?></th>
+ <th><?php echo __('AdminUsersLast box date'); ?></th>
+ <!-- <th><?php //echo __('AdminUsersLast box status'); ?></th> -->
+ </tr>
+ <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_ADMINUSERS, 'mID='.$row['admin_id'].'&action=edit') ?>"><?php echo $row['admin_id'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['name'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['date']) ?></td>
+ <!-- <td class="tcenter"><?php //echo $row['status'] ?></td> -->
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+ <div id="tabs-2" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('AdminUsersLast box reference'); ?></th>
+ <th><?php echo __('AdminUsersLast box title'); ?></th>
+ <th><?php echo __('AdminUsersLast box date up'); ?></th>
+ <!-- <th><?php //echo __('AdminUsersLast box status'); ?></th> -->
+ </tr>
+ <?php foreach($_query2->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_ADMINUSERS, 'mID='.$row['admin_id'].'&action=edit') ?>"><?php echo $row['admin_id'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['name'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['date']) ?></td>
+ <!-- <td class="tcenter"><?php //echo $row['status'] ?></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.
|
|
From: <os...@us...> - 2012-04-12 20:52:35
|
Revision: 4219
http://oscss.svn.sourceforge.net/oscss/?rev=4219&view=rev
Author: oscim
Date: 2012-04-12 20:52:28 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Ajustement pour ne pas bloquer l'install en cas de l'absence du groupe parend_id, et force l'id sur 0
Modified Paths:
--------------
trunk/catalog/admin/includes/exts/package/tags/config.php
Modified: trunk/catalog/admin/includes/exts/package/tags/config.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/config.php 2012-04-12 18:21:30 UTC (rev 4218)
+++ trunk/catalog/admin/includes/exts/package/tags/config.php 2012-04-12 20:52:28 UTC (rev 4219)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@original author Vlad Savitsky
@Support: http://forums.oscommerce.com/index.php?showuser=20490, http://forums.oscommerce.com/index.php?showtopic=156667
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 24/07/10, 18:07
+ @version 2.1.1
+ @date 11/04/2012, 18:07
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_config
@@ -135,7 +135,10 @@
$query = "select configuration_group_id as gid from " . TABLE_CONFIGURATION_GROUP . " where configuration_group_key='" . $this->data['group_key'] . "'";
$rs = tep_db_query($query);
- if (!($row = tep_db_fetch_array($rs))) CIP::InProcess(__('Configuration group does not exists with key:').$this->data['group_key'], __CLASS__.'->'.__FUNCTION__,'block');
+ if (!($row = tep_db_fetch_array($rs))) {
+ self::$gid=$this->data['gid'] = 0;
+// CIP::InProcess(__('Configuration group does not exists with key:').$this->data['group_key'], __CLASS__.'->'.__FUNCTION__,'block');
+ }
else self::$gid=$this->data['gid'] = $row['gid'];
}
@@ -151,7 +154,19 @@
if (!$rs->__get('numRows')) {
$query = "insert into " . TABLE_CONFIGURATION .
"(configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) " .
- " values ('','" . $this->data['title'] . "','" . $this->data['key'] . "','" . $this->data['value'] . "','" . $this->data['descr'] . "'," . self::$gid . "," . ($this->data['sort_order'] == NULL ? "NULL" : $this->data['sort_order']) . ",now(),now()," . ($this->data['use_function'] == NULL ? "NULL" : "'".$this->data['use_function']."'") . "," . ($this->data['set_function'] == NULL ? "NULL" : "'".$this->data['set_function']."'") . ")";
+ " values (
+ '',
+ '" . $this->data['title'] . "',
+ '" . $this->data['key'] . "',
+ '" . $this->data['value'] . "',
+ '" . $this->data['descr'] . "',
+ " . self::$gid . ",
+ " . ($this->data['sort_order'] == NULL ? "NULL" : $this->data['sort_order']) . ",
+ now(),
+ now(),
+ " . ($this->data['use_function'] == NULL ? "NULL" : "'".$this->data['use_function']."'") . ",
+ " . ($this->data['set_function'] == NULL ? "NULL" : "'".$this->data['set_function']."'") . "
+ )";
if(!$DB->query($query)){
CIP::InProcess(__('erreur insert into ').TABLE_CONFIGURATION.' '.$this->data['key'].__('requete').'<br />'.$query, __CLASS__.'->'.__FUNCTION__,'block');;
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-12 18:21:39
|
Revision: 4218
http://oscss.svn.sourceforge.net/oscss/?rev=4218&view=rev
Author: oscim
Date: 2012-04-12 18:21:30 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
suppression fichier obsolete
Removed Paths:
-------------
trunk/catalog/install/includes/upgrade/1.2.1-1.2.2.sql
trunk/catalog/install/includes/upgrade/1.2.2-2.1.0.sql
Deleted: trunk/catalog/install/includes/upgrade/1.2.1-1.2.2.sql
===================================================================
--- trunk/catalog/install/includes/upgrade/1.2.1-1.2.2.sql 2012-04-12 18:19:41 UTC (rev 4217)
+++ trunk/catalog/install/includes/upgrade/1.2.1-1.2.2.sql 2012-04-12 18:21:30 UTC (rev 4218)
@@ -1,454 +0,0 @@
-####################################-
-#| osCSS Open Source E-commerce |
-####################################-
-#| Copyright (c) 2005-2010 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| http://www.oscim.net |
-#| 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/license/2_0.txt. |
-####################################-
-
-# NOTE: * Please make any modifications to this file by hand!
-# * DO NOT use a mysqldump created file for new changes!
-# * Please take note of the table structure, and use this
-# structure as a standard for future modifications!
-# * Any tables you add here should be added in admin/backup.php
-# and in catalog/install/includes/functions/database.php
-# * Comments should be like these, full line comments.
-# (don't use inline comments)
-
-
-
-
-
-
-CREATE TABLE IF NOT EXISTS osc_holding_orders (
- orders_id int(11) NOT NULL auto_increment,
- customers_id int(11) NOT NULL default '0',
- customers_name varchar(64) NOT NULL default '',
- customers_company varchar(32) default NULL,
- customers_street_address varchar(64) NOT NULL default '',
- customers_suburb varchar(32) default NULL,
- customers_city varchar(32) NOT NULL default '',
- customers_postcode varchar(10) NOT NULL default '',
- customers_state varchar(32) default NULL,
- customers_country varchar(32) NOT NULL default '',
- customers_telephone varchar(32) NOT NULL default '',
- customers_email_address varchar(96) NOT NULL default '',
- customers_address_format_id int(5) NOT NULL default '0',
- delivery_name varchar(64) NOT NULL default '',
- delivery_company varchar(32) default NULL,
- delivery_street_address varchar(64) NOT NULL default '',
- delivery_suburb varchar(32) default NULL,
- delivery_city varchar(32) NOT NULL default '',
- delivery_postcode varchar(10) NOT NULL default '',
- delivery_state varchar(32) default NULL,
- delivery_country varchar(32) NOT NULL default '',
- delivery_address_format_id int(5) NOT NULL default '0',
- billing_name varchar(64) NOT NULL default '',
- billing_company varchar(32) default NULL,
- billing_street_address varchar(64) NOT NULL default '',
- billing_suburb varchar(32) default NULL,
- billing_city varchar(32) NOT NULL default '',
- billing_postcode varchar(10) NOT NULL default '',
- billing_state varchar(32) default NULL,
- billing_country varchar(32) NOT NULL default '',
- billing_address_format_id int(5) NOT NULL default '0',
- payment_method varchar(32) NOT NULL default '',
- cc_type varchar(20) default NULL,
- cc_owner varchar(64) default NULL,
- cc_number varchar(32) default NULL,
- cc_expires varchar(4) default NULL,
- last_modified datetime default NULL,
- date_purchased datetime default NULL,
- orders_status int(5) NOT NULL default '1',
- orders_date_finished datetime default NULL,
- currency char(3) default NULL,
- currency_value decimal(14,6) default NULL,
- ip_address varchar(50) NOT NULL default '',
- PRIMARY KEY (orders_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-CREATE TABLE IF NOT EXISTS osc_holding_orders_products (
- orders_products_id int(11) NOT NULL auto_increment,
- orders_id int(11) NOT NULL default '0',
- products_id int(11) NOT NULL default '0',
- products_model varchar(12) default NULL,
- products_name varchar(64) NOT NULL default '',
- products_price decimal(15,4) NOT NULL default '0.0000',
- final_price decimal(15,4) NOT NULL default '0.0000',
- products_tax decimal(7,4) NOT NULL default '0.0000',
- products_quantity int(2) NOT NULL default '0',
- products_returned tinyint(2) unsigned default '0',
- products_exchanged tinyint(2) NOT NULL default '0',
- products_exchanged_id int(11) NOT NULL default '0',
- PRIMARY KEY (orders_products_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-CREATE TABLE IF NOT EXISTS osc_holding_orders_products_attributes (
- orders_products_attributes_id int(11) NOT NULL auto_increment,
- orders_id int(11) NOT NULL default '0',
- orders_products_id int(11) NOT NULL default '0',
- products_options varchar(32) NOT NULL default '',
- products_options_values varchar(32) NOT NULL default '',
- options_values_price decimal(15,4) NOT NULL default '0.0000',
- price_prefix char(1) NOT NULL default '',
- PRIMARY KEY (orders_products_attributes_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-
-CREATE TABLE IF NOT EXISTS osc_holding_orders_products_download (
- orders_products_download_id int(11) NOT NULL auto_increment,
- orders_id int(11) NOT NULL default '0',
- orders_products_id int(11) NOT NULL default '0',
- orders_products_filename varchar(255) NOT NULL default '',
- download_maxdays int(2) NOT NULL default '0',
- download_count int(2) NOT NULL default '0',
- PRIMARY KEY (orders_products_download_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-
-
-CREATE TABLE IF NOT EXISTS osc_holding_orders_status_history (
- orders_status_history_id int(11) NOT NULL auto_increment,
- orders_id int(11) NOT NULL default '0',
- orders_status_id int(5) NOT NULL default '0',
- date_added datetime NOT NULL default '1000-01-01 00:00:00',
- customer_notified int(1) default '0',
- comments text,
- PRIMARY KEY (orders_status_history_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-CREATE TABLE IF NOT EXISTS osc_holding_orders_total (
- orders_total_id int(10) unsigned NOT NULL auto_increment,
- orders_id int(11) NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- text varchar(255) NOT NULL default '',
- value decimal(15,4) NOT NULL default '0.0000',
- class varchar(32) NOT NULL default '',
- sort_order int(11) NOT NULL default '0',
- PRIMARY KEY (orders_total_id),
- KEY idx_orders_total_orders_id (orders_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-
-ALTER TABLE osc_address_book MODIFY COLUMN entry_gender char(1) NOT NULL;
-ALTER TABLE osc_address_book MODIFY COLUMN entry_firstname varchar(32) NOT NULL;
-ALTER TABLE osc_address_book MODIFY COLUMN entry_lastname varchar(32) NOT NULL;
-ALTER TABLE osc_address_book MODIFY COLUMN entry_street_address varchar(64) NOT NULL;
-ALTER TABLE osc_address_book MODIFY COLUMN entry_postcode varchar(10) NOT NULL;
-ALTER TABLE osc_address_book MODIFY COLUMN entry_city varchar(32) NOT NULL;
-
-
-ALTER TABLE osc_admin MODIFY COLUMN admin_firstname varchar(32) NOT NULL;
-ALTER TABLE osc_admin MODIFY COLUMN admin_email_address varchar(96) NOT NULL;
-ALTER TABLE osc_admin MODIFY COLUMN admin_password varchar(40) NOT NULL;
-
-ALTER TABLE osc_admin_files MODIFY COLUMN admin_files_name varchar(64) NOT NULL;
-
-ALTER TABLE osc_banners MODIFY COLUMN banners_title varchar(64) NOT NULL;
-ALTER TABLE osc_banners MODIFY COLUMN banners_url varchar(255) NOT NULL;
-ALTER TABLE osc_banners MODIFY COLUMN banners_image varchar(64) NOT NULL;
-ALTER TABLE osc_banners MODIFY COLUMN banners_group varchar(10) NOT NULL;
-
-
-ALTER TABLE osc_categories_description MODIFY COLUMN categories_name varchar(32) NOT NULL;
-
-
-ALTER TABLE osc_configuration MODIFY COLUMN configuration_title varchar(64) NOT NULL;
-ALTER TABLE osc_configuration MODIFY COLUMN configuration_key varchar(64) NOT NULL;
-ALTER TABLE osc_configuration MODIFY COLUMN configuration_value varchar(255) NOT NULL;
-ALTER TABLE osc_configuration MODIFY COLUMN configuration_description varchar(255) NOT NULL;
-
-
-ALTER TABLE osc_configuration_group MODIFY COLUMN configuration_group_title varchar(64) NOT NULL;
-ALTER TABLE osc_configuration_group MODIFY COLUMN configuration_group_description varchar(255) NOT NULL;
-
-CREATE TABLE IF NOT EXISTS osc_content (
- content_id int(10) unsigned NOT NULL auto_increment,
- content_name varchar(50) NOT NULL,
- date_added datetime default NULL,
- last_modified datetime default NULL,
- content_status tinyint(1) NOT NULL default '0',
- PRIMARY KEY (content_id),
- KEY content_name (content_name)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-
-CREATE TABLE IF NOT EXISTS osc_content_description (
- content_id int(10) unsigned NOT NULL default '0',
- content_title varchar(128) NOT NULL,
- content_text text NOT NULL,
- language_id int(11) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-
-ALTER TABLE osc_countries MODIFY COLUMN countries_name varchar(64) NOT NULL;
-ALTER TABLE osc_countries MODIFY COLUMN countries_localname varchar(64) NOT NULL;
-ALTER TABLE osc_countries MODIFY COLUMN countries_iso_code_2 char(2) NOT NULL;
-ALTER TABLE osc_countries MODIFY COLUMN countries_iso_code_3 char(3) NOT NULL;
-
-CREATE TABLE IF NOT EXISTS osc_coupons (
- coupon_id int(11) NOT NULL auto_increment,
- coupon_type char(1) NOT NULL default 'F',
- coupon_code varchar(32) NOT NULL default '',
- coupon_amount decimal(8,4) NOT NULL default '0.0000',
- coupon_minimum_order decimal(8,4) NOT NULL default '0.0000',
- coupon_start_date datetime NOT NULL default '1000-01-01 00:00:00',
- coupon_expire_date datetime NOT NULL default '1000-01-01 00:00:00',
- uses_per_coupon int(5) NOT NULL default '1',
- uses_per_user int(5) NOT NULL default '0',
- restrict_to_products varchar(255) default NULL,
- restrict_to_categories varchar(255) default NULL,
- restrict_to_customers text,
- coupon_active char(1) NOT NULL default 'Y',
- date_created datetime NOT NULL default '1000-01-01 00:00:00',
- date_modified datetime NOT NULL default '1000-01-01 00:00:00',
- PRIMARY KEY (coupon_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-
-CREATE TABLE IF NOT EXISTS osc_coupons_description (
- coupon_id int(11) NOT NULL default '0',
- language_id int(11) NOT NULL default '0',
- coupon_name varchar(32) NOT NULL default '',
- coupon_description text,
- KEY coupon_id (coupon_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE IF NOT EXISTS osc_coupon_email_track (
- unique_id int(11) NOT NULL auto_increment,
- coupon_id int(11) NOT NULL default '0',
- customer_id_sent int(11) NOT NULL default '0',
- sent_firstname varchar(32) default NULL,
- sent_lastname varchar(32) default NULL,
- emailed_to varchar(32) default NULL,
- date_sent datetime NOT NULL default '1000-01-01 00:00:00',
- PRIMARY KEY (unique_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-
-CREATE TABLE IF NOT EXISTS osc_coupon_gv_customer (
- customer_id int(5) NOT NULL default '0',
- amount decimal(8,4) NOT NULL default '0.0000',
- PRIMARY KEY (customer_id),
- KEY customer_id (customer_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE IF NOT EXISTS osc_coupon_gv_queue (
- unique_id int(5) NOT NULL auto_increment,
- customer_id int(5) NOT NULL default '0',
- order_id int(5) NOT NULL default '0',
- amount decimal(8,4) NOT NULL default '0.0000',
- date_created datetime NOT NULL default '1000-01-01 00:00:00',
- ipaddr varchar(32) NOT NULL default '',
- release_flag char(1) NOT NULL default 'N',
- PRIMARY KEY (unique_id),
- KEY uid (unique_id,customer_id,order_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-
-CREATE TABLE IF NOT EXISTS osc_coupon_redeem_track (
- unique_id int(11) NOT NULL auto_increment,
- coupon_id int(11) NOT NULL default '0',
- customer_id int(11) NOT NULL default '0',
- redeem_date datetime NOT NULL default '1000-01-01 00:00:00',
- redeem_ip varchar(32) NOT NULL default '',
- order_id int(11) NOT NULL default '0',
- PRIMARY KEY (unique_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-ALTER TABLE osc_currencies MODIFY COLUMN title varchar(32) NOT NULL;
-ALTER TABLE osc_currencies MODIFY COLUMN code char(3) NOT NULL;
-
-ALTER TABLE osc_customers MODIFY COLUMN customers_gender char(1) NOT NULL;
-ALTER TABLE osc_customers MODIFY COLUMN customers_firstname varchar(32) NOT NULL;
-ALTER TABLE osc_customers MODIFY COLUMN customers_lastname varchar(32) NOT NULL;
-ALTER TABLE osc_customers MODIFY COLUMN customers_email_address varchar(96) NOT NULL;
-ALTER TABLE osc_customers MODIFY COLUMN customers_telephone varchar(32) NOT NULL;
-ALTER TABLE osc_customers MODIFY COLUMN customers_password varchar(40) NOT NULL;
-ALTER TABLE osc_customers ADD COLUMN customers_shopping_points decimal(15,2) NOT NULL default '0.00';
-ALTER TABLE osc_customers ADD COLUMN customers_points_expires date default NULL;
-
-CREATE TABLE IF NOT EXISTS osc_customers_points_pending (
- unique_id int(11) NOT NULL auto_increment,
- customer_id int(11) NOT NULL default '0',
- orders_id int(11) NOT NULL default '0',
- points_pending decimal(15,2) NOT NULL default '0.00',
- points_comment varchar(200) default NULL,
- date_added datetime NOT NULL default '1000-01-01 00:00:00',
- points_status int(1) NOT NULL default '1',
- points_type varchar(2) NOT NULL default 'SP',
- PRIMARY KEY (unique_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
-
-ALTER TABLE osc_geo_zones MODIFY COLUMN geo_zone_name varchar(32) NOT NULL;
-ALTER TABLE osc_geo_zones MODIFY COLUMN geo_zone_description varchar(255) NOT NULL;
-
-
-
-ALTER TABLE osc_holding_orders MODIFY COLUMN customers_name varchar(64) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN customers_street_address varchar(64) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN customers_city varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN customers_postcode varchar(10) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN customers_country varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN customers_telephone varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN customers_email_address varchar(96) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_name varchar(64) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_street_address varchar(64) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_city varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_postcode varchar(10) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_country varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN billing_name varchar(64) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN billing_street_address varchar(64) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN billing_city varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN billing_postcode varchar(10) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN billing_country varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders MODIFY COLUMN payment_method varchar(32) NOT NULL;
-
-
-
-
-
-ALTER TABLE osc_holding_orders_products MODIFY COLUMN products_name varchar(64) NOT NULL;
-
-
-ALTER TABLE osc_holding_orders_products_attributes MODIFY COLUMN products_options varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders_products_attributes MODIFY COLUMN products_options_values varchar(32) NOT NULL;
-ALTER TABLE osc_holding_orders_products_attributes MODIFY COLUMN price_prefix char(1) NOT NULL;
-
-ALTER TABLE osc_holding_orders_products_download MODIFY COLUMN orders_products_filename varchar(255) NOT NULL;
-
-
-
-ALTER TABLE osc_holding_orders_total MODIFY COLUMN title varchar(255) NOT NULL;
-ALTER TABLE osc_holding_orders_total MODIFY COLUMN text varchar(255) NOT NULL;
-ALTER TABLE osc_holding_orders_total MODIFY COLUMN class varchar(32) NOT NULL;
-
-ALTER TABLE osc_languages MODIFY COLUMN name varchar(32) NOT NULL;
-ALTER TABLE osc_languages MODIFY COLUMN code char(2) NOT NULL;
-
-ALTER TABLE osc_manufacturers MODIFY COLUMN manufacturers_name varchar(32) NOT NULL;
-
-
-ALTER TABLE osc_manufacturers_info MODIFY COLUMN manufacturers_url varchar(255) NOT NULL;
-
-ALTER TABLE osc_navigation_links MODIFY COLUMN nav_css_id varchar(50) NOT NULL;
-ALTER TABLE osc_navigation_links MODIFY COLUMN nav_file varchar(50) NOT NULL;
-
-ALTER TABLE osc_navigation_links_description MODIFY COLUMN nav_name varchar(50) NOT NULL;
-
-ALTER TABLE osc_newsletters MODIFY COLUMN title varchar(255) NOT NULL;
-ALTER TABLE osc_newsletters MODIFY COLUMN module varchar(255) NOT NULL;
-
-
-
-ALTER TABLE osc_orders MODIFY COLUMN customers_name varchar(64) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN customers_street_address varchar(64) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN customers_postcode varchar(10) NOT NULL default '';
-ALTER TABLE osc_orders MODIFY COLUMN customers_city varchar(32) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN customers_postcode varchar(10) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN customers_country varchar(32) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN customers_telephone varchar(32) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN customers_email_address varchar(96) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN delivery_name varchar(64) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN delivery_street_address varchar(64) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN delivery_city varchar(32) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN delivery_postcode varchar(10) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN delivery_country varchar(32) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN billing_name varchar(64) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN billing_street_address varchar(64) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN billing_city varchar(32) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN billing_postcode varchar(10) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN billing_country varchar(32) NOT NULL;
-ALTER TABLE osc_orders MODIFY COLUMN payment_method varchar(32) NOT NULL;
-ALTER TABLE osc_orders ADD COLUMN ip_address varchar(15) NOT NULL;
-
-
-ALTER TABLE osc_orders_products MODIFY COLUMN products_name varchar(64) NOT NULL;
-
-
-ALTER TABLE osc_orders_products_attributes MODIFY COLUMN products_options varchar(32) NOT NULL;
-ALTER TABLE osc_orders_products_attributes MODIFY COLUMN products_options_values varchar(32) NOT NULL;
-ALTER TABLE osc_orders_products_attributes MODIFY COLUMN price_prefix char(1) NOT NULL;
-
-
-
-ALTER TABLE osc_orders_status MODIFY COLUMN orders_status_name varchar(32) NOT NULL;
-ALTER TABLE osc_orders_status ADD COLUMN orders_status_color varchar(8) NOT NULL;
-
-ALTER TABLE osc_orders_total MODIFY COLUMN title varchar(255) NOT NULL;
-ALTER TABLE osc_orders_total MODIFY COLUMN text varchar(255) NOT NULL;
-ALTER TABLE osc_orders_total MODIFY COLUMN class varchar(32) NOT NULL;
-
-
-CREATE TABLE IF NOT EXISTS osc_products_extra_images (
- products_extra_images_id int(11) NOT NULL auto_increment,
- products_id int(11) default NULL,
- products_extra_image varchar(64) default NULL,
- KEY products_extra_images_id (products_extra_images_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=12 ;
-
-
-ALTER TABLE osc_products_options MODIFY COLUMN products_options_name varchar(32) NOT NULL;
-
-ALTER TABLE osc_products_options_values MODIFY COLUMN products_options_values_name varchar(64) NOT NULL;
-
-ALTER TABLE osc_reviews MODIFY COLUMN customers_name varchar(64) NOT NULL;
-
-CREATE TABLE IF NOT EXISTS osc_seo_cache (
- cache_id varchar(32) NOT NULL,
- cache_language_id tinyint(1) NOT NULL default '0',
- cache_name varchar(255) NOT NULL,
- cache_data mediumtext NOT NULL,
- cache_global tinyint(1) NOT NULL default '1',
- cache_gzip tinyint(1) NOT NULL default '1',
- cache_method varchar(20) NOT NULL default 'RETURN',
- cache_date datetime NOT NULL default '1000-01-01 00:00:00',
- cache_expires datetime NOT NULL default '1000-01-01 00:00:00',
- PRIMARY KEY (cache_id,cache_language_id),
- KEY cache_id (cache_id),
- KEY cache_language_id (cache_language_id),
- KEY cache_global (cache_global)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-ALTER TABLE osc_sessions MODIFY COLUMN sesskey varchar(32) NOT NULL;
-
-ALTER TABLE osc_tax_class MODIFY COLUMN tax_class_title varchar(32) NOT NULL;
-ALTER TABLE osc_tax_class MODIFY COLUMN tax_class_description varchar(255) NOT NULL;
-
-ALTER TABLE osc_tax_rates MODIFY COLUMN tax_description varchar(255) NOT NULL;
-
-
-ALTER TABLE osc_whos_online MODIFY COLUMN full_name varchar(64) NOT NULL;
-ALTER TABLE osc_whos_online MODIFY COLUMN session_id varchar(128) NOT NULL;
-ALTER TABLE osc_whos_online MODIFY COLUMN ip_address varchar(15) NOT NULL;
-ALTER TABLE osc_whos_online MODIFY COLUMN time_entry varchar(14) NOT NULL;
-ALTER TABLE osc_whos_online MODIFY COLUMN time_last_click varchar(14) NOT NULL;
-ALTER TABLE osc_whos_online MODIFY COLUMN last_page_url varchar(255) NOT NULL;
-
-ALTER TABLE osc_zones MODIFY COLUMN zone_code varchar(32) NOT NULL;
-ALTER TABLE osc_zones MODIFY COLUMN zone_name varchar(32) NOT NULL;
-
-
-
-
-
-
-
Deleted: trunk/catalog/install/includes/upgrade/1.2.2-2.1.0.sql
===================================================================
--- trunk/catalog/install/includes/upgrade/1.2.2-2.1.0.sql 2012-04-12 18:19:41 UTC (rev 4217)
+++ trunk/catalog/install/includes/upgrade/1.2.2-2.1.0.sql 2012-04-12 18:21:30 UTC (rev 4218)
@@ -1,1228 +0,0 @@
-#+###################################-+
-#| osCSS Open Source E-commerce |
-#+###################################-+
-#| Copyright (c) 2005-2010 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| http://www.oscim.net |
-#| 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/license/2_0.txt. |
-#+###################################-+
-
-# NOTE: * Please make any modifications to this file by hand!
-# * DO NOT use a mysqldump created file for new changes!
-# * Please take note of the table structure, and use this
-# structure as a standard for future modifications!
-# * Any tables you add here should be added in admin/backup.php
-# and in catalog/install/includes/functions/database.php
-# * Comments should be like these, full line comments.
-# (don't use inline comments)
-
-
-RENAME TABLE osc_am_attributes_to_templates TO osc_products_am_attributes_to_templates;
-
-RENAME TABLE osc_am_templates TO osc_products_am_templates;
-
-ALTER TABLE osc_address_book CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_address_format CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_admin ADD COLUMN url_openid varchar(150) null;
-
-ALTER TABLE osc_admin CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_admin_files CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_admin_groups CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_categories ADD COLUMN categories_status tinyint(1) NOT NULL default '0';
-ALTER TABLE osc_categories ADD COLUMN categories_hidden tinyint(1) NOT NULL default '0';
-
-ALTER TABLE osc_categories CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_categories_description ADD COLUMN categories_description longtext;
-ALTER TABLE osc_categories_description ADD COLUMN categories_head_keywords_tag longtext;
-
-ALTER TABLE osc_categories_description CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-drop table if exists osc_categories_extra;
-CREATE TABLE IF NOT EXISTS osc_categories_extra (
- categories_id int(11) NOT NULL,
- cat_key varchar(150) NOT NULL,
- cat_value varchar(250) NOT NULL,
- UNIQUE KEY categories_id (categories_id,cat_key)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-create table osc_cip (
- cip_id int(11) NOT NULL auto_increment,
- cip_folder_name varchar(255) NOT NULL,
- cip_installed int(1) NOT NULL default '0',
- cip_ident varchar(255) NOT NULL,
- cip_version varchar(255) NOT NULL,
- PRIMARY KEY (cip_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
-create table osc_cip_depend (
- cip_ident varchar(255) NOT NULL,
- cip_ident_req varchar(255) NOT NULL,
- cip_req_type int(2) NOT NULL,
- PRIMARY KEY (cip_ident(100),cip_ident_req(100),cip_req_type)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-ALTER TABLE osc_configuration ADD COLUMN configuration_type tinyint (1) default '2' not null;
-
-ALTER TABLE osc_configuration CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_configuration_group ADD COLUMN configuration_group_parentid tinyint(1) NOT NULL;
-ALTER TABLE osc_configuration_group ADD COLUMN configuration_group_group_id varchar(64) NOT NULL;
-ALTER TABLE osc_configuration_group ADD COLUMN configuration_group_key varchar(64) not null;
-
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_1' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_1_S', 'CFG_CLASS_VIRTUAL_TYPE_1', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_2' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_2_S', 'CFG_CLASS_VIRTUAL_TYPE_2', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_3' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_3_S', 'CFG_CLASS_VIRTUAL_TYPE_3', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_4' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_4_S', 'CFG_CLASS_VIRTUAL_TYPE_4', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'TYPE_VIRTUAL_PRODUCTS' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('TYPE_VIRTUAL_PRODUCTS_S', 'TYPE_VIRTUAL_PRODUCTS', '', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
-
-if not exists (select * from osc_configuration where configuration_key = 'STOCK_MARK_PRODUCT_NO_STOCK' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STOCK_MARK_PRODUCT_NO_STOCK_S', 'STOCK_MARK_PRODUCT_NO_STOCK', '*cmd*', 'STOCK_MARK_PRODUCT_NO_STOCK_L', '9', '4', NOW(), NOW(), 3);
-
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_FORCE_UCWORDS_S', 'CUSTOMER_FORCE_UCWORDS', '6', 'CUSTOMER_FORCE_UCWORDS_L', '28', '20', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_FORCE_STRTOUPPER_S', 'CUSTOMER_FORCE_STRTOUPPER', '10', 'CUSTOMER_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_CITY_FORCE_STRTOUPPER_S', 'CUSTOMER_CITY_FORCE_STRTOUPPER', '10', 'CUSTOMER_CITY_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-
-
-ALTER TABLE osc_configuration_group CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_content ADD COLUMN content_hidden tinyint(1) default '0' not null;
-ALTER TABLE osc_content ADD COLUMN sort_order varchar(2) default '0' not null;
-
-ALTER TABLE osc_content CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_content_description CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_content_to_categories (
-content_id INT( 10 ) NOT NULL ,
-categories_id INT( 11 ) NOT NULL ,
-PRIMARY KEY ( content_id , categories_id )
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-ALTER TABLE osc_countries CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_coupons CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_coupons_description CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_coupon_email_track CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_coupon_gv_customer CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_coupon_gv_queue CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_coupon_redeem_track CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_currencies CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_customers ADD COLUMN customers_group_id smallint(5) unsigned NOT NULL default '0' AFTER customers_newsletter;
-ALTER TABLE osc_customers ADD COLUMN customers_group_ra enum('0','1') NOT NULL AFTER customers_group_id;
-ALTER TABLE osc_customers ADD COLUMN customers_payment_allowed varchar(255) NOT NULL default '' AFTER customers_group_ra;
-ALTER TABLE osc_customers ADD COLUMN customers_shipment_allowed varchar(255) NOT NULL default '' AFTER customers_payment_allowed;
-ALTER TABLE osc_customers ADD COLUMN customers_order_total_allowed varchar(255) NOT NULL default '' AFTER customers_shipment_allowed;
-ALTER TABLE osc_customers ADD COLUMN customers_specific_taxes_exempt varchar(255) NOT NULL default '' AFTER customers_order_total_allowed;
-ALTER TABLE osc_customers ADD COLUMN customers_discount decimal(5,2) default '0.00' AFTER customers_specific_taxes_exempt;
-ALTER TABLE osc_customers ADD COLUMN customers_shopping_points decimal(15,2) NOT NULL default '0.00';
-ALTER TABLE osc_customers ADD COLUMN customers_status int(1) NOT NULL DEFAULT '1';
-
-
-ALTER TABLE osc_customers CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_customers_groups (
- customers_group_id smallint UNSIGNED NOT NULL,
- customers_group_name varchar(32) NOT NULL default '',
- customers_group_show_tax enum('1','0') NOT NULL,
- customers_group_tax_exempt enum('0','1') NOT NULL,
- group_payment_allowed varchar(255) NOT NULL default '',
- group_shipment_allowed varchar(255) NOT NULL default '',
- group_order_total_allowed varchar(255) NOT NULL default '',
- group_specific_taxes_exempt varchar(255) NOT NULL default '',
- group_discount decimal(5,2) default '0.00',
- PRIMARY KEY (customers_group_id)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-ALTER TABLE osc_customers_basket CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_customers_basket_attributes ADD COLUMN products_options_value_text text null;
-
-ALTER TABLE osc_customers_basket_attributes CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-
-CREATE TABLE osc_customers_to_extra_fields (
- customers_id int(11) NOT NULL default '0',
- fields_id int(11) NOT NULL default '0',
- value text
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-ALTER TABLE osc_customers_info ADD COLUMN global_product_notifications int(1) default NULL;
-
-ALTER TABLE osc_customers_info CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
- ALTER TABLE osc_customers CHANGE customers_shopping_points INT( 10 ) NOT NULL DEFAULT '0';
-ALTER TABLE osc_customers_points_pending CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_discount_coupons (
- coupons_id varchar(32) NOT NULL default '',
- coupons_description varchar(64) NOT NULL default '',
- coupons_discount_amount decimal(15,6) default NULL,
- coupons_discount_type varchar(35) default NULL,
- coupons_date_start datetime default NULL,
- coupons_date_end datetime default NULL,
- coupons_max_use int(3) NOT NULL default '0',
- coupons_min_order decimal(15,6) NOT NULL default '0.0000',
- coupons_min_order_type varchar(50) default NULL,
- coupons_number_available int(3) NOT NULL default '0',
- PRIMARY KEY (coupons_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE osc_discount_coupons_to_categories (
- coupons_id varchar(32) default NULL,
- categories_id int(11) default NULL,
- in_out varchar(1) NOT NULL default 'E',
- UNIQUE KEY coupons_id (coupons_id,categories_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE osc_discount_coupons_to_customers (
- coupons_id varchar(32) default NULL,
- customers_id int(11) default NULL,
- in_out varchar(1) NOT NULL default 'O' COMMENT 'I pour in, O pour out',
- UNIQUE KEY coupons_id (coupons_id,customers_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE osc_discount_coupons_to_manufacturers (
- coupons_id varchar(32) default NULL,
- manufacturers_id int(11) default NULL,
- in_out varchar(1) NOT NULL default 'E',
- UNIQUE KEY coupons_id (coupons_id,manufacturers_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE osc_discount_coupons_to_orders (
- discount_coupons_to_orders_id int(11) NOT NULL auto_increment,
- coupons_id varchar(32) default NULL,
- orders_id int(11) default '0',
- PRIMARY KEY (discount_coupons_to_orders_id),
- KEY coupons_id (coupons_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
-CREATE TABLE osc_discount_coupons_to_products (
- coupons_id varchar(32) default NULL,
- products_id int(11) default NULL,
- in_out varchar(1) NOT NULL default 'E',
- UNIQUE KEY coupons_id (coupons_id,products_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE osc_discount_coupons_to_zones (
- discount_coupons_to_zones_id int(11) NOT NULL auto_increment,
- coupons_id varchar(32) default NULL,
- geo_zone_id int(11) default NULL,
- in_out varchar(1) NOT NULL default 'E',
- PRIMARY KEY (discount_coupons_to_zones_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
-
-CREATE TABLE osc_extra_field_labels (
- epf_id int(11) NOT NULL,
- languages_id int(11) NOT NULL,
- epf_label varchar(64) default NULL,
- epf_active_for_language tinyint(1) NOT NULL default '1',
- PRIMARY KEY (epf_id,languages_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE osc_extra_field_values (
- value_id int(10) unsigned NOT NULL auto_increment,
- epf_id int(11) NOT NULL,
- languages_id int(11) NOT NULL,
- 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),
- KEY IDX_EPF (epf_id,languages_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
-
-CREATE TABLE osc_extra_fields (
- fields_id int(11) NOT NULL auto_increment,
- fields_input_type int(11) NOT NULL default '0',
- fields_input_value text NOT NULL,
- fields_status tinyint(2) NOT NULL default '0',
- fields_required_status tinyint(2) NOT NULL default '0',
- fields_size int(5) NOT NULL default '0',
- fields_required_email tinyint(2) NOT NULL default '0',
- PRIMARY KEY (fields_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
-
-CREATE TABLE osc_extra_fields_info (
- fields_id int(11) NOT NULL default '0',
- languages_id int(11) NOT NULL default '0',
- fields_name varchar(32) NOT NULL default ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-drop table if exists osc_full_tag;
-CREATE TABLE osc_full_tag (
- tag_id int(11) NOT NULL auto_increment,
- page_type tinytext NOT NULL,
- page_id varchar(30) default NULL,
- PRIMARY KEY (tag_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
-drop table if exists osc_full_tag_description;
-CREATE TABLE osc_full_tag_description (
- tag_id int(11) NOT NULL default '0',
- language_id int(3) NOT NULL default '1',
- head_title_tag varchar(80) default NULL,
- head_desc_tag longtext,
- head_keywords_tag longtext,
- PRIMARY KEY (tag_id, language_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO osc_full_tag (tag_id, page_type, page_id) VALUES (1, 'generic', 'generic');
-INSERT INTO osc_full_tag_description (tag_id, language_id, head_title_tag, head_desc_tag, head_keywords_tag) VALUES (1, 1, 'HEAD_TITLE_TAG_ALL', 'HEAD_DESC_TAG_ALL', 'HEAD_KEY_TAG_ALL');
-
-
-#deplacement des element de catgeorie tag
-Insert into osc_full_tag (page_id)
-Select c.categories_id from osc_categories c;
-
-Update osc_full_tag set page_type='cat' where page_type='';
-
-Insert into osc_full_tag_description (tag_id,language_id,head_title_tag,head_desc_tag,head_keywords_tag)
-Select distinct ft.tag_id,cd.language_id,c.category_head_title_tag,c.category_head_desc_tag,c.category_head_keywords_tag from osc_categories c, osc_categories_description cd, osc_full_tag ft Where c.categories_id=cd.categories_id and c.categories_id=ft.page_id and page_type='cat';
-
-ALTER TABLE osc_categories DROP category_head_title_tag;
-ALTER TABLE osc_categories DROP category_head_desc_tag;
-ALTER TABLE osc_categories DROP category_head_keywords_tag;
-
-
-
-## deplacement des element de table produits
-Insert into osc_full_tag (page_id)
-Select products_id from osc_products_description p;
-
-Update osc_full_tag set page_type='product' where page_type='';
-
-Insert into osc_full_tag_description (tag_id,language_id,head_title_tag,head_desc_tag,head_keywords_tag)
-Select distinct ft.tag_id,pd.language_id,products_head_title_tag,products_head_desc_tag,products_head_keywords_tag from osc_products p, osc_products_description pd, osc_full_tag ft Where p.products_id=pd.products_id and p.products_id=ft.page_id and page_type='product';
-
-ALTER TABLE osc_products_description DROP products_head_title_tag;
-ALTER TABLE osc_products_description DROP products_head_desc_tag;
-ALTER TABLE osc_products_description DROP products_head_keywords_tag ;
-
-
-ALTER TABLE osc_geo_zones CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_holding_orders ADD COLUMN orders_prefix varchar(32) null AFTER orders_id;
-ALTER TABLE osc_holding_orders ADD COLUMN total_weight varchar(5) null ;
-
-ALTER TABLE osc_holding_orders CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_holding_orders_products CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_holding_orders_products_attributes CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_holding_orders_products_download CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_holding_orders_status_history CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_holding_orders_total CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_newsletters_modeles ADD COLUMN modele_id int(1) NOT NULL default '0';
-
-drop table if exists osc_newsletters_sent;
-CREATE TABLE osc_newsletters_sent (
- customers_id int(11) NOT NULL default '0',
- module_type varchar(64) NOT NULL,
- newsletters_id int(11) NOT NULL,
- date_sent datetime NOT NULL,
- KEY id_index (customers_id,newsletters_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-ALTER TABLE osc_languages ADD COLUMN core int(1) not null default 2;
-ALTER TABLE osc_languages MODIFY COLUMN code varchar(6) NOT NULL;
-
-ALTER TABLE osc_languages CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-update osc_languages set code='fr_FR', directory='fr_FR' WHERE directory='french';
-update osc_languages set code='en_EN', directory='en_EN' WHERE directory='english';
-update osc_languages set code='de_DE', directory='de_DE' WHERE directory='german';
-update osc_languages set code='es_ES', directory='es_ES' WHERE directory='espanol';
-
-
-
-ALTER TABLE osc_manufacturers CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_manufacturers_info CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_navigation_links ADD COLUMN parent_id int(3) NOT NULL default '0';
-
-ALTER TABLE osc_navigation_links CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_navigation_links_description CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_newsletters ADD COLUMN nbr_send int(11) NOT NULL default '0';
-ALTER TABLE osc_newsletters ADD COLUMN newsletters_language int(11) NOT NULL default '1';
-
-ALTER TABLE osc_newsletters CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_newsletters_sent (
- customers_id int(11) NOT NULL default '0',
- module_type varchar(64) NOT NULL,
- newsletters_id int(11) NOT NULL,
- date_sent datetime NOT NULL,
- KEY id_index (customers_id,newsletters_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-ALTER TABLE osc_orders ADD COLUMN orders_prefix varchar(32) null AFTER orders_id;
-ALTER TABLE osc_orders ADD COLUMN total_weight varchar(5) null ;
-ALTER TABLE osc_orders ADD COLUMN facture_id int(11) null ;
-ALTER TABLE osc_orders ADD holding_origin_id INT( 11 ) NOT NULL ;
-
-ALTER TABLE osc_orders CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_orders_products ADD COLUMN products_stock_attributes varchar(255) default NULL;
-ALTER TABLE osc_orders_products ADD COLUMN products_returned tinyint(2) default '0' null;
-ALTER TABLE osc_orders_products ADD COLUMN products_exchanged tinyint(2) default '0' not null ;
-ALTER TABLE osc_orders_products ADD COLUMN products_exchanged_id int(11) default '0' not null;
-
-ALTER TABLE osc_orders_products CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-
-
-create table IF NOT EXISTS osc_orders_products_download (
- orders_products_download_id int(11) not null auto_increment,
- orders_id int(11) default '0' not null ,
- orders_products_id int(11) default '0' not null ,
- orders_products_filename varchar(255) not null ,
- download_maxdays int(2) default '0' not null ,
- download_count int(2) default '0' not null ,
- PRIMARY KEY (orders_products_download_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-ALTER TABLE osc_orders_products_attributes CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_orders_products_download CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_orders_status CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_orders_status_history CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_orders_total CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-
-ALTER TABLE osc_products CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_products ADD track_stock INT( 1 ) NOT NULL DEFAULT 1 AFTER manufacturers_id;
-
-CREATE TABLE osc_products_groups (
- customers_group_id smallint UNSIGNED NOT NULL default '0',
- customers_group_price decimal(15,6) NOT NULL default '0.0000',
- products_id int(11) NOT NULL default '0',
- PRIMARY KEY (customers_group_id, products_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-ALTER TABLE osc_products_attributes ADD COLUMN products_options_values_url varchar(128) null ;
-ALTER TABLE osc_products_attributes ADD COLUMN options_values_weight decimal(15,6) default '0.0000' not null;
-
-ALTER TABLE osc_products_attributes CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_products_attributes CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_products_attributes_download CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_products_attributes_groups (
- products_attributes_id int(11) NOT NULL default '0',
- customers_group_id smallint(5) NOT NULL default '0',
- options_values_price decimal(15,6) NOT NULL default '0.0000',
- price_prefix char(1) NOT NULL default '',
- products_id int(11) NOT NULL default '0',
- PRIMARY KEY (customers_group_id,products_attributes_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-ALTER TABLE osc_products_description ADD COLUMN products_chapo varchar(250) default NULL AFTER products_description ;
-ALTER TABLE osc_products_description CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_products_extra_images CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_products_notifications CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_products_options ADD COLUMN products_options_track_stock tinyint(1) default '0' not null AFTER products_options_name;
-ALTER TABLE osc_products_options ADD COLUMN products_options_images_enabled int(1) unsigned default '0' not null ;
-ALTER TABLE osc_products_options ADD COLUMN products_options_type int( 5 ) default '1' NOT NULL;
-ALTER TABLE osc_products_options ADD COLUMN products_options_length smallint( 2 ) DEFAULT '32' NOT NULL ;
-ALTER TABLE osc_products_options ADD COLUMN products_options_comment varchar( 32 );
-ALTER TABLE osc_products_options ADD COLUMN products_options_condition int(1) DEFAULT '1' NOT NULL;
-
-ALTER TABLE osc_products_options CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-
-ALTER TABLE osc_products_options_values ADD COLUMN products_options_values_thumbnail varchar(128) null;
-
-ALTER TABLE osc_products_options_values CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_products_options_values_to_products_options CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_products_to_categories CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_products_extra_fields (
- epf_id int unsigned NOT NULL auto_increment,
- epf_order int NOT NULL default 0,
- epf_status tinyint(1) NOT NULL default 1,
- epf_uses_value_list tinyint(1) not null default 0,
- epf_advanced_search tinyint(1) not null default 1,
- epf_show_in_listing tinyint(1) not null default 0,
- epf_size tinyint unsigned not null default 64,
- epf_use_as_meta_keyword tinyint(1) not null default 0,
- epf_use_to_restrict_listings tinyint(1) not null default 0,
- epf_show_parent_chain tinyint(1) not null default 0,
- epf_key varchar(40) default NULL COMMENT 'key de config pour plus de souplesse',
- epf_admin int(1) NOT NULL default '1' COMMENT 'dispo uniquement admin',
- epf_special_mod varchar(30) default NULL COMMENT 'flag module proprietaire',
- PRIMARY KEY (epf_id),
- KEY IDX_ORDER (epf_order)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE osc_products_extra_fields_labels (
- epf_id int unsigned NOT NULL,
- languages_id int NOT NULL,
- epf_label varchar(64),
- epf_active_for_language tinyint(1) not null default 1,
- epf_label_help varchar(160) default NULL COMMENT 'aide contextuelle',
- PRIMARY KEY (epf_id, languages_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-create table osc_products_extra_fields_values (
- value_id int unsigned not null auto_increment,
- epf_id int unsigned not null,
- languages_id int not null,
- parent_id int unsigned not null default 0,
- sort_order int not null default 0,
- epf_value varchar(64),
- primary key (value_id),
- key IDX_EPF (epf_id, languages_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE osc_products_to_products_extra_fields (
- products_id int(11) NOT NULL default '0',
- products_extra_fields_id int(11) NOT NULL default '0',
- products_extra_fields_value text,
- PRIMARY KEY (products_id,products_extra_fields_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-create table osc_products_to_vendors (
- products_id int(11) default '0' not null ,
- vendors_id int(11) default '0' not null ,
- PRIMARY KEY (products_id, vendors_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE osc_products_virtual (
- productsID int(10) NOT NULL,
- typeID tinyint(3) NOT NULL,
- PRIMARY KEY (productsID)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-create table osc_products_stock (
- products_stock_id int(11) not null auto_increment,
- products_id int(11) default '0' not null ,
- products_stock_attributes varchar(255) not null,
- products_stock_quantity int(11) default '0' not null ,
- PRIMARY KEY (products_stock_id),
- UNIQUE idx_products_stock_attributes (products_id,products_stock_attributes)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-ALTER TABLE osc_reviews CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_reviews_description CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_refund_payments (
- refund_payment_id int(11) NOT NULL auto_increment,
- returns_id int(11) NOT NULL default '0',
- refund_payment_name varchar(64) NOT NULL default 'No Refund Made',
- refund_payment_value decimal(15,6) NOT NULL default '0.0000',
- refund_payment_date datetime NOT NULL default '1000-01-01 00:00:00',
- refund_payment_reference varchar(50) default NULL,
- refund_payment_deductions decimal(15,6) NOT NULL default '0.0000',
- customer_method varchar(50) NOT NULL default '',
- PRIMARY KEY (refund_payment_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE osc_return_text (
- return_text_id tinyint(3) unsigned NOT NULL default '0',
- language_id int(3) unsigned NOT NULL default '1',
- return_text_one text,
- PRIMARY KEY (return_text_id,language_id),
- KEY status_id (return_text_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-create table osc_returned_products (
- returns_id int(11) NOT NULL auto_increment,
- customers_id int(11) NOT NULL default '0',
- rma_value varchar(15) NOT NULL default '0',
- order_id int(11) NOT NULL default '0',
- customers_name varchar(64) NOT NULL default '',
- customers_acct varchar(32) default NULL,
- customers_company varchar(32) default NULL,
- customers_street_address varchar(64) NOT NULL default '',
- customers_suburb varchar(32) default NULL,
- customers_city varchar(32) NOT NULL default '',
- customers_postcode varchar(10) NOT NULL default '',
- customers_state varchar(32) default NULL,
- customers_country varchar(32) NOT NULL default '',
- customers_telephone varchar(32) NOT NULL default '',
- customers_fax varchar(32) NOT NULL default '',
- customers_email_address varchar(96) NOT NULL default '',
- customers_address_format_id int(5) NOT NULL default '0',
- delivery_name varchar(64) NOT NULL default '',
- delivery_company varchar(32) default NULL,
- delivery_street_address varchar(64) NOT NULL default '',
- delivery_suburb varchar(32) default NULL,
- delivery_city varchar(32) NOT NULL default '',
- delivery_postcode varchar(10) NOT NULL default '',
- delivery_state varchar(32) default NULL,
- delivery_country varchar(32) NOT NULL default '',
- delivery_address_format_id int(5) NOT NULL default '0',
- billing_name varchar(64) NOT NULL default '',
- billing_acct varchar(32) default NULL,
- billing_company varchar(32) default NULL,
- billing_street_address varchar(64) NOT NULL default '',
- billing_suburb varchar(32) default NULL,
- billing_city varchar(32) NOT NULL default '',
- billing_postcode varchar(10) NOT NULL default '',
- billing_state varchar(32) default NULL,
- billing_country varchar(32) NOT NULL default '',
- billing_address_format_id int(5) NOT NULL default '0',
- payment_method varchar(64) NOT NULL default '',
- cc_type varchar(20) default NULL,
- cc_owner varchar(64) default NULL,
- cc_number varchar(32) default NULL,
- cc_expires varchar(4) default NULL,
- cvvnumber char(3) default NULL,
- last_modified datetime default NULL,
- date_purchased datetime default NULL,
- returns_status int(5) NOT NULL default '1',
- returns_date_finished datetime NOT NULL default '1000-01-01 00:00:00',
- comments text,
- currency char(3) default NULL,
- currency_value decimal(14,6) default NULL,
- account_name varchar(32) NOT NULL default '',
- account_number varchar(20) default NULL,
- po_number varchar(12) default NULL,
- date_finished datetime NOT NULL default '1000-01-01 00:00:00',
- returns_reason tinyint(5) unsigned default '0',
- contact_user_name varchar(64) NOT NULL default '',
- PRIMARY KEY (returns_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE osc_returns_products_data (
- returns_products_id int(11) NOT NULL auto_increment,
- returns_id int(11) NOT NULL default '0',
- order_id int(11) NOT NULL default '0',
- products_id int(11) NOT NULL default '0',
- products_model varchar(12) default NULL,
- products_name varchar(120) NOT NULL default '',
- products_price decimal(15,6) NOT NULL default '0.0000',
- products_discount_made decimal(15,6) default NULL,
- final_price decimal(15,6) NOT NULL default '0.0000',
- products_tax decimal(15,6) NOT NULL default '0.0000',
- products_quantity int(2) NOT NULL default '0',
- products_serial_number varchar(128) default NULL,
- products_returned tinyint(2) unsigned default '0',
- products_exchanged tinyint(2) unsigned default '0',
- PRIMARY KEY (returns_products_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE osc_returns_total (
- returns_total_id int(10) unsigned NOT NULL auto_increment,
- returns_id int(11) NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- text varchar(255) NOT NULL default '',
- value decimal(15,6) NOT NULL default '0.0000',
- class varchar(32) NOT NULL default '',
- sort_order int(11) NOT NULL default '0',
- PRIMARY KEY (returns_total_id),
- KEY idx_returns_total_returns_id (returns_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS osc_returns_status_history (
- returns_status_history_id int(11) unsigned NOT NULL auto_increment,
- returns_id int(11) unsigned NOT NULL default '0',
- returns_status int(5) unsigned NOT NULL default '0',
- date_added datetime default NULL,
- customer_notified int(1) unsigned default '0',
- comments text,
- PRIMARY KEY (returns_status_history_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Return products''s status change history';
-
-
-ALTER TABLE osc_sessions CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-
-create table osc_scart (
- scartid int(11) NOT NULL auto_increment,
- customers_id int(11) NOT NULL default '0',
- dateadded varchar(8) NOT NULL default '',
- datemodified varchar(8) NOT NULL default '',
- PRIMARY KEY (scartid)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-drop table if exists osc_seo_cache;
-create table osc_seo_cache (
- cache_id char(32) not null ,
- cache_language_id int(3) default '1' not null ,
- cache_name varchar(255) not null ,
- cache_data mediumtext not null ,
- cache_global tinyint(1) default '1' not null ,
- cache_gzip tinyint(1) default '1' not null ,
- cache_method varchar(6) default 'RETURN' not null ,
- cache_date datetime default '1000-01-01 00:00:00' null ,
- cache_expires datetime default '1000-01-01 00:00:00' null ,
- PRIMARY KEY (cache_id, cache_language_id),
- KEY cache_id (cache_id),
- KEY cache_language_id (cache_language_id),
- KEY cache_global (cache_global)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE osc_status (
- status_id int(11) NOT NULL default '0',
- status_type varchar(30) NOT NULL default 'orders',
- language_id int(3) NOT NULL default '1',
- status_name varchar(32) NOT NULL,
- status_color varchar(8) NOT NULL,
- PRIMARY KEY (status_id,status_type,language_id),
- KEY idx_status_name (status_name)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-## deplacement des status de commande
-Insert into osc_status (status_id, language_id, status_name,status_color )
-Select orders_status_id, language_id, orders_status_name,orders_status_color from osc_orders_status;
-
-Update osc_status set status_type='orders' where status_type='';
-
-drop table if exists osc_orders_status;
-
-
-
-ALTER TABLE osc_specials ADD COLUMN customers_group_id int(11) default '0' not null;
-ALTER TABLE osc_specials CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-CREATE TABLE osc_vendors (
- vendors_id int(11) NOT NULL auto_increment,
- vendors_name varchar(32) NOT NULL,
- vendors_image varchar(64),
- vendors_phone1 VARCHAR(20) DEFAULT NULL,
- vendors_phone2 VARCHAR(20) DEFAULT NULL,
- vendors_fax VARCHAR(20) DEFAULT NULL,
- vendors_email VARCHAR(20) DEFAULT NULL,
- vendors_url VARCHAR(60) DEFAULT NULL,
- vendors_comments VARCHAR(255) DEFAULT NULL,
- date_added datetime NULL,
- last_modified datetime NULL,
- PRIMARY KEY (vendors_id),
- KEY IDX_vendors_NAME (vendors_name)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-ALTER TABLE osc_tax_class CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_tax_rates CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_whos_online CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE osc_zones CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-
-ALTER TABLE osc_geo_zones ADD COLUMN geo_zone_type TINYINT(11)default '1' not null ;
-
-ALTER TABLE osc_zones_to_geo_zones CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-ALTER TABLE osc_address_book ADD COLUMN entry_company_tax_id varchar(32) default NULL AFTER entry_company;
-
-
-drop view if exists view_products;
-CREATE VIEW view_products AS
-select p.products_model, m.manufacturers_name,p.products_quantity,p.products_image, p.products_weight,p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price, p.products_date_added, p.products_date_available from osc_products p left join osc_manufacturers m on p.manufacturers_id = m.manufacturers_id left join osc_specials s on p.products_id = s.products_id, osc_products_to_categories p2c, osc_categories c where c.categories_id=p2c.categories_id and c.categories_status='1' and p.products_status = '1' and p.products_id = p2c.products_id;
-
-
-drop view if exists view_orders_status;
-CREATE VIEW view_orders_status AS
- SELECT status_id as orders_status_id, language_id , status_name as orders_status_name, status_color as orders_status_color FROM osc_status WHERE status_type = 'orders';
-
-
-drop view if exists view_returns_status;
-CREATE VIEW view_returns_status AS
- SELECT status_id as returns_status_id, language_id , status_name as returns_status_name, status_color as returns_status_color FROM osc_status WHERE status_type = 'returns';
-
-
-drop view if exists view_return_reasons_status;
-CREATE VIEW view_return_reasons_...
[truncated message content] |
|
From: <os...@us...> - 2012-04-12 18:19:50
|
Revision: 4217
http://oscss.svn.sourceforge.net/oscss/?rev=4217&view=rev
Author: oscim
Date: 2012-04-12 18:19:41 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
report section upgrade
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/data/
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_address_book.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin_files.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_banners.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_categories_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_countries.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_email_track.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_customer.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_queue.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_redeem_track.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_currencies.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers_points_pending.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_total.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_languages.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers_info.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_navigation_links.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_navigation_links_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_newsletters.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_orders_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_orders_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_orders_total.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_products_extra_images.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_products_options.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_products_options_values.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_reviews.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_seo_cache.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_sessions.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_tax_class.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_tax_rates.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_whos_online.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_zones.sql
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_address_book.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_address_book.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_address_book.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,23 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_address_book MODIFY COLUMN entry_gender char(1) NOT NULL;
+ALTER TABLE osc_address_book MODIFY COLUMN entry_firstname varchar(32) NOT NULL;
+ALTER TABLE osc_address_book MODIFY COLUMN entry_lastname varchar(32) NOT NULL;
+ALTER TABLE osc_address_book MODIFY COLUMN entry_street_address varchar(64) NOT NULL;
+ALTER TABLE osc_address_book MODIFY COLUMN entry_postcode varchar(10) NOT NULL;
+ALTER TABLE osc_address_book MODIFY COLUMN entry_city varchar(32) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_admin MODIFY COLUMN admin_firstname varchar(32) NOT NULL;
+ALTER TABLE osc_admin MODIFY COLUMN admin_email_address varchar(96) NOT NULL;
+ALTER TABLE osc_admin MODIFY COLUMN admin_password varchar(40) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin_files.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_admin_files.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_admin_files MODIFY COLUMN admin_files_name varchar(64) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_banners.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_banners.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_banners.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_banners MODIFY COLUMN banners_title varchar(64) NOT NULL;
+ALTER TABLE osc_banners MODIFY COLUMN banners_url varchar(255) NOT NULL;
+ALTER TABLE osc_banners MODIFY COLUMN banners_image varchar(64) NOT NULL;
+ALTER TABLE osc_banners MODIFY COLUMN banners_group varchar(10) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_categories_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_categories_description.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_categories_description.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_categories_description MODIFY COLUMN categories_name varchar(32) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,23 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_configuration MODIFY COLUMN configuration_title varchar(64) NOT NULL;
+ALTER TABLE osc_configuration MODIFY COLUMN configuration_key varchar(64) NOT NULL;
+ALTER TABLE osc_configuration MODIFY COLUMN configuration_value varchar(255) NOT NULL;
+ALTER TABLE osc_configuration MODIFY COLUMN configuration_description varchar(255) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration_group.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_configuration_group.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_configuration_group MODIFY COLUMN configuration_group_title varchar(64) NOT NULL;
+ALTER TABLE osc_configuration_group MODIFY COLUMN configuration_group_description varchar(255) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,28 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_content (
+ content_id int(10) unsigned NOT NULL auto_increment,
+ content_name varchar(50) NOT NULL,
+ date_added datetime default NULL,
+ last_modified datetime default NULL,
+ content_status tinyint(1) NOT NULL default '0',
+ PRIMARY KEY (content_id),
+ KEY content_name (content_name)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content_description.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_content_description.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,24 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_content_description (
+ content_id int(10) unsigned NOT NULL default '0',
+ content_title varchar(128) NOT NULL,
+ content_text text NOT NULL,
+ language_id int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_countries.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_countries.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_countries.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,22 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_countries MODIFY COLUMN countries_name varchar(64) NOT NULL;
+ALTER TABLE osc_countries MODIFY COLUMN countries_localname varchar(64) NOT NULL;
+ALTER TABLE osc_countries MODIFY COLUMN countries_iso_code_2 char(2) NOT NULL;
+ALTER TABLE osc_countries MODIFY COLUMN countries_iso_code_3 char(3) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_email_track.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_email_track.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_email_track.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,29 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_coupon_email_track (
+ unique_id int(11) NOT NULL auto_increment,
+ coupon_id int(11) NOT NULL default '0',
+ customer_id_sent int(11) NOT NULL default '0',
+ sent_firstname varchar(32) default NULL,
+ sent_lastname varchar(32) default NULL,
+ emailed_to varchar(32) default NULL,
+ date_sent datetime NOT NULL default '1000-01-01 00:00:00',
+ PRIMARY KEY (unique_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_customer.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_customer.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_customer.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,25 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_coupon_gv_customer (
+ customer_id int(5) NOT NULL default '0',
+ amount decimal(8,4) NOT NULL default '0.0000',
+ PRIMARY KEY (customer_id),
+ KEY customer_id (customer_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_queue.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_queue.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_gv_queue.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,31 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_coupon_gv_queue (
+ unique_id int(5) NOT NULL auto_increment,
+ customer_id int(5) NOT NULL default '0',
+ order_id int(5) NOT NULL default '0',
+ amount decimal(8,4) NOT NULL default '0.0000',
+ date_created datetime NOT NULL default '1000-01-01 00:00:00',
+ ipaddr varchar(32) NOT NULL default '',
+ release_flag char(1) NOT NULL default 'N',
+ PRIMARY KEY (unique_id),
+ KEY uid (unique_id,customer_id,order_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_redeem_track.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_redeem_track.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupon_redeem_track.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,29 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_coupon_redeem_track (
+ unique_id int(11) NOT NULL auto_increment,
+ coupon_id int(11) NOT NULL default '0',
+ customer_id int(11) NOT NULL default '0',
+ redeem_date datetime NOT NULL default '1000-01-01 00:00:00',
+ redeem_ip varchar(32) NOT NULL default '',
+ order_id int(11) NOT NULL default '0',
+ PRIMARY KEY (unique_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,36 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_coupons (
+ coupon_id int(11) NOT NULL auto_increment,
+ coupon_type char(1) NOT NULL default 'F',
+ coupon_code varchar(32) NOT NULL default '',
+ coupon_amount decimal(8,4) NOT NULL default '0.0000',
+ coupon_minimum_order decimal(8,4) NOT NULL default '0.0000',
+ coupon_start_date datetime NOT NULL default '1000-01-01 00:00:00',
+ coupon_expire_date datetime NOT NULL default '1000-01-01 00:00:00',
+ uses_per_coupon int(5) NOT NULL default '1',
+ uses_per_user int(5) NOT NULL default '0',
+ restrict_to_products varchar(255) default NULL,
+ restrict_to_categories varchar(255) default NULL,
+ restrict_to_customers text,
+ coupon_active char(1) NOT NULL default 'Y',
+ date_created datetime NOT NULL default '1000-01-01 00:00:00',
+ date_modified datetime NOT NULL default '1000-01-01 00:00:00',
+ PRIMARY KEY (coupon_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons_description.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_coupons_description.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,25 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_coupons_description (
+ coupon_id int(11) NOT NULL default '0',
+ language_id int(11) NOT NULL default '0',
+ coupon_name varchar(32) NOT NULL default '',
+ coupon_description text,
+ KEY coupon_id (coupon_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_currencies.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_currencies.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_currencies.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,23 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_currencies MODIFY COLUMN title varchar(32) NOT NULL;
+ALTER TABLE osc_currencies MODIFY COLUMN code char(3) NOT NULL;
+
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,29 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_customers MODIFY COLUMN customers_gender char(1) NOT NULL;
+ALTER TABLE osc_customers MODIFY COLUMN customers_firstname varchar(32) NOT NULL;
+ALTER TABLE osc_customers MODIFY COLUMN customers_lastname varchar(32) NOT NULL;
+ALTER TABLE osc_customers MODIFY COLUMN customers_email_address varchar(96) NOT NULL;
+ALTER TABLE osc_customers MODIFY COLUMN customers_telephone varchar(32) NOT NULL;
+ALTER TABLE osc_customers MODIFY COLUMN customers_password varchar(40) NOT NULL;
+ALTER TABLE osc_customers ADD COLUMN customers_shopping_points decimal(15,2) NOT NULL default '0.00';
+ALTER TABLE osc_customers ADD COLUMN customers_points_expires date default NULL;
+
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers_points_pending.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers_points_pending.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_customers_points_pending.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,31 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_customers_points_pending (
+ unique_id int(11) NOT NULL auto_increment,
+ customer_id int(11) NOT NULL default '0',
+ orders_id int(11) NOT NULL default '0',
+ points_pending decimal(15,2) NOT NULL default '0.00',
+ points_comment varchar(200) default NULL,
+ date_added datetime NOT NULL default '1000-01-01 00:00:00',
+ points_status int(1) NOT NULL default '1',
+ points_type varchar(2) NOT NULL default 'SP',
+ PRIMARY KEY (unique_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_geo_zones.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_geo_zones.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_geo_zones.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,22 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_geo_zones MODIFY COLUMN geo_zone_name varchar(32) NOT NULL;
+ALTER TABLE osc_geo_zones MODIFY COLUMN geo_zone_description varchar(255) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,81 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_holding_orders (
+ orders_id int(11) NOT NULL auto_increment,
+ customers_id int(11) NOT NULL default '0',
+ customers_name varchar(64) NOT NULL default '',
+ customers_company varchar(32) default NULL,
+ customers_street_address varchar(64) NOT NULL default '',
+ customers_suburb varchar(32) default NULL,
+ customers_city varchar(32) NOT NULL default '',
+ customers_postcode varchar(10) NOT NULL default '',
+ customers_state varchar(32) default NULL,
+ customers_country varchar(32) NOT NULL default '',
+ customers_telephone varchar(32) NOT NULL default '',
+ customers_email_address varchar(96) NOT NULL default '',
+ customers_address_format_id int(5) NOT NULL default '0',
+ delivery_name varchar(64) NOT NULL default '',
+ delivery_company varchar(32) default NULL,
+ delivery_street_address varchar(64) NOT NULL default '',
+ delivery_suburb varchar(32) default NULL,
+ delivery_city varchar(32) NOT NULL default '',
+ delivery_postcode varchar(10) NOT NULL default '',
+ delivery_state varchar(32) default NULL,
+ delivery_country varchar(32) NOT NULL default '',
+ delivery_address_format_id int(5) NOT NULL default '0',
+ billing_name varchar(64) NOT NULL default '',
+ billing_company varchar(32) default NULL,
+ billing_street_address varchar(64) NOT NULL default '',
+ billing_suburb varchar(32) default NULL,
+ billing_city varchar(32) NOT NULL default '',
+ billing_postcode varchar(10) NOT NULL default '',
+ billing_state varchar(32) default NULL,
+ billing_country varchar(32) NOT NULL default '',
+ billing_address_format_id int(5) NOT NULL default '0',
+ payment_method varchar(32) NOT NULL default '',
+ cc_type varchar(20) default NULL,
+ cc_owner varchar(64) default NULL,
+ cc_number varchar(32) default NULL,
+ cc_expires varchar(4) default NULL,
+ last_modified datetime default NULL,
+ date_purchased datetime default NULL,
+ orders_status int(5) NOT NULL default '1',
+ orders_date_finished datetime default NULL,
+ currency char(3) default NULL,
+ currency_value decimal(14,6) default NULL,
+ ip_address varchar(50) NOT NULL default '',
+ PRIMARY KEY (orders_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+
+ALTER TABLE osc_holding_orders MODIFY COLUMN customers_name varchar(64) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN customers_street_address varchar(64) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN customers_city varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN customers_postcode varchar(10) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN customers_country varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN customers_telephone varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN customers_email_address varchar(96) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_name varchar(64) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_street_address varchar(64) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_city varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_postcode varchar(10) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN delivery_country varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN billing_name varchar(64) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN billing_street_address varchar(64) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN billing_city varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN billing_postcode varchar(10) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN billing_country varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders MODIFY COLUMN payment_method varchar(32) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,33 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_holding_orders_products (
+ orders_products_id int(11) NOT NULL auto_increment,
+ orders_id int(11) NOT NULL default '0',
+ products_id int(11) NOT NULL default '0',
+ products_model varchar(12) default NULL,
+ products_name varchar(64) NOT NULL default '',
+ products_price decimal(15,4) NOT NULL default '0.0000',
+ final_price decimal(15,4) NOT NULL default '0.0000',
+ products_tax decimal(7,4) NOT NULL default '0.0000',
+ products_quantity int(2) NOT NULL default '0',
+ products_returned tinyint(2) unsigned default '0',
+ products_exchanged tinyint(2) NOT NULL default '0',
+ products_exchanged_id int(11) NOT NULL default '0',
+ PRIMARY KEY (orders_products_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+
+ALTER TABLE osc_holding_orders_products MODIFY COLUMN products_name varchar(64) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_attributes.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_attributes.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_attributes.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,30 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_holding_orders_products_attributes (
+ orders_products_attributes_id int(11) NOT NULL auto_increment,
+ orders_id int(11) NOT NULL default '0',
+ orders_products_id int(11) NOT NULL default '0',
+ products_options varchar(32) NOT NULL default '',
+ products_options_values varchar(32) NOT NULL default '',
+ options_values_price decimal(15,4) NOT NULL default '0.0000',
+ price_prefix char(1) NOT NULL default '',
+ PRIMARY KEY (orders_products_attributes_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+
+ALTER TABLE osc_holding_orders_products_attributes MODIFY COLUMN products_options varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders_products_attributes MODIFY COLUMN products_options_values varchar(32) NOT NULL;
+ALTER TABLE osc_holding_orders_products_attributes MODIFY COLUMN price_prefix char(1) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_download.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_download.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_products_download.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,27 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_holding_orders_products_download (
+ orders_products_download_id int(11) NOT NULL auto_increment,
+ orders_id int(11) NOT NULL default '0',
+ orders_products_id int(11) NOT NULL default '0',
+ orders_products_filename varchar(255) NOT NULL default '',
+ download_maxdays int(2) NOT NULL default '0',
+ download_count int(2) NOT NULL default '0',
+ PRIMARY KEY (orders_products_download_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+ALTER TABLE osc_holding_orders_products_download MODIFY COLUMN orders_products_filename varchar(255) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_status_history.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_status_history.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_status_history.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,25 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_holding_orders_status_history (
+ orders_status_history_id int(11) NOT NULL auto_increment,
+ orders_id int(11) NOT NULL default '0',
+ orders_status_id int(5) NOT NULL default '0',
+ date_added datetime NOT NULL default '1000-01-01 00:00:00',
+ customer_notified int(1) default '0',
+ comments text,
+ PRIMARY KEY (orders_status_history_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_total.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_total.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_holding_orders_total.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,32 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_holding_orders_total (
+ orders_total_id int(10) unsigned NOT NULL auto_increment,
+ orders_id int(11) NOT NULL default '0',
+ title varchar(255) NOT NULL default '',
+ text varchar(255) NOT NULL default '',
+ value decimal(15,4) NOT NULL default '0.0000',
+ class varchar(32) NOT NULL default '',
+ sort_order int(11) NOT NULL default '0',
+ PRIMARY KEY (orders_total_id),
+ KEY idx_orders_total_orders_id (orders_id)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+ALTER TABLE osc_holding_orders_total MODIFY COLUMN title varchar(255) NOT NULL;
+ALTER TABLE osc_holding_orders_total MODIFY COLUMN text varchar(255) NOT NULL;
+ALTER TABLE osc_holding_orders_total MODIFY COLUMN class varchar(32) NOT NULL;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_languages.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_languages.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_languages.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,22 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_languages MODIFY COLUMN name varchar(32) NOT NULL;
+ALTER TABLE osc_languages MODIFY COLUMN code char(2) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_manufacturers MODIFY COLUMN manufacturers_name varchar(32) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers_info.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers_info.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_manufacturers_info.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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_manufacturers_info MODIFY COLUMN manufacturers_url varchar(255) NOT NULL;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_navigation_links.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_navigation_links.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.1_1.2.2/tables/osc_navigation_links.sql 2012-04-12 18:19:41 UTC (rev 4217)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Cop...
[truncated message content] |
|
From: <os...@us...> - 2012-04-12 18:02:32
|
Revision: 4216
http://oscss.svn.sourceforge.net/oscss/?rev=4216&view=rev
Author: oscim
Date: 2012-04-12 18:02:18 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Re formatage des commande sql d'upgrade de la v 1.2.2 vers 2.1.0
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_languages.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_files.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_full_tag.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_cip.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_customers_groups.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_discount_coupons.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_discount_coupons_to_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_discount_coupons_to_customers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_full_tag_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_products_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_return_text.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_address_book.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_address_format.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_admin.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_admin_files.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_am_attributes_to_templates.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_am_templates.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_categories_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_categories_extra.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_cip.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_cip_depend.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_content.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_content_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_content_to_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_countries.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_coupon_email_track.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_coupon_gv_customer.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_coupon_gv_queue.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_coupon_redeem_track.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_coupons.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_coupons_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_currencies.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_customers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_customers_basket.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_customers_basket_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_customers_groups.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_customers_info.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_customers_points_pending.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_customers_to_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_discount_coupons.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_discount_coupons_to_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_discount_coupons_to_customers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_discount_coupons_to_manufacturers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_discount_coupons_to_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_discount_coupons_to_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_discount_coupons_to_zones.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_extra_field_labels.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_extra_field_values.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_extra_fields_info.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_full_tag.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_full_tag_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_holding_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_holding_orders_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_holding_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_holding_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_holding_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_holding_orders_total.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_languages.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_manufacturers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_manufacturers_info.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_navigation_links.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_navigation_links_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_newsletters.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_newsletters_modeles.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_newsletters_sent.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_orders_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_orders_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_orders_total.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_attributes_download.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_attributes_groups.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_extra_fields_labels.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_extra_fields_values.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_groups.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_notifications.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_options.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_options_values.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_options_values_to_products_options.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_stock.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_to_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_to_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_to_vendors.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_products_virtual.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_refund_payments.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_return_text.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_returned_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_returns_products_data.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_returns_status_history.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_returns_total.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_reviews.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_reviews_description.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_scart.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_seo_cache.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_sessions.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_specials.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_tax_class.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_tax_rates.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_vendors.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_whos_online.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_zones.sql
trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/tables/osc_zones_to_geo_zones.sql
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_languages.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_languages.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_languages.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+update osc_languages set code='fr_FR', directory='fr_FR' WHERE directory='french';
+update osc_languages set code='en_EN', directory='en_EN' WHERE directory='english';
+update osc_languages set code='de_DE', directory='de_DE' WHERE directory='german';
+update osc_languages set code='es_ES', directory='es_ES' WHERE directory='espanol';
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_status.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_status.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/20_osc_status.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,45 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+Insert into osc_status (status_id, language_id, status_name,status_color )
+Select orders_status_id, language_id, orders_status_name,orders_status_color from osc_orders_status;
+
+Update osc_status set status_type='orders' where status_type='';
+
+drop table if exists osc_orders_status;
+
+
+INSERT INTO osc_status VALUES (1, 'returns', 1, 'OSC_RETURNS_STATUS_PENDING','#FF1A00');
+INSERT INTO osc_status VALUES (2, 'returns',1, 'OSC_RETURNS_STATUS_AWAITING_RETURN', '#3393D9');
+INSERT INTO osc_status VALUES (3, 'returns',1, 'OSC_RETURNS_STATUS_CANCELLED', '#66FF00');
+INSERT INTO osc_status VALUES (4, 'returns',1, 'OSC_RETURNS_STATUS_COMPLETE', '#666');
+
+INSERT INTO osc_status VALUES (1, 'return_reasons', 1, 'OSC_RETURN_REASONS_FAULTY','#FF1A00');
+INSERT INTO osc_status VALUES (2, 'return_reasons',1, 'OSC_RETURN_REASONS_DAMAGED', '#3393D9');
+INSERT INTO osc_status VALUES (3, 'return_reasons',1, 'OSC_RETURN_REASONS_INCORRECT_ITEM', '#66FF00');
+INSERT INTO osc_status VALUES (4, 'return_reasons',1, 'OSC_RETURN_REASONS_WARRANTY', '#666');
+
+INSERT INTO osc_status VALUES (1, 'refund_method', 1, 'OSC_REFUND_METHOD_PAYPAL','');
+INSERT INTO osc_status VALUES (2, 'refund_method', 1, 'OSC_REFUND_METHOD_NOCHEX','');
+INSERT INTO osc_status VALUES (3, 'refund_method', 1, 'OSC_REFUND_METHOD_EXCHANGE','');
+INSERT INTO osc_status VALUES (4, 'refund_method', 1, 'OSC_REFUND_METHOD_GIFT_VOUCHERS','');
+
+insert into osc_status values (1, 'products_virtual_types', 1, 'OSC_PRODUCTS_VIRTUAL_TYPES_PHYSICAL','');
+insert into osc_status values (2, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SUBSCRIPTION','');
+insert into osc_status values (3, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SERVICE','');
+insert into osc_status values (4, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SOFTWARE','');
+
+INSERT INTO osc_status VALUES (1, 'attribute_optiontype', 1, 'Select','');
+INSERT INTO osc_status VALUES (2, 'attribute_optiontype', 1, 'Text','');
+INSERT INTO osc_status VALUES (3, 'attribute_optiontype', 1, 'Radio','');
+INSERT INTO osc_status VALUES (4, 'attribute_optiontype', 1, 'Checkbox','');
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_files.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_files.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,117 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (1, 'configuration.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (2, 'catalog.php', 1, 0, '1,2');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (3, 'customers.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (4, 'modules.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (6, 'tools.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (5, 'parameters.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (7, 'administrator.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (8, 'cms.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (9, 'hidden.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (10, 'commercial.php', 1, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (11, 'return_product.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (12, 'returns_invoice.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (13, 'returns_packingslip.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (14, 'attributeManager.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (15, 'products_cross.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (16, 'graphs_stats.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (17, 'ajax.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (18, 'qtprodoctor.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (19, 'sitemonitor.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (20, 'coupons_exclusions.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (21, 'stock.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (22, 'sitemaps.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (23, 'aca_portfolio.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (24, 'sales_stats.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (25, 'aca.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (26, 'mail.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (27, 'rss.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (28, 'tinybrowser.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (29, 'package.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (30, 'admin_members.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (31, 'config_110.php', 0, 8, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (32, 'configuration.php?gparentID=110&gID=25', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (33, 'configuration.php?gparentID=110&gID=31', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (34, 'configuration.php?gparentID=110&gID=1', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (35, 'configuration.php?gparentID=110&gID=2', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (36, 'configuration.php?gparentID=110&gID=28', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (37, 'configuration.php?gparentID=110&gID=30', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (38, 'return.php', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (39, 'configuration.php?gparentID=110&gID=30&type=returns', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (40, 'configuration.php?gparentID=110&gID=30&type=return_reasons', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (41, 'configuration.php?gparentID=110&gID=30&type=refund_method', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (42, 'configuration.php?gparentID=110&gID=35', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (43, 'config_127.php', 0, 8, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (44, 'configuration.php?gparentID=127&gID=7', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (45, 'configuration.php?gparentID=127&gID=9', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (46, 'configuration.php?gparentID=127&gID=11', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (47, 'configuration.php?gparentID=127&gID=13', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (48, 'config_126.php', 0, 8, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (49, 'configuration.php?gparentID=126&gID=22', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (50, 'configuration.php?gparentID=126&gID=20', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (51, 'configuration.php?gparentID=126&gID=17', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (52, 'config_120.php', 0, 8, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (53, 'configuration.php?gparentID=120&gID=6', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (54, 'configuration.php?gparentID=120&gID=24', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (55, 'configuration.php?gparentID=120&gID=10', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (56, 'configuration.php?gparentID=120&gID=12', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (57, 'configuration.php?gparentID=120&gID=16', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (58, 'configuration.php?gparentID=120&gID=33', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (59, 'configuration.php?gparentID=120&gID=15', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (60, 'configuration.php?gparentID=120&gID=14', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (61, 'configuration.php?gparentID=120&gID=34', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (62, 'config_100.php', 0, 8, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (63, 'configuration.php?gparentID=100&gID=29', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (64, 'configuration.php?gparentID=100&gID=27', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (65, 'configuration.php?gparentID=100&gID=21', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (66, 'configuration.php?gparentID=100&gID=19', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (67, 'configuration.php?gparentID=100&gID=8', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (68, 'configuration.php?gparentID=100&gID=4', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (69, 'taxes_in_zone.php', 0, 8, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (70, 'countries.php', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (71, 'geo_zones.php', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (72, 'tax_classes.php', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (73, 'adminUsers.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (74, 'adminGroup.php', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (75, 'admin_members.php?gID=groups', 0, 1, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (76, 'modules.php?manager=process', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (77, 'plugins.php', 0, 0, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (78, 'stats.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (79, 'stats.php?module=stats_customers', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (80, 'stats.php?module=stats_low_stock_attrib', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (81, 'stats.php?module=stats_newsletter', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (82, 'stats.php?module=stats_products_purchased', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (83, 'stats.php?module=stats_products_viewed', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (84, 'stats.php?module=whos_online', 0, 6, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (85, 'ggsitemap.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (86, 'header_tags.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (87, 'batch_print.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (88, 'system.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (89, 'backup.php', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (90, 'configuration.php?gID=37', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (91, 'configuration.php?gID=36', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (92, 'currencies.php', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (93, 'newsletters.php', 0, 4, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (94, 'orders.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (95, 'held_orders.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (96, 'recover_cart_sales.php', 0, 7, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (97, 'products.php', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (98, 'products.php?cPath=&action=new', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (99, 'products.php?expected=true', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (100, 'attributes.php', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (101, 'categories.php', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (102, 'cms_content.php', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (103, 'navigation_links.php', 0, 5, '1');
+INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (104, 'editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php?type=image', 0, 5, '1');
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_groups.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_groups.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_admin_groups.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+if not exists (select * from osc_admin_groups where admin_groups_name = 'OSC_ADMIN_GROUPS_ADMIN' )
+insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('1', 'OSC_ADMIN_GROUPS_ADMIN');
+if not exists (select * from osc_admin_groups where admin_groups_name = 'OSC_ADMIN_GROUPS_SELLER' )
+insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('2', 'OSC_ADMIN_GROUPS_SELLER');
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_categories.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_categories.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_categories.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,30 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+-- deplacement des element de catgeorie tag
+
+Insert into osc_full_tag (page_id)
+Select c.categories_id from osc_categories c;
+
+Update osc_full_tag set page_type='cat' where page_type='';
+
+Insert into osc_full_tag_description (tag_id,language_id,head_title_tag,head_desc_tag,head_keywords_tag)
+Select distinct ft.tag_id,cd.language_id,c.category_head_title_tag,c.category_head_desc_tag,c.category_head_keywords_tag from osc_categories c, osc_categories_description cd, osc_full_tag ft Where c.categories_id=cd.categories_id and c.categories_id=ft.page_id and page_type='cat';
+
+ALTER TABLE osc_categories DROP category_head_title_tag;
+ALTER TABLE osc_categories DROP category_head_desc_tag;
+ALTER TABLE osc_categories DROP category_head_keywords_tag;
+
+
+UPDATE osc_categories SET categories_status = '1', categories_hidden = '1';
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_full_tag.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_full_tag.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/40_osc_full_tag.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+INSERT INTO osc_full_tag (tag_id, page_type, page_id) VALUES (1, 'generic', 'generic');
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_cip.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_cip.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_cip.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,32 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+insert into osc_cip values (1, 'Contrib_Installer_2.2', 1, 'CONTRIB_INSTALLER', '2.2');
+insert into osc_cip values (2, 'ADDRESS_BOOK_stable', 1, 'ADDRESS_BOOK_stable', '1.0');
+insert into osc_cip values (3, 'DESC_BASE_stable', 1, 'DESC_BASE_stable', '1.0');
+insert into osc_cip values (4, 'HEADER_TAGS_stable', 1, 'HEADER_TAGS_stable', '1.0');
+insert into osc_cip values (5, 'ACCOUNT_EXTRA_stable', 1, 'ACCOUNT_EXTRA_stable', '1.0');
+insert into osc_cip values (6, 'SPECIAL_stable', 1, 'SPECIAL_stable', '1.0');
+insert into osc_cip values (7, 'SVNUPDATE_unstable', 1, 'SVNUPDATE_unstable', '1.0');
+insert into osc_cip values (8, 'SPU_stable', 1, 'SPU_stable', '1.0');
+insert into osc_cip values (9, 'ITEM_stable', 1, 'ITEM_stable', '1.0');
+insert into osc_cip values (10, 'FLAT_stable', 1, 'FLAT_stable', '1.0');
+insert into osc_cip values (11, 'MZMT_stable', 1, 'MZMT_stable', '1.0');
+insert into osc_cip values (13, 'MONEYORDER_stable', 1, 'MONEYORDER_stable', '1.0');
+insert into osc_cip values (14, 'OT_TAX_stable', 1, 'OT_TAX_stable', '1.0');
+insert into osc_cip values (15, 'OT_SUBTOTAL_stable', 1, 'OT_SUBTOTAL_stable', '1.0');
+insert into osc_cip values (16, 'OT_TOTAL_stable', 1, 'OT_TOTAL_stable', '1.0');
+insert into osc_cip values (17, 'OT_SHIPPING_stable', 1, 'OT_SHIPPING_stable', '1.0');
+insert into osc_cip values (18, 'SVNUPDATE_stable', 1, 'SVNUPDATE_stable', '1.0');
+insert into osc_cip values (19, 'COD_stable', 1, 'COD_stable', '1.0');
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_configuration.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/1.2.2_2.1.0/data/91_osc_configuration.sql 2012-04-12 18:02:18 UTC (rev 4216)
@@ -0,0 +1,224 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('Order completed', 'DEFAULT_ORDERS_STATUS_COMPLETED', '3', 'definir le status final d\'une commande livre', '0', '0', NULL, NOW(), NULL, NULL,2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('Order annulate', 'DEFAULT_ORDERS_STATUS_ANNULATE', '4', 'definir le status d\'une commande annule', '0', '0', NULL, NOW(), NULL, NULL,2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function) values ('WHOS_ONLINE_ACTIVE_S', 'WHOS_ONLINE_FLAG', 'false', 'WHOS_ONLINE_ACTIVE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_Non_Edit(\';\',');
+
+## 1 store
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('ORDERS_NUMBER_PREFIX_S', 'ORDERS_NUMBER_PREFIX', 'ym-5', 'ORDERS_NUMBER_PREFIX_L', '1', '0', NULL, NOW(), '2');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_LOGO_S', 'STORE_LOGO', 'oscss_logo.png', 'STORE_LOGO_L', '1', '9', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_LOGO_PRINT_S', 'STORE_LOGO_PRINT', 'oscss_logo.png', 'STORE_LOGO_PRINT_L', '1', '10', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
+update osc_configuration set_function='tep_cfg_textarea(' where values configuration_key= 'STORE_NAME_ADDRESS';
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_LEGAL_INFO_S', 'STORE_LEGAL_INFO', 'legale info \n ', 'STORE_LEGAL_INFO_L', '1', '18', NULL, NOW(), NULL, 'tep_cfg_textarea(');
+
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added,set_function) values ('STORE_OFFLINE_S', 'STORE_OFFLINE', 'false', 'STORE_OFFLINE_L', '1', '30', NULL, NOW(),'tep_cfg_select_option(array(\'true\', \'false\'),');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_OFFLINE_TXT_S', 'STORE_OFFLINE_TXT', '', 'STORE_OFFLINE_TXT_L', '1', '31', NULL, NOW());
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('UNIT_WEIGHT_NAME_S', 'UNIT_WEIGHT_NAME', 'Kg', 'UNIT_WEIGHT_NAME_L', '2', '20', NULL, NOW());
+
+## 3 max value
+
+## 4 images
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('POPUP_IMAGE_WIDTH_S', 'POPUP_IMAGE_WIDTH', '600', 'POPUP_IMAGE_WIDTH_L', '4', '7', NULL, NOW(), NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('POPUP_IMAGE_HEIGHT_S', 'POPUP_IMAGE_HEIGHT', '600', 'POPUP_IMAGE_HEIGHT_L', '4', '8', NULL, NOW(), NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STACK_IMAGE_WIDTH_S', 'STACK_IMAGE_WIDTH', '50', 'STACK_IMAGE_WIDTH_L', '4', '9', NULL, NOW(), NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STACK_IMAGE_HEIGHT_S', 'STACK_IMAGE_HEIGHT', '50', 'STACK_IMAGE_HEIGHT_L', '4', '10', NULL, NOW(), NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('JPEG_QUALITY_S', 'JPEG_QUALITY', '95', 'JPEG_QUALITY_L', '4', '11', NULL, NOW(), NULL, 'tep_cfg_pull_down_num_list(80,100,1,');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('IMAGE_NONEXISTENT_S', 'IMAGE_NONEXISTENT', 'oscss_logo.png', 'IMAGE_NONEXISTENT_L', '4', '13', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
+
+## 6 module option
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_RETURN_REASON_S', 'DEFAULT_RETURN_REASON', '2', 'DEFAULT_RETURN_REASON_L', '6', '3', '2003-02-27 06:44:29', '1000-01-01 00:00:00', NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_RETURN_STATUS_ID_S', 'DEFAULT_RETURN_STATUS_ID', '1', 'DEFAULT_RETURN_STATUS_ID_L', '6', '4', '2003-02-28 07:10:04', '1000-01-01 00:00:00', NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_REFUND_METHOD_S', 'DEFAULT_REFUND_METHOD', '1', 'DEFAULT_REFUND_METHOD_L', '6', '5', '2003-03-01 16:46:12', '1000-01-01 00:00:00', NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ( 'MODULE_GENERIC_INSTALLED_S', 'MODULE_GENERIC_INSTALLED', '', 'MODULE_GENERIC_INSTALLED_L', '6', '6', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_GENERIC_INSTALLED_BO_S', 'MODULE_GENERIC_INSTALLED_BO', '', 'MODULE_GENERIC_INSTALLED_BO_L', '6', '7', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACAPRO_INSTALLED_S', 'MODULE_ACAPRO_INSTALLED', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_L', '6', '8', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_ACAPRO_INSTALLED_BO_S', 'MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_BO_L', '6', '9', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_CONTENT_INSTALLED_S', 'MODULE_CONTENT_INSTALLED', '', 'MODULE_CONTENT_INSTALLED_L', '6', '10', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_CONTENT_INSTALLED_BO_S', 'MODULE_CONTENT_INSTALLED_BO', '', 'MODULE_CONTENT_INSTALLED_BO_L', '6', '11', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACACAT_INSTALLED_S', 'MODULE_ACACAT_INSTALLED', '', 'MODULE_ACACAT_INSTALLED_L', '6', '12', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration ( configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ( 'MODULE_ACACAT_INSTALLED_BO_S', 'MODULE_ACACAT_INSTALLED_BO', '', 'MODULE_ACACAT_INSTALLED_BO_L', '6', '13', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',',1);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACCOUNT_INSTALLED_S', 'MODULE_ACCOUNT_INSTALLED', '', 'MODULE_ACCOUNT_INSTALLED_L', '6', '14', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_ACCOUNT_INSTALLED_BO_S', 'MODULE_ACCOUNT_INSTALLED_BO', '', 'MODULE_ACCOUNT_INSTALLED_BO_L', '6', '15', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ( 'MODULE_LISTING_INSTALLED_S', 'MODULE_LISTING_INSTALLED', '', 'MODULE_LISTING_INSTALLED_L', '6', '16', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_LISTING_INSTALLED_BO_S', 'MODULE_LISTING_INSTALLED_BO', '', 'MODULE_LISTING_INSTALLED_BO_L', '6', '17', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_HOME_INSTALLED_S', 'MODULE_HOME_INSTALLED', '', 'MODULE_HOME_INSTALLED_L', '6', '18', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_HOME_INSTALLED_BO_S', 'MODULE_HOME_INSTALLED_BO', '', 'MODULE_HOME_INSTALLED_BO_L', '6', '19', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_CHECKOUT_PROCESS_INSTALLED_S', 'MODULE_CHECKOUT_PROCESS_INSTALLED', '', 'MODULE_CHECKOUT_PROCESS_INSTALLED_L', '6', '20', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_CHECKOUT_PROCESS_INSTALLED_BO_S', 'MODULE_CHECKOUT_PROCESS_INSTALLED_BO', '', 'MODULE_CHECKOUT_PROCESS_INSTALLED_BO_L', '6', '21', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+
+update osc_configuration SET set_function='tep_cfg_Non_Edit(\';\',' where configuration_key= 'MODULE_SHIPPING_INSTALLED';
+update osc_configuration SET set_function='tep_cfg_Non_Edit(\';\',' where configuration_key= 'MODULE_PAYMENT_INSTALLED';
+update osc_configuration SET set_function='tep_cfg_Non_Edit(\';\',' where configuration_key= 'MODULE_ORDER_TOTAL_INSTALLED';
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PLUGIN_GENERIC_INSTALLED_S', 'PLUGIN_GENERIC_INSTALLED', '', 'PLUGIN_GENERIC_INSTALLED_L', '6', '25', NULL, NOW(), NULL...
[truncated message content] |
|
From: <os...@us...> - 2012-04-12 16:54:00
|
Revision: 4215
http://oscss.svn.sourceforge.net/oscss/?rev=4215&view=rev
Author: oscim
Date: 2012-04-12 16:53:51 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
suppression widget obsolete
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt
trunk/catalog/admin/includes/widget/ImagesLastAdded.php
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt 2012-04-12 16:53:31 UTC (rev 4214)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt 2012-04-12 16:53:51 UTC (rev 4215)
@@ -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['ImagesLastAdded heading']="dernières images ajoutées" ;
-
-$lang['ImagesLastAdded box reference']="Réf." ;
-$lang['ImagesLastAdded box file']="Fichier" ;
-$lang['ImagesLastAdded box date']="Ajouté le" ;
-$lang['ImagesLastAdded box width_height']="Dim." ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/ImagesLastAdded.php
===================================================================
--- trunk/catalog/admin/includes/widget/ImagesLastAdded.php 2012-04-12 16:53:31 UTC (rev 4214)
+++ trunk/catalog/admin/includes/widget/ImagesLastAdded.php 2012-04-12 16:53:51 UTC (rev 4215)
@@ -1,42 +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
-*/
-global $languages_id;
-
-$DB=Database::getInstance();
-$_query=$DB->query("SELECT * FROM " . TABLE_IMAGES . " ORDER BY date_added DESC LIMIT 7");
-
-
-if( !$_query->__get('numRows') )
- return false;
-
-$res = $_query->fetchAllAssoc();
-?>
-<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('ImagesLastAdded heading') ;?></h3>
-
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('ImagesLastAdded box reference'); ?></th>
- <th><?php echo __('ImagesLastAdded box file'); ?></th>
- <th><?php echo __('ImagesLastAdded box date'); ?></th>
- <th><?php echo __('ImagesLastAdded box width_height'); ?></th>
- </tr>
- <?php foreach($res as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['rowid'].'&action=edit') ?>"><?php echo $row['rowid'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['file'] ?></td>
- <td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
- <td class="tcenter"><?php echo $row['width'] .' x '. $row['height'] ?></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-12 16:53:40
|
Revision: 4214
http://oscss.svn.sourceforge.net/oscss/?rev=4214&view=rev
Author: oscim
Date: 2012-04-12 16:53:31 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Ajout widget last images
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLast.txt
trunk/catalog/admin/includes/widget/ImagesLast.php
Added: trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLast.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLast.txt 2012-04-12 16:53:31 UTC (rev 4214)
@@ -0,0 +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 0203/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['ImagesLast heading']="Images" ;
+
+$lang['ImagesLast tab added']="Ajoutées" ;
+$lang['ImagesLast tab updated']="Modifiées" ;
+
+$lang['ImagesLast box reference']="Réf." ;
+$lang['ImagesLast box file']="Fichier" ;
+$lang['ImagesLast box date']="Ajoutées le" ;
+$lang['ImagesLast box date up']="Modifiées le" ;
+$lang['ImagesLast box width_height']="Dim." ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/widget/ImagesLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/ImagesLast.php (rev 0)
+++ trunk/catalog/admin/includes/widget/ImagesLast.php 2012-04-12 16:53:31 UTC (rev 4214)
@@ -0,0 +1,76 @@
+<?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 $languages_id;
+
+$DB=Database::getInstance();
+$_query=$DB->query("SELECT * ,date_added as date FROM " . TABLE_IMAGES . " ORDER BY date_added DESC LIMIT ".$conf->widget_max_line);
+
+$_query2=$DB->query("SELECT * ,last_modified as date FROM " . TABLE_IMAGES . " WHERE last_modified IS NOT NULL 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;
+
+?>
+<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
+ <h3><?php echo __('ImagesLast heading') ;?></h3>
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('ImagesLast tab added'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('ImagesLast tab updated'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('ImagesLast box reference'); ?></th>
+ <th><?php echo __('ImagesLast box file'); ?></th>
+ <th><?php echo __('ImagesLast box date'); ?></th>
+ <th><?php echo __('ImagesLast box width_height'); ?></th>
+ </tr>
+ <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><?php echo $row['rowid'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['file'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['date']) ?></td>
+ <td class="tcenter"><?php echo $row['width'] .' x '. $row['height'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+
+ <div id="tabs-2" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('ImagesLast box reference'); ?></th>
+ <th><?php echo __('ImagesLast box file'); ?></th>
+ <th><?php echo __('ImagesLast box date up'); ?></th>
+ <th><?php echo __('ImagesLast box width_height'); ?></th>
+ </tr>
+ <?php foreach($_query2->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><?php echo $row['rowid'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['file'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['date']) ?></td>
+ <td class="tcenter"><?php echo $row['width'] .' x '. $row['height'] ?></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.
|
|
From: <os...@us...> - 2012-04-12 16:51:29
|
Revision: 4213
http://oscss.svn.sourceforge.net/oscss/?rev=4213&view=rev
Author: oscim
Date: 2012-04-12 16:51:18 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Suite travail nettoyage et amelioration des dashboard / widget
correction coquille liens menu dans les widget / lib.configuration.php
application_bottom amelioration js / liens + forceview , suppression des doublon dans les params pass?\195?\169 en GET
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/application_bottom.php
trunk/catalog/admin/includes/functions/lib.configuration.php
trunk/catalog/admin/includes/header.php
trunk/catalog/admin/includes/languages/fr_FR/configuration.php
trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/widget/CategorieLast.php
trunk/catalog/admin/includes/widget/CustomerLast.php
trunk/catalog/admin/includes/widget/HelpConfig.php
trunk/catalog/admin/includes/widget/ProductsLast.php
trunk/catalog/admin/includes/widget/currencies_update_server.php
trunk/catalog/admin/includes/widget/homeStock.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-12 16:51:18 UTC (rev 4213)
@@ -17,13 +17,12 @@
<catalog>
<left>
- <widget>homeStock</widget>
<widget>ProductsWizzard</widget>
-
+ <widget>homeStock</widget>
+ <widget>ProductsLast</widget>
</left>
<right>
-
- <widget>ProductsLast</widget>
+ <widget>CategorieLast</widget>
</right>
</catalog>
@@ -32,7 +31,7 @@
<widget>ContentLast</widget>
</left>
<right>
-<!-- <widget>ImagesLastAdded</widget> -->
+ <widget>ImagesLast</widget>
<widget>CategorieLast</widget>
</right>
</cms>
@@ -67,7 +66,7 @@
<config_39>
<left>
-<!-- <widget>ProductsWizzard</widget> -->
+ <widget>HelpConfig</widget>
</left>
<right>
<widget>SsMenuConfig</widget>
@@ -76,7 +75,7 @@
<config_40>
<left>
- <!-- <widget>ProductsWizzard</widget> -->
+ <widget>HelpConfig</widget>
</left>
<right>
<widget>SsMenuConfig</widget>
@@ -85,7 +84,7 @@
<config_100>
<left>
- <widget>HelpConfig</widget>
+ <widget>HelpConfig</widget>
</left>
<right>
<widget>SsMenuConfig</widget>
Modified: trunk/catalog/admin/includes/application_bottom.php
===================================================================
--- trunk/catalog/admin/includes/application_bottom.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/application_bottom.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -63,6 +63,7 @@
?>
<script type="text/javascript"><!--
+
/** Init page event js */
function post_load_page(){
@@ -78,16 +79,24 @@
//! Updat GET
$('a.buttonimg.fancy,a.button.fancy,form.fancy').each(function(){
- if(this.action !=null) this.action +='&forceajax=true';
- else this.href +='&forceajax=true';
+ var reg = /(forceview)/gi;
+ if( ! reg.test( this.href) )
+ this.href +='&forceview=true';
});
$('a.buttonimg.fancyView,a.button.fancyView,form.fancyView').each(function(){
- if(this.action !=null) this.action +='&forceview=true';
- else this.href +='&forceview=true';
+ var reg = /(forceview)/gi;
+ if( ! reg.test( this.href) )
+ this.href +='&forceview=true';
});
// Tabs Exe
- $('#tabs, .tabs').tabs({cookie: {expires:30}}).find('.ui-tabs-nav').sortable({axis:'x'});
+ var $tabs = $('#tabs, .tabs').tabs({cookie: {expires:30}}).find('.ui-tabs-nav').sortable({axis:'x'});
+
+// if(window.location.hash) {
+ // Fragment exists
+// $tabs.tabs('select', window.location.hash);
+// }
+
$('.tabs_lang').tabs().find('.ui-tabs-nav').sortable({axis:'x'});
Modified: trunk/catalog/admin/includes/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -10,18 +10,24 @@
*/
/**
- @brief Construction d'un sous menu des page de configuration, s'appuiyant sur la valeur de l'id parent.
+ @brief Construction d'un sous menu des page de configuration, s'appuyant sur la valeur de l'id parent.
@param $parent_id int parent id
@param $option array other option
*/
function tep_ssmenu_configuration($parent_id,$option=''){
$format_line_ssmenu= (isset($option['format_line_ssmenu'])) ? $option['format_line_ssmenu'] : "%1\$s"; //'<li class="'."%2\$s".'">'."%1\$s".'</li>' ."\n";
$link='';
- $configuration_groups_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle from " . TABLE_CONFIGURATION_GROUP . " WHERE configuration_group_parentid ='".$parent_id."' ORDER BY configuration_group_parentid , sort_order ASC");
+ $configuration_groups_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle, configuration_group_group_id as is_sub_menu from " . TABLE_CONFIGURATION_GROUP . " WHERE configuration_group_parentid ='".$parent_id."' ORDER BY configuration_group_parentid , sort_order ASC");
- while ($configuration_groups = tep_db_fetch_array($configuration_groups_query)) {
+ while ($row = tep_db_fetch_array($configuration_groups_query)) {
+
+ $href = (((int)$row['is_sub_menu'] ==1)
+ ? tep_href_link(FILENAME_DEFAULT, 'type=config_' .$row['cgID'], 'NONSSL') // sub menu get index.php + id dashboard
+ : tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $parent_id.'&gID=' . $row['cgID'], 'NONSSL') // normal link configuration page
+ );
+
$link .=sprintf($format_line_ssmenu,
- '<a href="' . tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $parent_id.'&gID=' . $configuration_groups['cgID'], 'NONSSL') . '" class="menuBoxContentLink config'.$configuration_groups['cgID'].'">' . tep_cst_menu_conf($configuration_groups['cgTitle']) . '</a>'."\n"
+ '<a href="' . $href . '" class="menuBoxContentLink config'.$row['cgID'].'">' . tep_cst_menu_conf($row['cgTitle']) . '</a>'."\n"
,$parent_id);
}
Modified: trunk/catalog/admin/includes/header.php
===================================================================
--- trunk/catalog/admin/includes/header.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/header.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -48,6 +48,10 @@
// init jquery
$(function() {
+// var anchor = jQuery.url.attr('anchor');
+//
+// alert(anchor);
+
//! slider block tirroir
$('.Ctrtirroir').each(function(){
$(this).click(function () {
Modified: trunk/catalog/admin/includes/languages/fr_FR/configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/configuration.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/languages/fr_FR/configuration.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -56,5 +56,7 @@
define('BOX_HEADING_CONF_TITLE_RECOVER_CART_SALES',"Gestion du système de récupération des panniers client abandonnées" );
define('BOX_HEADING_CONF_TITLE_MEMBRES_DETAIL',"Détail des informations demandées lors de l'inscription d'un membre/client" );
define('BOX_HEADING_CONF_TITLE_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
+// define('BOX_HEADING_CONF_TITLE_OPTION_CUSTOMERS',"Tiers Utilisateurs public (client/membres)" );
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt 2012-04-12 16:51:18 UTC (rev 4213)
@@ -8,7 +8,7 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-$lang['CategorieLast heading']="Catégories ajoutées/modifiées" ;
+$lang['CategorieLast heading']="Catégories" ;
$lang['CategorieLast tab added']="Crées" ;
$lang['CategorieLast tab updated']="Modifiées" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt 2012-04-12 16:51:18 UTC (rev 4213)
@@ -20,5 +20,6 @@
$lang['CustomerLast box date']="inscrit le" ;
$lang['CustomerLast box date up']="mise à jour" ;
$lang['CustomerLast box date log']="connecté le" ;
+$lang['CustomerLast box available']="Att." ;
$lang['CustomerLast box status']="Etat" ;
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt 2012-04-12 16:51:18 UTC (rev 4213)
@@ -10,6 +10,8 @@
*/
$lang['widget help config config_35']="Configuration des produits" ;
+$lang['widget help config config_39']="Configuration des utilisateurs - Aides" ;
+$lang['widget help config config_40']="Configuration du processus - Aides" ;
$lang['widget help config config_110']="Configuration de base" ;
$lang['widget help config config_100']="Configuration de l'apparence" ;
$lang['widget help config config_120']="Configuration avancée" ;
@@ -17,5 +19,31 @@
$lang['widget help config config_127']="Configuration commerciale de votre boutique" ;
-$lang['widget text help config_110']="Dans cette section de la configuration, vous pouvez regler les informations de base de la boutique. Cette Etape est un prerequis pour un le focntionnement normal de votre shop. Notez que ces information ne sont en generale reglé qu'une seule fois; " ;
+$lang['HelpConfig link config_39'] = "Caractéristique des utilisateurs et comportement à l'inscription";
+$lang['widget text help config_39']="Ajuster les paramétres inherant au utilisateurs public, ainsi que le comportement du moteur(core) lors de l'inscription : %s.
+<br /> N'oubliez pas de configurer le template une fois celui-ci choisi. " ;
+
+$lang['HelpConfig link config_40 step 1'] = "Commandes / Totaux ";
+$lang['HelpConfig link config_40 step 2'] = "Expedition / Emballage ";
+$lang['widget text help config_40']="Commande / Totaux / comportement processus : %s <br />
+Gerer les seuils d'etat des commande , les modules de totaux et leur configuration, les numérotations
+<br /> Expedition / emballage : %s <br />
+Localiser votre entrepot (peut être different de l'adresse du siege), Gerer les modules d'expedition/livraison, et configurer les. " ;
+
+
+$lang['HelpConfig link template'] = "Choix du template";
+$lang['widget text help config_100 step 1']="Dans cette section , vous pouvez regler l'aspect visuel , en commencant par le choix du template(thême): %s.
+<br /> N'oubliez pas de configurer le template une fois celui-ci choisi. " ;
+
+
+$lang['HelpConfig link myshop'] = "Configuration minimal de la boutique";
+$lang['widget text help config_110']="Dans cette section de la configuration, vous pouvez regler les informations de base de la boutique: %s.
+<br /> Cette Etape est un pre-requis pour le fonctionnement normal de votre shop. Notez que ces information ne sont en generale reglé qu'une seule fois; " ;
+
+$lang['HelpConfig link template'] = "Choix du template";
+$lang['widget text help config_100 step 1']="Dans cette section , vous pouvez regler l'aspect visuel , en commencant par le choix du template(thême): %s.
+<br /> N'oubliez pas de configurer le template une fois celui-ci choisi. " ;
+
+
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt 2012-04-12 16:51:18 UTC (rev 4213)
@@ -18,4 +18,7 @@
$lang['ProductsLast box name']="Produits" ;
$lang['ProductsLast box date']="ajouté le" ;
$lang['ProductsLast box status']="Etat" ;
+
+$lang['ProductsLast txt active']="Actif" ;
+$lang['ProductsLast txt inactive']="Inactif" ;
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -16,70 +16,79 @@
class products
implements ExtModPage, InterfacedTJsonS, InterfacedInnerHtml{
+ /**
+ @def FILENAME current page
+ */
const FILENAME = FILENAME_PRODUCTS;
-
/**
- @p string $code
+ @var string $code
*/
public static $code;
/**
- @p string $action
+ @var string $action
*/
public static $action;
/**
- @p array $modules
+ @var array $modules
*/
public static $list=array();
/**
- @p array $modules
+ @var array $modules
*/
public static $modules;
/**
- @p array $languages
+ @var array $languages
*/
public static $languages;
/**
- @p objet $pInfo
+ @var objet $pInfo
*/
public static $pInfo;
/**
- @p array $tax_class_array
+ @var array $tax_class_array
*/
public static $tax_class_array;
/**
- @p array $track_stock tableau gestion stock
+ @var array $track_stock tableau gestion stock
*/
public static $track_stock;
-
/**
- @p bool $in_status
+ @var bool $in_status
*/
public static $in_status;
/**
- @p bool $in_status
+ @var bool $in_status
*/
public static $out_status;
/**
- @p array $product_investigation cf Qtpro
+ @var array $product_investigation cf Qtpro
*/
public static $product_investigation;
/**
- @p array $DiversInfo transport var
+ @var array $DiversInfo transport var
*/
public static $DiversInfo;
/**
- @p array $actions
+ @var array $actions
*/
public static $actions;
/**
- @p obj $box
+ @var obj $box
*/
public static $box;
-
-
+ /**
+ @var strign cPath
+ */
public static $cPath;
+ /**
+ @var int type product
+ */
public static $Vtype;
+
+ /**
+ @brief constructor
+ */
public function __construct(){
self::GetConf();
}
Modified: trunk/catalog/admin/includes/widget/CategorieLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/CategorieLast.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/widget/CategorieLast.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -10,10 +10,27 @@
*/
global $languages_id, $conf;
+$where='';
+$title='';
+
+/**
+ Use type for determine specific categories_datatype
+*/
+if(isset($_GET['type'])){
+ switch ($_GET['type']) {
+ case 'catalog': $type = 'product'; break;
+ case 'cms': $type = 'content'; break;
+ }
+
+ $where =" AND (categories_datatype = '".tep_db_input($type)."' OR categories_datatype ='' )";
+ $title = ' (DataType : '.$type.')';
+}
+
+
$DB=Database::getInstance();
-$_query=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.date_added DESC LIMIT ".$conf->widget_max_line);
+$_query=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ".$where." ORDER BY p.date_added DESC LIMIT ".$conf->widget_max_line);
-$_query2=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.last_modified DESC LIMIT ".$conf->widget_max_line);
+$_query2=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ".$where." ORDER BY p.last_modified DESC LIMIT ".$conf->widget_max_line);
// if
$new = ( !$_query->__get('numRows') ) ? false : true ;
@@ -26,7 +43,7 @@
$res2 = $_query2->fetchAllAssoc();
?>
<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('CategorieLast heading') ;?></h3>
+ <h3><?php echo __('CategorieLast heading').$title ;?></h3>
<div id="tabs">
<ul>
@@ -44,7 +61,7 @@
</tr>
<?php foreach($res as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></a></strong></td>
<td style="width:200px;"><?php echo $row['categories_name'] ?></td>
<td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
<td class="tcenter">
@@ -68,7 +85,7 @@
</tr>
<?php foreach($res2 as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></a></strong></td>
<td style="width:200px;"><?php echo $row['categories_name'] ?></td>
<td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
<td class="tcenter">
Modified: trunk/catalog/admin/includes/widget/CustomerLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/CustomerLast.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/widget/CustomerLast.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -14,7 +14,7 @@
$_query2 = tep_db_query("SELECT c.*, ci.customers_info_date_account_last_modified as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_account_last_modified DESC LIMIT ".$conf->widget_max_line);
-$_query3 = tep_db_query("SELECT c.*, ci.customers_info_date_account_created as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) WHERE c.customers_group_ra = '0' ORDER BY customers_info_date_account_created DESC LIMIT ".$conf->widget_max_line);
+$_query3 = tep_db_query("SELECT c.*, ci.customers_info_date_account_created as date , customers_group_ra FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) WHERE c.customers_group_ra = '0' ORDER BY customers_info_date_account_created DESC LIMIT ".$conf->widget_max_line);
$_query4 = tep_db_query("SELECT c.*, ci.customers_info_date_of_last_logon as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_of_last_logon DESC LIMIT ".$conf->widget_max_line);
@@ -57,10 +57,15 @@
</tr>
<?php foreach($_query->fetchAllAssoc() as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></a></strong></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']) ?></td>
- <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> txt"><?php echo (($row['customers_status'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
@@ -76,10 +81,15 @@
</tr>
<?php foreach($_query2->fetchAllAssoc() as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></a></strong></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']) ?></td>
- <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> txt"><?php echo (($row['customers_status'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
@@ -92,14 +102,26 @@
<th><?php echo __('CustomerLast box reference'); ?></th>
<th><?php echo __('CustomerLast box customers'); ?></th>
<th><?php echo __('CustomerLast box date'); ?></th>
+ <th><?php echo __('CustomerLast box available'); ?></th>
<th><?php echo __('CustomerLast box status'); ?></th>
</tr>
<?php foreach($_query3->fetchAllAssoc() as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></a></strong></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']) ?></td>
- <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Val-<?php echo $row['customers_group_ra'] ?> txt"><?php echo (($row['customers_group_ra'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Val-<?php echo $row['customers_group_ra'] ?> img"></span>
+ </span>
+ </td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> txt"><?php echo (($row['customers_status'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
@@ -120,7 +142,12 @@
<td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></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']) ?></td>
- <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> txt"><?php echo (($row['customers_status'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['customers_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
Modified: trunk/catalog/admin/includes/widget/HelpConfig.php
===================================================================
--- trunk/catalog/admin/includes/widget/HelpConfig.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/widget/HelpConfig.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -1,27 +1,66 @@
<?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
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 25/10/11, 11:00
+ @date 11/04/2012, 11:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+global $conf;
+
+$DB=Database::getInstance();
?>
<div id="HelpConfig" class="<?php echo $widg['class'] ?>" >
<h3><?php echo __('widget help config '.@$_GET['type']) ?></h3>
-
+
<?php
switch(@$_GET['type']){
- case 'config_110':
- echo __('widget text help config_110');
- break;
+ case 'config_39': // user
+ echo '<p>'.
+ sprintf(
+ __('widget text help config_39'),
+ '<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=39&gID=1').'">'.__('HelpConfig link myshop').'</a>'
+ ).
+ '</p>';
+ break;
+ case 'config_40': // orders
+ echo '<p>'.
+ sprintf(
+ __('widget text help config_40'),
+ '<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=40&gID=129').'">'.__('HelpConfig link config_40 step 1').'</a>',
+ '<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=40&gID=7').'">'.__('HelpConfig link config_40 step 2').'</a>'
+ ).
+ '</p>';
+ break;
+
+ case 'config_110': // base
+ echo '<p>'.
+ sprintf(
+ __('widget text help config_110'),
+ '<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=110&gID=1').'">'.__('HelpConfig link myshop').'</a>'
+ ).
+ '</p>';
+ break;
+
+ case 'config_100': // apparence
+
+ // check choose template
+ $res = sqlconfiguration::fetch(array('key'=>'TEMPLATE_NAME'), true);
+ if( tep_not_null($res->modified) && $res->modified > $res->added )
+ echo '<p>'.
+ sprintf(
+ __('widget text help config_100 step 1'),
+ '<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=100&gID=29').'">'.__('HelpConfig link template').'</a>'
+ ).
+ '</p>';
+
}
?>
Modified: trunk/catalog/admin/includes/widget/ProductsLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/ProductsLast.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/widget/ProductsLast.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -48,10 +48,15 @@
</tr>
<?php foreach($_query->fetchAllAssoc() as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></a></strong></td>
<td style="width:200px;"><?php echo $row['products_name'] ?></td>
<td class="tcenter"><?php echo tep_date_short($row['products_date_added']) ?></td>
- <td class="tcenter"><?php echo $row['products_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['products_status'] ?> txt"><?php echo (($row['products_status'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['products_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
@@ -69,10 +74,15 @@
</tr>
<?php foreach($_query2->fetchAllAssoc() as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></a></strong></td>
<td style="width:200px;"><?php echo $row['products_name'] ?></td>
<td class="tcenter"><?php echo tep_date_short($row['products_last_modified']) ?></td>
- <td class="tcenter"><?php echo $row['products_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['products_status'] ?> txt"><?php echo (($row['products_status'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['products_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
@@ -90,12 +100,19 @@
</tr>
<?php foreach($_query3->fetchAllAssoc() as $row) : ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></a></strong></td>
<td style="width:200px;"><?php echo $row['products_name'] ?></td>
<td class="tcenter"><?php echo tep_date_short($row['products_date_available']) ?></td>
- <td class="tcenter"><?php echo $row['products_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['products_status'] ?> txt"><?php echo (($row['products_status'] ==1)? __('ProductsLast txt active') : __('ProductsLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['products_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
</div>
+
+ </div>
</div>
Modified: trunk/catalog/admin/includes/widget/currencies_update_server.php
===================================================================
--- trunk/catalog/admin/includes/widget/currencies_update_server.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/widget/currencies_update_server.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -1,10 +1,10 @@
<?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
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 22/09/11, 17:18
+ @date 12/04/2012, 20:02
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -12,5 +12,5 @@
<div id="currencies_update_server" class="<?php echo $widg['class'] ?>" >
<h3><?php echo __('Suivi des devises') ?></h3>
- <?php echo '<a href="' . tep_href_link(FILENAME_CURRENCIES, 'page=1&cID=1&action=update') . '">' . IMAGE_UPDATE_CURRENCIES . '</a>'; ?>
+ <p><?php echo '<a href="' . tep_href_link(FILENAME_CURRENCIES, 'page=1&cID=1&action=update') . '">' . IMAGE_UPDATE_CURRENCIES . '</a>'; ?></p>
</div>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/widget/homeStock.php
===================================================================
--- trunk/catalog/admin/includes/widget/homeStock.php 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/admin/includes/widget/homeStock.php 2012-04-12 16:51:18 UTC (rev 4213)
@@ -24,7 +24,7 @@
return false;
?>
<div id="homeStock" class="<?php echo $widg['class'] ?>">
- <h3><a href="<?php echo tep_href_link(FILENAME_STATS,'module=stats_low_stock_attrib') ?>"><?php printf(__('heading stock %s'), count($l)) ;?></a></h3>
+ <h3><a href="<?php echo tep_href_link(FILENAME_STOCK) ?>"><?php printf(__('heading stock %s'), count($l)) ;?></a></h3>
<table class="dataTableBase">
<tr>
@@ -34,13 +34,17 @@
</tr>
<?php $i = 0; foreach($l as $p) : $i++; if( $i> $conf->widget_max_line) break; ?>
<tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$p['products_id'].'&action=edit') ?>"><?php echo $p['products_id'] ?></strong></td>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$p['products_id'].'&action=edit') ?>"><?php echo $p['products_id'] ?></a></strong></td>
<?php if(isset($p['option']) && is_array($p['option'])) : ?>
- <td style="width:200px;"><?php echo htmlspecialchars($p['products_name'].' '.implode(' ,',$p['option'])) ?></td>
- <td><?php echo $p['option_stock'] ?></td>
+ <td style="width:200px;"><?php echo htmlspecialchars($p['products_name']).' <i>'.htmlspecialchars(implode(' ,',$p['option'])).'</i>' ?></td>
+ <td class="tcenter">
+ <a href="<?php echo tep_href_link(FILENAME_STOCK,'product_id='.$p['products_id'].'&origin='.urlencode('index.php?type=catalog')) ?>"><?php echo $p['option_stock'] ?>
+ </td>
<?php else : ?>
<td style="width:200px;"><?php echo htmlspecialchars($p['products_name']) ?></td>
- <td class="tcenter"><?php echo $p['stock'] ?></td>
+ <td class="tcenter">
+ <a href="<?php echo tep_href_link(FILENAME_STOCK,'product_id='.$p['products_id'].'&origin='.urlencode('index.php?type=catalog')) ?>"><?php echo $p['stock'] ?></a>
+ </td>
<?php endif; ?>
</tr>
<?php endforeach; ?>
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2012-04-12 07:19:39 UTC (rev 4212)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2012-04-12 16:51:18 UTC (rev 4213)
@@ -354,7 +354,7 @@
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ANNULATE', '-1', 'DEFAULT_ORDERS_STATUS_ID_L', '129', '0', NULL, NOW(),'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_PAYED_S', 'DEFAULT_ORDERS_STATUS_PAYED', '2', 'DEFAULT_ORDERS_STATUS_PAYED_L', '129', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('ORDERS_NUMBER_PREFIX_S', 'ORDERS_NUMBER_PREFIX', 'ym-5', 'ORDERS_NUMBER_PREFIX_L', '129', '0', NULL, NOW(), '2');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_ORDER_REF_S', 'USE_LOCAL_GENERAT_ORDER_REF', '10', 'USE_LOCAL_GENERAT_ORDER_REF_L', '129', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_ORDER_REF_S', 'USE_LOCAL_GENERAT_ORDER_REF', 'true', 'USE_LOCAL_GENERAT_ORDER_REF_L', '129', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-- 130 option data types
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-12 07:19:46
|
Revision: 4212
http://oscss.svn.sourceforge.net/oscss/?rev=4212&view=rev
Author: oscim
Date: 2012-04-12 07:19:39 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Ajsutement du menu d'admin et des var de configuration lors d'un upgrade
Modified Paths:
--------------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration_group.sql
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration_group.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration_group.sql 2012-04-12 07:19:39 UTC (rev 4212)
@@ -0,0 +1,54 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 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/ |
+--+######################################################################--+
+
+
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 100,configuration_group_title = 'APPARENCE',configuration_group_parentid = 0,configuration_group_group_id = '1',configuration_group_key = 'CG_APPARENCE' WHERE configuration_group_id = 100;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 19,configuration_group_title = 'PAGE_PRODUCT_DETAIL',configuration_group_parentid = 100,configuration_group_group_id = '0',configuration_group_key = 'CG_PAGE_PRODUCT_DETAIL' WHERE configuration_group_id = 19;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 4,configuration_group_title = 'IMAGES',configuration_group_parentid = 100,configuration_group_group_id = '0',configuration_group_key = 'MODIMAGES' WHERE configuration_group_id = 4;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 8,configuration_group_title = 'LIST_PRODUTCS',configuration_group_parentid = 100,configuration_group_group_id = '0',configuration_group_key = 'CG_LIST_PRODUTCS' WHERE configuration_group_id = 8;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 21,configuration_group_title = 'OPEN_BOX',configuration_group_parentid = 100,configuration_group_group_id = '0',configuration_group_key = 'CG_OPEN_BOX' WHERE configuration_group_id = 21;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 27,configuration_group_title = 'APPARENCE_GENERAL',configuration_group_parentid = 100,configuration_group_group_id = '0',configuration_group_key = 'CG_APPARENCE_GENERAL' WHERE configuration_group_id = 27;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 29,configuration_group_title = 'BOX_CONFIGURATION_TEMPLATE',configuration_group_parentid = 100,configuration_group_group_id = '0',configuration_group_key = 'MODTEMPLATE' WHERE configuration_group_id = 29;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 110,configuration_group_title = 'CONFIGURATION',configuration_group_parentid = 0,configuration_group_group_id = '1',configuration_group_key = 'CG_CONFIGURATION' WHERE configuration_group_id = 110;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 2,configuration_group_title = 'VALUE_MINI',configuration_group_parentid = 110,configuration_group_group_id = '0',configuration_group_key = 'CG_VALUE_MINI' WHERE configuration_group_id = 2;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 1,configuration_group_title = 'MY_BOUTIQUE',configuration_group_parentid = 110,configuration_group_group_id = '0',configuration_group_key = 'CG_MY_BOUTIQUE' WHERE configuration_group_id = 1;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 30,configuration_group_title = 'BOX_LOCALIZATION_ORDERS_STATUS',configuration_group_parentid = 110,configuration_group_group_id = '0',configuration_group_key = 'MODSTATUS' WHERE configuration_group_id = 30;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 120,configuration_group_title = 'CONFIG_AVANCE',configuration_group_parentid = 0,configuration_group_group_id = '1',configuration_group_key = 'CG_CONFIG_AVANCE' WHERE configuration_group_id = 120;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 24,configuration_group_title = 'CG_CIP_MANAGER',configuration_group_parentid = 120,configuration_group_group_id = '0',configuration_group_key = 'CG_CIP_MANAGER' WHERE configuration_group_id = 24;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 10,configuration_group_title = 'LOGGING',configuration_group_parentid = 120,configuration_group_group_id = '1',configuration_group_key = 'CG_LOGGING' WHERE configuration_group_id = 10;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 12,configuration_group_title = 'OPTION_MAIL',configuration_group_parentid = 120,configuration_group_group_id = '0',configuration_group_key = 'MODMAIL' WHERE configuration_group_id = 12;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 14,configuration_group_title = 'COMPRESSION',configuration_group_parentid = 120,configuration_group_group_id = '0',configuration_group_key = 'CG_COMPRESSION' WHERE configuration_group_id = 14;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 15,configuration_group_title = 'SESSION',configuration_group_parentid = 120,configuration_group_group_id = '0',configuration_group_key = 'CG_SESSION' WHERE configuration_group_id = 15;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 16,configuration_group_title = 'SEO_URL',configuration_group_parentid = 120,configuration_group_group_id = '0',configuration_group_key = 'MODSEOURL' WHERE configuration_group_id = 16;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 31,configuration_group_title = 'BOX_LOCALIZATION_LANGUAGES',configuration_group_parentid = 120,configuration_group_group_id = '0',configuration_group_key = 'MODLANGUE' WHERE configuration_group_id = 31;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 128,configuration_group_title = 'BOX_CONFIGURATION_ENVIRONEMENT',configuration_group_parentid = 120,configuration_group_group_id = '0',configuration_group_key = 'CFG_ENVIRONEMENT' WHERE configuration_group_id = 128;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 126,configuration_group_title = 'ESPACE_ADMIN',configuration_group_parentid = 0,configuration_group_group_id = '1',configuration_group_key = 'CG_ESPACE_ADMIN' WHERE configuration_group_id = 126;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 17,configuration_group_title = 'QUICK_UPDATE',configuration_group_parentid = 126,configuration_group_group_id = '0',configuration_group_key = 'MODADMINCONFIG' WHERE configuration_group_id = 17;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 20,configuration_group_title = 'PRODUCT_ATTENTE',configuration_group_parentid = 126,configuration_group_group_id = '0',configuration_group_key = 'CG_PRODUCT_ATTENTE' WHERE configuration_group_id = 20;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 22,configuration_group_title = 'RECOVER_CART_SALES',configuration_group_parentid = 126,configuration_group_group_id = '0',configuration_group_key = 'CG_RECOVER_CART_SALES' WHERE configuration_group_id = 22;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 127,configuration_group_title = 'CONFIG_COMM',configuration_group_parentid = 0,configuration_group_group_id = '1',configuration_group_key = 'CG_CONFIG_COMM' WHERE configuration_group_id = 127;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 9,configuration_group_title = 'STOCK',configuration_group_parentid = 127,configuration_group_group_id = '0',configuration_group_key = 'MODSTOCK' WHERE configuration_group_id = 9;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 11,configuration_group_title = 'OPTION_CATALOG',configuration_group_parentid = 127,configuration_group_group_id = '0',configuration_group_key = 'CG_OPTION_CATALOG' WHERE configuration_group_id = 11;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 35,configuration_group_title = 'OPTION_PRODUCTS',configuration_group_parentid = 127,configuration_group_group_id = '1',configuration_group_key = 'OPTION_PRODUCTS' WHERE configuration_group_id = 35;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 36,configuration_group_title = 'CONFIG_PRODUCTS',configuration_group_parentid = 35,configuration_group_group_id = '0',configuration_group_key = 'DATATYPEPRODUCT' WHERE configuration_group_id = 36;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 13,configuration_group_title = 'DOWNLOADS',configuration_group_parentid = 35,configuration_group_group_id = '0',configuration_group_key = 'MODDOWNLOADS' WHERE configuration_group_id = 13;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 34,configuration_group_title = 'BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS',configuration_group_parentid = 35,configuration_group_group_id = '0',configuration_group_key = 'MODPRODEXTRA' WHERE configuration_group_id = 34;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 25,configuration_group_title = 'NEW_PRODUCTS',configuration_group_parentid = 35,configuration_group_group_id = '0',configuration_group_key = 'CG_NEW_PRODUCTS' WHERE configuration_group_id = 25;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 39,configuration_group_title = 'OPTION_CUSTOMERS',configuration_group_parentid = 127,configuration_group_group_id = '1',configuration_group_key = 'OPTION_CUSTOMERS' WHERE configuration_group_id = 39;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 28,configuration_group_title = 'MEMBRES_DETAIL',configuration_group_parentid = 39,configuration_group_group_id = '0',configuration_group_key = 'MODMEMBRES' WHERE configuration_group_id = 28;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 33,configuration_group_title = 'BOX_CONFIGURATION_EXTRA_FIELDS',configuration_group_parentid = 39,configuration_group_group_id = '0',configuration_group_key = 'MODCUSTEXTRA' WHERE configuration_group_id = 33;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 40,configuration_group_title = 'OPTION_ORDERS',configuration_group_parentid = 127,configuration_group_group_id = '1',configuration_group_key = 'OPTION_ORDERS' WHERE configuration_group_id = 40;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 129,configuration_group_title = 'CONFIGURATION_ORDERS',configuration_group_parentid = 40,configuration_group_group_id = '0',configuration_group_key = 'MODORDER' WHERE configuration_group_id = 129;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 7,configuration_group_title = 'EXPEDITION_EMBALLAGE',configuration_group_parentid = 40,configuration_group_group_id = '0',configuration_group_key = 'MODEXPEDITION' WHERE configuration_group_id = 7;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 37,configuration_group_title = 'VIEW_SYSINFO',configuration_group_parentid = 120,configuration_group_group_id = '1',configuration_group_key = 'MODSYSINFO' WHERE configuration_group_id = 37;
+UPDATE IGNORE osc_configuration_group SET configuration_group_id = 38,configuration_group_title = 'VIEW_SYSINFO',configuration_group_parentid = 120,configuration_group_group_id = '1',configuration_group_key = 'MODCORECACHE' WHERE configuration_group_id = 38;
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2012-04-11 19:32:01 UTC (rev 4211)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2012-04-12 07:19:39 UTC (rev 4212)
@@ -292,8 +292,6 @@
UPDATE osc_configuration SET configuration_key = 'CUSTOMER_FORCE_STRTOUPPER',configuration_title = 'CUSTOMER_FORCE_STRTOUPPER_S',configuration_description = 'CUSTOMER_FORCE_STRTOUPPER_L',configuration_group_id = 28,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'CUSTOMER_FORCE_STRTOUPPER';
UPDATE osc_configuration SET configuration_key = 'CUSTOMER_CITY_FORCE_STRTOUPPER',configuration_title = 'CUSTOMER_CITY_FORCE_STRTOUPPER_S',configuration_description = 'CUSTOMER_CITY_FORCE_STRTOUPPER_L',configuration_group_id = 28,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'CUSTOMER_CITY_FORCE_STRTOUPPER';
UPDATE osc_configuration SET configuration_key = 'CUSTOMER_PUBLIC_PROFIL',configuration_title = 'CUSTOMER_PUBLIC_PROFIL_S',configuration_description = 'CUSTOMER_PUBLIC_PROFIL_L',configuration_group_id = 28,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'CUSTOMER_PUBLIC_PROFIL';
-UPDATE osc_configuration SET configuration_key = 'USE_LOCAL_GENERAT_PDF',configuration_title = 'USE_LOCAL_GENERAT_PDF_S',configuration_description = 'USE_LOCAL_GENERAT_PDF_L',configuration_group_id = 128,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'USE_LOCAL_GENERAT_PDF';
-UPDATE osc_configuration SET configuration_key = 'USE_MODELE_PDF',configuration_title = 'USE_MODELE_PDF_S',configuration_description = 'USE_MODELE_PDF_L',configuration_group_id = 128,use_function = NULL,set_function = '',last_modified = NULL WHERE configuration_key = 'USE_MODELE_PDF';
UPDATE osc_configuration SET configuration_key = 'DEFAULT_ORDERS_STATUS_ID',configuration_title = 'DEFAULT_ORDERS_STATUS_ID_S',configuration_description = 'DEFAULT_ORDERS_STATUS_ID_L',configuration_group_id = 129,use_function = 'tep_cfg_pull_down_order_statuses(',set_function = 'tep_cfg_pull_down_order_statuses(',last_modified = NULL WHERE configuration_key = 'DEFAULT_ORDERS_STATUS_ID';
UPDATE osc_configuration SET configuration_key = 'DEFAULT_ORDERS_STATUS_COMPLETED',configuration_title = 'DEFAULT_ORDERS_STATUS_COMPLETED_S',configuration_description = 'DEFAULT_ORDERS_STATUS_COMPLETED_L',configuration_group_id = 129,use_function = 'tep_cfg_pull_down_order_statuses(',set_function = 'tep_cfg_pull_down_order_statuses(',last_modified = NULL WHERE configuration_key = 'DEFAULT_ORDERS_STATUS_COMPLETED';
UPDATE osc_configuration SET configuration_key = 'DEFAULT_ORDERS_STATUS_ANNULATE',configuration_title = 'DEFAULT_ORDERS_STATUS_ID_S',configuration_description = 'DEFAULT_ORDERS_STATUS_ID_L',configuration_group_id = 129,use_function = 'tep_cfg_pull_down_order_statuses(',set_function = 'tep_cfg_pull_down_order_statuses(',last_modified = NULL WHERE configuration_key = 'DEFAULT_ORDERS_STATUS_ANNULATE';
@@ -301,4 +299,17 @@
UPDATE osc_configuration SET configuration_key = 'ORDERS_NUMBER_PREFIX',configuration_title = 'ORDERS_NUMBER_PREFIX_S',configuration_description = 'ORDERS_NUMBER_PREFIX_L',configuration_group_id = 129,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'ORDERS_NUMBER_PREFIX';
UPDATE osc_configuration SET configuration_key = 'USE_LOCAL_GENERAT_ORDER_REF',configuration_title = 'USE_LOCAL_GENERAT_ORDER_REF_S',configuration_description = 'USE_LOCAL_GENERAT_ORDER_REF_L',configuration_group_id = 129,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'USE_LOCAL_GENERAT_ORDER_REF';
UPDATE osc_configuration SET configuration_key = 'PUBLIC_PAGE_TYPE',configuration_title = 'PUBLIC_PAGE_TYPE_S',configuration_description = 'PUBLIC_PAGE_TYPE_L',configuration_group_id = 130,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'PUBLIC_PAGE_TYPE';
-UPDATE osc_configuration SET configuration_key = 'DATATYPES',configuration_title = 'DATATYPES_S',configuration_description = 'DATATYPES_L',configuration_group_id = 130,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'DATATYPES';
+
+
+
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_ORDERS_STATUS_COMPLETED',configuration_title = 'DEFAULT_ORDERS_STATUS_COMPLETED_S',configuration_description = 'DEFAULT_ORDERS_STATUS_COMPLETED_L',configuration_group_id = 129,use_function = 'tep_cfg_pull_down_order_statuses(',set_function = 'tep_cfg_pull_down_order_statuses(',last_modified = NULL WHERE configuration_key = 'DEFAULT_ORDERS_STATUS_COMPLETED';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_ORDERS_STATUS_ANNULATE',configuration_title = 'DEFAULT_ORDERS_STATUS_ID_S',configuration_description = 'DEFAULT_ORDERS_STATUS_ID_L',configuration_group_id = 129,use_function = 'tep_cfg_pull_down_order_statuses(',set_function = 'tep_cfg_pull_down_order_statuses(',last_modified = NULL WHERE configuration_key = 'DEFAULT_ORDERS_STATUS_ANNULATE';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_ORDERS_STATUS_PAYED',configuration_title = 'DEFAULT_ORDERS_STATUS_PAYED_S',configuration_description = 'DEFAULT_ORDERS_STATUS_PAYED_L',configuration_group_id = 129,use_function = 'tep_cfg_pull_down_order_statuses(',set_function = 'tep_cfg_pull_down_order_statuses(',last_modified = NULL WHERE configuration_key = 'DEFAULT_ORDERS_STATUS_PAYED';
+UPDATE osc_configuration SET configuration_key = 'USE_LOCAL_GENERAT_ORDER_REF',configuration_title = 'USE_LOCAL_GENERAT_ORDER_REF_S',configuration_description = 'USE_LOCAL_GENERAT_ORDER_REF_L',configuration_group_id = 129,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'USE_LOCAL_GENERAT_ORDER_REF';
+
+-- 128 General environement
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_PDF_S', 'USE_LOCAL_GENERAT_PDF', 'true', 'USE_LOCAL_GENERAT_PDF_L', '128', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_MODELE_PDF_S', 'USE_MODELE_PDF', 'harry', 'USE_MODELE_PDF_L', '128', '5', NULL, NOW(), NULL, '','2');
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_S', 'DATATYPES', 'error, product,content, diver, categorie, manufacturer,home,', 'DATATYPES_L', '130', '0', NOW(), NOW(),NULL, NULL, 2);
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 19:32:08
|
Revision: 4211
http://oscss.svn.sourceforge.net/oscss/?rev=4211&view=rev
Author: oscim
Date: 2012-04-11 19:32:01 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Correction coquille
Ajout d'une class en dev, pour le traitement diff?\195?\169re des manipulation sur la db
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/gabarit/products/display_view.new.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
trunk/catalog/admin/includes/modules/pages/stock.php
trunk/catalog/admin/includes/template/defaut/data/icon_set.xml
trunk/catalog/admin/includes/widget/CustomerLast.php
trunk/catalog/common/classes/osCSS_pdf.php
trunk/catalog/install/includes/content/core.installdb.php
Added Paths:
-----------
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-11 19:32:01 UTC (rev 4211)
@@ -143,15 +143,11 @@
<left>
<widget>Notification</widget>
<widget>homeStock</widget>
-<!-- <widget>dashbordInfo</widget> -->
- <widget>orderLastnews</widget>
<widget>CustomerLast</widget>
- <widget>info_connexion</widget>
</left>
<right>
<widget class="graph" querystring="Sales">salesStats</widget>
-<!-- <widget>homeNews</widget> -->
-
+ <widget>orderLastnews</widget>
</right>
</home>
Added: trunk/catalog/admin/includes/classes/oscss_DBIndex.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_DBIndex.php (rev 0)
+++ trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-11 19:32:01 UTC (rev 4211)
@@ -0,0 +1,105 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 11/04/2012, 18:17
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief Base manipulate and track all table in core osCSS.
+ Manage add /install / dusplique for multi-language
+
+
+
+ Not used !!! In dev
+*/
+
+
+Class oscss_DBIndex {
+
+ /**
+ @def path
+ */
+ const T_AVAILABLE = 'admin/origin/db/tables/';
+
+ /**
+ @brief constructor
+ */
+ function __construct(){
+ // index all tables
+ $all = $this->ListTablesAvailable();
+
+ }
+
+
+
+ /**
+ @brief Browse Folder stock file define table
+ */
+ function ListTablesAvailable(){
+ $contents = array();
+
+ foreach (scan(DIR_FS_ROOT_DOCS . self::T_AVAILABLE ) as $file ) {
+ $ext=substr($file,-3);
+ $name = substr($file,-(strlen($ext)+1));
+ $key = false;
+ if( ( $pos =strpos($name, '.')) > 0 && ($new_name = substr($name, 0, $pos))){
+ $name = $new_name;
+ $key = true;
+
+ if (in_array($ext, array('sql')) ){
+ $tmp = array(
+ 'file'=>$file,
+ 'name'=>$name ,
+ 'extension'=>$ext,
+ 'type'=>(($key) ? 't' : 'k' )
+ );
+
+ if($key){
+ /*
+ Traitement des clef et recherche des liaision vers la table language
+ Si une liaison existe, celle ci considere la table associé comme une table de langue et celle ci sera duspliqué lors de l'ajout d'une nouvelle language
+ */
+ $fp = fopen(DIR_FS_ROOT_DOCS . self::T_AVAILABLE .$file , 'rb');
+ $test = array();
+ while (!feof ($fp)) {
+ $buf = fgets($fp, 4096);
+ if (substr($buf, 0, 2) <> '--' ) {
+ $buf=preg_all_match ('#(REFERENCES[ ]{1,}osc_languages[ ]{1,}[\(]languages_id[\)])#i' ,$buf, $match);
+ $test[]= ((count($match)>1)? true : false );
+ }
+ }
+ fclose($fp);
+
+ if(in_array(true,$test ))
+ $contents['lang'][$name] = $tmp;
+ }
+
+ $contents['table'][$name] = $tmp;
+ }
+ }
+ sort($contents);
+
+// foreach ($contents as $row ) {
+// }
+
+ return $contents;
+ }
+
+
+ /**
+ @brief Browse Folder stock file define table
+ */
+ function ListTablesInstalled(){
+ }
+
+ /**
+ @brief Browse Folder stock file define table
+ */
+ function ListTablesInstallable(){
+ }
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.new.gab 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.new.gab 2012-04-11 19:32:01 UTC (rev 4211)
@@ -20,8 +20,8 @@
</dt>
</dl>
</div>
- <div class="box_right">
- <?php echo __('text info intro choose product type') ?>
+ <div class="box_right" >
+ <p class="Info"><?php echo __('text info intro choose product type') ?></p>
</div>
<div class="button_nav">
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt 2012-04-11 19:32:01 UTC (rev 4211)
@@ -24,7 +24,7 @@
$lang['datatypeproduct tableheading virtual']="Virtuel" ;
/* tab physqiue */
-$lang['datatypeproduct tab physique']="physqiue" ;
+$lang['datatypeproduct tab physique']="Physique" ;
/* tab virtuel */
$lang['datatypeproduct tab virtual']="virtuel" ;
Modified: trunk/catalog/admin/includes/modules/pages/stock.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-11 19:32:01 UTC (rev 4211)
@@ -14,11 +14,17 @@
implements ExtModPage, InterfaceModule {
const FILENAME = FILENAME_STOCK;
-
+ /**
+ @var string name module
+ */
public static $code;
-
+ /**
+ @var string current GET[action]
+ */
public static $action;
-
+ /**
+ @var array
+ */
public static $list=array();
/**
@var array
@@ -50,7 +56,8 @@
public static $pID;
/**
- class constructor
+ @fn __construct()
+ @brief class constructor
*/
public function __construct() {
self::$code=__CLASS__;
@@ -65,6 +72,10 @@
// define('JSONSTATMENT', 'mod=page&type='.self::$code);
}
+ /**
+ @fn check_action($actions)
+ @brief
+ */
public function check_action($actions){
global $messageStack;
@@ -156,10 +167,18 @@
return self::$action;
}
+
+ /**
+ @fn get_header()
+ @brief
+ */
public function get_header(){
}
-
+ /**
+ @fn load_db_values($ID)
+ @brief
+ */
public static function load_db_values($ID){
global $languages_id;
$DB=Database::getInstance();
@@ -196,14 +215,20 @@
self::$investigation = qtpro_doctor_investigate_product($ID);
}
-
+ /**
+ @fn load_db_stock()
+ @brief
+ */
public static function load_db_stock(){
$DB=Database::getInstance();
$q=$DB->query("select * from " . TABLE_PRODUCTS_STOCK . " where products_id=" . self::$pID . " order by products_stock_attributes");
return $q->fetchAllAssoc();
}
-
+ /**
+ @fn display_view()
+ @brief
+ */
public function display_view(){
switch(self::$action){
case 'doctor';
@@ -231,7 +256,10 @@
}
-
+ /**
+ @fn tep_get_modele()
+ @brief
+ */
public static function tep_get_modele(){
return array(
'products_id' =>true,
@@ -242,6 +270,12 @@
);
}
+
+ /**
+ @fn tep_get_list()
+ @brief construct list for loop listing
+ @return array
+ */
public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
global $query_numrows,$languages_id;
@@ -256,7 +290,7 @@
// just physical product
if(strlen(TYPE_VIRTUAL_PRODUCTS) > 2 )
- $sWhere .=" AND products_type NOT IN (".TYPE_VIRTUAL_PRODUCTS.") ";
+ $sWhere .=" AND products_type NOT IN (". (( substr(TYPE_VIRTUAL_PRODUCTS,-1) ==',') ? substr(TYPE_VIRTUAL_PRODUCTS, 0,-1) : TYPE_VIRTUAL_PRODUCTS ) .") ";
$query_raw = "SELECT distinct p.products_id, pd.products_name, p.products_model, p.products_quantity,p.products_price, l.name from " . TABLE_PRODUCTS . " p LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd ON (p.products_id = pd.products_id AND pd.language_id = '" . (int)$languages_id . "' ) , " . TABLE_LANGUAGES . " l WHERE p.products_id = pd.products_id AND l.languages_id = pd.language_id ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
@@ -651,13 +685,51 @@
return $count_ret;
}
-/** 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 false; }
+
+ /**
+ @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/template/defaut/data/icon_set.xml
===================================================================
--- trunk/catalog/admin/includes/template/defaut/data/icon_set.xml 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/admin/includes/template/defaut/data/icon_set.xml 2012-04-11 19:32:01 UTC (rev 4211)
@@ -1,116 +1,171 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<root>
- <set>
- </set>
-
- <img>
- <icon>
- <admin_files>admin_files.png</admin_files>
- <arrow_right>icon_arrow_right.gif</arrow_right>
- <calendar>calendar.png</calendar>
- <categories>categories.png</categories>
- <copy_hover>copy_hover.png</copy_hover>
- <copy>copy.png</copy>
- <copyto>icon_copy.png</copyto>
- <cross>cross.gif</cross>
- <csv_hover>csv_hover.png</csv_hover>
- <csv>csv.png</csv>
- <current_folder>current_folder.png</current_folder>
- <delete>icon_delete.png</delete>
- <dir>icon_plus.png</dir>
- <details_close>details_close.png</details_close>
- <details_open>details_open.png</details_open>
- <edit>icon_edit.png</edit>
- <info>icon_info.gif</info>
- <install>install.gif</install>
- <publiclink>icon_link.jpg</publiclink>
- <stock>icon_stock.jpeg</stock>
- <new>icon_add_new.png</new>
- <noedit>icon_view.png</noedit>
- <preview>previews.png</preview>
- <view>icon_view.png</view>
-<!-- <recup_order></recup_order> -->
- <remove>remove.gif</remove>
- <stats>icon_stats.png</stats>
- <statistic>statistics.gif</statistic>
- <send>icon_send.png</send>
- <sendtest>icon_sendtest.png</sendtest>
- <incarner>icon_incarn.png</incarner>
-
- <inventaire_update>cog_add.png</inventaire_update>
- <inventaire_export>arrow_switch.png</inventaire_export>
-
- <dbdelete>icon_db_remove.png</dbdelete>
- <dbrestore>icon_db_restore.png</dbrestore>
- <dbupload>icon_db_upload.png</dbupload>
- <dbdownload>icon_db_download.png</dbdownload>
-
- <package_installed>icon_edit.png</package_installed>
- <package_a_remove>icon_edit.png</package_a_remove>
- <package_config>icon_edit.png</package_config>
- <package_is_zip>icon_edit.png</package_is_zip>
- <package_is_folder>icon_edit.png</package_is_folder>
- </icon>
- </img>
-
-
- <gabarit>
- <row_action_right>
- <link>
- <icon width="18" height="18"><![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]> </icon>
- <text><![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]> </text>
- </link>
- <button>
-
- </button>
- </row_action_right>
-
- <row_action_left>
- <mode>icon</mode>
- <icon><![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]> </icon>
- <text><![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]> </text>
- </row_action_left>
-
- <button_nav>
- <link>
- <icon width="18" height="18"><![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]> </icon>
- <text><![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]> </text>
- </link>
- <button>
- </button>
- <submit>
- <icon width="18" height="18" src="true"><![CDATA[<input type="submit" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]> </icon>
- <text><![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]> </text>
- </submit>
- </button_nav>
- <button_action>
- <link>
- <icon width="18" height="18"><![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]> </icon>
- <text><![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]> </text>
- </link>
- <button>
- <icon width="18" height="18" src="true"><![CDATA[<input type="image" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]> </icon>
- <text><![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]> </text>
- </button>
- <submit>
- <icon width="18" height="18" src="true"><![CDATA[<input type="submit" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]> </icon>
- <text><![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]> </text>
- </submit>
- </button_action>
- </gabarit>
-
- <format>
- <row_action>
- <![CDATA[<div class="row_action">
- <span class="view fils fleft"> %s </span>
- <span class="view fils fright "> %s </span>
- </div>]]>
- </row_action>
- <row_status>
- <![CDATA[<div class="row_action">
- <span class="view fils fleft"> %s </span>
- <span class="view fils fright "> %s </span>
- </div>]]>
- </row_status>
+ <set>
+ </set>
+
+ <img>
+ <icon>
+ <admin_files>admin_files.png</admin_files>
+ <arrow_right>icon_arrow_right.gif</arrow_right>
+ <calendar>calendar.png</calendar>
+ <categories>categories.png</categories>
+ <copy_hover>copy_hover.png</copy_hover>
+ <copy>copy.png</copy>
+ <copyto>icon_copy.png</copyto>
+ <cross>cross.gif</cross>
+ <csv_hover>csv_hover.png</csv_hover>
+ <csv>csv.png</csv>
+ <current_folder>current_folder.png</current_folder>
+ <delete>icon_delete.png</delete>
+ <dir>icon_plus.png</dir>
+ <details_close>details_close.png</details_close>
+ <details_open>details_open.png</details_open>
+ <edit>icon_edit.png</edit>
+ <plus>icon_plus.gif</plus>
+ <deplis>icon_down.gif</deplis>
+ <plis>icon_arrow_right.gif</plis>
+ <info>icon_info.gif</info>
+ <install>install.gif</install>
+ <publiclink>icon_link.jpg</publiclink>
+ <stock>icon_stock.jpeg</stock>
+ <new>icon_add_new.png</new>
+ <noedit>icon_view.png</noedit>
+ <preview>previews.png</preview>
+ <view>icon_view.png</view>
+ <trash>icon_trash.gif</trash>
+ <refresh>refresh.png</refresh>
+ <config>settings.png</config>
+ <heldorder>arrow_switch.png</heldorder>
+ <childs>icon_plus.gif</childs>
+ <!-- <recup_order>
+ </recup_order> -->
+ <remove>remove.gif</remove>
+ <stats>icon_stats.png</stats>
+ <statistic>statistics.gif</statistic>
+ <send>icon_send.png</send>
+ <sendtest>icon_sendtest.png</sendtest>
+ <incarner>icon_incarn.png</incarner>
+
+ <inventaire_update>cog_add.png</inventaire_update>
+ <inventaire_export>arrow_switch.png</inventaire_export>
+
+ <dbdelete>icon_db_remove.png</dbdelete>
+ <dbrestore>icon_db_restore.png</dbrestore>
+ <dbupload>icon_db_upload.png</dbupload>
+ <dbdownload>icon_db_download.png</dbdownload>
+
+ <package_installed>icon_edit.png</package_installed>
+ <package_a_remove>icon_edit.png</package_a_remove>
+ <package_config>icon_edit.png</package_config>
+ <package_is_zip>icon_edit.png</package_is_zip>
+ <package_is_folder>icon_edit.png</package_is_folder>
+ </icon>
+ </img>
+
+
+ <gabarit>
+ <row_action_right>
+ <link>
+ <icon width="18" height="18">
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </link>
+ <button>
+
+ </button>
+ </row_action_right>
+
+ <row_action_left>
+ <mode>icon</mode>
+ <icon>
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </row_action_left>
+
+ <button_nav>
+ <link>
+ <icon width="18" height="18">
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </link>
+ <button>
+ </button>
+ <submit>
+ <icon width="18" height="18" src="true">
+ <![CDATA[<input type="submit" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]>
+ </icon>
+ <text>
+ <![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]>
+ </text>
+ </submit>
+ </button_nav>
+ <button_action>
+ <link>
+ <icon width="18" height="18">
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </link>
+ <button>
+ <icon width="18" height="18" src="true">
+ <![CDATA[<input type="image" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]>
+ </icon>
+ <text>
+ <![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]>
+ </text>
+ </button>
+ <submit>
+ <icon width="18" height="18" src="true">
+ <![CDATA[<input type="submit" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]>
+ </icon>
+ <text>
+ <![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]>
+ </text>
+ </submit>
+ </button_action>
+ </gabarit>
+
+ <format>
+ <row_action>
+ <![CDATA[<div class="row_action">
+ <span class="view fils fleft"> %s </span>
+ <span class="view fils fright "> %s </span>
+ </div>]]>
+ </row_action>
+ <row_status>
+ <![CDATA[<div class="row_action">
+ <span class="view fils fleft"> %s </span>
+ <span class="view fils fright "> %s </span>
+ </div>]]>
+ </row_status>
+ <row_etat>
+ <![CDATA[
+ <span class="edit-input-value">
+ <span class="Val Val-%1$s txt">%2$s</span>
+ <span class="Val Val-%1$s img">
+ </span>
+ </span>
+ ]]>
+ </row_etat>
+ <row_flag>
+ <![CDATA[
+ <span class="edit-input-value">
+ <span class="Val Flag-%1$s txt">%2$s</span>
+ <span class="Val Flag-%1$s img">
+ </span>
+ </span>
+ ]]>
+ </row_flag>
</format>
</root>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/widget/CustomerLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/CustomerLast.php 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/admin/includes/widget/CustomerLast.php 2012-04-11 19:32:01 UTC (rev 4211)
@@ -14,7 +14,7 @@
$_query2 = tep_db_query("SELECT c.*, ci.customers_info_date_account_last_modified as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_account_last_modified DESC LIMIT ".$conf->widget_max_line);
-$_query3 = tep_db_query("SELECT c.*, ci.customers_info_date_account_created as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) WHERE customers_group_ra = 0 ORDER BY customers_info_date_account_created DESC LIMIT ".$conf->widget_max_line);
+$_query3 = tep_db_query("SELECT c.*, ci.customers_info_date_account_created as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) WHERE c.customers_group_ra = '0' ORDER BY customers_info_date_account_created DESC LIMIT ".$conf->widget_max_line);
$_query4 = tep_db_query("SELECT c.*, ci.customers_info_date_of_last_logon as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_of_last_logon DESC LIMIT ".$conf->widget_max_line);
@@ -91,7 +91,7 @@
<tr>
<th><?php echo __('CustomerLast box reference'); ?></th>
<th><?php echo __('CustomerLast box customers'); ?></th>
- <th><?php echo __('CustomerLast box date log'); ?></th>
+ <th><?php echo __('CustomerLast box date'); ?></th>
<th><?php echo __('CustomerLast box status'); ?></th>
</tr>
<?php foreach($_query3->fetchAllAssoc() as $row) : ?>
Modified: trunk/catalog/common/classes/osCSS_pdf.php
===================================================================
--- trunk/catalog/common/classes/osCSS_pdf.php 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/common/classes/osCSS_pdf.php 2012-04-11 19:32:01 UTC (rev 4211)
@@ -67,8 +67,8 @@
global $oscss,$language;
/// BO
- if(is_object($oscss))
- $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modeles/pdf/'.USE_MODELE_PDF.'.txt');
+ if(is_object($oscss))
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modeles/pdf/'.USE_MODELE_PDF.'/'.USE_MODELE_PDF.'.txt');
/// FO
global $page;
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2012-04-11 17:04:31 UTC (rev 4210)
+++ trunk/catalog/install/includes/content/core.installdb.php 2012-04-11 19:32:01 UTC (rev 4211)
@@ -24,8 +24,7 @@
$this->get_fs_document_root();
$this->get_db_conf();
- osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower(
-$this->db['DBMOTOR_TYPE']) );
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower($this->db['DBMOTOR_TYPE']) );
osc_db_select_db($this->db['DB_DATABASE']);
$db_error = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 17:04:44
|
Revision: 4210
http://oscss.svn.sourceforge.net/oscss/?rev=4210&view=rev
Author: oscim
Date: 2012-04-11 17:04:31 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Mise a niveau des menus de configuration , des directives associ?\195?\169, de la gestion des langues par fichiers
Modified Paths:
--------------
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql 2012-04-11 14:36:49 UTC (rev 4209)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql 2012-04-11 17:04:31 UTC (rev 4210)
@@ -12,4 +12,249 @@
--+######################################################################--+
-delete from osc_configuration where configuration_key='DIR_FS_CIP' limit 1;
\ No newline at end of file
+delete from osc_configuration where configuration_key='DIR_FS_CIP' limit 1;
+
+
+UPDATE osc_configuration SET configuration_key = 'TEMPLATE_NAME',configuration_title = 'TEMPLATE_NAME_S',configuration_description = 'TEMPLATE_NAME_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'TEMPLATE_NAME';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_CURRENCY',configuration_title = 'DEFAULT_CURRENCY_S',configuration_description = 'DEFAULT_CURRENCY_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'DEFAULT_CURRENCY';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_LANGUAGE',configuration_title = 'DEFAULT_LANGUAGE_S',configuration_description = 'DEFAULT_LANGUAGE_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'DEFAULT_LANGUAGE';
+UPDATE osc_configuration SET configuration_key = 'WHOS_ONLINE_FLAG',configuration_title = 'WHOS_ONLINE_ACTIVE_S',configuration_description = 'WHOS_ONLINE_ACTIVE_L',configuration_group_id = 0,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NOW() WHERE configuration_key = 'WHOS_ONLINE_FLAG';
+UPDATE osc_configuration SET configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_1',configuration_title = 'CFG_CLASS_VIRTUAL_TYPE_1_S',configuration_description = 'CFG_CLASS_VIRTUAL_TYPE_L',configuration_group_id = 0,use_function = NULL,set_function = 'tep_cfg_text_auto(',last_modified = NOW() WHERE configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_1';
+UPDATE osc_configuration SET configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_2',configuration_title = 'CFG_CLASS_VIRTUAL_TYPE_2_S',configuration_description = 'CFG_CLASS_VIRTUAL_TYPE_L',configuration_group_id = 0,use_function = NULL,set_function = 'tep_cfg_text_auto(',last_modified = NOW() WHERE configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_2';
+UPDATE osc_configuration SET configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_3',configuration_title = 'CFG_CLASS_VIRTUAL_TYPE_3_S',configuration_description = 'CFG_CLASS_VIRTUAL_TYPE_L',configuration_group_id = 0,use_function = NULL,set_function = 'tep_cfg_text_auto(',last_modified = NOW() WHERE configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_3';
+UPDATE osc_configuration SET configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_4',configuration_title = 'CFG_CLASS_VIRTUAL_TYPE_4_S',configuration_description = 'CFG_CLASS_VIRTUAL_TYPE_L',configuration_group_id = 0,use_function = NULL,set_function = 'tep_cfg_text_auto(',last_modified = NOW() WHERE configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_4';
+UPDATE osc_configuration SET configuration_key = 'TYPE_VIRTUAL_PRODUCTS',configuration_title = 'TYPE_VIRTUAL_PRODUCTS_S',configuration_description = 'TYPE_VIRTUAL_PRODUCTS_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = '2012-03-29 22:24:19' WHERE configuration_key = 'TYPE_VIRTUAL_PRODUCTS';
+UPDATE osc_configuration SET configuration_key = 'ORPHELIN_COLLECTOR',configuration_title = 'ORPHELIN_COLLECTOR_S',configuration_description = 'ORPHELIN_COLLECTOR_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'ORPHELIN_COLLECTOR';
+UPDATE osc_configuration SET configuration_key = 'PUBLIC_DRIVERS_PAGE',configuration_title = 'PUBLIC_DRIVERS_PAGE_S',configuration_description = 'PUBLIC_DRIVERS_PAGE_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'PUBLIC_DRIVERS_PAGE';
+UPDATE osc_configuration SET configuration_key = 'NO_DISPLAY_SYMBOL_TAXE',configuration_title = 'NO_DISPLAY_SYMBOL_TAXE_S',configuration_description = 'NO_DISPLAY_SYMBOL_TAXE_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'NO_DISPLAY_SYMBOL_TAXE';
+UPDATE osc_configuration SET configuration_key = 'STORE_NAME',configuration_title = 'STORE_NAME_S',configuration_description = 'STORE_NAME_L',configuration_group_id = 1,use_function = NULL,set_function = NULL,last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_NAME';
+UPDATE osc_configuration SET configuration_key = 'STORE_OWNER',configuration_title = 'STORE_OWNER_S',configuration_description = 'STORE_OWNER_L',configuration_group_id = 1,use_function = NULL,set_function = NULL,last_modified = '2012-04-02 17:08:32' WHERE configuration_key = 'STORE_OWNER';
+UPDATE osc_configuration SET configuration_key = 'STORE_OWNER_EMAIL_ADDRESS',configuration_title = 'STORE_OWNER_EMAIL_ADDRESS_S',configuration_description = 'STORE_OWNER_EMAIL_ADDRESS_L',configuration_group_id = 1,use_function = NULL,set_function = NULL,last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_OWNER_EMAIL_ADDRESS';
+UPDATE osc_configuration SET configuration_key = 'EMAIL_FROM',configuration_title = 'EMAIL_FROM_S',configuration_description = 'EMAIL_FROM_L',configuration_group_id = 1,use_function = NULL,set_function = NULL,last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'EMAIL_FROM';
+UPDATE osc_configuration SET configuration_key = 'STORE_COUNTRY',configuration_title = 'STORE_COUNTRY_S',configuration_description = 'STORE_COUNTRY_L',configuration_group_id = 1,use_function = 'tep_get_country_name',set_function = 'tep_cfg_pull_down_country_list(',last_modified = '2012-04-02 17:08:32' WHERE configuration_key = 'STORE_COUNTRY';
+UPDATE osc_configuration SET configuration_key = 'STORE_ZONE',configuration_title = 'STORE_ZONE_S',configuration_description = 'STORE_ZONE_L',configuration_group_id = 1,use_function = 'tep_cfg_get_zone_name',set_function = 'tep_cfg_pull_down_zone_list(',last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_ZONE';
+UPDATE osc_configuration SET configuration_key = 'STORE_LOGO',configuration_title = 'STORE_LOGO_S',configuration_description = 'STORE_LOGO_L',configuration_group_id = 1,use_function = NULL,set_function = 'tep_cfg_choose_img(',last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_LOGO';
+UPDATE osc_configuration SET configuration_key = 'STORE_LOGO_PRINT',configuration_title = 'STORE_LOGO_PRINT_S',configuration_description = 'STORE_LOGO_PRINT_L',configuration_group_id = 1,use_function = NULL,set_function = 'tep_cfg_choose_img(',last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_LOGO_PRINT';
+UPDATE osc_configuration SET configuration_key = 'STORE_NAME_ADDRESS',configuration_title = 'STORE_NAME_ADDRESS_S',configuration_description = 'STORE_NAME_ADDRESS_L',configuration_group_id = 1,use_function = NULL,set_function = 'tep_cfg_textarea(',last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_NAME_ADDRESS';
+UPDATE osc_configuration SET configuration_key = 'STORE_LEGAL_INFO',configuration_title = 'STORE_LEGAL_INFO_S',configuration_description = 'STORE_LEGAL_INFO_L',configuration_group_id = 1,use_function = NULL,set_function = 'tep_cfg_textarea(',last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_LEGAL_INFO';
+UPDATE osc_configuration SET configuration_key = 'STORE_OFFLINE',configuration_title = 'STORE_OFFLINE_S',configuration_description = 'STORE_OFFLINE_L',configuration_group_id = 1,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-03-27 18:06:28' WHERE configuration_key = 'STORE_OFFLINE';
+UPDATE osc_configuration SET configuration_key = 'STORE_OFFLINE_TXT',configuration_title = 'STORE_OFFLINE_TXT_S',configuration_description = 'STORE_OFFLINE_TXT_L',configuration_group_id = 1,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'STORE_OFFLINE_TXT';
+UPDATE osc_configuration SET configuration_key = 'STORE_OFFLINE_MODE',configuration_title = 'STORE_OFFLINE_MODE_S',configuration_description = 'STORE_OFFLINE_MODE_L',configuration_group_id = 1,use_function = NULL,set_function = 'tep_cfg_select_option(array(''block'', ''redirect''),',last_modified = NULL WHERE configuration_key = 'STORE_OFFLINE_MODE';
+UPDATE osc_configuration SET configuration_key = 'TAX_DECIMAL_PLACES',configuration_title = 'TAX_DECIMAL_PLACES_S',configuration_description = 'TAX_DECIMAL_PLACES_L',configuration_group_id = 2,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'TAX_DECIMAL_PLACES';
+UPDATE osc_configuration SET configuration_key = 'UNIT_WEIGHT_NAME',configuration_title = 'UNIT_WEIGHT_NAME_S',configuration_description = 'UNIT_WEIGHT_NAME_L',configuration_group_id = 2,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'UNIT_WEIGHT_NAME';
+UPDATE osc_configuration SET configuration_key = 'SMALL_IMAGE_WIDTH',configuration_title = 'SMALL_IMAGE_WIDTH_S',configuration_description = 'SMALL_IMAGE_WIDTH_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'SMALL_IMAGE_WIDTH';
+UPDATE osc_configuration SET configuration_key = 'SMALL_IMAGE_HEIGHT',configuration_title = 'SMALL_IMAGE_HEIGHT_S',configuration_description = 'SMALL_IMAGE_HEIGHT_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'SMALL_IMAGE_HEIGHT';
+UPDATE osc_configuration SET configuration_key = 'HEADING_IMAGE_WIDTH',configuration_title = 'HEADING_IMAGE_WIDTH_S',configuration_description = 'HEADING_IMAGE_WIDTH_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'HEADING_IMAGE_WIDTH';
+UPDATE osc_configuration SET configuration_key = 'HEADING_IMAGE_HEIGHT',configuration_title = 'HEADING_IMAGE_HEIGHT_S',configuration_description = 'HEADING_IMAGE_HEIGHT_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'HEADING_IMAGE_HEIGHT';
+UPDATE osc_configuration SET configuration_key = 'SUBCATEGORY_IMAGE_WIDTH',configuration_title = 'SUBCATEGORY_IMAGE_WIDTH_S',configuration_description = 'SUBCATEGORY_IMAGE_WIDTH_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'SUBCATEGORY_IMAGE_WIDTH';
+UPDATE osc_configuration SET configuration_key = 'SUBCATEGORY_IMAGE_HEIGHT',configuration_title = 'SUBCATEGORY_IMAGE_HEIGHT_S',configuration_description = 'SUBCATEGORY_IMAGE_HEIGHT_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'SUBCATEGORY_IMAGE_HEIGHT';
+UPDATE osc_configuration SET configuration_key = 'POPUP_IMAGE_WIDTH',configuration_title = 'POPUP_IMAGE_WIDTH_S',configuration_description = 'POPUP_IMAGE_WIDTH_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'POPUP_IMAGE_WIDTH';
+UPDATE osc_configuration SET configuration_key = 'POPUP_IMAGE_HEIGHT',configuration_title = 'POPUP_IMAGE_HEIGHT_S',configuration_description = 'POPUP_IMAGE_HEIGHT_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'POPUP_IMAGE_HEIGHT';
+UPDATE osc_configuration SET configuration_key = 'STACK_IMAGE_WIDTH',configuration_title = 'STACK_IMAGE_WIDTH_S',configuration_description = 'STACK_IMAGE_WIDTH_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'STACK_IMAGE_WIDTH';
+UPDATE osc_configuration SET configuration_key = 'STACK_IMAGE_HEIGHT',configuration_title = 'STACK_IMAGE_HEIGHT_S',configuration_description = 'STACK_IMAGE_HEIGHT_L',configuration_group_id = 4,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'STACK_IMAGE_HEIGHT';
+UPDATE osc_configuration SET configuration_key = 'JPEG_QUALITY',configuration_title = 'JPEG_QUALITY_S',configuration_description = 'JPEG_QUALITY_L',configuration_group_id = 4,use_function = NULL,set_function = 'tep_cfg_pull_down_num_list(80,100,1,',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'JPEG_QUALITY';
+UPDATE osc_configuration SET configuration_key = 'IMAGE_REQUIRED',configuration_title = 'IMAGE_REQUIRED_S',configuration_description = 'IMAGE_REQUIRED_L',configuration_group_id = 4,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'IMAGE_REQUIRED';
+UPDATE osc_configuration SET configuration_key = 'IMAGE_NONEXISTENT',configuration_title = 'IMAGE_NONEXISTENT_S',configuration_description = 'IMAGE_NONEXISTENT_L',configuration_group_id = 4,use_function = NULL,set_function = 'tep_cfg_choose_img(',last_modified = NOW() WHERE configuration_key = 'IMAGE_NONEXISTENT';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_RETURN_REASON',configuration_title = 'DEFAULT_RETURN_REASON_S',configuration_description = 'DEFAULT_RETURN_REASON_L',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = '2003-02-27 06:44:29' WHERE configuration_key = 'DEFAULT_RETURN_REASON';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_RETURN_STATUS_ID',configuration_title = 'DEFAULT_RETURN_STATUS_ID_S',configuration_description = 'DEFAULT_RETURN_STATUS_ID_L',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = '2003-02-28 07:10:04' WHERE configuration_key = 'DEFAULT_RETURN_STATUS_ID';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_REFUND_METHOD',configuration_title = 'DEFAULT_REFUND_METHOD_S',configuration_description = 'DEFAULT_REFUND_METHOD_L',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = '2003-03-01 16:46:12' WHERE configuration_key = 'DEFAULT_REFUND_METHOD';
+UPDATE osc_configuration SET configuration_key = 'MODULE_GENERIC_INSTALLED',configuration_title = 'Modules génériques installés',configuration_description = 'Liste des modules génériques installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'MODULE_GENERIC_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_GENERIC_INSTALLED_BO',configuration_title = '[admin]Modules génériques installés',configuration_description = 'Liste des modules génériques installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_GENERIC_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ACAPRO_INSTALLED',configuration_title = 'Modules de produit installés',configuration_description = 'Liste des modules de produit installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-10 19:35:08' WHERE configuration_key = 'MODULE_ACAPRO_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ACAPRO_INSTALLED_BO',configuration_title = '[admin]Modules de produit installés',configuration_description = 'Liste des modules de produit installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-10 19:35:07' WHERE configuration_key = 'MODULE_ACAPRO_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_CONTENT_INSTALLED',configuration_title = 'Modules de contenu installés',configuration_description = 'Liste des modules de contenu installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_CONTENT_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_CONTENT_INSTALLED_BO',configuration_title = '[admin] Modules de contenu installés',configuration_description = 'Liste des modules de contenu installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_CONTENT_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ACACAT_INSTALLED',configuration_title = 'Modules de catégorie installés',configuration_description = 'Liste des modules de catégories installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_ACACAT_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ACACAT_INSTALLED_BO',configuration_title = '[admin]Modules de catégorie installés',configuration_description = 'Liste des modules de catégorie installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_ACACAT_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ACCOUNT_INSTALLED',configuration_title = 'Modules de compte installés',configuration_description = 'Liste des modules de compte installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'MODULE_ACCOUNT_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ACCOUNT_INSTALLED_BO',configuration_title = '[admin]Modules de compte installés',configuration_description = 'Liste des modules de compte installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'MODULE_ACCOUNT_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_LISTING_INSTALLED',configuration_title = 'Modules de liste installés',configuration_description = 'Liste des modules de liste installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_LISTING_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_LISTING_INSTALLED_BO',configuration_title = '[admin]Modules de liste installés',configuration_description = 'Liste des modules de liste installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_LISTING_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_HOME_INSTALLED',configuration_title = 'Modules d''accueil installés',configuration_description = 'Liste des modules d''accueil installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_HOME_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_HOME_INSTALLED_BO',configuration_title = '[admin]Modules d''accueil installés',configuration_description = 'Liste des modules d''accueil installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_HOME_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_CHECKOUT_PROCESS_INSTALLED',configuration_title = 'Modules de commande installés',configuration_description = 'Liste des modules de commande installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_CHECKOUT_PROCESS_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_CHECKOUT_PROCESS_INSTALLED_BO',configuration_title = '[admin]Modules de commande installés',configuration_description = 'Liste des modules de commande installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_CHECKOUT_PROCESS_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'MODULE_SHIPPING_INSTALLED',configuration_title = 'Modules de livraison installés',configuration_description = 'Liste des modules de livraison installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: ups.php;flat.php;item.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_SHIPPING_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_PAYMENT_INSTALLED',configuration_title = 'Modules de paiement installés',configuration_description = 'Liste des modules de paiement installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_PAYMENT_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ORDER_TOTAL_INSTALLED',configuration_title = 'Modules total commande installés',configuration_description = 'Liste des modules de total installés; séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: ot_subtotal.php;ot_tax.php;ot_shipping.php;ot_total.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = NULL WHERE configuration_key = 'MODULE_ORDER_TOTAL_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'PLUGIN_GENERIC_INSTALLED',configuration_title = 'Plugins génériques installés',configuration_description = 'Liste des plugins génériques installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PLUGIN_GENERIC_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'PLUGIN_PRODUCT_INSTALLED',configuration_title = 'Plugins de produit installés',configuration_description = 'Liste des plugins de produit installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PLUGIN_PRODUCT_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'PLUGIN_ACCOUNT_INSTALLED',configuration_title = 'Plugins de compte installés',configuration_description = 'Liste des plugins de compte installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PLUGIN_ACCOUNT_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'PLUGIN_LISTING_INSTALLED',configuration_title = 'Plugins de liste installés',configuration_description = 'Liste des plugins de liste installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PLUGIN_LISTING_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'PLUGIN_HOME_INSTALLED',configuration_title = 'Plugins d''accueil installés',configuration_description = 'Liste des plugins d''accueil installés séparés par un point virgule. Mise à jour automatique. Ne pas éditer. (Exemple: cc.php;cod.php;paypal.php)',configuration_group_id = 6,use_function = NULL,set_function = 'tep_cfg_Non_Edit('';'',',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PLUGIN_HOME_INSTALLED';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ORDER_TOTAL_TOTAL_SORT_ORDER',configuration_title = 'Ordre de tri total',configuration_description = 'Ordre de tri pour l''affichage',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MODULE_ORDER_TOTAL_TOTAL_SORT_ORDER';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER',configuration_title = 'Ordre de tri sous-total',configuration_description = 'Ordre de tri pour l''affichage',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER',configuration_title = 'Ordre de tri taxes',configuration_description = 'Ordre de tri pour l''affichage',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER';
+UPDATE osc_configuration SET configuration_key = 'MODULE_ACAPRO_DESC_BASE_SORT_ORDER',configuration_title = 'Ordre de description',configuration_description = 'Ordre de tri pour l''affichage',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MODULE_ACAPRO_DESC_BASE_SORT_ORDER';
+UPDATE osc_configuration SET configuration_key = 'SHIPPING_ORIGIN_COUNTRY',configuration_title = 'SHIPPING_ORIGIN_COUNTRY_S',configuration_description = 'SHIPPING_ORIGIN_COUNTRY_L',configuration_group_id = 7,use_function = 'tep_get_country_name',set_function = 'tep_cfg_pull_down_country_list(',last_modified = '2012-04-02 17:08:32' WHERE configuration_key = 'SHIPPING_ORIGIN_COUNTRY';
+UPDATE osc_configuration SET configuration_key = 'SHIPPING_ORIGIN_ZIP',configuration_title = 'SHIPPING_ORIGIN_ZIP_S',configuration_description = 'SHIPPING_ORIGIN_ZIP_L',configuration_group_id = 7,use_function = NULL,set_function = NULL,last_modified = '2012-04-02 17:08:32' WHERE configuration_key = 'SHIPPING_ORIGIN_ZIP';
+UPDATE osc_configuration SET configuration_key = 'SHIPPING_MAX_WEIGHT',configuration_title = 'SHIPPING_MAX_WEIGHT_S',configuration_description = 'SHIPPING_MAX_WEIGHT_L',configuration_group_id = 7,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'SHIPPING_MAX_WEIGHT';
+UPDATE osc_configuration SET configuration_key = 'SHIPPING_BOX_WEIGHT',configuration_title = 'SHIPPING_BOX_WEIGHT_S',configuration_description = 'SHIPPING_BOX_WEIGHT_L',configuration_group_id = 7,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'SHIPPING_BOX_WEIGHT';
+UPDATE osc_configuration SET configuration_key = 'SHIPPING_BOX_PADDING',configuration_title = 'SHIPPING_BOX_PADDING_S',configuration_description = 'SHIPPING_BOX_PADDING_L',configuration_group_id = 7,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'SHIPPING_BOX_PADDING';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_PAGE_LINKS',configuration_title = 'MAX_DISPLAY_PAGE_LINKS_S',configuration_description = 'MAX_DISPLAY_PAGE_LINKS_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_PAGE_LINKS';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_SPECIAL_PRODUCTS',configuration_title = 'MAX_DISPLAY_SPECIAL_PRODUCTS_S',configuration_description = 'MAX_DISPLAY_SPECIAL_PRODUCTS_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_SPECIAL_PRODUCTS';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_NEW_PRODUCTS',configuration_title = 'MAX_DISPLAY_NEW_PRODUCTS_S',configuration_description = 'MAX_DISPLAY_NEW_PRODUCTS_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_NEW_PRODUCTS';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_UPCOMING_PRODUCTS',configuration_title = 'MAX_DISPLAY_UPCOMING_PRODUCTS_S',configuration_description = 'MAX_DISPLAY_UPCOMING_PRODUCTS_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_UPCOMING_PRODUCTS';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_PRODUCTS_NEW',configuration_title = 'MAX_DISPLAY_PRODUCTS_NEW_S',configuration_description = 'MAX_DISPLAY_PRODUCTS_NEW_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_PRODUCTS_NEW';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_BESTSELLERS',configuration_title = 'MAX_DISPLAY_BESTSELLERS_S',configuration_description = 'MAX_DISPLAY_BESTSELLERS_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_BESTSELLERS';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_ALSO_PURCHASED',configuration_title = 'MAX_DISPLAY_ALSO_PURCHASED_S',configuration_description = 'MAX_DISPLAY_ALSO_PURCHASED_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_ALSO_PURCHASED';
+UPDATE osc_configuration SET configuration_key = 'MAX_DISPLAY_SEARCH_RESULTS',configuration_title = 'MAX_DISPLAY_SEARCH_RESULTS_S',configuration_description = 'MAX_DISPLAY_SEARCH_RESULTS_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MAX_DISPLAY_SEARCH_RESULTS';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_IMAGE',configuration_title = 'PRODUCT_LIST_IMAGE_S',configuration_description = 'PRODUCT_LIST_IMAGE_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODUCT_LIST_IMAGE';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_DESCRIPTION',configuration_title = 'PRODUCT_LIST_DESCRIPTION_S',configuration_description = 'PRODUCT_LIST_DESCRIPTION_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PRODUCT_LIST_DESCRIPTION';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_MANUFACTURER',configuration_title = 'PRODUCT_LIST_MANUFACTURER_S',configuration_description = 'PRODUCT_LIST_MANUFACTURER_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PRODUCT_LIST_MANUFACTURER';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_MODEL',configuration_title = 'PRODUCT_LIST_MODEL_S',configuration_description = 'PRODUCT_LIST_MODEL_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PRODUCT_LIST_MODEL';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_NAME',configuration_title = 'PRODUCT_LIST_NAME_S',configuration_description = 'PRODUCT_LIST_NAME_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODUCT_LIST_NAME';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_PRICE',configuration_title = 'PRODUCT_LIST_PRICE_S',configuration_description = 'PRODUCT_LIST_PRICE_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PRODUCT_LIST_PRICE';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_QUANTITY',configuration_title = 'PRODUCT_LIST_QUANTITY_S',configuration_description = 'PRODUCT_LIST_QUANTITY_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PRODUCT_LIST_QUANTITY';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_WEIGHT',configuration_title = 'PRODUCT_LIST_WEIGHT_S',configuration_description = 'PRODUCT_LIST_WEIGHT_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'PRODUCT_LIST_WEIGHT';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_BUY_NOW',configuration_title = 'PRODUCT_LIST_BUY_NOW_S',configuration_description = 'PRODUCT_LIST_BUY_NOW_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODUCT_LIST_BUY_NOW';
+UPDATE osc_configuration SET configuration_key = 'PRODUCT_LIST_FILTER',configuration_title = 'PRODUCT_LIST_FILTER_S',configuration_description = 'PRODUCT_LIST_FILTER_L',configuration_group_id = 8,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODUCT_LIST_FILTER';
+UPDATE osc_configuration SET configuration_key = 'PREV_NEXT_BAR_LOCATION',configuration_title = 'PREV_NEXT_BAR_LOCATION_S',configuration_description = 'PREV_NEXT_BAR_LOCATION_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'PREV_NEXT_BAR_LOCATION';
+UPDATE osc_configuration SET configuration_key = 'MIN_DISPLAY_BESTSELLERS',configuration_title = 'MIN_DISPLAY_BESTSELLERS_S',configuration_description = 'MIN_DISPLAY_BESTSELLERS_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MIN_DISPLAY_BESTSELLERS';
+UPDATE osc_configuration SET configuration_key = 'MIN_DISPLAY_ALSO_PURCHASED',configuration_title = 'MIN_DISPLAY_ALSO_PURCHASED_S',configuration_description = 'MIN_DISPLAY_ALSO_PURCHASED_L',configuration_group_id = 8,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'MIN_DISPLAY_ALSO_PURCHASED';
+UPDATE osc_configuration SET configuration_key = 'DEFAULT_RESTOCK_VALUE',configuration_title = 'DEFAULT_RESTOCK_VALUE_S',configuration_description = 'DEFAULT_RESTOCK_VALUE_L',configuration_group_id = 9,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'DEFAULT_RESTOCK_VALUE';
+UPDATE osc_configuration SET configuration_key = 'STOCK_CHECK',configuration_title = 'STOCK_CHECK_S',configuration_description = 'STOCK_CHECK_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'STOCK_CHECK';
+UPDATE osc_configuration SET configuration_key = 'STOCK_LIMITED',configuration_title = 'STOCK_LIMITED_S',configuration_description = 'STOCK_LIMITED_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'STOCK_LIMITED';
+UPDATE osc_configuration SET configuration_key = 'STOCK_ALLOW_CHECKOUT',configuration_title = 'STOCK_ALLOW_CHECKOUT_S',configuration_description = 'STOCK_ALLOW_CHECKOUT_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'STOCK_ALLOW_CHECKOUT';
+UPDATE osc_configuration SET configuration_key = 'STOCK_MARK_PRODUCT_OUT_OF_STOCK',configuration_title = 'STOCK_MARK_PRODUCT_OUT_OF_STOCK_S',configuration_description = 'STOCK_MARK_PRODUCT_OUT_OF_STOCK_L',configuration_group_id = 9,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'STOCK_MARK_PRODUCT_OUT_OF_STOCK';
+UPDATE osc_configuration SET configuration_key = 'STOCK_MARK_PRODUCT_NO_STOCK',configuration_title = 'STOCK_MARK_PRODUCT_NO_STOCK_S',configuration_description = 'STOCK_MARK_PRODUCT_NO_STOCK_L',configuration_group_id = 9,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'STOCK_MARK_PRODUCT_NO_STOCK';
+UPDATE osc_configuration SET configuration_key = 'STOCK_REORDER_LEVEL',configuration_title = 'STOCK_REORDER_LEVEL_S',configuration_description = 'STOCK_REORDER_LEVEL_L',configuration_group_id = 9,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'STOCK_REORDER_LEVEL';
+UPDATE osc_configuration SET configuration_key = 'MODULE_PAGES_INSTALLED_BO',configuration_title = 'Installed Modules pages',configuration_description = 'This is automatically updated. No need to edit.',configuration_group_id = 6,use_function = NULL,set_function = NULL,last_modified = '2012-04-04 18:07:19' WHERE configuration_key = 'MODULE_PAGES_INSTALLED_BO';
+UPDATE osc_configuration SET configuration_key = 'PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK',configuration_title = 'PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_S',configuration_description = 'PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK';
+UPDATE osc_configuration SET configuration_key = 'PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK',configuration_title = 'PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_S',configuration_description = 'PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_L',configuration_group_id = 9,use_function = NULL,set_function = 'tep_cfg_select_option(array(''none'', ''right'', ''Left''),',last_modified = NULL WHERE configuration_key = 'PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK';
+UPDATE osc_configuration SET configuration_key = 'PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE',configuration_title = 'PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_S',configuration_description = 'PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE';
+UPDATE osc_configuration SET configuration_key = 'PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN',configuration_title = 'PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_S',configuration_description = 'PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN';
+UPDATE osc_configuration SET configuration_key = 'PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST',configuration_title = 'PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_S',configuration_description = 'PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST';
+UPDATE osc_configuration SET configuration_key = 'PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK',configuration_title = 'PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK_S',configuration_description = 'PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK_L',configuration_group_id = 9,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK';
+UPDATE osc_configuration SET configuration_key = 'STORE_PAGE_PARSE_TIME',configuration_title = 'STORE_PAGE_PARSE_TIME_S',configuration_description = 'STORE_PAGE_PARSE_TIME__L',configuration_group_id = 10,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'STORE_PAGE_PARSE_TIME';
+UPDATE osc_configuration SET configuration_key = 'STORE_PAGE_PARSE_TIME_LOG',configuration_title = 'STORE_PAGE_PARSE_TIME_LOG_S',configuration_description = 'STORE_PAGE_PARSE_TIME_LOG_L',configuration_group_id = 10,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'STORE_PAGE_PARSE_TIME_LOG';
+UPDATE osc_configuration SET configuration_key = 'STORE_PARSE_DATE_TIME_FORMAT',configuration_title = 'STORE_PARSE_DATE_TIME_FORMAT_S',configuration_description = 'STORE_PARSE_DATE_TIME_FORMAT_L',configuration_group_id = 10,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'STORE_PARSE_DATE_TIME_FORMAT';
+UPDATE osc_configuration SET configuration_key = 'DISPLAY_PAGE_PARSE_TIME',configuration_title = 'DISPLAY_PAGE_PARSE_TIME_S',configuration_description = 'DISPLAY_PAGE_PARSE_TIME_L.',configuration_group_id = 10,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'DISPLAY_PAGE_PARSE_TIME';
+UPDATE osc_configuration SET configuration_key = 'STORE_DB_TRANSACTIONS',configuration_title = 'STORE_DB_TRANSACTIONS_S',configuration_description = 'STORE_DB_TRANSACTIONS_L',configuration_group_id = 10,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'STORE_DB_TRANSACTIONS';
+UPDATE osc_configuration SET configuration_key = 'STORE_PAGE_PARSE_STOCK_ERROR',configuration_title = 'STORE_PAGE_PARSE_STOCK_ERROR_S',configuration_description = 'STORE_PAGE_PARSE_STOCK_ERROR_L',configuration_group_id = 10,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'STORE_PAGE_PARSE_STOCK_ERROR';
+UPDATE osc_configuration SET configuration_key = 'STORE_PAGE_PARSE_EMAIL_OWNER',configuration_title = 'STORE_PAGE_PARSE_EMAIL_OWNER_S',configuration_description = 'STORE_PAGE_PARSE_EMAIL_OWNER_L',configuration_group_id = 10,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'STORE_PAGE_PARSE_EMAIL_OWNER';
+UPDATE osc_configuration SET configuration_key = 'COUNTRY_LOCALNAME',configuration_title = 'COUNTRY_LOCALNAME_S',configuration_description = 'COUNTRY_LOCALNAME_L',configuration_group_id = 11,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'COUNTRY_LOCALNAME';
+UPDATE osc_configuration SET configuration_key = 'AJAX_CART_MODE',configuration_title = 'AJAX_CART_MODE_S',configuration_description = 'AJAX_CART_MODE_L',configuration_group_id = 11,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'AJAX_CART_MODE';
+UPDATE osc_configuration SET configuration_key = 'ADVANCED_SEARCH_DEFAULT_OPERATOR',configuration_title = 'ADVANCED_SEARCH_DEFAULT_OPERATOR_S',configuration_description = 'ADVANCED_SEARCH_DEFAULT_OPERATOR_L',configuration_group_id = 11,use_function = NULL,set_function = 'tep_cfg_select_option(array(''and'', ''or''),',last_modified = NULL WHERE configuration_key = 'ADVANCED_SEARCH_DEFAULT_OPERATOR';
+UPDATE osc_configuration SET configuration_key = 'USE_DEFAULT_LANGUAGE_CURRENCY',configuration_title = 'USE_DEFAULT_LANGUAGE_CURRENCY_S',configuration_description = 'USE_DEFAULT_LANGUAGE_CURRENCY_L',configuration_group_id = 11,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NULL WHERE configuration_key = 'USE_DEFAULT_LANGUAGE_CURRENCY';
+UPDATE osc_configuration SET configuration_key = 'DISPLAY_CART',configuration_title = 'DISPLAY_CART_S',configuration_description = 'DISPLAY_CART_L',configuration_group_id = 11,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-04 15:21:40' WHERE configuration_key = 'DISPLAY_CART';
+UPDATE osc_configuration SET configuration_key = 'WHOS_ONLINE_ACTIVE',configuration_title = 'WHOS_ONLINE_ACTIVE_S',configuration_description = 'WHOS_ONLINE_ACTIVE_L',configuration_group_id = 11,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''auto'',''false''),',last_modified = NOW() WHERE configuration_key = 'WHOS_ONLINE_ACTIVE';
+UPDATE osc_configuration SET configuration_key = 'LOGIN_SET_SNAPSHOT',configuration_title = 'LOGIN_SET_SNAPSHOT_S',configuration_description = 'LOGIN_SET_SNAPSHOT_L',configuration_group_id = 11,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'LOGIN_SET_SNAPSHOT';
+UPDATE osc_configuration SET configuration_key = 'NO_SHOPPING_CART_FOR_GUEST',configuration_title = 'NO_SHOPPING_CART_FOR_GUEST_S',configuration_description = 'NO_SHOPPING_CART_FOR_GUEST_L',configuration_group_id = 11,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'NO_SHOPPING_CART_FOR_GUEST';
+UPDATE osc_configuration SET configuration_key = 'ACCOUNT_FORCE_ACTIV_MAIL',configuration_title = 'ACCOUNT_FORCE_ACTIV_MAIL_S',configuration_description = 'ACCOUNT_FORCE_ACTIV_MAIL_L',configuration_group_id = 11,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'ACCOUNT_FORCE_ACTIV_MAIL';
+UPDATE osc_configuration SET configuration_key = 'EMAIL_TRANSPORT',configuration_title = 'EMAIL_TRANSPORT_S',configuration_description = 'EMAIL_TRANSPORT_L',configuration_group_id = 12,use_function = NULL,set_function = 'tep_cfg_select_option(array(''sendmail'', ''smtp''),',last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'EMAIL_TRANSPORT';
+UPDATE osc_configuration SET configuration_key = 'SMTP_MAIL_SERVER',configuration_title = 'SMTP_MAIL_SERVER_S',configuration_description = 'SMTP_MAIL_SERVER_L',configuration_group_id = 12,use_function = NULL,set_function = NULL,last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'SMTP_MAIL_SERVER';
+UPDATE osc_configuration SET configuration_key = 'SMTP_PORT_NUMBER',configuration_title = 'SMTP_PORT_NUMBER_S',configuration_description = 'SMTP_PORT_NUMBER_L',configuration_group_id = 12,use_function = NULL,set_function = NULL,last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'SMTP_PORT_NUMBER';
+UPDATE osc_configuration SET configuration_key = 'SMTP_SENDMAIL_FROM',configuration_title = 'SMTP_SENDMAIL_FROM_S',configuration_description = 'SMTP_SENDMAIL_FROM_L',configuration_group_id = 12,use_function = NULL,set_function = NULL,last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'SMTP_SENDMAIL_FROM';
+UPDATE osc_configuration SET configuration_key = 'SMTP_FROMEMAIL_NAME',configuration_title = 'SMTP_FROMEMAIL_NAME_S',configuration_description = 'SMTP_FROMEMAIL_NAME_L',configuration_group_id = 12,use_function = NULL,set_function = NULL,last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'SMTP_FROMEMAIL_NAME';
+UPDATE osc_configuration SET configuration_key = 'EMAIL_LINEFEED',configuration_title = 'EMAIL_LINEFEED_S',configuration_description = 'EMAIL_LINEFEED_L',configuration_group_id = 12,use_function = NULL,set_function = 'tep_cfg_select_option(array(''LF'', ''CRLF''),',last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'EMAIL_LINEFEED';
+UPDATE osc_configuration SET configuration_key = 'EMAIL_USE_HTML',configuration_title = 'EMAIL_USE_HTML_S',configuration_description = 'EMAIL_USE_HTML_L',configuration_group_id = 12,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'EMAIL_USE_HTML';
+UPDATE osc_configuration SET configuration_key = 'ENTRY_EMAIL_ADDRESS_CHECK',configuration_title = 'ENTRY_EMAIL_ADDRESS_CHECK_S',configuration_description = 'ENTRY_EMAIL_ADDRESS_CHECK_L',configuration_group_id = 12,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'ENTRY_EMAIL_ADDRESS_CHECK';
+UPDATE osc_configuration SET configuration_key = 'SEND_EMAILS',configuration_title = 'SEND_EMAILS_S',configuration_description = 'SEND_EMAILS_L',configuration_group_id = 12,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'SEND_EMAILS';
+UPDATE osc_configuration SET configuration_key = 'USE_MODELE_EMAIL',configuration_title = 'USE_MODELE_EMAIL_S',configuration_description = 'USE_MODELE_EMAIL_L',configuration_group_id = 12,use_function = NULL,set_function = 'tep_cfg_select_pull_down($this->GetModeleEmails(),',last_modified = '2012-04-08 16:28:28' WHERE configuration_key = 'USE_MODELE_EMAIL';
+UPDATE osc_configuration SET configuration_key = 'DOWNLOAD_ENABLED',configuration_title = 'DOWNLOAD_ENABLED_S',configuration_description = 'DOWNLOAD_ENABLED_L',configuration_group_id = 13,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'DOWNLOAD_ENABLED';
+UPDATE osc_configuration SET configuration_key = 'DOWNLOAD_BY_REDIRECT',configuration_title = 'DOWNLOAD_BY_REDIRECT_S',configuration_description = 'DOWNLOAD_BY_REDIRECT_L',configuration_group_id = 13,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'DOWNLOAD_BY_REDIRECT';
+UPDATE osc_configuration SET configuration_key = 'DOWNLOAD_MAX_DAYS',configuration_title = 'DOWNLOAD_MAX_DAYS_S',configuration_description = 'DOWNLOAD_MAX_DAYS_L',configuration_group_id = 13,use_function = NULL,set_function = '',last_modified = NOW() WHERE configuration_key = 'DOWNLOAD_MAX_DAYS';
+UPDATE osc_configuration SET configuration_key = 'DOWNLOAD_MAX_COUNT',configuration_title = 'DOWNLOAD_MAX_COUNT_S',configuration_description = 'DOWNLOAD_MAX_COUNT_L',configuration_group_id = 13,use_function = NULL,set_function = '',last_modified = NOW() WHERE configuration_key = 'DOWNLOAD_MAX_COUNT';
+UPDATE osc_configuration SET configuration_key = 'GZIP_COMPRESSION',configuration_title = 'GZIP_COMPRESSION_S',configuration_description = 'GZIP_COMPRESSION_L',configuration_group_id = 14,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'GZIP_COMPRESSION';
+UPDATE osc_configuration SET configuration_key = 'GZIP_LEVEL',configuration_title = 'GZIP_LEVEL_S',configuration_description = 'GZIP_LEVEL_L',configuration_group_id = 14,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'GZIP_LEVEL';
+UPDATE osc_configuration SET configuration_key = 'SESSION_LIFE_ADMIN',configuration_title = 'SESSION_LIFE_ADMIN_S',configuration_description = 'SESSION_LIFE_ADMIN_L',configuration_group_id = 15,use_function = NULL,set_function = 'tep_cfg_pull_down_num_list(15,60,5,',last_modified = NOW() WHERE configuration_key = 'SESSION_LIFE_ADMIN';
+UPDATE osc_configuration SET configuration_key = 'SESSION_LIFE_PUBLIC',configuration_title = 'SESSION_LIFE_PUBLIC_S',configuration_description = 'SESSION_LIFE_PUBLIC_L',configuration_group_id = 15,use_function = NULL,set_function = 'tep_cfg_pull_down_num_list(15,60,5,',last_modified = NOW() WHERE configuration_key = 'SESSION_LIFE_PUBLIC';
+UPDATE osc_configuration SET configuration_key = 'SESSION_FORCE_COOKIE_USE',configuration_title = 'SESSION_FORCE_COOKIE_USE_S',configuration_description = 'SESSION_FORCE_COOKIE_USE_L',configuration_group_id = 15,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'SESSION_FORCE_COOKIE_USE';
+UPDATE osc_configuration SET configuration_key = 'SESSION_CHECK_SSL_SESSION_ID',configuration_title = 'SESSION_CHECK_SSL_SESSION_ID_S',configuration_description = 'SESSION_CHECK_SSL_SESSION_ID_L',configuration_group_id = 15,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'SESSION_CHECK_SSL_SESSION_ID';
+UPDATE osc_configuration SET configuration_key = 'SESSION_CHECK_USER_AGENT',configuration_title = 'SESSION_CHECK_USER_AGENT_S',configuration_description = 'SESSION_CHECK_USER_AGENT_L',configuration_group_id = 15,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'SESSION_CHECK_USER_AGENT';
+UPDATE osc_configuration SET configuration_key = 'SESSION_CHECK_IP_ADDRESS',configuration_title = 'SESSION_CHECK_IP_ADDRESS_S',configuration_description = 'SESSION_CHECK_IP_ADDRESS_L',configuration_group_id = 15,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'SESSION_CHECK_IP_ADDRESS';
+UPDATE osc_configuration SET configuration_key = 'SESSION_BLOCK_SPIDERS',configuration_title = 'SESSION_BLOCK_SPIDERS_S',configuration_description = 'SESSION_BLOCK_SPIDERS_L',configuration_group_id = 15,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'SESSION_BLOCK_SPIDERS';
+UPDATE osc_configuration SET configuration_key = 'SESSION_RECREATE',configuration_title = 'SESSION_RECREATE_S',configuration_description = 'SESSION_RECREATE_L',configuration_group_id = 15,use_function = 'tep_value_for_humain',set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = NOW() WHERE configuration_key = 'SESSION_RECREATE';
+UPDATE osc_configuration SET configuration_key = 'SEO_ENABLED',configuration_title = 'SEO_ENABLED_S',configuration_description = 'SEO_ENABLED_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'SEO_ENABLED';
+UPDATE osc_configuration SET configuration_key = 'SEO_ADD_CPATH_TO_PRODUCT_URLS',configuration_title = 'SEO_ADD_CPATH_TO_PRODUCT_URLS_S',configuration_description = 'SEO_ADD_CPATH_TO_PRODUCT_URLS_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'SEO_ADD_CPATH_TO_PRODUCT_URLS';
+UPDATE osc_configuration SET configuration_key = 'SEO_ADD_CAT_PARENT',configuration_title = 'SEO_ADD_CAT_PARENT_S',configuration_description = 'SEO_ADD_CAT_PARENT_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'SEO_ADD_CAT_PARENT';
+UPDATE osc_configuration SET configuration_key = 'SEO_URLS_FILTER_SHORT_WORDS',configuration_title = 'SEO_URLS_FILTER_SHORT_WORDS_S',configuration_description = 'SEO_URLS_FILTER_SHORT_WORDS_L',configuration_group_id = 16,use_function = NULL,set_function = NULL,last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'SEO_URLS_FILTER_SHORT_WORDS';
+UPDATE osc_configuration SET configuration_key = 'SEO_URLS_USE_W3C_VALID',configuration_title = 'SEO_URLS_USE_W3C_VALID_S',configuration_description = 'SEO_URLS_USE_W3C_VALID_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'SEO_URLS_USE_W3C_VALID';
+UPDATE osc_configuration SET configuration_key = 'USE_SEO_CACHE_GLOBAL',configuration_title = 'USE_SEO_CACHE_GLOBAL_S',configuration_description = 'USE_SEO_CACHE_GLOBAL_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'USE_SEO_CACHE_GLOBAL';
+UPDATE osc_configuration SET configuration_key = 'USE_SEO_CACHE_PRODUCTS',configuration_title = 'USE_SEO_CACHE_PRODUCTS_S',configuration_description = 'USE_SEO_CACHE_PRODUCTS_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'USE_SEO_CACHE_PRODUCTS';
+UPDATE osc_configuration SET configuration_key = 'USE_SEO_CACHE_CATEGORIES',configuration_title = 'USE_SEO_CACHE_CATEGORIES_S',configuration_description = 'USE_SEO_CACHE_CATEGORIES_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'USE_SEO_CACHE_CATEGORIES';
+UPDATE osc_configuration SET configuration_key = 'USE_SEO_CACHE_TOPICS',configuration_title = 'USE_SEO_CACHE_TOPICS_S',configuration_description = 'USE_SEO_CACHE_TOPICS_L',configuration_group_id = 16,use_function = NULL,set_function = 'tep_cfg_select_option(array(''true'', ''false''),',last_modified = '2012-04-02 16:01:09' WHERE configuration_key = 'USE_SEO_CACHE_TOPICS';
+UPDATE osc_configuration SET configuration_key = 'USE_SEO_CACHE_LINKS',configuration_title = 'USE_SEO_CACHE_LINKS_S',configuration_description = 'USE_SEO_CACHE_LINKS_L'...
[truncated message content] |
|
From: <os...@us...> - 2012-04-11 14:36:59
|
Revision: 4209
http://oscss.svn.sourceforge.net/oscss/?rev=4209&view=rev
Author: oscim
Date: 2012-04-11 14:36:49 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Suppression elements obsolete cf commit precendent
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastModified.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastNew.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastModified.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastNew.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/customerStats.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/customers.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/dashbordInfo.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/quickview.txt
trunk/catalog/admin/includes/widget/ContentLastModified.php
trunk/catalog/admin/includes/widget/ContentLastNew.php
trunk/catalog/admin/includes/widget/CustomerLastModified.php
trunk/catalog/admin/includes/widget/CustomerLastNew.php
trunk/catalog/admin/includes/widget/__customers.php
trunk/catalog/admin/includes/widget/customerStats.php
trunk/catalog/admin/includes/widget/dashbordInfo.php
trunk/catalog/admin/includes/widget/quickview.php
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastModified.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastModified.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastModified.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['ContentLastModified heading']="Dernière page cms modifiées" ;
-
-$lang['ContentLastModified box reference']="Réf." ;
-$lang['ContentLastModified box customers']="titre" ;
-$lang['ContentLastModified box date']="modifié le" ;
-$lang['ContentLastModified box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastNew.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastNew.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLastNew.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['ContentLastNew heading']="Nouvelles page cms" ;
-
-$lang['ContentLastNew box reference']="Réf." ;
-$lang['ContentLastNew box customers']="titre" ;
-$lang['ContentLastNew box date']="créer le" ;
-$lang['ContentLastNew box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastModified.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastModified.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastModified.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['CustomerLastModified heading']="Derniers clients modifié" ;
-
-$lang['CustomerLastModified box reference']="Réf." ;
-$lang['CustomerLastModified box customers']="Nom" ;
-$lang['CustomerLastModified box date']="inscrit le" ;
-$lang['CustomerLastModified box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastNew.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastNew.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLastNew.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['CustomerLastNew heading']="Nouveaux Clients" ;
-
-$lang['CustomerLastNew box reference']="Réf." ;
-$lang['CustomerLastNew box customers']="Nom" ;
-$lang['CustomerLastNew box date']="inscrit le" ;
-$lang['CustomerLastNew box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/customerStats.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/customerStats.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/customerStats.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,14 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9h
- @date 06/06/10, 15:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['box title statistics']="Client / membres" ;
-$lang['box entry customers']="Clients" ;
-$lang['box entry products']="Produits" ;
-$lang['box entry online']="Actuellement en ligne" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/customers.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/customers.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/customers.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,13 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9h
- @date 06/06/10, 15:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['box title statistics']="Client / membres" ;
-$lang['box entry customers']="Clients" ;
-$lang['box entry online']="Actuellement en ligne" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/dashbordInfo.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/dashbordInfo.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/dashbordInfo.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,16 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9h
- @date 05/09/10, 15:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['dashbord info']="Listes des tableaux de bord" ;
-$lang['dashbord view extensions']="Extensions, modules et plugins" ;
-$lang['dashbord view customers']="Clients et commandes" ;
-$lang['dashbord view catalogue']="Produits et attributs" ;
-$lang['dashbord view content']="Contenu et categories" ;
-$lang['dashbord view tools']="Outils et rapports" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/quickview.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/quickview.txt 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/quickview.txt 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,15 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9h
- @date 06/06/10, 15:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['quickview titre']="Aperçu rapide" ;
-$lang['rubriques x ']="Rubriques x " ;
-$lang['produits x ']="Produits x " ;
-$lang['articles x ']="Articles x " ;
-$lang['liens x ']="Liens x " ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/ContentLastModified.php
===================================================================
--- trunk/catalog/admin/includes/widget/ContentLastModified.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/ContentLastModified.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,38 +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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT c.*, cd.* FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') WHERE last_modified IS NOT NULL ORDER BY last_modified DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-
-?>
-<div id="ContentLastModified" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('ContentLastModified heading'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('ContentLastModified box reference'); ?></th>
- <th><?php echo __('ContentLastModified box customers'); ?></th>
- <th><?php echo __('ContentLastModified box date'); ?></th>
- <th><?php echo __('ContentLastModified box status'); ?></th>
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT, 'cID='.$row['content_id'].'&action=edit') ?>"><?php echo $row['content_id'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['content_title'] ?></td>
- <td class="tcenter"><?php echo tep_date_short($row['last_modified']) ?></td>
- <td class="tcenter"><?php echo $row['content_status'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/ContentLastNew.php
===================================================================
--- trunk/catalog/admin/includes/widget/ContentLastNew.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/ContentLastNew.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,38 +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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT c.*, cd.* FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') ORDER BY date_added DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-
-?>
-<div id="ContentLastNew" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('ContentLastNew heading'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('ContentLastNew box reference'); ?></th>
- <th><?php echo __('ContentLastNew box customers'); ?></th>
- <th><?php echo __('ContentLastNew box date'); ?></th>
- <th><?php echo __('ContentLastNew box status'); ?></th>
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT, 'cID='.$row['content_id'].'&action=edit') ?>"><?php echo $row['content_id'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['content_title'] ?></td>
- <td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
- <td class="tcenter"><?php echo $row['content_status'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/CustomerLastModified.php
===================================================================
--- trunk/catalog/admin/includes/widget/CustomerLastModified.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/CustomerLastModified.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,38 +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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT c.*, ci.customers_info_date_account_last_modified FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_account_last_modified DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-
-?>
-<div id="CustomerLastModified" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('CustomerLastModified heading'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('CustomerLastModified box reference'); ?></th>
- <th><?php echo __('CustomerLastModified box customers'); ?></th>
- <th><?php echo __('CustomerLastModified box date'); ?></th>
- <th><?php echo __('CustomerLastModified box status'); ?></th>
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></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['customers_info_date_account_last_modified']) ?></td>
- <td class="tcenter"><?php echo $row['customers_status'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/CustomerLastNew.php
===================================================================
--- trunk/catalog/admin/includes/widget/CustomerLastNew.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/CustomerLastNew.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,38 +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 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT c.*, ci.customers_info_date_account_created FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_account_created DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-
-?>
-<div id="CustomerLastNew" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('CustomerLastNew heading'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('CustomerLastNew box reference'); ?></th>
- <th><?php echo __('CustomerLastNew box customers'); ?></th>
- <th><?php echo __('CustomerLastNew box date'); ?></th>
- <th><?php echo __('CustomerLastNew box status'); ?></th>
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></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['customers_info_date_account_created']) ?></td>
- <td class="tcenter"><?php echo $row['customers_status'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/__customers.php
===================================================================
--- trunk/catalog/admin/includes/widget/__customers.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/__customers.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,24 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9h
- @date 07/06/10, 11:59
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-/* Boucle calcul stat nbr commande, client, etc*/
-$customers_query = tep_db_query("select count(*) as count from " . TABLE_CUSTOMERS);
-$customers = tep_db_fetch_array($customers_query);
-$whos_online_query = tep_db_query("select * from " . TABLE_WHOS_ONLINE);
-
-?>
-<div class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('box title statistics'); ?></h3>
-<div id="customerStats" class="tirroir">
- <ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_CUSTOMERS, '', 'NONSSL') . '">' .__('box entry customers') . ' </a> : ' . $customers['count'].'' ;?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_WHOS_ONLINE, '', 'NONSSL') . '">' .__('box entry online') . '</a> : ' . tep_db_num_rows($whos_online_query) ;?></li>
- </ul>
-</div>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/customerStats.php
===================================================================
--- trunk/catalog/admin/includes/widget/customerStats.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/customerStats.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,25 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9h
- @date 07/06/10, 11:44
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-/* Boucle calcul stat nbr commande, client, etc*/
-$customers_query = tep_db_query("select count(*) as count from " . TABLE_CUSTOMERS);
-$customers = tep_db_fetch_array($customers_query);
-$products_query = tep_db_query("select count(*) as count from " . TABLE_PRODUCTS . " where products_status = '1'");
-$products = tep_db_fetch_array($products_query);
-$whos_online_query = tep_db_query("select * from " . TABLE_WHOS_ONLINE);
-
-?>
-<div id="customerStats" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('box title statistics'); ?></h3>
- <ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_CUSTOMERS, '', 'NONSSL') . '">' .__('box entry customers') . ' </a> : ' . $customers['count'].'' ;?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCTS, '', 'NONSSL') . '">'.__('box entry products') . ' </a> : ' . $products['count'] ;?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_WHOS_ONLINE, '', 'NONSSL') . '">' .__('box entry online') . '</a> : ' . tep_db_num_rows($whos_online_query) ;?></li>
- </ul>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/dashbordInfo.php
===================================================================
--- trunk/catalog/admin/includes/widget/dashbordInfo.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/dashbordInfo.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,20 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 05/09/10, 11:44
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<div id="dashbordInfo" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('dashbord info'); ?></h3>
- <ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT, 'type=modules', 'NONSSL') . '">' .__('dashbord view extensions') . ' </a>';?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT, 'type=customers', 'NONSSL') . '">' .__('dashbord view customers') . ' </a>';?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT, 'type=catalog', 'NONSSL') . '">' .__('dashbord view catalogue') . ' </a>';?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT, 'type=cms', 'NONSSL') . '">' .__('dashbord view content') . ' </a>';?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT, 'type=tools', 'NONSSL') . '">' .__('dashbord view tools') . ' </a>';?></li>
- </ul>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/quickview.php
===================================================================
--- trunk/catalog/admin/includes/widget/quickview.php 2012-04-11 14:36:11 UTC (rev 4208)
+++ trunk/catalog/admin/includes/widget/quickview.php 2012-04-11 14:36:49 UTC (rev 4209)
@@ -1,25 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 07/06/10, 11:38
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-/* Calcul sommes */
- $cat=tep_db_num_rows(tep_db_query("select * from ".TABLE_CATEGORIES." "));
- $prod=tep_db_num_rows(tep_db_query("select * from ".TABLE_PRODUCTS." "));
- $post=tep_db_num_rows(tep_db_query("select * from ".TABLE_CONTENT." "));
- $link=tep_db_num_rows(tep_db_query("select * from ".TABLE_NAVIGATION_LINKS." "));
-?>
-
-<div id="QuickView" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('quickview titre'); ?></h3>
- <ul>
- <li><a href="<?php echo tep_href_link(FILENAME_CATEGORIES)?>"><?php echo __('rubriques x ').$cat ?></a></li>
- <li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS)?>"><?php echo __('produits x ').$prod ?></a></li>
- <li><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT)?>"><?php echo __('articles x ').$post ?></a></li>
- <li><a href="<?php echo tep_href_link(FILENAME_NAVIGATION_LINKS)?>"><?php echo __('liens x ').$link ?></a></li>
- </ul>
-</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-11 14:36:17
|
Revision: 4208
http://oscss.svn.sourceforge.net/oscss/?rev=4208&view=rev
Author: oscim
Date: 2012-04-11 14:36:11 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
oublis report conf max line
Modified Paths:
--------------
trunk/catalog/admin/includes/widget/ContentLast.php
Modified: trunk/catalog/admin/includes/widget/ContentLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/ContentLast.php 2012-04-11 14:33:59 UTC (rev 4207)
+++ trunk/catalog/admin/includes/widget/ContentLast.php 2012-04-11 14:36:11 UTC (rev 4208)
@@ -13,9 +13,9 @@
$DB=Database::getInstance();
-$_query = tep_db_query("SELECT c.*, cd.*, c.date_added as date FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') ORDER BY date_added DESC LIMIT 5");
+$_query = tep_db_query("SELECT c.*, cd.*, c.date_added as date FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') ORDER BY date_added DESC LIMIT ".$conf->widget_max_line);
-$_query2 = tep_db_query("SELECT c.*, cd.* , c.last_modified as date FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') WHERE last_modified IS NOT NULL ORDER BY last_modified DESC LIMIT 5");
+$_query2 = tep_db_query("SELECT c.*, cd.* , c.last_modified as date FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') WHERE last_modified IS NOT NULL ORDER BY last_modified DESC LIMIT ".$conf->widget_max_line);
$add = ( !$_query->__get('numRows') ) ? false : true ;
$up = ( !$_query2->__get('numRows') ) ? false : true ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 14:34:09
|
Revision: 4207
http://oscss.svn.sourceforge.net/oscss/?rev=4207&view=rev
Author: oscim
Date: 2012-04-11 14:33:59 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Amelioration et rationalisation des widgets et ajustement dashboard
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
trunk/catalog/admin/includes/widget/CategorieLast.php
trunk/catalog/admin/includes/widget/ProductsLast.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt
trunk/catalog/admin/includes/widget/ContentLast.php
trunk/catalog/admin/includes/widget/CustomerLast.php
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-11 14:16:27 UTC (rev 4206)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-11 14:33:59 UTC (rev 4207)
@@ -29,13 +29,11 @@
<cms>
<left>
- <widget>ContentLastNew</widget>
- <widget>ContentLastModified</widget>
+ <widget>ContentLast</widget>
</left>
<right>
<!-- <widget>ImagesLastAdded</widget> -->
<widget>CategorieLast</widget>
- <widget>quickview</widget>
</right>
</cms>
@@ -132,10 +130,7 @@
<customers>
<left>
-<!-- <widget>orderStats</widget> -->
-<!-- <widget>customerStats</widget> -->
- <widget>CustomerLastNew</widget>
- <widget>CustomerLastModified</widget>
+ <widget>CustomerLast</widget>
</left>
<right>
<widget class="graph" querystring="NewCustomers">NewCustomersStats</widget>
@@ -148,17 +143,14 @@
<left>
<widget>Notification</widget>
<widget>homeStock</widget>
-
-
- <widget>dashbordInfo</widget>
- <widget>quickview</widget>
- <widget>orderStats</widget>
- <widget>customerStats</widget>
+<!-- <widget>dashbordInfo</widget> -->
+ <widget>orderLastnews</widget>
+ <widget>CustomerLast</widget>
<widget>info_connexion</widget>
</left>
<right>
<widget class="graph" querystring="Sales">salesStats</widget>
- <widget>homeNews</widget>
+<!-- <widget>homeNews</widget> -->
</right>
</home>
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt 2012-04-11 14:16:27 UTC (rev 4206)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt 2012-04-11 14:33:59 UTC (rev 4207)
@@ -17,4 +17,7 @@
$lang['CategorieLast box name']="Catégories" ;
$lang['CategorieLast box date']="ajouté le" ;
$lang['CategorieLast box status']="Etat" ;
+
+$lang['CategorieLast txt active']="Actif" ;
+$lang['CategorieLast txt inactive']="Inactif" ;
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLast.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLast.txt 2012-04-11 14:33:59 UTC (rev 4207)
@@ -0,0 +1,23 @@
+<?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 02/03/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['ContentLast heading']="Articles (pages)" ;
+
+$lang['ContentLast tab added']="Nouveaux" ;
+$lang['ContentLast tab updated']="Modifiés" ;
+
+$lang['ContentLast box reference']="Réf." ;
+$lang['ContentLast box content']="titre" ;
+$lang['ContentLast box date']="modifié le" ;
+$lang['ContentLast box status']="Etat" ;
+
+$lang['ContentLast txt active']="Actif" ;
+$lang['ContentLast txt inactive']="Inactif" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt 2012-04-11 14:33:59 UTC (rev 4207)
@@ -0,0 +1,24 @@
+<?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 02/03/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['CustomerLast heading']="Client/membres" ;
+
+$lang['CustomerLast tab added']="Nouveaux" ;
+$lang['CustomerLast tab updated']="Modifiés" ;
+$lang['CustomerLast tab da']="En attentes" ;
+$lang['CustomerLast tab logon']="Connectés" ;
+
+$lang['CustomerLast box reference']="Réf." ;
+$lang['CustomerLast box customers']="Nom" ;
+$lang['CustomerLast box date']="inscrit le" ;
+$lang['CustomerLast box date up']="mise à jour" ;
+$lang['CustomerLast box date log']="connecté le" ;
+$lang['CustomerLast box status']="Etat" ;
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/widget/CategorieLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/CategorieLast.php 2012-04-11 14:16:27 UTC (rev 4206)
+++ trunk/catalog/admin/includes/widget/CategorieLast.php 2012-04-11 14:33:59 UTC (rev 4207)
@@ -4,16 +4,16 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 0203/2012, 20:02
+ @date 11/04/2012, 20:02
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-global $languages_id;
+global $languages_id, $conf;
$DB=Database::getInstance();
-$_query=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.date_added DESC LIMIT 7");
+$_query=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.date_added DESC LIMIT ".$conf->widget_max_line);
-$_query2=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.last_modified DESC LIMIT 7");
+$_query2=$DB->query("SELECT distinct p.*,pd.categories_name FROM " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.last_modified DESC LIMIT ".$conf->widget_max_line);
// if
$new = ( !$_query->__get('numRows') ) ? false : true ;
@@ -47,7 +47,12 @@
<td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></strong></td>
<td style="width:200px;"><?php echo $row['categories_name'] ?></td>
<td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
- <td class="tcenter"><?php echo $row['categories_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['categories_status'] ?> txt"><?php echo (($row['categories_status'] ==1)? __('CategorieLast txt active') : __('CategorieLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['categories_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
@@ -66,7 +71,12 @@
<td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></strong></td>
<td style="width:200px;"><?php echo $row['categories_name'] ?></td>
<td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
- <td class="tcenter"><?php echo $row['categories_status'] ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['categories_status'] ?> txt"><?php echo (($row['categories_status'] ==1)? __('CategorieLast txt active') : __('CategorieLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['categories_status'] ?> img"></span>
+ </span>
+ </td>
</tr>
<?php endforeach; ?>
</table>
Added: trunk/catalog/admin/includes/widget/ContentLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/ContentLast.php (rev 0)
+++ trunk/catalog/admin/includes/widget/ContentLast.php 2012-04-11 14:33:59 UTC (rev 4207)
@@ -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 11/04/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $languages_id, $conf;
+
+$DB=Database::getInstance();
+
+
+$_query = tep_db_query("SELECT c.*, cd.*, c.date_added as date FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') ORDER BY date_added DESC LIMIT 5");
+
+$_query2 = tep_db_query("SELECT c.*, cd.* , c.last_modified as date FROM " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id = cd.content_id AND language_id = '".$languages_id."') WHERE last_modified IS NOT NULL ORDER BY last_modified DESC LIMIT 5");
+
+$add = ( !$_query->__get('numRows') ) ? false : true ;
+$up = ( !$_query2->__get('numRows') ) ? false : true ;
+
+if( !$up && !$add )
+ return false;
+
+
+
+?>
+<div id="ContentLast" class="<?php echo $widg['class'] ?>">
+<h3><?php echo __('ContentLast heading'); ?></h3>
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('ContentLast tab added'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('ContentLast tab updated'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('ContentLast box reference'); ?></th>
+ <th><?php echo __('ContentLast box content'); ?></th>
+ <th><?php echo __('ContentLast box date'); ?></th>
+ <th><?php echo __('ContentLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT, 'cID='.$row['content_id'].'&action=edit') ?>"><?php echo $row['content_id'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['content_title'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['date']) ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['content_status'] ?> txt"><?php echo (($row['content_status'] ==1)? __('ContentLast txt active') : __('ContentLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['content_status'] ?> img"></span>
+ </span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+
+ </div>
+
+
+ <div id="tabs-2" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('ContentLast box reference'); ?></th>
+ <th><?php echo __('ContentLast box content'); ?></th>
+ <th><?php echo __('ContentLast box date'); ?></th>
+ <th><?php echo __('ContentLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT, 'cID='.$row['content_id'].'&action=edit') ?>"><?php echo $row['content_id'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['content_title'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['date']) ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['content_status'] ?> txt"><?php echo (($row['content_status'] ==1)? __('ContentLast txt active') : __('ContentLast txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['content_status'] ?> img"></span>
+ </span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/admin/includes/widget/CustomerLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/CustomerLast.php (rev 0)
+++ trunk/catalog/admin/includes/widget/CustomerLast.php 2012-04-11 14:33:59 UTC (rev 4207)
@@ -0,0 +1,131 @@
+<?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 11/04/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $conf;
+
+$_query = tep_db_query("SELECT c.*, ci.customers_info_date_account_created as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_account_created DESC LIMIT ".$conf->widget_max_line);
+
+$_query2 = tep_db_query("SELECT c.*, ci.customers_info_date_account_last_modified as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_account_last_modified DESC LIMIT ".$conf->widget_max_line);
+
+$_query3 = tep_db_query("SELECT c.*, ci.customers_info_date_account_created as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) WHERE customers_group_ra = 0 ORDER BY customers_info_date_account_created DESC LIMIT ".$conf->widget_max_line);
+
+$_query4 = tep_db_query("SELECT c.*, ci.customers_info_date_of_last_logon as date FROM " . TABLE_CUSTOMERS . " c LEFT JOIN " . TABLE_CUSTOMERS_INFO . " ci ON(customers_info_id = customers_id) ORDER BY customers_info_date_of_last_logon DESC LIMIT ".$conf->widget_max_line);
+
+
+
+$add = ( !$_query->__get('numRows') ) ? false : true ;
+$up = ( !$_query2->__get('numRows') ) ? false : true ;
+$da = ( !$_query3->__get('numRows') ) ? false : true ;
+$lo = ( !$_query4->__get('numRows') ) ? false : true ;
+
+if( !$up && !$add && !$da && !$lo )
+ return false;
+
+
+?>
+<div id="CustomerLast" class="<?php echo $widg['class'] ?>">
+<h3><?php echo __('CustomerLast heading'); ?></h3>
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('CustomerLast tab added'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('CustomerLast tab updated'); ?></a></li>
+ <?php if($da): ?>
+ <li><a href="#tabs-3"><?php echo __('CustomerLast tab da'); ?></a></li>
+ <?php endif; ?>
+
+ <?php if($lo): ?>
+ <li><a href="#tabs-4"><?php echo __('CustomerLast tab logon'); ?></a></li>
+ <?php endif; ?>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('CustomerLast box reference'); ?></th>
+ <th><?php echo __('CustomerLast box customers'); ?></th>
+ <th><?php echo __('CustomerLast box date'); ?></th>
+ <th><?php echo __('CustomerLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></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']) ?></td>
+ <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+ <div id="tabs-2" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('CustomerLast box reference'); ?></th>
+ <th><?php echo __('CustomerLast box customers'); ?></th>
+ <th><?php echo __('CustomerLast box date up'); ?></th>
+ <th><?php echo __('CustomerLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query2->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></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']) ?></td>
+ <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+ <?php if($da): ?>
+ <div id="tabs-3" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('CustomerLast box reference'); ?></th>
+ <th><?php echo __('CustomerLast box customers'); ?></th>
+ <th><?php echo __('CustomerLast box date log'); ?></th>
+ <th><?php echo __('CustomerLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query3->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></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']) ?></td>
+ <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+ <?php endif; ?>
+
+ <?php if($lo): ?>
+ <div id="tabs-4" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('CustomerLast box reference'); ?></th>
+ <th><?php echo __('CustomerLast box customers'); ?></th>
+ <th><?php echo __('CustomerLast box date log'); ?></th>
+ <th><?php echo __('CustomerLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query4->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS, 'cID='.$row['customers_id'].'&action=edit') ?>"><?php echo $row['customers_id'] ?></strong></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']) ?></td>
+ <td class="tcenter"><?php echo $row['customers_status'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+ <?php endif; ?>
+
+ </div>
+</div>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/widget/ProductsLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/ProductsLast.php 2012-04-11 14:16:27 UTC (rev 4206)
+++ trunk/catalog/admin/includes/widget/ProductsLast.php 2012-04-11 14:33:59 UTC (rev 4207)
@@ -4,11 +4,11 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 0203/2012, 20:02
+ @date 11/04/2012, 20:02
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-global $languages_id;
+global $languages_id, $conf;
$DB=Database::getInstance();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 14:16:36
|
Revision: 4206
http://oscss.svn.sourceforge.net/oscss/?rev=4206&view=rev
Author: oscim
Date: 2012-04-11 14:16:27 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Ajustement du sample , id client sample ?\195?\160 1 et non a 2
Modified Paths:
--------------
trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
Modified: trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
===================================================================
--- trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-04-11 12:24:53 UTC (rev 4205)
+++ trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-04-11 14:16:27 UTC (rev 4206)
@@ -23,7 +23,7 @@
TRUNCATE TABLE osc_address_book;
INSERT INTO osc_address_book (address_book_id, customers_id, entry_gender, entry_company, entry_firstname, entry_lastname, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_country_id, entry_zone_id) VALUES
-(2, 2, 'm', '', 'Jean-Claude', 'Duce', 'Rue des Bronzés', '', '75000', 'Paris', '', 73, 249);
+(1, 1, 'm', '', 'Jean-Claude', 'Duce', 'Rue des Bronzés', '', '75000', 'Paris', '', 73, 249);
INSERT INTO osc_categories (categories_id, categories_datatype, categories_image, parent_id, sort_order, date_added, categories_status, categories_hidden) VALUES
@@ -46,11 +46,11 @@
TRUNCATE TABLE osc_customers;
INSERT INTO osc_customers (customers_id, customers_gender, customers_firstname, customers_lastname, customers_dob, customers_email_address, customers_default_address_id, customers_telephone, customers_fax, customers_password, customers_newsletter) VALUES
-(2, 'm', 'Jean-Claude', 'Duce', '1970-05-21 00:00:00', 'jc...@os...', 2, '0102010201', '', '1fc083b2afc17b6206a28e316c41ba0a:0d', '1');
+(1, 'm', 'Jean-Claude', 'Duce', '1970-05-21 00:00:00', 'jc...@os...', 2, '0102010201', '', '1fc083b2afc17b6206a28e316c41ba0a:0d', '1');
TRUNCATE TABLE osc_customers_info;
INSERT INTO osc_customers_info (customers_info_id, customers_info_date_of_last_logon, customers_info_number_of_logons, customers_info_date_account_created, customers_info_date_account_last_modified) VALUES
-(2, '2011-07-31 09:07:26', 6, '2011-07-24 12:34:55', '2011-07-24 12:42:20');
+(1, '2011-07-31 09:07:26', 6, '2011-07-24 12:34:55', '2011-07-24 12:42:20');
TRUNCATE TABLE osc_manufacturers;
INSERT INTO osc_manufacturers (manufacturers_id, manufacturers_name, manufacturers_image, date_added) VALUES
@@ -69,25 +69,25 @@
TRUNCATE TABLE osc_orders;
INSERT INTO osc_orders (orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value, ip_address, class_payment) VALUES
-(4, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+(4, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement par chèque', '', '', '', '', '2011-07-24 13:11:36',
'2011-06-24 12:36:40', 4, NULL, 'EUR', 1.000000, '127.0.0.1','moneyorder'),
-(5, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+(5, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:34:05',
'2011-07-24 12:45:35', 4, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(9, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+(9, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2011-07-28
15:42:27', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(10, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+(10, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2011-07-28
15:50:17', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(11, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+(11, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:35:57',
'2011-07-28 16:01:14', 3, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(12, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+(12, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:35:37',
'2011-07-28 16:02:55', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(13, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+(13, 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-31 10:19:59',
'2011-07-31 09:13:14', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 12:25:03
|
Revision: 4205
http://oscss.svn.sourceforge.net/oscss/?rev=4205&view=rev
Author: oscim
Date: 2012-04-11 12:24:53 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Suppression des ancien widget produits
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsExpected.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastAdded.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastModified.txt
trunk/catalog/admin/includes/widget/ProductsExpected.php
trunk/catalog/admin/includes/widget/ProductsLastAdded.php
trunk/catalog/admin/includes/widget/ProductsLastModified.php
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsExpected.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsExpected.txt 2012-04-11 12:23:50 UTC (rev 4204)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsExpected.txt 2012-04-11 12:24:53 UTC (rev 4205)
@@ -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['products expected title %s']="Produits à venir ( x %s)" ;
-
-$lang['ProductsExpected box reference']="Réf." ;
-$lang['ProductsExpected box name']="Produits" ;
-$lang['ProductsExpected box date']="Publié le " ;
-$lang['ProductsExpected box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastAdded.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastAdded.txt 2012-04-11 12:23:50 UTC (rev 4204)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastAdded.txt 2012-04-11 12:24:53 UTC (rev 4205)
@@ -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['ProductsLastAdded heading']="dernier produits ajouté" ;
-
-$lang['ProductsLastAdded box reference']="Réf." ;
-$lang['ProductsLastAdded box name']="Produits" ;
-$lang['ProductsLastAdded box date']="ajouté le" ;
-$lang['ProductsLastAdded box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastModified.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastModified.txt 2012-04-11 12:23:50 UTC (rev 4204)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLastModified.txt 2012-04-11 12:24:53 UTC (rev 4205)
@@ -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['ProductsLastModified heading']="dernier produits modifiés" ;
-
-$lang['ProductsLastModified box reference']="Réf." ;
-$lang['ProductsLastModified box name']="Produits" ;
-$lang['ProductsLastModified box date']="modifié le" ;
-$lang['ProductsLastModified box status']="Etat" ;
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/ProductsExpected.php
===================================================================
--- trunk/catalog/admin/includes/widget/ProductsExpected.php 2012-04-11 12:23:50 UTC (rev 4204)
+++ trunk/catalog/admin/includes/widget/ProductsExpected.php 2012-04-11 12:24:53 UTC (rev 4205)
@@ -1,42 +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
-*/
-global $languages_id;
-
-$DB=Database::getInstance();
-$_query=$DB->query("SELECT distinct p.*,pd.products_name FROM " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd WHERE p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' AND p.products_date_available IS NOT NULL ");
-
-
-if( !$_query->__get('numRows') )
- return false;
-
-$res = $_query->fetchAllAssoc();
-?>
-<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCTS, 'expected=true', 'NONSSL') . '">'. sprintf( __('products expected title %s'),count($res) ) .'</a>';?></h3>
-
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('ProductsExpected box reference'); ?></th>
- <th><?php echo __('ProductsExpected box name'); ?></th>
- <th><?php echo __('ProductsExpected box date'); ?></th>
- <th><?php echo __('ProductsExpected box status'); ?></th>
- </tr>
- <?php foreach($res as $row) : ?>
- <tr>
- <td><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['products_name'] ?></td>
- <td><?php echo tep_date_short($row['products_date_available']) ?></td>
- <td><?php echo $row['products_status'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/ProductsLastAdded.php
===================================================================
--- trunk/catalog/admin/includes/widget/ProductsLastAdded.php 2012-04-11 12:23:50 UTC (rev 4204)
+++ trunk/catalog/admin/includes/widget/ProductsLastAdded.php 2012-04-11 12:24:53 UTC (rev 4205)
@@ -1,42 +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
-*/
-global $languages_id;
-
-$DB=Database::getInstance();
-$_query=$DB->query("SELECT distinct p.*,pd.products_name FROM " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd WHERE p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.products_date_added DESC LIMIT 7");
-
-
-if( !$_query->__get('numRows') )
- return false;
-
-$res = $_query->fetchAllAssoc();
-?>
-<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('ProductsLastAdded heading') ;?></h3>
-
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('ProductsLastAdded box reference'); ?></th>
- <th><?php echo __('ProductsLastAdded box name'); ?></th>
- <th><?php echo __('ProductsLastAdded box date'); ?></th>
- <th><?php echo __('ProductsLastAdded box status'); ?></th>
- </tr>
- <?php foreach($res as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['products_name'] ?></td>
- <td class="tcenter"><?php echo tep_date_short($row['products_date_added']) ?></td>
- <td class="tcenter"><?php echo $row['products_status'] ?></td>
- </tr>
- <?php endforeach; ?>
-</table>
-
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/ProductsLastModified.php
===================================================================
--- trunk/catalog/admin/includes/widget/ProductsLastModified.php 2012-04-11 12:23:50 UTC (rev 4204)
+++ trunk/catalog/admin/includes/widget/ProductsLastModified.php 2012-04-11 12:24:53 UTC (rev 4205)
@@ -1,42 +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
-*/
-global $languages_id;
-
-$DB=Database::getInstance();
-$_query=$DB->query("SELECT distinct p.*,pd.products_name FROM " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd WHERE p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.products_last_modified DESC LIMIT 7");
-
-
-if( !$_query->__get('numRows') )
- return false;
-
-$res = $_query->fetchAllAssoc();
-?>
-<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
- <h3><?php echo __('ProductsLastModified heading');?></h3>
-
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('ProductsLastModified box reference'); ?></th>
- <th><?php echo __('ProductsLastModified box name'); ?></th>
- <th><?php echo __('ProductsLastModified box date'); ?></th>
- <th><?php echo __('ProductsLastModified box status'); ?></th>
- </tr>
- <?php foreach($res as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['products_name'] ?></td>
- <td class="tcenter"><?php echo tep_date_short($row['products_last_modified']) ?></td>
- <td><?php echo $row['products_status'] ?></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-11 12:23:56
|
Revision: 4204
http://oscss.svn.sourceforge.net/oscss/?rev=4204&view=rev
Author: oscim
Date: 2012-04-11 12:23:50 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Centralisation des widget des produits
ajsutement du dashboard
correction coquille dans le listing du stock, et restriction de celui ci a produit physique
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/modules/pages/stock.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt
trunk/catalog/admin/includes/widget/ProductsLast.php
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-11 07:41:41 UTC (rev 4203)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-11 12:23:50 UTC (rev 4204)
@@ -18,14 +18,12 @@
<catalog>
<left>
<widget>homeStock</widget>
- <widget>ProductsExpected</widget>
+ <widget>ProductsWizzard</widget>
</left>
<right>
- <widget>ProductsLastAdded</widget>
-
- <widget>ProductsLastModified</widget>
+ <widget>ProductsLast</widget>
</right>
</catalog>
Added: trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt 2012-04-11 12:23:50 UTC (rev 4204)
@@ -0,0 +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 11/04/2012, 20:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['ProductsLast heading']="Produits" ;
+
+$lang['ProductsLast tab added']="Ajoutés" ;
+$lang['ProductsLast tab updated']="Modifiés" ;
+$lang['ProductsLast tab expected']="A venir" ;
+
+$lang['ProductsLast box reference']="Réf." ;
+$lang['ProductsLast box name']="Produits" ;
+$lang['ProductsLast box date']="ajouté le" ;
+$lang['ProductsLast box status']="Etat" ;
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/stock.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-11 07:41:41 UTC (rev 4203)
+++ trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-11 12:23:50 UTC (rev 4204)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-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.0.9
- @date 30/08/10, 10:32
+ @version 2.1.1
+ @date 11/04/2012, 10:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class currencies
@@ -247,32 +247,24 @@
$DB=Database::getInstance();
+
if(tep_not_null($sWhere)){
$sWhere=str_replace(array('orders_id'),array('o.orders_id'), $sWhere);
}
+ else
+ $sWhere='';
-// $query_raw = "select distinct o.ip_address, o.orders_id, o.customers_id,o.customers_name, o.customers_id, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.status_name as orders_status_name, s.status_color as orders_status_color,ot.text as order_total from " . TABLE_HOLDING_ORDERS . " o left join " . TABLE_HOLDING_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_STATUS . " s where o.orders_status = s.status_id and status_type='orders' and s.language_id = '" . $languages_id . "' and ot.class = 'ot_total' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'o.orders_id DESC');
+ // just physical product
+ if(strlen(TYPE_VIRTUAL_PRODUCTS) > 2 )
+ $sWhere .=" AND products_type NOT IN (".TYPE_VIRTUAL_PRODUCTS.") ";
- $query_raw = "select distinct p.products_id, pd.products_name, p.products_model, p.products_quantity,p.products_price, l.name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_LANGUAGES . " l where p.products_id = pd.products_id and p.products_id = pd.products_id and l.languages_id = pd.language_id and pd.language_id = '" . (int)$languages_id . "' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
+ $query_raw = "SELECT distinct p.products_id, pd.products_name, p.products_model, p.products_quantity,p.products_price, l.name from " . TABLE_PRODUCTS . " p LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd ON (p.products_id = pd.products_id AND pd.language_id = '" . (int)$languages_id . "' ) , " . TABLE_LANGUAGES . " l WHERE p.products_id = pd.products_id AND l.languages_id = pd.language_id ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
- $orders_split = new splitPageResults($page, $rowbyp, $query_raw, $query_numrows);
+// $orders_split = new splitPageResults($page, $rowbyp, $query_raw, $query_numrows);
$orders_query = $DB->query($query_raw);
while ($orders = $orders_query->fetchAssoc()) {
-// $ord['oID']=$orders['orders_id'];
-// $ord['products_id']=$orders['products_id'];
-// $ord['customers_id']=tep_customers_row_action($orders['customers_id'], array('origin'=>self::FILENAME));
-// $ord['order_total']=strip_tags($orders['order_total']);
-// $ord['date_purchased']=tep_datetime_short($orders['date_purchased']);
-// $ord['payment_method']=$orders['payment_method'];
-// $ord['orders_status_name']='<span style="display:inline-block; width:100%;padding:3px 0;background:'.$orders['orders_status_color'].'" >'.$orders['orders_status_name'].'</span>';
-
-// $ord[0]=$orders['orders_id'];
-// $ord['null']=tep_draw_checkbox_field('action_multi['.$ord['oID'].']','action_mutli_'.$ord['oID'],$ord['orders_id']);
-// $ord['action']=self::get_item_action($ord);
-
-
self::$list[]=$orders;
}
Added: trunk/catalog/admin/includes/widget/ProductsLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/ProductsLast.php (rev 0)
+++ trunk/catalog/admin/includes/widget/ProductsLast.php 2012-04-11 12:23:50 UTC (rev 4204)
@@ -0,0 +1,101 @@
+<?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 $languages_id;
+
+$DB=Database::getInstance();
+
+
+$_query=$DB->query("SELECT distinct p.*,pd.products_name FROM " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd WHERE p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.products_date_added DESC LIMIT ".$conf->widget_max_line);
+
+$_query2=$DB->query("SELECT distinct p.*,pd.products_name FROM " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd WHERE p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY p.products_last_modified DESC LIMIT ".$conf->widget_max_line);
+
+$_query3=$DB->query("SELECT distinct p.*,pd.products_name FROM " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd WHERE p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' AND p.products_date_available IS NOT NULL LIMIT ".$conf->widget_max_line);
+
+$add = ( !$_query->__get('numRows') ) ? false : true ;
+$up = ( !$_query2->__get('numRows') ) ? false : true ;
+$ext = ( !$_query3->__get('numRows') ) ? false : true ;
+
+if( !$up && !$add && !$ext )
+ return false;
+
+$res = $_query->fetchAllAssoc();
+?>
+<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
+ <h3><?php echo __('ProductsLast heading') ;?></h3>
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('ProductsLast tab added'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('ProductsLast tab updated'); ?></a></li>
+ <li><a href="#tabs-3"><?php echo __('ProductsLast tab expected'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('ProductsLast box reference'); ?></th>
+ <th><?php echo __('ProductsLast box name'); ?></th>
+ <th><?php echo __('ProductsLast box date'); ?></th>
+ <th><?php echo __('ProductsLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['products_name'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['products_date_added']) ?></td>
+ <td class="tcenter"><?php echo $row['products_status'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+
+ <div id="tabs-2" class="tabPage">
+
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('ProductsLast box reference'); ?></th>
+ <th><?php echo __('ProductsLast box name'); ?></th>
+ <th><?php echo __('ProductsLast box date'); ?></th>
+ <th><?php echo __('ProductsLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query2->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['products_name'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['products_last_modified']) ?></td>
+ <td class="tcenter"><?php echo $row['products_status'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+
+
+ <div id="tabs-3" class="tabPage">
+
+ <table class="dataTableBase">
+ <tr>
+ <th><?php echo __('ProductsLast box reference'); ?></th>
+ <th><?php echo __('ProductsLast box name'); ?></th>
+ <th><?php echo __('ProductsLast box date'); ?></th>
+ <th><?php echo __('ProductsLast box status'); ?></th>
+ </tr>
+ <?php foreach($_query3->fetchAllAssoc() as $row) : ?>
+ <tr>
+ <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['products_id'].'&action=edit') ?>"><?php echo $row['products_id'] ?></strong></td>
+ <td style="width:200px;"><?php echo $row['products_name'] ?></td>
+ <td class="tcenter"><?php echo tep_date_short($row['products_date_available']) ?></td>
+ <td class="tcenter"><?php echo $row['products_status'] ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </div>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 07:41:52
|
Revision: 4203
http://oscss.svn.sourceforge.net/oscss/?rev=4203&view=rev
Author: oscim
Date: 2012-04-11 07:41:41 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Correction coquille suite suppresion repetoire stats
correction coquille lors creation admin_extra , Li?\195?\169e au mot reserv?\195?\169 du SQL
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_extra.sql
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-11 06:57:40 UTC (rev 4202)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-11 07:41:41 UTC (rev 4203)
@@ -8,16 +8,6 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
- /* stats et rapport*/
- $tabl_link[600]= array(FILENAME_STATS, 'BOX_REPORTS', 'stats',@$img['whos_online']);
- /* Calcul des module de stats et rapport*/
- foreach(scan(DIR_FS_ADMIN .DIR_WS_MODULES.'stats/') as $file)
- if (substr("$file", -4) == '.php')
- if( (_cst_bool('STOCK_CHECK') && preg_match("#(stock)#i", $file)) || !preg_match("#(stock)#i", $file) ){
- $name=substr("$file",0,strlen($file)-4);
- $tabl_link[600][4][]=array(FILENAME_STATS.'?module='.$name, ''.$name, 'stats '.$name,@$img[$name]);
- }
-
$tabl_link[]= array(FILENAME_RAPPORT, 'BOX_TOOLS_RAPPORT', 'stats',@$img['stats']);
$tabl_link[]= array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap',@$img['ggmap']);
Modified: trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
===================================================================
--- trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-04-11 06:57:40 UTC (rev 4202)
+++ trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-04-11 07:41:41 UTC (rev 4203)
@@ -26,14 +26,14 @@
(2, 2, 'm', '', 'Jean-Claude', 'Duce', 'Rue des Bronzés', '', '75000', 'Paris', '', 73, 249);
-INSERT INTO osc_categories (categories_id, categories_image, parent_id, sort_order, date_added, categories_status, categories_hidden) VALUES
-(10, 'photo.png', 0, 0, NOW(), 1, 1),
-(11, 'accessoires.png', 0, 0, NOW(), 1, 1),
-(12, 'bridges.png', 10, 1, NOW(), 1, 1),
-(13, 'accessoires.png', 11, 0, NOW(), 1, 1),
-(14, 'compact.png', 10, 0, NOW(),1, 1),
-(15, 'photo.png', 10, 0, NOW(), 1, 1),
-(16, NULL, 0, 0, NOW(), 1, 1);
+INSERT INTO osc_categories (categories_id, categories_datatype, categories_image, parent_id, sort_order, date_added, categories_status, categories_hidden) VALUES
+(10,'product', 'photo.png', 0, 0, NOW(), 1, 1),
+(11,'product', 'accessoires.png', 0, 0, NOW(), 1, 1),
+(12,'product', 'bridges.png', 10, 1, NOW(), 1, 1),
+(13,'product', 'accessoires.png', 11, 0, NOW(), 1, 1),
+(14,'product', 'compact.png', 10, 0, NOW(),1, 1),
+(15,'product', 'photo.png', 10, 0, NOW(), 1, 1),
+(16,'product', NULL, 0, 0, NOW(), 1, 1);
INSERT INTO osc_categories_description (categories_id, language_id, categories_name, categories_description , categories_head_keywords_tag) VALUES (10, 1, 'OSC_CATEGORIES_DESCRIPTION_01_T', 'OSC_CATEGORIES_DESCRIPTION_01_D', 'OSC_CATEGORIES_DESCRIPTION_01_K');
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_extra.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_extra.sql 2012-04-11 06:57:40 UTC (rev 4202)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_extra.sql 2012-04-11 07:41:41 UTC (rev 4203)
@@ -17,7 +17,7 @@
CREATE TABLE IF NOT EXISTS osc_admin_extra (
admin_users_id int(11) NOT NULL,
- key varchar(150) NOT NULL,
+ key_ref varchar(150) NOT NULL,
value text NOT NULL,
- UNIQUE KEY admin_users_id (admin_users_id,key)
+ UNIQUE KEY admin_users_id (admin_users_id,key_ref)
) DEFAULT CHARSET=utf8;
\ 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-11 06:57:46
|
Revision: 4202
http://oscss.svn.sourceforge.net/oscss/?rev=4202&view=rev
Author: oscim
Date: 2012-04-11 06:57:40 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
correction extension
Modified Paths:
--------------
trunk/extensions/ULTIMATEIMAGE_stable/install.xml
Modified: trunk/extensions/ULTIMATEIMAGE_stable/install.xml
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/install.xml 2012-04-11 06:57:19 UTC (rev 4201)
+++ trunk/extensions/ULTIMATEIMAGE_stable/install.xml 2012-04-11 06:57:40 UTC (rev 4202)
@@ -1,44 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contrib>
- <description>
- <details contrib_ref="" forum_ref="" contrib_type="shipping" status="0" last_update="2010-08-30" />
- <author_pkg>www.oscss.org</author_pkg>
- <comments><![CDATA[]]> </comments>
- <credits>oscim</credits>
- <version>1.0</version>
- </description>
+ <description>
+ <details contrib_ref="" forum_ref="" contrib_type="shipping" status="0" last_update="2010-08-30" />
+ <author_pkg>www.oscss.org</author_pkg>
+ <comments>
+ <![CDATA[]]>
+ </comments>
+ <credits>oscim</credits>
+ <version>1.0</version>
+ </description>
- <addfile>
- <file name="admin/includes/modules/products/UltimateImage.php" />
+ <addfile>
+ <file name="admin/includes/modules/products/UltimateImage.php" />
- <file name="admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab" />
- <file name="admin/includes/gabarit/products/UltimateImage/display_view.edit.gab" />
- <file name="admin/includes/gabarit/products/UltimateImage/display_view.delete.gab" />
+ <file name="admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab" />
+ <file name="admin/includes/gabarit/products/UltimateImage/display_view.edit.gab" />
+ <file name="admin/includes/gabarit/products/UltimateImage/display_view.delete.gab" />
- <file name="includes/modules/products/UltimateImage.php" />
- </addfile>
+ <file name="includes/modules/products/UltimateImage.php" />
+ </addfile>
- <addfilelg>
- <file name="admin/includes/languages/%LANGUAGE%/modules/products/UltimateImage.txt" lgref="fr_FR"/>
- <file name="includes/languages/%LANGUAGE%/modules/products/UltimateImage.txt" lgref="fr_FR"/>
- </addfilelg>
+ <addfilelg>
+ <file name="admin/includes/languages/%LANGUAGE%/modules/products/UltimateImage.txt" lgref="fr_FR"/>
+ <file name="includes/languages/%LANGUAGE%/modules/products/UltimateImage.txt" lgref="fr_FR"/>
+ </addfilelg>
- <add2end>
- <file name="admin/includes/tables_files_modules.php" />
- <add type="php"><![CDATA[
- define('TABLE_PRODUCTS_IMAGES', DB_TABLE_PREFIX.'products_images' );]]></add>
- </add2end>
+ <add2end>
+ <file name="admin/includes/tables_files_modules.php" />
+ <add type="php">
+ <![CDATA[
+ define('TABLE_PRODUCTS_IMAGES', DB_TABLE_PREFIX.'products_images' );]]>
+ </add>
+ </add2end>
- <sql>
- <query><![CDATA[
- CREATE TABLE %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
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 06:57:30
|
Revision: 4201
http://oscss.svn.sourceforge.net/oscss/?rev=4201&view=rev
Author: oscim
Date: 2012-04-11 06:57:19 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
correction et suppression fichiers obsoletes
Added Paths:
-----------
trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers/sppc_cust_force/display_edit.edit.gab
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/
trunk/catalog/admin/includes/modules/stats/
Added: trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers/sppc_cust_force/display_edit.edit.gab
===================================================================
--- trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers/sppc_cust_force/display_edit.edit.gab (rev 0)
+++ trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers/sppc_cust_force/display_edit.edit.gab 2012-04-11 06:57:19 UTC (rev 4201)
@@ -0,0 +1,125 @@
+<?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 06/04/2012, 18:12
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $processed;
+?>
+ <fieldset class="block_field">
+ <div class="block_input">
+ <h4><?php echo __('heading title modules payment') ?></h4>
+ <?php
+ if ($processed == true) {
+ if (isset(sppc_cust_force::$cInfo->customers_payment_settings) && sppc_cust_force::$cInfo->customers_payment_settings == '1') ENTRY_CUSTOMERS_PAYMENT_SET.' : ';
+ else echo __('entry customers payment default');
+ echo tep_draw_hidden_field('customers_payment_settings');
+ } else {
+ echo tep_draw_radio_field('customers_payment_settings', '','1', (tep_not_null(sppc_cust_force::$cInfo->customers_payment_allowed)? '1' : '0' )) .
+ ' ' . __('entry customers payment set') . ' ' . tep_draw_radio_field('customers_payment_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_payment_allowed))? '0' : '1' ) .
+ ' ' . __('entry customers payment default') ;
+ }
+ ?>
+
+ <?php if ($processed != true) { ?>
+ <ul>
+ <?php foreach(sppc_cust_force::get_array_mod('payment') as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
+ </ul>
+ <p><?php echo __('entry customers payment set explain') ?></p>
+ <?php } else { ?>
+ <p>
+ <?php if (isset(sppc_cust_force::$cInfo->customers_payment_settings) && sppc_cust_force::$cInfo->customers_payment_settings == '1') sppc_cust_force::$cInfo->customers_payment_allowed;
+ else echo __('entry customers payment default');
+ echo tep_draw_hidden_field('customers_payment_allowed', sppc_cust_force::$cInfo->customers_payment_allowed);
+ ?>
+ </p>
+ <?php } ?>
+ </div>
+
+ <div class="block_input">
+ <h4 for="customers_fax"><?php echo __('heading title modules shipping') ?></h4>
+<?php
+ if ($processed == true) {
+ if (isset(sppc_cust_force::$cInfo->customers_shipping_settings) && sppc_cust_force::$cInfo->customers_shipping_settings == '1') ENTRY_CUSTOMERS_SHIPPING_SET.' : ';
+ else echo __('entry customers shipping default');
+ echo tep_draw_hidden_field('customers_shipping_settings');
+ } else {
+ echo tep_draw_radio_field('customers_shipping_settings','', '1', (tep_not_null(sppc_cust_force::$cInfo->customers_shipping_allowed)? '1' : '0' )) .
+ ' ' . __('entry customers shipping set') .
+ ' ' . tep_draw_radio_field('customers_shipping_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_shipping_allowed)? '0' :'1' )) . ' ' . __('entry customers shipping default') ;
+ }
+?>
+
+ <?php if ($processed != true) { ?>
+ <ul>
+ <?php foreach(sppc_cust_force::get_array_mod('shipping') as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
+ </ul>
+ <p><?php echo __('entry customers shipping set explain') ?></p>
+ <?php } else { ?>
+ <p>
+ <?php if (sppc_cust_force::$cInfo->customers_shipping_settings == '1') sppc_cust_force::$cInfo->customers_shipping_allowed;
+ else echo __('entry customers shipping default');
+ tep_draw_hidden_field('customers_shipping_allowed', sppc_cust_force::$cInfo->customers_shipping_allowed); ?>
+ </p>
+ <?php } ?>
+ </div>
+
+
+ <div class="block_input">
+ <h4 for="customers_fax"><?php echo __('heading title modules order total') ?></h4>
+ <?php if ($processed == true) {
+ if (sppc_cust_force::$cInfo->customers_order_total_settings == '1') echo __('entry customers order total set'). ' : ';
+ else echo __('entry customers order total default');
+ echo tep_draw_hidden_field('customers_order_total_settings');
+ } else {
+ echo tep_draw_radio_field('customers_order_total_settings','', '1', (tep_not_null(sppc_cust_force::$cInfo->customers_order_total_allowed)? '1' : '0' )) .
+ ' ' . __('entry customers order total set') .
+ ' ' . tep_draw_radio_field('customers_order_total_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_order_total_allowed)? '0': '1' )) . ' ' . __('entry customers order total default') ;
+ }
+?>
+<?php if ($processed != true) { ?>
+ <ul>
+ <?php foreach(sppc_cust_force::get_array_mod('order_total') as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
+ </ul>
+ <p><?php echo __('entry customers order total set explain') ?><p>
+ <?php } else { ?>
+ <p>
+ <?php if (sppc_cust_force::$cInfo->customers_order_total_settings == '1') sppc_cust_force::$cInfo->customers_order_total_allowed;
+ else echo __('entry customers order total default');
+ echo tep_draw_hidden_field('customers_order_total_allowed',sppc_cust_force::$cInfo->customers_order_total_allowed);
+ ?>
+ <p>
+ <?php } ?>
+ </div>
+
+
+ <div class="block_input">
+ <h4 for="customers_fax"><?php echo __('heading title customers tax rates exempt') ?></h4>
+ <?php if ($processed == true) {
+ if (isset(sppc_cust_force::$cInfo->customers_tax_rate_exempt_settings) && sppc_cust_force::$cInfo->customers_tax_rate_exempt_settings == '1') ENTRY_CUSTOMERS_TAX_RATES_EXEMPT.' : ';
+ else echo __('entry customers tax rates default');
+ echo tep_draw_hidden_field('customers_tax_rate_exempt_settings');
+ } else {
+ echo tep_draw_radio_field('customers_tax_rate_exempt_settings','', '1', (tep_not_null(sppc_cust_force::$cInfo->customers_specific_taxes_exempt))? '1' : '0' ) . ' ' . __('entry customers tax rates exempt') . ' ' . tep_draw_radio_field('customers_tax_rate_exempt_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_specific_taxes_exempt))? '0' : '1' ) . ' ' . __('entry customers tax rates default') ;
+ }
+ ?>
+ <?php if ($processed != true) { ?>
+ <ul>
+ <?php foreach(sppc_cust_force::get_array_taxe() as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
+ </ul>
+
+ <p><?php echo __('entry customers tax rates exempt explain') ?></p>
+ <?php } else { ?>
+ <p>
+ <?php if (sppc_cust_force::$cInfo->customers_tax_rate_exempt_settings == '1') $customers_specific_taxes_exempt;
+ else echo __('entry customers tax rates default');
+ echo tep_draw_hidden_field('customers_specific_taxes_exempt', $customers_specific_taxes_exempt);?>
+ <p>
+ <?php } ?>
+ </div>
+ </fieldset>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-11 06:56:10
|
Revision: 4200
http://oscss.svn.sourceforge.net/oscss/?rev=4200&view=rev
Author: oscim
Date: 2012-04-11 06:56:03 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Correction coquille
Suite evolution stats en rapport , reconscruction du customers_purchased
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/08_cms.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_purchase.txt
trunk/catalog/admin/includes/modules/rapport/customers_purchase.php
Modified: trunk/catalog/admin/includes/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-10 21:35:52 UTC (rev 4199)
+++ trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-11 06:56:03 UTC (rev 4200)
@@ -1,14 +1,14 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 03/03/2012, 17:23
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
- $tabl_link[]= array(FILENAME_CATEGORIES, 'BOX_CATALOG_CATEGORIES', 'categories', @$img['categories']);
- $tabl_link[]= array(FILENAME_CMS_CONTENT, 'BOX_CMS_CONTENT', 'cms_content',@$img['cms_content']);
- $tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
- $tabl_link[]= array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images',@$img['navigation_image']);
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 03/03/2012, 17:23
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+ $tabl_link[]= array(FILENAME_CATEGORIES, 'BOX_CATALOG_CATEGORIES', 'categories', @$img['categories']);
+ $tabl_link[]= array(FILENAME_CMS_CONTENT, 'BOX_CMS_CONTENT', 'cms_content',@$img['cms_content']);
+ $tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
+ $tabl_link[]= array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images',@$img['navigation_image']);
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_purchase.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_purchase.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_purchase.txt 2012-04-11 06:56:03 UTC (rev 4200)
@@ -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 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['customers_purchase heading title'] ="Meilleurs clients" ;
+$lang['customers_purchase heading description'] ="La liste des sommes depensées par clients " ;
+
+$lang['customers_purchase table heading id'] ="N°" ;
+$lang['customers_purchase table heading firstname'] ="Prénom" ;
+$lang['customers_purchase table heading lastname'] ="Nom" ;
+$lang['customers_purchase table heading email'] ="Email" ;
+$lang['customers_purchase table heading ordernum'] ="nbr achats" ;
+$lang['customers_purchase table heading ordersum'] ="Total" ;
+$lang['customers_purchase table heading moycart'] ="panier moyen" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/rapport/customers_purchase.php
===================================================================
--- trunk/catalog/admin/includes/modules/rapport/customers_purchase.php (rev 0)
+++ trunk/catalog/admin/includes/modules/rapport/customers_purchase.php 2012-04-11 06:56:03 UTC (rev 4200)
@@ -0,0 +1,185 @@
+<?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 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class customers_purchase
+ @brief manage description customers_purchase
+*/
+
+class customers_purchase
+ implements InterfaceModule{
+ /**
+ @var current string name
+ */
+ public $code;
+ /**
+ @var Datatype master
+ */
+ public $type;
+ /**
+ @var string title current module
+ */
+ public $title;
+ /**
+ @var string description current module
+ */
+ public $description;
+ /**
+ @var array info post data
+ */
+ public $listing = array();
+ /**
+ @var array info post data
+ */
+ public $query = array();
+ /**
+ @var boolean true/false
+ */
+ public $enabled;
+
+ /**
+ @brief class constructor
+ */
+ function __construct() {
+ $this->code = 'customers_purchase';
+ $this->type ='rapport';
+ $this->title = __('customers_purchase heading title');
+ $this->description = __('customers_purchase heading description');
+ $this->enabled = true;
+
+
+ global $languages_id;
+ $this->language_id = $languages_id;
+
+
+ }
+
+ /**
+ */
+ public function check_action($actions){
+ }
+
+ /**
+ @brief Edition/affichage produit
+ */
+ function load_db_values ($id) {
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ $this->listing['theader']=array(
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('customers_purchase table heading id') ) ,
+ array('width'=>'25%','class'=>'tcenter', 'txt'=>__('customers_purchase table heading firstname') ) ,
+ array('width'=>'25%','class'=>'tcenter', 'txt'=>__('customers_purchase table heading lastname') ),
+ array('class'=>'tcenter', 'txt'=>__('customers_purchase table heading email') ),
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('customers_purchase table heading ordernum') ),
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('customers_purchase table heading ordersum') ),
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('customers_purchase table heading moycart') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ $this->listing['modele']=array(
+ 'customers_id'=>true,
+ 'customers_firstname' =>true,
+ 'customers_lastname' =>true,
+ 'customers_email_address' =>true,
+ 'ordernum' =>true,
+ 'ordersum' =>true,
+ 'moycart' =>true,
+ );
+
+ $this->query['select'] = " c.customers_id, c.customers_firstname, c.customers_lastname,c.customers_email_address, sum(op.products_quantity * op.final_price) as ordersum, COUNT(o.orders_id) as ordernum , ( SUM(op.products_quantity * op.final_price) /COUNT(o.orders_id) ) as moycart ";
+ $this->query['tables'] = " " . TABLE_CUSTOMERS . " c, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_ORDERS . " o ";
+ $this->query['where'] = " c.customers_id = o.customers_id and o.orders_id = op.orders_id ";
+ $this->query['groupby'] = " c.customers_firstname, c.customers_lastname ";
+ $this->query['orderby'] = " ordersum DESC ";
+
+ }
+
+ /**
+ @fn FormatDBValue($row)
+ @brief Format row values for put in listing
+ @param $item arrary/object
+ @return array;
+ */
+ function FormatDBValue($item) {
+ $ord = array();
+ foreach($this->listing['modele'] as $k=>$r){
+ if($k == 'customers_id')
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME_CUSTOMERS, 'action=noedit&cID='.$item[$k]).'" >'.$item[$k].'</a>';
+ elseif($k == 'customers_email_address')
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME_MAIL, 'origin='.urlencode(FILENAME_RAPPORT.'?cID='.__CLASS__.'&action=view').'&customer='.$item[$k]).'" >'.$item[$k].'</a>';
+ if($k == 'moycart')
+ $ord[$k]= round($item[$k], 2);
+ else $ord[$k]=$item[$k];
+
+ }
+
+ return $ord;
+ }
+
+ /**
+ */
+ function display_view($id) {
+ }
+
+
+
+ /**
+ @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('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER');
+ }
+
+ /**
+ @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-10 21:36:00
|
Revision: 4199
http://oscss.svn.sourceforge.net/oscss/?rev=4199&view=rev
Author: oscim
Date: 2012-04-10 21:35:52 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
suppression element devenu obsolete
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/index.html
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_customers.php
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_discount_coupons.php
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_low_stock_attrib.php
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_newsletter.php
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_purchased.php
trunk/catalog/admin/includes/modules/stats/index.html
trunk/catalog/admin/includes/modules/stats/stats_low_stock_attrib.php
trunk/catalog/admin/includes/modules/stats/stats_newsletter.php
trunk/catalog/admin/includes/modules/stats/stats_products_purchased.php
trunk/catalog/admin/includes/modules/stats/whos_online.php
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/index.html
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/index.html 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/index.html 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>.</title>
-</head>
-<body>
-.
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_customers.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_customers.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_customers.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,17 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:41
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-define('HEADING_TITLE',"Les meilleurs clients" );
-define('TABLE_HEADING_NUMBER',"No." );
-define('TABLE_HEADING_CUSTOMERS',"Clients" );
-define('TABLE_HEADING_USED_COUPONS',"Coupons utilisés" );
-define('TABLE_HEADING_TOTAL_PURCHASED',"Total acheté" );
-define('IMAGE_USED_COUPONS',"voir" );
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_discount_coupons.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_discount_coupons.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_discount_coupons.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,32 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:41
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-define('HEADING_TITLE',"Coupon de réduction d'utilisation des codes d'information" );
-define('HEADING_COUPONS_LIST',"Tous les coupons" );
-define('HEADING_CUSTOMERS_LIST',"Les clients qui ont utilisé coupon %s" );
-define('HEADING_ORDERS_LIST',"Les commandes de la clientèle en utilisant %s coupon %s" );
-
-define('TABLE_HEADING_CODE',"Code" );
-define('TABLE_HEADING_PERCENTAGE',"Remise Montant" );
-define('TABLE_HEADING_CUSTOMER',"Nom du client" );
-define('TABLE_HEADING_ORDER',"Numéro de commande" );
-define('TABLE_HEADING_MAX_USE',"Max utilisation par la clientèle" );
-define('TABLE_HEADING_USE_STILL_AVAIL',"Numéro disponible pour l'usage" );
-define('TABLE_HEADING_NUM_AVAIL',"Global Nombre Disponible" );
-define('TABLE_HEADING_NUM_STILL_AVAIL',"Global Nombre restant disponibles" );
-define('TABLE_HEADING_USE_COUNT',"Nombre d'occasion" );
-define('TABLE_HEADING_CUSTOMERS',"Clients" );
-define('TABLE_HEADING_ORDER_TOTAL',"Total de la commande" );
-define('TABLE_HEADING_ORDER_DISCOUNT',"Commander Discount" );
-define('TABLE_HEADING_DATE_PURCHASED',"Date d'achat" );
-define('TABLE_HEADING_STATUS',"Status" );
-define('VIEW_ORDER',"Voir Commande" );
-define('TEXT_DISPLAY_SHIPPING_DISCOUNT',"hors d'expédition" );
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_low_stock_attrib.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_low_stock_attrib.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_low_stock_attrib.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,21 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:41
- @author Ralph Day, October 2004
- Tom Wojcik aka TomThumb 2004/07/03 based on work by Michael Coffman aka coffman
- FREEZEHELL - 08/11/2003 fre...@ho... Copyright (c) 2003 IBWO
- Joseph Shain, January 2003
- oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-define('HEADING_TITLE',"Stock Report" );
-
-define('TABLE_HEADING_PRODUCTS',"Products" );
-define('TABLE_HEADING_MODEL',"Model" );
-define('TABLE_HEADING_QUANTITY',"Quantity" );
-define('TABLE_HEADING_PRICE',"Price" );
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_newsletter.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_newsletter.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_newsletter.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,17 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:41
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-define('HEADING_TITLE',"Membres inscrits à la newsletter" );
-
-define('TABLE_HEADING_NUMBER',"No." );
-define('TABLE_HEADING_LAST_NAME',"Nom / Prénom" );
-define('TABLE_HEADING_CREATE',"Créer" );
-define('TEXT_DESCRIPTION',"Nombre de membres inscrits à la newsletter : " );
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_purchased.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_purchased.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_purchased.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,15 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:41
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-define('HEADING_TITLE',"Les produits les plus achetés" );
-define('TABLE_HEADING_NUMBER',"N°" );
-define('TABLE_HEADING_PRODUCTS',"Produits" );
-define('TABLE_HEADING_PURCHASED',"Acheté" );
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/modules/stats/index.html
===================================================================
--- trunk/catalog/admin/includes/modules/stats/index.html 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/modules/stats/index.html 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>.</title>
-</head>
-<body>
-.
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/modules/stats/stats_low_stock_attrib.php
===================================================================
--- trunk/catalog/admin/includes/modules/stats/stats_low_stock_attrib.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/modules/stats/stats_low_stock_attrib.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,172 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 14/11/10, 14:29
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- Copyright (c) 2004 Ralph Day
- Released under the GNU General Public License
-
- Based on prior works released under the GNU General Public License:
- QT Pro prior versions
- Ralph Day, October 2004
- Tom Wojcik aka TomThumb 2004/07/03 based on work by Michael Coffman aka coffman
- FREEZEHELL - 08/11/2003 fre...@ho... Copyright (c) 2003 IBWO
- Joseph Shain, January 2003
- osCommerce MS2
- Copyright (c) 2003 osCommerce
-
- Modifications made:
- 11/2004 - Clean up to not replicate for all languages
- Handle multiple attributes per product
- Ignore attributes that stock isn't tracked for
- Remove unused code
- ENCODE UTF-8
-*/
-
- require(DIR_WS_CLASSES . 'tracked_stock.php');
- $tracked_stock = new tracked_stock();
-?>
-
- <h4><?php echo HEADING_TITLE; ?></h4>
-
-<div class="box_uniq">
-
-</div>
-<div class="box_uniq">
-<table style="width:100%" class="dataTableBase stock">
- <thead>
- <tr>
- <th><?php echo TABLE_HEADING_PRODUCTS.tep_link_sort_by(FILENAME_STATS,'pd.products_name'); ?></th>
- <th><?php echo TABLE_HEADING_MODEL.tep_link_sort_by(FILENAME_STATS_LOW_STOCK_ATTRIB,'p.products_model'); ?></th>
- <th><?php echo TABLE_HEADING_QUANTITY.tep_link_sort_by(FILENAME_STATS_LOW_STOCK_ATTRIB,'p.products_quantity'); ?></th>
- <th class="tright"><?php echo TABLE_HEADING_PRICE.tep_link_sort_by(FILENAME_STATS_LOW_STOCK_ATTRIB,'p.products_price'); ?></th>
- </tr>
-</thead>
-<tbody>
-<?php
- $products_query_raw = "select distinct p.products_id, pd.products_name, p.products_model, p.products_quantity,p.products_price, l.name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_LANGUAGES . " l where p.products_id = pd.products_id and p.products_id = pd.products_id and l.languages_id = pd.language_id and pd.language_id = '" . (int)$languages_id . "' order by ".((isset($_GET['sort_by'])) ? $_GET['sort_by'] : 'pd.products_name ASC');
-
- if (isset($_GET['page']) && ($_GET['page'] > 1)) $rows = $_GET['page'] * MAX_DISPLAY_SEARCH_RESULTS - MAX_DISPLAY_SEARCH_RESULTS;
- $db_query_numrows= tep_db_num_rows( tep_db_query($products_query_raw));
- $db_query_split = new splitPageResults($_GET['page'], MAX_DISPLAY_ROW_BY_PAGE, $products_query_raw, $db_query_numrows);
- $products_query = tep_db_query($products_query_raw);
-
-
- while ($products = tep_db_fetch_array($products_query)) {
-
- $products_id = $products['products_id'];
-
- // check for product or attributes below reorder level
- $products_stock_query=tep_db_query("SELECT products_stock_attributes, products_stock_quantity
- FROM " . TABLE_PRODUCTS_STOCK . "
- WHERE products_id=" . $products['products_id'] ."
- ORDER BY products_stock_attributes");
- $products_stock_rows=tep_db_num_rows($products_stock_query);
- // Highlight products with low stock
- if ($products['products_quantity'] > STOCK_REORDER_LEVEL)$trclass="dataTableRow";
- else $trclass="OutofStock";
-
-
- //if (($products['products_quantity'] > (-1)) || ($products_stock_rows > 0)) { //Note from Olof Larsson: I commented this out as we would like to se oversold products to. We would like to see the stockreport for ALL products regardles quantity right?
- $products_quantity= $products['products_quantity'];
- $products_price=($products_stock_rows > 0) ? '' : $currencies->format($products['products_price']);
-
- /**
- Add Attributes
- */
- if ($products_stock_rows > 0) {
- $products_options_name=$tracked_stock->db_option_tracked_stock($products['products_id']); ?>
-
- <tr class="dataTableRow">
- <td><?php echo '<a href="' . tep_href_link(FILENAME_STOCK, 'product_id=' . $products['products_id']) . '">' . $products['products_name'] .'</a>'; ?></td>
- <td class="tcenter"><?php echo $products['products_model']; ?></td>
- <td class="tcenter"> <?php echo $products_quantity; ?></td>
- <td class="tcenter"><?php echo $products_price; ?></td>
- </tr>
-
- <tr class="dataTableRow attribute stock">
- <td class="main">
- <table style="width:100%" class="dataTable">
- <tr class="dataTableRow ">
- <?php foreach($products_options_name as $products_options_name) echo " <td class=\"smalltext\"><u>" . $products_options_name['products_options_name'] . "</u></td>\n"; ?>
- </tr>
-<?php
- // buld array of attributes price delta
- $attributes_price = array();
- $products_attributes=$tracked_stock->db_attribute_value( $products['products_id']);
- foreach($products_attributes as $products_attributes_values) {
- $option_price = $products_attributes_values['options_values_price'];
- if ($products_attributes_values['price_prefix'] == "-") $option_price= -1*$option_price;
- $attributes_price[$products_attributes_values['options_id']][$products_attributes_values['options_values_id']] = $option_price;
- }
-
- // now display the attribute value names, table the html for quantity & price to get everything
- // to line up right
- $model_html_table="<table border=\"0\" width=\"100%\" class=\"dataTable\">\n";
- $model_html_table.=" <tr class=\"dataTableRow\"><td class=\"smalltext\" colspan=\"" . sizeof($products_attributes_values) . "\"> </td></tr>\n";
- $quantity_html_table="<table width=\"100%\" class=\"dataTable\">\n";
- $quantity_html_table.="<tr class=\"dataTableRow\"><td class=\"smalltext\" colspan=\"" . sizeof($products_attributes_values) . "\"> </td></tr>\n";
- $price_html_table="<table width=\"100%\" class=\"dataTable\">\n";
- $price_html_table.="<tr class=\"dataTableRow\"><td class=\"smalltext\" colspan=\"" . sizeof($products_attributes_values) . "\"> </td></tr>\n";
-
- while($products_stock_values=tep_db_fetch_array($products_stock_query)) {
- $attributes=explode(",",$products_stock_values['products_stock_attributes']);
- echo "<tr class=\"dataTableRowSelected\">\n";
-
- $model_html_table.="<tr class=\"dataTableRowSelected\">\n";
- $quantity_html_table.="<tr class=\"dataTableRowSelected\">\n";
- $price_html_table.="<tr class=\"dataTableRowSelected\">\n";
- $total_price=$products['products_price'];
-
- // Highlight products out of stock
- if (($products_stock_values['products_stock_quantity']) > STOCK_REORDER_LEVEL) $trclassstock="dataTableContent";
- else $trclassstock="OutofStockAttrib";
-
-
- foreach($attributes as $attribute) {
- $attr=explode("-",$attribute);
- echo "<td class=\" " . $trclassstock . " \" >".tep_values_name($attr[1])."</td>\n";
- $total_price+=$attributes_price[$attr[0]][$attr[1]];
- }
-
- $total_price=$currencies->format($total_price);
- echo "</tr>\n";
-
- $model_html_table.="<td class=\"" . $trclassstock . " tcenter \"> </td>\n";
- $model_html_table.="</tr>\n";
- $quantity_html_table.="<td class=\"" . $trclassstock . " tcenter\">" . $products_stock_values['products_stock_quantity'] . "</td>\n";
- $quantity_html_table.="</tr>\n";
- $price_html_table.="<td align=\"right\" class=\" " . $trclassstock . " tcenter\">" . $total_price . "</td>\n";
- $price_html_table.="</tr>\n";
- }
- $model_html_table.="</table>\n";
- $quantity_html_table.="</table>\n";
- $price_html_table.="</table>\n";
-
- echo "</table>\n";
- echo "</td>\n";
- echo "<td>" . $model_html_table . "</td>\n";
- echo "<td>" . $quantity_html_table . "</td>\n";
- echo "<td>" . $price_html_table . "</td>\n";
- echo "</tr>\n";
- echo "</table></td>\n";
- echo "</tr>\n";
- } else { ?>
- <tr class="<?php echo $trclass; ?>">
- <td><?php echo '<a href="' . tep_href_link(FILENAME_STOCK, 'product_id=' . $products['products_id']) . '">' . $products['products_name'] .'</a>'; ?></td>
- <td class="tcenter"><?php echo $products['products_model']; ?></td>
- <td class="tcenter"><?php echo $products_quantity; ?></td>
- <td class="tcenter"><?php echo $products_price; ?></td>
- </tr>
- <?php }
- }
-?>
-</tbody>
-</table>
-</div>
-<!-- body_text_eof //-->
-
-<!-- body_eof //-->
Deleted: trunk/catalog/admin/includes/modules/stats/stats_newsletter.php
===================================================================
--- trunk/catalog/admin/includes/modules/stats/stats_newsletter.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/modules/stats/stats_newsletter.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,53 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @Contribution by Nekosign, web...@ne...
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 14/11/10, 14:36
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
- $rows=0;
- $customers_query_raw = "select c.customers_id, c.customers_firstname, c.customers_lastname, c.customers_email_address, c.customers_newsletter , b.customers_info_id , b.customers_info_date_account_created as date_account_created
- from " . TABLE_CUSTOMERS . " c," . TABLE_CUSTOMERS_INFO . " b where c.customers_id = b.customers_info_id and c.customers_newsletter = '1'
- order by b.customers_info_date_account_created, c.customers_lastname, c.customers_firstname";
-
-
- $customers_split = new splitPageResults($_GET['cpage'], MAX_DISPLAY_SEARCH_RESULTS, $customers_query_raw, $customers_query_numrows);
- $customers_query = tep_db_query($customers_query_raw);
-
-?>
-<!-- body //-->
-<h4><?php echo HEADING_TITLE; ?></h4>
-<!-- body_text //-->
- <p><?php echo TEXT_DESCRIPTION; ?><strong><?php echo $customers_query_numrows; ?></strong></p>
- <table style="width:100%" class="dataTable">
- <thead>
- <tr>
- <th style="width:10%"><?php echo TABLE_HEADING_NUMBER; ?></th>
- <th style="width:30%"><?php echo TABLE_HEADING_LAST_NAME; ?></th>
- <th style="width:25%"><?php echo TABLE_HEADING_CREATE; ?></th>
- </tr>
- </thead>
-<?php
- while ($customers = tep_db_fetch_array($customers_query)) {
- $rows++;
- if (strlen($rows) < 2) { $rows = '0' . $rows; }
-?>
- <tr class="view parent dataTableRow">
- <td style="width:30%;white-space:nowrap;"><?php echo $rows; ?>.</td>
- <td><?php echo tep_customers_row_action($customers['customers_id'], array('origin'=>FILENAME_STATS_NEWSLETTER)); ?></td>
- <td class="tcenter"><?php echo tep_date_short($customers['date_account_created']); ?></td>
- </tr>
-<?php } ?>
-</table>
-
- <p><?php echo $customers_split->display_count($customers_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $_GET['cpage'], 'Totaal <b>%s</b> van <b>%s</b> (van <b>%s</b> klanten)' , '', 'cpage'); ?></p>
- <p class="tright"><?php echo $customers_split->display_links($customers_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $_GET['cpage'], tep_get_all_get_params(array('cpage')), 'cpage'); ?></p>
-
-
-<!-- body_text_eof //-->
-<!-- body_eof //-->
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/modules/stats/stats_products_purchased.php
===================================================================
--- trunk/catalog/admin/includes/modules/stats/stats_products_purchased.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/modules/stats/stats_products_purchased.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,49 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 14/11/10, 14:40
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<!-- body //-->
-<h4><?php echo HEADING_TITLE; ?></h4>
-<!-- body_text //-->
- <table style="width:100%" class="dataTable">
- <thead>
- <tr>
- <th><?php echo TABLE_HEADING_NUMBER; ?></th>
- <th><?php echo TABLE_HEADING_PRODUCTS; ?></th>
- <th><?php echo TABLE_HEADING_PURCHASED; ?></th>
- </tr>
- </thead>
- <tbody>
-<?php
- if (isset($_GET['page']) && ($_GET['page'] > 1)) $rows = $_GET['page'] * MAX_DISPLAY_SEARCH_RESULTS - MAX_DISPLAY_SEARCH_RESULTS;
- $products_query_raw = "select p.products_id, p.products_ordered, pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where pd.products_id = p.products_id and pd.language_id = '" . $languages_id. "' and p.products_ordered > 0 group by pd.products_id order by p.products_ordered DESC, pd.products_name";
- $db_query_split = new splitPageResults($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS, $products_query_raw, $db_query_numrows);
-
- $rows = 0;
- $products_query = tep_db_query($products_query_raw);
- while ($products = tep_db_fetch_array($products_query)) {
- $rows++;
-
- if (strlen($rows) < 2) {
- $rows = '0' . $rows;
- }
-?>
- <tr class="dataTableRow">
- <td><?php echo $rows; ?>.</td>
- <td><?php echo '<a href="' . tep_href_link(FILENAME_CATEGORIES, 'action=new_product_preview&read=only&pID=' . $products['products_id'] . '&origin=' . FILENAME_STATS_PRODUCTS_PURCHASED . '&page=' . $_GET['page'], 'NONSSL') . '">' . $products['products_name'] . '</a>'; ?></td>
- <td><?php echo $products['products_ordered']; ?></td>
- </tr>
-<?php
-}
-?>
-</tbody>
- </table>
-<!-- body_text_eof //-->
-<!-- body_eof //-->
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/modules/stats/whos_online.php
===================================================================
--- trunk/catalog/admin/includes/modules/stats/whos_online.php 2012-04-10 21:33:22 UTC (rev 4198)
+++ trunk/catalog/admin/includes/modules/stats/whos_online.php 2012-04-10 21:35:52 UTC (rev 4199)
@@ -1,134 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 05/09/10, 11:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
- $xx_mins_ago = (time() - 900);
-
-
-// remove entries that have expired
- tep_db_query("delete from " . TABLE_WHOS_ONLINE . " where time_last_click < '" . $xx_mins_ago . "'");
-?>
-<!-- body //-->
-<h3><?php echo HEADING_TITLE; ?></h3>
-<!-- body_text //-->
-
-<table style="width:100%" class="dataTable">
- <thead>
- <tr>
- <th><?php echo TABLE_HEADING_ONLINE; ?></th>
- <th class="tcenter"><?php echo TABLE_HEADING_CUSTOMER_ID; ?></th>
- <th><?php echo TABLE_HEADING_FULL_NAME; ?></th>
- <th class="tcenter"><?php echo TABLE_HEADING_IP_ADDRESS; ?></th>
- <th><?php echo TABLE_HEADING_ENTRY_TIME; ?></th>
- <th class="tcenter"><?php echo TABLE_HEADING_LAST_CLICK; ?></th>
- <th><?php echo TABLE_HEADING_LAST_PAGE_URL; ?></th>
- </tr>
- </thead>
- <tbody>
-<?php
- $whos_online_query = tep_db_query("select customer_id, full_name, ip_address, time_entry, time_last_click, last_page_url, session_id from " . TABLE_WHOS_ONLINE);
- while ($whos_online = tep_db_fetch_array($whos_online_query)) {
- $time_online = (time() - $whos_online['time_entry']);
- if ((!isset($_GET['info']) || (isset($_GET['info']) && ($_GET['info'] == $whos_online['session_id']))) && !isset($info)) {
- $info = $whos_online['session_id'];
- }
-?>
- <tr id="defaultSelected" class="dataTableRow">
- <td ><?php echo gmdate('H:i:s', $time_online); ?></td>
- <td class="tcenter"><?php echo $whos_online['customer_id']; ?></td>
- <td ><?php echo $whos_online['full_name']; ?></td>
- <td class="tcenter"><?php echo $whos_online['ip_address']; ?></td>
- <td ><?php echo date('H:i:s', $whos_online['time_entry']); ?></td>
- <td class="tcenter"><?php echo date('H:i:s', $whos_online['time_last_click']); ?></td>
- <td ><?php if (preg_match('#^(.*)' . tep_session_name() . '=[a-f,0-9]+[&]*(.*)#i', $whos_online['last_page_url'], $array)) { echo $array[1] . $array[2]; } else { echo $whos_online['last_page_url']; } ?> </td>
- </tr>
-<?php
- }
-?>
- </tbody>
- </table>
- <p><?php echo sprintf(TEXT_NUMBER_OF_CUSTOMERS, tep_db_num_rows($whos_online_query)); ?></p>
-
-<?php
- $heading = array();
- $contents = array();
-
- if (isset($info)) {
- $heading[] = array('text' => '<h4>' . TABLE_HEADING_SHOPPING_CART . '</h4>');
-
- if (STORE_SESSIONS == 'mysql') {
- $session_data = tep_db_query("select value from " . TABLE_SESSIONS . " WHERE sesskey = '" . $info . "'");
- $session_data = tep_db_fetch_array($session_data);
- $session_data = trim($session_data['value']);
- } else {
- if ( (file_exists(tep_session_save_path() . '/sess_' . $info)) && (filesize(tep_session_save_path() . '/sess_' . $info) > 0) ) {
- $session_data = file(tep_session_save_path() . '/sess_' . $info);
- $session_data = trim(implode('', $session_data));
- }
- }
- if ($length = strlen($session_data)) {
- $start_id = strpos($session_data, 'customer_id|s');
- $start_cart = strpos($session_data, 'cart|O');
- $start_currency = strpos($session_data, 'currency|s');
- $start_country = strpos($session_data, 'customer_country_id|s');
- $start_zone = strpos($session_data, 'customer_zone_id|s');
-
-if ($start_cart<1) $start_cart=1;
- for ($i=$start_cart; $i<$length; $i++) {
- if ($session_data[$i] == '{') {
- if (isset($tag)) {
- $tag++;
- } else {
- $tag = 1;
- }
- } elseif ($session_data[$i] == '}') {
- $tag--;
- } elseif ( (isset($tag)) && ($tag < 1) ) {
- break;
- }
- }
-
- $session_data_id = substr($session_data, $start_id, (strpos($session_data, ';', $start_id) - $start_id + 1));
- $session_data_cart = substr($session_data, $start_cart, $i);
- $session_data_currency = substr($session_data, $start_currency, (strpos($session_data, ';', $start_currency) - $start_currency + 1));
- $session_data_country = substr($session_data, $start_country, (strpos($session_data, ';', $start_country) - $start_country + 1));
- $session_data_zone = substr($session_data, $start_zone, (strpos($session_data, ';', $start_zone) - $start_zone + 1));
-
- session_decode($session_data_id);
- session_decode($session_data_currency);
- session_decode($session_data_country);
- session_decode($session_data_zone);
- session_decode($session_data_cart);
-
- if (isset($cart) && is_object($cart)) {
- $products = $cart->get_products();
- for ($i = 0, $n = sizeof($products); $i < $n; $i++) {
- $contents[] = array('text' => $products[$i]['quantity'] . ' x ' . $products[$i]['name']);
- }
-
- if (sizeof($products) > 0) {
- $contents[] = array('text' => TEXT_SHOPPING_CART_SUBTOTAL . ' ' . $currencies->format($cart->show_total(), true, $currency));
- } else {
- $contents[] = array('text' => ' ');
- }
- }
- }
- }
-?>
-<div class="fright" style="width:29%">
-<?php
- if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
- $box = new box;
- echo $box->infoBox($heading, $contents);
- }
-?>
- </div>
-<!-- body_text_eof //-->
-<!-- body_eof //-->
\ 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-10 21:33:29
|
Revision: 4198
http://oscss.svn.sourceforge.net/oscss/?rev=4198&view=rev
Author: oscim
Date: 2012-04-10 21:33:22 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/whos_online.php
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/whos_online.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/whos_online.php 2012-04-10 21:31:20 UTC (rev 4197)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/whos_online.php 2012-04-10 21:33:22 UTC (rev 4198)
@@ -1,23 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:41
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-define('HEADING_TITLE',"Qui est en ligne" );
-define('TABLE_HEADING_ONLINE',"En ligne" );
-define('TABLE_HEADING_CUSTOMER_ID',"ID" );
-define('TABLE_HEADING_FULL_NAME',"Nom & Prénom" );
-define('TABLE_HEADING_IP_ADDRESS',"Adresse IP" );
-define('TABLE_HEADING_ENTRY_TIME',"Heure d\'arrivée" );
-define('TABLE_HEADING_LAST_CLICK',"Dernier Clic" );
-define('TABLE_HEADING_LAST_PAGE_URL',"Dernière URL" );
-define('TABLE_HEADING_ACTION',"Action" );
-define('TABLE_HEADING_SHOPPING_CART',"Panier utilisateur" );
-define('TEXT_SHOPPING_CART_SUBTOTAL',"Sous-total" );
-define('TEXT_NUMBER_OF_CUSTOMERS',"Actuellement il y a %s client(s) en ligne" );
-?>
\ 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-10 21:31:27
|
Revision: 4197
http://oscss.svn.sourceforge.net/oscss/?rev=4197&view=rev
Author: oscim
Date: 2012-04-10 21:31:20 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Suppressiono ancien fichier d'apercu des produit en stock, et centralisation de ces elements dans le moduel de pages/stock
correction coquille
mise a niveau du code
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/07_catalog.php
trunk/catalog/admin/includes/header.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/stock.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt
trunk/catalog/admin/includes/modules/pages/stock.php
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/products/stock.listing.gab
Modified: trunk/catalog/admin/includes/boxes/07_catalog.php
===================================================================
--- trunk/catalog/admin/includes/boxes/07_catalog.php 2012-04-10 18:11:29 UTC (rev 4196)
+++ trunk/catalog/admin/includes/boxes/07_catalog.php 2012-04-10 21:31:20 UTC (rev 4197)
@@ -11,4 +11,5 @@
$tabl_link[]= array(FILENAME_PRODUCTS.'?cPath=&action=new', 'BOX_CATALOG_PRODUCT_ADD', 'product_add', @$img['product_add']);
$tabl_link[]= array(FILENAME_PRODUCTS.'?expected=true', 'BOX_CATALOG_PRODUCTS_EXPECTED', 'products', @$img['products']);
$tabl_link[]= array(FILENAME_ATTRIBUTES, 'BOX_CATALOG_ATTIBUTES', 'attributes', @$img['attributes']);
+ $tabl_link[]= array(FILENAME_STOCK, 'BOX_CATALOG_STOCK', 'stock', @$img['stock']);
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/products/stock.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/stock.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/products/stock.listing.gab 2012-04-10 21:31:20 UTC (rev 4197)
@@ -0,0 +1,138 @@
+<?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 30/03/2012, 09:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $languages_id, $currencies;
+
+ require(DIR_WS_CLASSES . 'tracked_stock.php');
+ $tracked_stock = new tracked_stock();
+?>
+<h3><?php echo __('products stock'); ?></h3>
+
+<div>
+
+
+<div class="box_uniq">
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th style="width:3%" class="tcenter"><?php echo __('table heading id'); ?></th>
+ <th style="width:10%" class="tcenter"><?php echo __('table heading name'); ?></th>
+ <th style="width:10%" class="tcenter"><?php echo __('table heading model'); ?></th>
+ <th style="width:25%" class="tleft"><?php echo __('table heading stock'); ?></th>
+ <th style="width:12%" class="tleft"><?php echo __('table heading price'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach( stock::tep_get_list() as $row ) :
+ /*print_r($tracked_stock->db_attribute_value( $row['products_id']));*/?>
+
+ <?php if( ($allattrib = stock::GetStockOneProduct( $row['products_id'])) ==false ): ?>
+
+ <tr>
+ <td style="width:3%" class="tcenter"><?php echo $row['products_id']; ?></td>
+ <td style="width:50%" class="tcenter"><?php echo $row['products_name']; ?></td>
+ <td style="width:10%" class="tcenter"><?php echo $row['products_model']; ?></td>
+ <td style="width:5%" class="tcenter"><?php echo $row['products_quantity']; ?></td>
+ <td style="width:5%" class="tcenter"><?php echo $row['products_price']; ?></td>
+ </tr>
+
+ <?php else : ?>
+
+ <tr class="odd">
+ <td style="width:3%" class="tcenter" rowspan="2"><?php echo $row['products_id']; ?></td>
+ <td style="width:50%" class="tcenter"><?php echo $row['products_name']; ?></td>
+ <td style="width:10%" class="tcenter"><?php echo $row['products_model']; ?></td>
+ <td style="width:5%" class="tcenter"><?php echo $row['products_quantity']; ?></td>
+ <td style="width:5%" class="tcenter"><?php echo $row['products_price']; ?></td>
+ </tr>
+
+ <tr class=" attribute stock">
+ <td class="main" border="0" style="padding:0; margin:0;">
+ <table style="width:100%" class="">
+ <tr style="line-height:12px">
+ <?php foreach($tracked_stock->db_option_tracked_stock($row['products_id']) as $products_options_name)
+ echo " <th class=\"smalltext\" style=\"line-height:12px;border-radius:0;\"><u>" . $products_options_name['products_options_name'] . "</u></th>\n"; ?>
+ </tr>
+
+ <tr>
+ <?php
+ // buld array of attributes price delta
+ $attributes_price = array();
+
+ foreach($tracked_stock->db_attribute_value( $row['products_id']) as $products_attributes_values) {
+ $option_price = $products_attributes_values['options_values_price'];
+ if ($products_attributes_values['price_prefix'] == "-") $option_price= -1*$option_price;
+ $attributes_price[$products_attributes_values['options_id']][$products_attributes_values['options_values_id']] = $option_price;
+ }
+
+ // // now display the attribute value names, table the html for quantity & price to get everything
+ // // to line up right
+ $model_html_table="<table border=\"0\" width=\"100%\" >\n";
+ $model_html_table.=" <tr><td class=\"smalltext\" colspan=\"" . sizeof($products_attributes_values) . "\"> </td></tr>\n";
+
+ $quantity_html_table="<table width=\"100%\" >\n";
+ $quantity_html_table.="<tr><td class=\"smalltext\" colspan=\"" . sizeof($products_attributes_values) . "\"> </td></tr>\n";
+
+ $price_html_table="<table width=\"100%\" >\n";
+ $price_html_table.="<tr><td class=\"smalltext\" colspan=\"" . sizeof($products_attributes_values) . "\"> </td></tr>\n";
+
+
+ foreach($allattrib as $products_stock_values) {
+ $attributes=explode(",",$products_stock_values['products_stock_attributes']);
+
+ $model_html_table.="<tr>\n";
+ $quantity_html_table.="<tr>\n";
+ $price_html_table.="<tr>\n";
+ $total_price=$row['products_price'];
+
+ // Highlight products out of stock
+ if (($products_stock_values['products_stock_quantity']) > STOCK_REORDER_LEVEL) $trclassstock="dataTableContent";
+ else $trclassstock="OutofStockAttrib";
+
+
+ foreach($attributes as $attribute) {
+ $attr=explode("-",$attribute);
+ echo "<td class=\" " . $trclassstock . " \" >".tep_values_name($attr[1])."</td>\n";
+ $total_price+=$attributes_price[$attr[0]][$attr[1]];
+ }
+
+ $total_price=$currencies->format($total_price);
+ echo "</tr>\n";
+
+ $model_html_table.="<td class=\"" . $trclassstock . " tcenter \"> </td>\n";
+ $model_html_table.="</tr>\n";
+
+ $quantity_html_table.="<td class=\"" . $trclassstock . " tcenter\">" . $products_stock_values['products_stock_quantity'] . "</td>\n";
+ $quantity_html_table.="</tr>\n";
+
+ $price_html_table.="<td align=\"right\" class=\" " . $trclassstock . " tcenter\">" . $total_price . "</td>\n";
+ $price_html_table.="</tr>\n";
+ }
+ $model_html_table.="</table>\n";
+ $quantity_html_table.="</table>\n";
+ $price_html_table.="</table>\n";
+
+ ?>
+ </tr>
+ </table>
+ </td>
+ <td><?php echo $model_html_table ?></td>
+ <td><?php echo $quantity_html_table ?></td>
+ <td><?php echo $price_html_table ?></td>
+ </tr>
+ <?php endif; ?>
+
+ <?php endforeach; ?>
+
+
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/header.php
===================================================================
--- trunk/catalog/admin/includes/header.php 2012-04-10 18:11:29 UTC (rev 4196)
+++ trunk/catalog/admin/includes/header.php 2012-04-10 21:31:20 UTC (rev 4197)
@@ -142,10 +142,10 @@
},
<?php if( ($col=call_user_func(array(tep_extrac_querystring(JSONSTATMENT,'type'), 'tep_get_modele'))) && is_array($col)): ?>
"aoColumns": [
- <?php $i=0; foreach($col as $k=>$sort):
- if($sort !=false) echo ' { "bSortable": true },'."\n";
- else echo ' { "bSortable": false },'."\n";
- $i++; endforeach; ?>
+ <?php $i=0; foreach($col as $k=>$sort):
+ if($sort !=false) echo ' { "bSortable": true },'."\n";
+ else echo ' { "bSortable": false },'."\n";
+ $i++; endforeach; ?>
],
<?php endif; ?>
<?php if(defined('AJAXSTATMENTDETAIL')) : ?>
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php 2012-04-10 18:11:29 UTC (rev 4196)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php 2012-04-10 21:31:20 UTC (rev 4197)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 09/12/10, 17:23
+ @version 2.1.1
+ @date 10/04/2012, 17:23
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief file languages for boxes menu
@@ -14,4 +14,5 @@
define('BOX_CATALOG_PRODUCT_ADD',"Ajouter Produit" );
define('BOX_CATALOG_PRODUCTS_EXPECTED',"Produit(s) en attente" );
define('BOX_CATALOG_ATTIBUTES',"Attribut(s)" );
+define('BOX_CATALOG_STOCK',"Stock(s)" );
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php 2012-04-10 18:11:29 UTC (rev 4196)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php 2012-04-10 21:31:20 UTC (rev 4197)
@@ -1,22 +1,17 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 09/12/10, 17:23
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief file languages for boxes menu
-*/
-
-define('BOX_CATALOG_CATEGORIES',"Catégories" );
-define('BOX_HEADING_CONF_CMS',"Contenu" );
-define('BOX_CMS_CONTENT',"Gestion des pages" );
-define('BOX_NAVIGATION_LINK',"Gestion du Menu" );
-define('BOX_NAVIGATION_IMAGE',"Gestion des images" );
-// define('BOX_CMS_HELP', 'Aide');
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 09/04/2012, 17:23
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief file languages for boxes menu
+*/
-/* Begin ANNONCES_stable - installed by CIP */
-define('BOX_TOOLS_ANNONCES', 'Datatype ANNONCES');
-/* End ANNONCES_stable - installed by CIP */
+define('BOX_CATALOG_CATEGORIES',"Catégories" );
+define('BOX_HEADING_CONF_CMS',"Contenu" );
+define('BOX_CMS_CONTENT',"Gestion des pages" );
+define('BOX_NAVIGATION_LINK',"Gestion du Menu" );
+define('BOX_NAVIGATION_IMAGE',"Gestion des images" );
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/stock.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/stock.txt 2012-04-10 18:11:29 UTC (rev 4196)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/stock.txt 2012-04-10 21:31:20 UTC (rev 4197)
@@ -1,13 +1,19 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:46
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$lang['products stock']="Produits en stock" ;
$lang['table title attributes']="Attributs" ;
+
+$lang['table heading id']="id" ;
+$lang['table heading name']="Produits" ;
+$lang['table heading model']="Modèle" ;
+$lang['table heading stock']="Stock" ;
+$lang['table heading price']="Prix" ;
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt 2012-04-10 18:11:29 UTC (rev 4196)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt 2012-04-10 21:31:20 UTC (rev 4197)
@@ -9,8 +9,8 @@
@encode UTF-8
*/
-$lang['products_purchased heading title'] ="Produits les plus achetés" ;
-$lang['products_purchased heading description'] ="Les produits les plus achetés" ;
+$lang['whos_online heading title'] ="Utilisateur en ligne" ;
+$lang['whos_online heading description'] ="Les utilisateurs en ligne " ;
$lang['whos_online table heading customer_id'] ="N°" ;
$lang['whos_online table heading full_name'] ="Utilisateur" ;
Modified: trunk/catalog/admin/includes/modules/pages/stock.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-10 18:11:29 UTC (rev 4196)
+++ trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-10 21:31:20 UTC (rev 4197)
@@ -21,31 +21,31 @@
public static $list=array();
/**
- @p array
+ @var array
*/
public static $option_names;
/**
- @p array
+ @var array
*/
public static $options;
/**
- @p bool on/off attribut ou stock classique
+ @var bool on/off attribut ou stock classique
*/
public static $by_attribute_stock;
/**
- @p array check Qtpro
+ @var array check Qtpro
*/
public static $investigation;
/**
- @p string Name products
+ @var string Name products
*/
public static $product_name;
/**
- @p int $db_quantity
+ @var int $db_quantity
*/
public static $db_quantity;
/**
- @p int Id product
+ @var int Id product
*/
public static $pID;
@@ -56,94 +56,99 @@
self::$code=__CLASS__;
+ /**
+ @remarks not load if not first init
+ */
+// if(defined('JSONSTATMENT')) return;
+ //! active datatable in ajax format, precise les GET necessaire
+// define('JSONSTATMENT', 'mod=page&type='.self::$code);
}
public function check_action($actions){
global $messageStack;
+
$DB=Database::getInstance();
-// $messageStack
-
self::$action=$actions;
-
if ($_SERVER['REQUEST_METHOD']=="GET") $VARS=$_GET;
else $VARS=$_POST;
self::$pID=(int)$VARS['product_id'];
- if (!isset($VARS['action'])) $VARS['action']='';
- switch($VARS['action']){
- case 'Add' :
- $inputok = true;
- if (!(is_numeric(self::$pID))) $inputok = false;
+ if (!isset($VARS['action'])) $VARS['action']='';
+ switch(strtolower($VARS['action'])){
- while(list($v1,$v2)=each($VARS)) {
- if (preg_match("/^option(\d+)$/",$v1,$m1)) {
- if (is_numeric($v2) and ($v2==(int)$v2)) $val_array[]=$m1[1]."-".$v2;
- else $inputok = false;
- }
- }
- if (!(is_numeric($_POST['quantity']) and ($_POST['quantity']==(int)$_POST['quantity']))) $inputok = false;
+ case 'add' :
+ $inputok = true;
+ if (!(is_numeric(self::$pID))) $inputok = false;
- if (($inputok)) {
- sort($val_array, SORT_NUMERIC);
- $val=join(",",$val_array);
- $q=$DB->query($sql="select products_stock_id as stock_id from " . TABLE_PRODUCTS_STOCK . " where products_id=" . self::$pID . " and products_stock_attributes='" . $val . "' order by products_stock_attributes");
+ while(list($v1,$v2)=each($VARS)) {
+ if (preg_match("/^option(\d+)$/",$v1,$m1)) {
+ if (is_numeric($v2) and ($v2==(int)$v2)) $val_array[]=$m1[1]."-".$v2;
+ else $inputok = false;
+ }
+ }
- if ($q->__get('numRows')>0) {
- $stock_item=$q->fetchAssoc();
- $stock_id=$stock_item['stock_id'];
+ if (!(is_numeric($_POST['quantity']) and ($_POST['quantity']==(int)$_POST['quantity']))) $inputok = false;
- if ($_POST['quantity']=intval($_POST['quantity']))
- $DB->query($sql="update " . TABLE_PRODUCTS_STOCK . " set products_stock_quantity='" . (int)$_POST['quantity']. "' where products_stock_id='".$stock_id."'");
+ if (($inputok)) {
+ sort($val_array, SORT_NUMERIC);
+ $val=join(",",$val_array);
+ $q=$DB->query($sql="select products_stock_id as stock_id from " . TABLE_PRODUCTS_STOCK . " where products_id=" . self::$pID . " and products_stock_attributes='" . $val . "' order by products_stock_attributes");
- else
- $DB->query($sql="delete from " . TABLE_PRODUCTS_STOCK . " where products_stock_id='".$stock_id."'");
+ if ($q->__get('numRows')>0) {
+ $stock_item=$q->fetchAssoc();
+ $stock_id=$stock_item['stock_id'];
- }
- else
- $DB->query($sql="insert into " . TABLE_PRODUCTS_STOCK . " values (0," .self::$pID . ",'$val','" . (int)$_POST['quantity'] . "' )");
+ if ($_POST['quantity']=intval($_POST['quantity']))
+ $DB->query($sql="update " . TABLE_PRODUCTS_STOCK . " set products_stock_quantity='" . (int)$_POST['quantity']. "' where products_stock_id='".$stock_id."'");
+ else
+ $DB->query($sql="delete from " . TABLE_PRODUCTS_STOCK . " where products_stock_id='".$stock_id."'");
- $q=$DB->query("select sum(products_stock_quantity) as summa from " . TABLE_PRODUCTS_STOCK . " where products_id='" . self::$pID . "' and products_stock_quantity>0");
- $list=tep_db_fetch_array($q);
- $summa= (empty($list['summa'])) ? 0 : $list['summa'];
- $DB->query("update " . TABLE_PRODUCTS . " set products_quantity=$summa where products_id=" . self::$pID);
+ }
+ else
+ $DB->query($sql="insert into " . TABLE_PRODUCTS_STOCK . " values (0," .self::$pID . ",'$val','" . (int)$_POST['quantity'] . "' )");
- if (($summa<1) && (STOCK_ALLOW_CHECKOUT == 'false')) {
- $DB->query("update " . TABLE_PRODUCTS . " set products_status='0' where products_id=" . self::$pID);
- }
- }
+ $q=$DB->query("select sum(products_stock_quantity) as summa from " . TABLE_PRODUCTS_STOCK . " where products_id='" . self::$pID . "' and products_stock_quantity>0");
+ $list=tep_db_fetch_array($q);
+ $summa= (empty($list['summa'])) ? 0 : $list['summa'];
+ $DB->query("update " . TABLE_PRODUCTS . " set products_quantity=$summa where products_id=" . self::$pID);
- tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) || isset($_GET['forceview'])? '&forceview=true':'') ) );
-// if(!isset($_GET['origin'])) tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) && isset($_GET['forceview']))? '&forceview=true':''));
-// else tep_redirect(tep_href_link($_GET['origin']));
+ if (($summa<1) && (STOCK_ALLOW_CHECKOUT == 'false')) {
+ $DB->query("update " . TABLE_PRODUCTS . " set products_status='0' where products_id=" . self::$pID);
+ }
- break;
- case "Update":
- tep_db_query("update " . TABLE_PRODUCTS . " set products_quantity=" . (int)$_POST['quantity'] . " where products_id=" . self::$pID);
- if (($_POST['quantity']<1) && (STOCK_ALLOW_CHECKOUT == 'false')) {
- tep_db_query("update " . TABLE_PRODUCTS . " set products_status='0' where products_id=" . self::$pID);
- }
-// exit;
- tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) || isset($_GET['forceview'])? '&forceview=true':'') ));
+ }
-// if(!isset($_GET['origin'])) tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) && isset($_GET['forceview']))? '&forceview=true':''));
-// else tep_redirect($_GET['origin']);
+// if(!isset($_GET['origin']))
+ tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) || isset($_GET['forceview'])? '&forceview=true':'') ) );
+// else
+// tep_redirect(tep_href_link($_GET['origin']));
+ break;
+
+
+
+ case "update":
+ tep_db_query("update " . TABLE_PRODUCTS . " set products_quantity=" . (int)$_POST['quantity'] . " where products_id=" . self::$pID);
+ if (($_POST['quantity']<1) && (STOCK_ALLOW_CHECKOUT == 'false')) {
+ tep_db_query("update " . TABLE_PRODUCTS . " set products_status='0' where products_id=" . self::$pID);
+ }
+ tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) || isset($_GET['forceview'])? '&forceview=true':'') ));
+
+ // if(!isset($_GET['origin'])) tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) && isset($_GET['forceview']))? '&forceview=true':''));
+ // else tep_redirect($_GET['origin']);
+
break;
case "Apply to all":
break;
default:
-
- self::load_db_values(self::$pID);
- /**
- Qt doctor
- */
+ self::load_db_values(self::$pID);
case "update_summary":
break;
}
@@ -174,9 +179,9 @@
if ($q->__get('numRows')>0) {
self::$by_attribute_stock=1;
while($list=$q->fetchAssoc()) {
- self::$options[$list['_option_id']][]=array($list['_value'],$list['_value_id']);
- self::$option_names[$list['_option_id']]=$list['_option'];
- self::$product_name=$list['products_name'];
+ self::$options[$list['_option_id']][]=array($list['_value'],$list['_value_id']);
+ self::$option_names[$list['_option_id']]=$list['_option'];
+ self::$product_name=$list['products_name'];
}
}
//Commented out so items with 0 stock will show up in the stock report.
@@ -189,7 +194,6 @@
}
self::$investigation = qtpro_doctor_investigate_product($ID);
-// return new objectInfo($currency_query->fetchAssoc() );
}
@@ -203,50 +207,129 @@
public function display_view(){
switch(self::$action){
case 'doctor';
- if(isset($_GET['action'])) $doctor_action = $_GET['action'];
- if(isset($_GET['pID'])) $products_id = $_GET['pID'];
+ if(isset($_GET['action'])) $doctor_action = $_GET['action'];
+ if(isset($_GET['pID'])) $products_id = $_GET['pID'];
- self::qtdoctor((int)$products_id);
- return tep_get_include_contents(self::$code.'.doctor');
+ self::qtdoctor((int)$products_id);
+ return tep_get_include_contents('products/'.self::$code.'.doctor');
break;
default:
- if ($_SERVER['REQUEST_METHOD']=="POST") $VARS=$_POST ;
- else $VARS=$_GET;
- self::$pID=(int)$VARS['product_id'];
- return tep_get_include_contents(self::$code.'.edit');
+
+ if ($_SERVER['REQUEST_METHOD']=="POST") $VARS=$_POST ;
+ else $VARS=$_GET;
+
+ if(isset($VARS['product_id']) && (int)$VARS['product_id'] > 0) {
+ self::$pID=(int)$VARS['product_id'];
+ return tep_get_include_contents('products/'.self::$code.'.edit');
+ }
+ else{
+
+// self::$info = self::tep_get_list();
+ return tep_get_include_contents('products/'.self::$code.'.listing');
+ }
}
}
+ public static function tep_get_modele(){
+ return array(
+ 'products_id' =>true,
+ 'products_name'=>true,
+ 'products_model'=>true,
+ 'products_quantity'=>true,
+ 'products_price'=>true,
+ );
+ }
+
+ public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
+ global $query_numrows,$languages_id;
+
+ $DB=Database::getInstance();
+
+ if(tep_not_null($sWhere)){
+ $sWhere=str_replace(array('orders_id'),array('o.orders_id'), $sWhere);
+ }
+
+// $query_raw = "select distinct o.ip_address, o.orders_id, o.customers_id,o.customers_name, o.customers_id, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.status_name as orders_status_name, s.status_color as orders_status_color,ot.text as order_total from " . TABLE_HOLDING_ORDERS . " o left join " . TABLE_HOLDING_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_STATUS . " s where o.orders_status = s.status_id and status_type='orders' and s.language_id = '" . $languages_id . "' and ot.class = 'ot_total' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'o.orders_id DESC');
+
+ $query_raw = "select distinct p.products_id, pd.products_name, p.products_model, p.products_quantity,p.products_price, l.name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_LANGUAGES . " l where p.products_id = pd.products_id and p.products_id = pd.products_id and l.languages_id = pd.language_id and pd.language_id = '" . (int)$languages_id . "' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
+
+
+ $orders_split = new splitPageResults($page, $rowbyp, $query_raw, $query_numrows);
+ $orders_query = $DB->query($query_raw);
+
+ while ($orders = $orders_query->fetchAssoc()) {
+// $ord['oID']=$orders['orders_id'];
+// $ord['products_id']=$orders['products_id'];
+// $ord['customers_id']=tep_customers_row_action($orders['customers_id'], array('origin'=>self::FILENAME));
+// $ord['order_total']=strip_tags($orders['order_total']);
+// $ord['date_purchased']=tep_datetime_short($orders['date_purchased']);
+// $ord['payment_method']=$orders['payment_method'];
+// $ord['orders_status_name']='<span style="display:inline-block; width:100%;padding:3px 0;background:'.$orders['orders_status_color'].'" >'.$orders['orders_status_name'].'</span>';
+
+// $ord[0]=$orders['orders_id'];
+// $ord['null']=tep_draw_checkbox_field('action_multi['.$ord['oID'].']','action_mutli_'.$ord['oID'],$ord['orders_id']);
+// $ord['action']=self::get_item_action($ord);
+
+
+ self::$list[]=$orders;
+ }
+
+ $li=$res=array();
+ foreach(self::$list as $item){
+ foreach(self::tep_get_modele() as $k=>$v) $li[$k]=(tep_not_null($item[$k]) ? $item[$k] : ' ');
+ $res[]=$li;
+ }
+
+ if(count($res)==0) $res[]=self::tep_get_modele();
+ return $res;
+ }
+
+ /**
+ @fn GetStockOneProduct($id)
+ @note used in listing.gab
+ */
+ public static function GetStockOneProduct($id){
+ $query = tep_db_query("SELECT products_stock_attributes, products_stock_quantity
+ FROM " . TABLE_PRODUCTS_STOCK . "
+ WHERE products_id=" .$id ."
+ ORDER BY products_stock_attributes");
+
+ if(tep_db_num_rows($query))
+ return $query->fetchAllAssoc();
+ else
+ return false;
+ }
+
private static function qtdoctor($products_id){
switch(self::$action){
case 'examine':
- if(self::qtpro_doctor_product_healthy($products_id)){
- self::$list[]= '<span style="font-family: Verdana, Arial, sans-serif; font-size: 10px; color: green; font-weight: normal; text-decoration: none;"><b>Product is healthy</b><br /> The database entries for this products stock as they should.</span>';
- }else{
- self::$list[]= '<span style="font-family: Verdana, Arial, sans-serif; font-size: 10px; color: red; font-weight: normal; text-decoration: none;"><b>Product is sick</b><br /> The database entries for this products stock is messed up. This is why the table above looks messed up.</span>';
- }
+ if(self::qtpro_doctor_product_healthy($products_id)){
+ self::$list[]= '<span style="font-family: Verdana, Arial, sans-serif; font-size: 10px; color: green; font-weight: normal; text-decoration: none;"><b>Product is healthy</b><br /> The database entries for this products stock as they should.</span>';
+ }else{
+ self::$list[]= '<span style="font-family: Verdana, Arial, sans-serif; font-size: 10px; color: red; font-weight: normal; text-decoration: none;"><b>Product is sick</b><br /> The database entries for this products stock is messed up. This is why the table above looks messed up.</span>';
+ }
break;
case 'amputate':
- self::$list[]= self::qtpro_doctor_amputate_bad_from_product($products_id).' database entries where amputated';
- self::$list[]= qtproUtility::update_summary_stock($products_id);
+ self::$list[]= self::qtpro_doctor_amputate_bad_from_product($products_id).' database entries where amputated';
+ self::$list[]= qtproUtility::update_summary_stock($products_id);
break;
case 'chuck_trash':
- print self::qtpro_chuck_trash().' database entries where identified as trash and deleted.';
+ print self::qtpro_chuck_trash().' database entries where identified as trash and deleted.';
break;
case 'update_summary':
- self::$list[]= qtproUtility::update_summary_stock($products_id);
- self::$list[]= 'The summary stock for the product was updated.';
+ self::$list[]= qtproUtility::update_summary_stock($products_id);
+ self::$list[]= 'The summary stock for the product was updated.';
break;
default:
- self::$list[]= "<h3>QTPro Doctor - Overview</h3>";
- self::$list[]= "You currently have <b>". self::qtpro_normal_product_count()."</b> products in your store.<br>";
- self::$list[]= "<b>".self::qtpro_tracked_product_count()."</b> of them have options with tracked stock.<br>";
- self::$list[]= "In the database we currently have <b>". self::qtpro_number_of_trash_stock_rows() . "</b> trash rows.";
- //print "<b>".qtpro_sick_product_count()."</b> of the producks with tracked stock is sick.<br><br>";
- self::$list[]= self::qtpro_doctor_formulate_database_investigation();
+ self::$list[]= "<h3>QTPro Doctor - Overview</h3>";
+ self::$list[]= "You currently have <b>". self::qtpro_normal_product_count()."</b> products in your store.<br>";
+ self::$list[]= "<b>".self::qtpro_tracked_product_count()."</b> of them have options with tracked stock.<br>";
+ self::$list[]= "In the database we currently have <b>". self::qtpro_number_of_trash_stock_rows() . "</b> trash rows.";
+ //print "<b>".qtpro_sick_product_count()."</b> of the producks with tracked stock is sick.<br><br>";
+ self::$list[]= self::qtpro_doctor_formulate_database_investigation();
break;
}
@@ -259,89 +342,87 @@
$str_ret ='';
switch($formulate_style){
case 'short_suggestion':
- if($facts_array['any_problems']){
- if($facts_array['summary_and_calc_stock_match'] != true && $facts_array['stock_entries_healthy'] != true){
- $str_ret =__('the database entries for this products stock is messy and the summary stock calculation is wrong. '). __('please take a look at this ').'<a class="button" href="' . tep_href_link(self::FILENAME, 'product_id=' . $facts_array['id']) . '" >'.__('products stock').'</a>.';
- }
- elseif(!$facts_array['summary_and_calc_stock_match']){
- $str_ret =__('the summary stock calculation is wrong. '). __('please take a look at this ').'<a class="button" href="' . tep_href_link(self::FILENAME, 'product_id=' . $facts_array['id']) . ' " class="headerLink">'.__('products stock').'</a>.';
- }
- elseif(!$facts_array['stock_entries_healthy']){
- $str_ret =__('the database entries for this products stock is messy. '). __('please take a look at this ').'<a class="button" href="' . tep_href_link(self::FILENAME, 'product_id=' . $facts_array['id']) . ' " class="headerLink">'.__('products stock').'</a>.';
- }else{
- $str_ret ="Errorcatsh 754780+94322354678";
- }
- }else{
- $str_ret =__("this product is all ok.");
- }
+ if($facts_array['any_problems']){
+ if($facts_array['summary_and_calc_stock_match'] != true && $facts_array['stock_entries_healthy'] != true){
+ $str_ret =__('the database entries for this products stock is messy and the summary stock calculation is wrong. '). __('please take a look at this ').'<a class="button" href="' . tep_href_link(self::FILENAME, 'product_id=' . $facts_array['id']) . '" >'.__('products stock').'</a>.';
+ }
+ elseif(!$facts_array['summary_and_calc_stock_match']){
+ $str_ret =__('the summary stock calculation is wrong. '). __('please take a look at this ').'<a class="button" href="' . tep_href_link(self::FILENAME, 'product_id=' . $facts_array['id']) . ' " class="headerLink">'.__('products stock').'</a>.';
+ }
+ elseif(!$facts_array['stock_entries_healthy']){
+ $str_ret =__('the database entries for this products stock is messy. '). __('please take a look at this ').'<a class="button" href="' . tep_href_link(self::FILENAME, 'product_id=' . $facts_array['id']) . ' " class="headerLink">'.__('products stock').'</a>.';
+ }else{
+ $str_ret ="Errorcatsh 754780+94322354678";
+ }
+ }else{
+ $str_ret =__("this product is all ok.");
+ }
break;
case 'detailed':
- //Create Header
- /*if($facts_array['any_problems']){
- $str_ret ='<span style="color:red; font-weight: bold; font-size:1.2em;">This product needs attention!</span><br /><br />';
- }else{
- $str_ret ='<span style="color:green; font-weight: bold;">This product is all ok.</span><br /><br />';
- }*/
+ //Create Header
+ /*if($facts_array['any_problems']){
+ $str_ret ='<span style="color:red; font-weight: bold; font-size:1.2em;">This product needs attention!</span><br /><br />';
+ }else{
+ $str_ret ='<span style="color:green; font-weight: bold;">This product is all ok.</span><br /><br />';
+ }*/
- //Talk about summary and calc stock
- if($facts_array['summary_and_calc_stock_match']){
- $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The stock quantity summary is ok</span><br />
- This means that the current summary of this products quantity, which is in the database, is the value we get if we calculates it from scratch right now.<br />
- <b>The Summary stock is: '. $facts_array['summary_stock'] .'</b><br /><br />';
- }else{
- $str_ret .='<span style="color:red; font-weight: bold; font-size:1.2em;">The stock quantity summary is NOT ok</span><br />
- This means that the current summary of this products quantity, which is in the database, isn\'t the value we get if we calculates it from scratch right now.<br />
- <b>The current summary stock is: '. $facts_array['summary_stock'] .'</b><br />
- <b>If we calculates it we get: '. $facts_array['calc_stock'] .'</b><br /><br />';
- }
+ //Talk about summary and calc stock
+ if($facts_array['summary_and_calc_stock_match']){
+ $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The stock quantity summary is ok</span><br />
+ This means that the current summary of this products quantity, which is in the database, is the value we get if we calculates it from scratch right now.<br />
+ <b>The Summary stock is: '. $facts_array['summary_stock'] .'</b><br /><br />';
+ }else{
+ $str_ret .='<span style="color:red; font-weight: bold; font-size:1.2em;">The stock quantity summary is NOT ok</span><br />
+ This means that the current summary of this products quantity, which is in the database, isn\'t the value we get if we calculates it from scratch right now.<br />
+ <b>The current summary stock is: '. $facts_array['summary_stock'] .'</b><br />
+ <b>If we calculates it we get: '. $facts_array['calc_stock'] .'</b><br /><br />';
+ }
- //Talk about the health of the stock entries
- if($facts_array['stock_entries_healthy']){
- $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The options stock is ok</span><br />
- This means that the database entries for this product looks the way they should. No options are missing in any row. No option exist in any row where it should not.<br />
- <b>Total number of stock entries this product has: '. $facts_array['stock_entries_count'] .'</b><br />
- <b>Number of messy entries: '. $facts_array['sick_stock_entries_count'] .'</b><br />';
+ //Talk about the health of the stock entries
+ if($facts_array['stock_entries_healthy']){
+ $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The options stock is ok</span><br />
+ This means that the database entries for this product looks the way they should. No options are missing in any row. No option exist in any row where it should not.<br />
+ <b>Total number of stock entries this product has: '. $facts_array['stock_entries_count'] .'</b><br />
+ <b>Number of messy entries: '. $facts_array['sick_stock_entries_count'] .'</b><br />';
- }else{
- $str_ret .='<span style="color:red; font-weight: bold; font-size:1.2em;">'.__('the options stock is not ok').'</span><br />'.
- __('this means that at least one of the database entries for this product is messed up. either options are missing in rows or options exist in rows they should not.').'<br />'.
- '<b>'.__('total number of stock entries this product has: '). $facts_array['stock_entries_count'] .'</b><br />'.
- '<b>'.__('number of messy entries: '). $facts_array['sick_stock_entries_count'] .'</b><br /><br />';
+ }else{
+ $str_ret .='<span style="color:red; font-weight: bold; font-size:1.2em;">'.__('the options stock is not ok').'</span><br />'.
+ __('this means that at least one of the database entries for this product is messed up. either options are missing in rows or options exist in rows they should not.').'<br />'.
+ '<b>'.__('total number of stock entries this product has: '). $facts_array['stock_entries_count'] .'</b><br />'.
+ '<b>'.__('number of messy entries: '). $facts_array['sick_stock_entries_count'] .'</b><br /><br />';
- if(sizeof($facts_array['lacks_id_array']) > 0){
- $str_ret .='<b>'.__('these options were missing in row(s):').'</b><br />';
- foreach($facts_array['lacks_id_array'] as $lack_id){
- $str_ret .= '<span style="color:red;"><b>'. tep_options_name($lack_id) .'</b></span><br />';
- }
- $str_ret .='<span style="color:blue; font-weight: bold;">'.__('possible solutions: ').'</span>'.__('delete the corresponding row(s) from the database or stop tracking the stock for that option.').'<br /><br />';
- }
+ if(sizeof($facts_array['lacks_id_array']) > 0){
+ $str_ret .='<b>'.__('these options were missing in row(s):').'</b><br />';
+ foreach($facts_array['lacks_id_array'] as $lack_id){
+ $str_ret .= '<span style="color:red;"><b>'. tep_options_name($lack_id) .'</b></span><br />';
+ }
+ $str_ret .='<span style="color:blue; font-weight: bold;">'.__('possible solutions: ').'</span>'.__('delete the corresponding row(s) from the database or stop tracking the stock for that option.').'<br /><br />';
+ }
- if(sizeof($facts_array['intruders_id_array']) > 0){
- $str_ret .= '<br /><b>'.__('these options exists in row(s) although they should not:').'</b><br />';
- foreach($facts_array['intruders_id_array'] as $intruder_id){
- $str_ret .= '<span style="color:red;"><b>'. tep_options_name($intruder_id) .'</b></span><br />';
- }
- $str_ret .='<span style="color:blue; font-weight: bold;">'.__('possible solutions: ').'</span>'.__('delete the corresponding row(s) from the database or start tracking the stock for that option.').'<br /><br />';
- }
+ if(sizeof($facts_array['intruders_id_array']) > 0){
+ $str_ret .= '<br /><b>'.__('these options exists in row(s) although they should not:').'</b><br />';
+ foreach($facts_array['intruders_id_array'] as $intruder_id){
+ $str_ret .= '<span style="color:red;"><b>'. tep_options_name($intruder_id) .'</b></span><br />';
+ }
+ $str_ret .='<span style="color:blue; font-weight: bold;">'.__('possible solutions: ').'</span>'.__('delete the corresponding row(s) from the database or start tracking the stock for that option.').'<br /><br />';
+ }
- }
+ }
- //Talk about automatic solutions
- if($facts_array['any_problems']){
- $str_ret .= '<div class="button_nav">'.
- '<span style="color:blue; font-weight: bold; font-size:1.2em;">'.__('automatic solutions avaliable') .':</span><br />';
+ //Talk about automatic solutions
+ if($facts_array['any_problems']){
+ $str_ret .= '<div class="button_nav">'.
+ '<span style="color:blue; font-weight: bold; font-size:1.2em;">'.__('automatic solutions avaliable') .':</span><br />';
- if(!$facts_array['stock_entries_healthy'])
- $str_ret .='<p><a class="button" href="' . tep_href_link(self::FILENAME, 'action=amputate&pID='.$facts_array['id'], 'NONSSL') . '" class="menuBoxContentLink" target="_blank">'.__('amputation (deletes all messy rows)').'</a></p>';
+ if(!$facts_array['stock_entries_healthy'])
+ $str_ret .='<p><a class="button" href="' . tep_href_link(self::FILENAME, 'action=amputate&pID='.$facts_array['id'], 'NONSSL') . '" class="menuBoxContentLink" target="_blank">'.__('amputation (deletes all messy rows)').'</a></p>';
- if(!$facts_array['summary_and_calc_stock_match'])
- $str_ret .='<p><a class="button" href="' . tep_href_link(self::FILENAME, 'action=update_summary&pID='.$facts_array['id'], 'NONSSL') . '" class="menuBoxContentLink" target="_blank">'.__('set the summary stock to: '). $facts_array['calc_stock'] .'</a></p>';
+ if(!$facts_array['summary_and_calc_stock_match'])
+ $str_ret .='<p><a class="button" href="' . tep_href_link(self::FILENAME, 'action=update_summary&pID='.$facts_array['id'], 'NONSSL') . '" class="menuBoxContentLink" target="_blank">'.__('set the summary stock to: '). $facts_array['calc_stock'] .'</a></p>';
- $str_ret .='</div>';
- }
-
-
+ $str_ret .='</div>';
+ }
break;
}
@@ -403,7 +484,7 @@
private static function qtpro_doctor_amputate_bad_from_product($products_id){
- $return_amputate_count = 0;
+ $return_amputate_count = 0;
//MISSION CODENAME "Get information" STARTS HERE
//Get all products_stock entries for the product. ---------------------------------------
@@ -505,7 +586,7 @@
//It is if the products it liks to not exists.
//The $row_array must contain the keys: 'products_id'
private static function qtpro_stock_row_is_trash($row_array){
- $prod_query = tep_db_query("SELECT products_id FROM " . TABLE_PRODUCTS . " WHERE products_id = '" . $products_id . "'");
+// $prod_query = tep_db_query("SELECT products_id FROM " . TABLE_PRODUCTS . " WHERE products_id = '" . $products_id . "'");
if (self::qtpro_product_exists($row_array['products_id'])){
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 18:11:41
|
Revision: 4196
http://oscss.svn.sourceforge.net/oscss/?rev=4196&view=rev
Author: oscim
Date: 2012-04-10 18:11:29 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerInstant.class.php
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php 2012-04-10 18:02:10 UTC (rev 4195)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php 2012-04-10 18:11:29 UTC (rev 4196)
@@ -335,8 +335,7 @@
'language_id' => amDB::input($langId),
'products_options_values_name' => amDB::input($name)
);
-print_r($optionValues);
-exit;
+
amDB::perform(TABLE_PRODUCTS_OPTIONS_VALUES,$ovData);
}
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerInstant.class.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerInstant.class.php 2012-04-10 18:02:10 UTC (rev 4195)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerInstant.class.php 2012-04-10 18:11:29 UTC (rev 4196)
@@ -522,13 +522,14 @@
$this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['prefix'] = $res['price_prefix'];
$this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['weight'] = $res['options_values_weight'];
+ $this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['products_attributes_id'] = $res['products_attributes_id'];
+
if (AM_USE_URLIMG)
$this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['urlimg'] = $res['products_options_values_url'];
if (AM_USE_COLOR)
$this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['thumb'] = $res['products_options_values_thumbnail'];
if (AM_USE_DOWNLOAD) {
- $this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['products_attributes_id'] = $res['products_attributes_id'];
$this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['products_attributes_filename'] = $res['products_attributes_filename'];
$this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['products_attributes_maxdays'] = $res['products_attributes_maxdays'];
$this->arrAllProductOptionsAndValues[$optionsId]['values'][$res['options_values_id']]['products_attributes_maxcount'] = $res['products_attributes_maxcount'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
