Version Notes
Fix pingback for risk review
Download this release
Release Info
| Developer | Paymentwall |
| Extension | paymentwall_magento_module |
| Version | 1.2.2 |
| Comparing to | |
| See all releases | |
Code changes from version 1.2.1 to 1.2.2
- app/code/community/Paymentwall/Paymentwall/Model/Method/Abstract.php +36 -12
- app/code/community/Paymentwall/Paymentwall/Model/Method/Pwbrick.php +22 -22
- app/code/community/Paymentwall/Paymentwall/Model/Method/Pwlocal.php +7 -1
- app/code/community/Paymentwall/Paymentwall/Model/Pingback.php +30 -7
- app/code/community/Paymentwall/Paymentwall/etc/config.xml +1 -1
- package.xml +5 -6
app/code/community/Paymentwall/Paymentwall/Model/Method/Abstract.php
CHANGED
|
@@ -12,7 +12,7 @@ if (!class_exists('Paymentwall_Config'))
|
|
| 12 |
* Class Paymentwall_Paymentwall_Model_Method_Abstract
|
| 13 |
*/
|
| 14 |
class Paymentwall_Paymentwall_Model_Method_Abstract extends Mage_Payment_Model_Method_Abstract {
|
| 15 |
-
|
| 16 |
protected $_code;
|
| 17 |
protected $_logFile = 'paymentwall.log';
|
| 18 |
|
|
@@ -124,22 +124,46 @@ class Paymentwall_Paymentwall_Model_Method_Abstract extends Mage_Payment_Model_M
|
|
| 124 |
|
| 125 |
/**
|
| 126 |
* Make invoice for paid order
|
| 127 |
-
* @
|
|
|
|
|
|
|
| 128 |
*/
|
| 129 |
-
public function makeInvoice() {
|
| 130 |
$order = $this->getCurrentOrder();
|
|
|
|
|
|
|
| 131 |
if ($order) {
|
| 132 |
$invoice = $order->prepareInvoice()
|
| 133 |
-
->setTransactionId($
|
| 134 |
->addComment("Invoice created by Paymentwall")
|
| 135 |
-
->register()
|
| 136 |
-
|
| 137 |
-
|
| 138 |
-
|
| 139 |
-
|
| 140 |
-
|
| 141 |
-
|
| 142 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 143 |
}
|
| 144 |
}
|
| 145 |
|
| 12 |
* Class Paymentwall_Paymentwall_Model_Method_Abstract
|
| 13 |
*/
|
| 14 |
class Paymentwall_Paymentwall_Model_Method_Abstract extends Mage_Payment_Model_Method_Abstract {
|
| 15 |
+
|
| 16 |
protected $_code;
|
| 17 |
protected $_logFile = 'paymentwall.log';
|
| 18 |
|
| 124 |
|
| 125 |
/**
|
| 126 |
* Make invoice for paid order
|
| 127 |
+
* @param $pingback
|
| 128 |
+
* @throws Exception
|
| 129 |
+
* @throws bool
|
| 130 |
*/
|
| 131 |
+
public function makeInvoice($pingback) {
|
| 132 |
$order = $this->getCurrentOrder();
|
| 133 |
+
$payment = $order->getPayment();
|
| 134 |
+
|
| 135 |
if ($order) {
|
| 136 |
$invoice = $order->prepareInvoice()
|
| 137 |
+
->setTransactionId($pingback->getReferenceId())
|
| 138 |
->addComment("Invoice created by Paymentwall")
|
| 139 |
+
->register();
|
| 140 |
+
|
| 141 |
+
$this->payInvoice($pingback, $invoice);
|
| 142 |
+
}
|
| 143 |
+
}
|
| 144 |
+
|
| 145 |
+
/**
|
| 146 |
+
* @param $pingback
|
| 147 |
+
* @param $invoice
|
| 148 |
+
*/
|
| 149 |
+
public function payInvoice($pingback, $invoice) {
|
| 150 |
+
$order = $this->getCurrentOrder();
|
| 151 |
+
$payment = $order->getPayment();
|
| 152 |
+
|
| 153 |
+
if ($order) {
|
| 154 |
+
$payment->setTransactionId($pingback->getReferenceId())
|
| 155 |
+
->setCurrencyCode($order->getOrderCurrencyCode())
|
| 156 |
+
->setPreparedMessage('Payment approved by Paymentwall')
|
| 157 |
+
->setShouldCloseParentTransaction(true)
|
| 158 |
+
->setIsTransactionClosed(0)
|
| 159 |
+
->registerCaptureNotification($invoice->getGrandTotal())
|
| 160 |
+
->save();
|
| 161 |
+
|
| 162 |
+
$invoice->pay();
|
| 163 |
+
|
| 164 |
+
$order->sendNewOrderEmail()
|
| 165 |
+
->setEmailSent(true)
|
| 166 |
+
->save();
|
| 167 |
}
|
| 168 |
}
|
| 169 |
|
app/code/community/Paymentwall/Paymentwall/Model/Method/Pwbrick.php
CHANGED
|
@@ -8,13 +8,14 @@
|
|
| 8 |
*/
|
| 9 |
class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwall_Model_Method_Abstract implements Mage_Payment_Model_Recurring_Profile_MethodInterface {
|
| 10 |
|
| 11 |
-
const MAX_LENGTH_OF_INTERNAL_REFERENCE_ID = 127;
|
| 12 |
-
|
| 13 |
protected $_isInitializeNeeded = false;
|
| 14 |
protected $_canUseInternal = false;
|
| 15 |
protected $_canUseForMultishipping = false;
|
| 16 |
protected $_canCapture = true;
|
| 17 |
-
protected $_canAuthorize =
|
|
|
|
|
|
|
|
|
|
| 18 |
|
| 19 |
/**
|
| 20 |
* Constructor method.
|
|
@@ -72,11 +73,13 @@ class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwa
|
|
| 72 |
|
| 73 |
$customerId = $_SERVER['REMOTE_ADDR'];
|
| 74 |
|
| 75 |
-
if(Mage::getSingleton('customer/session')->isLoggedIn()){
|
| 76 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 77 |
$customerId = $customer->getId();
|
| 78 |
}
|
| 79 |
|
|
|
|
|
|
|
| 80 |
$charge = new Paymentwall_Charge();
|
| 81 |
$charge->create(array_merge(
|
| 82 |
$this->prepareUserProfile($payment->getOrder()), // for User Profile API
|
|
@@ -92,7 +95,12 @@ class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwa
|
|
| 92 |
|
| 93 |
if ($charge->isSuccessful()) {
|
| 94 |
if ($charge->isCaptured()) {
|
| 95 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 96 |
} elseif ($charge->isUnderReview()) {
|
| 97 |
$payment->setIsTransactionPending(true);
|
| 98 |
}
|
|
@@ -105,6 +113,8 @@ class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwa
|
|
| 105 |
$strErrors .= "\n - Code #{$errors['error']['code']}: " . Mage::helper('paymentwall')->__($errors['error']['message']);
|
| 106 |
Mage::throwException($strErrors);
|
| 107 |
}
|
|
|
|
|
|
|
| 108 |
}
|
| 109 |
|
| 110 |
/**
|
|
@@ -114,16 +124,7 @@ class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwa
|
|
| 114 |
* @throws Mage_Core_Exception
|
| 115 |
*/
|
| 116 |
public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile) {
|
| 117 |
-
$errors = array();
|
| 118 |
-
$refId = $profile->getInternalReferenceId(); // up to 127 single-byte alphanumeric
|
| 119 |
-
|
| 120 |
-
if (strlen($refId) > self::MAX_LENGTH_OF_INTERNAL_REFERENCE_ID) { // || !preg_match('/^[a-z\d\s]+$/i', $refId)
|
| 121 |
-
$errors[] = Mage::helper('paymentwall')->__('Merchant reference ID format is not supported.');
|
| 122 |
-
}
|
| 123 |
|
| 124 |
-
if ($errors) {
|
| 125 |
-
Mage::throwException(implode(' ', $errors));
|
| 126 |
-
}
|
| 127 |
}
|
| 128 |
|
| 129 |
/**
|
|
@@ -131,35 +132,34 @@ class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwa
|
|
| 131 |
*
|
| 132 |
* @param Mage_Payment_Model_Recurring_Profile $profile
|
| 133 |
* @param Mage_Payment_Model_Info $paymentInfo
|
|
|
|
| 134 |
*/
|
| 135 |
public function submitRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile, Mage_Payment_Model_Info $paymentInfo) {
|
| 136 |
|
| 137 |
$this->initPaymentwallConfig();
|
| 138 |
-
|
| 139 |
$quote = Mage::getSingleton('checkout/session')->getQuote();
|
| 140 |
|
| 141 |
$subscriptionData = $this->prepareSubscriptionData($profile, $quote);
|
| 142 |
-
|
| 143 |
$paymentwallSubscription = new Paymentwall_Subscription();
|
| 144 |
-
|
| 145 |
$paymentwallSubscription->create($subscriptionData);
|
| 146 |
|
| 147 |
$response = json_decode($paymentwallSubscription->GetRawResponseData());
|
| 148 |
-
|
| 149 |
$this->log($response, 'Subscription Response Data');
|
| 150 |
|
| 151 |
if ($paymentwallSubscription->isSuccessful() && $response->object == 'subscription') {
|
| 152 |
-
$profile->setReferenceId($response->id);
|
| 153 |
|
|
|
|
| 154 |
if ($response->active) {
|
| 155 |
$profile->setState(Mage_Sales_Model_Recurring_Profile::STATE_ACTIVE);
|
| 156 |
} else {
|
| 157 |
$profile->setState(Mage_Sales_Model_Recurring_Profile::STATE_PENDING);
|
| 158 |
}
|
|
|
|
| 159 |
} else {
|
|
|
|
| 160 |
$profile->setState(Mage_Sales_Model_Recurring_Profile::STATE_UNKNOWN);
|
|
|
|
| 161 |
}
|
| 162 |
-
|
| 163 |
}
|
| 164 |
|
| 165 |
/**
|
|
@@ -173,7 +173,7 @@ class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwa
|
|
| 173 |
|
| 174 |
return array_merge(
|
| 175 |
array(
|
| 176 |
-
'token' => $post['brick_token'],
|
| 177 |
'amount' => $profile->getBillingAmount(),
|
| 178 |
'currency' => $profile->getCurrencyCode(),
|
| 179 |
'email' => $quote->getBillingAddress()->getEmail(),
|
|
@@ -198,7 +198,7 @@ class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwa
|
|
| 198 |
}
|
| 199 |
|
| 200 |
return array(
|
| 201 |
-
'trial[amount]' => $profile->
|
| 202 |
'trial[currency]' => $profile->getCurrencyCode(),
|
| 203 |
'trial[period]' => $profile->getTrialPeriodUnit(),
|
| 204 |
'trial[period_duration]' => $profile->getTrialPeriodFrequency(),
|
| 8 |
*/
|
| 9 |
class Paymentwall_Paymentwall_Model_Method_Pwbrick extends Paymentwall_Paymentwall_Model_Method_Abstract implements Mage_Payment_Model_Recurring_Profile_MethodInterface {
|
| 10 |
|
|
|
|
|
|
|
| 11 |
protected $_isInitializeNeeded = false;
|
| 12 |
protected $_canUseInternal = false;
|
| 13 |
protected $_canUseForMultishipping = false;
|
| 14 |
protected $_canCapture = true;
|
| 15 |
+
protected $_canAuthorize = false;
|
| 16 |
+
protected $_canVoid = false;
|
| 17 |
+
protected $_canReviewPayment = false;
|
| 18 |
+
protected $_canCreateBillingAgreement = false;
|
| 19 |
|
| 20 |
/**
|
| 21 |
* Constructor method.
|
| 73 |
|
| 74 |
$customerId = $_SERVER['REMOTE_ADDR'];
|
| 75 |
|
| 76 |
+
if (Mage::getSingleton('customer/session')->isLoggedIn()) {
|
| 77 |
$customer = Mage::getSingleton('customer/session')->getCustomer();
|
| 78 |
$customerId = $customer->getId();
|
| 79 |
}
|
| 80 |
|
| 81 |
+
$payment->setAmount($amount);
|
| 82 |
+
|
| 83 |
$charge = new Paymentwall_Charge();
|
| 84 |
$charge->create(array_merge(
|
| 85 |
$this->prepareUserProfile($payment->getOrder()), // for User Profile API
|
| 95 |
|
| 96 |
if ($charge->isSuccessful()) {
|
| 97 |
if ($charge->isCaptured()) {
|
| 98 |
+
|
| 99 |
+
$payment->setTransactionId($charge->getId());
|
| 100 |
+
$payment->setIsTransactionClosed(0);
|
| 101 |
+
|
| 102 |
+
// store token data
|
| 103 |
+
$payment->setTransactionAdditionalInfo('saved_token', Mage::helper('core')->encrypt($charge->getCard()->getToken()));
|
| 104 |
} elseif ($charge->isUnderReview()) {
|
| 105 |
$payment->setIsTransactionPending(true);
|
| 106 |
}
|
| 113 |
$strErrors .= "\n - Code #{$errors['error']['code']}: " . Mage::helper('paymentwall')->__($errors['error']['message']);
|
| 114 |
Mage::throwException($strErrors);
|
| 115 |
}
|
| 116 |
+
|
| 117 |
+
return $this;
|
| 118 |
}
|
| 119 |
|
| 120 |
/**
|
| 124 |
* @throws Mage_Core_Exception
|
| 125 |
*/
|
| 126 |
public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 127 |
|
|
|
|
|
|
|
|
|
|
| 128 |
}
|
| 129 |
|
| 130 |
/**
|
| 132 |
*
|
| 133 |
* @param Mage_Payment_Model_Recurring_Profile $profile
|
| 134 |
* @param Mage_Payment_Model_Info $paymentInfo
|
| 135 |
+
* @throws Mage_Exception
|
| 136 |
*/
|
| 137 |
public function submitRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile, Mage_Payment_Model_Info $paymentInfo) {
|
| 138 |
|
| 139 |
$this->initPaymentwallConfig();
|
|
|
|
| 140 |
$quote = Mage::getSingleton('checkout/session')->getQuote();
|
| 141 |
|
| 142 |
$subscriptionData = $this->prepareSubscriptionData($profile, $quote);
|
|
|
|
| 143 |
$paymentwallSubscription = new Paymentwall_Subscription();
|
|
|
|
| 144 |
$paymentwallSubscription->create($subscriptionData);
|
| 145 |
|
| 146 |
$response = json_decode($paymentwallSubscription->GetRawResponseData());
|
|
|
|
| 147 |
$this->log($response, 'Subscription Response Data');
|
| 148 |
|
| 149 |
if ($paymentwallSubscription->isSuccessful() && $response->object == 'subscription') {
|
|
|
|
| 150 |
|
| 151 |
+
$profile->setReferenceId($response->id);
|
| 152 |
if ($response->active) {
|
| 153 |
$profile->setState(Mage_Sales_Model_Recurring_Profile::STATE_ACTIVE);
|
| 154 |
} else {
|
| 155 |
$profile->setState(Mage_Sales_Model_Recurring_Profile::STATE_PENDING);
|
| 156 |
}
|
| 157 |
+
$profile->save();
|
| 158 |
} else {
|
| 159 |
+
$error = json_decode($paymentwallSubscription->getPublicData());
|
| 160 |
$profile->setState(Mage_Sales_Model_Recurring_Profile::STATE_UNKNOWN);
|
| 161 |
+
$profile->save();
|
| 162 |
}
|
|
|
|
| 163 |
}
|
| 164 |
|
| 165 |
/**
|
| 173 |
|
| 174 |
return array_merge(
|
| 175 |
array(
|
| 176 |
+
'token' => $post['brick_token'], // Onetime token
|
| 177 |
'amount' => $profile->getBillingAmount(),
|
| 178 |
'currency' => $profile->getCurrencyCode(),
|
| 179 |
'email' => $quote->getBillingAddress()->getEmail(),
|
| 198 |
}
|
| 199 |
|
| 200 |
return array(
|
| 201 |
+
'trial[amount]' => $profile->getTrialBillingAmount() ? $profile->getTrialBillingAmount() : 0,
|
| 202 |
'trial[currency]' => $profile->getCurrencyCode(),
|
| 203 |
'trial[period]' => $profile->getTrialPeriodUnit(),
|
| 204 |
'trial[period_duration]' => $profile->getTrialPeriodFrequency(),
|
app/code/community/Paymentwall/Paymentwall/Model/Method/Pwlocal.php
CHANGED
|
@@ -5,9 +5,15 @@
|
|
| 5 |
* @package Paymentwall\ThirdpartyIntegration\Magento\Model\Method
|
| 6 |
*/
|
| 7 |
class Paymentwall_Paymentwall_Model_Method_Pwlocal extends Paymentwall_Paymentwall_Model_Method_Abstract {
|
| 8 |
-
|
|
|
|
| 9 |
protected $_canUseInternal = false;
|
| 10 |
protected $_canUseForMultishipping = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
|
| 12 |
/**
|
| 13 |
* Constructor method.
|
| 5 |
* @package Paymentwall\ThirdpartyIntegration\Magento\Model\Method
|
| 6 |
*/
|
| 7 |
class Paymentwall_Paymentwall_Model_Method_Pwlocal extends Paymentwall_Paymentwall_Model_Method_Abstract {
|
| 8 |
+
|
| 9 |
+
protected $_isInitializeNeeded = false;
|
| 10 |
protected $_canUseInternal = false;
|
| 11 |
protected $_canUseForMultishipping = false;
|
| 12 |
+
protected $_canCapture = true;
|
| 13 |
+
protected $_canAuthorize = true;
|
| 14 |
+
protected $_canVoid = false;
|
| 15 |
+
protected $_canReviewPayment = false;
|
| 16 |
+
protected $_canCreateBillingAgreement = false;
|
| 17 |
|
| 18 |
/**
|
| 19 |
* Constructor method.
|
app/code/community/Paymentwall/Paymentwall/Model/Pingback.php
CHANGED
|
@@ -30,7 +30,6 @@ class Paymentwall_Paymentwall_Model_Pingback extends Mage_Core_Model_Abstract {
|
|
| 30 |
} else {
|
| 31 |
return $pingback->getErrorSummary();
|
| 32 |
}
|
| 33 |
-
|
| 34 |
return '';
|
| 35 |
}
|
| 36 |
|
|
@@ -46,9 +45,8 @@ class Paymentwall_Paymentwall_Model_Pingback extends Mage_Core_Model_Abstract {
|
|
| 46 |
if ($pingback->isDeliverable()) {
|
| 47 |
$recurringProfile->setState(Mage_Sales_Model_Recurring_Profile::STATE_ACTIVE)->save();
|
| 48 |
} elseif ($pingback->isCancelable()) {
|
| 49 |
-
$recurringProfile->
|
| 50 |
}
|
| 51 |
-
|
| 52 |
return self::DEFAULT_PINGBACK_RESPONSE;
|
| 53 |
} catch (Exception $e) {
|
| 54 |
Mage::log($e->getMessage());
|
|
@@ -69,15 +67,41 @@ class Paymentwall_Paymentwall_Model_Pingback extends Mage_Core_Model_Abstract {
|
|
| 69 |
protected function processPingbackOrder(Paymentwall_Pingback $pingback) {
|
| 70 |
$order = Mage::getModel('sales/order')->loadByIncrementId($pingback->getProductId());
|
| 71 |
if ($order->getId()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 72 |
try {
|
| 73 |
if ($pingback->isDeliverable()) {
|
| 74 |
-
|
| 75 |
-
$paymentModel
|
| 76 |
-
$paymentModel->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
|
| 78 |
} elseif ($pingback->isCancelable()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 79 |
$order->registerCancellation(Mage::helper('sales')->__('Order marked as cancelled by Paymentwall.'))
|
| 80 |
->save();
|
|
|
|
| 81 |
} elseif ($pingback->isUnderReview()) {
|
| 82 |
$order->setState(Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW, true)
|
| 83 |
->save();
|
|
@@ -101,5 +125,4 @@ class Paymentwall_Paymentwall_Model_Pingback extends Mage_Core_Model_Abstract {
|
|
| 101 |
protected function isRecurring(Paymentwall_Pingback $pingback) {
|
| 102 |
return $pingback->getProductPeriodLength() > 0;
|
| 103 |
}
|
| 104 |
-
|
| 105 |
}
|
| 30 |
} else {
|
| 31 |
return $pingback->getErrorSummary();
|
| 32 |
}
|
|
|
|
| 33 |
return '';
|
| 34 |
}
|
| 35 |
|
| 45 |
if ($pingback->isDeliverable()) {
|
| 46 |
$recurringProfile->setState(Mage_Sales_Model_Recurring_Profile::STATE_ACTIVE)->save();
|
| 47 |
} elseif ($pingback->isCancelable()) {
|
| 48 |
+
$recurringProfile->cancel()->save();
|
| 49 |
}
|
|
|
|
| 50 |
return self::DEFAULT_PINGBACK_RESPONSE;
|
| 51 |
} catch (Exception $e) {
|
| 52 |
Mage::log($e->getMessage());
|
| 67 |
protected function processPingbackOrder(Paymentwall_Pingback $pingback) {
|
| 68 |
$order = Mage::getModel('sales/order')->loadByIncrementId($pingback->getProductId());
|
| 69 |
if ($order->getId()) {
|
| 70 |
+
|
| 71 |
+
$payment = $order->getPayment();
|
| 72 |
+
$invoice = $order->getInvoiceCollection()
|
| 73 |
+
->addAttributeToSort('created_at', 'DSC')
|
| 74 |
+
->setPage(1, 1)
|
| 75 |
+
->getFirstItem();
|
| 76 |
+
|
| 77 |
try {
|
| 78 |
if ($pingback->isDeliverable()) {
|
| 79 |
+
|
| 80 |
+
$paymentModel = $payment->getMethodInstance();
|
| 81 |
+
$paymentModel->setCurrentOrder($order)
|
| 82 |
+
->callDeliveryApi($pingback->getReferenceId());
|
| 83 |
+
|
| 84 |
+
if ($invoice->getId()) {
|
| 85 |
+
$paymentModel->payInvoice($pingback, $invoice);
|
| 86 |
+
} else {
|
| 87 |
+
$paymentModel->makeInvoice($pingback);
|
| 88 |
+
}
|
| 89 |
|
| 90 |
} elseif ($pingback->isCancelable()) {
|
| 91 |
+
|
| 92 |
+
$payment->cancel()->save();
|
| 93 |
+
if($invoice->getId()){
|
| 94 |
+
$invoice->cancel();
|
| 95 |
+
$order->setIsInProcess(true);
|
| 96 |
+
$transactionSave = Mage::getModel('core/resource_transaction')
|
| 97 |
+
->addObject($invoice)
|
| 98 |
+
->addObject($order)
|
| 99 |
+
->save();
|
| 100 |
+
}
|
| 101 |
+
|
| 102 |
$order->registerCancellation(Mage::helper('sales')->__('Order marked as cancelled by Paymentwall.'))
|
| 103 |
->save();
|
| 104 |
+
|
| 105 |
} elseif ($pingback->isUnderReview()) {
|
| 106 |
$order->setState(Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW, true)
|
| 107 |
->save();
|
| 125 |
protected function isRecurring(Paymentwall_Pingback $pingback) {
|
| 126 |
return $pingback->getProductPeriodLength() > 0;
|
| 127 |
}
|
|
|
|
| 128 |
}
|
app/code/community/Paymentwall/Paymentwall/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymentwall_Paymentwall>
|
| 5 |
-
<version>1.2.
|
| 6 |
</Paymentwall_Paymentwall>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymentwall_Paymentwall>
|
| 5 |
+
<version>1.2.2</version>
|
| 6 |
</Paymentwall_Paymentwall>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>paymentwall_magento_module</name>
|
| 4 |
-
<version>1.2.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>MITL</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -9,12 +9,11 @@
|
|
| 9 |
<summary>Paymentwall payment extension for Magento. 120+ payment methods in more than 200 countries.</summary>
|
| 10 |
<description>Paymentwall payment extension for Magento. 120+ payment methods in more than 200 countries.
|
| 11 |
</description>
|
| 12 |
-
<notes
|
| 13 |
-
* Add Recurring Profile support</notes>
|
| 14 |
<authors><author><name>Paymentwall</name><user>platforms</user><email>platforms@paymentwall.com</email></author></authors>
|
| 15 |
-
<date>2015-12-
|
| 16 |
-
<time>09:
|
| 17 |
-
<contents><target name="magecommunity"><dir name="Paymentwall"><dir name="Paymentwall"><dir name="Block"><dir name="Checkout"><dir name="Form"><dir name="Method"><file name="Abstract.php" hash="de9bfa933a6e1757c3bab53768ec4d62"/><file name="Pwbrick.php" hash="c01cabde8670bdff801534fe283b0534"/><file name="Pwlocal.php" hash="2d4a1fb4fdfcaaf5d7cf72eae4231965"/></dir></dir><dir name="Info"><dir name="Method"><file name="Pwbrick.php" hash="4d8bc2a37e04c180896a708dabf9cfa7"/><file name="Pwlocal.php" hash="52d3d7580cbdcc8bf0f98834b9a9e5a0"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="4270b082a8264e63f6a82228b3e2c1d2"/></dir><dir name="Model"><dir name="Method"><file name="Abstract.php" hash="
|
| 18 |
<compatible/>
|
| 19 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 20 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>paymentwall_magento_module</name>
|
| 4 |
+
<version>1.2.2</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>MITL</license>
|
| 7 |
<channel>community</channel>
|
| 9 |
<summary>Paymentwall payment extension for Magento. 120+ payment methods in more than 200 countries.</summary>
|
| 10 |
<description>Paymentwall payment extension for Magento. 120+ payment methods in more than 200 countries.
|
| 11 |
</description>
|
| 12 |
+
<notes>Fix pingback for risk review</notes>
|
|
|
|
| 13 |
<authors><author><name>Paymentwall</name><user>platforms</user><email>platforms@paymentwall.com</email></author></authors>
|
| 14 |
+
<date>2015-12-10</date>
|
| 15 |
+
<time>09:55:08</time>
|
| 16 |
+
<contents><target name="magecommunity"><dir name="Paymentwall"><dir name="Paymentwall"><dir name="Block"><dir name="Checkout"><dir name="Form"><dir name="Method"><file name="Abstract.php" hash="de9bfa933a6e1757c3bab53768ec4d62"/><file name="Pwbrick.php" hash="c01cabde8670bdff801534fe283b0534"/><file name="Pwlocal.php" hash="2d4a1fb4fdfcaaf5d7cf72eae4231965"/></dir></dir><dir name="Info"><dir name="Method"><file name="Pwbrick.php" hash="4d8bc2a37e04c180896a708dabf9cfa7"/><file name="Pwlocal.php" hash="52d3d7580cbdcc8bf0f98834b9a9e5a0"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="4270b082a8264e63f6a82228b3e2c1d2"/></dir><dir name="Model"><dir name="Method"><file name="Abstract.php" hash="3d7a56f2e82bd28db0f6fac77a730d17"/><file name="Pwbrick.php" hash="2d5e32962f113c24df5c67382d0e22a7"/><file name="Pwlocal.php" hash="83e06a61479358f40a26de968dc79b66"/></dir><file name="Pingback.php" hash="96e82b81ea7e7e765bdfba48807298f7"/></dir><dir name="controllers"><file name="PaymentController.php" hash="6d576fabeef93bc1e36a1dad97a26f9c"/></dir><dir name="etc"><file name="config.xml" hash="f92b83737d9797beafd41d7b4a022b89"/><file name="system.xml" hash="82abac90b5d8edf1b47e72135245b2ea"/></dir></dir></dir></target><target name="magelib"><dir name="paymentwall-php"><file name="LICENSE" hash="001561189374b83bcd6bc7f962daee8a"/><file name="README.md" hash="04122bf55fe20b9954feb14817435da2"/><file name="composer.json" hash="4e7035c64f2d74ba0a5f5cf80effe45e"/><dir name="features"><dir name="bootstrap"><file name="ChargeContext.php" hash="f1d0604f2fc16dd5932535f9c24995a3"/><file name="FeatureContext.php" hash="146d6e79c6704cfb24ee6f2a7b7fba5a"/><file name="PingbackContext.php" hash="b6c86d8f3c9caa21435f47ddb2d5add1"/><file name="WidgetContext.php" hash="70c8d608eb407e346467c2a8f7162732"/></dir><file name="charge.feature" hash="04258fc641535794c48c6c55aad7f94f"/><file name="pingback.feature" hash="05869da8a3e36b6bec0293a22c1a9235"/><file name="widget.feature" hash="198999d8bf357de175f3268cc88337f6"/></dir><dir name="lib"><dir name="Paymentwall"><file name="ApiObject.php" hash="e6ba4d0c3b93adf84ae5819fddecf26c"/><file name="ApiObjectInterface.php" hash="4922ff334356aac33a5b159f8d001b93"/><file name="Base.php" hash="9bdae1c385327dadbd0ca5c9bbbe6107"/><file name="Card.php" hash="d8aa72a3e8ea0cdd132867164c8352c1"/><file name="Charge.php" hash="0ca04683046e9abdf3968f495db625c4"/><file name="Config.php" hash="9253f2afd5523653dd9e5fce2afc15c4"/><file name="GenerericApiObject.php" hash="6016e500c2c6736048c2f27ae8924a1c"/><file name="HttpAction.php" hash="555295426227f26733b7736692345667"/><file name="Instance.php" hash="86422afa5d43aac945021ef694b9bbc1"/><file name="OneTimeToken.php" hash="e3b9c56c34920c9b5ea53609d95acb3b"/><file name="Pingback.php" hash="a77fb2f158a60ab48af4d9f420a22894"/><file name="Product.php" hash="8b382cb28b68f77c9784e5dbc40512cb"/><dir name="Response"><file name="Abstract.php" hash="f59033acb9e14fa7a90cc2f812b6970c"/><file name="Error.php" hash="4554a0b337a2748221fb7dfae2daa8c2"/><file name="Factory.php" hash="7036d21f4682b505d5b1ff04ec79e355"/><file name="Interface.php" hash="e75f22329b3c8cbdf389aee8366ceaf3"/><file name="Success.php" hash="1f3c6c58b4273eadff5ef4b482b65187"/></dir><dir name="Signature"><file name="Abstract.php" hash="dea8f9c03b02db7462d276e3611a3a98"/><file name="Pingback.php" hash="1ab1e00037d395f9bc55bea929397927"/><file name="Widget.php" hash="2e1e2a712a0eca4f54f834838df51a59"/></dir><file name="Subscription.php" hash="7110f0292dbe01e4bc1517b5cc206ed2"/><file name="Widget.php" hash="6a91e8c0f4fe930facde52c2750824da"/></dir><file name="paymentwall.php" hash="6f4ee78ffb0677d2a49d2417dae2c038"/></dir><file name=".git" hash="50da8e1bb8ed3a4d1e1413fe2d6c0d68"/><file name=".gitignore" hash="d22fe2936066c576100994c62f32761e"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="paymentwall.css" hash="408b3eb269441b27d262c3abc6da78f3"/></dir><dir name="js"><file name="paymentwall.js" hash="d10a03a2130a5cdb87106a3eaa0cd30a"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="paymentwall.xml" hash="15713872f2239c9b3cb615291b36e54b"/></dir><dir name="template"><dir name="paymentwall"><dir name="checkout"><dir name="form"><dir name="method"><file name="pwbrick.phtml" hash="95f073505e84b3c75607ff52538c01c7"/><file name="pwlocal.phtml" hash="b964770e54bb91fca23a49951e3c744c"/></dir></dir><dir name="info"><dir name="method"><file name="pwbrick.phtml" hash="b23472e15332c427456e9d92619eecff"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Paymentwall_Paymentwall.xml" hash="a5ef063119f4c0d274cc2f7a72699538"/></dir></target></contents>
|
| 17 |
<compatible/>
|
| 18 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 19 |
</package>
|
