From: <be...@us...> - 2012-07-23 19:21:14
|
Revision: 9913 http://xoops.svn.sourceforge.net/xoops/?rev=9913&view=rev Author: beckmi Date: 2012-07-23 19:21:03 +0000 (Mon, 23 Jul 2012) Log Message: ----------- Adding Oledrion 2.3.3 Beta 1 (Converted to XOOPS 2.5.5 GUI) Modified Paths: -------------- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/attributes.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php XoopsModules/oledrion/branches/mamba/oledrion/admin/dbupdate.php XoopsModules/oledrion/branches/mamba/oledrion/admin/exports/csv.php XoopsModules/oledrion/branches/mamba/oledrion/admin/exports/dbase.php XoopsModules/oledrion/branches/mamba/oledrion/admin/exports/export.php XoopsModules/oledrion/branches/mamba/oledrion/admin/functions.php XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/gateway.php XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/paypal/gateway.php XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/paypal/language/english/main.php XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/paypal/language/french/main.php XoopsModules/oledrion/branches/mamba/oledrion/admin/index.php XoopsModules/oledrion/branches/mamba/oledrion/admin/menu.php XoopsModules/oledrion/branches/mamba/oledrion/admin/productsselector.php XoopsModules/oledrion/branches/mamba/oledrion/admin/tablefunctions.php XoopsModules/oledrion/branches/mamba/oledrion/ajax.php XoopsModules/oledrion/branches/mamba/oledrion/all-lists.php XoopsModules/oledrion/branches/mamba/oledrion/all-products.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_best_sales.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_block_tag.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_cart.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_categories.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_categoy_lists.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_mostviewed_lists.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_my_lists.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_new.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_promotion.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_random.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_random_lists.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_rated.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_recent_lists.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_recentlysold.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_recommended.php XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_top.php XoopsModules/oledrion/branches/mamba/oledrion/caddy.php XoopsModules/oledrion/branches/mamba/oledrion/cancel-payment.php XoopsModules/oledrion/branches/mamba/oledrion/categories-map.php XoopsModules/oledrion/branches/mamba/oledrion/category.php XoopsModules/oledrion/branches/mamba/oledrion/cgv.php XoopsModules/oledrion/branches/mamba/oledrion/checkout.php XoopsModules/oledrion/branches/mamba/oledrion/class/PEAR.php XoopsModules/oledrion/branches/mamba/oledrion/class/PersistableObjectHandler.php XoopsModules/oledrion/branches/mamba/oledrion/class/classheader.php XoopsModules/oledrion/branches/mamba/oledrion/class/lite.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_attributes.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_caddy.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_caddy_attributes.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_cat.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_commands.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_currency.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_discounts.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_files.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_gateways.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_gateways_options.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_handlers.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_lists.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_manufacturer.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_parameters.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_persistent_cart.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_plugins.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_products.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_products_list.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_productsmanu.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_related.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_shelf.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_shelf_parameters.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_utils.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_vat.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_vendors.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_votedata.php XoopsModules/oledrion/branches/mamba/oledrion/class/registryfile.php XoopsModules/oledrion/branches/mamba/oledrion/comment_delete.php XoopsModules/oledrion/branches/mamba/oledrion/comment_edit.php XoopsModules/oledrion/branches/mamba/oledrion/comment_new.php XoopsModules/oledrion/branches/mamba/oledrion/comment_post.php XoopsModules/oledrion/branches/mamba/oledrion/comment_reply.php XoopsModules/oledrion/branches/mamba/oledrion/config.php XoopsModules/oledrion/branches/mamba/oledrion/download.php XoopsModules/oledrion/branches/mamba/oledrion/extra/modules/rss/plugins/rssfit.oledrion.php XoopsModules/oledrion/branches/mamba/oledrion/extra/modules/sitemap/plugins/oledrion.php XoopsModules/oledrion/branches/mamba/oledrion/gateway-notify.php XoopsModules/oledrion/branches/mamba/oledrion/header.php XoopsModules/oledrion/branches/mamba/oledrion/include/comment_functions.php XoopsModules/oledrion/branches/mamba/oledrion/include/common.php XoopsModules/oledrion/branches/mamba/oledrion/include/functions.php XoopsModules/oledrion/branches/mamba/oledrion/include/notification.inc.php XoopsModules/oledrion/branches/mamba/oledrion/include/plugin.tag.php XoopsModules/oledrion/branches/mamba/oledrion/include/product_search_form.php XoopsModules/oledrion/branches/mamba/oledrion/include/search.inc.php XoopsModules/oledrion/branches/mamba/oledrion/index.php XoopsModules/oledrion/branches/mamba/oledrion/invoice.php XoopsModules/oledrion/branches/mamba/oledrion/js/attributes.js XoopsModules/oledrion/branches/mamba/oledrion/js/jquery/jquery.js XoopsModules/oledrion/branches/mamba/oledrion/language/english/addtocart.png XoopsModules/oledrion/branches/mamba/oledrion/language/english/addtowishlist.png XoopsModules/oledrion/branches/mamba/oledrion/language/english/admin.php XoopsModules/oledrion/branches/mamba/oledrion/language/english/blocks.php XoopsModules/oledrion/branches/mamba/oledrion/language/english/main.php XoopsModules/oledrion/branches/mamba/oledrion/language/english/modinfo.php XoopsModules/oledrion/branches/mamba/oledrion/language/french/Copie de addtowishlist.png XoopsModules/oledrion/branches/mamba/oledrion/language/french/addtowishlist.png XoopsModules/oledrion/branches/mamba/oledrion/language/french/admin.php XoopsModules/oledrion/branches/mamba/oledrion/language/french/blocks.php XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_client.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_client_cancel.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_client_verified.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_cancel.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_failed.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_fraud.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_pending.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_verified.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/global_newcategory_notify.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/global_newproduct_notify.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/shop_lowstock.tpl XoopsModules/oledrion/branches/mamba/oledrion/language/french/main.php XoopsModules/oledrion/branches/mamba/oledrion/language/french/messages.js XoopsModules/oledrion/branches/mamba/oledrion/language/french/modinfo.php XoopsModules/oledrion/branches/mamba/oledrion/language/french/newsletter.php XoopsModules/oledrion/branches/mamba/oledrion/language/persian/admin.php XoopsModules/oledrion/branches/mamba/oledrion/language/persian/blocks.php XoopsModules/oledrion/branches/mamba/oledrion/language/persian/main.php XoopsModules/oledrion/branches/mamba/oledrion/language/persian/modinfo.php XoopsModules/oledrion/branches/mamba/oledrion/list.php XoopsModules/oledrion/branches/mamba/oledrion/list.tag.php XoopsModules/oledrion/branches/mamba/oledrion/manufacturer.php XoopsModules/oledrion/branches/mamba/oledrion/media.php XoopsModules/oledrion/branches/mamba/oledrion/my-lists.php XoopsModules/oledrion/branches/mamba/oledrion/notification_update.php XoopsModules/oledrion/branches/mamba/oledrion/paypal-notify.php XoopsModules/oledrion/branches/mamba/oledrion/pdf/catalog.php XoopsModules/oledrion/branches/mamba/oledrion/pdf/config/tcpdf_config.php XoopsModules/oledrion/branches/mamba/oledrion/plugins/actions/newelements/plugins.php XoopsModules/oledrion/branches/mamba/oledrion/plugins/models/oledrion_action.php XoopsModules/oledrion/branches/mamba/oledrion/plugins/models/oledrion_filter.php XoopsModules/oledrion/branches/mamba/oledrion/product.php XoopsModules/oledrion/branches/mamba/oledrion/rate-product.php XoopsModules/oledrion/branches/mamba/oledrion/recommended.php XoopsModules/oledrion/branches/mamba/oledrion/rss.php XoopsModules/oledrion/branches/mamba/oledrion/search.php XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_bestsales.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_cart.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_categories.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_category_lists.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_mostviewed_lists.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_my_lists.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_new.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_promotion.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_random.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_random_lists.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_rated.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_recent_lists.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_recentlysold.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_recommended.html XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_top.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_all_lists.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_allproducts.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_bill.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_caddy.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_cancelpurchase.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_categories_list.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_category.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_cgv.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_chunk.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_command.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_index.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_list.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_manufacturer.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_map.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_mylists.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_product.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_productsselector.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_rate_product.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_recommended.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_search.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_thankyou.html XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_whoswho.html XoopsModules/oledrion/branches/mamba/oledrion/thankyou.php XoopsModules/oledrion/branches/mamba/oledrion/view.tag.php XoopsModules/oledrion/branches/mamba/oledrion/whoswho.php XoopsModules/oledrion/branches/mamba/oledrion/xoops_version.php Added Paths: ----------- XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php XoopsModules/oledrion/branches/mamba/oledrion/admin/admin_footer.php XoopsModules/oledrion/branches/mamba/oledrion/admin/admin_header.php XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php XoopsModules/oledrion/branches/mamba/oledrion/class/PEAR5.php XoopsModules/oledrion/branches/mamba/oledrion/docs/ XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt XoopsModules/oledrion/branches/mamba/oledrion/docs/credits.txt XoopsModules/oledrion/branches/mamba/oledrion/docs/error_log XoopsModules/oledrion/branches/mamba/oledrion/docs/index.html XoopsModules/oledrion/branches/mamba/oledrion/docs/install.txt XoopsModules/oledrion/branches/mamba/oledrion/docs/lang_diff.txt XoopsModules/oledrion/branches/mamba/oledrion/docs/licence.txt XoopsModules/oledrion/branches/mamba/oledrion/docs/readme.txt XoopsModules/oledrion/branches/mamba/oledrion/js/jquery/jquery_132.js XoopsModules/oledrion/branches/mamba/oledrion/language/english/help/ XoopsModules/oledrion/branches/mamba/oledrion/language/english/help/help.html XoopsModules/oledrion/branches/mamba/oledrion/language/english/help/index.html Removed Paths: ------------- XoopsModules/oledrion/branches/mamba/oledrion/changelog.php XoopsModules/oledrion/branches/mamba/oledrion/error_log XoopsModules/oledrion/branches/mamba/oledrion/lang.diff XoopsModules/oledrion/branches/mamba/oledrion/language/english.old/ XoopsModules/oledrion/branches/mamba/oledrion/language/englishUTF8/ XoopsModules/oledrion/branches/mamba/oledrion/language/frenchUTF8/ XoopsModules/oledrion/branches/mamba/oledrion/licence.txt Added: XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php (rev 0) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -0,0 +1,29 @@ +<?php +/** + * Birthday module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package birthday + * @since 2.5.0 + * @author XOOPS Module Team + * @version $Id $ + **/ + +include_once dirname(__FILE__) . '/admin_header.php'; + +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); + +include 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/attributes.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/attributes.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/attributes.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Hervé Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Hervé Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Hervé Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -182,7 +182,7 @@ if(isset($pagenav) && is_object($pagenav)) { echo "<div align='right'>".$pagenav->renderNav()."</div>"; } - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** @@ -243,7 +243,7 @@ echo "<tr>\n"; } echo '</table>'; - show_footer(); + include_once 'admin_footer.php'; } break; @@ -354,7 +354,7 @@ oledrion_utils::callJavascriptFile('attributes.js', false, true); $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -82,7 +82,7 @@ $sform->addElement($button_tray); $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; @@ -175,7 +175,7 @@ $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; @@ -245,7 +245,7 @@ oledrion_utils::redirect(_AM_OLEDRION_ERROR_10, $baseurl, 5); } $msg = sprintf(_AM_OLEDRION_CONF_DEL_CATEG, $category->getVar('cat_title')); - xoops_confirm(array( 'op' => 'categories', 'action' => 'confdelete', 'id' => $id), 'index.php', $msg); + xoops_confirm(array( 'op' => 'categories', 'action' => 'confdelete', 'id' => $id), 'main.php', $msg); break; Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -121,7 +121,7 @@ echo "</td></tr>\n"; echo "</table>\n"; } - show_footer(); + include_once 'admin_footer.php'; break; Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -31,7 +31,7 @@ case 'default': // Gestion des r\xE9ductions // **************************************************************************************************************** xoops_cp_header(); - oledrion_adminMenu(7); + //oledrion_adminMenu(7); $form = "<form method='post' action='$baseurl' name='frmadddiscount' id='frmadddiscount'><input type='hidden' name='op' id='op' value='discounts' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='"._AM_OLEDRION_ADD_ITEM."' /></form>"; echo $form; oledrion_utils::htitle(_MI_OLEDRION_ADMENU6, 4); @@ -74,7 +74,7 @@ } $oledrion_reductions = new oledrion_reductions(); - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** @@ -82,7 +82,7 @@ case 'edit': // Edition d'une promo // **************************************************************************************************************** xoops_cp_header(); - oledrion_adminMenu(7); +// oledrion_adminMenu(7); if($action == 'edit') { $title = _AM_OLEDRION_EDIT_DISCOUNT; $id = isset($_GET['id']) ? intval($_GET['id']) : 0; @@ -242,10 +242,10 @@ $xoopsTpl->assign('discount', $discountForTemplate); $xoopsTpl->assign('currencyName', oledrion_utils::getModuleOption('money_full')); - $editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DISCOUNT_DESCR, 'disc_description', $item->getVar('disc_description','e'), 15, 60, 'description_hidden'); - $xoopsTpl->assign('editor', $editor->render()); + //$editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DISCOUNT_DESCR, 'disc_description', $item->getVar('disc_description','e'), 15, 60, 'description_hidden'); + //$xoopsTpl->assign('editor', $editor->render()); $xoopsTpl->display('db:oledrion_admin_discounts.html'); - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -74,7 +74,7 @@ if(isset($pagenav) && is_object($pagenav)) { echo "<div align='right'>".$pagenav->renderNav()."</div>"; } - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** @@ -134,7 +134,7 @@ $sform->addElement($button_tray); $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -68,7 +68,7 @@ echo '<br />'._AM_OLEDRION_GATEWAYS_CREDITS.$gatewayInformation['credits']; } echo "</td>\n"; - echo "<td>".formatTimestamp(strtotime($gatewayInformation['releaseDate']), 's')."</td>\n"; + echo "<td align='center'>".formatTimestamp(strtotime($gatewayInformation['releaseDate']), 's')."</td>\n"; echo "<td align='center'>"; $checked = ''; $isCurrentGateway = false; @@ -94,7 +94,7 @@ echo "</tr>\n"; } echo "</table>\n"; - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** @@ -114,7 +114,7 @@ echo $logContent; echo "</pre>\n"; echo "</div>\n"; - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -74,7 +74,7 @@ if(isset($pagenav) && is_object($pagenav)) { echo "<div align='right'>".$pagenav->renderNav()."</div>"; } - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -51,7 +51,7 @@ echo "<tr class='".$class."'>\n"; $name = 'qty_'.$id; $names[] = $id; - echo '<td>'.$link."</td><td align='right'>".$item->getVar('product_stock')."</td><td align='right'>".$item->getVar('product_alert_stock')."</td><td align='center'><input type='text' name='$name' id='$name' size='3' maxlength='5' value='' /></td>\n"; + echo '<td>'.$link."</td><td align='center'>".$item->getVar('product_stock')."</td><td align='center'>".$item->getVar('product_alert_stock')."</td><td align='center'><input type='text' name='$name' id='$name' size='3' maxlength='5' value='' /></td>\n"; echo "<tr>\n"; } $class = ($class == 'even') ? 'odd' : 'even'; @@ -62,7 +62,7 @@ if(isset($pagenav) && is_object($pagenav)) { echo "<div align='right'>".$pagenav->renderNav().'</div>'; } - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -73,7 +73,7 @@ if(isset($pagenav) && is_object($pagenav)) { echo "<div align='right'>".$pagenav->renderNav()."</div>"; } - show_footer(); + include_once 'admin_footer.php'; break; @@ -140,7 +140,7 @@ $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -59,7 +59,7 @@ $sform->addElement($button_tray); $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** @@ -129,7 +129,7 @@ fclose($fp); $newsfile = OLEDRION_NEWSLETTER_URL; echo "<a href='$newsfile' target='_blank'>"._AM_OLEDRION_NEWSLETTER_READY."</a>"; - show_footer(); + include_once 'admin_footer.php'; break; } ?> \ No newline at end of file Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -88,7 +88,7 @@ $actions[] = "<a href='$baseurl?op=orders&action=delete&id=".$id."' title='"._OLEDRION_DELETE."'".$conf_msg.">".$icones['delete'].'</a>'; $actions[] = "<a href='$baseurl?op=orders&action=validate&id=".$id."' ".$confValidateOrder." title='"._OLEDRION_VALIDATE_COMMAND."'>".$icones['ok'].'</a>'; echo "<tr class='".$class."'>\n"; - echo "<td align='right'>".$id."</td><td align='center'>".$date."</td><td align='center'>".$item->getVar('cmd_lastname').' '.$item->getVar('cmd_firstname')."</td><td align='center'>".$oledrion_Currency->amountForDisplay($item->getVar('cmd_total', 'n')).' / '.$oledrion_Currency->amountForDisplay($item->getVar('cmd_shipping'))."</td><td align='center'>".implode(' ', $actions)."</td>\n"; + echo "<td align='center'>".$id."</td><td align='center'>".$date."</td><td align='center'>".$item->getVar('cmd_lastname').' '.$item->getVar('cmd_firstname')."</td><td align='center'>".$oledrion_Currency->amountForDisplay($item->getVar('cmd_total', 'n')).' / '.$oledrion_Currency->amountForDisplay($item->getVar('cmd_shipping'))."</td><td align='center'>".implode(' ', $actions)."</td>\n"; echo "<tr>\n"; $totalOrder += floatval($item->getVar('cmd_total', 'n')); } @@ -98,7 +98,7 @@ if(isset($pagenav) && is_object($pagenav)) { echo "<div align='right'>".$pagenav->renderNav()."</div>"; } - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** @@ -112,7 +112,7 @@ } $item = $h_oledrion_commands->get($id); if(is_object($item)) { - xoops_confirm(array( 'op' => 'orders', 'action' => 'remove', 'id' => $id), 'index.php', _AM_OLEDRION_CONF_DELITEM); + xoops_confirm(array( 'op' => 'orders', 'action' => 'remove', 'id' => $id), 'main.php', _AM_OLEDRION_CONF_DELITEM); } else { oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl.'?op='.$opRedirect,5); } @@ -186,7 +186,7 @@ } else { oledrion_utils::redirect(_AM_OLEDRION_ERROR_11); } - show_footer(); + include_once 'admin_footer.php'; break; } Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -200,7 +200,7 @@ if(isset($pagenav) && is_object($pagenav)) { echo "<div align='right'>".$pagenav->renderNav()."</div>"; } - show_footer(); + //include_once 'admin_footer.php'; break; @@ -477,8 +477,8 @@ } $downloadFile = new XoopsFormFile(_OLEDRION_ATTACHED_FILE , 'attachedfile3', oledrion_utils::getModuleOption('maxuploadsize')); $downloadFile->setDescription(_AM_OLEDRION_ATTACHED_HLP); - $sform->addElement($downloadFile, false); - + $sform->addElement($downloadFile, false); + if(oledrion_utils::getModuleOption('product_property1')) { $property1select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', $item->getVar('product_property1')); $property1Array = explode('|',oledrion_utils::getModuleOption('product_property1')); @@ -486,8 +486,8 @@ $property1select->addOption($property1); } $sform->addElement($property1select, false); - } - + } + if(oledrion_utils::getModuleOption('product_property2')) { $property2select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY2, 'product_property2', $item->getVar('product_property2')); $property2Array = explode('|',oledrion_utils::getModuleOption('product_property2')); @@ -495,8 +495,8 @@ $property2select->addOption($property2); } $sform->addElement($property2select, false); - } - + } + if(oledrion_utils::getModuleOption('product_property3')) { $property3select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY3, 'product_property3', $item->getVar('product_property3')); $property3Array = explode('|',oledrion_utils::getModuleOption('product_property3')); @@ -504,8 +504,8 @@ $property3select->addOption($property3); } $sform->addElement($property3select, false); - } - + } + if(oledrion_utils::getModuleOption('product_property4')) { $property4select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY4, 'product_property4', $item->getVar('product_property4')); $property4Array = explode('|',oledrion_utils::getModuleOption('product_property4')); @@ -513,8 +513,8 @@ $property4select->addOption($property4); } $sform->addElement($property4select, false); - } - + } + if(oledrion_utils::getModuleOption('product_property5')) { $property5select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY5, 'product_property5', $item->getVar('product_property5')); $property5Array = explode('|',oledrion_utils::getModuleOption('product_property5')); @@ -522,8 +522,8 @@ $property5select->addOption($property5); } $sform->addElement($property5select, false); - } - + } + $button_tray = new XoopsFormElementTray('' ,''); $submit_btn = new XoopsFormButton('', 'post', $label_submit, 'submit'); $button_tray->addElement($submit_btn); @@ -531,7 +531,7 @@ $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; @@ -710,7 +710,7 @@ if(!is_object($item)) { oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl, 5); } - xoops_confirm(array( 'op' => 'products', 'action' => 'delete', 'id' => $id), 'index.php', _AM_OLEDRION_CONF_DELITEM.'<br />'.$item->getVar('product_title')); + xoops_confirm(array( 'op' => 'products', 'action' => 'delete', 'id' => $id), 'main.php', _AM_OLEDRION_CONF_DELITEM.'<br />'.$item->getVar('product_title')); break; @@ -756,7 +756,7 @@ echo "<tr>\n"; } echo '</table>'; - show_footer(); + //include_once 'admin_footer.php'; } break; } Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -1,41 +1,41 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * @copyright Hervé Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Gestion des textes affichés sur certaines pages pour les utilisateurs - */ -if(!defined("OLEDRION_ADMIN")) exit(); - +<?php +/** + * **************************************************************************** + * oledrion - MODULE FOR XOOPS + * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/) + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Hervé Thouzard (http://www.herve-thouzard.com/) + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package oledrion + * @author Hervé Thouzard (http://www.herve-thouzard.com/) + * + * Version : $Id: + * **************************************************************************** + */ + +/** + * Gestion des textes affichés sur certaines pages pour les utilisateurs + */ +if(!defined("OLEDRION_ADMIN")) exit(); + $configHandler =& xoops_gethandler('config'); $moduleIdCriteria = new Criteria('conf_modid',$xoopsModule->getVar('mid')); - -switch($action) { - - case 'default': - xoops_cp_header(); +switch($action) { + + case 'default': + + xoops_cp_header(); - $sform = new XoopsThemeForm(_MI_OLEDRION_ADMENU17, 'property', $baseurl); - $sform->addElement(new XoopsFormHidden('op', 'property')); + $sform = new XoopsThemeForm(_MI_OLEDRION_ADMENU17, 'property', $baseurl); + $sform->addElement(new XoopsFormHidden('op', 'property')); $sform->addElement(new XoopsFormHidden('action', 'fromproperty')); $property1 = new XoopsFormTextArea ( _AM_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', oledrion_utils::getModuleOption('product_property1'), 5, 90 ); @@ -58,15 +58,15 @@ $property5->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY5_DESC ); $sform->addElement ( $property5 ); - $button_tray = new XoopsFormElementTray('' ,''); - $submit_btn = new XoopsFormButton('', 'post', _AM_OLEDRION_MODIFY, 'submit'); - $button_tray->addElement($submit_btn); - $sform->addElement($button_tray); - $sform = oledrion_utils::formMarkRequiredFields($sform); + $button_tray = new XoopsFormElementTray('' ,''); + $submit_btn = new XoopsFormButton('', 'post', _AM_OLEDRION_MODIFY, 'submit'); + $button_tray->addElement($submit_btn); + $sform->addElement($button_tray); + $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - - show_footer(); - + + include_once 'admin_footer.php'; + break; case 'fromproperty': @@ -173,8 +173,8 @@ } } - oledrion_utils::updateCache(); - oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op=property', 2); + oledrion_utils::updateCache(); + oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op=property', 2); break; -} +} ?> \ No newline at end of file Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -11,10 +11,10 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * Version : $Id: * **************************************************************************** @@ -46,7 +46,7 @@ $actions[] = "<a href='$baseurl?op=vat&action=edit&id=".$id."' title='"._OLEDRION_EDIT."'>".$icones['edit'].'</a>'; $actions[] = "<a href='$baseurl?op=vat&action=delete&id=".$id."' title='"._OLEDRION_DELETE."'".$conf_msg.">".$icones['delete'].'</a>'; echo "<tr class='".$class."'>\n"; - echo "<td>".$id."</td><td align='right'>".$oledrion_Currency->amountInCurrency($item->getVar('vat_rate'))."</td><td align='left'>".ucfirst($item->getVar('vat_country'))."</td><td align='center'>".implode(' ', $actions)."</td>\n"; + echo "<td align='center'>".$id."</td><td align='center'>".$oledrion_Currency->amountInCurrency($item->getVar('vat_rate'))."</td><td align='center'>".ucfirst($item->getVar('vat_country'))."</td><td align='center'>".implode(' ', $actions)."</td>\n"; echo "<tr>\n"; } $class = ($class == 'even') ? 'odd' : 'even'; @@ -54,7 +54,7 @@ echo "<td colspan='3' align='center'>".$form."</td>\n"; echo "</tr>\n"; echo '</table>'; - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** @@ -96,7 +96,7 @@ $sform->addElement($button_tray); $sform = oledrion_utils::formMarkRequiredFields($sform); $sform->display(); - show_footer(); + include_once 'admin_footer.php'; break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php 2012-07-23 19:10:37 UTC (rev 9912) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php 2012-07-23 19:21:03 UTC (rev 9913) @@ -2,7 +2,7 @@ /** * **************************************************************************** * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) + * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source ... [truncated message content] |
From: <be...@us...> - 2012-07-23 23:14:21
|
Revision: 9916 http://xoops.svn.sourceforge.net/xoops/?rev=9916&view=rev Author: beckmi Date: 2012-07-23 23:14:15 +0000 (Mon, 23 Jul 2012) Log Message: ----------- Fixed: adding new discount didn't work Modified Paths: -------------- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 19:58:26 UTC (rev 9915) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 23:14:15 UTC (rev 9916) @@ -81,8 +81,9 @@ case 'add': // Ajout d'une promotion case 'edit': // Edition d'une promo // **************************************************************************************************************** - xoops_cp_header(); -// oledrion_adminMenu(7); + + xoops_cp_header(); + //oledrion_adminMenu(7); if($action == 'edit') { $title = _AM_OLEDRION_EDIT_DISCOUNT; $id = isset($_GET['id']) ? intval($_GET['id']) : 0; @@ -103,8 +104,10 @@ $label_submit = _AM_OLEDRION_ADD; $edit = false; } + include_once XOOPS_ROOT_PATH.'/class/template.php'; - $xoopsTpl = new XoopsTpl(); + global $xoopsTpl; +// $xoopsTpl = new XoopsTpl(); $xoopsTpl->assign('formTitle', $title); $xoopsTpl->assign('action', 'edit'); $xoopsTpl->assign('baseurl', $baseurl); @@ -244,8 +247,11 @@ $xoopsTpl->assign('currencyName', oledrion_utils::getModuleOption('money_full')); //$editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DISCOUNT_DESCR, 'disc_description', $item->getVar('disc_description','e'), 15, 60, 'description_hidden'); //$xoopsTpl->assign('editor', $editor->render()); + $xoopsTpl->display('db:oledrion_admin_discounts.html'); include_once 'admin_footer.php'; + + break; // **************************************************************************************************************** Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 19:58:26 UTC (rev 9915) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 23:14:15 UTC (rev 9916) @@ -756,7 +756,7 @@ echo "<tr>\n"; } echo '</table>'; - //include_once 'admin_footer.php'; + include_once 'admin_footer.php'; } break; } Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php 2012-07-23 19:58:26 UTC (rev 9915) +++ XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php 2012-07-23 23:14:15 UTC (rev 9916) @@ -111,5 +111,6 @@ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl, 2); break; } -xoops_cp_footer(); +//xoops_cp_footer(); +include_once 'admin_footer.php'; ?> \ No newline at end of file Modified: XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-23 19:58:26 UTC (rev 9915) +++ XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-23 23:14:15 UTC (rev 9916) @@ -411,7 +411,7 @@ $caddyCount = count($this->cart); // Initialisation des totaux g\xE9n\xE9raux (ht, tva et frais de port) - $totalHT = $totalVAT = $totalShipping = $totalEcotaxe = 0.0; + $totalHT = $totalVAT = $totalShipping = $totalEcotaxe = $totalDiscountPrice = 0.0; // Boucle sur tous les produits et sur chacune des r\xE8gles pour calculer le prix du produit (et ses frais de port) et voir si on doit y appliquer une r\xE9duction foreach($this->cart as $cartProduct) { Modified: XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt 2012-07-23 19:58:26 UTC (rev 9915) +++ XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt 2012-07-23 23:14:15 UTC (rev 9916) @@ -14,8 +14,9 @@ TODO: - selecting Product Option should be reflected in total Price -- Adding new Discount doesn't work +- make sure that discounts are calculated properly + --------------------------------------- 2.31 Final 2009-11-08 (Hervet) --------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-07-24 22:09:40
|
Revision: 9923 http://xoops.svn.sourceforge.net/xoops/?rev=9923&view=rev Author: beckmi Date: 2012-07-24 22:09:33 +0000 (Tue, 24 Jul 2012) Log Message: ----------- Fixing Total price calculations Modified Paths: -------------- XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html Modified: XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-24 22:00:17 UTC (rev 9922) +++ XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-24 22:09:33 UTC (rev 9923) @@ -707,7 +707,7 @@ $xoopsTpl->assign('totalEcotaxe', $totalEcotaxe); $vatAmount = $totalVAT; - $commandAmountTTC = $totalHT + $totalVAT + $totalShipping + $totalEcotaxe; + $commandAmountTTC = $discountAmount + $totalVAT + $totalShipping + $totalEcotaxe; $cartForTemplate = $this->cartForTemplate; return true; Modified: XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html =================================================================== --- XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html 2012-07-24 22:00:17 UTC (rev 9922) +++ XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html 2012-07-24 22:09:33 UTC (rev 9923) @@ -5,10 +5,10 @@ <input type='hidden' name='op' id='op' value='discounts' /> <input type='hidden' name='action' id='action' value='saveedit' /> <input type='hidden' name='disc_id' id='disc_id' value='<{$discount.disc_id}>' /> - <div class="center"><h3><{$formTitle}></h3> + <div align="center"><h3><{$formTitle}></h3> <table width='100%' class='outer' cellspacing='1'> <tr> - <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_INFORMATION}></th> <{* Informations sur la r\xE9duction *}> + <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_INFORMATION}></th> <{* Informations sur la r\xE9duction *}> </tr> <tr> <td class='head'><label for="disc_title"><{$smarty.const._AM_OLEDRION_DISCOUNT_TITLE}></label></td> @@ -24,7 +24,7 @@ </tr> <tr> <{* A qui ou selon quoi appliquer la r\xE9duction ? *}> - <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_WHOWHAT}></th> + <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_WHOWHAT}></th> </tr> <tr> <td class='head'><label for="disc_group"><{$smarty.const._AM_OLEDRION_DISCOUNT_XOOPS_GROUP}></label></td> @@ -47,7 +47,7 @@ </tr> <tr> <{* R\xE9duction sur le prix du produit ou le montant de la commande *}> - <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_PRICE}></th> + <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_PRICE}></th> </tr> <tr> <td class='head' vclass="top"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_TYPE}></td> @@ -111,7 +111,7 @@ </td> </tr> <tr> - <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPING_REDUCTIONS}></th> <{* R\xE9ductions sur les frais de port *}> + <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPING_REDUCTIONS}></th> <{* R\xE9ductions sur les frais de port *}> </tr> <tr> <td class='head' vclass='top'><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPINGS_ARE}></td> @@ -178,4 +178,4 @@ </tr> </table> </form> -<{/if}> +<{/if}> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |