Menu
▾
▴
[Oscss-commit] SF.net SVN: oscss:[4068] trunk/catalog
|
From: <os...@us...> - 2012-03-05 10:10:53
|
Revision: 4068
http://oscss.svn.sourceforge.net/oscss/?rev=4068&view=rev
Author: oscim
Date: 2012-03-05 10:10:43 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
correction suite commit pr?\195?\169c?\195?\169dent, et fichier manquant ou coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/admin/includes/modules/pages/adminUsers.php
trunk/catalog/includes/database_tables.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2012-03-05 10:02:05 UTC (rev 4067)
+++ trunk/catalog/admin/includes/database_tables.php 2012-03-05 10:10:43 UTC (rev 4068)
@@ -85,6 +85,11 @@
define('TABLE_ORDERS_STATUS_HISTORY', DB_TABLE_PREFIX . 'orders_status_history');
define('TABLE_ORDERS_TOTAL', DB_TABLE_PREFIX . 'orders_total');
+
+ define('TABLE_SERVICES', DB_TABLE_PREFIX.'services');
+ define('TABLE_SHIPPING', DB_TABLE_PREFIX.'shipping');
+ define('TABLE_SHIPPING_PRODUCTS', DB_TABLE_PREFIX.'shipping_products');
+
## Customers tables
# Master tables
define('TABLE_CUSTOMERS', DB_TABLE_PREFIX . 'customers');
@@ -178,7 +183,7 @@
define('TABLE_NAVIGATION_LINKS_TO_CATEGORIES', DB_TABLE_PREFIX . 'navigation_links_to_categories');
-## Image index
+## Image index
define('TABLE_IMAGES', DB_TABLE_PREFIX . 'images');
/// TOP Not Used for dev
define('TABLE_IMAGES_USED', DB_TABLE_PREFIX . 'images_used');
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt 2012-03-05 10:10:43 UTC (rev 4068)
@@ -0,0 +1,40 @@
+<?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 04/03/2012, 16:07
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['heading title shipping']="Expeditions vers les clients" ;
+
+
+// $lang['tab services briefs']="Details" ;
+// $lang['tab services details']="Commande" ;
+
+/* Action */
+ /* Listing */
+ $lang['table heading shipping id']="n°" ;
+ $lang['table heading order id']="Cmd n°" ;
+ $lang['table heading customers']="Clients" ;
+ $lang['table heading date expedition']="Expd. le" ;
+ $lang['table heading method']="Méthode" ;
+ $lang['table heading status']="Etat" ;
+ $lang['table heading action']="Action" ;
+
+
+ /* mutli */
+ $lang['shipping update n %s']="Appliquer a cette livraison" ;
+ $lang['text info multi notify']="informer le client de ce changement " ;
+ $lang['image modify multi']="Valider" ;
+
+
+
+/* Value list */
+ /* status */
+ $lang['shipping opened']="Ouverte" ;
+ $lang['shipping progress']="En cours" ;
+ $lang['shipping closed']="Cloturé" ;
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminUsers.php 2012-03-05 10:02:05 UTC (rev 4067)
+++ trunk/catalog/admin/includes/modules/pages/adminUsers.php 2012-03-05 10:10:43 UTC (rev 4068)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 28/12/11, 17:28
+ @date 04/03/2012, 17:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class adminUsers
@@ -39,12 +39,20 @@
@param string/false
*/
public static $url_redirect=self::FILENAME;
+ /**
+ @param array
+ */
+ public static $modules;
+
/**
class constructor
*/
public function __construct() {
self::$code=__CLASS__;
+
+ sqladminuser::getInstance();
+ self::$modules = sqladminuser::$modules;
}
public function check_action($actions){
@@ -122,7 +130,7 @@
}
if (in_array($_POST['admin_email_address'], $stored_email)) {
- tep_redirect(tep_href_link(self::FILENAME, 'page=' . $page . 'mID=' . $_GET['mID'] . '&error=email&action=edit_member'));
+ tep_redirect(tep_href_link(self::FILENAME, 'page=' . $page . 'mID=' . $_GET['mID'] . '&error=email&action=edit'));
}
else {
$sql_data_array = array('id' => $admin_id,
@@ -240,18 +248,32 @@
public static function load_db_values($ID){
$DB=Database::getInstance();
+
+
$array=sqladminuser::fetch(array('id'=>(int)$ID));
+ self::$modules->load_db_values($ID);
+// print_r(self::$modules);
+
return new objectInfo($array);
}
public function display_view(){
+ $action = self::$action;
switch(self::$action){
+ case 'edit':
+ break;
+
+
default:
- self::tep_get_list();
- return tep_get_include_contents(__CLASS__.'.listing');
+ self::tep_get_list();
+ $action ='listing';
+// return tep_get_include_contents(__CLASS__.'.listing');
}
+
+ /// use master gabarit
+ return MGabCont::CallGab($action,__FUNCTION__,__CLASS__);
}
@@ -289,7 +311,7 @@
$contents[] = array('class' => 'button_nav','text' => tep_image_submit('button_insert.gif', IMAGE_INSERT) . ' <a class="button" href="' . tep_href_link(self::FILENAME) . '">' . IMAGE_CANCEL . '</a>');
break;
- case 'edit_member':
+ case 'edit':
$heading[] = array('text' => __('text info heading new') );
$contents = array('form' => tep_draw_form('newmember', self::$url_redirect, 'action=member_edit&mID=' . self::$mInfo->admin_id, 'post', '', ' name="newmember"'));
@@ -334,9 +356,9 @@
$contents[] = array('text' => '<strong>' . __('text info fullname') . '</strong>' . self::$mInfo->admin_firstname . ' ' . self::$mInfo->admin_lastname);
$contents[] = array('text' => '<strong>' . __('text info email') . '</strong>' . self::$mInfo->admin_email_address);
$contents[] = array('text' => '<strong>' . __('text info group') . '</strong>' . self::$mInfo->admin_groups_name);
- $contents[] = array('text' => '<strong>' . __('text info created') . '</strong>' . self::$mInfo->admin_created);
- $contents[] = array('text' => '<strong>' . __('text info modified') . '</strong>' . self::$mInfo->admin_modified);
- $contents[] = array('text' => '<strong>' . __('text info logdate') . '</strong>' . self::$mInfo->admin_logdate);
+ $contents[] = array('text' => '<strong>' . __('text info created') . '</strong>' . tep_date_short(self::$mInfo->admin_created));
+ $contents[] = array('text' => '<strong>' . __('text info modified') . '</strong>' . tep_date_short(self::$mInfo->admin_modified));
+ $contents[] = array('text' => '<strong>' . __('text info logdate') . '</strong>' . tep_date_short(self::$mInfo->admin_logdate));
$contents[] = array('text' => '<strong>' . __('text info lognum') . '</strong>' . self::$mInfo->admin_lognum);
}
}
Modified: trunk/catalog/includes/database_tables.php
===================================================================
--- trunk/catalog/includes/database_tables.php 2012-03-05 10:02:05 UTC (rev 4067)
+++ trunk/catalog/includes/database_tables.php 2012-03-05 10:10:43 UTC (rev 4068)
@@ -79,10 +79,10 @@
define('TABLE_ORDERS_STATUS_HISTORY', DB_TABLE_PREFIX . 'orders_status_history');
define('TABLE_ORDERS_TOTAL', DB_TABLE_PREFIX . 'orders_total');
+ define('TABLE_SERVICES', DB_TABLE_PREFIX.'services');
+ define('TABLE_SHIPPING', DB_TABLE_PREFIX.'shipping');
+ define('TABLE_SHIPPING_PRODUCTS', DB_TABLE_PREFIX.'shipping_products');
-
- define('TABLE_SERVICES', DB_TABLE_PREFIX.'services');
-
define('TABLE_PRODUCTS', DB_TABLE_PREFIX . 'products');
define('TABLE_PRODUCTS_ATTRIBUTES', DB_TABLE_PREFIX . 'products_attributes');
define('TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD', DB_TABLE_PREFIX . 'products_attributes_download');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
