Version Notes
Fixed compatibility with E-Check module
Download this release
Release Info
Developer | Justin Slingerland |
Extension | BluePay_CreditCard |
Version | 1.5.5.4 |
Comparing to | |
See all releases |
Code changes from version 1.5.5.3 to 1.5.5.4
app/code/local/BluePay/CreditCard/Block/.Form.php.swp
ADDED
Binary file
|
app/code/local/BluePay/CreditCard/Block/Form.php
CHANGED
@@ -4,6 +4,10 @@ class BluePay_CreditCard_Block_Form extends Mage_Payment_Block_Form
|
|
4 |
protected function _construct()
|
5 |
{
|
6 |
parent::_construct();
|
|
|
|
|
|
|
|
|
7 |
if (Mage::getStoreConfig('payment/ccpayment/use_iframe') == 1) {
|
8 |
$this->setTemplate('bluepay/creditcardiframe.phtml');
|
9 |
} else {
|
4 |
protected function _construct()
|
5 |
{
|
6 |
parent::_construct();
|
7 |
+
if (Mage::app()->getStore()->isAdmin()) {
|
8 |
+
$this->setTemplate('bluepay/creditcard.phtml');
|
9 |
+
return;
|
10 |
+
}
|
11 |
if (Mage::getStoreConfig('payment/ccpayment/use_iframe') == 1) {
|
12 |
$this->setTemplate('bluepay/creditcardiframe.phtml');
|
13 |
} else {
|
app/design/adminhtml/default/default/template/bluepay/inforeview.phtml
DELETED
@@ -1,86 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* Magento
|
4 |
-
*
|
5 |
-
* NOTICE OF LICENSE
|
6 |
-
*
|
7 |
-
* This source file is subject to the Academic Free License (AFL 3.0)
|
8 |
-
* that is bundled with this package in the file LICENSE_AFL.txt.
|
9 |
-
* It is also available through the world-wide-web at this URL:
|
10 |
-
* http://opensource.org/licenses/afl-3.0.php
|
11 |
-
* If you did not receive a copy of the license and are unable to
|
12 |
-
* obtain it through the world-wide-web, please send an email
|
13 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
-
*
|
15 |
-
* DISCLAIMER
|
16 |
-
*
|
17 |
-
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
-
* versions in the future. If you wish to customize Magento for your
|
19 |
-
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
-
*
|
21 |
-
* @category design
|
22 |
-
* @package base_default
|
23 |
-
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
24 |
-
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
25 |
-
*/
|
26 |
-
?>
|
27 |
-
<?php echo $this->getChildHtml('items_before'); ?>
|
28 |
-
<div id="checkout-review-table-wrapper">
|
29 |
-
<table class="data-table" id="checkout-review-table">
|
30 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
|
31 |
-
<col />
|
32 |
-
<col width="1" />
|
33 |
-
<col width="1" />
|
34 |
-
<col width="1" />
|
35 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
36 |
-
<col width="1" />
|
37 |
-
<col width="1" />
|
38 |
-
<?php endif; ?>
|
39 |
-
<thead>
|
40 |
-
<tr>
|
41 |
-
<th rowspan="<?php echo $rowspan ?>"><?php echo $this->__('Product Name') ?></th>
|
42 |
-
<th colspan="<?php echo $colspan ?>" class="a-center"><?php echo $this->__('Price') ?></th>
|
43 |
-
<th rowspan="<?php echo $rowspan ?>" class="a-center"><?php echo $this->__('Qty') ?></th>
|
44 |
-
<th colspan="<?php echo $colspan ?>" class="a-center"><?php echo $this->__('Subtotal') ?></th>
|
45 |
-
</tr>
|
46 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
47 |
-
<tr>
|
48 |
-
<th class="a-right"><?php echo $this->helper('tax')->getIncExcTaxLabel(false) ?></th>
|
49 |
-
<th><?php echo $this->helper('tax')->getIncExcTaxLabel(true) ?></th>
|
50 |
-
<th class="a-right"><?php echo $this->helper('tax')->getIncExcTaxLabel(false) ?></th>
|
51 |
-
<th><?php echo $this->helper('tax')->getIncExcTaxLabel(true) ?></th>
|
52 |
-
</tr>
|
53 |
-
<?php endif; ?>
|
54 |
-
</thead>
|
55 |
-
<?php echo $this->getChildHtml('totals'); ?>
|
56 |
-
<tbody>
|
57 |
-
<?php foreach($this->getItems() as $_item): ?>
|
58 |
-
<?php echo $this->getItemHtml($_item)?>
|
59 |
-
<?php endforeach ?>
|
60 |
-
</tbody>
|
61 |
-
</table>
|
62 |
-
</div>
|
63 |
-
<?php echo $this->getChildHtml('items_after'); ?>
|
64 |
-
<script type="text/javascript">
|
65 |
-
//<![CDATA[
|
66 |
-
decorateTable('checkout-review-table');
|
67 |
-
truncateOptions();
|
68 |
-
//]]>
|
69 |
-
</script>
|
70 |
-
<div id="checkout-review-submit">
|
71 |
-
<?php echo $this->getChildHtml('agreements') ?>
|
72 |
-
<div class="buttons-set" id="review-buttons-container">
|
73 |
-
<p class="f-left"><?php echo $this->__('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Your Cart') ?></a></p>
|
74 |
-
<?php echo $this->getChildHtml('button') ?>
|
75 |
-
<span class="please-wait" id="review-please-wait" style="display:none;">
|
76 |
-
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
|
77 |
-
</span>
|
78 |
-
</div>
|
79 |
-
<script type="text/javascript">
|
80 |
-
//<![CDATA[
|
81 |
-
bluepay = new BluePay('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
|
82 |
-
review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
|
83 |
-
//bluepay = new BluePay('<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
|
84 |
-
//]]>
|
85 |
-
</script>
|
86 |
-
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>BluePay_CreditCard</name>
|
4 |
-
<version>1.5.5.
|
5 |
<stability>stable</stability>
|
6 |
<license>GNU General Public License</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>Credit card payment module for the BluePay gateway.</description>
|
11 |
<notes>Fixed compatibility with E-Check module</notes>
|
12 |
<authors><author><name>Justin Slingerland</name><user>jslingerland</user><email>jslingerland@bluepay.com</email></author></authors>
|
13 |
-
<date>2014-09-
|
14 |
-
<time>15:
|
15 |
-
<contents><target name="mageetc"><dir name="modules"><file name="BluePay_CreditCard.xml" hash="8a84b7d3e004f61f9d55e428b55cea8c"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="bluepay.xml" hash="cde2375a1a27707f7942117ed04f481f"/></dir><dir name="template"><dir name="bluepay"><file name="form.phtml" hash="e5cf9ce8eeaeae71fb3372fb542f7431"/><file name="creditcard.phtml" hash="4084bffebe86bead51a4910091fe82a5"/><file name="creditcardiframe.phtml" hash="55c518297c050fc4ce6a82a65d6620b0"/><file name="button.phtml" hash="85af90e7faab002f872f82e3d663139f"/><file name="inforeview.phtml" hash="0d29af5174235ded956fea6e92302a54"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="bluepay"><file name="creditcard.phtml" hash="34d197c5479f948b17c7a58a155a1e9d"
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>5.6.9</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>BluePay_CreditCard</name>
|
4 |
+
<version>1.5.5.4</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>GNU General Public License</license>
|
7 |
<channel>community</channel>
|
10 |
<description>Credit card payment module for the BluePay gateway.</description>
|
11 |
<notes>Fixed compatibility with E-Check module</notes>
|
12 |
<authors><author><name>Justin Slingerland</name><user>jslingerland</user><email>jslingerland@bluepay.com</email></author></authors>
|
13 |
+
<date>2014-09-18</date>
|
14 |
+
<time>15:04:30</time>
|
15 |
+
<contents><target name="mageetc"><dir name="modules"><file name="BluePay_CreditCard.xml" hash="8a84b7d3e004f61f9d55e428b55cea8c"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="bluepay.xml" hash="cde2375a1a27707f7942117ed04f481f"/></dir><dir name="template"><dir name="bluepay"><file name="form.phtml" hash="e5cf9ce8eeaeae71fb3372fb542f7431"/><file name="creditcard.phtml" hash="4084bffebe86bead51a4910091fe82a5"/><file name="creditcardiframe.phtml" hash="55c518297c050fc4ce6a82a65d6620b0"/><file name="button.phtml" hash="85af90e7faab002f872f82e3d663139f"/><file name="inforeview.phtml" hash="0d29af5174235ded956fea6e92302a54"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="bluepay"><file name="creditcard.phtml" hash="34d197c5479f948b17c7a58a155a1e9d"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="bluepay"><file name="bluepay.js" hash="c371e7e864f1b3db25328fa08e3e9c27"/><dir name="easyXDM"><file name="easyXDM.Widgets.debug.js" hash="26b23561d39a64b926fe8dafea2f0a7b"/><file name="easyXDM.Widgets.js" hash="26b23561d39a64b926fe8dafea2f0a7b"/><file name="easyXDM.Widgets.min.js" hash="790f5fa04af75a8013d0ff5fd6dc770d"/><file name="easyXDM.debug.js" hash="2f74fa97b0aacdfb5e8570e381465905"/><file name="easyXDM.js" hash="499464a0c3d89679c11df6ee5d188df5"/><file name="easyXDM.min.js" hash="e3fd912457d7213fe5ccae7bf0fd0c82"/><file name="name.html" hash="990620350432f6c7e28f1e111ce598c8"/><file name=".gitignore" hash="f256c78995e7e95eb33afc3cee8ff195"/></dir></dir></dir></target><target name="magelocal"><dir name="BluePay"><dir name="CreditCard"><dir name="Block"><file name="Form.php" hash="3132dfeb27e31edb4c5a2a862126cdd7"/><file name=".Form.php.swp" hash="0220b69997fe967f426dcf20f6d57185"/></dir><dir name="Helper"><file name="Data.php" hash="dc77bf42a31b7dd5dc31b92549c99abc"/></dir><dir name="Model"><dir name="CCPayment"><file name="Debug.php" hash="bde283680e78d3891affd630c0959bc8"/><file name="Request.php" hash="0317b2c7dc66004767405b78a3cc2631"/><file name="Result.php" hash="0d285e50805f03af609c87d91fce092a"/><dir name="Source"><file name="Cctype.php" hash="9d0f6dd894fb1006ed9bedce966f270b"/><file name="PaymentAction.php" hash="a233de610ff201a77d920fd73ecfb24a"/></dir></dir><file name="CCPayment.php" hash="cb24f25eb95ffddf1465d01e9d0613a9"/><file name="Config.php" hash="387ecaf88faa6c7d740b78d9e2dd2db6"/><dir name="Mysql4"><dir name="CCPayment"><dir name="Debug"><file name="Collection.php" hash="9d4c92ad278242715d08b6e202770ce1"/></dir><file name="Debug.php" hash="4f64c922ddb5b80d36538696471b69b5"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="f514f783fd39e1836b6ef4fc5087ea18"/><file name="system.xml" hash="a7622a714caebe79f607e6aea2fffee1"/></dir><dir name="sql"><dir name="creditcard_setup"><file name="mysql4-install-0.7.0.php" hash="c97f60ff629417efef8beebf619caa9a"/></dir></dir></dir></dir></target><target name="magecore"><dir name="Mage"><dir name="Adminhtml"><dir name="Model"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Order"><dir name="Status"><file name="Processingcomplete.php" hash="f9eb96ffc645117a04cc094b62fb24d4"/></dir></dir><file name="Testmode.php" hash="3f72e89b4f8239ad839d591310468453"/><file name="Duplicatewindow.php" hash="86b5f8c6d10b2cca813919c8aead0464"/></dir></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>5.6.9</max></php></required></dependencies>
|
18 |
</package>
|