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

// Merge -> 10309

Browse Source
This commit is contained in:
rMalie
2011-11-21 11:05:10 +00:00
parent 3bfd9ad4ca
commit 82c9dead2a
365 changed files with 11185 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/authorizeaim/authorizeaim.php
+44 -40
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -27,7 +27,7 @@
if (!defined('_PS_VERSION_'))
exit;
class authorizeAIM extends PaymentModule
{
public function __construct()
@@ -46,19 +46,19 @@ class authorizeAIM extends PaymentModule
/* For 1.4.3 and less compatibility */
$updateConfig = array(
'PS_OS_CHEQUE' => 1,
'PS_OS_PAYMENT' => 2,
'PS_OS_PREPARATION' => 3,
'PS_OS_SHIPPING' => 4,
'PS_OS_DELIVERED' => 5,
'PS_OS_CHEQUE' => 1,
'PS_OS_PAYMENT' => 2,
'PS_OS_PREPARATION' => 3,
'PS_OS_SHIPPING' => 4,
'PS_OS_DELIVERED' => 5,
'PS_OS_CANCELED' => 6,
'PS_OS_REFUND' => 7,
'PS_OS_ERROR' => 8,
'PS_OS_OUTOFSTOCK' => 9,
'PS_OS_BANKWIRE' => 10,
'PS_OS_PAYPAL' => 11,
'PS_OS_REFUND' => 7,
'PS_OS_ERROR' => 8,
'PS_OS_OUTOFSTOCK' => 9,
'PS_OS_BANKWIRE' => 10,
'PS_OS_PAYPAL' => 11,
'PS_OS_WS_PAYMENT' => 12);
foreach ($updateConfig as $u => $v)
if (!Configuration::get($u) || (int)Configuration::get($u) < 1)
{
@@ -75,8 +75,8 @@ class authorizeAIM extends PaymentModule
public function install()
{
return (parent::install() AND $this->registerHook('orderConfirmation') AND
$this->registerHook('payment') AND Configuration::updateValue('AUTHORIZE_AIM_DEMO', 1));
return (parent::install() && $this->registerHook('orderConfirmation') && $this->registerHook('payment')
AND $this->registerHook('header') && Configuration::updateValue('AUTHORIZE_AIM_DEMO', 1));
}
public function uninstall()
@@ -94,15 +94,15 @@ class authorizeAIM extends PaymentModule
public function hookOrderConfirmation($params)
{
if ($params['objOrder']->module != $this->name)
if ($params['objOrder']->module != $this->name)
return;
if ($params['objOrder']->getCurrentState() != Configuration::get('PS_OS_ERROR'))
if ($params['objOrder']->getCurrentState() != Configuration::get('PS_OS_ERROR'))
$this->context->smarty->assign(array('status' => 'ok', 'id_order' => intval($params['objOrder']->id)));
else
$this->context->smarty->assign('status', 'failed');
return $this->display(__FILE__, 'hookorderconfirmation.tpl');
return $this->display(__FILE__, 'hookorderconfirmation.tpl');
}
public function getContent()
@@ -165,7 +165,7 @@ class authorizeAIM extends PaymentModule
if (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off'))
{
$invoiceAddress = new Address((int)$params['cart']->id_address_invoice);
$authorizeAIMParams = array();
$authorizeAIMParams['x_login'] = Configuration::get('AUTHORIZE_AIM_LOGIN_ID');
$authorizeAIMParams['x_tran_key'] = Configuration::get('AUTHORIZE_AIM_KEY');
@@ -182,7 +182,7 @@ class authorizeAIM extends PaymentModule
$authorizeAIMParams['x_zip'] = $invoiceAddress->postcode;
$authorizeAIMParams['x_first_name'] = $this->context->customer->firstname;
$authorizeAIMParams['x_last_name'] = $this->context->customer->lastname;
$isFailed = Tools::getValue('aimerror');
$cards = array();
@@ -198,31 +198,35 @@ class authorizeAIM extends PaymentModule
return $this->display(__FILE__, 'authorizeaim.tpl');
}
}
/**
* Set the detail of a payment - Call before the validate order init
* correctly the pcc object
* See Authorize documentation to know the associated key => value
* @param array fields
*/
public function setTransactionDetail($response)
{
// If Exist we can store the details
if (isset($this->pcc))
{
$this->pcc->transaction_id = (string)$response[6];
public function hookHeader()
{
Tools::addJS(_PS_JS_DIR_.'jquery/jquery.validate.creditcard2-1.0.1.js');
}
/**
* Set the detail of a payment - Call before the validate order init
* correctly the pcc object
* See Authorize documentation to know the associated key => value
* @param array fields
*/
public function setTransactionDetail($response)
{
// If Exist we can store the details
if (isset($this->pcc))
{
$this->pcc->transaction_id = (string)$response[6];
// 50 => Card number (XXXX0000)
$this->pcc->card_number = (string)substr($response[50], -4);
// 51 => Card Mark (Visa, Master card)
$this->pcc->card_brand = (string)$response[51];
$this->pcc->card_expiration = (string)Tools::getValue('x_exp_date');
// 68 => Owner name
$this->pcc->card_holder = (string)$response[68];
}
}
}
}
}
?>
modules/authorizeaim/authorizeaim.tpl
+37 -26
View File
@@ -30,22 +30,14 @@
<p style="color: red;">{l s='Error, please verify the card information' mod='authorizeaim'}</p>
{/if}
<form id="aut" name="authorizeaim_form" action="{$module_dir}validation.php" method="post">
<form id="aut" name="authorizeaim_form" id="authorizeaim_form" action="{$module_dir}validation.php" method="post">
<span style="border: 1px solid #595A5E;display: block;padding: 0.6em;text-decoration: none;margin-left: 0.7em;">
<a id="click_authorizeaim" href="#" title="{l s='Pay with authorizeaim' mod='authorizeaim'}" style="display: block;text-decoration: none;">
{if $cards.visa == 1}
<img src="{$module_dir}cards/visa.gif" alt="{l s='visa logo' mod='authorizeaim'}" />
{/if}
{if $cards.mastercard == 1}
<img src="{$module_dir}cards/mastercard.gif" alt="{l s='mastercard logo' mod='authorizeaim'}" />
{/if}
{if $cards.discover == 1}
<img src="{$module_dir}cards/discover.gif" alt="{l s='discover logo' mod='authorizeaim'}" />
{/if}
{if $cards.ax == 1}
<img src="{$module_dir}cards/ax.gif" alt="{l s='american express logo' mod='authorizeaim'}" />
{/if}
{l s='Secured credit card payment with Authorize.net' mod='authorizeaim'}
<a id="click_authorizeaim" href="#" title="{l s='Pay with authorizeaim' mod='authorizeaim'}" style="display: block;text-decoration: none; font-weight: bold;">
{if $cards.visa == 1}<img src="{$module_dir}cards/visa.gif" alt="{l s='visa logo' mod='authorizeaim'}" style="vertical-align: middle;" />{/if}
{if $cards.mastercard == 1}<img src="{$module_dir}cards/mastercard.gif" alt="{l s='mastercard logo' mod='authorizeaim'}" style="vertical-align: middle;" />{/if}
{if $cards.discover == 1}<img src="{$module_dir}cards/discover.gif" alt="{l s='discover logo' mod='authorizeaim'}" style="vertical-align: middle;" />{/if}
{if $cards.ax == 1}<img src="{$module_dir}cards/ax.gif" alt="{l s='american express logo' mod='authorizeaim'}" style="vertical-align: middle;" />{/if}
&nbsp;&nbsp;{l s='Secured credit card payment with Authorize.net' mod='authorizeaim'}
</a>
{if $isFailed == 0}
@@ -53,16 +45,28 @@
{else}
<div id="aut2">
{/if}
<br />
<br /><br />
<img src="{$module_dir}logoa.gif" alt="secure payment" style="float: left;margin-top:40px;"/>
<div style="width: 136px; height: 165px; float: left; padding-top:40px; padding-right: 20px; border-right: 1px solid #DDD;">
<img src="{$module_dir}logoa.gif" alt="secure payment" />
</div>
{foreach from=$p key=k item=v}
<input type="hidden" name="{$k}" value="{$v}" />
{/foreach}
<label style="margin-left: 50px;display: block;width: 85px;float: left;">{l s='Full name' mod='authorizeaim'}</label> <input type="text" name="name" size="20" maxlength="25S" /><img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;" /><br /><br />
<label style="margin-left: 50px;display: block;width: 85px;float: left;">{l s='Card number' mod='authorizeaim'}</label> <input type="text" id="ccn" name="x_card_num" size="16" maxlength="16" autocomplete="Off"/><img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;" /><br /><br />
<label style="margin-left: 50px;display: block;width: 85px;float: left;">{l s='Expiration date' mod='authorizeaim'}</label>
<label style="margin-top: 4px; margin-left: 40px;display: block;width: 90px;float: left;">{l s='Full name' mod='authorizeaim'}</label> <input type="text" name="name" id="fullname" size="30" maxlength="25S" /><img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;" /><br /><br />
<label style="margin-top: 4px; margin-left: 40px;display: block;width: 90px;float: left;">{l s='Card Type' mod='authorizeaim'}</label>
<select id="cardType">
{if $cards.ax == 1}<option value="AmEx">American Express</option>{/if}
{if $cards.visa == 1}<option value="Visa">Visa</option>{/if}
{if $cards.mastercard == 1}<option value="MasterCard">MasterCard</option>{/if}
{if $cards.discover == 1}<option value="Discover">Discover</option>{/if}
</select>
<img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;" /><br /><br />
<label style="margin-top: 4px; margin-left: 40px;display: block;width: 90px;float: left;">{l s='Card number' mod='authorizeaim'}</label> <input type="text" name="x_card_num" id="cardnum" size="30" maxlength="16" autocomplete="Off" /><img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;" /><br /><br />
<label style="margin-top: 4px; margin-left: 40px;display: block;width: 90px;float: left;">{l s='Expiration date' mod='authorizeaim'}</label>
<select id="x_exp_date_m" name="x_exp_date_m" style="width:60px;">{section name=date_m start=01 loop=13}
<option value="{$smarty.section.date_m.index}">{$smarty.section.date_m.index}</option>{/section}
</select>
@@ -71,15 +75,16 @@
<option value="{$smarty.section.date_y.index}">20{$smarty.section.date_y.index}</option>{/section}
</select>
<img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;" /><br /><br />
<label style="margin-left: 186px;display: block;width: 85px;float: left;">{l s='CVV' mod='authorizeaim'}</label> <input type="text" name="x_card_code" size="4" maxlength="4" /><img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;"/> <img src="{$module_dir}help.png" id="cvv_help" title="{l s='the 3 last digits on the back of your credit card' mod='authorizeaim'}" alt="" /><br /><br />
<label style="margin-top: 4px; margin-left: 40px;display: block;width: 90px;float: left;">{l s='CVV' mod='authorizeaim'}</label> <input type="text" name="x_card_code" id="x_card_code" size="4" maxlength="4" /><img src="{$module_dir}secure.png" alt="" style="margin-left: 5px;"/> <img src="{$module_dir}help.png" id="cvv_help" title="{l s='the 3 last digits on the back of your credit card' mod='authorizeaim'}" alt="" /><br /><br />
<img src="{$module_dir}cvv.png" id="cvv_help_img" alt=""style="display: none;margin-left: 211px;" />
<input type="button" id="asubmit" value="{l s='Validate order' mod='authorizeaim'}" style="margin-left: 236px;" class="button"/>
<input type="button" id="asubmit" value="{l s='Validate order' mod='authorizeaim'}" style="margin-left: 129px; padding-left: 25px; padding-right: 25px;" class="button" />
</div>
</span>
</form>
</p>
<script type="text/javascript">
var mess_error = "{l s='Your card number is false' mod='authorizeaim' js=1}";
var mess_error = "{l s='Please check your credit card information (Credit card type, number and expiration date)' mod='authorizeaim' js=1}";
var mess_error2 = "{l s='Please specify your Full Name' mod='authorizeaim' js=1}";
{literal}
$(document).ready(function(){
$('#x_exp_date_m').children('option').each(function()
@@ -107,9 +112,14 @@
$('#cvv_help').unbind();
});
$('#asubmit').click(function(){
if ($('#ccn').val() < 13)
$('#asubmit').click(function()
{
if ($('#fullname').val() == '')
{
alert(mess_error2);
}
else if (!validateCC($('#cardnum').val(), $('#cardType').val()) || $('#x_card_code').val() == '')
{
alert(mess_error);
}
else
@@ -118,5 +128,6 @@
}
});
});
{/literal}
</script>
</script>