dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/trustedshops/lib/js/index.php
+36
View File
@@ -0,0 +1,36 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
modules/trustedshops/lib/js/payment.js
+7 -4
View File
@@ -5,8 +5,8 @@ var TSPayment = (function()
payment_module : {},
alert_message : '',
module_box : {
html : '<b class="payment-module-label"></b>',
class : '.payment-module-label',
html : '<b class=\'payment-module-label\'></b>',
ui_class : '.payment-module-label',
id :'label-module-',
css : {
display : 'none',
@@ -38,10 +38,10 @@ var TSPayment = (function()
};
function hoverEffect()
{
$(TSPayment.module_box.class).live('mouseover', function(){
$(TSPayment.module_box.ui_class).live('mouseover', function(){
$(this).css({backgroundColor:'#CF0000', opacity:0.6});
});
$(TSPayment.module_box.class).live('mouseout', function(){
$(TSPayment.module_box.ui_class).live('mouseout', function(){
$(this).css({backgroundColor:TSPayment.module_box.css.backgroundColor, opacity:1});
});
@@ -65,6 +65,8 @@ var TSPayment = (function()
var boolean = true;
var payment_type = $('select[name=payment_type]').val();
var payment_module = $('select[name=payment_module]').val();
if (payment_type != null && payment_module != null)
{
$('.choosen_payment_type').each(function() {
var reg = new RegExp(payment_type, 'i');
if ($(this).val() == payment_module)
@@ -78,6 +80,7 @@ var TSPayment = (function()
TSPayment.alert_message = 'A payment module can be choosen for only one payment type';
TSPayment.alertMessage();
}
});
}
function clickRemoveFunction()