Version Notes
Implemented support for "Previously Used" methods when re-ordering in admin, fixed issue with currency conversion in Payments Pro
Download this release
Release Info
Developer | Classy Llama |
Extension | CLS_Paypal_Credit_Card_Tokenization |
Version | 1.0.8 |
Comparing to | |
See all releases |
Code changes from version 1.0.5 to 1.0.8
- app/code/community/CLS/Paypal/CHANGELOG.txt +13 -0
- app/code/community/CLS/Paypal/Helper/Orderstored/Agreement.php +4 -2
- app/code/community/CLS/Paypal/Model/Paypal/Api/Nvp.php +2 -2
- app/code/community/CLS/Paypal/Model/Paypal/Method/Orderstored/Agreement.php +1 -0
- app/code/community/CLS/Paypal/Model/Paypal/Stored/Orderstored.php +1 -0
- app/code/community/CLS/Paypal/README.md +1 -1
- app/code/community/CLS/Paypal/etc/config.xml +1 -1
- package.xml +6 -6
app/code/community/CLS/Paypal/CHANGELOG.txt
CHANGED
@@ -1,3 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
CLS_Paypal 1.0.5 (1/22/2014)
|
2 |
=======================================
|
3 |
[FIXED] Bugs with multi-address checkout
|
1 |
+
CLS_Paypal 1.0.8 (3/19/2014)
|
2 |
+
=======================================
|
3 |
+
[ADDED] Implemented support for "Previously Used" methods when re-ordering in admin
|
4 |
+
[FIXED] Fixed issue with currency conversion in Payments Pro
|
5 |
+
|
6 |
+
CLS_Paypal 1.0.7 (3/18/2014)
|
7 |
+
=======================================
|
8 |
+
[FIXED] Changes to meta files to be in line with current extension packager and standard modman workflow
|
9 |
+
|
10 |
+
CLS_Paypal 1.0.6 (2/5/2014)
|
11 |
+
=======================================
|
12 |
+
[CHANGED] Removed packages and made changes to be compatible with separate packager script
|
13 |
+
|
14 |
CLS_Paypal 1.0.5 (1/22/2014)
|
15 |
=======================================
|
16 |
[FIXED] Bugs with multi-address checkout
|
app/code/community/CLS/Paypal/Helper/Orderstored/Agreement.php
CHANGED
@@ -65,8 +65,10 @@ class CLS_Paypal_Helper_Orderstored_Agreement extends Mage_Core_Helper_Data
|
|
65 |
*/
|
66 |
public function getSessionOrder() {
|
67 |
if (is_null($this->_sessionOrder)) {
|
68 |
-
//New order from this payment
|
69 |
-
if ($orderId = Mage::getSingleton('adminhtml/session_quote')->getPreviousOrderId())
|
|
|
|
|
70 |
$this->_sessionOrder = Mage::getModel('sales/order')->load($orderId);
|
71 |
} else {
|
72 |
//Edit
|
65 |
*/
|
66 |
public function getSessionOrder() {
|
67 |
if (is_null($this->_sessionOrder)) {
|
68 |
+
//New order from this payment, or re-order
|
69 |
+
if (($orderId = Mage::getSingleton('adminhtml/session_quote')->getPreviousOrderId())
|
70 |
+
|| ($orderId = Mage::getSingleton('adminhtml/session_quote')->getReordered())
|
71 |
+
) {
|
72 |
$this->_sessionOrder = Mage::getModel('sales/order')->load($orderId);
|
73 |
} else {
|
74 |
//Edit
|
app/code/community/CLS/Paypal/Model/Paypal/Api/Nvp.php
CHANGED
@@ -27,14 +27,14 @@
|
|
27 |
*/
|
28 |
|
29 |
class CLS_Paypal_Model_Paypal_Api_Nvp extends Mage_Paypal_Model_Api_Nvp
|
30 |
-
{
|
31 |
-
|
32 |
protected function _construct()
|
33 |
{
|
34 |
parent::_construct();
|
35 |
|
36 |
$this->_globalMap['BUTTONSOURCE'] = 'paypal_info_code';
|
37 |
$this->_debugReplacePrivateDataKeys[] = 'BUTTONSOURCE';
|
|
|
38 |
}
|
39 |
|
40 |
/**
|
27 |
*/
|
28 |
|
29 |
class CLS_Paypal_Model_Paypal_Api_Nvp extends Mage_Paypal_Model_Api_Nvp
|
30 |
+
{
|
|
|
31 |
protected function _construct()
|
32 |
{
|
33 |
parent::_construct();
|
34 |
|
35 |
$this->_globalMap['BUTTONSOURCE'] = 'paypal_info_code';
|
36 |
$this->_debugReplacePrivateDataKeys[] = 'BUTTONSOURCE';
|
37 |
+
$this->_doReferenceTransactionRequest[] = 'CURRENCYCODE';
|
38 |
}
|
39 |
|
40 |
/**
|
app/code/community/CLS/Paypal/Model/Paypal/Method/Orderstored/Agreement.php
CHANGED
@@ -79,6 +79,7 @@ class CLS_Paypal_Model_Paypal_Method_Orderstored_Agreement extends Mage_Paypal_M
|
|
79 |
->setReferenceId($payment->getBillingAgreementId())
|
80 |
->setPaymentAction($this->_pro->getConfig()->paymentAction)
|
81 |
->setAmount($amount)
|
|
|
82 |
->setNotifyUrl(Mage::getUrl('paypal/ipn/'))
|
83 |
->setPaypalCart(Mage::getModel('paypal/cart', array($order)))
|
84 |
->setIsLineItemsEnabled($this->_pro->getConfig()->lineItemsEnabled)
|
79 |
->setReferenceId($payment->getBillingAgreementId())
|
80 |
->setPaymentAction($this->_pro->getConfig()->paymentAction)
|
81 |
->setAmount($amount)
|
82 |
+
->setCurrencyCode($order->getBaseCurrencyCode())
|
83 |
->setNotifyUrl(Mage::getUrl('paypal/ipn/'))
|
84 |
->setPaypalCart(Mage::getModel('paypal/cart', array($order)))
|
85 |
->setIsLineItemsEnabled($this->_pro->getConfig()->lineItemsEnabled)
|
app/code/community/CLS/Paypal/Model/Paypal/Stored/Orderstored.php
CHANGED
@@ -121,6 +121,7 @@ class CLS_Paypal_Model_Paypal_Stored_Orderstored extends CLS_Paypal_Model_Paypal
|
|
121 |
if (
|
122 |
($originalOrderId = $session->getPreviousOrderId())
|
123 |
|| ($originalOrderId = $session->getOrderId())
|
|
|
124 |
) {
|
125 |
// Get original order data
|
126 |
/** @var $originalOrder Mage_Sales_Model_Order */
|
121 |
if (
|
122 |
($originalOrderId = $session->getPreviousOrderId())
|
123 |
|| ($originalOrderId = $session->getOrderId())
|
124 |
+
|| ($originalOrderId = $session->getReordered())
|
125 |
) {
|
126 |
// Get original order data
|
127 |
/** @var $originalOrder Mage_Sales_Model_Order */
|
app/code/community/CLS/Paypal/README.md
CHANGED
@@ -15,7 +15,7 @@ PCI Compliant saved credit cards with Paypal reference transactions.
|
|
15 |
## Admin Order Management
|
16 |
|
17 |
* When viewing an order, admins have the option to select "New Order from this Payment." This option allows the same PayPal billing agreement or credit card used on the previous order to be charged on the new order.
|
18 |
-
* The ability to re-charge the previous PayPal billing agreement or credit card is also available when editing an order.
|
19 |
* To better facilitate the use of the "New Order from this Payment" feature, the admin interface can now be used to create guest orders.
|
20 |
|
21 |
|
15 |
## Admin Order Management
|
16 |
|
17 |
* When viewing an order, admins have the option to select "New Order from this Payment." This option allows the same PayPal billing agreement or credit card used on the previous order to be charged on the new order.
|
18 |
+
* The ability to re-charge the previous PayPal billing agreement or credit card is also available when performing a re-order or editing an order.
|
19 |
* To better facilitate the use of the "New Order from this Payment" feature, the admin interface can now be used to create guest orders.
|
20 |
|
21 |
|
app/code/community/CLS/Paypal/etc/config.xml
CHANGED
@@ -30,7 +30,7 @@
|
|
30 |
<config>
|
31 |
<modules>
|
32 |
<CLS_Paypal>
|
33 |
-
<version>1.0.
|
34 |
</CLS_Paypal>
|
35 |
</modules>
|
36 |
|
30 |
<config>
|
31 |
<modules>
|
32 |
<CLS_Paypal>
|
33 |
+
<version>1.0.8</version>
|
34 |
</CLS_Paypal>
|
35 |
</modules>
|
36 |
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>CLS_Paypal_Credit_Card_Tokenization</name>
|
4 |
-
<version>1.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
@@ -24,7 +24,7 @@ PCI Compliant saved credit cards with Paypal reference transactions.
|
|
24 |
## Admin Order Management
|
25 |

|
26 |
* When viewing an order, admins have the option to select "New Order from this Payment." This option allows the same PayPal billing agreement or credit card used on the previous order to be charged on the new order. 
|
27 |
-
* The ability to re-charge the previous PayPal billing agreement or credit card is also available when editing an order.
|
28 |
* To better facilitate the use of the "New Order from this Payment" feature, the admin interface can now be used to create guest orders.
|
29 |

|
30 |

|
@@ -73,11 +73,11 @@ Enable the module's various features from these groups, as well as setting
|
|
73 |
their configuration options independently of the standard credit card
|
74 |
and billing agreement configurations.
|
75 |
</description>
|
76 |
-
<notes>
|
77 |
<authors><author><name>Classy Llama</name><user>classyllama</user><email>info@classyllama.com</email></author></authors>
|
78 |
-
<date>2014-
|
79 |
-
<time>21:
|
80 |
-
<contents><target name="magecommunity"><dir name="CLS"><dir name="Paypal"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Create"><file name="Customer.php" hash="bdda7f26580da00836dc14c760ce7bd4"/></dir></dir></dir></dir><dir name="Customer"><file name="Storedcard.php" hash="1f0ea64d4d88d8acc69b491ad157013d"/></dir><dir name="Payment"><dir name="Form"><file name="Cc.php" hash="bd28bf5a1476b6d000f7ddcfc8097520"/></dir></dir><dir name="Paypal"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Location.php" hash="51a66bf4179183e15d74e2dd60867d08"/></dir></dir></dir></dir><dir name="Payflow"><dir name="Advanced"><file name="Form.php" hash="431cc885b585b3a6ae44b3e63b4a3500"/></dir><dir name="Link"><file name="Form.php" hash="803988293c751db8be065174648ea789"/></dir></dir><dir name="Payment"><dir name="Form"><file name="Customerstored.php" hash="705a1066768956fa2757aa6974df6a90"/><dir name="Orderstored"><file name="Agreement.php" hash="51a809dde7da3c5fb7adaccfc94583fe"/></dir><file name="Orderstored.php" hash="aae8127491dcace2d2800879b2743157"/></dir></dir></dir><dir name="Paypaluk"><dir name="Payment"><dir name="Form"><dir name="Orderstored"><file name="Agreement.php" hash="f2cefe3e8fc148a628b8c7275401845d"/></dir></dir></dir></dir></dir><file name="CHANGELOG.txt" hash="
|
81 |
<compatible/>
|
82 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
83 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>CLS_Paypal_Credit_Card_Tokenization</name>
|
4 |
+
<version>1.0.8</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
24 |
## Admin Order Management
|
25 |

|
26 |
* When viewing an order, admins have the option to select "New Order from this Payment." This option allows the same PayPal billing agreement or credit card used on the previous order to be charged on the new order. 
|
27 |
+
* The ability to re-charge the previous PayPal billing agreement or credit card is also available when performing a re-order or editing an order.
|
28 |
* To better facilitate the use of the "New Order from this Payment" feature, the admin interface can now be used to create guest orders.
|
29 |

|
30 |

|
73 |
their configuration options independently of the standard credit card
|
74 |
and billing agreement configurations.
|
75 |
</description>
|
76 |
+
<notes>Implemented support for "Previously Used" methods when re-ordering in admin, fixed issue with currency conversion in Payments Pro</notes>
|
77 |
<authors><author><name>Classy Llama</name><user>classyllama</user><email>info@classyllama.com</email></author></authors>
|
78 |
+
<date>2014-03-19</date>
|
79 |
+
<time>21:51:12</time>
|
80 |
+
<contents><target name="magecommunity"><dir name="CLS"><dir name="Paypal"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Create"><file name="Customer.php" hash="bdda7f26580da00836dc14c760ce7bd4"/></dir></dir></dir></dir><dir name="Customer"><file name="Storedcard.php" hash="1f0ea64d4d88d8acc69b491ad157013d"/></dir><dir name="Payment"><dir name="Form"><file name="Cc.php" hash="bd28bf5a1476b6d000f7ddcfc8097520"/></dir></dir><dir name="Paypal"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Location.php" hash="51a66bf4179183e15d74e2dd60867d08"/></dir></dir></dir></dir><dir name="Payflow"><dir name="Advanced"><file name="Form.php" hash="431cc885b585b3a6ae44b3e63b4a3500"/></dir><dir name="Link"><file name="Form.php" hash="803988293c751db8be065174648ea789"/></dir></dir><dir name="Payment"><dir name="Form"><file name="Customerstored.php" hash="705a1066768956fa2757aa6974df6a90"/><dir name="Orderstored"><file name="Agreement.php" hash="51a809dde7da3c5fb7adaccfc94583fe"/></dir><file name="Orderstored.php" hash="aae8127491dcace2d2800879b2743157"/></dir></dir></dir><dir name="Paypaluk"><dir name="Payment"><dir name="Form"><dir name="Orderstored"><file name="Agreement.php" hash="f2cefe3e8fc148a628b8c7275401845d"/></dir></dir></dir></dir></dir><file name="CHANGELOG.txt" hash="5098f0874db46a1d4c74ead47612cc90"/><dir name="Helper"><file name="Data.php" hash="0d3f45c57c94284712bd91aa4b19351b"/><dir name="Orderstored"><file name="Agreement.php" hash="2fad52d6d80fb4ece74dbfe6c4b3fc1a"/></dir><dir name="Paypal"><file name="Data.php" hash="f60bf2892eb63645f2eab96bc7dc6b4a"/></dir><file name="Storedcard.php" hash="874a70e486c9b8ed353167245f9ed07a"/></dir><file name="LICENSE.txt" hash="71db18446bebc23ced8dd62644d16b5f"/><dir name="Model"><file name="Customerstored.php" hash="8be7c468362ad43b6a09d4c223d36515"/><file name="Observer.php" hash="457631f86139aa7666657e9b6658af89"/><dir name="Paypal"><dir name="Api"><file name="Nvp.php" hash="74be53d000dfb2a9c0884403059d7e4d"/></dir><file name="Config.php" hash="dc8223a0fc3b8d6659184d1fe6c0330b"/><file name="Direct.php" hash="9f551d5e14e99451ca02f79d2f78f4ab"/><dir name="Express"><file name="Checkout.php" hash="021cbbf4e0985106ab24bfa8bd62abb4"/></dir><file name="Express.php" hash="67b5631bf57b2797050c73c7378aee9c"/><file name="Info.php" hash="d6d8415242d2a63eb831cac84f276701"/><dir name="Method"><dir name="Orderstored"><file name="Agreement.php" hash="294bf176eabbd2c6dac52497c3bdc5ba"/></dir></dir><file name="Payflowadvanced.php" hash="333a909b6b48c6c3c864e591d5ee0a4d"/><file name="Payflowlink.php" hash="98129dfc3d9a5236e8c5a94cddbeb6d3"/><file name="Payflowpro.php" hash="dbfa4f171934f4f26d05515ca5ae36b1"/><dir name="Stored"><file name="Abstract.php" hash="946b41be7b003f821fa091e25974e2e1"/><dir name="Customerstored"><file name="Direct.php" hash="1fb16f32ce53c7825d9460c57de571ef"/><file name="Payflow.php" hash="b01eba2260d72dc3dc60efa6277502b1"/><file name="Payflowadvanced.php" hash="5d5b02436cf305412bfec098eea85e09"/><file name="Payflowlink.php" hash="83a4de2a5192635c48af3aac8b2cb7e2"/><file name="Payflowpro.php" hash="394ec117863b90196f141d1df367b068"/></dir><file name="Customerstored.php" hash="f9fe1df0936372d6abcb30b3129c080b"/><dir name="Orderstored"><file name="Direct.php" hash="403bd0b06c2f235c9480eaf05d449b3b"/><file name="Payflow.php" hash="98fae36789f67423db4a520b7feaa01f"/><file name="Payflowadvanced.php" hash="8dd64cf3c2b9ae5560b3a06204d59751"/><file name="Payflowlink.php" hash="71b134111dc49d20692c3ffae3bfa1c7"/><file name="Payflowpro.php" hash="08bac93661b9234b0546ab429f4a3931"/></dir><file name="Orderstored.php" hash="47b0f39b6f334fd987bfc238eb06ed7f"/><file name="Payflow.php" hash="288f16ab9d9d2b0d8957c8887f528b99"/></dir></dir><dir name="Paypaluk"><dir name="Api"><file name="Nvp.php" hash="ef27f778fde49eab569c6f3944702ec4"/></dir><dir name="Express"><file name="Checkout.php" hash="6a2a85e0acb0645d025c8823a5b3cd2f"/></dir><file name="Express.php" hash="b491f2d6acf89a29f4a23dc573f8e44f"/><dir name="Method"><file name="Agreement.php" hash="c86f295fa6312888b45c0f4a68fd27df"/><dir name="Orderstored"><file name="Agreement.php" hash="8534a919294e533247ef5cebdef434ce"/></dir></dir></dir><dir name="Resource"><dir name="Customerstored"><file name="Collection.php" hash="818889cb1eedd1e2047d09f6270f9b30"/></dir><file name="Customerstored.php" hash="0dd4ba6646ffbd32efbe6e4f0bc4e3c7"/></dir></dir><file name="README.md" hash="b2736f6dbadb03a660bd5a7021391d4c"/><dir name="controllers"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="CreateController.php" hash="edd90db7fcc89ccfd5519864debed3ad"/></dir></dir></dir><dir name="Customer"><file name="StoredcardController.php" hash="60c3403cd13a9ff1805506f5988cabdb"/></dir><dir name="Paypal"><file name="ExpressController.php" hash="53f83f79f948ffc0eb6abdfc5d8f60b0"/></dir><dir name="PaypalUk"><file name="ExpressController.php" hash="639821dc1c01a0276052579c5507a599"/></dir></dir><dir name="etc"><file name="config.xml" hash="c169b620d553bb4b4ea8c871c4bd951c"/><file name="system.xml" hash="4d5998c927b5739a52c078c99644bd32"/></dir><dir name="sql"><dir name="cls_paypal_setup"><file name="install-0.0.1.php" hash="33f870045a3cc0da094eed143adaf57b"/><file name="upgrade-0.3.0-0.3.1.php" hash="240dd4eae586f033ec6efad99773fbce"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="cls_paypal.xml" hash="6747dd281152c450e1511f9d551c9766"/></dir><dir name="template"><dir name="cls_paypal"><dir name="payment"><dir name="form"><file name="cc.phtml" hash="a23359ef60f0cf4041f4dd406c1cb286"/><file name="customer_stored.phtml" hash="6004f23604bb7de0a409494bb0c0c439"/><file name="order_stored.phtml" hash="7620eacd6d2351df7e827eb168d03236"/></dir></dir><dir name="sales"><dir name="order"><dir name="create"><dir name="form"><file name="address.phtml" hash="a452ddc2a6e812f0872e82ad931b9dac"/></dir></dir></dir><dir name="payment"><dir name="form"><dir name="orderstored"><file name="agreement.phtml" hash="5a080925e336f505381cba5e43f70e07"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="cls_paypal.xml" hash="0e2a6af1135e6fb29dda4b267797a6bd"/></dir><dir name="template"><dir name="cls_paypal"><dir name="customer"><file name="storedcard.phtml" hash="4756af996c65fb83a09ab0312a66bd1f"/></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="bd55fa445bea026721116b29dfadbb73"/><file name="customer_stored.phtml" hash="591d82906294e37f5c2e317f71144a0f"/></dir></dir><dir name="paypal"><dir name="payflow"><file name="info.phtml" hash="548f1b761782c2351482dd1d1f44a7af"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="CLS_Paypal.xml" hash="9e629aac18f2e5f2c9feb266985c912f"/></dir></target><target name="magelocale"><dir name="en_US"><file name="CLS_Paypal.csv" hash="ab57482877d914bb1d02021d95c65520"/></dir></target></contents>
|
81 |
<compatible/>
|
82 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
83 |
</package>
|