Merge remote-tracking branch 'remotes/origin/release-7.002.4.0-RC2'

loadedcommerce · May 21, 2014 · 1f4e9fe · 1f4e9fe
2 parents eeaf58f + f5d61b6
commit 1f4e9fe
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 13 deletions.
diff --git a/catalog/admin/includes/applications/administrators_log/classes/administrators_log.php b/catalog/admin/includes/applications/administrators_log/classes/administrators_log.php
@@ -35,7 +35,7 @@ public static function getAll() {
     $QresultTotal->freeResult(); 
 
     /* Paging */
-    $sLimit = "";
+    $sLimit = " LIMIT 0,25 ";
     if (isset($_GET['iDisplayStart'])) {
       if ($_GET['iDisplayLength'] != -1) {
         $sLimit = " LIMIT " . $_GET['iDisplayStart'] . ", " . $_GET['iDisplayLength'];

diff --git a/catalog/admin/includes/applications/administrators_log/js/administrators_log.js.php b/catalog/admin/includes/applications/administrators_log/js/administrators_log.js.php
@@ -19,6 +19,7 @@
     "sAjaxSource": dataTableDataURL.replace('MEDIA', $.template.mediaQuery.name),
     "sPaginationType": paginationType, 
     "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]],
+    "iDisplayLength": 25,
     "aoColumns": [{ "sWidth": "25%", "bSortable": true, "sClass": "dataColModule" },
                   { "sWidth": "10%", "bSortable": true, "sClass": "dataColId hide-on-tablet" }, 
                   { "sWidth": "15%", "bSortable": true, "sClass": "dataColType hide-on-mobile-portrait" },

diff --git a/catalog/admin/includes/applications/countries/classes/countries.php b/catalog/admin/includes/applications/countries/classes/countries.php
@@ -31,7 +31,7 @@ public static function getAll() {
     $QresultTotal->freeResult();
 
     /* Paging */
-    $sLimit = "";
+    $sLimit = " LIMIT 0,25 ";
     if (isset($_GET['iDisplayStart'])) {
       if ($_GET['iDisplayLength'] != -1) {
         $sLimit = " LIMIT " . $_GET['iDisplayStart'] . ", " . $_GET['iDisplayLength'];

diff --git a/catalog/admin/includes/applications/countries/js/countries.js.php b/catalog/admin/includes/applications/countries/js/countries.js.php
@@ -20,6 +20,7 @@
         "sAjaxSource": dataTableDataURL.replace('MEDIA', $.template.mediaQuery.name),
         "sPaginationType": paginationType,
         "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]],
+        "iDisplayLength": 25,
         "aoColumns": [{ "sWidth": "10px", "bSortable": false, "sClass": "hide-on-mobile-portrait dataColCheck" },
                       { "sWidth": "60%", "bSortable": true, "sClass": "dataColZone" },
                       { "sWidth": "20%", "bSortable": false, "sClass": "hide-on-mobile-portrait dataColCode" },

diff --git a/catalog/admin/includes/applications/customer_groups/classes/customer_groups.php b/catalog/admin/includes/applications/customer_groups/classes/customer_groups.php
@@ -151,10 +151,12 @@ public static function save($id = null, $data, $default = false) {
     }
 
     foreach ( $lC_Language->getAll() as $l ) {
+      $group_name = str_replace('&#37;','%',$data['name'][$l['id']]);
+      $group_name = str_replace('&#64;','@',$group_name);
       $Qgroups = $lC_Database->query('insert into :table_customers_groups (customers_group_id, language_id, customers_group_name) values (:customers_group_id, :language_id, :customers_group_name)');
       $Qgroups->bindTable(':table_customers_groups', TABLE_CUSTOMERS_GROUPS);
       $Qgroups->bindInt(':customers_group_id', $customers_group_id);
-      $Qgroups->bindValue(':customers_group_name', $data['name'][$l['id']]);
+      $Qgroups->bindValue(':customers_group_name', $group_name);
       $Qgroups->bindInt(':language_id', $l['id']);
       $Qgroups->setLogging($_SESSION['module'], $customers_group_id);
       $Qgroups->execute();

diff --git a/catalog/admin/includes/applications/customer_groups/modal/edit.php b/catalog/admin/includes/applications/customer_groups/modal/edit.php
@@ -78,6 +78,10 @@ classes:  'blue-gradient glossy',
                   }
                 }).form();
                 if (bValid) {
+                  $("#osEdit :input").each(function(index, elm){
+                    $(elm).val($(elm).val().replace( /%/g, "&#37;" ));
+                    $(elm).val($(elm).val().replace( /@/g, "&#64;" ));
+                  });
                   var nvp = $("#osEdit").serialize();
                   var jsonLink = '<?php echo lc_href_link_admin('rpc.php', $lC_Template->getModule() . '&action=saveGroup&cgid=CGID&BATCH'); ?>'
                   $.getJSON(jsonLink.replace('CGID', parseInt(id)).replace('BATCH', nvp),

diff --git a/catalog/admin/includes/applications/customer_groups/modal/new.php b/catalog/admin/includes/applications/customer_groups/modal/new.php
@@ -74,6 +74,10 @@ classes:  'blue-gradient glossy',
                   }
                 }).form();
                 if (bValid) {
+                  $("#osNew :input").each(function(index, elm){
+                    $(elm).val($(elm).val().replace( /%/g, "&#37;" ));
+                    $(elm).val($(elm).val().replace( /@/g, "&#64;" ));
+                  });
                   var nvp = $("#osNew").serialize();
                   var jsonLink = '<?php echo lc_href_link_admin('rpc.php', $lC_Template->getModule() . '&action=saveGroup&BATCH'); ?>'
                   $.getJSON(jsonLink.replace('BATCH', nvp),

diff --git a/catalog/admin/includes/applications/customers/classes/customers.php b/catalog/admin/includes/applications/customers/classes/customers.php
@@ -30,7 +30,7 @@ public static function getAll() {
     $QresultTotal->freeResult();
 
     /* Paging */
-    $sLimit = "";
+    $sLimit = " LIMIT 0,25 ";
     if (isset($_GET['iDisplayStart'])) {
       if ($_GET['iDisplayLength'] != -1) {
         $sLimit = " LIMIT " . $_GET['iDisplayStart'] . ", " . $_GET['iDisplayLength'];

diff --git a/catalog/admin/includes/applications/customers/js/customers.js.php b/catalog/admin/includes/applications/customers/js/customers.js.php
@@ -23,6 +23,7 @@
       "sAjaxSource": dataTableDataURL.replace('MEDIA', $.template.mediaQuery.name),
       "sPaginationType": paginationType,
       "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]],
+      "iDisplayLength": 25,
       "aoColumns": [{ "sWidth": "10px", "bSortable": false, "sClass": "hide-on-mobile dataColCheck" },
                     { "sWidth": "10px", "bSortable": false, "sClass": "hide-on-mobile dataColIcon" },
                     { "sWidth": "22%", "bSortable": true, "sClass": "dataColLast" },

diff --git a/catalog/admin/includes/applications/error_log/js/error_log.js.php b/catalog/admin/includes/applications/error_log/js/error_log.js.php
@@ -20,6 +20,7 @@
       "sAjaxSource": dataTableDataURL.replace('MEDIA', $.template.mediaQuery.name),
       "sPaginationType": paginationType,
       "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]],
+      "iDisplayLength": 25,
       "aoColumns": [{ "sWidth": "20%", "bSortable": true, "sClass": "dataColDate" },
                     { "sWidth": "80%", "bSortable": true, "sClass": "dataColMessage" }]
     });

diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php
@@ -46,7 +46,7 @@ public static function getAll() {
     $QresultTotal->freeResult();      
 
     /* Paging */
-    $sLimit = "";
+    $sLimit = " LIMIT 0,25 ";
     if (isset($_GET['iDisplayStart'])) {
       if ($_GET['iDisplayLength'] != -1) {
         $sLimit = " LIMIT " . $_GET['iDisplayStart'] . ", " . $_GET['iDisplayLength'];

diff --git a/catalog/admin/includes/applications/orders/js/orders.js.php b/catalog/admin/includes/applications/orders/js/orders.js.php
@@ -41,6 +41,7 @@ function (data) {
           "sAjaxSource": dataTableDataURL.replace('FILTER', filter).replace('MEDIA', $.template.mediaQuery.name),
           "sPaginationType": paginationType,     
           "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]], 
+          "iDisplayLength": 25,
           "aaSorting": [[1,'desc']],
           "bDestroy": true,
           "aoColumns": [{ "sWidth": "10px", "bSortable": false, "sClass": "dataColCheck hide-on-mobile" },

diff --git a/catalog/admin/includes/applications/products/classes/products.php b/catalog/admin/includes/applications/products/classes/products.php
@@ -50,7 +50,7 @@ public static function getAll($category_id = null) {
     $QresultTotal->freeResult();
 
     /* Paging */
-    $sLimit = "";
+    $sLimit = " LIMIT 0,25 ";
     if (isset($_GET['iDisplayStart'])) {
       if ($_GET['iDisplayLength'] != -1) {
         $sLimit = " LIMIT " . $_GET['iDisplayStart'] . ", " . $_GET['iDisplayLength'];

diff --git a/...log/admin/includes/applications/products_import_export/classes/products_import_export.php b/...log/admin/includes/applications/products_import_export/classes/products_import_export.php
@@ -7,10 +7,12 @@
   @copyright  Template built on Developr theme by DisplayInline http://themeforest.net/user/displayinline under Extended license 
   @license    https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
   @version    $Id: products_import_export.php v1.0 2013-12-01 resultsonlyweb $
-*/ 
-include_once('includes/classes/category_tree.php');
-include_once('includes/applications/products/classes/products.php');
-include_once('includes/applications/categories/classes/categories.php');
+*/
+global $lC_Vqmod;
+
+include_once($lC_Vqmod->modCheck('includes/classes/category_tree.php'));
+include_once($lC_Vqmod->modCheck('includes/applications/products/classes/products.php'));
+include_once($lC_Vqmod->modCheck('includes/applications/categories/classes/categories.php'));
 
 class lC_Products_import_export_Admin {
  /*
@@ -34,7 +36,7 @@ public static function getFilterTotal($filter, $type) {
         $QtotalsSQL .= TABLE_CATEGORIES;
         break;
       case 'options':
-      $QtotalsSQL .= TABLE_PRODUCTS_VARIANTS;
+      $QtotalsSQL .= TABLE_PRODUCTS_VARIANTS_VALUES;
       break;
     }
 

diff --git a/catalog/includes/version.txt b/catalog/includes/version.txt
@@ -1 +1 @@
-7.002.3.0|05/07/2014
+7.002.4.0|05/21/2014
diff --git a/catalog/iredirect.php b/catalog/iredirect.php
@@ -27,7 +27,7 @@
     ?>
   </head>
   <body>    
-    <form id="iredirect" name="iredirect" method="post" target="_top" action="<?php echo lc_href_link(FILENAME_CHECKOUT, 'process', 'SSL'); ?>">
+    <form id="iredirect" name="iredirect" method="post" target="_top" action="<?php echo lc_href_link(FILENAME_CHECKOUT, 'process', 'SSL', null, null, true); ?>">
       <?php echo $postString; ?>
     </form>
     <script>