Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12290] XoopsModules/oledrion/branches/voltan/ oledrion
|
From: <be...@us...> - 2014-02-07 11:05:25
|
Revision: 12290
http://sourceforge.net/p/xoops/svn/12290
Author: beckmi
Date: 2014-02-07 11:05:17 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
Changes from Voltan (see changelog)
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/location.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/maintain.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/packing.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/payment.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/texts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vat.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/csv.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/dbase.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/export.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/french/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/nusoap.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/index.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/menu.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/productsselector.php
XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
XoopsModules/oledrion/branches/voltan/oledrion/all-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/all-products.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_best_sales.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_block_tag.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categories.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categoy_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_mostviewed_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_my_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_new.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_promotion.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_rated.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recent_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recentlysold.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_top.php
XoopsModules/oledrion/branches/voltan/oledrion/caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/cancel-payment.php
XoopsModules/oledrion/branches/voltan/oledrion/categories-map.php
XoopsModules/oledrion/branches/voltan/oledrion/category.php
XoopsModules/oledrion/branches/voltan/oledrion/cgv.php
XoopsModules/oledrion/branches/voltan/oledrion/checkout.php
XoopsModules/oledrion/branches/voltan/oledrion/class/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/PersistableObjectHandler.php
XoopsModules/oledrion/branches/voltan/oledrion/class/classheader.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_cat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_commands.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_currency.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_files.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways_options.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_handlers.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_packing.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment_log.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_persistent_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products_list.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_productsmanu.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_related.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_votedata.php
XoopsModules/oledrion/branches/voltan/oledrion/class/registryfile.php
XoopsModules/oledrion/branches/voltan/oledrion/class/tree.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Canvas.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Dimension.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Exception.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/FileMapperFactory.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Image.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/OpFactory.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/PaletteImage.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/TrueColorImage.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/WideImage.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/fonts/Font_GDF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/fonts/Font_TTF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_GD.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_GD2.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_GIF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_JPEG.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_PNG.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/ApplyConvolution.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/ApplyFilter.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/ApplyMask.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/AsGrayscale.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/CopyChannelsPalette.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/CopyChannelsTrueColor.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/CorrectGamma.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Crop.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Flip.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/GetMask.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Merge.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Mirror.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Resize.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Rotate.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Unsharp.class.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_delete.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_edit.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_fast.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_new.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_post.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_reply.php
XoopsModules/oledrion/branches/voltan/oledrion/config.php
XoopsModules/oledrion/branches/voltan/oledrion/css/autocomplete.css
XoopsModules/oledrion/branches/voltan/oledrion/css/oledrion.css
XoopsModules/oledrion/branches/voltan/oledrion/css/print.css
XoopsModules/oledrion/branches/voltan/oledrion/css/rateit.css
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/download.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/clone.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/plugins/rssfit.oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/plugins/oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/gateway-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/header.php
XoopsModules/oledrion/branches/voltan/oledrion/images/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/images/cartadd.png
XoopsModules/oledrion/branches/voltan/oledrion/include/comment_functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/common.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_install.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_update.php
XoopsModules/oledrion/branches/voltan/oledrion/include/notification.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/include/plugin.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/voltan/oledrion/include/search.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/index.php
XoopsModules/oledrion/branches/voltan/oledrion/invoice.php
XoopsModules/oledrion/branches/voltan/oledrion/js/tableWidget.js
XoopsModules/oledrion/branches/voltan/oledrion/language/english/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/list.php
XoopsModules/oledrion/branches/voltan/oledrion/list.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/my-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/notification_update.php
XoopsModules/oledrion/branches/voltan/oledrion/paypal-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/actions/newelements/plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_action.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_filter.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php
XoopsModules/oledrion/branches/voltan/oledrion/recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/rss.php
XoopsModules/oledrion/branches/voltan/oledrion/search.php
XoopsModules/oledrion/branches/voltan/oledrion/sql/mysql.sql
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_bill.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/voltan/oledrion/thankyou.php
XoopsModules/oledrion/branches/voltan/oledrion/view.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/whoswho.php
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_sms.php
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/example/
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/example/option.php
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/example/sms.php
XoopsModules/oledrion/branches/voltan/oledrion/class/sms.zip
XoopsModules/oledrion/branches/voltan/oledrion/docs/todo.txt
XoopsModules/oledrion/branches/voltan/oledrion/images/delivery.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/16/
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/16/factory.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/factory.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/money_delete.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/package.png
XoopsModules/oledrion/branches/voltan/oledrion/images/package.png
XoopsModules/oledrion/branches/voltan/oledrion/images/submit.png
XoopsModules/oledrion/branches/voltan/oledrion/images/track.png
XoopsModules/oledrion/branches/voltan/oledrion/include/directorychecker.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_bill_print.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product_print.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_user.html
XoopsModules/oledrion/branches/voltan/oledrion/user.php
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/js/validate/lib/jquery.js
Added: XoopsModules/oledrion/branches/voltan/oledrion/.directory
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/.directory (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/.directory 2014-02-07 11:05:17 UTC (rev 12290)
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2013,11,21,10,10,32
+Version=3
+ViewMode=2
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -554,4 +554,3 @@
exit;
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -275,4 +275,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -27,19 +27,63 @@
case 'default': // Affichage du dashboard
// ****************************************************************************************************************
xoops_cp_header();
+
+ include_once dirname(dirname(dirname(__FILE__))) . '/include/directorychecker.php';
+
oledrion_utils::htitle(_MI_OLEDRION_ADMENU10, 4);
$indexAdmin = new ModuleAdmin();
- $indexAdmin->addConfigBoxLine(OLEDRION_UPLOAD_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_UPLOAD_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_ATTACHED_FILES_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_ATTACHED_FILES_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_PICTURES_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_PICTURES_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_CSV_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_CSV_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_CACHE_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_CACHE_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_UPLOAD_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_UPLOAD_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_ATTACHED_FILES_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_ATTACHED_FILES_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_PICTURES_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_PICTURES_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_CSV_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_CSV_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_CACHE_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_CACHE_PATH, '777'), 'chmod');
+ $categories = $h_oledrion_cat->getCategoriesCount();
+ if($categories == 0) {
+ $link = OLEDRION_ADMIN_URL . 'index.php?op=maintain&action=import';
+ $link = sprintf('<a href="%s">%s</a>', $link, _AM_OLEDRION_IMPORT_DATA_TITLE);
+ $text = sprintf(_AM_OLEDRION_IMPORT_DATA_TEXT, $link);
+ $indexAdmin->addInfoBox(_AM_OLEDRION_IMPORT_DATA);
+ $indexAdmin->addInfoBoxLine(_AM_OLEDRION_IMPORT_DATA, $text);
+ }
+
+
+//------ check directories ---------------
+
+$indexAdmin->addConfigBoxLine('');
+$redirectFile = $_SERVER['PHP_SELF'];
+
+$languageConstants = array(_AM_OLEDRION_AVAILABLE,_AM_OLEDRION_NOTAVAILABLE, _AM_OLEDRION_CREATETHEDIR, _AM_OLEDRION_NOTWRITABLE, _AM_OLEDRION_SETMPERM, _AM_OLEDRION_DIRCREATED,_AM_OLEDRION_DIRNOTCREATED,_AM_OLEDRION_PERMSET,_AM_OLEDRION_PERMNOTSET);
+
+//$path = $xoopsModuleConfig['uploaddir'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_UPLOAD_PATH,0777,$languageConstants,$redirectFile));
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['screenshots'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_ATTACHED_FILES_PATH,0777,$languageConstants,$redirectFile));
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['catimage'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_PICTURES_PATH,0777,$languageConstants,$redirectFile));
+
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['mainimagedir'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_CSV_PATH,0777,$languageConstants,$redirectFile));
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['catimage'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_CACHE_PATH,0777,$languageConstants,$redirectFile));
+
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['mainimagedir'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_TEXT_PATH,0777,$languageConstants,$redirectFile));
+
+//echo $indexAdmin->addNavigation('index.php');
+//echo $indexAdmin->renderIndex();
+//echo wfd_serverstats();
+//---------------------------
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
@@ -170,4 +214,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -21,41 +21,30 @@
/**
* Check is admin
*/
-if (!defined("OLEDRION_ADMIN")) {
- exit();
-}
+if (!defined("OLEDRION_ADMIN")) exit();
switch ($action) {
case 'default':
xoops_cp_header();
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
$delivery = array();
- $form = "<form method='post' action='$baseurl' name='frmadddelivery' id='frmadddelivery'><input type='hidden' name='op' id='op' value='delivery' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='"
- . _AM_OLEDRION_ADD_ITEM . "' /></form>";
+ $form = "<form method='post' action='$baseurl' name='frmadddelivery' id='frmadddelivery'><input type='hidden' name='op' id='op' value='delivery' /><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_ADMENU20, 4);
- $delivery = $h_oledrion_delivery->getAllDelivery(
- new oledrion_parameters(array('start' => $start, 'limit' => $limit))
- );
+ $delivery = $h_oledrion_delivery->getAllDelivery(new oledrion_parameters(array('start' => $start, 'limit' => $limit)));
$class = '';
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr><th align='center'>" . _AM_OLEDRION_ID . "</th><th align='center'>" . _AM_OLEDRION_DELIVERY_TITLE
- . "</th><th align='center'>" . _OLEDRION_ONLINE . "</th><th align='center'>" . _AM_OLEDRION_ACTION
- . "</th></tr>";
+ echo "<tr><th align='center'>" . _AM_OLEDRION_ID . "</th><th align='center'>" . _AM_OLEDRION_DELIVERY_TITLE . "</th><th align='center'>" . _OLEDRION_ONLINE . "</th><th align='center'>" . _AM_OLEDRION_ACTION . "</th></tr>";
foreach ($delivery as $item) {
- $id = $item->getVar('delivery_id');
- $class = ($class == 'even') ? 'odd' : 'even';
- $actions = array();
- $actions[] = "<a href='$baseurl?op=delivery&action=edit&id=" . $id . "' title='" . _OLEDRION_EDIT . "'>"
- . $icones['edit'] . '</a>';
- $actions[] = "<a href='$baseurl?op=delivery&action=delete&id=" . $id . "' title='" . _OLEDRION_DELETE . "'"
- . $conf_msg . ">" . $icones['delete'] . '</a>';
- $online = $item->getVar('delivery_online') == 1 ? _YES : _NO;
+ $id = $item->getVar('delivery_id');
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $actions = array();
+ $actions[] = "<a href='$baseurl?op=delivery&action=edit&id=" . $id . "' title='" . _OLEDRION_EDIT . "'>" . $icones['edit'] . '</a>';
+ $actions[] = "<a href='$baseurl?op=delivery&action=delete&id=" . $id . "' title='" . _OLEDRION_DELETE . "'" . $conf_msg . ">" . $icones['delete'] . '</a>';
+ $online = $item->getVar('delivery_online') == 1 ? _YES : _NO;
echo "<tr class='" . $class . "'>\n";
- echo "<td align='center'>" . $id . "</td><td align='center'>" . $item->getVar('delivery_title')
- . "</td><td align='center'>" . $online . "</td><td align='center'>" . implode(' ', $actions)
- . "</td>\n";
+ echo "<td align='center'>" . $id . "</td><td align='center'>" . $item->getVar('delivery_title') . "</td><td align='center'>" . $online . "</td><td align='center'>" . implode(' ', $actions) . "</td>\n";
echo "<tr>\n";
}
$class = ($class == 'even') ? 'odd' : 'even';
@@ -71,7 +60,7 @@
xoops_cp_header();
if ($action == 'edit') {
$title = _AM_OLEDRION_DELIVERY_EDIT;
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
if (empty($id)) {
oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
}
@@ -81,23 +70,19 @@
if (!is_object($item)) {
oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl, 5);
}
- $edit = true;
+ $edit = true;
$label_submit = _AM_OLEDRION_MODIFY;
} else {
- $title = _AM_OLEDRION_DELIVERY_ADD;
- $item = $h_oledrion_delivery->create(true);
+ $title = _AM_OLEDRION_DELIVERY_ADD;
+ $item = $h_oledrion_delivery->create(true);
$label_submit = _AM_OLEDRION_ADD;
- $edit = false;
+ $edit = false;
}
$sform = new XoopsThemeForm($title, 'frmadddelivery', $baseurl);
$sform->addElement(new XoopsFormHidden('op', 'delivery'));
$sform->addElement(new XoopsFormHidden('action', 'save'));
$sform->addElement(new XoopsFormHidden('delivery_id', $item->getVar('delivery_id')));
- $sform->addElement(
- new XoopsFormText(_AM_OLEDRION_DELIVERY_TITLE, 'delivery_title', 50, 150, $item->getVar(
- 'delivery_title', 'e'
- )), true
- );
+ $sform->addElement(new XoopsFormText(_AM_OLEDRION_DELIVERY_TITLE, 'delivery_title', 50, 150, $item->getVar('delivery_title', 'e')), true);
// Add payment options ************************************************************
$payments = $deliveryPayments = $payments_d = $deliveryPayments_d = array();
@@ -128,31 +113,21 @@
if ($action == 'edit' && $item->pictureExists()) {
$pictureTray = new XoopsFormElementTray(_AM_OLEDRION_CURRENT_PICTURE, '<br />');
- $pictureTray->addElement(
- new XoopsFormLabel('', "<img src='" . $item->getPictureUrl() . "' alt='' border='0' />")
- );
+ $pictureTray->addElement(new XoopsFormLabel('', "<img src='" . $item->getPictureUrl() . "' alt='' border='0' />"));
$deleteCheckbox = new XoopsFormCheckBox('', 'delpicture');
$deleteCheckbox->addOption(1, _DELETE);
$pictureTray->addElement($deleteCheckbox);
$sform->addElement($pictureTray);
unset($pictureTray, $deleteCheckbox);
}
- $sform->addElement(
- new XoopsFormFile(_AM_OLEDRION_PICTURE, 'attachedfile', oledrion_utils::getModuleOption('maxuploadsize')),
- false
- );
- $editor = oledrion_utils::getWysiwygForm(
- _AM_OLEDRION_DESCRIPTION, 'delivery_description', $item->getVar('delivery_description', 'e'), 15, 60,
- 'description_hidden'
- );
+ $sform->addElement(new XoopsFormFile(_AM_OLEDRION_PICTURE, 'attachedfile', oledrion_utils::getModuleOption('maxuploadsize')), false);
+ $editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DESCRIPTION, 'delivery_description', $item->getVar('delivery_description', 'e'), 15, 60, 'description_hidden');
if ($editor) {
$sform->addElement($editor, false);
}
- $sform->addElement(
- new XoopsFormRadioYN(_OLEDRION_ONLINE_HLP, 'delivery_online', $item->getVar('delivery_online')), true
- );
+ $sform->addElement(new XoopsFormRadioYN(_OLEDRION_ONLINE_HLP, 'delivery_online', $item->getVar('delivery_online')), true);
$button_tray = new XoopsFormElementTray('', '');
- $submit_btn = new XoopsFormButton('', 'post', $label_submit, 'submit');
+ $submit_btn = new XoopsFormButton('', 'post', $label_submit, 'submit');
$button_tray->addElement($submit_btn);
$sform->addElement($button_tray);
$sform = oledrion_utils::formMarkRequiredFields($sform);
@@ -179,15 +154,10 @@
$item->deletePicture();
}
$destname = '';
- $res1 = oledrion_utils::uploadFile(0, OLEDRION_PICTURES_PATH);
+ $res1 = oledrion_utils::uploadFile(0, OLEDRION_PICTURES_PATH);
if ($res1) {
if (oledrion_utils::getModuleOption('resize_others')) { // Eventuellement on redimensionne l'image
- oledrion_utils::resizePicture(
- OLEDRION_PICTURES_PATH . DIRECTORY_SEPARATOR . $destname,
- OLEDRION_PICTURES_PATH . DIRECTORY_SEPARATOR . $destname,
- oledrion_utils::getModuleOption('images_width'), oledrion_utils::getModuleOption('images_height'),
- true
- );
+ oledrion_utils::resizePicture(OLEDRION_PICTURES_PATH . DIRECTORY_SEPARATOR . $destname, OLEDRION_PICTURES_PATH . DIRECTORY_SEPARATOR . $destname, oledrion_utils::getModuleOption('images_width'), oledrion_utils::getModuleOption('images_height'), true);
}
$item->setVar('delivery_image', basename($destname));
} else {
@@ -267,4 +237,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -281,8 +281,8 @@
} else {
oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
}
+ break;
-
// ****************************************************************************************************************
case 'saveedit': // Enregistrement d'une réduction après modification ou ajout
// ****************************************************************************************************************
@@ -339,4 +339,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -191,4 +191,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -207,4 +207,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -95,4 +95,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/location.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/location.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/location.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -85,9 +85,9 @@
// Get delivery methods
$deliveres = $h_oledrion_delivery->getLocationDelivery(new oledrion_parameters(array('limit' => $limit, 'location' => $id)));
if (empty($deliveres)) {
- oledrion_utils::redirect(_AM_OLEDRION_LOCATION_DELIVERYADD, $baseurl, 5);
+ oledrion_utils::redirect(_AM_OLEDRION_LOCATION_DELIVERYADD, $baseurl, 5);
}
-
+
$sform = new XoopsThemeForm($title, 'frmaddlocation', $baseurl);
$sform->addElement(new XoopsFormHidden('op', 'location'));
$sform->addElement(new XoopsFormHidden('action', 'save'));
@@ -102,7 +102,7 @@
$product_type->addOption('parent', _AM_OLEDRION_LOCATION_PARENT);
$sform->addElement($product_type, true);
$sform->addElement(new XoopsFormRadioYN(_OLEDRION_ONLINE_HLP, 'location_online', $item->getVar('location_online')), true);
-
+
$delivery_options = new XoopsFormElementTray(_AM_OLEDRION_LOCATION_DELIVERY, '<br />');
foreach ($deliveres as $delivery) {
if (isset($delivery['ld_id']) && is_array($delivery['ld_id'])) {
@@ -162,9 +162,9 @@
$item->setVars($post);
if($post['location_type'] == 'parent') {
$item->setVar('location_pid', 0);
- }
+ }
$res = $h_oledrion_location->insert($item);
-
+
$location_id = $item->getVar('location_id');
// Save payments for each delivery type
if ($edit) {
@@ -184,7 +184,7 @@
}
}
- if ($res) {
+ if ($res) {
oledrion_utils::updateCache();
oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
} else {
@@ -238,4 +238,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -86,4 +86,3 @@
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/maintain.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/maintain.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/maintain.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -7,7 +7,7 @@
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.
-*/
+ */
/**
* oledrion
@@ -21,30 +21,78 @@
/**
* Check is admin
*/
-if (!defined("OLEDRION_ADMIN")) exit();
+if (!defined("OLEDRION_ADMIN"))
+ exit();
switch ($action) {
- case 'default':
- xoops_cp_header();
- xoops_confirm(array('op' => 'maintain', 'action' => 'confirm'), 'index.php', _AM_OLEDRION_CONF_MAINTAIN);
- break;
-
- case 'confirm':
- xoops_cp_header();
- require '../../xoops_version.php';
- $tables = array();
- foreach ($modversion['tables'] as $table) {
- $tables[] = $xoopsDB->prefix($table);
- }
- if (count($tables) > 0) {
- $list = implode(',', $tables);
- $xoopsDB->queryF('CHECK TABLE ' . $list);
- $xoopsDB->queryF('ANALYZE TABLE ' . $list);
- $xoopsDB->queryF('OPTIMIZE TABLE ' . $list);
- }
- oledrion_utils::updateCache();
- $h_oledrion_products->forceCacheClean();
- oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl, 2);
- break;
+ case 'default' :
+ xoops_cp_header();
+ xoops_confirm(array('op' => 'maintain', 'action' => 'confirm'), 'index.php', _AM_OLEDRION_CONF_MAINTAIN);
+ break;
+
+ case 'confirm' :
+ xoops_cp_header();
+ require OLEDRION_PATH . 'xoops_version.php';
+ $tables = array();
+ foreach ($modversion['tables'] as $table) {
+ $tables[] = $xoopsDB -> prefix($table);
+ }
+ if (count($tables) > 0) {
+ $list = implode(',', $tables);
+ $xoopsDB -> queryF('CHECK TABLE ' . $list);
+ $xoopsDB -> queryF('ANALYZE TABLE ' . $list);
+ $xoopsDB -> queryF('OPTIMIZE TABLE ' . $list);
+ }
+ oledrion_utils::updateCache();
+ $h_oledrion_products -> forceCacheClean();
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl, 2);
+ break;
+
+ case 'import' :
+ xoops_cp_header();
+ $categories = $h_oledrion_cat -> getCategoriesCount();
+ if ($categories == 0) {
+ xoops_confirm(array('op' => 'maintain', 'action' => 'doimport'), 'index.php', _AM_OLEDRION_IMPORT_CONF);
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl, 2);
+ }
+ break;
+
+ case 'doimport' :
+ xoops_cp_header();
+ $categories = $h_oledrion_cat -> getCategoriesCount();
+ if ($categories == 0) {
+
+ $cat_array = array('cat_cid' => 1, 'cat_pid' => 0, 'cat_title' => 'Test category');
+ $cat = $h_oledrion_cat -> create();
+ $cat -> setVars($cat_array);
+ $res = $h_oledrion_cat -> insert($cat);
+
+ $manufacturer_array = array('manu_id' => 1, 'manu_name' => 'Test manufacturer');
+ $manufacturer = $h_oledrion_manufacturer -> create(true);
+ $manufacturer -> setVars($manufacturer_array);
+ $res = $h_oledrion_manufacturer -> insert($manufacturer);
+
+ $product_array = array('product_id' => 1, 'product_cid' => 1, 'product_title' => 'Test product', 'product_vendor_id' => 1, 'product_submitter' => 1, 'product_online' => 1, 'product_submitted' => time(), 'product_price' => '100', 'product_summary' => 'Test test test test test test test test test test test test test test test test test', 'product_vat_id' => 1, 'product_stock' => 100);
+ $product = $h_oledrion_products -> create(true);
+ $product -> setVars($product_array);
+ $res = $h_oledrion_products -> insert($product);
+
+ $productsmanu_array = array('pm_id' => 1, 'pm_id' => 1, 'pm_manu_id' => 1);
+ $productsmanu = $h_oledrion_productsmanu -> create(true);
+ $productsmanu -> setVars($productsmanu_array);
+ $res = $h_oledrion_products -> insert($productsmanu);
+
+ $vat_array = array('vat_id' => 1, 'vat_rate' => '0.00', 'vat_country' => 'us');
+ $vat = $h_oledrion_vat -> create(true);
+ $vat -> setVars($vat_array);
+ $res = $h_oledrion_vat -> insert($vat);
+
+ $vendor_array = array('vendor_id' => 1, 'vendor_name' => 'Test vendor');
+ $vendor = $h_oledrion_vendors -> create(true);
+ $vendor -> setVars($vendor_array);
+ $res = $h_oledrion_vendors -> insert($vendor);
+ }
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl, 2);
+ break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -216,4 +216,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -128,4 +128,3 @@
include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -39,7 +39,7 @@
}
$_SESSION['filter3'] = $filter3;
$selected = array('', '', '', '', '', '');
- $conditions = array(OLEDRION_STATE_NOINFORMATION, OLEDRION_STATE_VALIDATED, OLEDRION_STATE_PENDING, OLEDRION_STATE_FAILED, OLEDRION_STATE_CANCELED, OLEDRION_STATE_FRAUD);
+ $conditions = array(OLEDRION_STATE_NOINFORMATION, OLEDRION_STATE_VALIDATED, OLEDRION_STATE_PENDING, OLEDRION_STATE_FAILED, OLEDRION_STATE_CANCELED, OLEDRION_STATE_FRAUD, OLEDRION_STATE_PACKED, OLEDRION_STATE_SUBMITED, OLEDRION_STATE_DELIVERYED);
$selected[$filter3] = " selected='selected'";
$criteria = new CriteriaCompo();
@@ -56,8 +56,21 @@
$orders = $h_oledrion_commands->getObjects($criteria);
$class = '';
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- $form = "<form method='post' name='frmfilter' id='frmfilter' action='$baseurl'><b>" . _AM_OLEDRION_LIMIT_TO . "</b> <select name='filter3' id='filter3'><option value='0'" . $selected[0] . ">" . _OLEDRION_CMD_STATE1 . "</option><option value='1'" . $selected[1] . ">" . _OLEDRION_CMD_STATE2 . "</option><option value='2'" . $selected[2] . ">" . _OLEDRION_CMD_STATE3 . "</option><option value='3'" . $selected[3] . ">" . _OLEDRION_CMD_STATE4 . "</option><option value='4'" . $selected[4] . ">" . _OLEDRION_CMD_STATE5 . "</option><option value='5'" . $selected[5] . ">" . _OLEDRION_CMD_STATE6 . "</option></select> <input type='hidden' name='op' id='op' value='orders' /><input type='submit' name='btnfilter' id='btnfilter' value='" . _AM_OLEDRION_FILTER . "' /></form>";
+ $form = "<form method='post' name='frmfilter' id='frmfilter' action='$baseurl'><b>" . _AM_OLEDRION_LIMIT_TO . "</b> <select name='filter3' id='filter3'>
+ <option value='0'" . $selected[0] . ">" . _OLEDRION_CMD_STATE1 . "</option>
+ <option value='1'" . $selected[1] . ">" . _OLEDRION_CMD_STATE2 . "</option>
+ <option value='2'" . $selected[2] . ">" . _OLEDRION_CMD_STATE3 . "</option>
+ <option value='3'" . $selected[3] . ">" . _OLEDRION_CMD_STATE4 . "</option>
+ <option value='4'" . $selected[4] . ">" . _OLEDRION_CMD_STATE5 . "</option>
+ <option value='5'" . $selected[5] . ">" . _OLEDRION_CMD_STATE6 . "</option>
+ <option value='6'" . $selected[6] . ">" . _OLEDRION_CMD_STATE7 . "</option>
+ <option value='7'" . $selected[7] . ">" . _OLEDRION_CMD_STATE8 . "</option>
+ <option value='8'" . $selected[8] . ">" . _OLEDRION_CMD_STATE9 . "</option>
+ </select> <input type='hidden' name='op' id='op' value='orders' /><input type='submit' name='btnfilter' id='btnfilter' value='" . _AM_OLEDRION_FILTER . "' /></form>";
$confValidateOrder = oledrion_utils::javascriptLinkConfirm(_AM_OLEDRION_CONF_VALIDATE);
+ $confPackOrder = oledrion_utils::javascriptLinkConfirm(_AM_OLEDRION_CONF_Pack);
+ $confSubmitOrder = oledrion_utils::javascriptLinkConfirm(_AM_OLEDRION_CONF_SUBMIT);
+ $confDeliveryOrder = oledrion_utils::javascriptLinkConfirm(_AM_OLEDRION_CONF_DELIVERY);
echo "<tr><td colspan='2' align='left'>";
if (isset($pagenav) && is_object($pagenav)) {
echo $pagenav->renderNav();
@@ -83,6 +96,10 @@
$actions[] = "<a target='_blank' href='$baseurl?op=orders&action=print&id=" . $id . "' title='" . _OLEDRION_PRINT_VERSION . "'>" . $icones['print'] . '</a>';
$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>';
+ $actions[] = "<a href='$baseurl?op=orders&action=pack&id=" . $id . "' " . $confPackOrder . " title='" . _OLEDRION_PACK . "'>" . $icones['package'] . '</a>';
+ $actions[] = "<a href='$baseurl?op=orders&action=submit&id=" . $id . "' " . $confSubmitOrder . " title='" . _OLEDRION_SUBMIT . "'>" . $icones['submit'] . '</a>';
+ $actions[] = "<a href='$baseurl?op=orders&action=delivery&id=" . $id . "' " . $confDeliveryOrder . " title='" . _OLEDRION_DELIVERY . "'>" . $icones['delivery'] . '</a>';
+ $actions[] = "<a href='$baseurl?op=orders&action=track&id=" . $id . "' title='" . _OLEDRION_TRACK . "'>" . $icones['track'] . '</a>';
echo "<tr class='" . $class . "'>\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";
@@ -147,6 +164,13 @@
if (is_object($item)) {
$res = $h_oledrion_commands->validateOrder($item);
if ($res) {
+ // Send sms
+ if (oledrion_utils::getModuleOption('sms_validate')) {
+ $information['to'] = ltrim($item -> getVar('cmd_mobile'), 0);
+ $information['text'] = oledrion_utils::getModuleOption('sms_validate_text');
+ $sms = oledrion_sms::sendSms($information);
+ }
+ //
oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
} else {
oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
@@ -157,6 +181,93 @@
break;
// ****************************************************************************************************************
+ case 'pack': // Validation d'une commande
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if (empty($id)) {
+ oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
+ }
+ $opRedirect = 'orders';
+ $item = $h_oledrion_commands->get($id);
+ if (is_object($item)) {
+ $res = $h_oledrion_commands->packOrder($item);
+ if ($res) {
+ // Send sms
+ if (oledrion_utils::getModuleOption('sms_validate')) {
+ $information['to'] = ltrim($item -> getVar('cmd_mobile'), 0);
+ $information['text'] = oledrion_utils::getModuleOption('sms_pack_text');
+ $sms = oledrion_sms::sendSms($information);
+ }
+ //
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+ }
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+ }
+ break;
+
+ // ****************************************************************************************************************
+ case 'submit': // Validation d'une commande
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if (empty($id)) {
+ oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
+ }
+ $opRedirect = 'orders';
+ $item = $h_oledrion_commands->get($id);
+ if (is_object($item)) {
+ $res = $h_oledrion_commands->submitOrder($item);
+ if ($res) {
+ // Send sms
+ if (oledrion_utils::getModuleOption('sms_validate')) {
+ $information['to'] = ltrim($item -> getVar('cmd_mobile'), 0);
+ $information['text'] = oledrion_utils::getModuleOption('sms_submit_text');
+ $sms = oledrion_sms::sendSms($information);
+ }
+ //
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+ }
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+ }
+ break;
+
+ // ****************************************************************************************************************
+ case 'delivery': // Validation d'une commande
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if (empty($id)) {
+ oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
+ }
+ $opRedirect = 'orders';
+ $item = $h_oledrion_commands->get($id);
+ if (is_object($item)) {
+ $res = $h_oledrion_commands->deliveryOrder($item);
+ if ($res) {
+ // Send sms
+ if (oledrion_utils::getModuleOption('sms_validate')) {
+ $information['to'] = ltrim($item -> getVar('cmd_mobile'), 0);
+ $information['text'] = oledrion_utils::getModuleOption('sms_delivery_text');
+ $sms = oledrion_sms::sendSms($information);
+ }
+ //
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+ }
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+ }
+ break;
+
+ // ****************************************************************************************************************
case 'export': // Export des commandes au format CSV
// ****************************************************************************************************************
xoops_cp_header();
@@ -174,7 +285,6 @@
$result = $export->export();
if ($result === true) {
echo "<a href='" . $export->getDownloadUrl() . "'>" . _AM_OLEDRION_EXPORT_READY . '</a>';
- //echo "<a href='$baseurl?op=orders&action=deleteexport&file=".$export->getDownloadPath()."'>".
}
}
} else {
@@ -182,7 +292,60 @@
}
include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
break;
+
// ****************************************************************************************************************
+ case 'track': // track
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ oledrion_utils::htitle(_MI_OLEDRION_ADMENU5, 4);
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if (empty($id)) {
+ oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
+ }
+ $item = $h_oledrion_commands->get($id);
+
+ $sform = new XoopsThemeForm(_OLEDRION_TRACK, 'frmproduct', $baseurl);
+ $sform->setExtra('enctype="multipart/form-data"');
+ $sform->addElement(new XoopsFormHidden('op', 'orders'));
+ $sform->addElement(new XoopsFormHidden('action', 'savetrack'));
+ $sform->addElement(new XoopsFormHidden('cmd_id', $item->getVar('cmd_id')));
+ $sform->addElement(new XoopsFormText(_OLEDRION_TRACK, 'cmd_track', 50, 255, $item->getVar('cmd_track', 'e')), true);
+ $button_tray = new XoopsFormElementTray('', '');
+ $submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
+ $button_tray->addElement($submit_btn);
+ $sform->addElement($button_tray);
+ $sform = oledrion_utils::formMarkRequiredFields($sform);
+ $sform->display();
+
+ include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
+ break;
+
+ // ****************************************************************************************************************
+ case 'savetrack': // save track
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ $id = isset($_POST['cmd_id']) ? intval($_POST['cmd_id']) : 0;
+ $item = $h_oledrion_commands->get($id);
+ $opRedirect = 'orders';
+ if (!is_object($item)) {
+ oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl, 5);
+ }
+ $item->setVar('cmd_track', $_POST['cmd_track']);
+ $res = $h_oledrion_commands->insert($item);
+ if ($res) {
+ // Send sms
+ if (oledrion_utils::getModuleOption('sms_track')) {
+ $information['to'] = ltrim($item -> getVar('cmd_mobile'), 0);
+ $information['text'] = oledrion_utils::getModuleOption('sms_track_text');
+ $sms = oledrion_sms::sendSms($information);
+ }
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+ }
+ break;
+
+ // ****************************************************************************************************************
case 'print': // Print invoice
// ****************************************************************************************************************
xoops_cp_header();
@@ -271,4 +434,3 @@
xoops_cp_footer();
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/packing.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/packing.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/packing.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -192,4 +192,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/payment.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/payment.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/payment.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -212,4 +212,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -163,6 +163,13 @@
}
$actions = array();
+
+
+ $actions[] = "<a href='$baseurl?op=products&action=related&id=" . $id . "' title='" . _OLEDRION_RELATED_PRODUCTS . "'>" . $icones['details'] . '</a>';
+
+
+
+
$actions[] = "<a href='$baseurl?op=products&action=edit&id=" . $id . "' title='" . _OLEDRION_EDIT . "'>" . $icones['edit'] . '</a>';
$actions[] = "<a href='$baseurl?op=products&action=copy&id=" . $id . "' title='" . _OLEDRION_DUPLICATE_PRODUCT . "'>" . $icones['copy'] . '</a>';
$actions[] = "<a href='$baseurl?op=products&action=confdelete&id=" . $id . "' title='" . _OLEDRION_DELETE . "'>" . $icones['delete'] . '</a>';
@@ -336,7 +343,9 @@
$downloadUrl->setDescription(_AM_OLEDRION_DOWNLOAD_EXAMPLE . ' ' . XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . 'image.png');
$sform->addElement($downloadUrl, false);
- $sform->addElement(new XoopsFormText(_AM_OLEDRION_URL_HLP, 'product_url', 50, 255, $item->getVar('product_url', 'e')), false);
+ $sform->addElement(new XoopsFormText(_AM...
[truncated message content] |
