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: <ay...@us...> - 2011-06-01 08:29:57
|
Revision: 3744
http://oscss.svn.sourceforge.net/oscss/?rev=3744&view=rev
Author: ayatus
Date: 2011-06-01 08:29:51 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Validation xhtml
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/template/oscss/gabarit-1.php
Modified: branches/2.1.0/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/template/oscss/gabarit-1.php 2011-06-01 07:55:53 UTC (rev 3743)
+++ branches/2.1.0/catalog/admin/includes/template/oscss/gabarit-1.php 2011-06-01 08:29:51 UTC (rev 3744)
@@ -61,13 +61,15 @@
<ul class="fright">
<li class="w_30 nobr ">
<form action="" method="post">
- <select name="SearchSpeed">
- <option value="products" <?php if($page_module=='products') echo ' selected="selected" ' ?>><?php echo __('quicksearch products') ?></option>
- <option value="customers" <?php if($page_module=='customers') echo ' selected="selected" ' ?>><?php echo __('quicksearch customers') ?></option>
- <option value="categories" <?php if($page_module=='categories') echo ' selected="selected" ' ?>><?php echo __('quicksearch categories') ?></option>
- <option value="orders" <?php if($page_module=='orders') echo ' selected="selected" ' ?>><?php echo __('quicksearch orders') ?></option>
- </select>
- <input type='text' name="sSearch" value="<?php if(isset($_REQUEST['sSearch'])) echo $_REQUEST['sSearch']?>" onchange="this.form.submit();" />
+ <div>
+ <select name="SearchSpeed">
+ <option value="products" <?php if($page_module=='products') echo ' selected="selected" ' ?>><?php echo __('quicksearch products') ?></option>
+ <option value="customers" <?php if($page_module=='customers') echo ' selected="selected" ' ?>><?php echo __('quicksearch customers') ?></option>
+ <option value="categories" <?php if($page_module=='categories') echo ' selected="selected" ' ?>><?php echo __('quicksearch categories') ?></option>
+ <option value="orders" <?php if($page_module=='orders') echo ' selected="selected" ' ?>><?php echo __('quicksearch orders') ?></option>
+ </select>
+ <input type='text' name="sSearch" value="<?php if(isset($_REQUEST['sSearch'])) echo $_REQUEST['sSearch']?>" onchange="this.form.submit();" />
+ </div>
</form>
</li>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ay...@us...> - 2011-06-01 07:56:00
|
Revision: 3743
http://oscss.svn.sourceforge.net/oscss/?rev=3743&view=rev
Author: ayatus
Date: 2011-06-01 07:55:53 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Orthographe
Modified Paths:
--------------
branches/2.1.0/catalog/install/includes/language/en_EN/oscss_config.txt
branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
branches/2.1.0/catalog/install/includes/upgrade/1.2.2-2.1.0.sql
branches/2.1.0/catalog/install/includes/upgrade/oscom2.2Ms2-1.2.2.sql
branches/2.1.0/catalog/install/oscss_config.sql
Modified: branches/2.1.0/catalog/install/includes/language/en_EN/oscss_config.txt
===================================================================
--- branches/2.1.0/catalog/install/includes/language/en_EN/oscss_config.txt 2011-05-25 14:33:11 UTC (rev 3742)
+++ branches/2.1.0/catalog/install/includes/language/en_EN/oscss_config.txt 2011-06-01 07:55:53 UTC (rev 3743)
@@ -14,7 +14,7 @@
/* osc_admin_groups */
$lg['OSC_ADMIN_GROUPS_ADMIN']= 'Root';
-$lg['OSC_ADMIN_GROUPS_BUYER']= 'Buyer';
+$lg['OSC_ADMIN_GROUPS_SELLER']= 'Buyer';
/* osc_configuration */
/// 0 template
Modified: branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
===================================================================
--- branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-05-25 14:33:11 UTC (rev 3742)
+++ branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-06-01 07:55:53 UTC (rev 3743)
@@ -15,7 +15,7 @@
/* osc_admin_groups */
$lg['OSC_ADMIN_GROUPS_ADMIN']= 'Administrateur';
-$lg['OSC_ADMIN_GROUPS_BUYER']= 'Vendeur';
+$lg['OSC_ADMIN_GROUPS_SELLER']= 'Vendeur';
/* osc_configuration */
/// 0 template
@@ -29,7 +29,7 @@
$lg['CFG_CLASS_VIRTUAL_TYPE_3_S']= 'configuration type products 3';
$lg['CFG_CLASS_VIRTUAL_TYPE_4_S']= 'configuration type products 4';
$lg['ORPHELIN_COLLECTOR_S']= 'Collecteur d\'orphelin';
-$lg['ORPHELIN_COLLECTOR_L']= 'Preciser l\'id de la categories dans laquel les élément orphelin sont associé';
+$lg['ORPHELIN_COLLECTOR_L']= 'Préciser l\'id de la catégorie dans laquelle les éléments orphelins sont associés';
/// 1 store
@@ -38,7 +38,7 @@
$lg['STORE_NAME_S']= 'Nom de la boutique';
$lg['STORE_NAME_L']= 'Indiquer le nom de la boutique.';
$lg['STORE_OWNER_S']= 'Propriétaire de la boutique';
-$lg['STORE_OWNER_L']= 'Indiquer le nom du Propriétaire de la boutique.';
+$lg['STORE_OWNER_L']= 'Indiquer le nom du propriétaire de la boutique.';
$lg['STORE_OWNER_EMAIL_ADDRESS_S']= 'Adresse Email';
$lg['STORE_OWNER_EMAIL_ADDRESS_L']= 'L\'adresse Email du gérant de la boutique.';
$lg['EMAIL_FROM_S']= 'Champ \'From\' d\'un Email envoyé';
@@ -47,11 +47,11 @@
$lg['STORE_COUNTRY_L']= 'Le pays de résidence de la boutique.<br /><strong>Note : Pensez à mettre à jour la zone.</strong>';
$lg['STORE_ZONE_S']= 'Zone';
$lg['STORE_ZONE_L']= 'Zone de la localisation de la boutique.';
-$lg['USE_DEFAULT_LANGUAGE_CURRENCY_S']= 'Change langue en fonction devises';
+$lg['USE_DEFAULT_LANGUAGE_CURRENCY_S']= 'Change la langue en fonction de la devise';
$lg['USE_DEFAULT_LANGUAGE_CURRENCY_L']= 'Change automatiquement la langue sur celle correspondant à la nouvelle devise choisie.';
-$lg['STORE_LOGO_S']= 'Le Logo de la boutique';
-$lg['STORE_LOGO_L']= 'Le Logo utilisé pour la partie public';
-$lg['STORE_LOGO_PRINT_S']= 'Le Logo pour impression';
+$lg['STORE_LOGO_S']= 'Le logo de la boutique';
+$lg['STORE_LOGO_L']= 'Le logo utilisé pour la partie public';
+$lg['STORE_LOGO_PRINT_S']= 'Le logo pour impression';
$lg['STORE_LOGO_PRINT_L']= 'Le logo utilisé lors de l\'impression, uniquement en jpg, pas de couche de transparence';
$lg['SEND_EXTRA_ORDER_EMAILS_TO_S']= 'Email lors d\'une commande';
$lg['SEND_EXTRA_ORDER_EMAILS_TO_L']= 'Envoie une copie de la commande aux adresses spécifiées. Celles-ci doivent être dans le format :<br />Nom 1 ‹email@address1›, Nom 2 ‹email@address2›';
@@ -65,15 +65,15 @@
$lg['STORE_OFFLINE_L']= 'Bloquer l\'affichage public pour mettre à jour ou intervenir sur votre boutique ';
$lg['STORE_OFFLINE_TXT_S']= 'Texte mode maintenance ';
$lg['STORE_OFFLINE_TXT_L']= 'texte affiché lorsque votre boutique est en maintenance ';
-$lg['STORE_LEGAL_INFO_S']= 'Informtions légales ';
+$lg['STORE_LEGAL_INFO_S']= 'Informations légales ';
$lg['STORE_LEGAL_INFO_L']= 'texte affiché en pied de page des imprimés pdf';
/// 2 Unite
-$lg['TAX_DECIMAL_PLACES_S']= 'Taxe Décimale';
+$lg['TAX_DECIMAL_PLACES_S']= 'Taxe décimale';
$lg['TAX_DECIMAL_PLACES_L']= 'Emplacement décimal pour la valeur du montant de la taxe.';
$lg['UNIT_WEIGHT_NAME_S']= 'Unité de poids';
-$lg['UNIT_WEIGHT_NAME_L']= 'Préciser l\'unité de poids utilisé (kg)';
+$lg['UNIT_WEIGHT_NAME_L']= 'Préciser l\'unité de poids utilisée (kg)';
/// 3 max value
@@ -102,7 +102,7 @@
$lg['JPEG_QUALITY_L']= 'Définissez la qualité de compression des vignettes jpeg.';
$lg['IMAGE_REQUIRED_S']= 'Image inexistante';
$lg['IMAGE_REQUIRED_L']= 'Permettre l\'affichage des liens brisés sur les images (pour le développement).';
-$lg['IMAGE_NONEXISTENT_S']= 'Substitution Image introuvable';
+$lg['IMAGE_NONEXISTENT_S']= 'Substitution image introuvable';
$lg['IMAGE_NONEXISTENT_L']= 'Image qui vient remplacer l\'image non trouvée';
/// 6 module option
@@ -112,9 +112,9 @@
$lg['DEFAULT_LANGUAGE_L']= 'Langage par défaut.';
$lg['DEFAULT_ORDERS_STATUS_ID_S']= 'État par défaut pour une nouvelle commande';
$lg['DEFAULT_ORDERS_STATUS_ID_L']= 'Quand une nouvelle commande est créée, ce statut de commande lui sera assigné.';
-$lg['DEFAULT_RETURN_REASON_S']= 'Raison retour par défaut';
-$lg['DEFAULT_RETURN_REASON_L']= 'La raison par défaut appliquée pour tout retour.';
-$lg['DEFAULT_RETURN_STATUS_ID_S']= 'Statut retour pad défaut';
+$lg['DEFAULT_RETURN_REASON_S']= 'Raison des retours par défaut';
+$lg['DEFAULT_RETURN_REASON_L']= 'La raison par défaut appliquée pour tous retours.';
+$lg['DEFAULT_RETURN_STATUS_ID_S']= 'Statut des retours par défaut';
$lg['DEFAULT_RETURN_STATUS_ID_L']= 'Retour d\'état par défaut attribué à tous nouveaux retours.';
$lg['DEFAULT_REFUND_METHOD_S']= 'Méthode de remboursement par défaut';
$lg['DEFAULT_REFUND_METHOD_L']= 'Méthode de remboursement par défaut.';
Modified: branches/2.1.0/catalog/install/includes/upgrade/1.2.2-2.1.0.sql
===================================================================
--- branches/2.1.0/catalog/install/includes/upgrade/1.2.2-2.1.0.sql 2011-05-25 14:33:11 UTC (rev 3742)
+++ branches/2.1.0/catalog/install/includes/upgrade/1.2.2-2.1.0.sql 2011-06-01 07:55:53 UTC (rev 3743)
@@ -922,8 +922,8 @@
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_BUYER' )
-insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('2', 'OSC_ADMIN_GROUPS_BUYER');
+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');
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');
Modified: branches/2.1.0/catalog/install/includes/upgrade/oscom2.2Ms2-1.2.2.sql
===================================================================
--- branches/2.1.0/catalog/install/includes/upgrade/oscom2.2Ms2-1.2.2.sql 2011-05-25 14:33:11 UTC (rev 3742)
+++ branches/2.1.0/catalog/install/includes/upgrade/oscom2.2Ms2-1.2.2.sql 2011-06-01 07:55:53 UTC (rev 3743)
@@ -579,7 +579,7 @@
insert into osc_admin (admin_id, admin_groups_id, admin_firstname, admin_lastname, admin_email_address, admin_password, admin_created, admin_modified, admin_logdate, admin_lognum) values ('1', '1', 'AdminFirstname', 'AdminLastname', 'admin@localhost', '351683ea4e19efe34874b501fdbf9792:9b', NOW(), '1000-01-01 00:00:00', NOW(), '0');
insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('1', 'OSC_ADMIN_GROUPS_ADMIN');
-insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('2', 'OSC_ADMIN_GROUPS_BUYER');
+insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('2', 'OSC_ADMIN_GROUPS_SELLER');
ALTER TABLE osc_categories ADD sortchids_products VARCHAR( 50 ) NOT NULL;
Modified: branches/2.1.0/catalog/install/oscss_config.sql
===================================================================
--- branches/2.1.0/catalog/install/oscss_config.sql 2011-05-25 14:33:11 UTC (rev 3742)
+++ branches/2.1.0/catalog/install/oscss_config.sql 2011-06-01 07:55:53 UTC (rev 3743)
@@ -152,7 +152,7 @@
insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('1', 'OSC_ADMIN_GROUPS_ADMIN');
-insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('2', 'OSC_ADMIN_GROUPS_BUYER');
+insert into osc_admin_groups (admin_groups_id, admin_groups_name) values ('2', 'OSC_ADMIN_GROUPS_SELLER');
insert into osc_cip values (1, 'Contrib_Installer_2.2', 1, 'CONTRIB_INSTALLER', '2.2');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-25 14:33:17
|
Revision: 3742
http://oscss.svn.sourceforge.net/oscss/?rev=3742&view=rev
Author: oscim
Date: 2011-05-25 14:33:11 +0000 (Wed, 25 May 2011)
Log Message:
-----------
coquille
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
branches/2.1.0/catalog/admin/includes/modules/pages/products.php
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-05-24 21:27:47 UTC (rev 3741)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-05-25 14:33:11 UTC (rev 3742)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 30/08/10, 21:39
+ @version 2.1.0
+ @date 24/05/11, 23:25
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -11,7 +12,7 @@
$lang['heading title edit']='Édition d\'une page';
$lang['table heading id']='ID';
$lang['table heading listings']='Contenu';
-$lang['table heading date added']='Date d\'ajout';
+$lang['table heading date added']='Crée(s)';
$lang['table heading categories']='Catégorie';
$lang['table heading c title']='Titre';
$lang['table heading last modified']='Dernière modification';
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-05-24 21:27:47 UTC (rev 3741)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-05-25 14:33:11 UTC (rev 3742)
@@ -645,7 +645,7 @@
switch(self::$action){
case 'new':
- $action='delete';
+ $action='new';
break;
case 'delete_product':
self::load_db_values($_GET['pID']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-24 21:27:53
|
Revision: 3741
http://oscss.svn.sourceforge.net/oscss/?rev=3741&view=rev
Author: oscim
Date: 2011-05-24 21:27:47 +0000 (Tue, 24 May 2011)
Log Message:
-----------
correction extension
Modified Paths:
--------------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-20 08:00:50 UTC (rev 3740)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-24 21:27:47 UTC (rev 3741)
@@ -529,7 +529,7 @@
self::$InitInfo['adjust']['sWhere']=$sWhere;
self::$InitInfo['adjust']['options']=$options;
- $res = self::load_db_values();
+ $res = self::GetDBValue();
return self::$list=self::CheckResult($res);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-20 08:00:56
|
Revision: 3740
http://oscss.svn.sourceforge.net/oscss/?rev=3740&view=rev
Author: oscim
Date: 2011-05-20 08:00:50 +0000 (Fri, 20 May 2011)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
branches/2.1.0/catalog/includes/classes/page.contact.php
branches/2.1.0/catalog/password_forgotten.php
Modified: branches/2.1.0/catalog/includes/classes/page.contact.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/page.contact.php 2011-05-16 12:55:50 UTC (rev 3739)
+++ branches/2.1.0/catalog/includes/classes/page.contact.php 2011-05-20 08:00:50 UTC (rev 3740)
@@ -101,7 +101,7 @@
'from_email'=>$email_address,
'subject'=>EMAIL_SUBJECT,
'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
- 'message'=>$enquiry,
+ 'message'=>$name.' '.$email_address.'<br />'.$enquiry,
);
notification::notif('contact_us',EMAIL_SUBJECT,$myarray,$data);
Modified: branches/2.1.0/catalog/password_forgotten.php
===================================================================
--- branches/2.1.0/catalog/password_forgotten.php 2011-05-16 12:55:50 UTC (rev 3739)
+++ branches/2.1.0/catalog/password_forgotten.php 2011-05-20 08:00:50 UTC (rev 3740)
@@ -40,8 +40,18 @@
$DB->query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_db_input($crypted_password) . "' where customers_id = '" . (int)$user['customers_id'] . "'");
- tep_mail($user['customers_firstname'] . ' ' . $user['customers_lastname'], $email_address, EMAIL_PASSWORD_REMINDER_SUBJECT, sprintf(EMAIL_PASSWORD_REMINDER_BODY, $new_password), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+ $myarray = array(
+ 'from'=>STORE_OWNER,
+ 'subject'=>'',
+ '_oLinks'=>tep_href_link(FILENAME_ACCOUNT, '', 'SSL'),
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'message'=>sprintf(EMAIL_PASSWORD_REMINDER_BODY, $new_password),
+ );
+ $message_final=tep_post_prepare_email('password_forgotten.tpl',$language,$myarray);
+
+ tep_mail($user['customers_firstname'] . ' ' . $user['customers_lastname'], $email_address, EMAIL_PASSWORD_REMINDER_SUBJECT,$message_final , STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+
$page->messageStack->add_session('login', SUCCESS_PASSWORD_SENT, 'success');
tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-16 12:56:00
|
Revision: 3739
http://oscss.svn.sourceforge.net/oscss/?rev=3739&view=rev
Author: oscim
Date: 2011-05-16 12:55:50 +0000 (Mon, 16 May 2011)
Log Message:
-----------
maj n?\194?\176 version
Modified Paths:
--------------
branches/2.1.0/catalog/common/oscss.version.xml
Modified: branches/2.1.0/catalog/common/oscss.version.xml
===================================================================
--- branches/2.1.0/catalog/common/oscss.version.xml 2011-05-16 12:53:48 UTC (rev 3738)
+++ branches/2.1.0/catalog/common/oscss.version.xml 2011-05-16 12:55:50 UTC (rev 3739)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<core>
<version>2.1.0 RC</version>
- <svn>3737</svn>
+ <svn>3739</svn>
<level>stable</level>
<template_admin>oscss</template_admin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-16 12:53:55
|
Revision: 3738
http://oscss.svn.sourceforge.net/oscss/?rev=3738&view=rev
Author: oscim
Date: 2011-05-16 12:53:48 +0000 (Mon, 16 May 2011)
Log Message:
-----------
correction coquille sur l'appel des detail inline, suite modification des gabarits
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/classes/dataTableInnerHTML.php
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
branches/2.1.0/catalog/admin/includes/modules/pages/attributes.php
branches/2.1.0/catalog/admin/includes/modules/pages/backup.php
branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
branches/2.1.0/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.0/catalog/admin/includes/modules/pages/customers.php
branches/2.1.0/catalog/admin/includes/modules/pages/held_orders.php
branches/2.1.0/catalog/admin/includes/modules/pages/newsletters.php
branches/2.1.0/catalog/admin/includes/modules/pages/newslettersModeles.php
branches/2.1.0/catalog/admin/includes/modules/pages/orders.php
branches/2.1.0/catalog/admin/includes/modules/pages/package.php
branches/2.1.0/catalog/admin/includes/modules/pages/products.php
branches/2.1.0/catalog/install/oscss_config.sql
Modified: branches/2.1.0/catalog/admin/includes/classes/dataTableInnerHTML.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/classes/dataTableInnerHTML.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/classes/dataTableInnerHTML.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -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-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 16/07/10, 20:58
+ @version 2.1.0
+ @date 16/05/11, 14:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class dataTableInnerHTML
@@ -15,38 +15,19 @@
class dataTableInnerHTML {
/**
- @p string type (products/categories/etc...)
+ @var string type (products/categories/etc...)
*/
public static $type;
/**
- @p string mode (page|content)
+ @var string mode (page|content)
*/
public static $mode;
/**
- @p array modele tableau des col dispo pour search
+ @var array list tableau
*/
- public static $modele;
- /**
- @p array list tableau
- */
public static $list;
- /**
- @p int page index page num
- */
- public static $page=1;
- /**
- @p int rowbyp filtre nombre lg
- */
- public static $rowbyp;
- /**
- @p string sOrder clause order
- */
- public static $sOrder= '';
- /**
- @p string sWhere clause where supp
- */
- public static $sWhere= '';
+
public function __construct(){
global $language;
@@ -54,15 +35,9 @@
self::$type= $_GET['type'];
self::$mode= (isset($_GET['mod']))?$_GET['mod']:'content';
- self::$page=$_GET['iDisplayStart'] / $_GET['iDisplayLength'];
- self::$rowbyp=(isset($_GET['iDisplayLength'])?$_GET['iDisplayLength'] : MAX_DISPLAY_ROW_BY_PAGE );
$function='init_mod_'.self::$mode;
self::$function();
-
-
-
-
}
@@ -91,11 +66,7 @@
$oscss->pile_file_lang(DIR_WS_LANGUAGES . $oscss->the_var('language') . '/modules/pages/'.self::$type.'.txt');
include (DIR_WS_FUNCTIONS.'lib.'.self::$type.'.php');
- require(DIR_WS_MODULES.'pages/'.$obj.'.php');
-
- self::$modele=call_user_func(array($obj, 'tep_get_modele'));
-
-
+ require_once(DIR_WS_MODULES.'pages/'.$obj.'.php');
}
private function detail_row_page($id){
@@ -103,20 +74,6 @@
return call_user_func(array(self::$type, 'detail_row_page'),$id);
}
- /**
- Init libs functions soutient
- */
-// private function init_mod_content(){
-//
-// include (DIR_WS_FUNCTIONS.'lib.'.self::$type.'.php');
-// include (DIR_WS_LANGUAGES.$language.'/'.self::$type.'.php');
-//
-// //! tableau modele col data
-// $funct='tep_get_modele_'.self::$type;
-// self::$modele=$funct();
-//
-// }
-
private function list_mod_content(){
//! data array list
$funct='tep_get_list_'.self::$type;
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2011-05-16 12:53:48 UTC (rev 3738)
@@ -44,4 +44,7 @@
$lang['success database saved']="Succès : La base de données a été sauvé.";
$lang['success database restored']="Succès : La base de données a été restauré.";
$lang['success backup deleted']="Success : La base de données a été supprimé.";
+
+$lang['faire un backup integrant la structure des tables']="faire un backup integrant la structure des tables.";
+$lang['ajouter commande pour vider les tables avant de restaurer']="Ajouter commande pour vider les tables avant de restaurer";
?>
\ No newline at end of file
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/attributes.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/attributes.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/attributes.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -395,11 +395,10 @@
/** static InterfacedInnerHtml */
public static function detail_row_page($id){
-// self::init();
self::$poID=(int)$id;
self::$type='values_for_option';
self::load_db_values((int)$id);
- return tep_get_include_contents(__CLASS__.'.options.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/backup.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/backup.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/backup.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -419,7 +419,7 @@
if (function_exists('gzopen'))$contents[] = array('class' => 'block_input','text' => tep_draw_radio_field('compress', 'gzip', 'gzip') . ' ' . __('text info use gzip'));
$contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('backup_structure','', 'yes') . ' ' . __('faire un backup integrant la structure des tables'));
- $contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('backup_truncate','', 'yes') . ' ' . __('ajouter commende pour vider les tables avant de restaurer'));
+ $contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('backup_truncate','', 'yes') . ' ' . __('ajouter commande pour vider les tables avant de restaurer'));
if (self::$dir_ok == true)
$contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('download','', 'yes') . ' ' . __('text info download only'));
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -113,7 +113,7 @@
public function check_action($actionss){
global $languages_id, $oscss,$messageStack;
- self::$action=$actionss;
+// self::$action=$actionss;
$DB=Database::getInstance();
self::$actions['action'] = self::$action;
@@ -428,6 +428,7 @@
$action=self::$action;
switch(self::$action){
+ case 'edit':
case 'new':
$action='edit';
break;
@@ -546,7 +547,7 @@
public static function detail_row_page($id){
self::$cInfo=self::load_db_values((int)$id);
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/cms_content.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/cms_content.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -447,7 +447,7 @@
self::$action ='detail';
self::GetConf();
self::load_db_values((int)$id);
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/customers.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/customers.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -527,7 +527,7 @@
$res=tep_db_query($customers_query_raw = "select sum(op.products_quantity * op.final_price) as ordersum from " . TABLE_CUSTOMERS . " c, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_ORDERS . " o where c.customers_id = o.customers_id and c.customers_id='".(int)$id."' and o.orders_id = op.orders_id group by c.customers_firstname, c.customers_lastname order by ordersum DESC");
$r=tep_db_fetch_array($res);
self::$cInfo->orders_sum=$r['ordersum'];
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/held_orders.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/held_orders.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/held_orders.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -309,7 +309,7 @@
include(DIR_WS_FUNCTIONS.'lib.orders.php');
self::$order=new order((int)$id, 'HOLDING');
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/newsletters.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/newsletters.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/newsletters.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -387,7 +387,7 @@
}
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/newslettersModeles.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/newslettersModeles.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/newslettersModeles.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -276,11 +276,11 @@
public static function detail_row_page($id){
global $language;
-// self::init();
+
self::$nID=(int)$id;
self::$nInfo=self::load_db_values((int)$id);
self::load_module();
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/orders.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/orders.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -13,8 +13,6 @@
-error_reporting(E_ALL);
-
class orders
extends ModTwo /// new abstract class for nextgen module
implements
@@ -505,7 +503,7 @@
public static function detail_row_page($id){
self::$list=self::load_status_history($id);
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/package.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/package.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/package.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -509,7 +509,7 @@
$obj=self::load_db_values((string)$id);
self::$list=$obj[0];
self::$Rightlist=$obj[0]->item;
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
/** Interface module */
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-05-16 12:53:48 UTC (rev 3738)
@@ -756,6 +756,9 @@
$products_query = "select distinct p.products_id, p.products_image, pv.typeID , p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status from " . TABLE_PRODUCTS . " p LEFT JOIN ".TABLE_PRODUCTS_VIRTUAL." pv on(p.products_id = pv.productsID) LEFT JOIN ".TABLE_STATUS." s on(pv.typeID = s.status_id and s.status_type='products_virtual_types' and s.language_id='" . (int)$languages_id . "') , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c ".$add_tbl." where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".$cat." ".$avenir." ".$sta." ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
+
+ $query_numrows= tep_db_num_rows($DB->query($products_query));
+
$products_split = new splitPageResults($page, $rowbyp, $products_query,$query_numrows);
$pq=$DB->query($products_query);
@@ -799,7 +802,7 @@
new self();
self::load_db_values((int)$id);
self::$modules->display_detail_row_page($id);
- return tep_get_include_contents(__CLASS__.'.inline');
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
}
Modified: branches/2.1.0/catalog/install/oscss_config.sql
===================================================================
--- branches/2.1.0/catalog/install/oscss_config.sql 2011-05-15 18:35:45 UTC (rev 3737)
+++ branches/2.1.0/catalog/install/oscss_config.sql 2011-05-16 12:53:48 UTC (rev 3738)
@@ -186,7 +186,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 ('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);
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);
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);
-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', '4', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), 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 ('TYPE_VIRTUAL_PRODUCTS_S', 'TYPE_VIRTUAL_PRODUCTS', '3,4', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), 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 ('ORPHELIN_COLLECTOR_S', 'ORPHELIN_COLLECTOR', '1', 'ORPHELIN_COLLECTOR_L', '0', '0', NOW(), NOW(),NULL, NULL, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-15 18:35:51
|
Revision: 3737
http://oscss.svn.sourceforge.net/oscss/?rev=3737&view=rev
Author: oscim
Date: 2011-05-15 18:35:45 +0000 (Sun, 15 May 2011)
Log Message:
-----------
Modified Paths:
--------------
branches/2.1.0/catalog/common/oscss.version.xml
Modified: branches/2.1.0/catalog/common/oscss.version.xml
===================================================================
--- branches/2.1.0/catalog/common/oscss.version.xml 2011-05-15 17:52:22 UTC (rev 3736)
+++ branches/2.1.0/catalog/common/oscss.version.xml 2011-05-15 18:35:45 UTC (rev 3737)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<core>
<version>2.1.0 RC</version>
- <svn>3703</svn>
+ <svn>3737</svn>
<level>stable</level>
<template_admin>oscss</template_admin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-15 17:52:31
|
Revision: 3736
http://oscss.svn.sourceforge.net/oscss/?rev=3736&view=rev
Author: oscim
Date: 2011-05-15 17:52:22 +0000 (Sun, 15 May 2011)
Log Message:
-----------
suite deport des gabarit en repertoire , et ajustement des modules correspondants
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/modules/pages/attributes.php
branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
branches/2.1.0/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.0/catalog/admin/includes/modules/pages/held_orders.php
branches/2.1.0/catalog/admin/includes/modules/pages/newslettersModeles.php
Added Paths:
-----------
branches/2.1.0/catalog/admin/includes/gabarit/attributes/
branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories/
branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content/
branches/2.1.0/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content/display_view.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders/
branches/2.1.0/catalog/admin/includes/gabarit/held_orders/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders/display_view.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders/display_view.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders/display_view.recup_order.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles/
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles/display_view.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles/display_view.preview.gab
Removed Paths:
-------------
branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/categories.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/held_orders.recup_order.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/newslettersModeles.preview.gab
Copied: branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.delete.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.delete.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.delete.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.delete.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 02/03/11, 08:34
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title option delete') ?></h3>
+ <?php echo tep_draw_form('sort_detail', attributes::FILENAME, 'poID='.attributes::$poID.'&action=delete', 'post') ?>
+
+ <?php echo tep_image_submit('', IMAGE_UPDATE). tep_js_back(tep_href_link(attributes::FILENAME, tep_get_all_get_params(array('action','poID'))), IMAGE_CANCEL) ; ?>
+
+ </form>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.edit.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,65 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 07/02/11, 19:22
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title') ?></h3>
+ <?php echo tep_draw_form('sort_detail', attributes::FILENAME, 'poID='.attributes::$poID.'&action='.((attributes::$action=='new')? 'insert':'update'), 'post') ?>
+
+ <fieldset class="tabs_lang block_field">
+ <ul>
+ <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
+ <li><?php echo '<a href="#_name-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . attributes::$languages[$i]['directory'] . '/images/' . attributes::$languages[$i]['image'], attributes::$languages[$i]['name']) . ' ' . attributes::$languages[$i]['name'] . '</a>' ?></li>
+ <?php } ?>
+ </ul>
+ <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
+ <div id="<?php echo "_name-" . ($i+1) ?>">
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('legend opt name'); ?></label>
+ <?php echo tep_draw_input_field('products_options_name[' . attributes::$languages[$i]['id'] . ']', 'products_name_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_name[attributes::$languages[$i]['id']], ' maxlength="60" size="60"') ; ?>
+ </p>
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('label opt comment'); ?></label>
+ <?php echo tep_draw_input_field('products_options_comment[' . attributes::$languages[$i]['id'] . ']', 'products_options_comment_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_comment[attributes::$languages[$i]['id']], ' maxlength="60" size="60"') ; ?>
+ </p>
+ </div>
+ <?php } ?>
+ </fieldset>
+
+ <fieldset class="tabs_lang block_field">
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('label opt mode'); ?></label>
+ <?php echo tep_draw_pull_down_menu('products_options_condition', attributes::$products_options_condition, ((attributes::$poIDInfo->products_options_condition=='1') ? '1' : '0')) ; ?>
+ </p>
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('label opt sort'); ?></label>
+ <?php echo tep_draw_input_field('products_options_sort_order', '', (tep_not_null(attributes::$poIDInfo->products_options_sort_order)? attributes::$poIDInfo->products_options_sort_order : 5), ' maxlength="10" size="10"') ; ?>
+ </p>
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('label opt type'); ?></label>
+ <?php echo tep_draw_pull_down_menu('products_options_type', draw_optiontype_pulldown(), attributes::$poIDInfo->products_options_type) ; ?>
+ </p>
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('label opt length'); ?></label>
+ <?php echo tep_draw_input_field('products_options_length', 'products_options_length' , attributes::$poIDInfo->products_options_length, ' maxlength="10" size="10"') ; ?>
+ </p>
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('label opt stock enable'); ?></label>
+ <?php echo tep_draw_pull_down_menu('products_options_track_stock', attributes::$products_options_track_stock, ((attributes::$poIDInfo->products_options_track_stock=='1') ? '1' : '0')) ; ?>
+ </p>
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('label opt img enable'); ?></label>
+ <?php echo tep_draw_pull_down_menu('products_options_images_enabled', attributes::$products_options_images_enabled, ((attributes::$poIDInfo->products_options_images_enabled=='1') ? '1' : '0')) ; ?>
+ </p>
+ </fieldset>
+
+ <fieldset class="block_field button_nav">
+ <?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(attributes::FILENAME, tep_get_all_get_params(array('action','poID'))), IMAGE_CANCEL) ; ?>
+ </fieldset>
+ </form>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.inline.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.inline.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.inline.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.inline.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,44 @@
+<?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 22/06/10, 18:12
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<tr>
+ <td>
+ <div class="button_nav">
+ <?php echo '<a class="button fancy" href="' . tep_href_link(attributes::FILENAME,'poID='.attributes::$poID.'&type=values&action=new') . '">'.__('image insert attribute option value').'</a>'; ?>
+ </div>
+ </td>
+</tr>
+<tr>
+ <td>
+ <table style="width:100%">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading id'); ?></th>
+ <th><?php echo __('table heading opt name'); ?></th>
+ <th class="row_action"><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(attr__GetArray_ListValueOption(attributes::$poID) as $Ovalues) { ?>
+ <tr class="view parent dataTableRow <?php ?>">
+
+ <td><?php echo $Ovalues["products_options_values_id"]; ?></td>
+ <td> <?php echo $Ovalues["products_options_values_name"]; ?> </td>
+ <td class="row_action">
+ <span class="view fils ">
+ <?php echo '<a class="buttonimg fancy" href="' . tep_href_link(attributes::FILENAME, 'type=values&poID='.attributes::$poID.'&povID=' . $Ovalues['products_options_values_id'].'&action=edit' , 'NONSSL') . '">'; ?><?php echo tep_image(DIR_WS_ICONS.'icon_edit.png', IMAGE_UPDATE); ?></a>
+ <?php echo '<a class="buttonimg fancy" href="' . tep_href_link(attributes::FILENAME, 'type=values&poID='.attributes::$poID.'&povID=' . $Ovalues['products_options_values_id'].'&action=delete_confirm', 'NONSSL') , '">'; ?><?php echo tep_image(DIR_WS_ICONS.'icon_delete.png', IMAGE_DELETE); ?></a>
+ </span>
+ </td>
+ <?php }?>
+ </tbdoy>
+ </table>
+ </td>
+</tr>
Copied: branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.listing.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.listing.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.listing.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.options.listing.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,35 @@
+<?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 22/06/10, 18:12
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title opt') ?></h3>
+ <div class="button_nav">
+ <?php echo '<a class="button" href="' . tep_href_link(attributes::FILENAME,'action=new' ) . '">'.__('image insert attribute opt').'</a>'; ?>
+ </div>
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php echo __('table heading id'); ?></th>
+ <th><?php echo __('table heading opt name'); ?></th>
+ <th><?php echo __('table heading opt mode'); ?></th>
+ <th><?php echo __('table heading opt type'); ?></th>
+ <th><?php echo __('table heading opt length'); ?></th>
+ <th><?php echo __('table heading opt comment'); ?></th>
+ <th><?php echo __('table heading opt track stock'); ?></th>
+ <th><?php echo __('table heading opt sort'); ?></th>
+ <th><?php echo __('table heading opt image'); ?></th>
+ <th class="row_action"><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- AJAX BLOCK -->
+ </tbody>
+ </table>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.delete.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.delete.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.delete.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.delete.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,31 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 07/02/11, 19:27
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+*/
+?>
+<h3><?php echo __('heading title option value delete') ?></h3>
+<div class="box_uniq">
+ <?php echo tep_draw_form('post_pov', attributes::FILENAME, 'poID='. attributes::$poID.'&povID='. attributes::$povID.'&type=values&action=delete', 'post'); ?>
+
+ <fieldset class="block_field">
+ <p><?php echo __('text confirm option value delete') ?></p>
+
+ <p><?php echo __('text info count products for option value').' '.count(attributes::$list) ?></p>
+ <?php foreach(attributes::$list as $item): ?>
+ <li><li>
+ <?php endforeach; ?>
+ </fieldset>
+
+ <fieldset class="block_field button_nav">
+
+ <?php echo tep_image_submit('', IMAGE_DELETE).tep_js_back(tep_href_link(attributes::FILENAME)); ?>
+ </fieldset>
+ </form>
+</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.edit.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.edit.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.edit.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes/display_view.values.edit.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,38 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 07/02/11, 19:23
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title add option value') ?></h3>
+ <div class="box_uniq">
+ <?php echo tep_draw_form('post_pov', attributes::FILENAME, 'poID='. attributes::$poID.'&type=values&action='.((attributes::$action=='new')? 'insert' : 'update&povID='.attributes::$povID), 'post', (isset($_GET['forceView'])? 'fancyform': '' )); ?>
+ <fieldset class="block_field tabs_lang ">
+ <ul>
+ <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
+ <li><?php echo '<a href="#_name-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . attributes::$languages[$i]['directory'] . '/images/' . attributes::$languages[$i]['image'], attributes::$languages[$i]['name']) . ' ' . attributes::$languages[$i]['name'] . '</a>' ?></li>
+ <?php } ?>
+ </ul>
+ <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++): ?>
+ <div id="<?php echo "_name-" . ($i+1) ?>">
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('legend opt name'); ?></label>
+ <?php echo tep_draw_input_field('products_options_values_name[' . attributes::$languages[$i]['id'] . ']', 'products_options_values_name_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_values_name[attributes::$languages[$i]['id']], ' maxlength="60" size="60"') ; ?>
+ </p>
+ <p class="block_input">
+ <label for="products_date_available"><?php echo __('legend opt thumbail'); ?></label>
+ <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur('products_options_values_thumbnail_' . attributes::$languages[$i]['id'] . '', "image", '').'">'.tep_draw_input_field('products_options_values_thumbnail[' . attributes::$languages[$i]['id'] . ']', 'products_options_values_thumbnail_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_values_thumbnail[attributes::$languages[$i]['id']]).tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER).'</a>' ; ?>
+ </p>
+ </div>
+ <?php endfor; ?>
+ </fieldset>
+ <fieldset class="block_field button_nav ">
+ <?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(attributes::FILENAME)); ?>
+ </fieldset>
+ </form>
+ </div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.delete.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.delete.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.delete.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,17 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 02/03/11, 08:34
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title option delete') ?></h3>
- <?php echo tep_draw_form('sort_detail', attributes::FILENAME, 'poID='.attributes::$poID.'&action=delete', 'post') ?>
-
- <?php echo tep_image_submit('', IMAGE_UPDATE). tep_js_back(tep_href_link(attributes::FILENAME, tep_get_all_get_params(array('action','poID'))), IMAGE_CANCEL) ; ?>
-
- </form>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.edit.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.edit.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,65 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 19:22
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title') ?></h3>
- <?php echo tep_draw_form('sort_detail', attributes::FILENAME, 'poID='.attributes::$poID.'&action='.((attributes::$action=='new')? 'insert':'update'), 'post') ?>
-
- <fieldset class="tabs_lang block_field">
- <ul>
- <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
- <li><?php echo '<a href="#_name-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . attributes::$languages[$i]['directory'] . '/images/' . attributes::$languages[$i]['image'], attributes::$languages[$i]['name']) . ' ' . attributes::$languages[$i]['name'] . '</a>' ?></li>
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
- <div id="<?php echo "_name-" . ($i+1) ?>">
- <p class="block_input">
- <label for="products_date_available"><?php echo __('legend opt name'); ?></label>
- <?php echo tep_draw_input_field('products_options_name[' . attributes::$languages[$i]['id'] . ']', 'products_name_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_name[attributes::$languages[$i]['id']], ' maxlength="60" size="60"') ; ?>
- </p>
- <p class="block_input">
- <label for="products_date_available"><?php echo __('label opt comment'); ?></label>
- <?php echo tep_draw_input_field('products_options_comment[' . attributes::$languages[$i]['id'] . ']', 'products_options_comment_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_comment[attributes::$languages[$i]['id']], ' maxlength="60" size="60"') ; ?>
- </p>
- </div>
- <?php } ?>
- </fieldset>
-
- <fieldset class="tabs_lang block_field">
- <p class="block_input">
- <label for="products_date_available"><?php echo __('label opt mode'); ?></label>
- <?php echo tep_draw_pull_down_menu('products_options_condition', attributes::$products_options_condition, ((attributes::$poIDInfo->products_options_condition=='1') ? '1' : '0')) ; ?>
- </p>
- <p class="block_input">
- <label for="products_date_available"><?php echo __('label opt sort'); ?></label>
- <?php echo tep_draw_input_field('products_options_sort_order', '', (tep_not_null(attributes::$poIDInfo->products_options_sort_order)? attributes::$poIDInfo->products_options_sort_order : 5), ' maxlength="10" size="10"') ; ?>
- </p>
- <p class="block_input">
- <label for="products_date_available"><?php echo __('label opt type'); ?></label>
- <?php echo tep_draw_pull_down_menu('products_options_type', draw_optiontype_pulldown(), attributes::$poIDInfo->products_options_type) ; ?>
- </p>
- <p class="block_input">
- <label for="products_date_available"><?php echo __('label opt length'); ?></label>
- <?php echo tep_draw_input_field('products_options_length', 'products_options_length' , attributes::$poIDInfo->products_options_length, ' maxlength="10" size="10"') ; ?>
- </p>
- <p class="block_input">
- <label for="products_date_available"><?php echo __('label opt stock enable'); ?></label>
- <?php echo tep_draw_pull_down_menu('products_options_track_stock', attributes::$products_options_track_stock, ((attributes::$poIDInfo->products_options_track_stock=='1') ? '1' : '0')) ; ?>
- </p>
- <p class="block_input">
- <label for="products_date_available"><?php echo __('label opt img enable'); ?></label>
- <?php echo tep_draw_pull_down_menu('products_options_images_enabled', attributes::$products_options_images_enabled, ((attributes::$poIDInfo->products_options_images_enabled=='1') ? '1' : '0')) ; ?>
- </p>
- </fieldset>
-
- <fieldset class="block_field button_nav">
- <?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(attributes::FILENAME, tep_get_all_get_params(array('action','poID'))), IMAGE_CANCEL) ; ?>
- </fieldset>
- </form>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.inline.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.inline.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.inline.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,44 +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 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<tr>
- <td>
- <div class="button_nav">
- <?php echo '<a class="button fancy" href="' . tep_href_link(attributes::FILENAME,'poID='.attributes::$poID.'&type=values&action=new') . '">'.__('image insert attribute option value').'</a>'; ?>
- </div>
- </td>
-</tr>
-<tr>
- <td>
- <table style="width:100%">
- <thead>
- <tr>
- <th><?php echo __('table heading id'); ?></th>
- <th><?php echo __('table heading opt name'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach(attr__GetArray_ListValueOption(attributes::$poID) as $Ovalues) { ?>
- <tr class="view parent dataTableRow <?php ?>">
-
- <td><?php echo $Ovalues["products_options_values_id"]; ?></td>
- <td> <?php echo $Ovalues["products_options_values_name"]; ?> </td>
- <td class="row_action">
- <span class="view fils ">
- <?php echo '<a class="buttonimg fancy" href="' . tep_href_link(attributes::FILENAME, 'type=values&poID='.attributes::$poID.'&povID=' . $Ovalues['products_options_values_id'].'&action=edit' , 'NONSSL') . '">'; ?><?php echo tep_image(DIR_WS_ICONS.'icon_edit.png', IMAGE_UPDATE); ?></a>
- <?php echo '<a class="buttonimg fancy" href="' . tep_href_link(attributes::FILENAME, 'type=values&poID='.attributes::$poID.'&povID=' . $Ovalues['products_options_values_id'].'&action=delete_confirm', 'NONSSL') , '">'; ?><?php echo tep_image(DIR_WS_ICONS.'icon_delete.png', IMAGE_DELETE); ?></a>
- </span>
- </td>
- <?php }?>
- </tbdoy>
- </table>
- </td>
-</tr>
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.listing.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes.options.listing.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,35 +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 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title opt') ?></h3>
- <div class="button_nav">
- <?php echo '<a class="button" href="' . tep_href_link(attributes::FILENAME,'action=new' ) . '">'.__('image insert attribute opt').'</a>'; ?>
- </div>
-
- <table class="dataTable">
- <thead>
- <tr>
- <th> </th>
- <th><?php echo __('table heading id'); ?></th>
- <th><?php echo __('table heading opt name'); ?></th>
- <th><?php echo __('table heading opt mode'); ?></th>
- <th><?php echo __('table heading opt type'); ?></th>
- <th><?php echo __('table heading opt length'); ?></th>
- <th><?php echo __('table heading opt comment'); ?></th>
- <th><?php echo __('table heading opt track stock'); ?></th>
- <th><?php echo __('table heading opt sort'); ?></th>
- <th><?php echo __('table heading opt image'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tbody>
- <!-- AJAX BLOCK -->
- </tbody>
- </table>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.delete.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.delete.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.delete.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,31 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 19:27
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-
-*/
-?>
-<h3><?php echo __('heading title option value delete') ?></h3>
-<div class="box_uniq">
- <?php echo tep_draw_form('post_pov', attributes::FILENAME, 'poID='. attributes::$poID.'&povID='. attributes::$povID.'&type=values&action=delete', 'post'); ?>
-
- <fieldset class="block_field">
- <p><?php echo __('text confirm option value delete') ?></p>
-
- <p><?php echo __('text info count products for option value').' '.count(attributes::$list) ?></p>
- <?php foreach(attributes::$list as $item): ?>
- <li><li>
- <?php endforeach; ?>
- </fieldset>
-
- <fieldset class="block_field button_nav">
-
- <?php echo tep_image_submit('', IMAGE_DELETE).tep_js_back(tep_href_link(attributes::FILENAME)); ?>
- </fieldset>
- </form>
-</div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.edit.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/attributes.values.edit.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,38 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 19:23
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title add option value') ?></h3>
- <div class="box_uniq">
- <?php echo tep_draw_form('post_pov', attributes::FILENAME, 'poID='. attributes::$poID.'&type=values&action='.((attributes::$action=='new')? 'insert' : 'update&povID='.attributes::$povID), 'post', (isset($_GET['forceView'])? 'fancyform': '' )); ?>
- <fieldset class="block_field tabs_lang ">
- <ul>
- <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
- <li><?php echo '<a href="#_name-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . attributes::$languages[$i]['directory'] . '/images/' . attributes::$languages[$i]['image'], attributes::$languages[$i]['name']) . ' ' . attributes::$languages[$i]['name'] . '</a>' ?></li>
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++): ?>
- <div id="<?php echo "_name-" . ($i+1) ?>">
- <p class="block_input">
- <label for="products_date_available"><?php echo __('legend opt name'); ?></label>
- <?php echo tep_draw_input_field('products_options_values_name[' . attributes::$languages[$i]['id'] . ']', 'products_options_values_name_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_values_name[attributes::$languages[$i]['id']], ' maxlength="60" size="60"') ; ?>
- </p>
- <p class="block_input">
- <label for="products_date_available"><?php echo __('legend opt thumbail'); ?></label>
- <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur('products_options_values_thumbnail_' . attributes::$languages[$i]['id'] . '', "image", '').'">'.tep_draw_input_field('products_options_values_thumbnail[' . attributes::$languages[$i]['id'] . ']', 'products_options_values_thumbnail_' . attributes::$languages[$i]['id'], attributes::$poIDInfo->products_options_values_thumbnail[attributes::$languages[$i]['id']]).tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER).'</a>' ; ?>
- </p>
- </div>
- <?php endfor; ?>
- </fieldset>
- <fieldset class="block_field button_nav ">
- <?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(attributes::FILENAME)); ?>
- </fieldset>
- </form>
- </div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.delete.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/categories.delete.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.delete.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.delete.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,37 @@
+<?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, 19:57
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+
+ <h3><?php echo __('text info heading delete category'); ?></h3>
+ <div class="box_uniq block_form">
+ <?php echo tep_draw_form('categories', categories::FILENAME, 'action=delete_confirm') . tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id) ?>
+
+ <p><?php echo __('text delete category intro') ?></p>
+ <p><strong><?php echo categories::$cInfo->categories_name ?></strong></p>
+
+ <?php if (categories::$cInfo->childs_count > 0): ?>
+ <h4><?php echo sprintf(__('text delete warning childs'), categories::$cInfo->childs_count ) ?></h4>
+ <p><?php echo tep_draw_checkbox_field('delete_childs_in_cat',"delete_childs_in_cat", '', false).' '.__('text delete exe childs') ?></p>
+ <?php endif; ?>
+ <?php if (categories::$cInfo->products_count > 0) : ?>
+ <h4><?php echo sprintf(__('text delete warning products'), categories::$cInfo->products_count ) ?></h4>
+ <p><?php echo tep_draw_checkbox_field('delete_products_in_cat',"delete_products_in_cat", '', false).' '.__('text delete exe products') ?></p>
+ <?php endif; ?>
+ <?php if (categories::$cInfo->cms_count > 0): ?>
+ <h4><?php echo sprintf(__('text delete warning cms'), categories::$cInfo->cms_count ) ?></h4>
+ <p><?php echo tep_draw_checkbox_field('delete_cms_in_cat',"delete_cms_in_cat", '', false).' '.__('text delete exe cms') ?></p>
+ <?php endif; ?>
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(categories::FILENAME, 'cID=' . categories::$cInfo->categories_id), IMAGE_CANCEL) ?>
+ </div>
+ </form>
+ </div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.edit.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.edit.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,113 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 07/02/11, 19:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+?>
+
+ <h3><?php echo __('text info heading edit category'); ?></h3>
+ <div class="box_uniq block_form">
+ <?php echo tep_draw_form('categories', categories::FILENAME, 'action='.((categories::$action == 'new')?'insert' : 'update').'&cPath=' . categories::$cPath, 'post', 'enctype="multipart/form-data"') ?>
+
+ <div class="edit box_left w_70">
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
+ <?php
+ $g=3;
+ categories::$modules->display_edit($contents,@$_GET['cID']);
+ if(is_array($contents))
+ foreach ($contents as $value) {
+ if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
+ $g++;
+ } ?>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+ <p>
+ <?php echo __('text edit intro') ?>
+ </p>
+ <p class="block_input">
+ <?php echo tep_draw_pull_down_menu('cPath', array_merge(array(array('id'=>'', 'text'=> __('txt cat all'))),tep_get_category_tree(0,'',@$_GET['cID'])), categories::$cInfo->parent_id);
+ if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
+ </p>
+ <p class="block_input">
+ <Label><?php echo __('text edit sort order') ?></label>
+ <?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
+ </p>
+ <p class="block_input">
+
+ <div class="tabs_lang">
+ <?php /* categories::$languages = tep_get_languages(); */?>
+ <ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
+
+ <?php } ?>
+ </ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <fieldset id="fieldset_<?php echo $i ?>">
+ <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name'], TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT); ?></legend>
+ <p class="block_input" style="width:90%;">
+ <label for="<?php echo 'content_title' . categories::$languages[$i]['id']; ?>"><?php echo __('text edit categories name'); ?></label>
+ <?php echo tep_draw_input_field('categories_name[' . categories::$languages[$i]['id'] . ']', '', categories::$cInfo->categories_name[categories::$languages[$i]['id']]) ; ?>
+ </p>
+ <br style="clear:both" />
+ <label for="<?php echo 'categories_description_' . categories::$languages[$i]['id'] . ''; ?>"><?php echo __('text edit categories description'); ?></label>
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','categories_description[' . categories::$languages[$i]['id'] . ']','1000','800',categories::$cInfo->categories_description[categories::$languages[$i]['id']]); ?>
+ </fieldset>
+ <?php } ?>
+ </div>
+ </div>
+
+ <?php
+ $g=3;
+ if(is_array($contents)){
+ reset($contents);
+ foreach ($contents as $value) {
+ echo '<div id="tabs-'.$g.'" class="tabPage">'."\n";
+ if (!empty($value['text'])) echo $value['text']."\n";
+ else echo '<br />';
+ echo '<div class="separator"></div></div>'."\n";
+ $g++;
+ }
+ } ?>
+ <div class="separator"></div>
+ </div>
+ </div>
+
+ <div class="edit box_right fright w_30">
+ <dl>
+ <dt class="block_input" style="width:95%; text-align:center;">
+ <?php echo tep_image(DIR_WS_CATALOG_IMAGES . categories::$cInfo->categories_image, 'image', TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT) ?>
+ <?php if(tep_not_null(categories::$cInfo->categories_image)) echo tep_draw_checkbox_field('categories_image_no', 'categories_image_no', 'on'). ' '.__('text delete image cat'); ?>
+ </dt>
+ <dt class="block_input" style="width:95%; ">
+ <Label><?php echo __('text choose img') ?></label>
+ <?php echo '<a class="button" href="#" onclick="'.tep_get_filebroswerserveur("categories_image", "image", '').'">'.tep_draw_input_field('categories_image','', categories::$cInfo->categories_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER).'</a>' ?>
+ </dt>
+ <dt class="block_input">
+ <label><?php echo __('text categories status'); ?></label>
+ <?php echo tep_draw_radio_field('categories_status', 'categories_status_1', '1', (((bool)categories::$cInfo->categories_status)?true:false),'','class="radio"') . __('text categories available') .' '. tep_draw_radio_field('categories_status', 'categories_status_0', '0', ((!(bool)categories::$cInfo->categories_status)?true:false),'','class="radio"') . __('text categories not available'); ?>
+ </dt>
+ <dt class="block_input">
+ <label><?php echo __('text categories hidden'); ?></label>
+ <?php echo tep_draw_radio_field('categories_hidden', 'categories_hidden_1', '1', (((bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories not hidden') .' '. tep_draw_radio_field('categories_hidden', 'categories_hidden_0', '0', ((!(bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories hidden'); ?>
+ </dt>
+ <dt class="button_nav block_input" style="width:95%;">
+ <?php
+ echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
+ echo tep_js_back(tep_href_link(categories::FILENAME, 'cPath=' . categories::$cPath . (isset($_GET['cID']) ? '&cID=' . $_GET['cID'] : '') ), IMAGE_CANCEL) ;
+ ?>
+ </dt>
+ </dl>
+ </div>
+
+ </form>
+ </div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.inline.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/categories.inline.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.inline.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.inline.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,24 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 17/03/11, 15:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+
+<tr>
+ <td>
+ <div>
+ <ul>
+ <li><?php echo __('text date added').tep_date_short(categories::$cInfo->date_added) ?></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_CATEGORIES, 'cPath='.categories::$cInfo->categories_id) ?>"><?php echo __('text subcategories').categories::$cInfo->childs_count ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'cPath='.categories::$cInfo->categories_id) ?>"><?php echo __('text products').categories::$cInfo->products_count ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT, 'cPath='.categories::$cInfo->cPath) ?>"><?php echo __('text cms').categories::$cInfo->cms_count ?></a></li>
+ </ul>
+ </div>
+ </td>
+</tr>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.listing.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/categories.listing.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.listing.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories/display_view.listing.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,56 @@
+<?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 11/10/10, 17:35
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+
+ <div class="fleft smallText" style="width:25%">
+ <?php echo tep_draw_form('goto', categories::FILENAME, '', 'get').'<p>'.__('heading title goto') . ' ' . tep_draw_pull_down_menu('cPath', tep_get_category_tree(), categories::$current_category_id, 'onchange="this.form.submit();"').'</p></form>'; ?>
+ </div>
+
+
+ <div class="fright smallText" style="width:25%">
+ <div class="navButtons">
+ <?php echo '<a class="button" href="' . tep_href_link(categories::FILENAME, 'cPath=' . categories::$cPath . '&action=new') . '">' . tep_image(DIR_WS_ICONS.'icon_add_new.png' , IMAGE_NEW_CATEGORY) . IMAGE_NEW_CATEGORY . '</a>'; ?>
+ </div>
+ </div>
+
+ <br style="clear:both;" />
+
+ <div class="box_uniq">
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php echo __('table heading categories id'); ?></th>
+ <th style="width:<?php echo TEMP_BO_SMALL_IMAGE_WIDTH ?>px"><?php echo __('table heading categories images'); ?></th>
+ <th><?php echo __('table heading categories'); ?></th>
+ <th class="tcenter row_status"><?php echo __('table heading status'); ?></th>
+ <th class="tcenter row_status"><?php echo __('table heading view status'); ?></th>
+ <th class="tcenter row_action"><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td style="width:2%"> </td>
+ <td style="width:2%"> </td>
+ <td style="width:<?php echo TEMP_BO_SMALL_IMAGE_WIDTH ?>px"> </td>
+ <td class="w_60"> </td>
+ <td class="tcenter row_status"> </td>
+ <td class="tcenter row_status"> </td>
+ <td class="tcenter row_action"> </td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <!-- BLOCK AJAX -->
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/categories.delete.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories.delete.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories.delete.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,37 +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, 19:57
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-
- <h3><?php echo __('text info heading delete category'); ?></h3>
- <div class="box_uniq block_form">
- <?php echo tep_draw_form('categories', categories::FILENAME, 'action=delete_confirm') . tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id) ?>
-
- <p><?php echo __('text delete category intro') ?></p>
- <p><strong><?php echo categories::$cInfo->categories_name ?></strong></p>
-
- <?php if (categories::$cInfo->childs_count > 0): ?>
- <h4><?php echo sprintf(__('text delete warning childs'), categories::$cInfo->childs_count ) ?></h4>
- <p><?php echo tep_draw_checkbox_field('delete_childs_in_cat',"delete_childs_in_cat", '', false).' '.__('text delete exe childs') ?></p>
- <?php endif; ?>
- <?php if (categories::$cInfo->products_count > 0) : ?>
- <h4><?php echo sprintf(__('text delete warning products'), categories::$cInfo->products_count ) ?></h4>
- <p><?php echo tep_draw_checkbox_field('delete_products_in_cat',"delete_products_in_cat", '', false).' '.__('text delete exe products') ?></p>
- <?php endif; ?>
- <?php if (categories::$cInfo->cms_count > 0): ?>
- <h4><?php echo sprintf(__('text delete warning cms'), categories::$cInfo->cms_count ) ?></h4>
- <p><?php echo tep_draw_checkbox_field('delete_cms_in_cat',"delete_cms_in_cat", '', false).' '.__('text delete exe cms') ?></p>
- <?php endif; ?>
-
- <div class="button_nav">
- <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(categories::FILENAME, 'cID=' . categories::$cInfo->categories_id), IMAGE_CANCEL) ?>
- </div>
- </form>
- </div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,113 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 19:18
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $oscss;
-?>
-
- <h3><?php echo __('text info heading edit category'); ?></h3>
- <div class="box_uniq block_form">
- <?php echo tep_draw_form('categories', categories::FILENAME, 'action='.((categories::$action == 'new')?'insert' : 'update').'&cPath=' . categories::$cPath, 'post', 'enctype="multipart/form-data"') ?>
-
- <div class="edit box_left w_70">
- <div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
- <?php
- $g=3;
- categories::$modules->display_edit($contents,@$_GET['cID']);
- if(is_array($contents))
- foreach ($contents as $value) {
- if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
- $g++;
- } ?>
- </ul>
-
- <div id="tabs-1" class="tabPage">
- <p>
- <?php echo __('text edit intro') ?>
- </p>
- <p class="block_input">
- <?php echo tep_draw_pull_down_menu('cPath', array_merge(array(array('id'=>'', 'text'=> __('txt cat all'))),tep_get_category_tree(0,'',@$_GET['cID'])), categories::$cInfo->parent_id);
- if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
- </p>
- <p class="block_input">
- <Label><?php echo __('text edit sort order') ?></label>
- <?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
- </p>
- <p class="block_input">
-
- <div class="tabs_lang">
- <?php /* categories::$languages = tep_get_languages(); */?>
- <ul>
- <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
- <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
-
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
- <fieldset id="fieldset_<?php echo $i ?>">
- <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name'], TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT); ?></legend>
- <p class="block_input" style="width:90%;">
- <label for="<?php echo 'content_title' . categories::$languages[$i]['id']; ?>"><?php echo __('text edit categories name'); ?></label>
- <?php echo tep_draw_input_field('categories_name[' . categories::$languages[$i]['id'] . ']', '', categories::$cInfo->categories_name[categories::$languages[$i]['id']]) ; ?>
- </p>
- <br style="clear:both" />
- <label for="<?php echo 'categories_description_' . categories::$languages[$i]['id'] . ''; ?>"><?php echo __('text edit categories description'); ?></label>
- <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','categories_description[' . categories::$languages[$i]['id'] . ']','1000','800',categories::$cInfo->categories_description[categories::$languages[$i]['id']]); ?>
- </fieldset>
- <?php } ?>
- </div>
- </div>
-
- <?php
- $g=3;
- if(is_array($contents)){
- reset($contents);
- foreach ($contents as $value) {
- echo '<div id="tabs-'.$g.'" class="tabPage">'."\n";
- if (!empty($value['text'])) echo $value['text']."\n";
- else echo '<br />';
- echo '<div class="separator"></div></div>'."\n";
- $g++;
- }
- } ?>
- <div class="separator"></div>
- </div>
- </div>
-
- <div class="edit box_right fright w_30">
- <dl>
- <dt class="block_input" style="width:95%; text-align:center;">
- <?php echo tep_image(DIR_WS_CATALOG_IMAGES . categories::$cInfo->categories_image, 'image', TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT) ?>
- <?php if(tep_not_null(categories::$cInfo->categories_image)) echo tep_draw_checkbox_field('categories_image_no', 'categories_image_no', 'on'). ' '.__('text delete image cat'); ?>
- </dt>
- <dt class="block_input" style="width:95%; ">
- <Label><?php echo __('text choose img') ?></label>
- <?php echo '<a class="button" href="#" onclick="'.tep_get_filebroswerserveur("categories_image", "image", '').'">'.tep_draw_input_field('categories_image','', categories::$cInfo->categories_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER).'</a>' ?>
- </dt>
- <dt class="block_input">
- <label><?php echo __('text categories status'); ?></label>
- <?php echo tep_draw_radio_field('categories_status', 'categories_status_1', '1', (((bool)categories::$cInfo->categories_status)?true:false),'','class="radio"') . __('text categories available') .' '. tep_draw_radio_field('categories_status', 'categories_status_0', '0', ((!(bool)categories::$cInfo->categories_status)?true:false),'','class="radio"') . __('text categories not available'); ?>
- </dt>
- <dt class="block_input">
- <label><?php echo __('text categories hidden'); ?></label>
- <?php echo tep_draw_radio_field('categories_hidden', 'categories_hidden_1', '1', (((bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories not hidden') .' '. tep_draw_radio_field('categories_hidden', 'categories_hidden_0', '0', ((!(bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories hidden'); ?>
- </dt>
- <dt class="button_nav block_input" style="width:95%;">
- <?php
- echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
- echo tep_js_back(tep_href_link(categories::FILENAME, 'cPath=' . categories::$cPath . (isset($_GET['cID']) ? '&cID=' . $_GET['cID'] : '') ), IMAGE_CANCEL) ;
- ?>
- </dt>
- </dl>
- </div>
-
- </form>
- </div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/categories.inline.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories.inline.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories.inline.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,24 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 17/03/11, 15:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-
-<tr>
- <td>
- <div>
- <ul>
- <li><?php echo __('text date added').tep_date_short(categories::$cInfo->date_added) ?></li>
- <li><a href="<?php echo tep_href_link(FILENAME_CATEGORIES, 'cPath='.categories::$cInfo->categories_id) ?>"><?php echo __('text subcategories').categories::$cInfo->childs_count ?></a></li>
- <li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'cPath='.categories::$cInfo->categories_id) ?>"><?php echo __('text products').categories::$cInfo->products_count ?></a></li>
- <li><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT, 'cPath='.categories::$cInfo->cPath) ?>"><?php echo __('text cms').categories::$cInfo->cms_count ?></a></li>
- </ul>
- </div>
- </td>
-</tr>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/categories.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories.listing.gab 2011-05-15 17:12:32 UTC (rev 3735)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories.listing.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -1,56 +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 11/10/10, 17:35
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title'); ?></h3>
-
-
- <div class="fleft smallText" style="width:25%">
- <?php echo tep_draw_form('goto', categories::FILENAME, '', 'get').'<p>'.__('heading title goto') . ' ' . tep_draw_pull_down_menu('cPath', tep_get_category_tree(), categories::$current_category_id, 'onchange="this.form.submit();"').'</p></form>'; ?>
- </div>
-
-
- <div class="fright smallText" style="width:25%">
- <div class="navButtons">
- <?php echo '<a class="button" href="' . tep_href_link(categories::FILENAME, 'cPath=' . categories::$cPath . '&action=new') . '">' . tep_image(DIR_WS_ICONS.'icon_add_new.png' , IMAGE_NEW_CATEGORY) . IMAGE_NEW_CATEGORY . '</a>'; ?>
- </div>
- </div>
-
- <br style="clear:both;" />
-
- <div class="box_uniq">
- <table class="dataTable">
- <thead>
- <tr>
- <th> </th>
- <th><?php echo __('table heading categories id'); ?></th>
- <th style="width:<?php echo TEMP_BO_SMALL_IMAGE_WIDTH ?>px"><?php echo __('table heading categories images'); ?></th>
- <th><?php echo __('table heading categories'); ?></th>
- <th class="tcenter row_status"><?php echo __('table heading status'); ?></th>
- <th class="tcenter row_status"><?php echo __('table heading view status'); ?></th>
- <th class="tcenter row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td style="width:2%"> </td>
- <td style="width:2%"> </td>
- <td style="width:<?php echo TEMP_BO_SMALL_IMAGE_WIDTH ?>px"> </td>
- <td class="w_60"> </td>
- <td class="tcenter row_status"> </td>
- <td class="tcenter row_status"> </td>
- <td class="tcenter row_action"> </td>
- </tr>
- </tfoot>
- <tbody>
- <!-- BLOCK AJAX -->
- </tbody>
- </table>
-</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/cms_content.delete.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab 2011-05-15 17:52:22 UTC (rev 3736)
@@ -0,0 +1,22 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCS...
[truncated message content] |
|
From: <os...@us...> - 2011-05-15 17:12:38
|
Revision: 3735
http://oscss.svn.sourceforge.net/oscss/?rev=3735&view=rev
Author: oscim
Date: 2011-05-15 17:12:32 +0000 (Sun, 15 May 2011)
Log Message:
-----------
correction header html ds les reponse ajax
Modified Paths:
--------------
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php
Modified: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php 2011-05-15 17:11:43 UTC (rev 3734)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php 2011-05-15 17:12:32 UTC (rev 3735)
@@ -102,6 +102,8 @@
tep_db_query($sql="DELETE FROM " . TABLE_PRODUCTS_IMAGES . " where products_id = '".$pID."' and id='".$iID."' LIMIT 1; ");
+ header("HTTP/1.1 200 OK");
+ header ("Content-type: text/plain");
echo
'<script type="text/javascript"><!-- // '."\n".
" \n".
@@ -152,8 +154,9 @@
$mode=2;
}
+ header("HTTP/1.1 200 OK");
+ header ("Content-type: text/plain");
-// var_dump($sql_data_array);
$result="<td>".tep_image(DIR_WS_CATALOG_IMAGES.$sql_data_array['products_image_sm'],'',self::$THUMB)."</td>".
"<td>".tep_image(DIR_WS_CATALOG_IMAGES.$sql_data_array['products_image_xl'],'',self::$THUMB)."</td>".
"<td>"/*.(self::RowsAction($iID))*/."</td>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-15 17:11:52
|
Revision: 3734
http://oscss.svn.sourceforge.net/oscss/?rev=3734&view=rev
Author: oscim
Date: 2011-05-15 17:11:43 +0000 (Sun, 15 May 2011)
Log Message:
-----------
Deport des gabarits en sous repertoire
Ajustement des modules de page
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/classes/categorieUtility.php
branches/2.1.0/catalog/admin/includes/modules/pages/customers.php
branches/2.1.0/catalog/admin/includes/modules/pages/newsletters.php
branches/2.1.0/catalog/admin/includes/modules/pages/products.php
branches/2.1.0/catalog/admin/includes/modules/products/desc_base.php
Added Paths:
-----------
branches/2.1.0/catalog/admin/includes/gabarit/customers/
branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm_send.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.preview.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.send.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.sendtest.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/
branches/2.1.0/catalog/admin/includes/gabarit/products/desc_base/
branches/2.1.0/catalog/admin/includes/gabarit/products/desc_base/display_edit.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/display_view.aca_actions.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/display_view.copy_to.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/display_view.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/display_view.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/display_view.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/products/display_view.new.gab
Removed Paths:
-------------
branches/2.1.0/catalog/admin/includes/gabarit/customers.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/customers.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/customers.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/customers.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm_send.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.preview.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.send.gab
branches/2.1.0/catalog/admin/includes/gabarit/newsletters.sendtest.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.aca_actions.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.copy_to.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.delete_product.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.desc_base.display_edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.new.gab
Modified: branches/2.1.0/catalog/admin/includes/classes/categorieUtility.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/classes/categorieUtility.php 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/classes/categorieUtility.php 2011-05-15 17:11:43 UTC (rev 3734)
@@ -121,11 +121,16 @@
}
/**
- @package oscss
- @author OscssTeam
+ @brief get name categorie, by id
+ @param $category_id int
+ @param $language_id int
*/
public static function get_category_name($category_id, $language_id) {
- $category_query = tep_db_query("select categories_name from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . (int)$category_id . "' and language_id = '" . (int)$language_id . "'");
+ global $languages_id;
+
+ $lg=(empty($language_id)) ? $languages_id :$language_id ;
+
+ $category_query = tep_db_query("select categories_name from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . (int)$category_id . "' and language_id = '" . (int)$lg . "'");
$category = tep_db_fetch_array($category_query);
return $category['categories_name'];
Copied: branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.delete.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/customers.delete.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.delete.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.delete.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,23 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 07/02/11, 19:31
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<h3><?php echo __('text info heading delete customer') ?></h3>
+
+<?php echo tep_draw_form('customers', customers::FILENAME, 'cID=' . customers::$cInfo->customers_id . '&action=deleteconfirm') ?>
+ <fieldset class="block_input button_nav">
+ <p><?php echo __('text delete intro') . '<strong>' . customers::$cInfo->customers_firstname . ' ' . customers::$cInfo->customers_lastname . '</strong>'?></p>
+ </fieldset>
+
+ <fieldset class="block_input button_nav">
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(customers::FILENAME, 'cID=' .customers::$cInfo->customers_id), IMAGE_CANCEL) ?>
+ </fieldset>
+</form>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.edit.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/customers.edit.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.edit.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.edit.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,158 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 16/04/11, 16:28
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+*/
+$contents=array();
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+ <?php echo tep_draw_form('customers', FILENAME_CUSTOMERS, 'action='.((in_array(customers::$action,array('edit','update')))?'update':'insert'), 'post', 'onsubmit="return check_form();"'); ?>
+ <!-- box_uniq -->
+<div class="box_uniq block_form">
+
+
+<div class="box_left">
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('tab customers data'); ?></a></li>
+ <?php
+ $g=6; $contents=array();
+ customers::$modules->display_edit($contents,customers::$cID);
+ if(is_array($contents))
+ foreach ($contents as $value) {
+ if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
+ $g++;
+ } ?>
+ </ul>
+
+
+
+ <div id="tabs-1" class="tabPage">
+
+ <fieldset class="block_field">
+ <legend><?php echo __('category personal') . '</legend>' ?>
+
+
+
+ <?php if (_cst_bool('ACCOUNT_GENDER')) { ?>
+ <div class="block_input">
+ <label><?php echo __('entry gender'); ?></label>
+ <?php if(customers::$processed) echo tep_result_up_field(customers::$cInfo,'customers_gender','tep_view_gender_human','', true, true);
+ else {
+ echo '<ul class="inline">' . "\n" .
+ '<li class="inline">' . tep_draw_radio_field('customers_gender', 'm', 'm', true, customers::$cInfo->customers_gender) . ' ' . MALE . '' . '</li>' . "\n ".
+ '<li class="inline">' . tep_draw_radio_field('customers_gender', 'f', 'f', false, customers::$cInfo->customers_gender) . ' ' . FEMALE . '' . '</li>' . "\n" .
+ '<li class="inline">' . tep_draw_radio_field('customers_gender', 'l', 'l', false, customers::$cInfo->customers_gender) . ' ' . MLLE . '' . '</li>' . "\n" .
+ '</ul>' . "\n";
+ } ?>
+ </div>
+ <?php } ?>
+
+ <p class="block_input">
+ <label for="customers_firstname"><?php echo __('entry first name'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_firstname','','', true); ?>
+ </p>
+
+ <p class="block_input">
+ <label for="customers_lastname"><?php echo __('entry last name'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_lastname','','', true); ?>
+ </p>
+
+ <?php if (_cst_bool('ACCOUNT_DOB')) { ?>
+ <p class="block_input">
+ <label for="customers_dob"><?php echo __('entry date of birth'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_dob','tep_date_short','', true); ?>
+ </p>
+ <?php } ?>
+
+ <p class="block_input">
+ <label for="customers_email_address"><?php echo __('entry email address'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_email_address','','96', true); ?>
+ </p>
+
+
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('category contact'); ?></legend>
+
+ <p class="block_input">
+ <label for="customers_telephone"><?php echo __('entry telephone number'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_telephone','','', true); ?>
+ </p>
+ <p class="block_input">
+ <label for="customers_fax"><?php echo __('entry fax number'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_fax'); ?>
+ </p>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('category options'); ?></legend>
+ <p class="block_input">
+ <label for="customers_newsletter"><?php echo __('entry newsletter'); ?></label>
+ <?php echo (customers::$processed == true)? customers::tep_view_news_human(customers::$cInfo->customers_newsletter).tep_draw_hidden_field('customers_newsletter') : tep_draw_pull_down_menu('customers_newsletter', customers::$newsletter_array, ((customers::$cInfo->customers_newsletter == '1') ? '1' : '0')) ; ?>
+ </p>
+ <p class="block_input">
+ <label for="global_product_notifications"><?php echo __('entry product notification'); ?></label>
+ <?php echo (customers::$processed == true)? customers::tep_view_news_human(customers::$cInfo->global_product_notifications).tep_draw_hidden_field('global_product_notifications') : tep_draw_pull_down_menu('global_product_notifications', customers::$newsletter_array, ((customers::$cInfo->global_product_notifications == '1') ? '1' : '0')) ; ?>
+ </p>
+ </fieldset>
+ <div class="separator"></div>
+ </div>
+
+ <?php
+ $g=6;
+ if(is_array($contents)){
+ reset($contents);
+ foreach ($contents as $value) {
+ echo '<div id="tabs-'.$g.'" class="tabPage">'."\n";
+ if (!empty($value['text'])) echo $value['text']."\n";
+ else echo '<br />';
+ echo '<div class="separator"></div></div>'."\n";
+ $g++;
+ }
+ } ?>
+
+ </div>
+ <div class="separator"></div>
+</div>
+
+ <div class="box_right">
+ <p class="block_input">
+ <label for="customers_group_ra"><?php echo __('entry customers group request authentication'); ?></label>
+ <?php if (customers::$processed == true) echo (customers::$cInfo->customers_group_ra)?__('entry customers group ra yes') : __('entry customers group ra no') ;
+ else echo tep_draw_radio_field('customers_group_ra','customers_group_ra', '0', (((bool)customers::$cInfo->customers_group_ra)? false:true), customers::$cInfo->customers_group_ra) . ' ' . __('entry customers group ra no') . ' ' . tep_draw_radio_field('customers_group_ra','customers_group_ra1', '1',(((bool)customers::$cInfo->customers_group_ra)? true:false), customers::$cInfo->customers_group_ra) . ' ' . __('entry customers group ra yes'); ?>
+ </p>
+ <p class="block_input">
+ <label for="customers_shopping_points"><?php echo __('entry customers points'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_shopping_points'); ?>
+ </p>
+ <!-- BOF Separate Pricing per Customer -->
+ <p class="block_input">
+ <label for="customers_group_id"><?php echo __('entry customers group name'); ?></label>
+ <?php echo tep_result_up_field(customers::$cInfo,'customers_group_id','tep_get_grp_name','', false, true); ?>
+ </p>
+
+
+ <div class="button_nav">
+ <?php if (customers::$processed != true) echo tep_image_submit('button_update.gif', IMAGE_UPDATE). tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' ); ;
+
+ if(isset($_GET['origin'])) echo tep_js_back(tep_href_link(basename($_GET['origin']), strchr('?',$_GET['origin'])), IMAGE_BACK) ;
+ else echo tep_js_back(tep_href_link(customers::FILENAME, tep_get_all_get_params(array('action'))), IMAGE_CANCEL);
+ ?>
+ <?php echo tep_draw_hidden_field('default_address_id', 'default_address_id', customers::$cInfo->customers_default_address_id);
+ if(customers::$action !='new') echo tep_draw_hidden_field('customers_id', 'customers_id', customers::$cInfo->customers_id); ?>
+ </div>
+
+ </div>
+
+
+</div>
+ </form>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.inline.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/customers.inline.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.inline.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.inline.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,83 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 07/02/11, 08:52
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$contents=array();
+global $currencies;
+?>
+<tr>
+ <td>
+ <div class="fleft">
+ <ul>
+ <li>
+ <span class="label text"><?php echo __('text date account created') ?> </span>
+ <span class="input text"> <?php echo tep_date_short(customers::$cInfo->date_account_created) ?></span>
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text date account last modified') ?> </span>
+ <span class="input text"> <?php echo tep_date_short(customers::$cInfo->date_account_last_modified) ?></span>
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text info date last logon') ?> </span>
+ <span class="input text"> <?php echo tep_date_short(customers::$cInfo->date_last_logon) ?></span>
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text info number of logons') ?> </span>
+ <span class="input text"> <?php echo customers::$cInfo->number_of_logons ?></span>
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text info country') ?> </span>
+ <span class="input text"> <?php echo customers::$cInfo->countries_name ?></span>
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text info lang customers') ?> </span>
+ <span class="input text"> <?php echo customers::$cInfo->customers_language ?></span>
+ </li>
+ </ul>
+ </div>
+ <div class="fleft">
+ <ul>
+ <li>
+ <span class="label text"><?php echo __('text email') ?> </span>
+ <span class="input text"><a href="<?php echo tep_mailto(customers::$cInfo->customers_email_address ) ?>"> <?php echo customers::$cInfo->customers_email_address ?></a></span>
+ </li>
+ <li>
+<!-- <span class="label text"><?php echo __('text info number of logons') ?> </span> -->
+<!-- <span class="input text"> <?php echo customers::$cInfo->number_of_logons ?></span> -->
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text info number of orders') ?> </span>
+ <span class="input text"> <?php echo customers::$cInfo->orders ?></span>
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text montant total order') ?> </span>
+ <span class="input text"> <?php echo $currencies->format(customers::$cInfo->orders_sum) ?></span>
+ </li>
+ <li>
+ <span class="label text"><?php echo __('text moyenne order') ?> </span>
+ <span class="input text"> <?php echo $currencies->format( (customers::$cInfo->orders_sum / customers::$cInfo->orders) ) ?></span>
+ </li>
+
+ <li>
+<!-- <span class="label text"><?php echo __('text info country') ?> </span> -->
+<!-- <span class="input text"> <?php echo customers::$cInfo->countries_name ?></span> -->
+ </li>
+
+ </ul>
+ </div>
+ <div class="fleft">
+ <ul>
+ <?php foreach( customers::$modules->display_right_column($contents, customers::$cInfo->customers_id) as $item): ?>
+ <li><?php echo $item['text'] ?></li>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+
+ </td>
+</tr>
Copied: branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.listing.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/customers.listing.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.listing.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers/display_view.listing.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,54 @@
+<?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 02/11/10, 14:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title') ?></h3>
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(customers::FILENAME, 'action=new') ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_add_new.png' , __('image creat customer')) . __('image creat customer') ?></a>
+</div>
+
+<div class="box_uniq">
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php echo __('table heading id') ?></th>
+ <th><?php echo __('nom') ?></th>
+ <th><?php echo __('table heading firstname') ?></th>
+ <th><?php echo __('groupe') ?></th>
+ <th><?php echo __('table heading points') ?></th>
+ <th><?php echo __('compte creer') ?></th>
+ <th><?php echo __('dernier acces') ?></th>
+ <th><?php echo __('da') ?></th>
+ <th><?php echo __('etat') ?></th>
+ <th><?php echo __('action') ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr class="dataTableRow">
+ <td style="width:2%;"><?php echo tep_draw_hidden_field('xx','xxx','','class="search_init" '); ?></td>
+ <td width="3%"><?php echo tep_draw_input_field('customers_id','customers_id',__('table heading id'),'style="width:100%" class="search_init"'); ?></td>
+ <td width="10%"><?php echo tep_draw_input_field('customers_lastname','customers_lastname',__('nom'),'style="width:100%" class="search_init"'); ?></td>
+ <td width="25%" class="tcenter"><?php echo tep_draw_input_field('customers_firstname','customers_firstname',__('table heading firstname'),'style="width:100%" class="search_init"'); ?></td>
+ <td width="7%" class="tleft"><?php echo tep_draw_input_field('customers_group_name','customers_group_name',__('groupe'),'style="width:100%" class="search_init"'); ?></td>
+ <td width="5%" class="tleft"><?php echo tep_draw_input_field('customers_shopping_points','customers_shopping_points',__('table heading points'),'style="width:100%" class="search_init"'); ?></td>
+ <td width="7%" class="tcenter"><?php echo tep_draw_input_field('customers_info_date_account_created','customers_info_date_account_created',__('compte creer'),'style="width:100%" class="search_init"'); ?></td>
+ <td width="7%" class="tcenter"><?php echo tep_draw_input_field('customers_info_date_account_last_modified','customers_info_date_account_last_modified',__('dernier acces'),'style="width:100%" class="search_init"'); ?></td>
+ <td width="3%"><?php echo tep_draw_pull_down_menu('customers_group_ra', array(array('id'=>'all', 'text'=> __('txt all') ),array('id'=>'1', 'text'=> __('confirme')),array('id'=>'0', 'text'=> __('non confirme'))), ((isset($_GET['view_status']) && (is_numeric($_GET['view_status'])))?$_GET['view_status'] : 'all'),'style="width:100%" class="search_init" onchange="oTable.fnFilter( $(this).val(), 7 );
+"'); ?></td>
+ <td width="4%" class="tcenter"> </td>
+ <td> </td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <!-- AJAX BLOCK -->
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/customers.delete.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers.delete.gab 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers.delete.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -1,23 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 19:31
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-?>
-<h3><?php echo __('text info heading delete customer') ?></h3>
-
-<?php echo tep_draw_form('customers', customers::FILENAME, 'cID=' . customers::$cInfo->customers_id . '&action=deleteconfirm') ?>
- <fieldset class="block_input button_nav">
- <p><?php echo __('text delete intro') . '<strong>' . customers::$cInfo->customers_firstname . ' ' . customers::$cInfo->customers_lastname . '</strong>'?></p>
- </fieldset>
-
- <fieldset class="block_input button_nav">
- <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(customers::FILENAME, 'cID=' .customers::$cInfo->customers_id), IMAGE_CANCEL) ?>
- </fieldset>
-</form>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/customers.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers.edit.gab 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers.edit.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -1,158 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 16/04/11, 16:28
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-
-*/
-$contents=array();
-?>
-<h3><?php echo __('heading title'); ?></h3>
-
- <?php echo tep_draw_form('customers', FILENAME_CUSTOMERS, 'action='.((in_array(customers::$action,array('edit','update')))?'update':'insert'), 'post', 'onsubmit="return check_form();"'); ?>
- <!-- box_uniq -->
-<div class="box_uniq block_form">
-
-
-<div class="box_left">
- <div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('tab customers data'); ?></a></li>
- <?php
- $g=6; $contents=array();
- customers::$modules->display_edit($contents,customers::$cID);
- if(is_array($contents))
- foreach ($contents as $value) {
- if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
- $g++;
- } ?>
- </ul>
-
-
-
- <div id="tabs-1" class="tabPage">
-
- <fieldset class="block_field">
- <legend><?php echo __('category personal') . '</legend>' ?>
-
-
-
- <?php if (_cst_bool('ACCOUNT_GENDER')) { ?>
- <div class="block_input">
- <label><?php echo __('entry gender'); ?></label>
- <?php if(customers::$processed) echo tep_result_up_field(customers::$cInfo,'customers_gender','tep_view_gender_human','', true, true);
- else {
- echo '<ul class="inline">' . "\n" .
- '<li class="inline">' . tep_draw_radio_field('customers_gender', 'm', 'm', true, customers::$cInfo->customers_gender) . ' ' . MALE . '' . '</li>' . "\n ".
- '<li class="inline">' . tep_draw_radio_field('customers_gender', 'f', 'f', false, customers::$cInfo->customers_gender) . ' ' . FEMALE . '' . '</li>' . "\n" .
- '<li class="inline">' . tep_draw_radio_field('customers_gender', 'l', 'l', false, customers::$cInfo->customers_gender) . ' ' . MLLE . '' . '</li>' . "\n" .
- '</ul>' . "\n";
- } ?>
- </div>
- <?php } ?>
-
- <p class="block_input">
- <label for="customers_firstname"><?php echo __('entry first name'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_firstname','','', true); ?>
- </p>
-
- <p class="block_input">
- <label for="customers_lastname"><?php echo __('entry last name'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_lastname','','', true); ?>
- </p>
-
- <?php if (_cst_bool('ACCOUNT_DOB')) { ?>
- <p class="block_input">
- <label for="customers_dob"><?php echo __('entry date of birth'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_dob','tep_date_short','', true); ?>
- </p>
- <?php } ?>
-
- <p class="block_input">
- <label for="customers_email_address"><?php echo __('entry email address'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_email_address','','96', true); ?>
- </p>
-
-
- </fieldset>
-
- <fieldset class="block_field">
- <legend><?php echo __('category contact'); ?></legend>
-
- <p class="block_input">
- <label for="customers_telephone"><?php echo __('entry telephone number'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_telephone','','', true); ?>
- </p>
- <p class="block_input">
- <label for="customers_fax"><?php echo __('entry fax number'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_fax'); ?>
- </p>
- </fieldset>
-
- <fieldset class="block_field">
- <legend><?php echo __('category options'); ?></legend>
- <p class="block_input">
- <label for="customers_newsletter"><?php echo __('entry newsletter'); ?></label>
- <?php echo (customers::$processed == true)? customers::tep_view_news_human(customers::$cInfo->customers_newsletter).tep_draw_hidden_field('customers_newsletter') : tep_draw_pull_down_menu('customers_newsletter', customers::$newsletter_array, ((customers::$cInfo->customers_newsletter == '1') ? '1' : '0')) ; ?>
- </p>
- <p class="block_input">
- <label for="global_product_notifications"><?php echo __('entry product notification'); ?></label>
- <?php echo (customers::$processed == true)? customers::tep_view_news_human(customers::$cInfo->global_product_notifications).tep_draw_hidden_field('global_product_notifications') : tep_draw_pull_down_menu('global_product_notifications', customers::$newsletter_array, ((customers::$cInfo->global_product_notifications == '1') ? '1' : '0')) ; ?>
- </p>
- </fieldset>
- <div class="separator"></div>
- </div>
-
- <?php
- $g=6;
- if(is_array($contents)){
- reset($contents);
- foreach ($contents as $value) {
- echo '<div id="tabs-'.$g.'" class="tabPage">'."\n";
- if (!empty($value['text'])) echo $value['text']."\n";
- else echo '<br />';
- echo '<div class="separator"></div></div>'."\n";
- $g++;
- }
- } ?>
-
- </div>
- <div class="separator"></div>
-</div>
-
- <div class="box_right">
- <p class="block_input">
- <label for="customers_group_ra"><?php echo __('entry customers group request authentication'); ?></label>
- <?php if (customers::$processed == true) echo (customers::$cInfo->customers_group_ra)?__('entry customers group ra yes') : __('entry customers group ra no') ;
- else echo tep_draw_radio_field('customers_group_ra','customers_group_ra', '0', (((bool)customers::$cInfo->customers_group_ra)? false:true), customers::$cInfo->customers_group_ra) . ' ' . __('entry customers group ra no') . ' ' . tep_draw_radio_field('customers_group_ra','customers_group_ra1', '1',(((bool)customers::$cInfo->customers_group_ra)? true:false), customers::$cInfo->customers_group_ra) . ' ' . __('entry customers group ra yes'); ?>
- </p>
- <p class="block_input">
- <label for="customers_shopping_points"><?php echo __('entry customers points'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_shopping_points'); ?>
- </p>
- <!-- BOF Separate Pricing per Customer -->
- <p class="block_input">
- <label for="customers_group_id"><?php echo __('entry customers group name'); ?></label>
- <?php echo tep_result_up_field(customers::$cInfo,'customers_group_id','tep_get_grp_name','', false, true); ?>
- </p>
-
-
- <div class="button_nav">
- <?php if (customers::$processed != true) echo tep_image_submit('button_update.gif', IMAGE_UPDATE). tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' ); ;
-
- if(isset($_GET['origin'])) echo tep_js_back(tep_href_link(basename($_GET['origin']), strchr('?',$_GET['origin'])), IMAGE_BACK) ;
- else echo tep_js_back(tep_href_link(customers::FILENAME, tep_get_all_get_params(array('action'))), IMAGE_CANCEL);
- ?>
- <?php echo tep_draw_hidden_field('default_address_id', 'default_address_id', customers::$cInfo->customers_default_address_id);
- if(customers::$action !='new') echo tep_draw_hidden_field('customers_id', 'customers_id', customers::$cInfo->customers_id); ?>
- </div>
-
- </div>
-
-
-</div>
- </form>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/customers.inline.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers.inline.gab 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers.inline.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -1,83 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 08:52
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$contents=array();
-global $currencies;
-?>
-<tr>
- <td>
- <div class="fleft">
- <ul>
- <li>
- <span class="label text"><?php echo __('text date account created') ?> </span>
- <span class="input text"> <?php echo tep_date_short(customers::$cInfo->date_account_created) ?></span>
- </li>
- <li>
- <span class="label text"><?php echo __('text date account last modified') ?> </span>
- <span class="input text"> <?php echo tep_date_short(customers::$cInfo->date_account_last_modified) ?></span>
- </li>
- <li>
- <span class="label text"><?php echo __('text info date last logon') ?> </span>
- <span class="input text"> <?php echo tep_date_short(customers::$cInfo->date_last_logon) ?></span>
- </li>
- <li>
- <span class="label text"><?php echo __('text info number of logons') ?> </span>
- <span class="input text"> <?php echo customers::$cInfo->number_of_logons ?></span>
- </li>
- <li>
- <span class="label text"><?php echo __('text info country') ?> </span>
- <span class="input text"> <?php echo customers::$cInfo->countries_name ?></span>
- </li>
- <li>
- <span class="label text"><?php echo __('text info lang customers') ?> </span>
- <span class="input text"> <?php echo customers::$cInfo->customers_language ?></span>
- </li>
- </ul>
- </div>
- <div class="fleft">
- <ul>
- <li>
- <span class="label text"><?php echo __('text email') ?> </span>
- <span class="input text"><a href="<?php echo tep_mailto(customers::$cInfo->customers_email_address ) ?>"> <?php echo customers::$cInfo->customers_email_address ?></a></span>
- </li>
- <li>
-<!-- <span class="label text"><?php echo __('text info number of logons') ?> </span> -->
-<!-- <span class="input text"> <?php echo customers::$cInfo->number_of_logons ?></span> -->
- </li>
- <li>
- <span class="label text"><?php echo __('text info number of orders') ?> </span>
- <span class="input text"> <?php echo customers::$cInfo->orders ?></span>
- </li>
- <li>
- <span class="label text"><?php echo __('text montant total order') ?> </span>
- <span class="input text"> <?php echo $currencies->format(customers::$cInfo->orders_sum) ?></span>
- </li>
- <li>
- <span class="label text"><?php echo __('text moyenne order') ?> </span>
- <span class="input text"> <?php echo $currencies->format( (customers::$cInfo->orders_sum / customers::$cInfo->orders) ) ?></span>
- </li>
-
- <li>
-<!-- <span class="label text"><?php echo __('text info country') ?> </span> -->
-<!-- <span class="input text"> <?php echo customers::$cInfo->countries_name ?></span> -->
- </li>
-
- </ul>
- </div>
- <div class="fleft">
- <ul>
- <?php foreach( customers::$modules->display_right_column($contents, customers::$cInfo->customers_id) as $item): ?>
- <li><?php echo $item['text'] ?></li>
- <?php endforeach; ?>
- </ul>
- </div>
-
- </td>
-</tr>
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/customers.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/customers.listing.gab 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/gabarit/customers.listing.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -1,52 +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 02/11/10, 14:46
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title') ?></h3>
-<div class="button_nav">
- <a class="button" href="<?php echo tep_href_link(customers::FILENAME, 'action=new') ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_add_new.png' , __('image creat customer')) . __('image creat customer') ?></a>
-</div>
-
-<div class="box_uniq">
- <table class="dataTable">
- <thead>
- <tr>
- <th> </th>
- <th><?php echo __('table heading id') ?></th>
- <th><?php echo __('nom') ?></th>
- <th><?php echo __('table heading firstname') ?></th>
- <th><?php echo __('groupe') ?></th>
- <th><?php echo __('table heading points') ?></th>
- <th><?php echo __('compte creer') ?></th>
- <th><?php echo __('dernier acces') ?></th>
- <th><?php echo __('da') ?></th>
- <th><?php echo __('action') ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr class="dataTableRow">
- <td style="width:2%;"><?php echo tep_draw_hidden_field('xx','xxx','','class="search_init" '); ?></td>
- <td width="3%"><?php echo tep_draw_input_field('customers_id','customers_id',__('table heading id'),'style="width:100%" class="search_init"'); ?></td>
- <td width="10%"><?php echo tep_draw_input_field('customers_lastname','customers_lastname',__('nom'),'style="width:100%" class="search_init"'); ?></td>
- <td width="25%" class="tcenter"><?php echo tep_draw_input_field('customers_firstname','customers_firstname',__('table heading firstname'),'style="width:100%" class="search_init"'); ?></td>
- <td width="7%" class="tleft"><?php echo tep_draw_input_field('customers_group_name','customers_group_name',__('groupe'),'style="width:100%" class="search_init"'); ?></td>
- <td width="5%" class="tleft"><?php echo tep_draw_input_field('customers_shopping_points','customers_shopping_points',__('table heading points'),'style="width:100%" class="search_init"'); ?></td>
- <td width="7%" class="tcenter"><?php echo tep_draw_input_field('customers_info_date_account_created','customers_info_date_account_created',__('compte creer'),'style="width:100%" class="search_init"'); ?></td>
- <td width="7%" class="tcenter"><?php echo tep_draw_input_field('customers_info_date_account_last_modified','customers_info_date_account_last_modified',__('dernier acces'),'style="width:100%" class="search_init"'); ?></td>
- <td width="3%"><?php echo tep_draw_pull_down_menu('customers_group_ra', array(array('id'=>'all', 'text'=> __('txt all') ),array('id'=>'1', 'text'=> __('confirme')),array('id'=>'0', 'text'=> __('non confirme'))), ((isset($_GET['view_status']) && (is_numeric($_GET['view_status'])))?$_GET['view_status'] : 'all'),'style="width:100%" class="search_init" onchange="oTable.fnFilter( $(this).val(), 7 );
-"'); ?></td>
- <td> </td>
- </tr>
- </tfoot>
- <tbody>
- <!-- AJAX BLOCK -->
- </tbody>
- </table>
-</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,18 @@
+<?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 12/08/10, 10:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('text info confirm newsletters') ?></h3>
+
+<table border="0" width="100%" cellspacing="2" cellpadding="2">
+ <tr>
+ <td><?php echo newsletters::$module->confirm(); ?></td>
+ </tr>
+</table>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm_send.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm_send.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm_send.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.confirm_send.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,38 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/03/11, 13:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $language;
+
+?>
+<h3><?php echo __('text info confirm send newsletters') ?></h3>
+
+<div class="box_left">
+ <p><span><?php newsletters::draw_progress_bar(round(NewslettersChargeur::$count_sended/NewslettersChargeur::$count*100,0), 400, 30); ?></span> </p>
+
+ <?php if(NewslettersChargeur::$count_sended != NewslettersChargeur::$count || isset($_REQUEST['sendtest']) ):
+ tep_set_time_limit(0);
+ flush();
+ NewslettersChargeur::ExecSent(@$_REQUEST['sendtest']);
+ if(!isset($_REQUEST['sendtest']) ):
+ ?>
+ <script type="text/javascript"> <!--
+ window.location = window.location.href
+ //--> </script>
+ <?php endif; ?>
+ <?php else : ?>
+ <p><strong><?php echo __('text finished sending emails').NewslettersChargeur::$count_sended .'/'. NewslettersChargeur::$count; ?></strong></p>
+ <?php endif; ?>
+
+</div>
+<div class="box_right">
+ <div class="button_nav">
+ <?php echo '<a class="button" href="' . tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID) . '">' . IMAGE_BACK . '</a>'; ?>
+ </div>
+</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.delete.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.delete.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.delete.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.delete.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,21 @@
+<?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 01/09/10, 18:12
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('text info heading delete newsletters') ?></h3>
+
+<?php echo tep_draw_form('delete', newsletters::FILENAME, 'nID=' . newsletters::$nID . '&action=deleteconfirm', 'post'); ?>
+
+ <p><?php echo __('text info delete intro') ?></p>
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID), IMAGE_CANCEL) ?>
+ </div>
+
+</form>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.edit.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,97 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/03/11, 20:48
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+?>
+<h3><?php echo __('heading title') ?></h3>
+
+<?php echo tep_draw_form('newsletter', newsletters::FILENAME, 'action='.((newsletters::$action == 'edit')?'update' : 'insert') , 'post' ); ?>
+ <div class="box_left">
+ <p><?php if (newsletters::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', newsletters::$nID); ?></p>
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('text tab content') ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('text tab module') ?></a></li>
+ </ul>
+
+
+ <div id="tabs-1">
+ <fieldset class="block_field">
+ <p class="block_input">
+ <label for="p_format"><?php echo __('text newsletter format'); ?></label>
+ <?php echo tep_draw_pull_down_menu('p_format', array(array('id'=>'HTML', 'text'=>'html'),array('id'=>'TEXT', 'text'=>'text')), (isset($_POST['customer']) ? $_POST['customer'] : ''));?><br />
+ </p>
+
+
+ <p class="block_input">
+ <label for="title" title="<?php echo __('text newsletter title help') ; ?>"> <?php echo __('text newsletter title') . tep_image(DIR_WS_ICONS.'icon_help.gif'); ?></label>
+ <?php echo tep_draw_input_field('title', '', newsletters::$nInfo->title, '', true); ?>
+ </p>
+
+ <div class="block_input">
+ <label for="content" title="<?php echo __('text newsletter content help') ; ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_help.gif');?></label>
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','content','600','400',newsletters::$nInfo->content); ?>
+ <div>
+ </fieldset>
+ <br style="clear:both" />
+ </div>
+
+ <div id="tabs-2">
+
+ <?php print_r(NewslettersChargeur:: $module); ?>
+ </div>
+ <br style="clear:both" />
+ </div>
+
+
+ </div>
+
+ <div class="box_right">
+ <fieldset class="block_field">
+ <legend><?php echo __('text newsletter module'); ?></legend>
+ <p class="block_input">
+ <label for="module" title="<?php echo __('text newsletter module help') ; ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_help.gif'); ?> </label>
+ <?php echo tep_draw_pull_down_menu('module', newsletters::list_module_newsletters(), newsletters::$nInfo->module); ?>
+ </p>
+ </fieldset>
+ <fieldset class="block_field">
+ <legend><?php echo __('text newsletter modele'); ?></legend>
+ <p class="block_input">
+ <label for="module" title="<?php echo __('text newsletter modele help') ; ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_help.gif'); ?> </label>
+ <?php echo tep_draw_pull_down_menu('modele_id', newsletters::list_modele_newsletters(), newsletters::$nInfo->modele_id); ?>
+ </p>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('text newsletter replace'); ?></legend>
+ <div class="block_input">
+ <?php echo __('text newsletter replace in mail'); ?>
+ <ul>
+ <?php foreach(newsletters::$TagReplace as $type=>$list): ?>
+ <li>
+ <?php echo __('type tag text '.$type ) ?>
+ <ul>
+ <?php foreach($list as $tag): ?>
+ <li><?php echo $tag .' : '.__('tag text '.$tag ) ?></li>
+ <?php endforeach; ?>
+ </ul>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+ </fieldset>
+ <div class="button_nav">
+ <?php echo ((newsletters::$action == 'new') ? tep_image_submit('button_save.gif', IMAGE_SAVE) : tep_image_submit('button_update.gif', IMAGE_UPDATE));
+ echo '<a class="button" href="' . tep_href_link(newsletters::FILENAME) . '">' . IMAGE_CANCEL . '</a>'; ?>
+ </div>
+ </div>
+
+</form>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.inline.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.inline.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.inline.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.inline.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,36 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/03/11, 20:48
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<tr>
+ <td>
+ <div class="fleft" style="margin:0 5px;">
+ <ul>
+ <li><?php echo __('text newsletter date added').tep_date_short(newsletters::$nInfo->date_added)?></li>
+ <li><?php echo __('text newsletter date sent').tep_date_short(newsletters::$nInfo->date_sent) ?></li>
+ <li><?php echo __('text info number send number count').newsletters::$uhtml_received_count.'/'.newsletters::$uhtml_want_count ?></li>
+ </ul>
+ </div>
+ <div class="fleft" style="margin:0 5px;">
+ <ul>
+ <li><?php echo __('text inline newsletter opened').newsletters::$nInfo->open .' / '.newsletters::$uhtml_want_count; ?></li>
+ <li><?php echo __('text inline newsletter view_online'). newsletters::$nInfo->view_online .' / '.newsletters::$nInfo->open; ?></li>
+ <li><?php echo __('text inline newsletter click'). newsletters::$nInfo->click .' / '.newsletters::$uhtml_want_count; ?></li>
+ </ul>
+ </div>
+ <div class="fleft" style="margin:0 5px;">
+ <ul>
+ <li><?php echo __('text inline newsletter moyn opened').round(newsletters::$nInfo->open *100/newsletters::$uhtml_want_count).' %'; ?></li>
+ <li><?php echo __('text inline newsletter moyn view_online').round(newsletters::$nInfo->view_online *100/newsletters::$nInfo->open ).' %'; ?></li>
+ <li><?php echo __('text inline newsletter moyn click').round(newsletters::$nInfo->click *100/newsletters::$uhtml_want_count).' %'; ?></li>
+ </ul>
+ </div>
+ </td>
+</tr>
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.listing.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.listing.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.listing.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.listing.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,35 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/03/11, 20:48
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title') ?></h3>
+
+<div class="button_nav">
+ <?php echo '<a class="button" href="' . tep_href_link(newsletters::FILENAME, 'action=new') . '">' . tep_image(DIR_WS_ICONS.'icon_add_new.png',IMAGE_NEW_NEWSLETTER).__('image new newsletter') . '</a>'; ?>
+</div>
+<div class="box_uniq">
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php echo __('table heading newsletters'); ?></th>
+ <th class="tright"><?php echo __('table heading size'); ?></th>
+ <th class="tright"><?php echo __('table heading module'); ?></th>
+ <th class="tcenter"><?php echo __('table heading sent'); ?></th>
+ <th class="tcenter"><?php echo __('table heading status'); ?></th>
+ <th class="tcenter"><?php echo __('table heading nbr send'); ?></th>
+ <th class="tright"><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- AJAX BLOCK -->
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.preview.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.preview.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.preview.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.preview.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,37 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/03/11, 20:48
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $_GET, $language;
+
+$myarray = array(
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'email_use_logo'=>(int)NewslettersUtility::UseModele(newsletters::$nInfo->modele_id),
+ 'message'=> NewslettersUtility::ApplModele(newsletters::$preview, newsletters::$nInfo->modele_id),
+ );
+
+$array_email=tep_post_prepare_email(newsletters::$nInfo->module.'.tpl',$language,$myarray);
+// var_dump(newsletters::$preview);
+?>
+<h3><?php echo __('text info preview newsletters') ?></h3>
+
+<table border="0" width="100%" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="right"><?php echo '<a class="button" href="' . tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID) . '">' . IMAGE_BACK . '</a>'; ?></td>
+ </tr>
+ <tr>
+ <td><tt><?php echo stripslashes($array_email['html']); ?></tt></td>
+ </tr>
+
+ <td><tt><pre><?php echo stripslashes($array_email['text']); ?></pre></tt></td>
+ </tr>
+ <tr>
+ <td align="right"><?php echo '<a class="button" href="' . tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID) . '">' . IMAGE_BACK . '</a>'; ?></td>
+ </tr>
+</table>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.send.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.send.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.send.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.send.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,27 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/03/11, 13:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+// error_reporting(E_ALL);
+?>
+<h3><?php echo __('text info send newsletters') ?></h3>
+
+<div class="box_left">
+ <table class="dataTableBase">
+ <tr>
+ <td><?php echo NewslettersChargeur::DisplaySent(); ?></td>
+ </tr>
+ </table>
+</div>
+<div class="box_right">
+ <div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID . '&action=confirm_send') ?>"><?php echo __('image send') ?></a>
+ <a class="button" href="<?php echo tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID) ?>"><?php echo __('image cancel') ?></a>
+ </div>
+</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.sendtest.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/newsletters.sendtest.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.sendtest.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters/display_view.sendtest.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -0,0 +1,41 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/03/11, 13:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+// print_r($_SESSION['login_email_address']);
+?>
+<h3><?php echo __('text info send newsletters') ?></h3>
+
+<?php echo tep_draw_form('newsletter', newsletters::FILENAME, 'nID='.$_GET['nID'].'&action=confirm_sendtest' , 'post' ); ?>
+
+ <div class="box_left">
+ <table class="dataTableBase">
+ <tr>
+ <td><?php echo NewslettersChargeur::DisplaySent(); ?></td>
+ </tr>
+ </table>
+ </div>
+
+ <div class="box_right">
+ <fieldset class="block_field">
+ <legend><?php echo __('heading newsletter sendtest email'); ?></legend>
+ <p><?php echo __('txt sendtest email'); ?></p>
+ <p class="block_input">
+ <label for="module" title="<?php echo __('text newsletter sendtest email help') ; ?>" ><?php echo tep_image(DIR_WS_ICONS.'icon_help.gif'); ?> </label>
+ <?php echo tep_draw_textarea_field('sendtest', '', '30','3',$_SESSION['login_email_address']); ?>
+ </p>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('', __('image send') ) ?>
+<!-- <a class="button" href="<?php //echo tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID . '&action=confirm_send') ?>"><?php echo __('image send') ?></a> -->
+ <a class="button" href="<?php echo tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID) ?>"><?php echo __('image cancel') ?></a>
+ </div>
+ </div>
+</form>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm.gab 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -1,18 +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 12/08/10, 10:45
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('text info confirm newsletters') ?></h3>
-
-<table border="0" width="100%" cellspacing="2" cellpadding="2">
- <tr>
- <td><?php echo newsletters::$module->confirm(); ?></td>
- </tr>
-</table>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm_send.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm_send.gab 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters.confirm_send.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -1,38 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 20/03/11, 13:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $language;
-
-?>
-<h3><?php echo __('text info confirm send newsletters') ?></h3>
-
-<div class="box_left">
- <p><span><?php newsletters::draw_progress_bar(round(NewslettersChargeur::$count_sended/NewslettersChargeur::$count*100,0), 400, 30); ?></span> </p>
-
- <?php if(NewslettersChargeur::$count_sended != NewslettersChargeur::$count || isset($_REQUEST['sendtest']) ):
- tep_set_time_limit(0);
- flush();
- NewslettersChargeur::ExecSent(@$_REQUEST['sendtest']);
- if(!isset($_REQUEST['sendtest']) ):
- ?>
- <script type="text/javascript"> <!--
- window.location = window.location.href
- //--> </script>
- <?php endif; ?>
- <?php else : ?>
- <p><strong><?php echo __('text finished sending emails').NewslettersChargeur::$count_sended .'/'. NewslettersChargeur::$count; ?></strong></p>
- <?php endif; ?>
-
-</div>
-<div class="box_right">
- <div class="button_nav">
- <?php echo '<a class="button" href="' . tep_href_link(newsletters::FILENAME, 'nID=' . newsletters::$nID) . '">' . IMAGE_BACK . '</a>'; ?>
- </div>
-</div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/newsletters.delete.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/newsletters.delete.gab 2011-05-15 15:52:41 UTC (rev 3733)
+++ branches/2.1.0/catalog/admin/includes/gabarit/newsletters.delete.gab 2011-05-15 17:11:43 UTC (rev 3734)
@@ -1,21 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @pac...
[truncated message content] |
|
From: <os...@us...> - 2011-05-15 15:52:48
|
Revision: 3733
http://oscss.svn.sourceforge.net/oscss/?rev=3733&view=rev
Author: oscim
Date: 2011-05-15 15:52:41 +0000 (Sun, 15 May 2011)
Log Message:
-----------
report des gabarit des packages dans un sous rep, et utilisation MasterGab
correction coquille, redirection apres configuration
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/exts/package/packageUtility.php
branches/2.1.0/catalog/admin/includes/modules/pages/package.php
Added Paths:
-----------
branches/2.1.0/catalog/admin/includes/gabarit/package/
branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.config.gab
branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.detail.gab
branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.upload.gab
branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.listing.gab
Removed Paths:
-------------
branches/2.1.0/catalog/admin/includes/gabarit/package.detail.gab
branches/2.1.0/catalog/admin/includes/gabarit/package.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/package.package.config.gab
branches/2.1.0/catalog/admin/includes/gabarit/package.package.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/package.package.upload.gab
branches/2.1.0/catalog/admin/includes/gabarit/package.source.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/package.source.listing.gab
Modified: branches/2.1.0/catalog/admin/includes/exts/package/packageUtility.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/exts/package/packageUtility.php 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/exts/package/packageUtility.php 2011-05-15 15:52:41 UTC (rev 3733)
@@ -110,7 +110,11 @@
$mInfo = new objectInfo($module_info);
+ $get =(isset($_GET['class'] )) ? 'class='.$_GET['class'] : '';
+ $get .=(isset($_GET['core'] )) ? '&core='.$_GET['core'] : '';
+ $get .=(isset($_GET['set'] )) ? '&set='.$_GET['set'] : '';
+
$format['title']='<dt>%s</dt>';
$format['description']='<dd><label>%s</label>';
$format['block']='%s</dd>';
@@ -121,9 +125,9 @@
$heading[] = array('text' => '['.$_GET['set'].']'.$mInfo->title );
- $contents = array('form' => tep_draw_form('modules', parent::FILENAME, 'set='.$_GET['set'].'&class='.$_GET['class'].'&action=save'));
+ $contents = array('form' => tep_draw_form('modules', parent::FILENAME, $get.'&action=save'));
$contents[] = array('class' => 'block_input','text' => $keys);
- $contents[] = array('class' => 'button_nav', 'text' => tep_image_submit('button_update.gif', IMAGE_UPDATE) . tep_js_back(tep_href_link(parent::FILENAME, 'set='.$_GET['set'].'&class='.$_GET['class'].'&action=config'), IMAGE_CANCEL));
+ $contents[] = array('class' => 'button_nav', 'text' => tep_image_submit('button_update.gif', IMAGE_UPDATE) . tep_js_back(tep_href_link(parent::FILENAME, $get.'&action=config'), IMAGE_CANCEL));
break;
default:
if(isset($mInfo) && is_object($mInfo)) {
Copied: branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.config.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/package.package.config.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.config.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.config.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -0,0 +1,59 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 10/02/11, 11:08
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('title heading configuration package').' '. $_GET['class'] ?></h3>
+<div class="button_nav">
+ <?php echo tep_js_back(tep_href_link(package::FILENAME), IMAGE_BACK) ?>
+</div>
+<div class="fleft w_40">
+<table class="dataTableBase">
+ <thead>
+ <tr>
+ <th><?php echo __('core') ?></th>
+ <th><?php echo __('type') ?></th>
+ <th><?php echo __('status') ?></th>
+ <th><?php echo __('action') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(package::$modules_array as $k2=>$v2): $class=strtoupper(trim(package::$class)); ?>
+ <?php if (isset($v2[$class]['path'])): ?>
+ <tr class="view parent">
+ <td><?php echo '[FO] ' ?></td>
+ <td><?php echo $k2 ?></td>
+ <td><?php echo package::status_flag(in_array($v2[$class]['file'],explode(';',package::$code_inistalletd_array[$k2]['value'])),'action=setflag&set='.$k2.'&class='.$v2[$class]['class']); ?></td>
+ <td><?php if(!isset(package::$modules_array[$k2][$class]['path_BO'])): ?>
+ <span class="view fils fleft"><?php echo ' <a class="buttonimg" href="' . tep_href_link(package::FILENAME, 'set='.$k2.'&class='.$v2[$class]['class'] . '&action=edit' ) . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png', IMAGE_EDIT ) . '</a>'; ?></span><?php endif; ?>
+ </td>
+ </tr>
+ <?php endif; ?>
+
+ <?php if(isset($v2[$class]['path_BO'])): ?>
+ <tr class="view parent">
+ <td><?php echo '[BO] ' ?></td>
+ <td><?php echo $k2 ?></td>
+ <td><?php echo package::status_flag(in_array($v2[$class]['file'], explode(';',package::$code_inistalletd_array[$k2]['value_BO'])) ,'action=setflag&set='.$k2.'&class='.$v2[$class]['class'].'&core=BO'); ?></td>
+ <td><span class="view fils fleft"><?php echo ' <a class="buttonimg" href="' . tep_href_link(package::FILENAME, 'set='.$k2.'&class='.$v2[$class]['class'] . '&action=edit'.'&core=BO') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png', IMAGE_EDIT ) . '</a>'; ?></span>
+ </td>
+ </tr>
+ <?php endif; ?>
+
+ <?php endforeach; ?>
+
+
+ <!-- AJAX BLOCK -->
+ </tbody>
+</table>
+</div>
+
+<div class="fright w_60">
+ <?php echo package::get_right_bar() ?>
+</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.detail.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/package.detail.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.detail.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.detail.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -0,0 +1,25 @@
+<?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 26/07/10, 20:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<div class="fleft w_40">
+ <ul>
+ <?php foreach(package::$list as $item): ?>
+ <li><?php echo $item ?></li>
+ <?php endforeach; ?>
+ </ul>
+</div>
+
+<div class="fright w_60">
+ <ul>
+ <?php foreach(package::$Rightlist as $item): ?>
+ <li>- <?php echo $item ?></li>
+ <?php endforeach; ?>
+ </ul>
+</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.inline.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/package.inline.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.inline.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.inline.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -0,0 +1,37 @@
+<?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 26/07/10, 20:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<tr>
+ <td>
+ <div>
+<div class="fleft w_40">
+ <ul>
+ <?php foreach(package::$list as $item): ?>
+ <li><?php echo $item ?></li>
+ <?php endforeach; ?>
+ </ul>
+</div>
+
+<div class="fright w_60">
+ <ul class="fleft w_40">
+ <li><?php echo package::$Rightlist->title ?></li>
+ <li><?php echo package::$Rightlist->author ?></li>
+ <li><?php echo package::$Rightlist->version ?></li>
+ <li><?php echo package::$Rightlist->level ?></li>
+ </ul>
+
+ <ul class="fright w_60">
+ <li><?php echo package::$Rightlist->image ?></li>
+ <li><?php echo package::$Rightlist->description ?></li>
+ </ul>
+</div>
+ </div>
+ </td>
+</tr>
Copied: branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.listing.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/package.package.listing.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.listing.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.listing.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -0,0 +1,48 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 10/04/11, 10:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief gabarit for package list
+*/
+?>
+<h3><?php echo __('heading title package') ?></h3>
+
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(package::FILENAME,'mode=installed') ?>"><?php echo __('image package already install') ?></a>
+ <a class="button" href="<?php echo tep_href_link(package::FILENAME,'mode=notinstall') ?>"><?php echo __('image package not install') ?></a>
+<!-- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'mode=update') ?>"><?php echo __('image package updatable') ?></a> -->
+ <a class="button" href="<?php echo tep_href_link(package::FILENAME,'type_data=source') ?>"><?php echo __('image source catalog') ?></a>
+ <a class="button" href="<?php echo tep_href_link(package::FILENAME,'action=upload') ?>"><?php echo __('image upload package') ?></a>
+</div>
+<table class="dataTable">
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php echo __('table heading nom') ?></th>
+ <th><?php echo __('table heading description') ?></th>
+ <th><?php echo __('table heading level') ?></th>
+ <th><?php echo __('table heading repository') ?></th>
+ <th><?php echo __('table heading status') ?></th>
+ <th class="row_action"><?php echo __('table heading action') ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td style="width:2%;"> </td>
+ <td style="width:9%;"><?php echo tep_draw_input_field('title','title',__('table heading nom'),'style="width:100%" class="search_init"'); ?></td>
+ <td style="width:60%;"><?php echo tep_draw_input_field('description','description',__('table heading description'),'style="width:100%" class="search_init"'); ?></td>
+ <td style="width:5%;"><?php echo tep_draw_input_field('level','level',__('table heading level'),'style="width:100%" class="search_init"'); ?></td>
+ <td style="width:5%;"><?php echo tep_draw_input_field('sourceTitle','sourceTitle',__('table heading repository'),'style="width:100%" class="search_init"'); ?></td>
+ <td style="width:5%;"> </td>
+ <td class="row_action"> </td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <!-- AJAX BLOCK -->
+ </tbody>
+</table>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.upload.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/package.package.upload.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.upload.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.package.upload.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -0,0 +1,21 @@
+<?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 26/09/10, 10:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('title heading upload package') ?></h3>
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(package::FILENAME) ?>"><?php echo IMAGE_BACK ?></a>
+</div>
+<div id="upload" class="fleft">
+ <?php echo tep_draw_form('pck_upload', package::FILENAME, 'action=upload_confirm', 'post', 'enctype="multipart/form-data"') ?>
+ <?php echo tep_draw_file_field('new_package') ?>
+ <?php echo tep_image_submit('', __('image upload manuel')) ?>
+ </form>
+</div>
\ No newline at end of file
Copied: branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.edit.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/package.source.edit.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.edit.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.edit.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -0,0 +1,33 @@
+<?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 22/06/10, 18:12
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('title heading configuration source repository') ?></h3>
+<table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('heading key') ?></th>
+ <th><?php echo __('heading title') ?></th>
+ <th><?php echo __('heading last update') ?></th>
+ <th><?php echo __('heading action') ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td><?php echo __('heading key') ?></td>
+ <td><?php echo __('heading title') ?></td>
+ <td><?php echo __('heading last update') ?></td>
+ <td><?php echo __('heading action') ?></td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <!-- AJAX BLOCK -->
+ </tbody>
+</table>
+
Copied: branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.listing.gab (from rev 3730, branches/2.1.0/catalog/admin/includes/gabarit/package.source.listing.gab)
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.listing.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package/display_view.source.listing.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -0,0 +1,31 @@
+<?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 22/06/10, 18:12
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title source repository') ?></h3>
+
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(package::FILENAME,'type_data=package') ?>"><?php echo __('image package catalog') ?></a>
+ <a class="button" href="<?php echo tep_href_link(package::FILENAME,'type_data=source&action=source_update') ?>"><?php echo __('image source update') ?></a>
+</div>
+
+<table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('heading source key') ?></th>
+ <th><?php echo __('heading source title') ?></th>
+ <th><?php echo __('heading source last update') ?></th>
+ <th><?php echo __('heading action') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- AJAX BLOCK -->
+ </tbody>
+</table>
+
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/package.detail.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package.detail.gab 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package.detail.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -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 26/07/10, 20:53
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<div class="fleft w_40">
- <ul>
- <?php foreach(package::$list as $item): ?>
- <li><?php echo $item ?></li>
- <?php endforeach; ?>
- </ul>
-</div>
-
-<div class="fright w_60">
- <ul>
- <?php foreach(package::$Rightlist as $item): ?>
- <li>- <?php echo $item ?></li>
- <?php endforeach; ?>
- </ul>
-</div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/package.inline.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package.inline.gab 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package.inline.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -1,37 +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 26/07/10, 20:53
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<tr>
- <td>
- <div>
-<div class="fleft w_40">
- <ul>
- <?php foreach(package::$list as $item): ?>
- <li><?php echo $item ?></li>
- <?php endforeach; ?>
- </ul>
-</div>
-
-<div class="fright w_60">
- <ul class="fleft w_40">
- <li><?php echo package::$Rightlist->title ?></li>
- <li><?php echo package::$Rightlist->author ?></li>
- <li><?php echo package::$Rightlist->version ?></li>
- <li><?php echo package::$Rightlist->level ?></li>
- </ul>
-
- <ul class="fright w_60">
- <li><?php echo package::$Rightlist->image ?></li>
- <li><?php echo package::$Rightlist->description ?></li>
- </ul>
-</div>
- </div>
- </td>
-</tr>
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/package.package.config.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package.package.config.gab 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package.package.config.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -1,59 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 10/02/11, 11:08
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('title heading configuration package').' '. $_GET['class'] ?></h3>
-<div class="button_nav">
- <?php echo tep_js_back(tep_href_link(package::FILENAME), IMAGE_BACK) ?>
-</div>
-<div class="fleft w_40">
-<table class="dataTableBase">
- <thead>
- <tr>
- <th><?php echo __('core') ?></th>
- <th><?php echo __('type') ?></th>
- <th><?php echo __('status') ?></th>
- <th><?php echo __('action') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach(package::$modules_array as $k2=>$v2): $class=strtoupper(trim(package::$class)); ?>
- <?php if (isset($v2[$class]['path'])): ?>
- <tr class="view parent">
- <td><?php echo '[FO] ' ?></td>
- <td><?php echo $k2 ?></td>
- <td><?php echo package::status_flag(in_array($v2[$class]['file'],explode(';',package::$code_inistalletd_array[$k2]['value'])),'action=setflag&set='.$k2.'&class='.$v2[$class]['class']); ?></td>
- <td><?php if(!isset(package::$modules_array[$k2][$class]['path_BO'])): ?>
- <span class="view fils fleft"><?php echo ' <a class="buttonimg" href="' . tep_href_link(package::FILENAME, 'set='.$k2.'&class='.$v2[$class]['class'] . '&action=edit' ) . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png', IMAGE_EDIT ) . '</a>'; ?></span><?php endif; ?>
- </td>
- </tr>
- <?php endif; ?>
-
- <?php if(isset($v2[$class]['path_BO'])): ?>
- <tr class="view parent">
- <td><?php echo '[BO] ' ?></td>
- <td><?php echo $k2 ?></td>
- <td><?php echo package::status_flag(in_array($v2[$class]['file'], explode(';',package::$code_inistalletd_array[$k2]['value_BO'])) ,'action=setflag&set='.$k2.'&class='.$v2[$class]['class'].'&core=BO'); ?></td>
- <td><span class="view fils fleft"><?php echo ' <a class="buttonimg" href="' . tep_href_link(package::FILENAME, 'set='.$k2.'&class='.$v2[$class]['class'] . '&action=edit'.'&core=BO') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png', IMAGE_EDIT ) . '</a>'; ?></span>
- </td>
- </tr>
- <?php endif; ?>
-
- <?php endforeach; ?>
-
-
- <!-- AJAX BLOCK -->
- </tbody>
-</table>
-</div>
-
-<div class="fright w_60">
- <?php echo package::get_right_bar() ?>
-</div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/package.package.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package.package.listing.gab 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package.package.listing.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -1,48 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 10/04/11, 10:05
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for package list
-*/
-?>
-<h3><?php echo __('heading title package') ?></h3>
-
-<div class="button_nav">
- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'mode=installed') ?>"><?php echo __('image package already install') ?></a>
- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'mode=notinstall') ?>"><?php echo __('image package not install') ?></a>
-<!-- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'mode=update') ?>"><?php echo __('image package updatable') ?></a> -->
- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'type_data=source') ?>"><?php echo __('image source catalog') ?></a>
- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'action=upload') ?>"><?php echo __('image upload package') ?></a>
-</div>
-<table class="dataTable">
- <thead>
- <tr>
- <th> </th>
- <th><?php echo __('table heading nom') ?></th>
- <th><?php echo __('table heading description') ?></th>
- <th><?php echo __('table heading level') ?></th>
- <th><?php echo __('table heading repository') ?></th>
- <th><?php echo __('table heading status') ?></th>
- <th class="row_action"><?php echo __('table heading action') ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td style="width:2%;"> </td>
- <td style="width:9%;"><?php echo tep_draw_input_field('title','title',__('table heading nom'),'style="width:100%" class="search_init"'); ?></td>
- <td style="width:60%;"><?php echo tep_draw_input_field('description','description',__('table heading description'),'style="width:100%" class="search_init"'); ?></td>
- <td style="width:5%;"><?php echo tep_draw_input_field('level','level',__('table heading level'),'style="width:100%" class="search_init"'); ?></td>
- <td style="width:5%;"><?php echo tep_draw_input_field('sourceTitle','sourceTitle',__('table heading repository'),'style="width:100%" class="search_init"'); ?></td>
- <td style="width:5%;"> </td>
- <td class="row_action"> </td>
- </tr>
- </tfoot>
- <tbody>
- <!-- AJAX BLOCK -->
- </tbody>
-</table>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/package.package.upload.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package.package.upload.gab 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package.package.upload.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -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 26/09/10, 10:32
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('title heading upload package') ?></h3>
-<div class="button_nav">
- <a class="button" href="<?php echo tep_href_link(package::FILENAME) ?>"><?php echo IMAGE_BACK ?></a>
-</div>
-<div id="upload" class="fleft">
- <?php echo tep_draw_form('pck_upload', package::FILENAME, 'action=upload_confirm', 'post', 'enctype="multipart/form-data"') ?>
- <?php echo tep_draw_file_field('new_package') ?>
- <?php echo tep_image_submit('', __('image upload manuel')) ?>
- </form>
-</div>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/package.source.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package.source.edit.gab 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package.source.edit.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -1,33 +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 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('title heading configuration source repository') ?></h3>
-<table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('heading key') ?></th>
- <th><?php echo __('heading title') ?></th>
- <th><?php echo __('heading last update') ?></th>
- <th><?php echo __('heading action') ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td><?php echo __('heading key') ?></td>
- <td><?php echo __('heading title') ?></td>
- <td><?php echo __('heading last update') ?></td>
- <td><?php echo __('heading action') ?></td>
- </tr>
- </tfoot>
- <tbody>
- <!-- AJAX BLOCK -->
- </tbody>
-</table>
-
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/package.source.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/package.source.listing.gab 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/gabarit/package.source.listing.gab 2011-05-15 15:52:41 UTC (rev 3733)
@@ -1,31 +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 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title source repository') ?></h3>
-
-<div class="button_nav">
- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'type_data=package') ?>"><?php echo __('image package catalog') ?></a>
- <a class="button" href="<?php echo tep_href_link(package::FILENAME,'type_data=source&action=source_update') ?>"><?php echo __('image source update') ?></a>
-</div>
-
-<table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('heading source key') ?></th>
- <th><?php echo __('heading source title') ?></th>
- <th><?php echo __('heading source last update') ?></th>
- <th><?php echo __('heading action') ?></th>
- </tr>
- </thead>
- <tbody>
- <!-- AJAX BLOCK -->
- </tbody>
-</table>
-
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/package.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/package.php 2011-05-15 10:08:36 UTC (rev 3732)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/package.php 2011-05-15 15:52:41 UTC (rev 3733)
@@ -95,18 +95,60 @@
class constructor
*/
public function __construct() {
- self::$code=__CLASS__;
- self::init();
+ self::GetConf();
include_once(DIR_WS_FUNCTIONS.'lib.cip_manager.php');
include_once(DIR_WS_FUNCTIONS.'lib.configuration.php');
}
+
+ /**
+ @brief Load , adjust and define var environement exe for module
+ Is use in module and class abstract for init value config this module
+ */
+ public static function GetConf(){
+ global $languages_id;
+
+ self::$code=__CLASS__;
+
+ self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : 'listing' );
+ self::$type_data=(isset($_GET['type_data'])?$_GET['type_data']:'package');
+ $mode=(isset($_GET['mode'])?$_GET['mode']:'');
+
+
+
+ /**
+ @remarks not load if not first init
+ */
+ if(defined('JSONSTATMENT')) return;
+
+ switch(self::$type_data){
+ case 'source':
+ $class=__CLASS__.'Repository';
+ if(!tep_class_exists('exts_'.__CLASS__.'_'.$class)) die('class no found '.$class);
+ self::$objChild=new $class;
+ break;
+ case 'package':
+ default:
+ //! detail item in ajax
+ define('AJAXSTATMENTDETAIL', 'mod=page&type='.__CLASS__.'&type_data='.self::$type_data.'&mode='.$mode);
+
+
+ $class=__CLASS__.'Utility';
+ if(!tep_class_exists('exts_'.__CLASS__.'_'.$class)) die('class no found '.$class);
+ self::$objChild=new $class;
+ }
+
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'mod=page&type='.__CLASS__.'&type_data='.self::$type_data.'&mode='.$mode);
+
+
+ }
+
+
public function check_action($actions){
global $messageStack;
-// self::$action=$actions;
-
switch(self::$action){
case 'source_update':
if(self::$objChild->SourceUpdate()==true) tep_redirect(tep_href_link(self::FILENAME));
@@ -160,7 +202,7 @@
while (list($key, $value) = each($_POST['configuration'])) {
tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . $value . "' where configuration_key = '" . $key . "'");
}
- tep_redirect(tep_href_link(self::FILENAME, 'set=' . self::$set .'&class='.$_GET['class'].'&action=edit' ));
+ tep_redirect(tep_href_link(self::FILENAME, 'set=' . self::$set .'&class='.$_GET['class'].'&core='.@$_GET['core'].'&action=edit' ));
break;
default:
self::load_repository();
@@ -234,7 +276,7 @@
Mise à jour cache paquet installed / updatable / non install
*/
foreach($Feed as $item){
-// $var_file['paquet'][md5($item->ident.'_'.$item->level)]['etat']=
+
$item->etat=(self::pkg_is_installed($item->ident.'_'.$item->level)? 1 : 0);
switch($mode){
@@ -265,56 +307,61 @@
public function display_view(){
+
+ $action=self::$action;
+
switch(self::$action){
//! source repository
case 'source_update':
break;
case 'source_add':
- return tep_get_include_contents(__CLASS__.'.'.self::$type_data.'.edit');
+ $action='edit';
break;
//! paquets
case 'upload':
- return tep_get_include_contents(__CLASS__.'.package.upload');
break;
+
case 'view':
case 'detail':
+ $action='detail';
$class=self::$code.'Installer';
if(!tep_class_exists('exts_'.self::$code.'_'.$class)) return false;
$obj=new $class;
self::$list=$obj->view_exts((string)$_GET['pkgID']);
+ break;
- return tep_get_include_contents(__CLASS__.'.detail');
- break;
case 'install':
-
+ $action='detail';
$class=self::$code.'Installer';
if(!tep_class_exists('exts_'.self::$code.'_'.$class)) return false;
$obj=new $class;
self::$list=$obj->install_exts((string)$_GET['pkgID']);
- return tep_get_include_contents(__CLASS__.'.detail');
break;
+
case 'remove':
+ $action='detail';
$class=self::$code.'Installer';
if(!tep_class_exists('exts_'.self::$code.'_'.$class))return false;
$obj=new $class;
self::$list=$obj->remove_exts((string)$_GET['pkgID']);
- return tep_get_include_contents(__CLASS__.'.detail');
break;
+
case 'edit':
case 'config':
-
+ $action='config';
call_user_func(array(self::$objChild, 'load_config_value'));
- return tep_get_include_contents(__CLASS__.'.'.self::$type_data.'.config');
break;
default:
-// self::tep_get_list();
- return tep_get_include_contents(__CLASS__.'.'.self::$type_data.'.listing');
+
}
+
+ /// use master gabarit
+ return MGabCont::CallGab(self::$type_data.'.'.$action,__FUNCTION__,__CLASS__);
}
@@ -380,7 +427,7 @@
public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
global $query_numrows;
- self::init();
+ self::GetConf();
switch(self::$type_data){
case 'source':
@@ -496,46 +543,15 @@
}
- /**
- Init
- */
- private static function init(){
- global $action;
- self::$action=(!empty($action))? $action : '';
- self::$type_data=(isset($_GET['type_data'])?$_GET['type_data']:'package');
- $mode=(isset($_GET['mode'])?$_GET['mode']:'');
- switch(self::$type_data){
- case 'source':
- $class=__CLASS__.'Repository';
- if(!tep_class_exists('exts_'.__CLASS__.'_'.$class)) die('class no found '.$class);
- self::$objChild=new $class;
- break;
- case 'package':
- default:
- //! detail item in ajax
- if(empty(self::$action) && !defined('AJAXSTATMENTDETAIL') )define('AJAXSTATMENTDETAIL', 'mod=page&type='.__CLASS__.'&type_data='.self::$type_data.'&mode='.$mode);
-
-
- $class=__CLASS__.'Utility';
- if(!tep_class_exists('exts_'.__CLASS__.'_'.$class)) die('class no found '.$class);
- self::$objChild=new $class;
- }
-
- //! active datatable in ajax, precise les GET necessaire
- if(empty(self::$action) && !defined('JSONSTATMENT')) define('JSONSTATMENT', 'mod=page&type='.__CLASS__.'&type_data='.self::$type_data.'&mode='.$mode);
-
- }
-
-
/**
*/
public static function get_right_bar(){
global $language,$heading,$contents;
$heading = array();
$contents = array();
- self::init();
+ self::GetConf();
self::$objChild->right_bar();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-15 10:08:43
|
Revision: 3732
http://oscss.svn.sourceforge.net/oscss/?rev=3732&view=rev
Author: oscim
Date: 2011-05-15 10:08:36 +0000 (Sun, 15 May 2011)
Log Message:
-----------
Correction et amelioration de l'extension inventaire
Ajout module export.
Modified Paths:
--------------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml
Added Paths:
-----------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/Inventaire.php
Removed Paths:
-------------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/inventaire.php
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab 2011-05-15 10:05:19 UTC (rev 3731)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab 2011-05-15 10:08:36 UTC (rev 3732)
@@ -15,7 +15,7 @@
<p class="block_input">
<label> <?php echo __('utilise le module') ?></label>
- <?php echo tep_draw_pull_down_menu('export_type', Inventaire::$export->list_export_template() , @$_GET['export_type'], ' ') ; ?>
+ <?php echo tep_draw_pull_down_menu('export_type', Inventaire::$export->list_export_template('Inventaire') , @$_GET['export_type'], ' ') ; ?>
</p>
<p class="block_input">
<label> <?php echo __('utilise encodage') ?></label>
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-15 10:05:19 UTC (rev 3731)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-15 10:08:36 UTC (rev 3732)
@@ -256,7 +256,7 @@
tep_redirect(tep_href_link(self::FILENAME));
break;
case 'export':
- self::$export= new export();
+ self::$export= new export(__CLASS__);
break;
case 'exportconfirm':
$modeexport=tep_db_prepare_input($_POST['modeexport']);
@@ -267,28 +267,42 @@
self::$export= new export();
self::$export->pre_export(array( 'mode' => $modeexport, 'encodage'=>$encodage, 'export_type'=>$export_type, 'page_admin'=>$page_module));
- foreach($_POST['action_multi'] as $oID ){
- $order = new order((int)$oID);
- $qer=tep_db_query("SELECT countries_iso_code_2 FROM " . TABLE_COUNTRIES . " WHERE countries_name='".$order->customer['country']."' ");
- $c=tep_db_fetch_array($qer);
+ $inventaire = new InventaireSql($inventaire_id);
+ $inventaire_product = new InventaireProductSql();
+ $res=$inventaire_product->list_inventaires_products($inventaire_id);
- $od[]=array('IDExpedition'=>$oID,
- 'IDCustomer'=>$order->customer['id'],
- 'Namecustomer'=>self::$export->decodage($order->customer['name']),
- 'Compagnycustomer'=>self::$export->decodage($order->customer['company']),
- 'Streetadress'=>self::$export->decodage($order->delivery['street_address']),
- 'Streetadress2'=>self::$export->decodage($order->delivery['suburb']) ,
- 'Cityshipping'=>self::$export->decodage($order->delivery['city']),
- 'Stateshipping'=>self::$export->decodage($order->customer['state']) ,
- 'telephone'=>self::$export->decodage($order->customer['telephone']),
- 'postcode'=>self::$export->decodage($order->delivery['postcode']),
- 'codecountryiso'=>$c['countries_iso_code_2'],
- 'weight'=>round($order->info['total_weight'],3),
- 'Contreremb'=>'');
- }
+ foreach($res as $item ){
+// $order = new order((int)$oID);
+// $qer=tep_db_query("SELECT countries_iso_code_2 FROM " . TABLE_COUNTRIES . " WHERE countries_name='".$order->customer['country']."' ");
+// $c=tep_db_fetch_array($qer);
+//
+// $od[]=array('IDExpedition'=>$oID,
+// 'IDCustomer'=>$order->customer['id'],
+// 'Namecustomer'=>self::$export->decodage($order->customer['name']),
+// 'Compagnycustomer'=>self::$export->decodage($order->customer['company']),
+// 'Streetadress'=>self::$export->decodage($order->delivery['street_address']),
+// 'Streetadress2'=>self::$export->decodage($order->delivery['suburb']) ,
+// 'Cityshipping'=>self::$export->decodage($order->delivery['city']),
+// 'Stateshipping'=>self::$export->decodage($order->customer['state']) ,
+// 'telephone'=>self::$export->decodage($order->customer['telephone']),
+// 'postcode'=>self::$export->decodage($order->delivery['postcode']),
+// 'codecountryiso'=>$c['countries_iso_code_2'],
+// 'weight'=>round($order->info['total_weight'],3),
+// 'Contreremb'=>'');
+ $od[]=array(
+ 'pid'=>$item['products_id'],
+ 'pname'=>__('nom produits'),
+ 'pmodele'=>__('modele produits'),
+ 'poption'=>$item['attributes'],
+ 'pvalueAchatHt'=>$item['value_ht'],
+ 'qtstock'=>$item['qty_site'],
+ );
+ }
+
self::$export->op_export($od);
+
break;
case 'deleteconfirm':
Copied: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/Inventaire.php (from rev 3730, branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/inventaire.php)
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/Inventaire.php (rev 0)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/Inventaire.php 2011-05-15 10:08:36 UTC (rev 3732)
@@ -0,0 +1,54 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package Inventaire For osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/04/11, 18:04
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+Class Export_inventaire {
+
+ protected $page;
+ /**
+ @var active module for this page
+ */
+ public $enable;
+ /**
+ @var array define page active export
+ */
+ protected $UsedInPage=array('Inventaire');
+
+ function __construct($page){
+ $this->page = $page;
+
+ if(in_array($this->page, $this->UsedInPage)) $this->enable = true;
+ else $this->enable = false;
+ }
+
+ /**
+ @brief return array name colonne, for empty export
+ */
+ function FormatExportCols(){
+ return array(
+ 'pid'=>__('num produits'),
+ 'pname'=>__('nom produits'),
+ 'pmodele'=>__('modele produits'),
+ 'poption'=>__('option produits'),
+ 'pvalueAchatHt'=>__('valeur achat ht produits'),
+ 'qtstock'=>__('quantite produits'),
+ );
+ }
+
+ /**
+ @brief return array name colonne, for empty export
+ */
+ function FormatLigneValue($data){
+ return $data;
+ }
+
+}
+
+?>
Deleted: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/inventaire.php
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/inventaire.php 2011-05-15 10:05:19 UTC (rev 3731)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/template_export/inventaire.php 2011-05-15 10:08:36 UTC (rev 3732)
@@ -1,38 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 23/04/11, 11:01
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-
-switch($this->page){
-// case 'orders':
-// if($this->mode =='txt' || $this->mode =='csv')
-// foreach($this->content as $orders ){
-// echo implode($this->separator,$orders )."\r\n";
-// // echo "" . $oID . ";" . $order->customer['id'] . ";" . utf8_decode($order->customer['name']) . ";" . utf8_decode($order->customer['company']) . ";" . utf8_decode($order->delivery['street_address']) . ";" . utf8_decode($order->delivery['suburb']) . ";" . utf8_decode($order->delivery['city']) . ";" . utf8_decode($order->customer['state']) . ";" . $order->customer['telephone'] . ";". $order->delivery['postcode'] . "; ". $c['countries_iso_code_2'] . ";". round($order->info['total_weight'],3) . ";" /*contre remboursement*/ . ";\r\n";
-// }
-// elseif($this->mode =='xml')
-// die("non implementé");
-// break;
-
- case 'inventaire':
- if($this->mode =='txt' || $this->mode =='csv')
- foreach($this->content as $orders ){
- echo implode($this->separator,$orders )."\r\n";
-// // $order->customer['id'] . ";" . utf8_decode($order->customer['name']) . ";" . utf8_decode($order->customer['company']) . ";" . utf8_decode($order->delivery['street_address']) . ";" . utf8_decode($order->delivery['suburb']) . ";" . $order->delivery['postcode'] . ";". utf8_decode($order->delivery['city']) . ";" . $c['countries_iso_code_2'] . ";;;" . $order->customer['telephone'] . ";;" . utf8_decode($order->customer['state']) . ";; \n\r";
- }
- elseif($this->mode =='xml')
- die("non implementé");
-
- break;
-
-}
-
-
-?>
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml 2011-05-15 10:05:19 UTC (rev 3731)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml 2011-05-15 10:08:36 UTC (rev 3732)
@@ -11,7 +11,7 @@
<addfile>
<file name="admin/includes/modules/pages/Inventaire.php" />
- <file name="admin/includes/modules/template_export/inventaire.php" />
+ <file name="admin/includes/modules/template_export/Inventaire.php" />
<file name="admin/includes/gabarit/Inventaire/display_view.delete.gab" />
<file name="admin/includes/gabarit/Inventaire/display_view.edit.gab" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-15 10:05:30
|
Revision: 3731
http://oscss.svn.sourceforge.net/oscss/?rev=3731&view=rev
Author: oscim
Date: 2011-05-15 10:05:19 +0000 (Sun, 15 May 2011)
Log Message:
-----------
Intg?\195?\169ration ModTwo sur le module orders
centralisation des gabarit des orders
amelioration et refonte partiel des module d'export et de la class mere osCSS_export
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/classes/ModTwo.php
branches/2.1.0/catalog/admin/includes/classes/osCSS_export.php
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
branches/2.1.0/catalog/admin/includes/modules/pages/orders.php
branches/2.1.0/catalog/admin/includes/modules/template_export/expeditor.php
Added Paths:
-----------
branches/2.1.0/catalog/admin/includes/gabarit/orders/
branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.multi.gab
Removed Paths:
-------------
branches/2.1.0/catalog/admin/includes/gabarit/orders.delete.gab
branches/2.1.0/catalog/admin/includes/gabarit/orders.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/orders.inline.gab
branches/2.1.0/catalog/admin/includes/gabarit/orders.listing.gab
branches/2.1.0/catalog/admin/includes/gabarit/orders.multi_confirm.gab
Modified: branches/2.1.0/catalog/admin/includes/classes/ModTwo.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/classes/ModTwo.php 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/classes/ModTwo.php 2011-05-15 10:05:19 UTC (rev 3731)
@@ -70,11 +70,14 @@
*/
public static $InitInfo=array();
+ /**
+ @var array $modules
+ */
+ public static $modules;
-
/**
@brief standart class exe action in module
If use "action" in var (POST or GET), this function is loaded
@@ -177,7 +180,8 @@
*/
public static function DMenuModule(){
$action=(empty(self::$action)? 'listing' :self::$action);
- $s='';
+ $s=array();
+ if(isset(self::$InitInfo['MenuModule']) && is_array(self::$InitInfo['MenuModule']))
foreach(self::$InitInfo['MenuModule'] as $item){
$fct=self::MenuAdjustType($item['type']);
Modified: branches/2.1.0/catalog/admin/includes/classes/osCSS_export.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/classes/osCSS_export.php 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/classes/osCSS_export.php 2011-05-15 10:05:19 UTC (rev 3731)
@@ -16,17 +16,19 @@
/**
Public type (txt/csv) array
*/
- var $mode;
+ public $mode;
/**
Encodage
*/
- var $encode;
+ public $encode;
/**
Constructeur
*/
- function __construct(){
+ function __construct($page_admin){
+ $this->page=$page_admin;
+
$this->mode=array(
array('id' => '', 'text' => 'Aucun'),
array('id' => 'csv', 'text' => 'CSV'),
@@ -35,7 +37,8 @@
$this->encode=array(
array('id'=>'utf-8','text'=>'utf-8'),
- array('id'=>'iso8859-1','text'=>'iso8859-1')
+ array('id'=>'iso8859-1','text'=>'iso8859-1'),
+ array('id'=>'iso8859-16','text'=>'iso8859-16'),
);
}
@@ -64,33 +67,58 @@
}
/**
- Sortie
+ @brief process export and print
+ This method finish by exit
*/
private function draw(){
+ $data=array();
+
+ $exp= $this->LoadChildsModule($this->export_type);
+
+ /// @remarks if data is empty, return name col in export
+ if(!isset($this->content) || empty($this->content) || count($this->content)<=0)
+ $this->content = array( $exp->FormatExportCols() );
+
+
+ /// @remarks format data
+ foreach($this->content as $item)
+ $data[]=$exp->FormatLigneValue($item);
+
+// print_r($data);
+// exit;
+
header ("Content-type: application/".$this->mode."; chartset=".$this->encodage);
header ("Content-Disposition:filename=".$this->export_type."_".$this->page.".".$this->mode);
header ("Content-type:application/octetstream");
- include(DIR_WS_MODULES . 'template_export/' . $this->export_type.'.php' );
+ /// @remarks process format rows in current mode export
+ foreach($data as $item)
+ echo $this->FormatLigneMode($item);
+
exit;
}
/**
+ @brief return array name colonne, for empty export
*/
- private function define_separator(){
+ function FormatLigneMode($item){
switch($this->mode){
+ case 'txt':
case 'csv':
- case 'txt':
- default:
- $this->separator=';';
+ return implode($this->separator,$item ).$this->separator.$this->ligneseparator;
+ break;
}
}
+
+
/**
@brief List des gabarit d'export disponible
+ Load Childs module for test var enable is true
@param search key
+ @return array for use un draw_menu
*/
public function list_export_template($key=''){
$file_extension = '.php';
@@ -99,8 +127,17 @@
while ($file = $dir->read()) {
if (!is_dir(DIR_WS_MODULES . 'template_export/' . $file)) {
- if ( ((!empty($key) && strpos($file,$key) !=false) || empty($key) ) && substr($file, strrpos($file, '.')) == $file_extension) {
- $directory_array[] = $file;
+ if ( ((!empty($key) && (bool)strpos($file,$key)>=0) || empty($key) ) && substr($file, strrpos($file, '.')) == $file_extension) {
+
+ $f_short=substr($file, 0,strrpos($file, '.'));
+
+ /// @remarks load module export
+ $exp=$this->LoadChildsModule($f_short);
+
+ /// @remarks check enable
+ if($exp->enable){
+ $directory_array[] = $f_short;
+ }
}
}
}
@@ -109,7 +146,7 @@
}
for ($i=0, $n=sizeof($directory_array); $i<$n; $i++) {
- $modules_array[] = array('id' => substr($directory_array[$i], 0, strrpos($directory_array[$i], '.')), 'text' => substr($directory_array[$i], 0, strrpos($directory_array[$i], '.')) ) ;
+ $modules_array[] = array('id' => $directory_array[$i], 'text' => $directory_array[$i] ) ;
}
return $modules_array;
}
@@ -123,6 +160,33 @@
return $var;
}
+ /**
+ @brief define separator fields and line in rows
+ */
+ private function define_separator(){
+ switch($this->mode){
+ case 'csv':
+ case 'txt':
+ default:
+ $this->separator=';';
+ $this->ligneseparator="\r\n";
+ }
+ }
+
+ /**
+ @brief Load childs module
+ @return object module
+ */
+ private function LoadChildsModule($name){
+ /// @remarks load module export
+ include_once(DIR_WS_MODULES . 'template_export/' . $name.'.php' );
+
+ $class_export='Export_'.$name;
+
+ $exp = new $class_export($this->page);
+
+ return $exp;
+ }
}
?>
\ No newline at end of file
Added: branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.delete.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.delete.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.delete.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -0,0 +1,21 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 15/05/11, 09:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<h3><?php echo __('text info heading delete order'); ?></h3>
+
+<?php echo tep_draw_form('orders', orders::FILENAME, 'oID=' . orders::$oInfo->orders_id . '&action=deleteconfirm'); ?>
+ <p><?php echo __('text info delete intro'); ?></p>
+ <p><?php echo tep_draw_checkbox_field('restock','','',true) . __('text info restock product quantity'); ?></p>
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL); ?>
+ </div>
+</form>
\ No newline at end of file
Added: branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.edit.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -0,0 +1,201 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 15/05/11, 09:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $price;
+?>
+ <div class="box_uniq block_form">
+ <fieldset class="block_field">
+
+ <div class="fleft w_30" style="margin:0 0.5em">
+ <h4><?php echo __('entry customer'); ?></h4>
+ <p class="block_input">
+ <?php echo tep_address_format(orders::$order->customer['format_id'], orders::$order->customer, 1, '', '<br />'); ?><br />
+ </p>
+ <p class="block_input">
+ <strong><?php echo __('entry telephone number'); ?></strong><?php echo orders::$order->customer['telephone']; ?>
+ <br />
+
+ <strong><?php echo __('entry email address'); ?></strong><?php echo '<a href="mailto:' . orders::$order->customer['email_address'] . '">' . orders::$order->customer['email_address'] . '</a>'; ?>
+ <br />
+
+ <strong><?php echo __('entry ip'); ?></strong><?php echo orders::$order->info['ip_address']; ?>
+ </p>
+ </div>
+
+ <div class="fleft w_30" style="margin:0 0.5em">
+ <h4><?php echo __('entry shipping address'); ?></h4>
+ <p class="block_input">
+ <?php echo tep_address_format(orders::$order->delivery['format_id'], orders::$order->delivery, 1, '', '<br />'); ?></p>
+ </p>
+ </div>
+
+ <div class="fleft w_30" style="margin:0 0.5em">
+ <h4><?php echo __('entry billing address'); ?></h4>
+ <p class="block_input">
+ <?php echo tep_address_format(orders::$order->billing['format_id'], orders::$order->billing, 1, '', '<br />'); ?>
+ </p>
+ </div>
+
+ <div class="fleft w_30" style="margin:0 0.5em">
+ <p class="block_input">
+ <strong><?php echo __('entry payment method'); ?></strong><?php echo orders::$order->info['payment_method'] ; ?>
+ <br />
+ <?php if (tep_not_null(orders::$order->info['cc_type']) || tep_not_null(orders::$order->info['cc_owner']) || tep_not_null(orders::$order->info['cc_number'])) { ?>
+ <strong><?php echo __('entry credit card type'); ?></strong><?php echo orders::$order->info['cc_type']; ?>
+ <br />
+ <strong><?php echo __('entry credit card owner'); ?></strong><?php echo orders::$order->info['cc_owner']; ?>
+ <br />
+ <strong><?php echo __('entry credit card number'); ?></strong><?php echo orders::$order->info['cc_number']; ?>
+ <br />
+ <strong><?php echo __('entry credit card expires'); ?></strong><?php echo orders::$order->info['cc_expires']; ?>
+ <?php } ?>
+ </p>
+ </div>
+
+ </fieldset>
+
+ <div class="separator"></div>
+
+
+ <div class="box_left">
+ <table class="dataTableBase orders">
+ <thead>
+ <tr>
+ <?php if(_cst_bool('MODULE_ACCOUNT_RETURN_PRODUCTS_STATUS')): ?>
+ <th><?php echo __('table heading return'); ?></th>
+ <?php endif; ?>
+ <th colspan="2"><?php echo __('table heading products'); ?></th>
+ <th><?php echo __('table heading products model'); ?></th>
+ <th><?php echo __('table heading tax'); ?></th>
+ <th><?php echo __('table heading price excluding tax'); ?></th>
+ <th><?php echo __('table heading price including tax'); ?></th>
+ <th><?php echo __('table heading total excluding tax'); ?></th>
+ <th><?php echo __('table heading total including tax'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php for ($i=0, $n=sizeof(orders::$order->products); $i<$n; $i++): ?>
+ <tr>
+ <?php if(_cst_bool('MODULE_ACCOUNT_RETURN_PRODUCTS_STATUS')): ?>
+ <td><?php
+ //BEGIN RMA MODULE
+ $returns_check_query = tep_db_query("SELECT r.rma_value, rp.products_id FROM " . TABLE_RETURNS . " r, " . TABLE_RETURNS_PRODUCTS_DATA . " rp where r.returns_id = rp.returns_id and r.order_id = '" . orders::$oID . "' and rp.products_id = '" . orders::$order->products[$i]['id'] . "' ");
+ if (!tep_db_num_rows($returns_check_query)){
+
+ if (orders::$order->products[$i]['return'] != '1') {
+ $return_link = '<a href="' . tep_href_link(FILENAME_RETURN_PRODUCT, 'order_id=' . orders::$oID . '&products_id=' . (orders::$order->products[$i]['id']), 'NONSSL') . '">' . tep_image(DIR_WS_ICONS .'icon_rma_return.png', TEXT_SHEDULE_RETURN ).'</a>';
+ }
+// if (orders::$orders_status !=DEFAULT_ORDERS_STATUS_COMPLETED ) $return_link = '';
+ } else {
+ $returns = tep_db_fetch_array($returns_check_query);
+ $return_link = '<a href=' . tep_href_link(FILENAME_RETURNS, 'cID=' . $returns['rma_value']) . '><font color=red><b><i>Returns</b></i></font></a>';
+ }
+ echo $return_link; ?>
+ </td>
+ <?php endif; ?>
+ <td class="tleft"><a href="javascript: updateProduct('<?php echo orders::$oID ?> ', '<?php orders::$order->products[$i]['id'] ?> ', 'products_quantity', 'update', '', ' <?php echo orders::$order->products[$i]['qty'] ?> ');"><?php echo orders::$order->products[$i]['qty'] . ' x' ?></a></td>
+ <td class="tleft"><?php echo orders::$order->products[$i]['name'].tep_draw_attribute_products(orders::$order,$i).' ' ?></td>
+ <td class="tcenter"><?php echo orders::$order->products[$i]['model'] ?></td>
+ <td class="tcenter"><?php echo tep_display_tax_value(orders::$order->products[$i]['tax']) . '%' ?></td>
+ <td class="tcenter"><?php echo $price->format(orders::$order->products[$i]['final_price'], true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
+ <td class="tcenter"><?php echo $price->format(tep_add_tax(orders::$order->products[$i]['final_price'], orders::$order->products[$i]['tax']), true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
+ <td class="tcenter"><?php echo $price->format(orders::$order->products[$i]['final_price'] * orders::$order->products[$i]['qty'], true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
+ <td class="tcenter"><?php echo $price->format(tep_add_tax(orders::$order->products[$i]['final_price'], orders::$order->products[$i]['tax']) * orders::$order->products[$i]['qty'], true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
+ </tr>
+ <?php endfor; ?>
+
+ <!-- Block Total -->
+ <?php for ($i = 0, $n = sizeof(orders::$order->totals); $i < $n; $i++) { ?>
+ <tr>
+ <?php if(_cst_bool('MODULE_ACCOUNT_RETURN_PRODUCTS_STATUS')): ?>
+ <td> </td>
+ <?php endif; ?>
+ <td colspan="5" > </td>
+ <td class="tright"><?php echo orders::$order->totals[$i]['title'] ?></td>
+ <td class="tcenter"><?php echo orders::$order->totals[$i]['text'] ?></td>
+ <td> </td>
+ </tr>
+ <?php } ?>
+ <!-- Block Total eof-->
+ </tbody>
+ </table>
+
+ <table>
+ <thead>
+ <tr>
+ <th><?php echo __('table heading date added'); ?></th>
+ <th class="tcenter"><?php echo __('table heading customer notified'); ?></th>
+ <th class="tcenter"><?php echo __('table heading status'); ?></th>
+ <th><?php echo __('table heading comments'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php
+ if( ($list=orders::load_status_history(orders::$oID) ) && $list ==false ) echo '<tr>' . "\n" . '<td colspan="5">' . __('text no order history') . '</td>' . "\n" . '</tr>' . "\n";
+ else
+ foreach($list as $item): ?>
+ <tr>
+ <td><?php echo $item['date_added']; ?></td>
+ <td class="tcenter"><?php echo $item['customer_notified']; ?></td>
+ <td class="tcenter"><?php echo $item['orders_status']; ?></td>
+ <td><?php echo $item['comments']; ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+</div>
+
+ <!-- Block suivi etat -->
+ <div class="box_right">
+
+ <?php if(orders::$update) :?>
+ <?php echo tep_draw_form('status_form', orders::FILENAME,'oID='.orders::$oID.'&action=update_order', 'post', ' class="block_form"'); ?>
+ <fieldset class="block_field">
+
+
+ <p class="block_input">
+ <label for="status"><?php echo __('entry status'); ?></label>
+ <?php echo tep_draw_pull_down_menu('status', orders::$orders_statuses, orders::$order->info['orders_status']); ?>
+ </p>
+
+ <p class="block_input inline">
+ <label for ="notify"><?php echo __('entry notify customer'); ?></label>
+ <?php echo tep_draw_checkbox_field('notify', '', '', true); ?>
+ <br style="clear:both"/>
+ <label for ="notify_comments"><?php echo __('entry notify comments'); ?></label>
+ <?php echo tep_draw_checkbox_field('notify_comments', '', '', false ,'class="radio" onclick="activ(\'#cont_comments\')"'); ?>
+ </p>
+
+ <fieldset id="cont_comments" class="block_field">
+ <legend><?php echo __('table heading comments'); ?></legend>
+ <?php echo tep_draw_textarea_field('comments', '', '30', '5', '','style="width:100%"'); ?>
+ <br /><br />
+ </fieldset>
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_update.gif', IMAGE_UPDATE); ?>
+ </div>
+ </fieldset>
+ </form>
+ <?php endif; ?>
+ </div>
+ <!-- Block suivi etat eof-->
+
+ <div class="button_nav">
+ <?php echo tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL);?>
+ </div>
+
+ <div class="button_action">
+ <?php echo '<a class="button" href="' . tep_href_link(FILENAME_BATCH_PRINT, tep_get_all_get_params(array('page_admin','action','forceview')).'forceview=pdf&file_type=invoice&action=exe') . '">' . IMAGE_ORDERS_INVOICE . '</a>'.
+ '<a class="button" href="' . tep_href_link(FILENAME_BATCH_PRINT, tep_get_all_get_params(array('page_admin','action')).'forceview=pdf&file_type=packingslip&action=exe') . '" onclick="window.open(this.href); return false;">' . IMAGE_ORDERS_PACKINGSLIP . '</a>';
+ ; ?>
+ </div>
+ </div>
Added: branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.inline.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.inline.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.inline.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -0,0 +1,25 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 15/05/11, 09:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<tr>
+ <td>
+ <div>
+ <?php foreach(orders::$list as $item): ?>
+ <tr>
+ <td><?php echo $item['date_added']; ?></td>
+ <td class="tcenter"><?php echo $item['customer_notified']; ?></td>
+ <td class="tcenter"><?php echo $item['orders_status']; ?></td>
+ <td><?php echo $item['comments']; ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </div>
+ </td>
+</tr>
Added: branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.multi.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.multi.gab (rev 0)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders/display_view.multi.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -0,0 +1,39 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 15/05/11, 09:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h4><?php echo __('text info multi heading upload order'); ?></h4>
+<hr />
+<div class="box_left">
+<?php echo tep_draw_form('orders', orders::FILENAME, tep_get_all_get_params(array('oID', 'action','forceajax','forceview')) .'action=multiconfirm'); ?>
+ <ul>
+ <?php if(isset($_POST['action_multi']) && is_array($_POST['action_multi']) )
+ foreach($_POST['action_multi'] as $oid=>$txt ): ?>
+ <li><?php echo tep_draw_hidden_field('action_multi['.$oid.']', 'action_multi_'.$oid.'', $oid).__('cmd n°').' '.$txt ?></li>
+ <?php endforeach; ?>
+ </ul>
+ <?php if(tep_not_null($_POST['status_multi'])){ ?>
+ <p><?php echo tep_draw_hidden_field('status_multi', '', $_POST['status_multi']).__('text info multi action detail').orders::$orders_statuses[$_POST['status_multi']]['text']; ?></p>
+ <p><?php echo tep_draw_checkbox_field('notify','','',false) . __('text info multi notify'); ?></p>
+ <p><?php echo tep_draw_checkbox_field('notify_comments', '', '', false ,'class="radio"') . __('entry notify comments') ; ?></p>
+ <p><?php echo tep_draw_textarea_field('comments', '', '30', '5', '','style="width:100%"') ; ?></p>
+ <?php } ?>
+
+ <?php if(tep_not_null($_POST['modeexport'])) { ?>
+ <p> <?php echo tep_draw_pull_down_menu('export_type', orders::$export->list_export_template('orders') , @$_GET['export_type'], ' ') ; ?></p>
+ <p> <?php echo tep_draw_pull_down_menu('encodage', orders::$export->encode, @$_GET['encodage'], ' ') ; ?></p>
+ <p> <?php echo tep_draw_hidden_field('modeexport', '', $_POST['modeexport']).__('text info multi action export detail') ; ?></p>
+ <?php } ?>
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_delete.gif', __('image modify multi'), ' onclick="$.fancybox.close();" ') . tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL); ?>
+ </div>
+</form>
+</div>
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/orders.delete.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders.delete.gab 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders.delete.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -1,21 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 18:56
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-?>
-<h3><?php echo __('text info heading delete order'); ?></h3>
-
-<?php echo tep_draw_form('orders', orders::FILENAME, 'oID=' . orders::$oInfo->orders_id . '&action=deleteconfirm'); ?>
- <p><?php echo __('text info delete intro'); ?></p>
- <p><?php echo tep_draw_checkbox_field('restock','','',true) . __('text info restock product quantity'); ?></p>
- <div class="button_nav">
- <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL); ?>
- </div>
-</form>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/orders.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders.edit.gab 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders.edit.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -1,201 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 18:55
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $price;
-?>
- <div class="box_uniq block_form">
- <fieldset class="block_field">
-
- <div class="fleft w_30" style="margin:0 0.5em">
- <h4><?php echo __('entry customer'); ?></h4>
- <p class="block_input">
- <?php echo tep_address_format(orders::$order->customer['format_id'], orders::$order->customer, 1, '', '<br />'); ?><br />
- </p>
- <p class="block_input">
- <strong><?php echo __('entry telephone number'); ?></strong><?php echo orders::$order->customer['telephone']; ?>
- <br />
-
- <strong><?php echo __('entry email address'); ?></strong><?php echo '<a href="mailto:' . orders::$order->customer['email_address'] . '">' . orders::$order->customer['email_address'] . '</a>'; ?>
- <br />
-
- <strong><?php echo __('entry ip'); ?></strong><?php echo orders::$order->info['ip_address']; ?>
- </p>
- </div>
-
- <div class="fleft w_30" style="margin:0 0.5em">
- <h4><?php echo __('entry shipping address'); ?></h4>
- <p class="block_input">
- <?php echo tep_address_format(orders::$order->delivery['format_id'], orders::$order->delivery, 1, '', '<br />'); ?></p>
- </p>
- </div>
-
- <div class="fleft w_30" style="margin:0 0.5em">
- <h4><?php echo __('entry billing address'); ?></h4>
- <p class="block_input">
- <?php echo tep_address_format(orders::$order->billing['format_id'], orders::$order->billing, 1, '', '<br />'); ?>
- </p>
- </div>
-
- <div class="fleft w_30" style="margin:0 0.5em">
- <p class="block_input">
- <strong><?php echo __('entry payment method'); ?></strong><?php echo orders::$order->info['payment_method'] ; ?>
- <br />
- <?php if (tep_not_null(orders::$order->info['cc_type']) || tep_not_null(orders::$order->info['cc_owner']) || tep_not_null(orders::$order->info['cc_number'])) { ?>
- <strong><?php echo __('entry credit card type'); ?></strong><?php echo orders::$order->info['cc_type']; ?>
- <br />
- <strong><?php echo __('entry credit card owner'); ?></strong><?php echo orders::$order->info['cc_owner']; ?>
- <br />
- <strong><?php echo __('entry credit card number'); ?></strong><?php echo orders::$order->info['cc_number']; ?>
- <br />
- <strong><?php echo __('entry credit card expires'); ?></strong><?php echo orders::$order->info['cc_expires']; ?>
- <?php } ?>
- </p>
- </div>
-
- </fieldset>
-
- <div class="separator"></div>
-
-
- <div class="box_left">
- <table class="dataTableBase orders">
- <thead>
- <tr>
- <?php if(_cst_bool('MODULE_ACCOUNT_RETURN_PRODUCTS_STATUS')): ?>
- <th><?php echo __('table heading return'); ?></th>
- <?php endif; ?>
- <th colspan="2"><?php echo __('table heading products'); ?></th>
- <th><?php echo __('table heading products model'); ?></th>
- <th><?php echo __('table heading tax'); ?></th>
- <th><?php echo __('table heading price excluding tax'); ?></th>
- <th><?php echo __('table heading price including tax'); ?></th>
- <th><?php echo __('table heading total excluding tax'); ?></th>
- <th><?php echo __('table heading total including tax'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php for ($i=0, $n=sizeof(orders::$order->products); $i<$n; $i++): ?>
- <tr>
- <?php if(_cst_bool('MODULE_ACCOUNT_RETURN_PRODUCTS_STATUS')): ?>
- <td><?php
- //BEGIN RMA MODULE
- $returns_check_query = tep_db_query("SELECT r.rma_value, rp.products_id FROM " . TABLE_RETURNS . " r, " . TABLE_RETURNS_PRODUCTS_DATA . " rp where r.returns_id = rp.returns_id and r.order_id = '" . orders::$oID . "' and rp.products_id = '" . orders::$order->products[$i]['id'] . "' ");
- if (!tep_db_num_rows($returns_check_query)){
-
- if (orders::$order->products[$i]['return'] != '1') {
- $return_link = '<a href="' . tep_href_link(FILENAME_RETURN_PRODUCT, 'order_id=' . orders::$oID . '&products_id=' . (orders::$order->products[$i]['id']), 'NONSSL') . '">' . tep_image(DIR_WS_ICONS .'icon_rma_return.png', TEXT_SHEDULE_RETURN ).'</a>';
- }
-// if (orders::$orders_status !=DEFAULT_ORDERS_STATUS_COMPLETED ) $return_link = '';
- } else {
- $returns = tep_db_fetch_array($returns_check_query);
- $return_link = '<a href=' . tep_href_link(FILENAME_RETURNS, 'cID=' . $returns['rma_value']) . '><font color=red><b><i>Returns</b></i></font></a>';
- }
- echo $return_link; ?>
- </td>
- <?php endif; ?>
- <td class="tleft"><a href="javascript: updateProduct('<?php echo orders::$oID ?> ', '<?php orders::$order->products[$i]['id'] ?> ', 'products_quantity', 'update', '', ' <?php echo orders::$order->products[$i]['qty'] ?> ');"><?php echo orders::$order->products[$i]['qty'] . ' x' ?></a></td>
- <td class="tleft"><?php echo orders::$order->products[$i]['name'].tep_draw_attribute_products(orders::$order,$i).' ' ?></td>
- <td class="tcenter"><?php echo orders::$order->products[$i]['model'] ?></td>
- <td class="tcenter"><?php echo tep_display_tax_value(orders::$order->products[$i]['tax']) . '%' ?></td>
- <td class="tcenter"><?php echo $price->format(orders::$order->products[$i]['final_price'], true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
- <td class="tcenter"><?php echo $price->format(tep_add_tax(orders::$order->products[$i]['final_price'], orders::$order->products[$i]['tax']), true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
- <td class="tcenter"><?php echo $price->format(orders::$order->products[$i]['final_price'] * orders::$order->products[$i]['qty'], true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
- <td class="tcenter"><?php echo $price->format(tep_add_tax(orders::$order->products[$i]['final_price'], orders::$order->products[$i]['tax']) * orders::$order->products[$i]['qty'], true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
- </tr>
- <?php endfor; ?>
-
- <!-- Block Total -->
- <?php for ($i = 0, $n = sizeof(orders::$order->totals); $i < $n; $i++) { ?>
- <tr>
- <?php if(_cst_bool('MODULE_ACCOUNT_RETURN_PRODUCTS_STATUS')): ?>
- <td> </td>
- <?php endif; ?>
- <td colspan="5" > </td>
- <td class="tright"><?php echo orders::$order->totals[$i]['title'] ?></td>
- <td class="tcenter"><?php echo orders::$order->totals[$i]['text'] ?></td>
- <td> </td>
- </tr>
- <?php } ?>
- <!-- Block Total eof-->
- </tbody>
- </table>
-
- <table>
- <thead>
- <tr>
- <th><?php echo __('table heading date added'); ?></th>
- <th class="tcenter"><?php echo __('table heading customer notified'); ?></th>
- <th class="tcenter"><?php echo __('table heading status'); ?></th>
- <th><?php echo __('table heading comments'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php
- if( ($list=orders::load_status_history(orders::$oID) ) && $list ==false ) echo '<tr>' . "\n" . '<td colspan="5">' . __('text no order history') . '</td>' . "\n" . '</tr>' . "\n";
- else
- foreach($list as $item): ?>
- <tr>
- <td><?php echo $item['date_added']; ?></td>
- <td class="tcenter"><?php echo $item['customer_notified']; ?></td>
- <td class="tcenter"><?php echo $item['orders_status']; ?></td>
- <td><?php echo $item['comments']; ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
-
-</div>
-
- <!-- Block suivi etat -->
- <div class="box_right">
-
- <?php if(orders::$update) :?>
- <?php echo tep_draw_form('status_form', orders::FILENAME,'oID='.orders::$oID.'&action=update_order', 'post', ' class="block_form"'); ?>
- <fieldset class="block_field">
-
-
- <p class="block_input">
- <label for="status"><?php echo __('entry status'); ?></label>
- <?php echo tep_draw_pull_down_menu('status', orders::$orders_statuses, orders::$order->info['orders_status']); ?>
- </p>
-
- <p class="block_input inline">
- <label for ="notify"><?php echo __('entry notify customer'); ?></label>
- <?php echo tep_draw_checkbox_field('notify', '', '', true); ?>
- <br style="clear:both"/>
- <label for ="notify_comments"><?php echo __('entry notify comments'); ?></label>
- <?php echo tep_draw_checkbox_field('notify_comments', '', '', false ,'class="radio" onclick="activ(\'#cont_comments\')"'); ?>
- </p>
-
- <fieldset id="cont_comments" class="block_field">
- <legend><?php echo __('table heading comments'); ?></legend>
- <?php echo tep_draw_textarea_field('comments', '', '30', '5', '','style="width:100%"'); ?>
- <br /><br />
- </fieldset>
-
- <div class="button_nav">
- <?php echo tep_image_submit('button_update.gif', IMAGE_UPDATE); ?>
- </div>
- </fieldset>
- </form>
- <?php endif; ?>
- </div>
- <!-- Block suivi etat eof-->
-
- <div class="button_nav">
- <?php echo tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL);?>
- </div>
-
- <div class="button_action">
- <?php echo '<a class="button" href="' . tep_href_link(FILENAME_BATCH_PRINT, tep_get_all_get_params(array('page_admin','action','forceview')).'forceview=pdf&file_type=invoice&action=exe') . '">' . IMAGE_ORDERS_INVOICE . '</a>'.
- '<a class="button" href="' . tep_href_link(FILENAME_BATCH_PRINT, tep_get_all_get_params(array('page_admin','action')).'forceview=pdf&file_type=packingslip&action=exe') . '" onclick="window.open(this.href); return false;">' . IMAGE_ORDERS_PACKINGSLIP . '</a>';
- ; ?>
- </div>
- </div>
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/orders.inline.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders.inline.gab 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders.inline.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -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.9
- @date 18/08/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<tr>
- <td>
- <div>
- <?php foreach(orders::$list as $item): ?>
- <tr>
- <td><?php echo $item['date_added']; ?></td>
- <td class="tcenter"><?php echo $item['customer_notified']; ?></td>
- <td class="tcenter"><?php echo $item['orders_status']; ?></td>
- <td><?php echo $item['comments']; ?></td>
- </tr>
- <?php endforeach; ?>
- </div>
- </td>
-</tr>
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/orders.listing.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders.listing.gab 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders.listing.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -1,46 +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 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<?php echo tep_draw_form('multi', orders::FILENAME, 'action=multi_confirm', 'post', ' class="fancy" '); ?>
- <table class="dataTable">
- <thead>
- <tr>
- <th style="width:2%;"> </th>
- <th style="width:2%;"> </th>
- <th style="width:8%;"><?php echo __('table heading order id'); ?></th>
- <th style="width:40%;"><?php echo __('table heading customers'); ?></th>
- <th style="width:150px;"><?php echo __('table heading order total'); ?></th>
- <th style="width:10%;"><?php echo __('table heading date purchased'); ?></th>
- <th style="width:8%;"><?php echo __('table heading status'); ?></th>
- <th style="width:10%;"><?php echo __('table heading status'); ?></th>
- <th class="row_action"><?php echo __('table heading action') ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td style="width:2%;"><?php echo tep_draw_hidden_field('xx','xxx','','class="search_init" '); ?></td>
- <td style="width:2%;"><?php echo tep_draw_hidden_field('xxx','xxx','','class="search_init" '); ?></td>
- <td class="tcenter"><?php echo tep_draw_input_field('o.orders_id','orders_id',__('table heading order id'),'style="width:98%" class="search_init"'); ?></td>
- <td><?php echo tep_draw_input_field('o.customers_name','customers_name',__('table heading customers'),'style="width:98%" class="search_init"'); ?></td>
- <td class="tcenter"><?php echo tep_draw_input_field('ot.text','text',__('table heading order total'),'style="width:98%" class="search_init"'); ?></td>
- <td class="tcenter"><?php echo tep_draw_input_field('o.date_purchased','date_purchased',__('table heading date purchased'),'style="width:98%" class="search_init"'); ?></td>
- <td><?php echo tep_draw_input_field('o.payment_method','payment_method',__('table heading status'),'style="width:98%" class="search_init"'); ?></td>
- <td><?php echo tep_draw_input_field('s.status_name','status_name',__('table heading status'),'style="width:98%" class="search_init"'); ?></td>
- <td> </td>
- </tr>
- <tr>
- <td colspan="9"> <span class="fleft"><?php echo __('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple orders'))), orders::$orders_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', orders::$export->mode ); ?> </span> <span class="fleft" style="margin-left:50px;"> <?php echo tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ). "\n"; ?></span></td>
- </tr>
- </tfoot>
- <tbody>
- <!-- AJAX BLOCK -->
- </tbody>
- </table>
-</form>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/admin/includes/gabarit/orders.multi_confirm.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/orders.multi_confirm.gab 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/gabarit/orders.multi_confirm.gab 2011-05-15 10:05:19 UTC (rev 3731)
@@ -1,38 +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 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h4><?php echo __('text info multi heading upload order'); ?></h4>
-<hr />
-<div class="box_left">
-<?php echo tep_draw_form('orders', orders::FILENAME, tep_get_all_get_params(array('oID', 'action','forceajax','forceview')) .'action=multi'); ?>
- <ul>
- <?php if(isset($_POST['action_multi']) && is_array($_POST['action_multi']) )
- foreach($_POST['action_multi'] as $oid=>$txt ): ?>
- <li><?php echo tep_draw_hidden_field('action_multi['.$oid.']', 'action_multi_'.$oid.'', $oid).__('cmd n°').' '.$txt ?></li>
- <?php endforeach; ?>
- </ul>
- <?php if(tep_not_null($_POST['status_multi'])){ ?>
- <p><?php echo tep_draw_hidden_field('status_multi', '', $_POST['status_multi']).__('text info multi action detail').orders::$orders_statuses[$_POST['status_multi']]['text']; ?></p>
- <p><?php echo tep_draw_checkbox_field('notify','','',false) . __('text info multi notify'); ?></p>
- <p><?php echo tep_draw_checkbox_field('notify_comments', '', '', false ,'class="radio"') . __('entry notify comments') ; ?></p>
- <p><?php echo tep_draw_textarea_field('comments', '', '30', '5', '','style="width:100%"') ; ?></p>
- <?php } ?>
-
- <?php if(tep_not_null($_POST['modeexport'])) { ?>
- <p> <?php echo tep_draw_pull_down_menu('export_type', orders::$export->list_export_template() , @$_GET['export_type'], ' ') ; ?></p>
- <p> <?php echo tep_draw_pull_down_menu('encodage', orders::$export->encode, @$_GET['encodage'], ' ') ; ?></p>
- <p> <?php echo tep_draw_hidden_field('modeexport', '', $_POST['modeexport']).__('text info multi action export detail') ; ?></p>
- <?php } ?>
-
- <div class="button_nav">
- <?php echo tep_image_submit('button_delete.gif', __('image modify multi')) . tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL); ?>
- </div>
-</form>
-</div>
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-05-15 10:05:19 UTC (rev 3731)
@@ -1,12 +1,14 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 30/08/10, 21:39
+ @version 2.1.0
+ @date 15/05/11, 09:57
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+$lang['heading title orders']='Commandes';
$lang['heading title']='Commandes';
$lang['heading title search']='ID commande :';
$lang['heading title status']='Statut :';
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/orders.php 2011-05-12 11:27:06 UTC (rev 3730)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/orders.php 2011-05-15 10:05:19 UTC (rev 3731)
@@ -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-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.0
- @date 18/12/10, 22:49
+ @date 15/05/11, 11:45
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class orders
@@ -12,22 +12,22 @@
*/
+
+error_reporting(E_ALL);
+
class orders
- implements ExtModPage, InterfacedTJsonS, InterfacedInnerHtml {
+ extends ModTwo /// new abstract class for nextgen module
+ implements
+ InterfaceModule,
+ IntModTwo, /// new interface module for nextgen module
+ InterfacedInnerHtml {
/**
@param const
*/
const FILENAME = FILENAME_ORDERS;
+
/**
- @param string code, le nom de la class
- */
- public static $code;
- /**
- @param string action, passé en GET
- */
- public static $action;
- /**
@param array list, utilisé dans les gabarits, list des orders
*/
public static $list=array();
@@ -66,29 +66,143 @@
class constructor
*/
public function __construct() {
+ self::GetConf();
+ }
+
+ /**
+ @brief Load , adjust and define var environement exe for module
+ Is use in module and class abstract for init value config this module
+ */
+ public static function GetConf(){
+ global $languages_id;
+
self::$code=__CLASS__;
- //! active datatable in ajax format, precise les GET necessaire
- define('JSONSTATMENT', 'mod=page&type='.self::$code);
+ self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : 'listing' );
+ self::$oID=(isset($_REQUEST['oID'])? $_REQUEST['oID'] : '' );
+
+
+// var_dump(self::$action);
+ self::$export= new export(__CLASS__);
+
+ /**
+ @remarks define var execution sql in GetDBValue()
+ */
+ self::$InitInfo['adjust']=array(
+ 'languages_id'=>$languages_id,
+ 'page'=>1,
+ 'rowbyp'=>10,
+ 'sOrder'=>'',
+ 'sWhere'=>'',
+ );
+
+
+
+ /**
+ @remarks not load if not first init
+ */
+ if(defined('JSONSTATMENT')) return;
+
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'mod=page&type='.self::$code.
+ (isset(parent::$action)?'&action='.parent::$action : '' ).
+ (isset(self::$oID)?'&oID='.self::$oID : '' )
+ );
+
//! detail item in ajax
define('AJAXSTATMENTDETAIL', 'mod=page&type='.self::$code);
- self::$export= new export();
- self::init();
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ self::$InitInfo['theader']['listing']=array(
+ 0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ 1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ 2 =>array('width'=>'8%', 'class'=>'tcenter', 'txt'=>__('table heading order id') ),
+ 3 =>array('width'=>'40%','class'=>'tcenter', 'txt'=>__('table heading customers')),
+ 4 =>array('width'=>'150px','class'=>'tcenter', 'txt'=>__('table heading order total')),
+ 5 =>array('width'=>'10%', 'txt'=>__('table heading date purchased')),
+ 6 =>array('width'=>'8%', 'txt'=>__('table heading status')),
+ 7 =>array('width'=>'10%', 'txt'=>__('table heading status')),
+ 8 =>array('width'=>'10%','class'=>'row_action', 'txt'=>__('table heading action')),
+ );
+
+ self::$InitInfo['tfooter']['listing']=array(
+ 0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>tep_draw_hidden_field('xx','xxx','','class="search_init" ') ),
+ 1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>tep_draw_hidden_field('xxx','xxx','','class="search_init" ') ),
+ 2 =>array('width'=>'8%', 'class'=>'tcenter', 'txt'=>tep_draw_input_field('o.orders_id','orders_id',__('table heading order id'),'style="width:98%" class="search_init"') ),
+ 3 =>array('width'=>'40%','class'=>'tcenter', 'txt'=>tep_draw_input_field('o.customers_name','customers_name',__('table heading customers'),'style="width:98%" class="search_init"') ),
+ 4 =>array('width'=>'150px','class'=>'tcenter', 'txt'=>tep_draw_input_field('ot.text','text',__('table heading order total'),'style="width:98%" class="search_init"') ),
+ 5 =>array('width'=>'10%', 'txt'=>tep_draw_input_field('o.date_purchased','date_purchased',__('table heading date purchased'),'style="width:98%" class="search_init"')),
+ 6 =>array('width'=>'8%', 'txt'=>tep_draw_input_field('o.payment_method','payment_method',__('table heading status'),'style="width:98%" class="search_init"')),
+ 7 =>array('width'=>'10%', 'txt'=>tep_draw_input_field('s.status_name','status_name',__('table heading status'),'style="width:98%" class="search_init"')),
+ 8 =>array('width'=>'10%','class'=>'row_action', 'txt'=>' '),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ self::$InitInfo['modele']['listing']=array(
+ 0 =>false,
+ 1 =>false,
+ 'orders_id'=>true,
+ 'customers_id'=>true,
+ 'order_total'=>true,
+ 'date_purchased'=>true,
+ 'payment_method'=>true,
+ 'orders_status_name'=>true,
+ 'action' =>false
+ );
+
+
+
+ /**
+ @remarks this define menu master module in page
+ */
+// if(self::$action =='' || self::$action =='listing')
+// self::$InitInfo['MenuModule'][]=array(
+// 'type'=>'getLink',
+// 'format'=>'button_nav',
+// 'image'=>'',
+// 'cssclass'=>'',
+// 'title'=>__('image inventaire add'),
+// 'url'=>tep_href_link(self::FILENAME, 'action=new'),
+// );
+
+
+
+
+ $DB=Database::getInstance();
+ self::$orders_statuses=array();
+ $orders_status_query = $DB->query("select status_id, status_name from " . TABLE_STATUS . " where status_type='orders' and language_id = '" . (int)$languages_id . "'");
+ while ($orders_status = $orders_status_query->fetchAssoc()) {
+ self::$orders_statuses[] = array('id' => $orders_status['status_id'], 'text' => $orders_status['status_name']);
+ self::$orders_status_array[$orders_status['status_id']] = $orders_status['status_name'];
+ }
+
+
+ return true;
}
+
public function check_action($actions){
global $messageStack,$page_module;
self::$action=$actions;
switch (self::$action) {
- case 'multi':
+ case 'multiconfirm':
$res=array();
/**
- Action mutliple
+ @remarks Action mutliple
*/
+
+
+
+
$status = tep_db_prepare_input(@$_POST['status_multi']);
// $modeexport = tep_db_prepare_input(@$_POST['modeexport']);
$notify_comments = (isset($_POST['notify_comments'])) ? tep_db_prepare_input($_POST['notify_comments']) : '';
@@ -101,6 +215,8 @@
if (up_status_order($oID, array('status'=>$status,'comments'=>'', 'notify'=>$notify, 'notify_comments'=>$notify_comments , 'comments'=> $comments) ) ) $res[]=true;
else $res[]=false;
}
+
+
if(isset($_POST['modeexport'])){
$modeexport=tep_db_prepare_input($_POST['modeexport']);
@@ -131,7 +247,7 @@
'Contreremb'=>'');
}
- self::$export->op_export($od);
+ print self::$export->op_export($od);
}
}
@@ -169,60 +285,104 @@
<?php endif;
}
+ /**
+ @fn Inventaire::GetDBValue();
+ @brief return DB value adapted for current action
+ Use self::action for determine switch
+ @return
+ */
+ public static function GetDBValue(){
+ global $languages_id;
+ $arg=func_get_arg();
- public static function load_db_values($ID){
- global $languages_id;
$DB=Database::getInstance();
- $ID = tep_db_prepare_input($ID);
- $orders_query_raw = "select distinct o.orders_id,o.orders_prefix, o.customers_id,o.customers_name, 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_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_STATUS . " s where o.orders_status = s.status_id and s.status_type='orders' and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' and o.orders_id='".$ID."' ";
+ $res=array();
- $currency_query = $DB->query($orders_query_raw);
+// var_dump(self::$action);
+ switch (self::$action) {
+ case 'export';
+ break;
- return new objectInfo($currency_query->fetchAssoc() );
+
+ case 'listing';
+ /**
+ @remarks retrun object load one inventaire
+ */
+ global $query_numrows;
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+
+
+ if(tep_not_null($adjust->sWhere)){
+ $adjust->sWhere=str_replace(array('orders_id',
+ 'order_total',
+ 'customers_id',
+ 'orders_status_name'),
+ array('o.orders_id',
+ ' ot.text',
+ 'o.customers_name',
+ 's.status_name'),
+ $adjust->sWhere);
+ }
+
+ $query_raw = "select distinct o.orders_id,o.orders_prefix, o.customers_id, o.customers_name, 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_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_STATUS . " s where o.orders_status = s.status_id and s.status_type='orders' and s.language_id = '" . (int)$adjust->languages_id . "' and ot.class = 'ot_total' ".$adjust->sWhere." order by ".((!empty($adjust->sOrder)) ? $adjust->sOrder : 'o.orders_id DESC');
+
+ $_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
+ $_query = $DB->query($query_raw);
+
+ $res=self::FormatDBValue($_query);
+
+ return $res;
+ break;
+
+ case 'delete';
+ default:
+
+// $ID = tep_db_prepare_input($ID);
+ $orders_query_raw = "select distinct o.orders_id,o.orders_prefix, o.customers_id,o.customers_name, 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_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_STATUS . " s where o.orders_status = s.status_id and s.status_type='orders' and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' and o.orders_id='".self::$oID."' ";
+
+ $currency_query = $DB->query($orders_query_raw);
+
+ return new objectInfo($currency_query->fetchAssoc() );
+
+ }
}
+
+
+
public function display_view(){
switch (self::$action) {
case 'delete':
- if(self::test_oID((int)$_GET['oID'])) {
- self::$oInfo=self::load_db_values((int)$_GET['oID']);
- return tep_get_include_contents(self::$code.'.delete');
+ if(self::test_oID((int)self::$oID)) {
+ self::$oInfo=self::GetDBValue();
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__); //tep_get_include_contents(self::$code.'.delete');
}
break;
- case 'multi_confirm':
- return tep_get_include_contents(self::$code.'.multi_confirm');
+ case 'multi':
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__); //tep_get_include_contents(self::$code.'.multi');
break;
case 'edit':
- if(self::test_oID((int)$_GET['oID'])) {
- self::$oID=(int)$_GET['oID'];
+ if(self::test_oID((int)self::$oID)) {
self::$order= new order(self::$oID);
- return tep_get_include_contents(self::$code.'.edit');
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__); //tep_get_include_contents(self::$code.'.edit');
}
break;
default:
- self::$export= new export();
- self::tep_get_list();
- return tep_get_include_contents(self::$code.'.listing');
+ self::load_db_values();
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
}
}
/** Iterne public module */
- public static function init(){
- global $languages_id;
- $DB=Database::getInstance();
- self::$orders_statuses=array();
- $orders_status_query = $DB->query("select status_id, status_name from " . TABLE_STATUS . " where status_type='orders' and language_id = '" . (int)$languages_id . "'");
- while ($orders_status = $orders_status_query->fetchAssoc()) {
- self::$orders_statuses[] = array('id' => $orders_status['status_id'], 'text' => $orders_status['status_name']);
- self::$orders_status_array[$orders_status['status_id']] = $orders_status['status_name'];
- }
- }
+
public static function load_status_history($oID){
- self::init();
+// self::init();
$list=array();
$DB=Database::getInstance();
$orders_history_query = $DB->query("select orders_status_id, date_added, customer_notified, comments from " . TABLE_ORDERS_STATUS_HISTORY . " where orders_id = '" . tep_db_input($oID) . "' order by date_added");
@@ -246,15 +406,8 @@
- /** static InterfacedTJsonS */
- private static function emptyResult(){
- $li=array();
- foreach(self::tep_get_modele() as $k=>$v) $li[$k]=' ';
- return $li;
- }
-
/**
@fn get_item_action($orders)
@brief fonction qui construit l'affichage de la colonne action
@@ -271,67 +424,83 @@
);
}
+ /**
+ @brief load listing array, for use format retrun by JSON
+ */
+ public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
- public static function tep_get_modele(){
- return array( 0 =>false,
- 1 =>false,
- 'orders_id'=>true,
- 'customers_id'=>true,
- 'order_total'=>true,
- 'date_purchased'=>true,
- 'payment_method'=>true,
- 'orders_status_name'=>true,
- 'action' =>false
- );
- }
+ /// @remarks force load conf
+ self::GetConf();
+ $res=array();
- public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
- global $query_numrows,$languages_id;
+ /**
+ @remarks adjust param for sql requete
+ */
+ self::$InitInfo['adjust']['page']=$page;
+ self::$InitInfo['adjust']['rowbyp']=$rowbyp;
+ self::$InitInfo['adjust']['sOrder']=$sOrder;
+ self::$InitInfo['adjust']['sWhere']=$sWhere;
+ self::$InitInfo['adjust']['options']=$options;
- $DB=Database::getInstance();
+ $res = self::load_db_values();
- if(tep_not_null($sWhere)){
- $sWhere=str_replace(array('orders_id',
- 'order_total',
- 'customers_id',
- 'orders_status_name'),
- array('o.orders_id',
- ' ot.text',
- 'o.customers_name',
- 's.status_name'),
- $sWhere);
- }
+ return self::$list=self::CheckResult($res);
+ }
- $query_raw = "select distinct o.orders_id,o.orders_prefix, o.customers_id, o.customers_name, 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_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_STATUS . " s where o.orders_status = s.status_id and s.status_type='orders' and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'o.orders_id DESC');
- $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['orders_id']=$orders['orders_prefix'].$orders['orders_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[1]=tep_draw_checkbox_field('action_multi['.$orders['orders_id'].']','action_mutli_'.$orders['orders_id'],$orders['orders_id']);
- $ord['action']=self::get_item_action($ord);
- self::$list[]=$ord;
+ /**
+ @brief Redefine Parent method
+ */
+ public static function DTFootTable($mutli=false){
+ /**
+ @remarks mutli action specific line
+ */
+ if($mutli) {
+ $col=count(self::DTheaderTable());
+ return array(
+ 0 => self::$InitInfo['tfooter']['listing'] ,
+ 1 =>array( array('colspan'=>$col, 'class'=>'tleft', 'txt'=>'<span class="fleft">'.__('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple orders'))), orders::$orders_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', orders::$export->mode ).'</span> <span class="fleft" style="margin-left:50px;"> '. tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ).'</span>' ) )
+ ) ;
}
+ else
+ /**
+ @remarks No tfoot specific,use equal theader
+ */
+ return array( 0 =>self::DTheaderTable());
+ }
- $li=$res=array();
- foreach(self::$list as $item){
- foreach(self::tep_get_modele() as $k=>$v) $li[$k]=(isset($item[$k]) && !empty($item[$k]))? $item[$k] : ' ';
- $res[]=$li;
+ /**
+ @brief format db value for ...
[truncated message content] |
|
From: <ay...@us...> - 2011-05-12 11:27:12
|
Revision: 3730
http://oscss.svn.sourceforge.net/oscss/?rev=3730&view=rev
Author: ayatus
Date: 2011-05-12 11:27:06 +0000 (Thu, 12 May 2011)
Log Message:
-----------
Coquille
Modified Paths:
--------------
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml
Modified: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml 2011-05-11 20:39:14 UTC (rev 3729)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml 2011-05-12 11:27:06 UTC (rev 3730)
@@ -12,7 +12,7 @@
<file name="admin/includes/modules/products/UltimateImage.php" />
<file name="admin/includes/gabarit/UltimateImage/display_edit.listing.gab" />
<file name="admin/includes/gabarit/UltimateImage/display_view.edit.gab" />
- <file name="admin/includes/gabarit/UltimateImage/display_edit.delete.gab" />
+ <file name="admin/includes/gabarit/UltimateImage/display_view.delete.gab" />
<file name="includes/modules/products/UltimateImage.php" />
</addfile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-11 20:39:21
|
Revision: 3729
http://oscss.svn.sourceforge.net/oscss/?rev=3729&view=rev
Author: oscim
Date: 2011-05-11 20:39:14 +0000 (Wed, 11 May 2011)
Log Message:
-----------
correction sur le texte definissant le nombre de jours pour considerer les produit comme nouveaux
Modified Paths:
--------------
branches/2.1.0/catalog/includes/boxes/whats_new.php
branches/2.1.0/catalog/includes/modules/new_products.php
branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
branches/2.1.0/catalog/install/oscss_config.sql
Modified: branches/2.1.0/catalog/includes/boxes/whats_new.php
===================================================================
--- branches/2.1.0/catalog/includes/boxes/whats_new.php 2011-05-11 16:12:09 UTC (rev 3728)
+++ branches/2.1.0/catalog/includes/boxes/whats_new.php 2011-05-11 20:39:14 UTC (rev 3729)
@@ -15,7 +15,7 @@
* Affichage de la boite des nouveautés, qui assure l'affichage d'une seul produit.
*/
global $random_product, $price;
-if ($random_product = tep_random_select("select p.products_id from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and p.products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL 30 DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_RANDOM_SELECT_NEW'))) {
+if ($random_product = tep_random_select("select p.products_id from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and p.products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL ".(int)MAX_DATEADDED_FOR_NEWX_PRODUCT." DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_RANDOM_SELECT_NEW'))) {
$product_obj=product::get_item($random_product['products_id']);
$s='';
$random_product['products_name'] = $product_obj->products_name;
Modified: branches/2.1.0/catalog/includes/modules/new_products.php
===================================================================
--- branches/2.1.0/catalog/includes/modules/new_products.php 2011-05-11 16:12:09 UTC (rev 3728)
+++ branches/2.1.0/catalog/includes/modules/new_products.php 2011-05-11 20:39:14 UTC (rev 3729)
@@ -27,9 +27,9 @@
$languages_id=$page->the_var('languages_id');
if ( (!empty($new_products_category_id)) || ((int)$new_products_category_id == 0) ) {
- $new_products_query = $DB->query($sql="select distinct p.products_id from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and p.products_id = pd.products_id and language_id='".$languages_id."' and products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL 30 DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
+ $new_products_query = $DB->query($sql="select distinct p.products_id from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and p.products_id = pd.products_id and language_id='".$languages_id."' and products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL ".(int)MAX_DATEADDED_FOR_NEWX_PRODUCT." DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
} else {
- $new_products_query = $DB->query($sql="select distinct p.products_id from " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and c.parent_id = '" . (int)$new_products_category_id . "' and p.products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL 30 DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
+ $new_products_query = $DB->query($sql="select distinct p.products_id from " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and c.parent_id = '" . (int)$new_products_category_id . "' and p.products_status = '1' and c.categories_status = '1' and p.products_date_added > SUBDATE(now(), INTERVAL ".(int)MAX_DATEADDED_FOR_NEWX_PRODUCT." DAY) order by p.products_date_added desc limit " . $page->_conf_value('MAX_DISPLAY_NEW_PRODUCTS'));
}
if ($new_products_query->__get('NumRows') > 0) return $new_products_query;
Modified: branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
===================================================================
--- branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-05-11 16:12:09 UTC (rev 3728)
+++ branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-05-11 20:39:14 UTC (rev 3729)
@@ -503,8 +503,8 @@
$lg['TEXT_LINK_CONTR_L']= 'URL de la page contribution osCSS.org';
/// 25 new products
-$lg['MAX_DATEADDED_FOR_NEWX_PRODUCT_S']= 'Période class nouveau produits';
-$lg['MAX_DATEADDED_FOR_NEWX_PRODUCT_L']= 'Nombre de mois autorisés pour être nouveau produit';
+$lg['MAX_DATEADDED_FOR_NEWX_PRODUCT_S']= 'durée des nouveaux produits';
+$lg['MAX_DATEADDED_FOR_NEWX_PRODUCT_L']= 'Nombre de jourspour être un nouveaux produits';
/// 26 products option
$lg['PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK_S']= 'Avertir lors d\une rupture de stock lors d\'un ajout au panier.';
Modified: branches/2.1.0/catalog/install/oscss_config.sql
===================================================================
--- branches/2.1.0/catalog/install/oscss_config.sql 2011-05-11 16:12:09 UTC (rev 3728)
+++ branches/2.1.0/catalog/install/oscss_config.sql 2011-05-11 20:39:14 UTC (rev 3729)
@@ -457,7 +457,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 ('TEXT_LINK_CONTR_S', 'TEXT_LINK_CONTR', 'http://www.oscommerce.com/community/contributions,', 'TEXT_LINK_CONTR_L', '24', '14', NOW(), NOW(), NULL, NULL, '1');
## 25 new 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) values ('MAX_DATEADDED_FOR_NEWX_PRODUCT_S', 'MAX_DATEADDED_FOR_NEWX_PRODUCT', '2', 'MAX_DATEADDED_FOR_NEWX_PRODUCT_L', '25', '0', NULL, '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 ('MAX_DATEADDED_FOR_NEWX_PRODUCT_S', 'MAX_DATEADDED_FOR_NEWX_PRODUCT', '35', 'MAX_DATEADDED_FOR_NEWX_PRODUCT_L', '25', '0', NULL, '1000-01-01 00:00:00', NULL, NULL);
## 26 products option
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-11 16:12:15
|
Revision: 3728
http://oscss.svn.sourceforge.net/oscss/?rev=3728&view=rev
Author: oscim
Date: 2011-05-11 16:12:09 +0000 (Wed, 11 May 2011)
Log Message:
-----------
suite correction et dev de l'ext inventaire, prise en charge correct des stock de produit avec attributs
Modified Paths:
--------------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab 2011-05-11 16:11:23 UTC (rev 3727)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab 2011-05-11 16:12:09 UTC (rev 3728)
@@ -43,9 +43,9 @@
<thead>
<tr>
<th>pID</th>
- <th>Image</th>
+ <th>Nom</th>
<th>Modele</th>
- <th>Nom</th>
+ <th>Options</th>
<th>Valeur Achat Ht</th>
<th>Qt</th>
<!-- <th>Qt</th> -->
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-11 16:11:23 UTC (rev 3727)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-11 16:12:09 UTC (rev 3728)
@@ -33,7 +33,7 @@
inventaires_products_id int(11) NOT NULL auto_increment,
products_id int(11) NOT NULL default '0',
attributes varchar(124) NOT NULL,
- value_ht float(6,4) NOT NULL,
+ value_ht float(15,4) NOT NULL,
qty_site int(5) NOT NULL default '0',
qty_calcul int(5) NOT NULL default '0',
qty_reel int(5) NOT NULL default '0',
@@ -136,9 +136,9 @@
self::$InitInfo['theader']['edit']=array(
/*0 =>false,*/
'products_id' =>true,
- 'products_image' =>false,
- 'products_model'=>true,
'products_name' =>true,
+ 'products_model'=>true,
+ 'products_option' =>false,
'value_ht' =>true,
'qty_site'=>true,
);
@@ -162,9 +162,9 @@
self::$InitInfo['modele']['edit']=array(
/*0 =>false,*/
'products_id' =>true,
- 'products_image' =>false,
- 'products_model'=>true,
'products_name' =>true,
+ 'products_model'=>true,
+ 'products_option' =>false,
'value_ht' =>true,
'qty_site'=>true,
);
@@ -210,6 +210,7 @@
global $messageStack,$languages_id;
parent::$action=$actions;
$inventaire_id = ( isset($_GET['iID'])? (int)$_GET['iID'] : '' );
+ $DB=Database::getInstance();
switch (parent::$action) {
@@ -217,16 +218,37 @@
/**
@remarks updated shop by content inventaire and change status inventaire
*/
- $DB=Database::getInstance();
+
$inventaire = new InventaireSql($inventaire_id);
$inventaire_product = new InventaireProductSql();
$res=$inventaire_product->list_inventaires_products($inventaire_id);
foreach($res as $item){
- $sql_array['products_quantity']=$item['qty_site'];
- tep_db_perform(TABLE_PRODUCTS, $sql_array, 'update', " products_id='".$item['products_id']."' ");
+ $sql_array=array();
+ /// adjust stock in attribute products
+ if(!empty($item['attributes'])) {
+ $sql_array['products_stock_quantity']=$item['qty_site'];
+ tep_db_perform(TABLE_PRODUCTS_STOCK, $sql_array, 'update', " products_id='".$item['products_id']."' AND products_stock_attributes ='".$item['attributes']."' ");
+ }
+
+ /// normal stock, in table products
+ else {
+ $sql_array['products_quantity']=$item['qty_site'];
+ tep_db_perform(TABLE_PRODUCTS, $sql_array, 'update', " products_id='".$item['products_id']."' ");
+ }
+
}
+
+ /// up stock global product for products use attribute
+ $q=$DB->query("select products_id, SUM(products_stock_quantity) as qty_site from " . TABLE_PRODUCTS_STOCK . " GROUP BY products_id");
+ $result=$q->fetchAllAssoc();
+ foreach($result as $up){
+ $sql_array['products_quantity']=$up['qty_site'];
+ tep_db_perform(TABLE_PRODUCTS, $sql_array, 'update', " products_id='".$up['products_id']."' ");
+ }
+
+ /// up status inventaire
$sql_data_array['date_modified'] = 'now()';
$sql_data_array['status'] = '2'; // clos
$inventaire->update($sql_data_array);
@@ -294,62 +316,20 @@
$new_inventaire_id = $inventaire->update($sql_data_array);
-
-// $products_query = "select distinct p.products_id, p.products_image, pv.typeID , p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status from " . TABLE_PRODUCTS . " p LEFT JOIN ".TABLE_PRODUCTS_VIRTUAL." pv on(p.products_id = pv.productsID) LEFT JOIN ".TABLE_STATUS." s on(pv.typeID = s.status_id and s.status_type='products_virtual_types' and s.language_id='" . (int)$languages_id . "') , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id order by pd.products_name ASC";
- $products_query = "SELECT inventaires_products_id, products_id, attributes,value_ht, qty_site, qty_calcul, qty_reel, qty_defectueux, qty_di
+ $products_query = "SELECT inventaires_products_id, products_id, attributes,value_ht, qty_site, qty_calcul, qty_reel, qty_defectueux, qty_di
FROM
".TABLE_INVENTAIRES_PRODUCTS."
WHERE
inventaires_id = '".(int)$inventaire_id."' ";
$qrey=tep_db_query($products_query);
$res=$qrey->fetchAllAssoc() ;
- foreach ($res as $products )
- {
-// var_dump($products);
-// list($level,$cat_id) = explode("|",$v);
-// $module_query_raw = $product->list_products('cat_unique', $cat_id, 'query');
-// $module_query = tep_db_query($module_query_raw);
+ foreach ($res as $products ){
+ $sql_array['value_ht'] = (float)tep_db_prepare_input($_POST['value_ht'][$products['inventaires_products_id']]);
+ $sql_array['qty_site'] = (float)tep_db_prepare_input($_POST['qty_site'][$products['inventaires_products_id']]);
-// if (tep_get_num_rows($module_query) > 0)
-// {
-// while ($products = tep_db_fetch_array($module_query))
-// {
-// if (/* ( $products['products_pack'] == '' ) && */( $products['products_status'] > 0 ) )
-// {
-// $products_attribut = new ProductsAttribut();
-//
-// $sql_array = array('inventaires_id' => $inventaire_id,
-// 'products_id' => (isset($_POST['']) $products['products_id']);
-// $sql_array['value_ht'] = (float)tep_db_prepare_input($products['cost']);
-// if ( $products_attribut->has_attributes($products['products_id']) > 0 )
-// {
-// $products_attribut_list = $products_attribut->list_attributs($products['products_id'], 'array');
-// if ( count($products_attribut_list) > 0 )
-// {
-//
-// foreach ( $products_attribut_list as $products_attributs)
-// {
-// $sql_array['qty_site'] = $products_attributs['qty'];
-// $sql_array['attributes'] = $products_attributs['attributes'];
-// $inventaire_product->add($sql_array);
-// }
-// }
-// }
-// else
-// {
- $sql_array['value_ht'] = (float)tep_db_prepare_input($_POST['value_ht'][$products['inventaires_products_id']]);
- $sql_array['qty_site'] = (float)tep_db_prepare_input($_POST['qty_site'][$products['inventaires_products_id']]);
- $sql_array['attributes'] = '';
-// var_dump($sql_array);
- $inventaire_product->update($sql_array,$products['inventaires_products_id']);
-// }
-// }
+ $inventaire_product->update($sql_array,$products['inventaires_products_id']);
-
-
-// }
-// }
}
tep_redirect(tep_href_link(self::FILENAME, 'action=edit&iID='.$inventaire_id));
@@ -369,53 +349,51 @@
$new_inventaire_id = $inventaire->add($sql_data_array);
- $products_query = "select distinct p.products_id, p.products_price, p.products_image, IF( pv.typeID, pv.typeID, 0) as typeID , p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status from " . TABLE_PRODUCTS . " p LEFT JOIN ".TABLE_PRODUCTS_VIRTUAL." pv on(p.products_id = pv.productsID) LEFT JOIN ".TABLE_STATUS." s on(pv.typeID = s.status_id and s.status_type='products_virtual_types' and s.language_id='" . (int)$languages_id . "') , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where (pv.typeID IS NULL OR pv.typeID NOT IN(".TYPE_VIRTUAL_PRODUCTS.")) AND p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id order by pd.products_name ASC";
+ $products_query = "SELECT DISTINCT p.products_id, p.products_price, p.products_image, IF( pv.typeID, pv.typeID, 0) as typeID , p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status
+ FROM " . TABLE_PRODUCTS . " p
+ LEFT JOIN ".TABLE_PRODUCTS_VIRTUAL." pv on(p.products_id = pv.productsID)
+ LEFT JOIN ".TABLE_STATUS." s on(pv.typeID = s.status_id and s.status_type='products_virtual_types' and s.language_id='" . (int)$languages_id . "')
+ , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
+ WHERE (pv.typeID IS NULL OR pv.typeID NOT IN(".TYPE_VIRTUAL_PRODUCTS.") ) AND p.products_id = pd.products_id AND pd.language_id = '" . (int)$languages_id . "' AND p.products_id = p2c.products_id AND p. track_stock > 0
+ ORDER BY pd.products_name ASC";
$qrey=tep_db_query($products_query);
$res=$qrey->fetchAllAssoc();
- foreach ($res as $products )
- {
-// var_dump($products);
-// list($level,$cat_id) = explode("|",$v);
-// $module_query_raw = $product->list_products('cat_unique', $cat_id, 'query');
-// $module_query = tep_db_query($module_query_raw);
+ foreach ($res as $products ){
+ if (( $products['products_status'] > 0 ) ){
+ $sql_array = array('inventaires_id' => $new_inventaire_id,
+ 'products_id' => $products['products_id']);
+ /// Ajout de la base du produit!
+ $sql_array['value_ht'] = $products['products_price'];
+ $sql_array['qty_site'] = $products['products_quantity'];
+ $sql_array['attributes'] = '';
+ $inventaire_product->add($sql_array);
-// if (tep_get_num_rows($module_query) > 0)
-// {
-// while ($products = tep_db_fetch_array($module_query))
-// {
- if (/* ( $products['products_pack'] == '' ) && */( $products['products_status'] > 0 ) )
- {
-// $products_attribut = new ProductsAttribut();
-//
- $sql_array = array('inventaires_id' => $new_inventaire_id,
- 'products_id' => $products['products_id']);
-// $sql_array['value_ht'] = (float)tep_db_prepare_input($products['cost']);
-// if ( $products_attribut->has_attributes($products['products_id']) > 0 )
-// {
-// $products_attribut_list = $products_attribut->list_attributs($products['products_id'], 'array');
-// if ( count($products_attribut_list) > 0 )
-// {
-//
-// foreach ( $products_attribut_list as $products_attributs)
-// {
-// $sql_array['qty_site'] = $products_attributs['qty'];
-// $sql_array['attributes'] = $products_attributs['attributes'];
-// $inventaire_product->add($sql_array);
-// }
-// }
-// }
-// else
-// {
- $sql_array['value_ht'] = $products['products_price'];
- $sql_array['qty_site'] = $products['products_quantity'];
- $sql_array['attributes'] = '';
- $inventaire_product->add($sql_array);
-// }
- }
+ /// si option , ajout des options
+ if ( productUtility::get_product_attribut_info($products['products_id']) > 0 ){
+ /// uniquement les option deja en stock
+ $q=$DB->query("select * from " . TABLE_PRODUCTS_STOCK . " where products_id=" . $products['products_id'] . " order by products_stock_attributes");
+ $products_attribut_list= $q->fetchAllAssoc();
+ foreach ( $products_attribut_list as $products_attributs){
+
+
+ $r=explode(',',$products_attributs['products_stock_attributes']);
+ foreach($r as $i)
+ $attr[substr($i, 0,strpos($i,'-'))]=substr($i, strpos($i,'-')+1);
+
+
+ $sql_array['value_ht'] = productUtility::get_product_attribut_price($products['products_id'],$attr ,$products['products_price']);
+ $sql_array['qty_site'] = $products_attributs['products_stock_quantity'];
+ $sql_array['attributes'] = $products_attributs['products_stock_attributes'];
+ $inventaire_product->add($sql_array);
+ }
+ }
+ }
}
+
+// exit;
tep_redirect(tep_href_link(self::FILENAME, 'action=edit&iID='.$new_inventaire_id));
break;
}
@@ -582,9 +560,17 @@
$ord=$item;
$ord[0]=$item['id'];
$ord['inventaires_products_id']=$item['id'];
- $ord['products_image']==(!empty($item['products_image']))
- ? tep_info_image($item['products_image'], $item['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT)
- : tep_info_image(IMAGE_NONEXISTENT, $item['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) ;
+// $ord['products_image']=(!empty($item['products_image']))
+// ? tep_info_image($item['products_image'], $item['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT)
+// : tep_info_image(IMAGE_NONEXISTENT, $item['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) ;
+
+ $r=explode(',',$item['attributes']);
+ $ord['products_option']='';
+ foreach($r as $i) {
+ $s=explode('-',$i); // print_r($s);
+ $ord['products_option'] .= productUtility::options_name(@$s[0]).' ';
+ $ord['products_option'] .= productUtility::values_name(@$s[1]). "\n";
+ }
$ord['value_ht']=tep_draw_input_field('value_ht['.$item['id'].']','value_ht_'.$item['id'],$item['value_ht']);
$ord['qty_site']=tep_draw_input_field('qty_site['.$item['id'].']','qty_site_'.$item['id'],$item['qty_site']);
$res[]=$ord;
@@ -618,7 +604,7 @@
CsrtAction::getFormat('row_action'),
(
((int)$item['status']==1)
- ? sprintf(CsrtAction::getLink('row_action_right', __('txt updated stock by inventaire') , 'inventaire_update'), 'fancyView', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=appli') ,'' )
+ ? sprintf(CsrtAction::getLink('row_action_right', __('txt updated stock by inventaire') , 'inventaire_update'), '', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=appli') ,'' )
:''
).
sprintf(CsrtAction::getLink('row_action_right', __('txt export inventaire') , 'inventaire_export'), 'fancy', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=export') ,'' )
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml 2011-05-11 16:11:23 UTC (rev 3727)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml 2011-05-11 16:12:09 UTC (rev 3728)
@@ -62,7 +62,7 @@
inventaires_products_id int(11) NOT NULL auto_increment,
products_id int(11) NOT NULL default '0',
attributes varchar(124) NOT NULL,
- value_ht float(6,4) NOT NULL,
+ value_ht float(15,4) NOT NULL,
qty_site int(5) NOT NULL default '0',
qty_calcul int(5) NOT NULL default '0',
qty_reel int(5) NOT NULL default '0',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-11 16:11:30
|
Revision: 3727
http://oscss.svn.sourceforge.net/oscss/?rev=3727&view=rev
Author: oscim
Date: 2011-05-11 16:11:23 +0000 (Wed, 11 May 2011)
Log Message:
-----------
correction coquille
ajout methode ds productUtility pour manipuler les attributs
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/classes/productUtility.php
branches/2.1.0/catalog/admin/includes/functions/general.php
branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
branches/2.1.0/catalog/install/oscss_config.sql
Modified: branches/2.1.0/catalog/admin/includes/classes/productUtility.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/classes/productUtility.php 2011-05-11 06:56:58 UTC (rev 3726)
+++ branches/2.1.0/catalog/admin/includes/classes/productUtility.php 2011-05-11 16:11:23 UTC (rev 3727)
@@ -1,9 +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
- @package oscss-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 22/08/10, 09:26
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 11/05/11, 18:03
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class productUtility
@@ -114,8 +115,28 @@
return $values_values['products_options_values_name'];
}
+ /**
+ @brief Recuperation price pour attribute
+ */
+ public static function get_product_attribut_price($products_id, $attributes=array(), $price=0){
+ $uprid=tep_get_uprid($products_id, $attributes);
+ if (is_array($attributes) && count($attributes)>0) {
+ reset($attributes);
+ while (list($option, $value) = each($attributes)) {
+ $attribute_price_query = tep_db_query("select options_values_price, price_prefix from " . TABLE_PRODUCTS_ATTRIBUTES . " where products_id = '" . (int)$products_id . "' and options_id = '" . (int)$option . "' and options_values_id = '" . (int)$value . "'");
+ $attribute_price = tep_db_fetch_array($attribute_price_query);
+ if ($attribute_price['price_prefix'] == '+') {
+ $price += $attribute_price['options_values_price'];
+ } else {
+ $price -= $attribute_price['options_values_price'];
+ }
+ }
+ }
+ return $price;
+ }
+
/**
Generation des value de product extra value
Si langue , table TABLE_PRODUCTS_DESCRIPTION sinon table TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS
@@ -186,11 +207,60 @@
}
+ /**
+ * \fn get_product_attribut_info($pID)
+ * \brief Retourn tableau asso des element de pId precisé ou false
+ * @param $pID int l'id du produits
+ * @return array/false
+ */
+ public static function get_product_attribut_info($pID){
+ global $languages_id;
+ $language_id=$languages_id;
+ $products_attributes_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_ATTRIBUTES . " patrib where patrib.products_id='" . (int)$pID . "' and patrib.options_id = popt.products_options_id and popt.language_id = '" . (int) $language_id. "'");
+ $products_attributes = tep_db_fetch_array($products_attributes_query);
+ $products_attributes= ($products_attributes['total'] > 0)? $products_attributes['total'] : 0 ;
+ return $products_attributes;
+ }
/**
+ * \brief Calcul des stock avec attribut , pour un jeu d'attribut
+ * @param [in] $products_id int
+ * @param [in] $attributes tableau attribute id array
+ * @return int quantity
+ */
+ public static function get_products_attribute_stock($products_id, $attributes=array()){
+ global $languages_id;
+
+
+
+ $DB=Database::getInstance();
+ if (is_array($attributes) && count($attributes)>0) {
+ $attr_list='';
+ $options_list=implode(",",array_keys($attributes));
+ $sql="select products_options_id, products_options_track_stock from " . TABLE_PRODUCTS_OPTIONS . " where products_options_id in ($options_list) and language_id= '" . (int)$languages_id . "' order by products_options_id";
+ $track_stock_query=$DB->query($sql);
+ while($track_stock_array=$track_stock_query->fetchAssoc())
+ if ($track_stock_array['products_options_track_stock'])
+ $attr_list.=$track_stock_array['products_options_id'] . '-' . $attributes[$track_stock_array['products_options_id']] . ',';
+
+ $attr_list=substr($attr_list,0,strlen($attr_list)-1);
+ unset($track_stock_query);
+
+
+ $stock_query=$DB->query($sql="select products_stock_quantity as quantity from " . TABLE_PRODUCTS_STOCK . " where products_id='". (int)$products_id . "' and products_stock_attributes='$attr_list'");
+ $stock=$stock_query->fetchAssoc();
+ unset($attr_list);
+
+
+ return $stock['quantity'];
+ }
+ return 0;
+ }
+
+ /**
Sets the status of a product
@package oscss
@author OscssTeam
Modified: branches/2.1.0/catalog/admin/includes/functions/general.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/functions/general.php 2011-05-11 06:56:58 UTC (rev 3726)
+++ branches/2.1.0/catalog/admin/includes/functions/general.php 2011-05-11 16:11:23 UTC (rev 3727)
@@ -796,7 +796,7 @@
function tep_get_generated_category_path_ids($id, $from = 'category') { return categorieUtility::get_generated_category_path_ids($id, $from); }
function tep_get_category_tree($parent_id = '0', $spacing = '', $exclude = '', $category_tree_array = '', $include_itself = false) { return categorieUtility::get_category_tree($parent_id, $spacing, $exclude, $category_tree_array, $include_itself); }
function tep_parse_category_path($cPath) { return categorieUtility::parse_category_path($cPath); }
-function tep_get_category_name($category_id, $language_id) { return categorieUtility::get_category_name($category_id, $language_id); }
+function tep_get_category_name($category_id, $language_id='') { return categorieUtility::get_category_name($category_id, $language_id); }
function tep_generate_category_path($id, $from = 'category', $categories_array = '', $index = 0) { return categorieUtility::generate_category_path($id, $from, $categories_array, $index); }
function tep_get_products_special_price($product_id) { return productUtility::get_products_special_price($product_id); }
Modified: branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
===================================================================
--- branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-05-11 06:56:58 UTC (rev 3726)
+++ branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-05-11 16:11:23 UTC (rev 3727)
@@ -21,7 +21,7 @@
/// 0 template
$lg['TEMPLATE_NAME_S']= 'Nom du template par défaut';
$lg['TEMPLATE_NAME_L']= 'Nom du template par défaut.';
-$lg['TYPE_VIRTUAL_PRODUCTS_S']= 'type produit virutel';
+$lg['TYPE_VIRTUAL_PRODUCTS_S']= 'type produit virtuel';
$lg['TYPE_VIRTUAL_PRODUCTS_L']= 'préciser les statut de produit qui sont virtuel en opposition au produit physique';
$lg['CFG_CLASS_VIRTUAL_TYPE_L']= 'les class non autorisées pour ce type de produits';
$lg['CFG_CLASS_VIRTUAL_TYPE_1_S']= 'configuration type products 1';
Modified: branches/2.1.0/catalog/install/oscss_config.sql
===================================================================
--- branches/2.1.0/catalog/install/oscss_config.sql 2011-05-11 06:56:58 UTC (rev 3726)
+++ branches/2.1.0/catalog/install/oscss_config.sql 2011-05-11 16:11:23 UTC (rev 3727)
@@ -186,7 +186,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 ('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);
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);
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);
-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);
+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', '4', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), 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 ('ORPHELIN_COLLECTOR_S', 'ORPHELIN_COLLECTOR', '1', 'ORPHELIN_COLLECTOR_L', '0', '0', NOW(), NOW(),NULL, NULL, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-11 06:57:05
|
Revision: 3726
http://oscss.svn.sourceforge.net/oscss/?rev=3726&view=rev
Author: oscim
Date: 2011-05-11 06:56:58 +0000 (Wed, 11 May 2011)
Log Message:
-----------
Suite developpement et mise en oeuvre
Modified Paths:
--------------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/languages/fr_FR/modules/pages/Inventaire.txt
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml
Added Paths:
-----------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.delete.gab
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab
Removed Paths:
-------------
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.delete.gab
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.edit.gab
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.export.gab
branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.listing.gab
Added: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.delete.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.delete.gab (rev 0)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.delete.gab 2011-05-11 06:56:58 UTC (rev 3726)
@@ -0,0 +1,23 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package Inventaire For osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/04/11, 18:04
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<h3><?php echo __('text info heading delete Inventaire') ?></h3>
+
+<?php echo tep_draw_form('delete', Inventaire::FILENAME, 'iID=' . Inventaire::$iID . '&action=deleteconfirm', 'post'); ?>
+
+ <p><?php echo __('text info delete intro') ?></p>
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(Inventaire::FILENAME, 'iID=' . Inventaire::$iID), IMAGE_CANCEL) ?>
+ </div>
+
+</form>
\ No newline at end of file
Added: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab (rev 0)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.edit.gab 2011-05-11 06:56:58 UTC (rev 3726)
@@ -0,0 +1,67 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package Inventaire For osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/04/11, 18:04
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+ <?php echo tep_draw_form('edit', Inventaire::FILENAME, 'iID='.@$_GET['iID'].'&action=update', 'post') ?>
+<div class="boc_uniq block_form">
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('tab inventaire base'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('tab inventaire produits'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+ <div class="box_left">
+ <fieldset class="block_field">
+ <legend><?php echo __('Le nom de votre inventaire');?></legend>
+ <p class="block_input">
+ <?php echo tep_draw_input_field('name','',Inventaire::$iInfo->name) ?>
+ </p>
+ </fieldset>
+ </div>
+ <div class="box_right">
+ <ul>
+ <li><span class="label text"><?php echo __('flash shop le') ?></span> <span class="input text"><?php echo tep_date_short(Inventaire::$iInfo->date_added) ?></span></li>
+ <li><span class="label text"><?php echo __('flash shop modifed') ?></span> <span class="input text"><?php echo tep_date_short(Inventaire::$iInfo->date_modified) ?></span></li>
+ </ul>
+
+ </div>
+ <br style="clear:both" />
+ </div>
+ <div id="tabs-2" class="tabPage">
+ <legend><?php echo __('Le detail des produits de l inventaire');?></legend>
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th>pID</th>
+ <th>Image</th>
+ <th>Modele</th>
+ <th>Nom</th>
+ <th>Valeur Achat Ht</th>
+ <th>Qt</th>
+<!-- <th>Qt</th> -->
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ <br style="clear:both" />
+ </div>
+
+ </div>
+
+ <div class="button_nav block_input">
+ <?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(Inventaire::FILENAME, tep_get_all_get_params(array('action','iID'))), IMAGE_CANCEL) ; ?>
+ </div>
+
+ </form>
+</div>
\ No newline at end of file
Added: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab (rev 0)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire/display_view.export.gab 2011-05-11 06:56:58 UTC (rev 3726)
@@ -0,0 +1,38 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package Inventaire For osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 20/04/11, 18:04
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('text info multi heading upload order'); ?></h3>
+<div class="box_uniq">
+<?php echo tep_draw_form('Inventaire', Inventaire::FILENAME, tep_get_all_get_params(array( 'action','forceajax','forceview')) .'action=exportconfirm'); ?>
+
+ <p class="block_input">
+ <label> <?php echo __('utilise le module') ?></label>
+ <?php echo tep_draw_pull_down_menu('export_type', Inventaire::$export->list_export_template() , @$_GET['export_type'], ' ') ; ?>
+ </p>
+ <p class="block_input">
+ <label> <?php echo __('utilise encodage') ?></label>
+ <?php echo tep_draw_pull_down_menu('encodage', Inventaire::$export->encode, @$_GET['encodage'], ' ') ; ?>
+ </p>
+ <p class="block_input">
+ <label> <?php echo __('utilise type') ?></label>
+ <?php echo tep_draw_pull_down_menu('modeexport', Inventaire::$export->mode , @$_GET['encodage'], ' ') ; ?>
+ </p>
+
+ <p class="block_input">
+ <?php echo __('text info multi action export detail') ; ?>
+ </p>
+
+
+ <div class="button_nav block_input">
+ <?php echo tep_image_submit('button_delete.gif', __('image modify multi')) . tep_js_back(tep_href_link(Inventaire::FILENAME), IMAGE_CANCEL); ?>
+ </div>
+</form>
+</div>
Deleted: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.delete.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.delete.gab 2011-05-10 21:06:13 UTC (rev 3725)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.delete.gab 2011-05-11 06:56:58 UTC (rev 3726)
@@ -1,22 +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 01/09/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-?>
-<h3><?php echo __('text info heading delete Inventaire') ?></h3>
-
-<?php echo tep_draw_form('delete', Inventaire::FILENAME, 'iID=' . Inventaire::$iID . '&action=deleteconfirm', 'post'); ?>
-
- <p><?php echo __('text info delete intro') ?></p>
-
- <div class="button_nav">
- <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(Inventaire::FILENAME, 'iID=' . Inventaire::$iID), IMAGE_CANCEL) ?>
- </div>
-
-</form>
\ No newline at end of file
Deleted: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.edit.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.edit.gab 2011-05-10 21:06:13 UTC (rev 3725)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.edit.gab 2011-05-11 06:56:58 UTC (rev 3726)
@@ -1,67 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 23/04/11, 11:34
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title'); ?></h3>
- <?php echo tep_draw_form('edit', Inventaire::FILENAME, 'iID='.@$_GET['iID'].'&action=update', 'post') ?>
-<div class="boc_uniq block_form">
- <div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('tab inventaire base'); ?></a></li>
- <li><a href="#tabs-2"><?php echo __('tab inventaire produits'); ?></a></li>
- </ul>
-
- <div id="tabs-1" class="tabPage">
- <div class="box_left">
- <fieldset class="block_field">
- <legend><?php echo __('Le nom de votre inventaire');?></legend>
- <p class="block_input">
- <?php echo tep_draw_input_field('name','',Inventaire::$iInfo->name) ?>
- </p>
- </fieldset>
- </div>
- <div class="box_right">
- <ul>
- <li><span class="label text"><?php echo __('flash shop le') ?></span> <span class="input text"><?php echo tep_date_short(Inventaire::$iInfo->date_added) ?></span></li>
- <li><span class="label text"><?php echo __('flash shop modifed') ?></span> <span class="input text"><?php echo tep_date_short(Inventaire::$iInfo->date_modified) ?></span></li>
- </ul>
-
- </div>
- <br style="clear:both" />
- </div>
- <div id="tabs-2" class="tabPage">
- <legend><?php echo __('Le detail des produits de l inventaire');?></legend>
-
- <table class="dataTable">
- <thead>
- <tr>
- <th>pID</th>
- <th>Image</th>
- <th>Modele</th>
- <th>Nom</th>
- <th>Valeur Achat Ht</th>
- <th>Qt</th>
-<!-- <th>Qt</th> -->
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- <br style="clear:both" />
- </div>
-
- </div>
-
- <div class="button_nav block_input">
- <?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(Inventaire::FILENAME, tep_get_all_get_params(array('action','iID'))), IMAGE_CANCEL) ; ?>
- </div>
-
- </form>
-</div>
\ No newline at end of file
Deleted: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.export.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.export.gab 2011-05-10 21:06:13 UTC (rev 3725)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.export.gab 2011-05-11 06:56:58 UTC (rev 3726)
@@ -1,38 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 23/04/11, 11:33
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('text info multi heading upload order'); ?></h3>
-<div class="box_uniq">
-<?php echo tep_draw_form('Inventaire', Inventaire::FILENAME, tep_get_all_get_params(array( 'action','forceajax','forceview')) .'action=exportconfirm'); ?>
-
- <p class="block_input">
- <label> <?php echo __('utilise le module') ?></label>
- <?php echo tep_draw_pull_down_menu('export_type', Inventaire::$export->list_export_template() , @$_GET['export_type'], ' ') ; ?>
- </p>
- <p class="block_input">
- <label> <?php echo __('utilise encodage') ?></label>
- <?php echo tep_draw_pull_down_menu('encodage', Inventaire::$export->encode, @$_GET['encodage'], ' ') ; ?>
- </p>
- <p class="block_input">
- <label> <?php echo __('utilise type') ?></label>
- <?php echo tep_draw_pull_down_menu('modeexport', Inventaire::$export->mode , @$_GET['encodage'], ' ') ; ?>
- </p>
-
- <p class="block_input">
- <?php echo __('text info multi action export detail') ; ?>
- </p>
-
-
- <div class="button_nav block_input">
- <?php echo tep_image_submit('button_delete.gif', __('image modify multi')) . tep_js_back(tep_href_link(Inventaire::FILENAME), IMAGE_CANCEL); ?>
- </div>
-</form>
-</div>
Deleted: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.listing.gab
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.listing.gab 2011-05-10 21:06:13 UTC (rev 3725)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/gabarit/Inventaire.listing.gab 2011-05-11 06:56:58 UTC (rev 3726)
@@ -1,42 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 11/04/11, 10:34
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title'); ?></h3>
-
- <div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('image inventaire add') ), '', tep_href_link(Inventaire::FILENAME, 'action=new') ,'' ); ?>
- </div>
-
-<div class="box_uniq ">
- <?php echo tep_draw_form('multi', Inventaire::FILENAME, 'action=multi', 'post') ?>
- <table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('table heading inventaire id'); ?></th>
- <th><?php echo __('table heading inventaire id'); ?></th>
- <th><?php echo __('table heading inventaire name'); ?></th>
- <th class="tcenter"><?php echo __('table heading inventaire date'); ?></th>
- <th class="tcenter"><?php echo __('table heading inventaire status'); ?></th>
- <th class="row_action"><?php echo __('table heading inventaire action'); ?></th>
- </tr>
- </thead>
- <tfoot>
-
- <tr>
- <td colspan="2"> </td>
- <td colspan="4"><?php printf(CsrtAction::getButton('button_action', IMAGE_DELETE, 'delete'), '', ' name="delete" ' ); ?></td>
- </tr>
- </tfoot>
- <tbody>
- </tbody>
- </table>
- </form>
-</div>
\ No newline at end of file
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/languages/fr_FR/modules/pages/Inventaire.txt
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/languages/fr_FR/modules/pages/Inventaire.txt 2011-05-10 21:06:13 UTC (rev 3725)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/languages/fr_FR/modules/pages/Inventaire.txt 2011-05-11 06:56:58 UTC (rev 3726)
@@ -8,85 +8,109 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-$lang['heading title']='Inventaires';
-$lang['heading title edit']="Ajout modification d'action programmées";
-/* bouton */
-$lang['image inventaire add']='Ajouter un Inventaire';
+/* export */
+ $lang['text info multi heading upload order']='Exporter l\'inventaire couant';
+ $lang['text info multi action export detail']='Ces options vous permetent d\'ajuster l\'export en fonction de vos outils';
+ $lang['utilise le module']='Utiliser le module';
+ $lang['utilise encodage']='Utiliser l\'encodage';
+ $lang['utilise type']='Utiliser ce type ';
+
+
+/**
+ @remarks Use Master gabarit
+*/
+
+/* delete Use Master gabarit */
+ $lang['heading title delete Inventaire']='Confirmez la suppression';
+ $lang['text info delete Inventaire']='Vous êtes sur de vouloir supprimer cet invenatire. cette action est irremédiable. <br /> Seul le contenu de l\'inventaire sera supprimé. Si vous l\'avez déjà appliqué, aucune modification ne sera effectué sur la boutique';
+
/* listing */
-$lang['table heading inventaire id']='ID';
-$lang['table heading inventaire name']='Nom';
-$lang['table heading inventaire date']='date';
-$lang['table heading inventaire status']='Status';
-$lang['table heading inventaire action']='action';
+ $lang['heading title Inventaire']='Inventaires';
+ $lang['table heading inventaire id']='ID';
+ $lang['table heading inventaire name']='Nom';
+ $lang['table heading inventaire date']='date';
+ $lang['table heading inventaire status']='Status';
+ $lang['table heading inventaire action']='action';
-$lang['txt updated stock by inventaire']='Appliqué';
-$lang['txt export inventaire']='Exporter';
+ $lang['txt updated stock by inventaire']='Appliqué';
+ $lang['txt export inventaire']='Exporter';
+ $lang['txt detail usage']="Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
+ Pour fonctionner , vous devez definir une tache cron avec un répetion de 5 min<br />
+ <pre>wget -q ".tep_get_http().DIR_WS_ADMIN."cronfile.php </pre><br />
+ Vous pouvez aussi utiliser un webcron , et pointez sur cette addresse <br /><br />
+ <pre>".tep_get_http().DIR_WS_ADMIN."cronfile.php</pre>";
+ /* bouton */
+ $lang['image inventaire add']='Ajouter un Inventaire';
+
+
+/**
+ @remarks Use specific gabarit
+*/
+
+
+
/* Edit */
-$lang['tab inventaire base']='Caractèristiques';
-$lang['tab inventaire produits']='Produits';
-$lang['tab inventaire export']='Produits';
+ $lang['heading title edit']="Ajout modification d'action programmées";
+ $lang['tab inventaire base']='Caractèristiques';
+ $lang['tab inventaire produits']='Produits';
+ $lang['tab inventaire export']='Produits';
-$lang['table heading inventaire id']='ID';
-$lang['table heading inventaire name']='Nom';
-$lang['table heading inventaire date']='date';
-$lang['table heading inventaire status']='Status';
-$lang['table heading inventaire action']='action';
+ $lang['table heading inventaire id']='ID';
+ $lang['table heading inventaire name']='Nom';
+ $lang['table heading inventaire date']='date';
+ $lang['table heading inventaire status']='Status';
+ $lang['table heading inventaire action']='action';
-$lang['flash shop le']='Etat boutique flashé le';
-$lang['flash shop modifed']='Inventaire ajusté le ';
+ $lang['flash shop le']='Etat boutique flashé le';
+ $lang['flash shop modifed']='Inventaire ajusté le ';
-/* export */
-$lang['text info multi heading upload order']='Exporter l\'inventaire couant';
-$lang['text info multi action export detail']='Ces options vous permetent d\'ajuster l\'export en fonction de vos outils';
-$lang['utilise le module']='Utiliser le module';
-$lang['utilise encodage']='Utiliser l\'encodage';
-$lang['utilise type']='Utiliser ce type ';
-/* delete */
-$lang['text info heading delete Inventaire']='Suppresion d\'un inventaire';
-$lang['text info delete intro']='Vous êtes sur de voulir supprimer cet invenatire. cette action est irremediable. <br /> Seul le contenu de l\'inventaire sera supprimé. Si vous l\'avez déjà appliqué, aucune modification ne sera effectué sur la boutique';
-/* TODO: A supprimer */
-$lang['definir la date de premiere execution']='Date de premiere execution';
-$lang["definir si l'execution est unique"]='Repetition';
-$lang['text 1 min']='Toutes les 1 min';
-$lang['text 5 min']='Toutes les 5 min';
-$lang['text 15 min']='Toutes les 15 min';
-$lang['text 30 min']='Toutes les 30 min';
-$lang['text 1 h']='Toutes les 1 heures';
-$lang['text 2 h']='Toutes les 2 heures';
-$lang['text 4 h']='Toutes les 4 heures';
-$lang['text 8 h']='Toutes les 8 heures';
-$lang['text 12 h']='Toutes les 12 heures';
-$lang['text 1 jour']='Tous les 1 jour';
-$lang['text 2 jour']='Tous les 2 jours';
-$lang['text 3 jour']='Tous les 3 jours';
-$lang['text 1 semaine']='Tous les 1 semaine';
-$lang['text 2 semaine']='Tous les 2 semaines';
-$lang['text 1 mois']='Tous les 1 mois';
+/**
+ @remarks option value
+*/
-$lang['txt detail usage']="Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
-Pour fonctionner , vous devez definir une tache cron avec un répetion de 5 min<br />
-<pre>wget -q ".tep_get_http().DIR_WS_ADMIN."cronfile.php </pre><br />
-Vous pouvez aussi utiliser un webcron , et pointez sur cette addresse <br /><br />
-<pre>".tep_get_http().DIR_WS_ADMIN."cronfile.php</pre>";
+ $lang['text 1 min']='Toutes les 1 min';
+ $lang['text 5 min']='Toutes les 5 min';
+ $lang['text 15 min']='Toutes les 15 min';
+ $lang['text 30 min']='Toutes les 30 min';
+ $lang['text 1 h']='Toutes les 1 heures';
+ $lang['text 2 h']='Toutes les 2 heures';
+ $lang['text 4 h']='Toutes les 4 heures';
+ $lang['text 8 h']='Toutes les 8 heures';
+ $lang['text 12 h']='Toutes les 12 heures';
+ $lang['text 1 jour']='Tous les 1 jour';
+ $lang['text 2 jour']='Tous les 2 jours';
+ $lang['text 3 jour']='Tous les 3 jours';
+ $lang['text 1 semaine']='Tous les 1 semaine';
+ $lang['text 2 semaine']='Tous les 2 semaines';
+ $lang['text 1 mois']='Tous les 1 mois';
-/* Module Name */
-$lang['module txt name clean_cache_dir']='Nettoyage fichiers de caches';
-$lang['module txt name customers_birthday']='Envoye de mail à la date d\'anniversaire des clients ';
-$lang['module txt name ggsitemap_refresh']='Mise à jour des sitemap pour google';
-$lang['module txt name relance_order']='Traitement commandes automatisées';
+/**
+ @remarks Module Name
+*/
+
+ $lang['module txt name clean_cache_dir']='Nettoyage fichiers de caches';
+ $lang['module txt name customers_birthday']='Envoye de mail à la date d\'anniversaire des clients ';
+ $lang['module txt name ggsitemap_refresh']='Mise à jour des sitemap pour google';
+ $lang['module txt name relance_order']='Traitement commandes automatisées';
+
+
+
+/* TODO: A supprimer */
+$lang['definir la date de premiere execution']='Date de premiere execution';
+$lang["definir si l'execution est unique"]='Repetition';
?>
\ No newline at end of file
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-10 21:06:13 UTC (rev 3725)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/catalog/admin/includes/modules/pages/Inventaire.php 2011-05-11 06:56:58 UTC (rev 3726)
@@ -55,22 +55,16 @@
define('TABLE_INVENTAIRES_PRODUCTS', DB_TABLE_PREFIX.'inventaires_products');
error_reporting(E_ALL);
-
class Inventaire
- implements ExtModPage, InterfaceModule{
+ extends ModTwo /// new abstract class for nextgen module
+ implements InterfaceModule
+ ,IntModTwo /// new interface module for nextgen module
+ ,ExtModConfig {
/**
@var Const current page
*/
Const FILENAME ='Inventaire.php';
/**
- @var current class string name
- */
- public static $code;
- /**
- @var current action by GET var
- */
- public static $action;
- /**
@var array list code action module
*/
public static $list=array();
@@ -90,33 +84,135 @@
@var export object
*/
public static $export;
+
/**
class constructor
*/
public function __construct() {
+ self::GetConf();
+ }
+
+
+ /**
+ @brief Load , adjust and define var environement exe for module
+ Is use in module and class abstract for init value config this module
+ */
+ public static function GetConf(){
+ global $languages_id;
+
self::$code=__CLASS__;
- self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : '' );
+ self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : 'listing' );
self::$iID=(isset($_REQUEST['iID'])? $_REQUEST['iID'] : '' );
+
+ /**
+ @remarks define var execution sql in GetDBValue()
+ */
+ self::$InitInfo['adjust']=array(
+ 'languages_id'=>$languages_id,
+ 'page'=>1,
+ 'rowbyp'=>10,
+ 'sOrder'=>'',
+ 'sWhere'=>'',
+ );
+
+
+
+ /**
+ @remarks not load if not first init
+ */
+ if(defined('JSONSTATMENT')) return;
+
//! active datatable in ajax, precise les GET necessaire
define('JSONSTATMENT', 'mod=page&type='.self::$code.
- (isset(self::$action)?'&action='.self::$action : '' ).
+ (isset(parent::$action)?'&action='.parent::$action : '' ).
(isset(self::$iID)?'&iID='.self::$iID : '' )
);
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit action
+ */
+ self::$InitInfo['theader']['edit']=array(
+ /*0 =>false,*/
+ 'products_id' =>true,
+ 'products_image' =>false,
+ 'products_model'=>true,
+ 'products_name' =>true,
+ 'value_ht' =>true,
+ 'qty_site'=>true,
+ );
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ self::$InitInfo['theader']['listing']=array(
+ 0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ 1 =>array('width'=>'2%','class'=>'tcenter', 'txt'=>__('table heading inventaire id')),
+ 2 =>array('class'=>'tcenter', 'txt'=>__('table heading inventaire name')),
+ 3 =>array('width'=>'5%','class'=>'tcenter', 'txt'=>__('table heading inventaire date')),
+ 4 =>array('width'=>'10%','class'=>'tcenter', 'txt'=>__('table heading inventaire status')),
+ 5 =>array('width'=>'10%','class'=>'row_action', 'txt'=>__('table heading inventaire action')),
+ );
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit action
+ */
+ self::$InitInfo['modele']['edit']=array(
+ /*0 =>false,*/
+ 'products_id' =>true,
+ 'products_image' =>false,
+ 'products_model'=>true,
+ 'products_name' =>true,
+ 'value_ht' =>true,
+ 'qty_site'=>true,
+ );
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ self::$InitInfo['modele']['listing']=array(
+ 0 =>false,
+ 'inventaires_id' =>false,
+ 'name' =>true,
+ 'date_added'=>true,
+ 'status_name'=>true,
+ 'action' =>false
+ );
+
+
+
+ /**
+ @remarks this define menu master module in page
+ */
+ if(self::$action =='' || self::$action =='listing')
+ self::$InitInfo['MenuModule'][]=array(
+ 'type'=>'getLink',
+ 'format'=>'button_nav',
+ 'image'=>'',
+ 'cssclass'=>'',
+ 'title'=>__('image inventaire add'),
+ 'url'=>tep_href_link(self::FILENAME, 'action=new'),
+ );
+
+ return true;
}
+// public function ActionUrl(){
+//
+// }
+
+ /**
+ @brief Process action module
+ */
public function check_action($actions){
global $messageStack,$languages_id;
- self::$action=$actions;
+ parent::$action=$actions;
$inventaire_id = ( isset($_GET['iID'])? (int)$_GET['iID'] : '' );
+ switch (parent::$action) {
-
-
- switch (self::$action) {
-
case 'appli':
/**
@remarks updated shop by content inventaire and change status inventaire
@@ -324,156 +420,179 @@
break;
}
- return self::$action;
+ return parent::$action;
}
- public function get_header(){
- ?>
- <script type="text/javascript"><!--
- // --></script>
- <?php
- }
+ /**
+ @fn Inventaire::GetDBValue();
+ @brief return DB value adapted for current action
+ Use self::action for determine switch
+ @return
+ */
+ public static function GetDBValue(){
- public static function load_db_values($ID){
- $Invt=new InventaireSql($ID);
- return $Invt->load();
+ $arg=func_get_arg();
+
+ $DB=Database::getInstance();
+ $res=array();
+
+ switch (self::$action) {
+ case 'export';
+ break;
+ case 'edit';
+ global $query_numrows;
+
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+ if(!isset(self::$iID)) return ;
+
+ self::$iInfo=new InventaireSql((int)self::$iID);
+
+ $query_raw = "SELECT DISTINCT inventaires_products_id as id, ip.products_id , attributes, value_ht , qty_site, products_image ,products_model, pd.products_name
+ FROM " . TABLE_INVENTAIRES_PRODUCTS . " ip
+ LEFT JOIN " . TABLE_PRODUCTS . " p on (p.products_id=ip.products_id)
+ LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd on (pd.products_id=ip.products_id AND language_id='".(int)$adjust->languages_id."' )
+ WHERE inventaires_id='".self::$iID."' ".$adjust->sWhere." order by ".((!empty($adjust->sOrder)) ? $adjust->sOrder : 'inventaires_products_id ASC');
+
+ $_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
+ $_query = $DB->query($query_raw);
+
+ $res=self::FormatDBValue($_query);
+
+ return $res;
+ break;
+
+ case 'listing';
+ /**
+ @remarks retrun object load one inventaire
+ */
+ global $query_numrows;
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+
+ $query_raw = "select distinct inventaires_id as id, i.status , status_name , name , admin_id, date_added , date_modified from " . TABLE_INVENTAIRES . " i ".
+ "LEFT JOIN " . TABLE_STATUS . " s ON( s.status_id=i.status AND status_type='inventaire' AND language_id='".(int)$adjust->languages_id."' ) ".
+ $adjust->sWhere." ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' date_added DESC ');
+
+ $_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
+ $_query = $DB->query($query_raw);
+
+ $res=self::FormatDBValue($_query);
+
+ return $res;
+ break;
+ default:
+ /**
+ @remarks retrun object load one inventaire
+ */
+ $Invt=new InventaireSql((int)self::$iID);
+ return self::$iInfo=$Invt->load();
+
+ }
}
+ /**
+ @brief Display content page module
+ */
public function display_view(){
- switch (self::$action) {
- case 'delete':
- self::$iInfo=self::load_db_values(self::$iID);
- return tep_get_include_contents(self::$code.'.delete');
- break;
+ switch (parent::$action) {
case 'export':
- self::$iInfo=self::load_db_values(self::$iID);
- return tep_get_include_contents(self::$code.'.export');
- break;
case 'edit':
- self::$iInfo=self::load_db_values(self::$iID);
- return tep_get_include_contents(self::$code.'.edit');
+ self::load_db_values(self::$iID);
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
break;
+ case 'delete':
+ self::load_db_values(self::$iID);
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,self::MASTER);
+ break;
+ case 'listing':
default:
-// self::tep_get_list();
- return tep_get_include_contents(self::$code.'.listing');
+ self::load_db_values();
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
}
}
- public static function get_item_action($item){
- return sprintf(
- CsrtAction::getFormat('row_action'),
- (($item['id']==1)
- ? sprintf(CsrtAction::getLink('row_action_right', __('txt updated stock by inventaire') , 'inventaire_update'), 'fancyView', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=appli') ,'' )
- :''
- ).
- sprintf(CsrtAction::getLink('row_action_right', __('txt export inventaire') , 'inventaire_export'), 'fancyView', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=export') ,'' )
- ,
-// sprintf(CsrtAction::getLink('row_action_right', IMAGE_COPY_TO, 'copyto'), 'fancy', tep_href_link(self::FILENAME, 'pID=' . $products['products_id'] . '&action=copy_to') ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=edit') ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=delete') ,'' )
+ /**
+ @brief load listing array, for use format retrun by JSON
+ */
+ public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
-// sprintf(CsrtAction::getLink('row_action_right', __('image view public') , 'publiclink'), '', tep_catalog_href_link('product_info.php', 'products_id=' . $products['products_id']) ,' target="blank"' )
- );
+ /// @remarks force load conf
+ self::GetConf();
+
+ $res=array();
+
+ /**
+ @remarks adjust param for sql requete
+ */
+ self::$InitInfo['adjust']['page']=$page;
+ self::$InitInfo['adjust']['rowbyp']=$rowbyp;
+ self::$InitInfo['adjust']['sOrder']=$sOrder;
+ self::$InitInfo['adjust']['sWhere']=$sWhere;
+ self::$InitInfo['adjust']['options']=$options;
+
+ $res = self::load_db_values();
+
+ return self::$list=self::CheckResult($res);
}
- public static function tep_get_modele(){
- switch (self::$action) {
- case 'edit';
- return array( /*0 =>false,*/
- 'products_id' =>true,
- 'products_image' =>false,
- 'products_model'=>true,
- 'products_name' =>true,
-// 'products_id' =>true,
-
- 'value_ht' =>true,
- 'qty_site'=>true,
- );
- break;
- default:
- return array( 0 =>false,
- 'inventaires_id' =>false,
- 'name' =>true,
- 'date_added'=>true,
- 'status_name'=>true,
- 'action' =>false
- );
+ /**
+ @brief Redefine Parent method
+ */
+ public static function DTFootTable($mutli=false){
+ /**
+ @remarks mutli action specific line
+ */
+ if($mutli) {
+ $col=count(self::DTheaderTable());
+ return array(
+ 0 => self::DTheaderTable(),
+ 1 =>array( array('colspan'=>$col, 'class'=>'tleft', 'txt'=>sprintf(CsrtAction::getButton('button_action', IMAGE_DELETE, 'delete'), '', ' name="delete" ' )) )
+ ) ;
}
+ else
+ /**
+ @remarks No tfoot specific,use equal theader
+ */
+ return array( 0 =>self::DTheaderTable());
}
- public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
-// self:: loadMod($_REQUEST['vue']);
-// var_dump(self::$Mod->tep_get_list($page,$rowbyp,$sOrder,$sWhere,$options));
-// return self::$Mod->tep_get_list($page,$rowbyp,$sOrder,$sWhere,$options);
- self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : '' );
- switch (self::$action) {
+
+ /**
+ @brief format db value for display page
+ @param $_query ressource db sql
+ @return array
+ */
+ private static function FormatDBValue($_query){
+ $DB=Database::getInstance();
+ $res=array();
+
+ switch (parent::$action) {
case 'edit';
global $query_numrows,$languages_id;
- $iID=(isset($_REQUEST['iID'])? $_REQUEST['iID'] : '' );
- $DB=Database::getInstance();
-// if(tep_not_null($sWhere)){
-// $sWhere=str_replace(array('orders_id'),array('o.orders_id'), $sWhere);
-// }
-
- $query_raw = "SELECT DISTINCT inventaires_products_id as id, ip.products_id , attributes, value_ht , qty_site, products_image ,products_model, pd.products_name
- FROM " . TABLE_INVENTAIRES_PRODUCTS . " ip
- LEFT JOIN " . TABLE_PRODUCTS . " p on (p.products_id=ip.products_id)
- LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd on (pd.products_id=ip.products_id AND language_id='".$languages_id."' )
- WHERE inventaires_id='".$iID."' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'inventaires_products_id ASC');
-// var_dump($query_raw);
- $_split = new splitPageResults($page, $rowbyp, $query_raw, $query_numrows);
- $_query = $DB->query($query_raw);
-
while ($item = $_query->fetchAssoc()) {
$ord=$item;
$ord[0]=$item['id'];
$ord['inventaires_products_id']=$item['id'];
- $ord['date_added']=tep_date_short($item['date_added']);
$ord['products_image']==(!empty($item['products_image']))
? tep_info_image($item['products_image'], $item['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT)
: tep_info_image(IMAGE_NONEXISTENT, $item['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) ;
-// $ord['null']=tep_draw_checkbox_field('action_multi['.$item['inventaires_id'].']','action_mutli_'.$item['inventaires_id'],$item['inventaires_id']);
-
$ord['value_ht']=tep_draw_input_field('value_ht['.$item['id'].']','value_ht_'.$item['id'],$item['value_ht']);
$ord['qty_site']=tep_draw_input_field('qty_site['.$item['id'].']','qty_site_'.$item['id'],$item['qty_site']);
-
- $ord['action']=self::get_item_action($ord);
- self::$list[]=$ord;
+ $res[]=$ord;
}
-// print_r(self::$list);
- $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[]=array(); //self::emptyResult();
- return $res;
+
break;
- default:
- global $query_numrows,$languages_id;
-
- $DB=Database::getInstance();
-
- if(tep_not_null($sWhere)){
-// $sWhere=str_replace(array('orders_id'),array('o.orders_id'), $sWhere);
-// array_flip(self::$StatusName);
-// $sWhere=str_replace(array('orders_id'),array('o.orders_id'), $sWhere);
- }
-
- $query_raw = "select distinct inventaires_id as id, status_id , status_name , name , admin_id, date_added , date_modified from " . TABLE_INVENTAIRES . " i ".
- "LEFT JOIN " . TABLE_STATUS . " s ON ( status_id=status AND status_type='inventaire' AND language_id='".$languages_id."' ) ".
- $sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'date_added DESC');
-// var_dump($query_raw);
- $_split = new splitPageResults($page, $rowbyp, $query_raw, $query_numrows);
- $_query = $DB->query($query_raw);
-
+ case 'listing':
while ($item = $_query->fetchAssoc()) {
$ord=$item;
$ord[0]=$item['id'];
@@ -481,27 +600,54 @@
$ord['date_added']=tep_date_short($item['date_added']);
// $ord['date_added']=self::StatusName($key);
// $ord['null']=tep_draw_checkbox_field('action_multi['.$item['inventaires_id'].']','action_mutli_'.$item['inventaires_id'],$item['inventaires_id']);
- $ord['action']=self::get_item_action($ord);
- self::$list[]=$ord;
+ $ord['action']=self::ButtonRowsActions($ord);
+ $res[]=$ord;
}
+ break;
+ }
- $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;
- }
+ return $res;
+ }
- if(count($res)==0) $res[]=array(); //self::emptyResult();
- return $res;
- }
+ /**
+ @brief Button action for row in table
+ Specific call by tep_get_list
+ */
+ public static function ButtonRowsActions($item){
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ (
+ ((int)$item['status']==1)
+ ? sprintf(CsrtAction::getLink('row_action_right', __('txt updated stock by inventaire') , 'inventaire_update'), 'fancyView', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=appli') ,'' )
+ :''
+ ).
+ sprintf(CsrtAction::getLink('row_action_right', __('txt export inventaire') , 'inventaire_export'), 'fancy', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=export') ,'' )
+ ,
+// sprintf(CsrtAction::getLink('row_action_right', IMAGE_COPY_TO, 'copyto'), 'fancy', tep_href_link(self::FILENAME, 'pID=' . $products['products_id'] . '&action=copy_to') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=edit') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'iID=' . $item['id'] . '&action=delete') ,'' )
+// sprintf(CsrtAction::getLink('row_action_right', __('image view public') , 'publiclink'), '', tep_catalog_href_link('product_info.php', 'products_id=' . $products['products_id']) ,' target="blank"' )
+ );
}
+ /**
+ @depend IntModTwo
+ @remarks interne core mode Modtwo, is absolute required
+ */
+ /**
+ @brief return Filename
+ */
+ public static function GetFILENAME(){
+ return self::FILENAME;
+ }
-/** Interface module */
+ /**
+ @depend InterfaceModule
+ */
function check() { return false; }
function install() { return false; }
function remove() { return false; }
@@ -509,6 +655,7 @@
}
+
/**
@class InventaireSql
@portion code Copyright (c) 2006 OSC-evolution
Modified: branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml
===================================================================
--- branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml 2011-05-10 21:06:13 UTC (rev 3725)
+++ branches/2.1.0/extensions/INVENTAIRE_unstable/install.xml 2011-05-11 06:56:58 UTC (rev 3726)
@@ -12,16 +12,31 @@
<addfile>
<file name="admin/includes/modules/pages/Inventaire.php" />
<file name="admin/includes/modules/template_export/inventaire.php" />
- <file name="admin/includes/gabarit/Inventaire.edit.gab" />
- <file name="admin/includes/gabarit/Inventaire.delete.gab" />
- <file name="admin/includes/gabarit/Inventaire.listing.gab" />
- <file name="admin/includes/gabarit/Inventaire.export.gab" />
+
+ <file name="admin/includes/gabarit/Inventaire/display_view.delete.gab" />
+ <file name="admin/includes/gabarit/Inventaire/display_view.edit.gab" />
+ <file name="admin/includes/gabarit/Inventaire/display_view.export.gab" />
+
</addfile>
<addfilelg>
<file name="admin/includes/languages/%LANGUAGE%/modules/pages/Inventaire.txt" lgref="fr_FR"/>
</addfilelg>
+
+ <add2endlg>
+ <file name="admin/includes/languages/%LANGUAGE%/boxes/10_orders.php" />
+ <add type="php" lgref="fr_FR"><![CDATA[define('BOX_MENU_STOCK', 'Stock');
+ define('BOX_INVENTAIRE', 'Inventaire');]]></add>
+ </add2endlg>
+
+ <add2end>
+ <file name="admin/includes/boxes/10_orders.php" />
+ <add type="php"><![CDATA[ $tabl_link[1009]= array('ss_menu', 'BOX_MENU_STOCK', 'mail',@$img['mail']);
+ $tabl_link[1009][4][]= array('Inventaire.php', 'BOX_INVENTAIRE', 'orders',@$img['orders']);
+ //$tabl_link[1009][4][]= array('flashStock.php', 'BOX_FLASHSTOCK', 'orders',@$img['orders']);]]></add>
+ </add2end>
+
<sql>
<query><![CDATA[
DROP TABLE IF EXISTS %DB_PREFIX%inventaires;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-10 21:06:19
|
Revision: 3725
http://oscss.svn.sourceforge.net/oscss/?rev=3725&view=rev
Author: oscim
Date: 2011-05-10 21:06:13 +0000 (Tue, 10 May 2011)
Log Message:
-----------
http://dev.oscss.org/task/855
http://dev.oscss.org/task/856
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/functions/html_output.php
branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/cms_content.edit.gab
branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
Modified: branches/2.1.0/catalog/admin/includes/functions/html_output.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/functions/html_output.php 2011-05-10 19:45:36 UTC (rev 3724)
+++ branches/2.1.0/catalog/admin/includes/functions/html_output.php 2011-05-10 21:06:13 UTC (rev 3725)
@@ -33,18 +33,23 @@
/**
@version 2.0
@brief Ultimate SEO URLs v2.1 The HTML href link wrapper function Or href classic
+ @param $page string name page destination
+ @param $parameters Get value
+ @param $linkadmin bool add link for connectin front for admin user
*/
if (_cst_bool('SEO_ENABLED')) {
- function tep_catalog_href_link($page = '', $parameters = '', $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true) {
+ function tep_catalog_href_link($page = '', $parameters = '', $connection = 'NONSSL', $linkadmin= true) {
global $languages_id,$SecuKey;
+ $add_session_id = true;
+ $search_engine_safe = true;
/// force offline mode
- $parameters =(empty($parameters)? '' : '&' ).'admin='.md5($SecuKey);
+ if($linkadmin)$parameters =(empty($parameters)? '' : '&' ).'admin='.md5($SecuKey);
$seo_urls = seo_url::getInstance($languages_id);
return preg_replace('/&/','&',$seo_urls->href_link($page, $parameters, $connection, $add_session_id));
}
} else {
- function tep_catalog_href_link($page = '', $parameters = '', $connection = 'NONSSL') {
+ function tep_catalog_href_link($page = '', $parameters = '', $connection = 'NONSSL', $linkadmin= true) {
global $SecuKey;
if ($connection == 'NONSSL') $link = HTTP_SERVER . DIR_WS_HTTP_CATALOG;
@@ -52,7 +57,7 @@
else die('<br /><br /><span class="error"><strong>Error!</strong><br /><br /><strong>Unable to determine connection method on a link!<br /><br />Known methods: NONSSL SSL<br /><br />Function used:<br /><br />tep_href_link(\'' . $page . '\', \'' . $parameters . '\', \'' . $connection . '\')</strong></span>');
/// force offline mode
- $parameters =(empty($parameters)? '' : '&' ).'admin='.md5($SecuKey);
+ if($linkadmin)$parameters =(empty($parameters)? '' : '&' ).'admin='.md5($SecuKey);
if ($parameters == '')$link .= $page;
else $link .= $page . '?' . $parameters;
Modified: branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab 2011-05-10 19:45:36 UTC (rev 3724)
+++ branches/2.1.0/catalog/admin/includes/gabarit/categories.edit.gab 2011-05-10 21:06:13 UTC (rev 3725)
@@ -86,11 +86,11 @@
<dl>
<dt class="block_input" style="width:95%; text-align:center;">
<?php echo tep_image(DIR_WS_CATALOG_IMAGES . categories::$cInfo->categories_image, 'image', TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT) ?>
+ <?php if(tep_not_null(categories::$cInfo->categories_image)) echo tep_draw_checkbox_field('categories_image_no', 'categories_image_no', 'on'). ' '.__('text delete image cat'); ?>
</dt>
<dt class="block_input" style="width:95%; ">
<Label><?php echo __('text choose img') ?></label>
- <?php echo tep_draw_file_field('categories_image') ?>
- <?php //echo '<a class="button" href="#" onclick="'.tep_get_filebroswerserveur("categories_image", "image", '').'">'.tep_draw_input_field('categories_image','', categories::$cInfo->categories_image ).' '.PARCOURIR_SERVER.'</a>' ?>
+ <?php echo '<a class="button" href="#" onclick="'.tep_get_filebroswerserveur("categories_image", "image", '').'">'.tep_draw_input_field('categories_image','', categories::$cInfo->categories_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER).'</a>' ?>
</dt>
<dt class="block_input">
<label><?php echo __('text categories status'); ?></label>
Modified: branches/2.1.0/catalog/admin/includes/gabarit/cms_content.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/cms_content.edit.gab 2011-05-10 19:45:36 UTC (rev 3724)
+++ branches/2.1.0/catalog/admin/includes/gabarit/cms_content.edit.gab 2011-05-10 21:06:13 UTC (rev 3725)
@@ -38,14 +38,13 @@
<?php } ?>
</ul>
<?php for ($i=0, $n=sizeof(cms_content::$languages); $i<$n; $i++) { ?>
- <fieldset id="fieldset_<?php echo $i ?>">
- <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . cms_content::$languages[$i]['directory'] . '/images/' . cms_content::$languages[$i]['image'], cms_content::$languages[$i]['name']); ?></legend>
- <p class="block_input" style="width:90%;">
+ <fieldset id="fieldset_<?php echo $i ?>" class="block_field">
+ <p class="block_input">
<label for="<?php echo 'content_title' . cms_content::$languages[$i]['id']; ?>"><?php echo __('entry title'); ?></label>
<?php echo tep_draw_input_field('content_title[' . cms_content::$languages[$i]['id'] . ']', 'content_title' . $i, cms_content::$cInfo->title[ cms_content::$languages[$i]['id']], 'size="70"', true) ; ?>
</p>
- <p class="block_input" style="width:90%;">
- <?php echo __('txt info permalink').tep_catalog_href_link('content.php','content=' . cms_content::$cInfo->content_id.'&language='.cms_content::$languages[$i]['code'] ); ?>
+ <p class="block_input" >
+ <?php echo __('txt info permalink').tep_catalog_href_link('content.php','content=' . cms_content::$cInfo->content_id.'&language='.cms_content::$languages[$i]['code'] , 'NONSSL', false); ?>
</p>
<br style="clear:both" />
<?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','content_text[' . cms_content::$languages[$i]['id'] . ']','1000','800',cms_content::$cInfo->text[cms_content::$languages[$i]['id']]); ?>
@@ -68,9 +67,16 @@
<dt class="block_input w_90 CategoryView">
<label><?php echo __('txt categories'); ?></label>
<ul id="cat_list_in_edit">
- <?php foreach(get_cat_list(0) as $v){
- echo '<li>'.tep_decal($v['niveau']).' '. tep_draw_checkbox_field('categories['.$v['categories_id'].']','cat_'.$v['categories_id'], tep_get_generated_category_path_ids($v['categories_id']), (isset(cms_content::$cInfo->categories[$v['categories_id']])?true : false) ).' '.$v['categories_name'].'</li>';
- }?>
+ <?php foreach(cms_content::$cInfo->categories as $v){ $k=$v['categories_id'];
+ echo '<li class="selected">'. tep_draw_checkbox_field('categories['.$k.']','cat_'.$k, tep_get_generated_category_path_ids($k), true ).' '.tep_get_category_name($k).'</li>';
+ }
+ foreach(get_cat_list(0) as $v)
+ if(!isset(cms_content::$cInfo->categories[$v['categories_id']])){
+ echo '<li class="'.(isset(cms_content::$cInfo->categories[$v['categories_id']])? 'selected' : 'noselected').'">'.tep_decal($v['niveau']).' '. tep_draw_checkbox_field('categories['.$v['categories_id'].']','cat_'.$v['categories_id'], tep_get_generated_category_path_ids($v['categories_id']), (isset(cms_content::$cInfo->categories[$v['categories_id']])?true : false) ).' '.$v['categories_name'].'</li>';
+ }
+ else
+ echo '<li class="'.(isset(cms_content::$cInfo->categories[$v['categories_id']])? 'selected' : 'noselected').'">'.tep_decal($v['niveau']).' '. ' '.$v['categories_name'].'</li>';
+ ?>
</ul>
</dt>
<dt class="block_input button_nav w_90" >
Modified: branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab
===================================================================
--- branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab 2011-05-10 19:45:36 UTC (rev 3724)
+++ branches/2.1.0/catalog/admin/includes/gabarit/products.edit.gab 2011-05-10 21:06:13 UTC (rev 3725)
@@ -214,9 +214,16 @@
<dd class="block_input w_90 CategoryView ">
<label for="products_date_available"><?php echo __('txt categories'); ?></label>
<ul id="cat_list_in_edit" class="ChooseSelect">
- <?php foreach(get_cat_list(0) as $v){
+ <?php foreach(products::$pInfo->categories as $v){ $k=$v['categories_id'];
+ echo '<li class="selected">'. tep_draw_checkbox_field('categories['.$k.']','cat_'.$k, tep_get_generated_category_path_ids($k), true ).' '.tep_get_category_name($k).'</li>';
+ }
+ foreach(get_cat_list(0) as $v)
+ if(!isset(products::$pInfo->categories[$v['categories_id']])){
echo '<li class="'.(isset(products::$pInfo->categories[$v['categories_id']])? 'selected' : 'noselected').'">'.tep_decal($v['niveau']).' '. tep_draw_checkbox_field('categories['.$v['categories_id'].']','cat_'.$v['categories_id'], tep_get_generated_category_path_ids($v['categories_id']), (isset(products::$pInfo->categories[$v['categories_id']])?true : false) ).' '.$v['categories_name'].'</li>';
- }?>
+ }
+ else
+ echo '<li class="'.(isset(products::$pInfo->categories[$v['categories_id']])? 'selected' : 'noselected').'">'.tep_decal($v['niveau']).' '. ' '.$v['categories_name'].'</li>';
+ ?>
</ul>
</dd>
<dd class="block_input button_nav" style="width:95%;">
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-05-10 19:45:36 UTC (rev 3724)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-05-10 21:06:13 UTC (rev 3725)
@@ -55,6 +55,7 @@
$lang['tab products data']='Caractéristiques';
$lang['text choose img']='Choix de l\'image ';;
$lang['empty category']='Catégorie vide';
+$lang['text delete image cat']='Aucune image';
$lang['text how to copy']='Méthode de copie :';
$lang['view in menu']='Voir dans le menu';
$lang['error catalog image directory not writeable']='Erreur : Impossible d\'écrire dans le répertoire images : ' . DIR_FS_CATALOG_IMAGES;
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-05-10 19:45:36 UTC (rev 3724)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-05-10 21:06:13 UTC (rev 3725)
@@ -154,15 +154,26 @@
case 'update':
if (isset($_POST['categories_id'])) $categories_id = tep_db_prepare_input((int)$_POST['categories_id']);
+
+ if (isset($_POST['categories_image']) && tep_not_null($_POST['categories_image']) && ($_POST['categories_image'] != 'none')){
+ if( strpos($_POST['categories_image'],DIR_WS_CATALOG_IMAGES) >=0 )
+ $_POST['categories_image'] = tep_db_prepare_input(substr($_POST['categories_image'], strlen( DIR_WS_CATALOG_IMAGES) ) );
+ else
+ $_POST['categories_image'] = tep_db_prepare_input($_POST['categories_image']);
+ }
+
$sort_order = (isset($_POST['sort_order'])) ? tep_db_prepare_input((int)$_POST['sort_order']) : 0 ;
self::$current_category_id = (isset($_POST['cPath'])) ? tep_db_prepare_input($_POST['cPath']) : 0 ;
$categories_status = (isset($_POST['categories_status'])) ? tep_db_prepare_input((int)$_POST['categories_status']) : 0 ;
$categories_hidden = (isset($_POST['categories_hidden'])) ? tep_db_prepare_input((int)$_POST['categories_hidden']) : 0 ;
+ $categories_image = (!isset($_POST['categories_image']) || (!isset($_POST['categories_image_no']) && $_POST['categories_image']=='on') ) ? '' : tep_db_prepare_input($_POST['categories_image']) ;
$sql_data_array = array('sort_order' => $sort_order,
'parent_id' => self::$current_category_id,
'categories_status' => $categories_status,
- 'categories_hidden' => $categories_hidden);
+ 'categories_hidden' => $categories_hidden,
+ 'categories_image'=>$categories_image
+ );
if (self::$action == 'insert') {
$insert_sql_data = array('date_added' => 'now()');
@@ -213,10 +224,10 @@
}
}
- if ( !empty($_FILES['categories_image']['tmp_name']) ) {
- $categories_image = new upload('categories_image', DIR_FS_CATALOG_IMAGES);
- tep_db_query("update " . TABLE_CATEGORIES . " set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'");
- }
+// if ( !empty($_FILES['categories_image']['tmp_name']) ) {
+// $categories_image = new upload('categories_image', DIR_FS_CATALOG_IMAGES);
+// tep_db_query("update " . TABLE_CATEGORIES . " set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'");
+// }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-10 19:45:42
|
Revision: 3724
http://oscss.svn.sourceforge.net/oscss/?rev=3724&view=rev
Author: oscim
Date: 2011-05-10 19:45:36 +0000 (Tue, 10 May 2011)
Log Message:
-----------
correction extension
Modified Paths:
--------------
branches/2.1.0/extensions/ACCOUNT_PAYPAL_stable/catalog/includes/gabarit/account_paypal.display_view.gab
branches/2.1.0/extensions/ACCOUNT_RIB_stable/catalog/includes/gabarit/account_rib.display_view.gab
branches/2.1.0/extensions/CUSTOMER_POINTS_stable/catalog/includes/modules/payment/customer_points.php
Modified: branches/2.1.0/extensions/ACCOUNT_PAYPAL_stable/catalog/includes/gabarit/account_paypal.display_view.gab
===================================================================
--- branches/2.1.0/extensions/ACCOUNT_PAYPAL_stable/catalog/includes/gabarit/account_paypal.display_view.gab 2011-05-10 13:01:45 UTC (rev 3723)
+++ branches/2.1.0/extensions/ACCOUNT_PAYPAL_stable/catalog/includes/gabarit/account_paypal.display_view.gab 2011-05-10 19:45:36 UTC (rev 3724)
@@ -20,7 +20,7 @@
</p>
<p class="form_row">
- <label class="contact" for="rib_bic"><?php echo __('account paypal email adrress'); ?></label>
+ <label for="account_paypal"><?php echo __('account paypal email adrress'); ?></label>
<?php echo tep_draw_input_field('account_paypal','account_paypal', (isset(account_paypal::$account_paypal) ? account_paypal::$account_paypal : '' ) ); ?>
</p>
@@ -31,5 +31,3 @@
</div>
</fieldset>
</form>
-
-<p class="notice"><?php echo FORM_REQUIRED_INFORMATION; ?></p>
\ No newline at end of file
Modified: branches/2.1.0/extensions/ACCOUNT_RIB_stable/catalog/includes/gabarit/account_rib.display_view.gab
===================================================================
--- branches/2.1.0/extensions/ACCOUNT_RIB_stable/catalog/includes/gabarit/account_rib.display_view.gab 2011-05-10 13:01:45 UTC (rev 3723)
+++ branches/2.1.0/extensions/ACCOUNT_RIB_stable/catalog/includes/gabarit/account_rib.display_view.gab 2011-05-10 19:45:36 UTC (rev 3724)
@@ -1,11 +1,18 @@
<?php
/**
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @package account_rib osCSS-2 <www http://www.oscss.org>
- @version osCSS-2.1.0
- @date 18/04/11, 21:35
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @subpackage account_rib
+ @version 2.1.0
+ @date 29/01/11, 11:24
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
+ *\dir includes/gabarit/
+ *\file
+ *\brief the file is template for module address_book_details;
+ *
+ * display form address for update/add/edit address customers
*/
?>
@@ -18,28 +25,32 @@
<legend><?php echo __('information rib') ?></legend>
- <p>
- <label for="rib_bic"><?php echo __('bic or switch'); ?></label>
+ <p class="form_row">
+ <label class="contact" for="rib_bic"><?php echo __('bic or switch'); ?></label>
<?php echo tep_draw_input_field('rib_bic','rib_bic', (isset(account_rib::$account_rib['rib_bic']) ? account_rib::$account_rib['rib_bic'] : '' ) ); ?>
</p>
- <p>
- <label for="rib_bank_name"><?php echo __('bank name'); ?></label>
+ <p class="form_row">
+ <label class="contact" for="rib_bank_name"><?php echo __('bank name'); ?></label>
<?php echo tep_draw_input_field('rib_bank_name','rib_bank_name', (isset(account_rib::$account_rib['rib_bank_name']) ? account_rib::$account_rib['rib_bank_name'] : '' ) ); ?>
</p>
- <p>
- <label for="rib_bank_code"><?php echo __('bank code'); ?></label>
+ <p class="form_row">
+ <label class="contact" for="rib_bank_code"><?php echo __('bank code'); ?></label>
<?php echo tep_draw_input_field('rib_bank_code','rib_bank_code', (isset(account_rib::$account_rib['rib_bank_code']) ? account_rib::$account_rib['rib_bank_code'] : '' ) ); ?>
</p>
- <p>
- <label for="rib_iban"><?php echo __('iban'); ?></label>
+ <p class="form_row">
+ <label class="contact" for="rib_iban"><?php echo __('iban'); ?></label>
<?php echo tep_draw_input_field('rib_iban','rib_iban', (isset(account_rib::$account_rib['rib_iban']) ? account_rib::$account_rib['rib_iban'] : '' ) ); ?>
</p>
- <div class="navBt">
+
+
+
+ <div class="formBt">
<input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_CONTINUE; ?>" />
<?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT) . '">' .IMAGE_BUTTON_BACK . '</a>'; ?>
</div>
+
</fieldset>
Modified: branches/2.1.0/extensions/CUSTOMER_POINTS_stable/catalog/includes/modules/payment/customer_points.php
===================================================================
--- branches/2.1.0/extensions/CUSTOMER_POINTS_stable/catalog/includes/modules/payment/customer_points.php 2011-05-10 13:01:45 UTC (rev 3723)
+++ branches/2.1.0/extensions/CUSTOMER_POINTS_stable/catalog/includes/modules/payment/customer_points.php 2011-05-10 19:45:36 UTC (rev 3724)
@@ -1,7 +1,7 @@
<?php
/**
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
+ @package customer_points for osCSS-2 <www http://www.oscss.org>
@version 2.1.0
@date 02/11/10, 15:40
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@@ -39,7 +39,8 @@
self::load_points($customer_id);
- if ( self::check_points() <= self::$points) {
+ $result=self::check_points();
+ if ( $result >0 && $result <= self::$points) {
if ((int)MODULE_PAYMENT_CUSTOMER_POINTS_ZONE > 0){
$check_flag = false;
$check_query = tep_db_query("select zone_id from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . MODULE_PAYMENT_CUSTOMER_POINTS_ZONE . "' and (zone_country_id = '" . $order->delivery['country']['id'] . "' OR zone_country_id ='0') order by zone_id");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ay...@us...> - 2011-05-10 13:01:54
|
Revision: 3723
http://oscss.svn.sourceforge.net/oscss/?rev=3723&view=rev
Author: ayatus
Date: 2011-05-10 13:01:45 +0000 (Tue, 10 May 2011)
Log Message:
-----------
Remplacement de la fonction php sql_regcase
Modified Paths:
--------------
branches/2.1.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php
Modified: branches/2.1.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php
===================================================================
--- branches/2.1.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php 2011-05-10 12:15:56 UTC (rev 3722)
+++ branches/2.1.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php 2011-05-10 13:01:45 UTC (rev 3723)
@@ -353,7 +353,7 @@
$filenum=0;
foreach($filetypes as $filetype)
{
- $filenum = $filenum + count(glob($root.$tree.$branch.sql_regcase($filetype),GLOB_NOSORT));
+ $filenum = $filenum + count(glob($root.$tree.$branch.tn_sql_regcase($filetype),GLOB_NOSORT));
}
$treeparts = explode('/',rtrim($tree,'/'));
$topname = end($treeparts);
@@ -369,7 +369,7 @@
$filenum=0;
foreach($filetypes as $filetype)
{
- $filenum = $filenum + count(glob($root.$tree.$branch.$dirname.'/'.sql_regcase($filetype),GLOB_NOSORT));
+ $filenum = $filenum + count(glob($root.$tree.$branch.$dirname.'/'.tn_sql_regcase($filetype),GLOB_NOSORT));
}
$indent = '';
for($i=0;$i<$level;$i++) { $indent .= ' '; }
@@ -382,4 +382,15 @@
$level--;
}
+function tn_sql_regcase($string){
+ $max=strlen($string);
+ for ($i = 0; $i < $max; $i++) {
+ $char=substr($string,$i,1);
+ $up=strtoupper ($char);
+ $low=strtolower($char);
+ $ret=($up!=$low)?'['.$up.$low.']' : $char;
+ }
+ return $ret;
+}
+
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-10 12:16:03
|
Revision: 3722
http://oscss.svn.sourceforge.net/oscss/?rev=3722&view=rev
Author: oscim
Date: 2011-05-10 12:15:56 +0000 (Tue, 10 May 2011)
Log Message:
-----------
coquille de logique sur le control du stock
Modified Paths:
--------------
branches/2.1.0/catalog/includes/classes/Stock.php
Modified: branches/2.1.0/catalog/includes/classes/Stock.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/Stock.php 2011-05-09 21:20:15 UTC (rev 3721)
+++ branches/2.1.0/catalog/includes/classes/Stock.php 2011-05-10 12:15:56 UTC (rev 3722)
@@ -8,7 +8,7 @@
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
\class Stock
- \file
+ \file
\dir includes/classes/
\brief Gestion avancé des Stock, extension des class shopping_cart et chekcout_process
*/
@@ -43,7 +43,7 @@
break;
case 1: /// check stock
default:
- self::$marck=( ((tep_get_products_stock($product['id'],$attributes) - $product['quantity'] ) <= 0)? 2 : 0);
+ self::$marck=( ((tep_get_products_stock($product['id'],$attributes) - $product['quantity'] ) < 0)? 2 : 0);
}
return (in_array(self::$marck, array(2,1) ) )? true : false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-09 21:20:21
|
Revision: 3721
http://oscss.svn.sourceforge.net/oscss/?rev=3721&view=rev
Author: oscim
Date: 2011-05-09 21:20:15 +0000 (Mon, 09 May 2011)
Log Message:
-----------
correction coquille javascript et control du stock
Modified Paths:
--------------
branches/2.1.0/catalog/includes/classes/pad_base.php
Modified: branches/2.1.0/catalog/includes/classes/pad_base.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/pad_base.php 2011-05-09 21:13:07 UTC (rev 3720)
+++ branches/2.1.0/catalog/includes/classes/pad_base.php 2011-05-09 21:20:15 UTC (rev 3721)
@@ -11,8 +11,8 @@
\dir includes/classes/
\page front_attribute_pad_base
\brief - ATTRIBUTES IN PRODUCT LIST FOR QTPRO -
-
-
+
+
Based on prior works released under the GNU General Public License:
QT Pro prior versions
Ralph Day, October 2004
@@ -28,7 +28,7 @@
out of stock.
\li 09/2009 oscim correction xhtml, delete table for list, adaptation oscss
\li 09/2010 refonte partiel , re develop code, and delete class enfants
-
+
QT Pro Product Attributes Display Plugin
pad_base.php - Base Class
@@ -91,7 +91,7 @@
/**
- * \fn _SetConfigurationProperties($prefix)
+ * \fn _SetConfigurationProperties($prefix)
* \brief Set local configuration properties from osCommerce configuration DB constants
* @param $prefix string Prefix for the osCommerce DB constants
* @returns: nothing
@@ -133,7 +133,7 @@
/**
* \fn draw()
- * \brief
+ * \brief
Draws the product attributes. This is the only method other than the constructor that is
intended to be called by a user of this class.
Attributes that stock is tracked for are grouped first and drawn with one dropdown list per
@@ -156,7 +156,7 @@
/**
* \fn _draw_table_start()
- * \brief
+ * \brief
Draws the start of a table to wrap the product attributes display.
Intended for class internal use only.
@returns: string: HTML for start of table
@@ -166,8 +166,8 @@
}
/**
- * \fn _draw_table_end()
- * \brief
+ * \fn _draw_table_end()
+ * \brief
Draws the end of a table to wrap the product attributes display.
Intended for class internal use only.
@returns: string: HTML for end of table
@@ -224,7 +224,7 @@
/**
- * \fn _build_attributes_array($build_stocked, $build_nonstocked)
+ * \fn _build_attributes_array($build_stocked, $build_nonstocked)
* \brief Build an array of the attributes for the product,
@date 06.09.2009 12:06:10 oscim add order in sort
@param
@@ -469,7 +469,7 @@
$out.='{'.$ovid.':';
$opts[]=$oid;
}
- $out.='1';
+ $out.=$combinations[0]['stock'];
for ($combindex=1; $combindex<sizeof($combinations); $combindex++) {
$comb=$combinations[$combindex]['comb'];
@@ -490,8 +490,8 @@
/**
- * \fn _draw_out_of_stock_message_js($attributes)
- * \brief
+ * \fn _draw_out_of_stock_message_js($attributes)
+ * \brief
draw Javascript to display out of stock message for out of stock attribute combinations
@param array $attributes Array of attributes for the product. Format is as returned by
_build_attributes_array.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-05-09 21:13:17
|
Revision: 3720
http://oscss.svn.sourceforge.net/oscss/?rev=3720&view=rev
Author: oscim
Date: 2011-05-09 21:13:07 +0000 (Mon, 09 May 2011)
Log Message:
-----------
Evolution du module , correction et mise au point.
Utilise Master Gabarit
Modified Paths:
--------------
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/includes/modules/products/UltimateImage.php
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml
Added Paths:
-----------
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_edit.listing.gab
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.delete.gab
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.edit.gab
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab.old
Removed Paths:
-------------
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab
Added: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_edit.listing.gab
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_edit.listing.gab (rev 0)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_edit.listing.gab 2011-05-09 21:13:07 UTC (rev 3720)
@@ -0,0 +1,55 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 09/05/11, 21:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @subpackage UltimateImage
+*/
+$cpt=0;
+?>
+<div>
+ <h3><?php echo __('UltimateImage heading edit image products') ?></h3>
+
+ <fielset class="block_field">
+ <?php echo __('UltimateImage txt add img product').sprintf(CsrtAction::getLink('row_action_right', IMAGE_NEW, 'new'), 'fancyView iframe', UltimateImage::HrefLinkInMod('new_image') ,'' ) ?>
+ </fielset>
+ <fielset class="block_field">
+
+ <legend><?php echo __('les images presente') ?></legend>
+
+ <table id="ListImage" class="dataTableBase">
+ <thead>
+ <tr>
+ <th><?php echo __('UltimateImage heading image xl') ?></th>
+ <th><?php echo __('UltimateImage heading image sm') ?></th>
+ <th><?php echo __('UltimateImage heading action') ?></th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <?php foreach(UltimateImage::$iList as $img): $cpt++; ?>
+ <tr id="ListImage_<?php echo $img->id ?>">
+ <td>
+ <?php echo tep_image(DIR_WS_CATALOG_IMAGES . $img->products_image_sm, products::$pInfo->products_name, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
+ <?php echo tep_draw_hidden_field('products_image_sm_', $img->products_image_sm) ?>
+ </td>
+
+ <td>
+ <?php echo tep_draw_hidden_field('products_image_xl', $img->products_image_xl) ?>
+ <?php echo tep_image(DIR_WS_CATALOG_IMAGES . $img->products_image_xl, products::$pInfo->products_name, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
+
+ </td>
+
+ <td> <?php echo UltimateImage::RowsAction($img->id); ?> </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </fielset>
+
+
+</div>
Added: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.delete.gab
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.delete.gab (rev 0)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.delete.gab 2011-05-09 21:13:07 UTC (rev 3720)
@@ -0,0 +1,18 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 09/05/11, 21:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @subpackage UltimateImage
+*/
+?>
+<h3><?php echo __('UltimateImage heading title option delete') ?></h3>
+<?php echo tep_draw_form('delete', UltimateImage::HrefLinkInMod('Imgdeleteconfirm','','page'),UltimateImage::HrefLinkInMod('Imgdeleteconfirm','', 'param'), 'post',' class="fancy" ') ?>
+
+<?php echo tep_image_submit('', IMAGE_DELETE). tep_js_back(tep_href_link(UltimateImage::HrefLinkInMod('','','page'), tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
+
+</form>
\ No newline at end of file
Added: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.edit.gab
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.edit.gab (rev 0)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/UltimateImage/display_view.edit.gab 2011-05-09 21:13:07 UTC (rev 3720)
@@ -0,0 +1,35 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 09/05/11, 21:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @subpackage UltimateImage
+*/
+?>
+<h3><?php echo __('UltimateImage heading title option edit') ?></h3>
+<?php echo tep_draw_form('add', UltimateImage::HrefLinkInMod('Imgupdate','','page'),UltimateImage::HrefLinkInMod('Imgupdate','', 'param'), 'post',' class="fancy" ') ?>
+
+
+ <fielset class="block_field">
+ <legend><?php echo __('Ajouter une image') ?></legend>
+ <p class="block_input">
+ <label><?php echo __('Ajouter image supplementaire mini') ?></label>
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_add_min", "image", '') ?>">
+ <?php echo tep_draw_input_field('products_image_add_min','',UltimateImage::$iInfo->products_image_sm).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ <br />
+ <label><?php echo __('Ajouter image supplementaire maxi') ?></label>
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_add_max", "image", '') ?>">
+ <?php echo tep_draw_input_field('products_image_add_max','',UltimateImage::$iInfo->products_image_xl).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ </p>
+
+ </fielset>
+
+<?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(UltimateImage::HrefLinkInMod('','','page'), tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
+
+</form>
\ No newline at end of file
Deleted: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab 2011-05-09 18:17:28 UTC (rev 3719)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab 2011-05-09 21:13:07 UTC (rev 3720)
@@ -1,78 +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 09/10/10, 18:33
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @class UltimateImage
- @subpackage UltimateImage
-*/
-$cpt=0;
-?>
-<div>
- <h3><?php echo __('Gestions des images du produit') ?></h3>
-
- <fielset>
-
- <p class="block_input">
- <label><?php echo __('Image principale produit') ?></label>
- <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur("products_image", "image", '').'">'.tep_draw_input_field('products_image','', products::$pInfo->products_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) .'</a>'; ?>
- </p>
- </fielset>
-
- <fielset>
- <?php foreach(UltimateImage::$iInfo as $img): $cpt++; ?>
- <p class="block_input">
- <label><?php echo __('text products image sm') ?></label>
-
- <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_sm", "image", '') ?>">
- <?php echo tep_draw_input_field('products_image_sm['.$cpt.']','products_image_sm_'.$cpt, $img->products_image_sm).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
- </a>
- <?php echo tep_draw_hidden_field('products_image_sm_', $img->products_image_sm) ?>
- <br />
-
- <?php if (tep_not_null($img->products_image_sm)) : ?>
- <?php echo tep_image(DIR_WS_CATALOG_IMAGES . $img->products_image_sm, products::$pInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="left" hspace="0" vspace="5"') ?>
- <br />
- <input type="checkbox" name="unlink_image_sm[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image remove short') ?>
- <input type="checkbox" name="delete_image_sm[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image delete short') ?>
-
- <br />
- <label><?php echo __('text products image xl') ?></label>
- <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_xl", "image", '') ?>">
- <?php echo tep_draw_input_field('products_image_xl['.$cpt.']','products_image_xl'.$cpt, $img->products_image_xl).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
- </a>
- <?php echo tep_draw_hidden_field('products_image_xl', $img->products_image_xl) ?>
- <br />
-
- <?php if (tep_not_null($img->products_image_xl)) : ?>
- <?php echo tep_image(DIR_WS_CATALOG_IMAGES . $img->products_image_xl, products::$pInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="left" hspace="0" vspace="5"') ?>
- <br />
- <input type="checkbox" name="unlink_image_xl[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image remove short') ?>
- <input type="checkbox" name="delete_image_xl[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image delete short') ?>
- <?php endif; ?>
-
- <?php endif; ?>
-
- </p>
- <?php endforeach; ?>
- </fielset>
-
- <fielset>
-
- <p class="block_input">
- <label><?php echo __('Ajouter image supplementaire mini') ?></label>
- <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_add_min", "image", '') ?>">
- <?php echo tep_draw_input_field('products_image_add_min','', $img->products_image_sm_1).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
- </a>
- <br />
- <label><?php echo __('Ajouter image supplementaire maxi') ?></label>
- <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_add_max", "image", '') ?>">
- <?php echo tep_draw_input_field('products_image_add_max','', $img->products_image_sm_1).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
- </a>
- </p>
- </fielset>
-</div>
Copied: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab.old (from rev 3710, branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab)
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab.old (rev 0)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/gabarit/products.UltimateImage.display_edit.gab.old 2011-05-09 21:13:07 UTC (rev 3720)
@@ -0,0 +1,78 @@
+<?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 09/10/10, 18:33
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class UltimateImage
+ @subpackage UltimateImage
+*/
+$cpt=0;
+?>
+<div>
+ <h3><?php echo __('Gestions des images du produit') ?></h3>
+
+ <fielset>
+
+ <p class="block_input">
+ <label><?php echo __('Image principale produit') ?></label>
+ <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur("products_image", "image", '').'">'.tep_draw_input_field('products_image','', products::$pInfo->products_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) .'</a>'; ?>
+ </p>
+ </fielset>
+
+ <fielset>
+ <?php foreach(UltimateImage::$iInfo as $img): $cpt++; ?>
+ <p class="block_input">
+ <label><?php echo __('text products image sm') ?></label>
+
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_sm", "image", '') ?>">
+ <?php echo tep_draw_input_field('products_image_sm['.$cpt.']','products_image_sm_'.$cpt, $img->products_image_sm).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ <?php echo tep_draw_hidden_field('products_image_sm_', $img->products_image_sm) ?>
+ <br />
+
+ <?php if (tep_not_null($img->products_image_sm)) : ?>
+ <?php echo tep_image(DIR_WS_CATALOG_IMAGES . $img->products_image_sm, products::$pInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="left" hspace="0" vspace="5"') ?>
+ <br />
+ <input type="checkbox" name="unlink_image_sm[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image remove short') ?>
+ <input type="checkbox" name="delete_image_sm[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image delete short') ?>
+
+ <br />
+ <label><?php echo __('text products image xl') ?></label>
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_xl", "image", '') ?>">
+ <?php echo tep_draw_input_field('products_image_xl['.$cpt.']','products_image_xl'.$cpt, $img->products_image_xl).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ <?php echo tep_draw_hidden_field('products_image_xl', $img->products_image_xl) ?>
+ <br />
+
+ <?php if (tep_not_null($img->products_image_xl)) : ?>
+ <?php echo tep_image(DIR_WS_CATALOG_IMAGES . $img->products_image_xl, products::$pInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT, 'align="left" hspace="0" vspace="5"') ?>
+ <br />
+ <input type="checkbox" name="unlink_image_xl[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image remove short') ?>
+ <input type="checkbox" name="delete_image_xl[<?php echo $i ?>]" value="yes" class="check"><?php echo __('text products image delete short') ?>
+ <?php endif; ?>
+
+ <?php endif; ?>
+
+ </p>
+ <?php endforeach; ?>
+ </fielset>
+
+ <fielset>
+
+ <p class="block_input">
+ <label><?php echo __('Ajouter image supplementaire mini') ?></label>
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_add_min", "image", '') ?>">
+ <?php echo tep_draw_input_field('products_image_add_min','', $img->products_image_sm_1).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ <br />
+ <label><?php echo __('Ajouter image supplementaire maxi') ?></label>
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_add_max", "image", '') ?>">
+ <?php echo tep_draw_input_field('products_image_add_max','', $img->products_image_sm_1).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ </p>
+ </fielset>
+</div>
Modified: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt 2011-05-09 18:17:28 UTC (rev 3719)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt 2011-05-09 21:13:07 UTC (rev 3720)
@@ -28,6 +28,24 @@
define('TEXT_PRODUCTS_IMAGE_TH_NOTICE', '<b>SM = Small Images,</b> if a "SM" image is used<br>(Alone) NO Pop-up window link is created, the "SM"<br>(small image) will be placed directly under the products<br>description. if used inconjunction with a<br>"XL" image on the right, A Pop-up Window Link<br> is created and the "XL" image will be<br>shown in a Pop-up window.<br><br>');
define('TEXT_PRODUCTS_IMAGE_XL_NOTICE', '<b>XL = Large Images,</b> Used for the Pop-up image<br><br><br>');
define('TEXT_PRODUCTS_IMAGE_ADDITIONAL', 'More Addition Images - These will appear below product description if used.');
-define('TEXT_PRODUCTS_IMAGE_SM_1', 'SM Image 1:');
-define('TEXT_PRODUCTS_IMAGE_XL_1', 'XL Image 1:');
+
+
+/* Page edit product */
+$lang['text products image remove short']= 'Retirer';
+$lang['text products image xl']= 'Image';
+$lang['text products image sm']= 'Miniature';
+$lang['les images presente']= 'Les image(s) présente(s)';
+
+
+$lang['UltimateImage heading image xl']= 'Grande';
+$lang['UltimateImage heading image sm']= 'Minitature';
+$lang['UltimateImage heading action']= 'Actions';
+$lang['UltimateImage heading edit image products']= 'Gestions des images du produit';
+$lang['UltimateImage txt add img product']= 'Selectionner une image : ';
+
+/* delete image */
+$lang['UltimateImage heading title option edit']= 'Editer/ajouter une image';
+
+/* delete image */
+$lang['UltimateImage heading title option delete']= 'Supprimer cette image';
?>
\ No newline at end of file
Modified: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php 2011-05-09 18:17:28 UTC (rev 3719)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/admin/includes/modules/products/UltimateImage.php 2011-05-09 21:13:07 UTC (rev 3720)
@@ -1,18 +1,33 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.0
- @date 09/10/10, 18:33
+ @date 09/05/11, 21:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class UltimateImage
@subpackage UltimateImage
+ @brief Backoffice class
+
+
+
+ TODO
+ - Mettre en place la purge des image associé a un produit lors de la suppression du produit
+ - Inserer correction les boutons lors de l'ajout d'image (RowsAction)
+ - aJouter une methode pour remplacer l'image classique produit, et y ajouter Une minitaure de chacunne des images
+ - ajouter une redirection classique apres execution sans js
*/
+
+
class UltimateImage{
/**
+ @var whith/height Thumb
+ */
+ public static $THUMB = '100';
+ /**
*/
public $code;
@@ -20,8 +35,22 @@
public $description;
public $sort_order;
public $enabled;
+ /**
+ @var public object
+ */
public static $iInfo;
+ /**
+ @var public list
+ */
+ public static $iList=array();
+ /**
+ @var string
+ */
+ public static $action;
+
+
+
/**
Constructeur
*/
@@ -42,17 +71,120 @@
}
-// function get_header_js ($action) {
-// }
+ /**
+ @brief process for module
+ Use javascript in section for close popup after process
+ */
public function check_action($actions){
global $messageStack;
-// if($this->product_investigation['any_problems']) $messageStack->add('<b>Warning: </b>'. qtpro_doctor_formulate_product_investigation($this->product_investigation, 'short_suggestion') ,'warning');
+
+ self::$action=$actions['action'];
+
+ switch(self::$action){
+ /**
+ @remarks general action for products
+ */
+ case 'deleteconfirm':
+
+ break;
+
+
+
+ /**
+ @remarks specific action for images
+ */
+ case 'Imgdeleteconfirm':
+ $pID = tep_db_prepare_input($_GET['pID']);
+ $iID = tep_db_prepare_input($_GET['iID']);
+
+ tep_db_query($sql="DELETE FROM " . TABLE_PRODUCTS_IMAGES . " where products_id = '".$pID."' and id='".$iID."' LIMIT 1; ");
+
+ echo
+ '<script type="text/javascript"><!-- // '."\n".
+ " \n".
+
+ " function post_load_page(){}; \n".
+ " parent.$('#ListImage_".$iID."').remove(); \n".
+ " parent.$.fancybox.close(); \n".
+ '//--></script>';
+ exit;
+ break;
+
+ case 'Imgupdate':
+ $iID = (int)(isset($_REQUEST['iID'])?tep_db_prepare_input(@$_REQUEST['iID']) : 0);
+ $pID = (int)tep_db_prepare_input((int)$_REQUEST['pID']);
+
+ if(isset($_POST['products_image_add_min']) && !empty($_POST['products_image_add_min'])
+ || isset($_POST['products_image_add_max']) && !empty($_POST['products_image_add_max']) ) {
+
+ $sql_data_array['products_image_sm']=( (!empty($_POST['products_image_add_min']))
+ ? tep_db_prepare_input( (( strpos($_POST['products_image_add_min'],DIR_WS_CATALOG_IMAGES) ===false)
+ ? $_POST['products_image_add_min']
+ : substr($_POST['products_image_add_min'], strlen( DIR_WS_CATALOG_IMAGES) )
+ )
+ )
+ : ''
+ );
+ $sql_data_array['products_image_xl']=( (!empty($_POST['products_image_add_max']))
+ ? tep_db_prepare_input( (( strpos($_POST['products_image_add_max'],DIR_WS_CATALOG_IMAGES) ===false )
+ ? $_POST['products_image_add_max']
+ : substr($_POST['products_image_add_max'], strlen( DIR_WS_CATALOG_IMAGES) )
+ )
+ )
+ : ''
+ );
+
+ $sql_data_array['products_id']=$pID;
+ $sql_data_array['status']=1;
+
+ }
+
+ if($iID===0){
+ $res=tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array);
+ $iID=$res->__get('insertId');
+ $mode=1;
+ }
+ else{
+ tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array, 'update', " id='".$iID."' ");
+ $mode=2;
+ }
+
+
+// var_dump($sql_data_array);
+ $result="<td>".tep_image(DIR_WS_CATALOG_IMAGES.$sql_data_array['products_image_sm'],'',self::$THUMB)."</td>".
+ "<td>".tep_image(DIR_WS_CATALOG_IMAGES.$sql_data_array['products_image_xl'],'',self::$THUMB)."</td>".
+ "<td>"/*.(self::RowsAction($iID))*/."</td>";
+
+ echo
+ '<script type="text/javascript"><!-- // '."\n".
+ " \n";
+
+ if($mode===1) echo " parent.$('table#ListImage tbody').prepend( $('"."<tr id=\"ListImage_".$iID."\">".$result."</tr>"."') ); \n";
+ else {
+ echo " parent.$('#ListImage_".$iID."').replaceWith( $('"."<tr id=\"ListImage_".$iID."\">".$result."</tr>"."') ); \n";
+ }
+
+
+ echo " parent.$.fancybox.close(); \n".
+ '//--></script>';
+ exit;
+ break;
+
+ }
+
+
+
return $actions;
}
+
+
+// function get_header_js ($action) {
+// }
+
/**
*/
public function insert_table_products(){
@@ -60,7 +192,6 @@
// $DB=Database::getInstance();
-// MaxiDVD Added ULTRA Image SM - LG 1
if ((isset($_POST['delete_image_sm_1']) && $_POST['delete_image_sm_1'] == 'yes') /*&& ($image_sm_1_count['total']<= '1')*/) {
@unlink(DIR_FS_CATALOG_IMAGES . $_POST['products_previous_image_sm_1']);
}
@@ -68,56 +199,20 @@
if ((isset($_POST['delete_image_xl_1']) && $_POST['delete_image_xl_1'] == 'yes') /*&& ($image_xl_1_count['total']<= '1')*/) {
@unlink(DIR_FS_CATALOG_IMAGES . $_POST['products_previous_image_xl_1']);
}
-// products_image[UltimateImage][add]
- if(isset($_POST['products_image_add_min']) ||isset($_POST['products_image_add_max']) ) {
-// if ( !empty($_FILES['products_image_add_min']['tmp_name']) ){
-// $new_image_min = new upload('products_image_add_min', DIR_WS_CATALOG_IMAGES);
-// $sql_data_array['products_image_sm']=tep_db_prepare_input(substr($_POST['products_image_add_min'], strlen( DIR_WS_CATALOG_IMAGES) ) );
-// }
-// else $sql_data_array['products_image_sm']='';
+ if(isset($_POST['products_image_add_min']) && !empty($_POST['products_image_add_min'])
+ || isset($_POST['products_image_add_max']) && !empty($_POST['products_image_add_max']) ) {
-// if ( !empty($_FILES['products_image_add_max']['tmp_name']) ){
-// $new_image_min = new upload('products_image_add_max', DIR_WS_CATALOG_IMAGES);
- $sql_data_array['products_image_sm']=(!empty($_POST['products_image_add_min'])) ?tep_db_prepare_input(substr($_POST['products_image_add_min'], strlen( DIR_WS_CATALOG_IMAGES) ) ) : '' ;
+ $sql_data_array['products_image_sm']=(!empty($_POST['products_image_add_min'])) ?tep_db_prepare_input(substr($_POST['products_image_add_min'], strlen( DIR_WS_CATALOG_IMAGES) ) ) : '' ;
$sql_data_array['products_image_xl']=(!empty($_POST['products_image_add_max'])) ?tep_db_prepare_input(substr($_POST['products_image_add_max'], strlen( DIR_WS_CATALOG_IMAGES) ) ) : '' ;
-// }
-// else $sql_data_array['products_image_xl']='';
-// print_r($sql_data_array);
-// exit;
+
+
$sql_data_array['products_id']=(int)$_GET['pID'];
$sql_data_array['status']=1;
tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array);
}
-//
-// foreach($_POST['products_image'][__CLASS__]['add'] as $image)
-
-
-// if ((@$_POST['unlink_image_sm_1'] == 'yes') or (@$_POST['delete_image_sm_1'] == 'yes')) {
-// $sql_data_array['products_image_sm_1'] = '';
-// } else {
-// if (isset($_POST['products_image_sm_1']) && tep_not_null($_POST['products_image_sm_1']) && ($_POST['products_image_sm_1'] != 'none')) {
-// if( substr($_POST['products_image_sm_1'], 0,strlen( DIR_WS_CATALOG_IMAGES)) ==DIR_WS_CATALOG_IMAGES )
-// $sql_data_array['products_image_sm_1'] = tep_db_prepare_input(substr($_POST['products_image_sm_1'], strlen( DIR_WS_CATALOG_IMAGES) ) );
-// else
-// $sql_data_array['products_image_sm_1'] = tep_db_prepare_input($_POST['products_image_sm_1']);
-//
-// }
-// }
-// if ((@$_POST['unlink_image_xl_1'] == 'yes') or (@$_POST['delete_image_xl_1'] == 'yes')) {
-// $sql_data_array['products_image_xl_1'] = '';
-// } else {
-// if (isset($_POST['products_image_xl_1']) && tep_not_null($_POST['products_image_xl_1']) && ($_POST['products_image_xl_1'] != 'none')) {
-// if( substr($_POST['products_image_xl_1'], 0,strlen( DIR_WS_CATALOG_IMAGES)) ==DIR_WS_CATALOG_IMAGES )
-// $sql_data_array['products_image_xl_1'] = tep_db_prepare_input(substr($_POST['products_image_xl_1'], strlen( DIR_WS_CATALOG_IMAGES) ) );
-// else
-// $sql_data_array['products_image_xl_1'] = tep_db_prepare_input($_POST['products_image_xl_1']);
-//
-// }
-// }
-
return array();
}
@@ -137,10 +232,12 @@
$product_query = tep_db_query("select * from " . TABLE_PRODUCTS_IMAGES . " p where p.products_id = '".$pID."' ");
$res=$product_query->fetchAllAssoc();
foreach($res as $img)
- self::$iInfo[]=new ObjectInfo($img);
+ self::$iList[]=new ObjectInfo($img);
}
+
+
/**
Vue lors edition produits
*/
@@ -148,12 +245,76 @@
global $pInfo;
$title= __('tab products utltimate image');
- $m =tep_get_include_contents('products.'.__CLASS__.'.'.__FUNCTION__);
+ /// use master gabarit
+ $m = MGabCont::CallGab('listing',__FUNCTION__,__CLASS__);
- $contents []=array('title'=> $title,'text'=> $m);
+ $contents[]=array('title'=> $title,'text'=> $m);
}
- function function check() {
+
+ public function display_view(){
+ $action=self::$action;
+ switch(self::$action){
+ case 'new_image':
+ $action='edit';
+ self::$iInfo=new ObjectInfo(array('products_image_sm'=>'','products_image_xl'=>''));
+ break;
+ case 'edit':
+ self::$iInfo=self::loadValues ((int)@$_GET['pID'],(int)@$_GET['iID']);
+ break;
+ default:
+ }
+
+ /// use master gabarit
+ return MGabCont::CallGab($action,__FUNCTION__,__CLASS__);
+ }
+
+
+ /**
+ @brief Rows action column
+ */
+ static public function RowsAction($id){
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ '',
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), 'fancyView iframe', UltimateImage::HrefLinkInMod('edit', 'iID='.$id) ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancyView iframe', UltimateImage::HrefLinkInMod('delete', 'iID='.$id) ,'' )
+ );
+ }
+
+ /**
+ @brief function for construct link use in aca action page
+ @param $separate bool false or string name key array
+ @return full href string, or partiel string extract array (page or param) or array
+ */
+ public static function HrefLinkInMod($action, $param='', $separate=false) {
+ if(!empty($param)) $param = '&'.$param;
+
+ if(strpos($param,'iID')===false) $param .='&iID='.@$_GET['iID'];
+ if(strpos($param,'pID')===false) $param .='&pID='.@$_GET['pID'];
+ if(strpos($param,'forceview')===false) $param .='&forceview=true';
+
+ $b=array('page'=>'aca.php',
+ 'param'=>'action_type=products&action_class='.__CLASS__.'&action_method=display_view&action='.$action.$param);
+
+ if(is_bool($separate) && !$separate)
+ return tep_href_link('aca.php', 'action_type=products&action_class='.__CLASS__.'&action_method=display_view&action='.$action.$param);
+
+ elseif(is_string($separate))
+ return (isset($b[$separate] )?$b[$separate] : $n);
+ }
+
+ /**
+ @brief load specific id in table image
+ */
+ private static function loadValues ($pID,$iID) {
+ $product_query = tep_db_query("select * from " . TABLE_PRODUCTS_IMAGES . " p where p.products_id = '".$pID."' and id='".$iID."' ");
+ return new ObjectInfo($product_query->fetchAssoc());
+ }
+
+
+
+ public function check() {
if (!isset($this->_check)) {
$check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_ACA_ULTIMATEIMAGE_STATUS'");
$this->_check = tep_db_num_rows($check_query);
@@ -161,11 +322,11 @@
return $this->_check;
}
- function function install() { return false ; }
+ public function install() { return false ; }
- function function remove(){ return false ; }
+ public function remove(){ return false ; }
- function function keys() {
+ public function keys() {
return array( 'MODULE_ACA_ULTIMATEIMAGE_STATUS',
'MODULE_ACA_ULTIMATEIMAGE_SORT_ORDER');
}
Modified: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/includes/modules/products/UltimateImage.php
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/includes/modules/products/UltimateImage.php 2011-05-09 18:17:28 UTC (rev 3719)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/catalog/includes/modules/products/UltimateImage.php 2011-05-09 21:13:07 UTC (rev 3720)
@@ -1,46 +1,45 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.0
- @date 09/10/10, 18:33
+ @date 09/05/11, 21:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class UltimateImage
@subpackage UltimateImage
+ @brief Frontoffice class
*/
-class UltimateImage extends product{
+class UltimateImage
+ extends AbstractProduct
+ implements InterfaceModule {
+
function __construct($page=''){
global $page;
$this->code = __CLASS__;
$this->sort_order = (defined('MODULE_ACAPRO_ULTIMATEIMAGE_SORT_ORDER')) ? MODULE_ACAPRO_ULTIMATEIMAGE_SORT_ORDER : 0 ;
$this->enabled = true;
- $this->pID=(int)$_GET['products_id'];
+ if(!is_object($page)) return null;
$this->language_id=$page->the_var('languages_id');
+
+ define('TABLE_PRODUCTS_IMAGES', DB_TABLE_PREFIX.'products_images' );
}
function get_header($action=''){
global $page;
-
+ $this->pID=(int)$_GET['products_id'];
$this->load_db_values((int)$this->pID);
//! calcu des images présente et ajout dans la pile des produits
$db_block=array();
- if(is_array($this->imgs))
- foreach($this->imgs as $key=>$img){
- $s=split('_',$key);
- $list[$s[3]][$s[2]]=$img;
- $list[$s[3]]['key']=$key;
- }
-
- if(isset($list) && is_array($list))
- foreach($list as $img){
- $img['xl']=(!empty($img['xl']))? $img['xl'] :$img['sm'];
+ if( is_array($this->imgs))
+ foreach($this->imgs as $img){
+ $img['xl']=(!empty($img['products_image_xl']))? $img['products_image_xl'] :$img['products_image_sm'];
if(tep_not_null($img['xl']) && !in_array($img['xl'],$db_block)){
$db_block[]=$img['xl'];
if(!in_array( $img,$page->product->pile_img)) $page->product->pile_img[]=$img['xl'];
@@ -54,7 +53,10 @@
*/
public function load_db_values($pID){
$product_query = tep_db_query("select * from " . TABLE_PRODUCTS_IMAGES . " p where p.products_id = '".$pID."' and status =1 ");
- $this->imgs=tep_db_fetch_array($product_query);
+
+ while($i = tep_db_fetch_array($product_query))
+ $this->imgs[]=$i;
+
$this->viewimg=(tep_db_num_rows($product_query)>0)?true:false;
tep_db_free_result($product_query);
}
@@ -63,22 +65,17 @@
Liste les titre
*/
- public function display_view($pID){
+ public function display_view($pID,$class=''){
global $page;
$m=array();
if(!isset($this->viewimg))$this->load_db_values((int)$pID);
if(!$this->viewimg) return array(new objectInfo(array('title'=>'','content'=>'')));
- foreach($this->imgs as $key=>$img){
- $s=split('_',$key);
- $list[$s[3]][$s[2]]=$img;
- $list[$s[3]]['key']=$key;
- }
$content='<div id=\'additionalImages\'><ul id="gallery_img"> ';
- foreach($list as $img){
- $img['xl']=(!empty($img['xl']))? $img['xl'] :$img['sm'];
+ foreach($this->imgs as $img){
+ $img['xl']=(!empty($img['products_image_xl']))? $img['products_image_xl'] :$img['products_image_sm'];
if(tep_not_null($img['xl'])){
$content .='<li>';
$content .='<p><a class="fancy" rel="fancy" href="' . tep_href_link(DIR_WS_IMAGES . $img['xl']) . '">' . tep_image(DIR_WS_IMAGES . $img['sm'], $img['key'], $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'), ' id="image_master" ', 'simple') . '</a><br /><a class="fancy" rel="fancy" href="' . tep_href_link(DIR_WS_IMAGES . $img['xl']). '">' . TEXT_CLICK_TO_ENLARGE . '</a></p>'."\n";
@@ -93,5 +90,11 @@
return array(new objectInfo($v));
}
+
+/** implements InterfaceModule depend */
+ public function check() {}
+ public function install() {}
+ public function remove() {}
+ public function keys() {}
}
?>
\ No newline at end of file
Modified: branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml
===================================================================
--- branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml 2011-05-09 18:17:28 UTC (rev 3719)
+++ branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/install.xml 2011-05-09 21:13:07 UTC (rev 3720)
@@ -10,7 +10,9 @@
<addfile>
<file name="admin/includes/modules/products/UltimateImage.php" />
- <file name="admin/includes/gabarit/products.UltimateImage.display_edit.gab" />
+ <file name="admin/includes/gabarit/UltimateImage/display_edit.listing.gab" />
+ <file name="admin/includes/gabarit/UltimateImage/display_view.edit.gab" />
+ <file name="admin/includes/gabarit/UltimateImage/display_edit.delete.gab" />
<file name="includes/modules/products/UltimateImage.php" />
</addfile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
