Version Notes
- The module now displays an alert when a user logs into the Magento admin, showing that there is a new version available.
- When a customer cancels an already captured transaction on our dashboard, the module cancels the generated invoice and closes the request.
Download this release
Release Info
| Developer | mundipagg |
| Extension | Mundipagg_Integracao |
| Version | 2.9.20 |
| Comparing to | |
| See all releases | |
Code changes from version 2.9.19 to 2.9.20
- README.md +41 -0
- app/code/community/Uecommerce/Mundipagg/Block/Standard/Form.php +1 -1
- app/code/community/Uecommerce/Mundipagg/Model/Api.php +58 -51
- app/code/community/Uecommerce/Mundipagg/Model/Observer.php +0 -21
- app/code/community/Uecommerce/Mundipagg/Model/Standard.php +8 -14
- app/code/community/Uecommerce/Mundipagg/etc/config.xml +1 -1
- app/design/frontend/rwd/default/template/mundipagg/form.phtml +48 -43
- modman +68 -0
- package.xml +4 -4
README.md
ADDED
|
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
# Magento.Integracao
|
| 2 |
+
|
| 3 |
+
## Magento Connect ##
|
| 4 |
+
https://www.magentocommerce.com/magento-connect/mundipagg-payment-gateway.html
|
| 5 |
+
|
| 6 |
+
## System requirements ##
|
| 7 |
+
PHP 5.4
|
| 8 |
+
|
| 9 |
+
## Installation with modgit ##
|
| 10 |
+
modgit: https://github.com/jreinke/modgit
|
| 11 |
+
|
| 12 |
+
$ cd /path/to/magento
|
| 13 |
+
$ modgit init
|
| 14 |
+
$ modgit add mundipagg_integracao git@github.com:mundipagg/Magento.Integracao.git
|
| 15 |
+
|
| 16 |
+
## Simulator rules by amount ##
|
| 17 |
+
|
| 18 |
+
### Authorization ###
|
| 19 |
+
Authorized: <= $ 1.050,00
|
| 20 |
+
|
| 21 |
+
Timeout: >= $ 1.050,01 && < $ 1.051,71
|
| 22 |
+
|
| 23 |
+
Not Authorized: >= $ 1.500,00
|
| 24 |
+
|
| 25 |
+
## Documentation ##
|
| 26 |
+
|
| 27 |
+
http://docs.mundipagg.com
|
| 28 |
+
|
| 29 |
+
## Work with us!
|
| 30 |
+
|
| 31 |
+
Gostou da nossa SDK? Estamos sempre em busca de gente boa pra codar!
|
| 32 |
+
|
| 33 |
+
Manda email (vagas@mundipagg.com) ou dá uma olhada nas [vagas](https://github.com/mundipagg/vagas) e vem conhecer a gente! :smile:
|
| 34 |
+
|
| 35 |
+
Dev queremos você!
|
| 36 |
+
|
| 37 |
+
Did you like our SDK? We're always looking for good coders!
|
| 38 |
+
|
| 39 |
+
Send us an email (vagas@mundipagg.com) or take a look at our [jobs](https://github.com/mundipagg/vagas) page and come meet us! :smile:
|
| 40 |
+
|
| 41 |
+
|
app/code/community/Uecommerce/Mundipagg/Block/Standard/Form.php
CHANGED
|
@@ -76,7 +76,7 @@ class Uecommerce_Mundipagg_Block_Standard_Form extends Mage_Payment_Block_Form
|
|
| 76 |
if ($session->isLoggedIn()) {
|
| 77 |
$quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
|
| 78 |
} else {
|
| 79 |
-
$quote =(Mage::getModel('checkout/type_onepage') !== false)? Mage::getModel('checkout/type_onepage')->getQuote(): Mage::getModel('checkout/session')->getQuote()
|
| 80 |
}
|
| 81 |
|
| 82 |
$quote->setMundipaggInterest(0.0);
|
| 76 |
if ($session->isLoggedIn()) {
|
| 77 |
$quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
|
| 78 |
} else {
|
| 79 |
+
$quote =(Mage::getModel('checkout/type_onepage') !== false)? Mage::getModel('checkout/type_onepage')->getQuote(): Mage::getModel('checkout/session')->getQuote();
|
| 80 |
}
|
| 81 |
|
| 82 |
$quote->setMundipaggInterest(0.0);
|
app/code/community/Uecommerce/Mundipagg/Model/Api.php
CHANGED
|
@@ -284,13 +284,6 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 284 |
'result' => $response
|
| 285 |
);
|
| 286 |
|
| 287 |
-
if (is_null($createDate) === false) {
|
| 288 |
-
$result['CreateDate'] = $createDate;
|
| 289 |
-
}
|
| 290 |
-
|
| 291 |
-
// save offline retry statements if this feature is enabled
|
| 292 |
-
$this->saveOfflineRetryStatements($orderReference, new DateTime($createDate));
|
| 293 |
-
|
| 294 |
return $result;
|
| 295 |
}
|
| 296 |
|
|
@@ -1281,14 +1274,12 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 1281 |
$capturedAmountInCents = $data['OnlineDebitTransaction']['AmountPaidInCents'];
|
| 1282 |
$transactionData = $data['OnlineDebitTransaction'];
|
| 1283 |
}
|
| 1284 |
-
|
| 1285 |
$returnMessageLabel = "Order #{$order->getIncrementId()}";
|
| 1286 |
|
| 1287 |
if (isset($data['OrderStatus'])) {
|
| 1288 |
$orderStatus = $data['OrderStatus'];
|
| 1289 |
-
|
| 1290 |
-
|
| 1291 |
-
if ($orderStatus == Uecommerce_Mundipagg_Model_Enum_OrderStatusEnum::CANCELED) {
|
| 1292 |
|
| 1293 |
if ($order->getState() == Mage_Sales_Model_Order::STATE_CANCELED) {
|
| 1294 |
$returnMessage = "OK | {$returnMessageLabel} | Order already canceled.";
|
|
@@ -1492,7 +1483,6 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 1492 |
$order->save();
|
| 1493 |
|
| 1494 |
$returnMessage = "OK | {$returnMessageLabel} | Transaction status '{$status}' processed. Order status updated.";
|
| 1495 |
-
|
| 1496 |
$helperLog->info($returnMessage);
|
| 1497 |
|
| 1498 |
return $returnMessage;
|
|
@@ -1540,7 +1530,7 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 1540 |
$order->unhold();
|
| 1541 |
}
|
| 1542 |
|
| 1543 |
-
$
|
| 1544 |
$invoices = array();
|
| 1545 |
$canceledInvoices = array();
|
| 1546 |
|
|
@@ -1557,44 +1547,16 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 1557 |
}
|
| 1558 |
|
| 1559 |
// Refund invoices and Credit Memo
|
| 1560 |
-
if (!empty($invoices)) {
|
| 1561 |
$service = Mage::getModel('sales/service_order', $order);
|
| 1562 |
|
| 1563 |
foreach ($invoices as $invoice) {
|
| 1564 |
-
$
|
| 1565 |
-
|
| 1566 |
-
|
| 1567 |
-
$creditmemo = $service->prepareInvoiceCreditmemo($invoice);
|
| 1568 |
-
$creditmemo->setOfflineRequested(true);
|
| 1569 |
-
$creditmemo->register()->save();
|
| 1570 |
}
|
| 1571 |
|
| 1572 |
-
|
| 1573 |
-
$
|
| 1574 |
-
$order->setStatus('closed');
|
| 1575 |
-
$order->save();
|
| 1576 |
-
|
| 1577 |
-
// Return
|
| 1578 |
-
$ok++;
|
| 1579 |
-
}
|
| 1580 |
-
|
| 1581 |
-
// Credit Memo
|
| 1582 |
-
if (!empty($canceledInvoices)) {
|
| 1583 |
-
$service = Mage::getModel('sales/service_order', $order);
|
| 1584 |
-
|
| 1585 |
-
foreach ($invoices as $invoice) {
|
| 1586 |
-
$creditmemo = $service->prepareInvoiceCreditmemo($invoice);
|
| 1587 |
-
$creditmemo->setOfflineRequested(true);
|
| 1588 |
-
$creditmemo->register()->save();
|
| 1589 |
-
}
|
| 1590 |
-
|
| 1591 |
-
// Close order
|
| 1592 |
-
$order->setData('state', Mage_Sales_Model_Order::STATE_CLOSED);
|
| 1593 |
-
$order->setStatus(Mage_Sales_Model_Order::STATE_CLOSED);
|
| 1594 |
-
$order->save();
|
| 1595 |
-
|
| 1596 |
-
// Return
|
| 1597 |
-
$ok++;
|
| 1598 |
}
|
| 1599 |
|
| 1600 |
if (empty($invoices) && empty($canceledInvoices)) {
|
|
@@ -1603,10 +1565,10 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 1603 |
$helperLog->info("{$returnMessageLabel} | Order canceled.");
|
| 1604 |
|
| 1605 |
// Return
|
| 1606 |
-
$
|
| 1607 |
}
|
| 1608 |
|
| 1609 |
-
if ($
|
| 1610 |
$returnMessage = "{$returnMessageLabel} | Order status '{$status}' processed.";
|
| 1611 |
$helperLog->info($returnMessage);
|
| 1612 |
|
|
@@ -1873,6 +1835,7 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 1873 |
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, 'overpaid');
|
| 1874 |
} else {
|
| 1875 |
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, true);
|
|
|
|
| 1876 |
}
|
| 1877 |
|
| 1878 |
$order->save();
|
|
@@ -2167,7 +2130,7 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 2167 |
|
| 2168 |
/**
|
| 2169 |
* Check if order is in offline retry time
|
| 2170 |
-
*
|
| 2171 |
* @author Ruan Azevedo <razevedo@mundipagg.com>
|
| 2172 |
* @since 2016-06-20
|
| 2173 |
* @param string $orderIncrementId
|
|
@@ -2194,6 +2157,7 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 2194 |
* If the Offline Retry feature is enabled, save order offline retry statements
|
| 2195 |
*
|
| 2196 |
* @author Ruan Azevedo <razevedo@mundipagg.com>
|
|
|
|
| 2197 |
* @since 2016-06-23
|
| 2198 |
* @param string $orderIncrementId
|
| 2199 |
* @param DateTime $createDate
|
|
@@ -2363,5 +2327,48 @@ class Uecommerce_Mundipagg_Model_Api extends Uecommerce_Mundipagg_Model_Standard
|
|
| 2363 |
|
| 2364 |
return $data;
|
| 2365 |
}
|
| 2366 |
-
|
| 2367 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 284 |
'result' => $response
|
| 285 |
);
|
| 286 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 287 |
return $result;
|
| 288 |
}
|
| 289 |
|
| 1274 |
$capturedAmountInCents = $data['OnlineDebitTransaction']['AmountPaidInCents'];
|
| 1275 |
$transactionData = $data['OnlineDebitTransaction'];
|
| 1276 |
}
|
|
|
|
| 1277 |
$returnMessageLabel = "Order #{$order->getIncrementId()}";
|
| 1278 |
|
| 1279 |
if (isset($data['OrderStatus'])) {
|
| 1280 |
$orderStatus = $data['OrderStatus'];
|
| 1281 |
+
//if Magento order is not processing and MundiPagg order status is canceled, cancel the order on Magento
|
| 1282 |
+
if ($order->getState() != Mage_Sales_Model_Order::STATE_PROCESSING && $orderStatus == Uecommerce_Mundipagg_Model_Enum_OrderStatusEnum::CANCELED) {
|
|
|
|
| 1283 |
|
| 1284 |
if ($order->getState() == Mage_Sales_Model_Order::STATE_CANCELED) {
|
| 1285 |
$returnMessage = "OK | {$returnMessageLabel} | Order already canceled.";
|
| 1483 |
$order->save();
|
| 1484 |
|
| 1485 |
$returnMessage = "OK | {$returnMessageLabel} | Transaction status '{$status}' processed. Order status updated.";
|
|
|
|
| 1486 |
$helperLog->info($returnMessage);
|
| 1487 |
|
| 1488 |
return $returnMessage;
|
| 1530 |
$order->unhold();
|
| 1531 |
}
|
| 1532 |
|
| 1533 |
+
$success = false;
|
| 1534 |
$invoices = array();
|
| 1535 |
$canceledInvoices = array();
|
| 1536 |
|
| 1547 |
}
|
| 1548 |
|
| 1549 |
// Refund invoices and Credit Memo
|
| 1550 |
+
if (!empty($invoices) || !empty($canceledInvoices)) {
|
| 1551 |
$service = Mage::getModel('sales/service_order', $order);
|
| 1552 |
|
| 1553 |
foreach ($invoices as $invoice) {
|
| 1554 |
+
$this->closeInvoice($invoice);
|
| 1555 |
+
$this->createCreditMemo($invoice, $service);
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1556 |
}
|
| 1557 |
|
| 1558 |
+
$this->closeOrder($order);
|
| 1559 |
+
$success = true;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1560 |
}
|
| 1561 |
|
| 1562 |
if (empty($invoices) && empty($canceledInvoices)) {
|
| 1565 |
$helperLog->info("{$returnMessageLabel} | Order canceled.");
|
| 1566 |
|
| 1567 |
// Return
|
| 1568 |
+
$success = true;
|
| 1569 |
}
|
| 1570 |
|
| 1571 |
+
if ($success) {
|
| 1572 |
$returnMessage = "{$returnMessageLabel} | Order status '{$status}' processed.";
|
| 1573 |
$helperLog->info($returnMessage);
|
| 1574 |
|
| 1835 |
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, 'overpaid');
|
| 1836 |
} else {
|
| 1837 |
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, true);
|
| 1838 |
+
$order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PROCESSING, $comment = 'Boleto pago', true);
|
| 1839 |
}
|
| 1840 |
|
| 1841 |
$order->save();
|
| 2130 |
|
| 2131 |
/**
|
| 2132 |
* Check if order is in offline retry time
|
| 2133 |
+
* @deprecated since version 2.9.20
|
| 2134 |
* @author Ruan Azevedo <razevedo@mundipagg.com>
|
| 2135 |
* @since 2016-06-20
|
| 2136 |
* @param string $orderIncrementId
|
| 2157 |
* If the Offline Retry feature is enabled, save order offline retry statements
|
| 2158 |
*
|
| 2159 |
* @author Ruan Azevedo <razevedo@mundipagg.com>
|
| 2160 |
+
* @deprecated since version 2.9.20
|
| 2161 |
* @since 2016-06-23
|
| 2162 |
* @param string $orderIncrementId
|
| 2163 |
* @param DateTime $createDate
|
| 2327 |
|
| 2328 |
return $data;
|
| 2329 |
}
|
| 2330 |
+
|
| 2331 |
+
/**
|
| 2332 |
+
* @param object $order
|
| 2333 |
+
* @return boolean
|
| 2334 |
+
*/
|
| 2335 |
+
private function closeOrder($order){
|
| 2336 |
+
$order->setData('state', Mage_Sales_Model_Order::STATE_CLOSED);
|
| 2337 |
+
$order->setStatus(Mage_Sales_Model_Order::STATE_CLOSED);
|
| 2338 |
+
$order->addStatusToHistory(Mage_Sales_Model_Order::STATE_CLOSED, "Transaction update received: " . Mage_Sales_Model_Order::STATE_CLOSED, true);
|
| 2339 |
+
$order->sendOrderUpdateEmail();
|
| 2340 |
+
if($order->save()){
|
| 2341 |
+
return true;
|
| 2342 |
+
}else{
|
| 2343 |
+
return false;
|
| 2344 |
+
}
|
| 2345 |
+
}
|
| 2346 |
+
|
| 2347 |
+
/**
|
| 2348 |
+
* @param object $invoice
|
| 2349 |
+
* @return boolean
|
| 2350 |
+
*/
|
| 2351 |
+
private function closeInvoice($invoice){
|
| 2352 |
+
$invoice->setState(Mage_Sales_Model_Order_Invoice::STATE_CANCELED);
|
| 2353 |
+
if($invoice->save()){
|
| 2354 |
+
return true;
|
| 2355 |
+
}else{
|
| 2356 |
+
return false;
|
| 2357 |
+
}
|
| 2358 |
+
}
|
| 2359 |
+
|
| 2360 |
+
/**
|
| 2361 |
+
* @param object $invoice
|
| 2362 |
+
* @return boolean
|
| 2363 |
+
*/
|
| 2364 |
+
private function createCreditMemo($invoice, $service){
|
| 2365 |
+
$creditmemo = $service->prepareInvoiceCreditmemo($invoice);
|
| 2366 |
+
$creditmemo->setOfflineRequested(true);
|
| 2367 |
+
if($creditmemo->register()->save()){
|
| 2368 |
+
return true;
|
| 2369 |
+
}else{
|
| 2370 |
+
return false;
|
| 2371 |
+
}
|
| 2372 |
+
}
|
| 2373 |
+
|
| 2374 |
+
}
|
app/code/community/Uecommerce/Mundipagg/Model/Observer.php
CHANGED
|
@@ -57,27 +57,6 @@ class Uecommerce_Mundipagg_Model_Observer extends Uecommerce_Mundipagg_Model_Sta
|
|
| 57 |
$state = $order->getState();
|
| 58 |
|
| 59 |
if ($state == Mage_Sales_Model_Order::STATE_CANCELED) {
|
| 60 |
-
|
| 61 |
-
// if a order is canceled successfuly, offline retry data must be deleted if exists
|
| 62 |
-
if (Uecommerce_Mundipagg_Model_Offlineretry::offlineRetryIsEnabled()) {
|
| 63 |
-
$model = Mage::getModel('mundipagg/offlineretry');
|
| 64 |
-
$incrementId = $order->getIncrementId();
|
| 65 |
-
$offlineRetry = $model->loadByIncrementId($incrementId);
|
| 66 |
-
|
| 67 |
-
if (is_null($offlineRetry->getId()) === false) {
|
| 68 |
-
$helperLog = new Uecommerce_Mundipagg_Helper_Log(__METHOD__);
|
| 69 |
-
$helperLog->setLogLabel("Order #{$incrementId} canceled");
|
| 70 |
-
|
| 71 |
-
try {
|
| 72 |
-
$offlineRetry->delete();
|
| 73 |
-
$helperLog->info("Offline retry data deleted successfully.");
|
| 74 |
-
|
| 75 |
-
} catch (Exception $e) {
|
| 76 |
-
$helperLog->info("Offline retry data cannot be deleted: {$e}");
|
| 77 |
-
}
|
| 78 |
-
}
|
| 79 |
-
}
|
| 80 |
-
|
| 81 |
//cancel Mundi transactions via API
|
| 82 |
$this->cancelOrderViaApi($order);
|
| 83 |
}
|
| 57 |
$state = $order->getState();
|
| 58 |
|
| 59 |
if ($state == Mage_Sales_Model_Order::STATE_CANCELED) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 60 |
//cancel Mundi transactions via API
|
| 61 |
$this->cancelOrderViaApi($order);
|
| 62 |
}
|
app/code/community/Uecommerce/Mundipagg/Model/Standard.php
CHANGED
|
@@ -1956,9 +1956,7 @@ class Uecommerce_Mundipagg_Model_Standard extends Mage_Payment_Model_Method_Abst
|
|
| 1956 |
$api = new Uecommerce_Mundipagg_Model_Api();
|
| 1957 |
$orderInOfflineRetry = $api->orderIsInOfflineRetry($orderIncrementId);
|
| 1958 |
|
| 1959 |
-
if (in_array($ccTransactionStatus, $transactionOpenStatuses)
|
| 1960 |
-
|| $orderInOfflineRetry
|
| 1961 |
-
) {
|
| 1962 |
$transaction->setIsClosed(0);
|
| 1963 |
} else {
|
| 1964 |
$transaction->setIsClosed(1);
|
|
@@ -2000,21 +1998,17 @@ class Uecommerce_Mundipagg_Model_Standard extends Mage_Payment_Model_Method_Abst
|
|
| 2000 |
$helperLog = new Uecommerce_Mundipagg_Helper_Log(__METHOD__);
|
| 2001 |
$logLabel = "Order #{$orderIncrementId}";
|
| 2002 |
|
| 2003 |
-
if ($offlineRetryIsEnabled
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2004 |
$helperLog->info("{$logLabel} | Payment not authorized and store don't have offline retry, order will be canceled.");
|
| 2005 |
Mage::getSingleton('checkout/session')->setApprovalRequestSuccess('cancel');
|
| 2006 |
-
|
| 2007 |
return;
|
| 2008 |
}
|
| 2009 |
-
|
| 2010 |
-
$api = new Uecommerce_Mundipagg_Model_Api();
|
| 2011 |
-
|
| 2012 |
-
if ($api->orderIsInOfflineRetry($orderIncrementId)) {
|
| 2013 |
-
$message = "{$logLabel} | payment not authorized but order is in offline retry yet, not cancel.";
|
| 2014 |
-
|
| 2015 |
-
$helperLog->info($message);
|
| 2016 |
-
Mage::getSingleton('checkout/session')->setApprovalRequestSuccess('success');
|
| 2017 |
-
}
|
| 2018 |
}
|
| 2019 |
|
| 2020 |
/**
|
| 1956 |
$api = new Uecommerce_Mundipagg_Model_Api();
|
| 1957 |
$orderInOfflineRetry = $api->orderIsInOfflineRetry($orderIncrementId);
|
| 1958 |
|
| 1959 |
+
if (in_array($ccTransactionStatus, $transactionOpenStatuses)) {
|
|
|
|
|
|
|
| 1960 |
$transaction->setIsClosed(0);
|
| 1961 |
} else {
|
| 1962 |
$transaction->setIsClosed(1);
|
| 1998 |
$helperLog = new Uecommerce_Mundipagg_Helper_Log(__METHOD__);
|
| 1999 |
$logLabel = "Order #{$orderIncrementId}";
|
| 2000 |
|
| 2001 |
+
if ($offlineRetryIsEnabled) {
|
| 2002 |
+
$api = new Uecommerce_Mundipagg_Model_Api();
|
| 2003 |
+
$message = "{$logLabel} | payment not authorized but order is in offline retry yet, not cancel.";
|
| 2004 |
+
$helperLog->info($message);
|
| 2005 |
+
Mage::getSingleton('checkout/session')->setApprovalRequestSuccess('success');
|
| 2006 |
+
|
| 2007 |
+
}else{
|
| 2008 |
$helperLog->info("{$logLabel} | Payment not authorized and store don't have offline retry, order will be canceled.");
|
| 2009 |
Mage::getSingleton('checkout/session')->setApprovalRequestSuccess('cancel');
|
|
|
|
| 2010 |
return;
|
| 2011 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2012 |
}
|
| 2013 |
|
| 2014 |
/**
|
app/code/community/Uecommerce/Mundipagg/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Uecommerce_Mundipagg>
|
| 5 |
-
<version>2.9.
|
| 6 |
</Uecommerce_Mundipagg>
|
| 7 |
</modules>
|
| 8 |
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Uecommerce_Mundipagg>
|
| 5 |
+
<version>2.9.20</version>
|
| 6 |
</Uecommerce_Mundipagg>
|
| 7 |
</modules>
|
| 8 |
|
app/design/frontend/rwd/default/template/mundipagg/form.phtml
CHANGED
|
@@ -43,11 +43,13 @@ if ($quote->isVirtual()) {
|
|
| 43 |
$data = $quote->getShippingAddress();
|
| 44 |
}
|
| 45 |
|
| 46 |
-
$orderGrandTotal = $standard->getQuote()->getBaseGrandTotal();
|
| 47 |
|
| 48 |
// Partial payment?
|
| 49 |
$isPartial = Mage::getSingleton('checkout/session')->getApprovalRequestSuccess();
|
| 50 |
|
|
|
|
|
|
|
|
|
|
| 51 |
if ($isPartial === 'partial'):
|
| 52 |
$order = $this->loadOrder();
|
| 53 |
$authorizedAmount = $order->getPaymentAuthorizationAmount();
|
|
@@ -150,35 +152,34 @@ $_code = $this->getMethodCode();
|
|
| 150 |
<label class="required"><?php echo $this->__('Select a Credit Card or add a new one') ?>
|
| 151 |
<span class="required">*</span></label>
|
| 152 |
<div class="input-box">
|
| 153 |
-
|
| 154 |
<select id="<?php echo $_code; ?>_token_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 155 |
data="group_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 156 |
name="payment[<?php echo $_code; ?>_token_<?php echo $num; ?>_<?php echo $c; ?>]"
|
| 157 |
class="required-entry tokens group_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 158 |
onchange="token_or_not(<?php echo $num; ?>,<?php echo $c; ?>,this)">
|
| 159 |
<option value="">...</option>
|
| 160 |
-
|
| 161 |
-
|
| 162 |
-
|
| 163 |
-
|
| 164 |
-
|
| 165 |
-
|
| 166 |
-
|
| 167 |
-
|
| 168 |
-
|
| 169 |
-
|
| 170 |
-
|
| 171 |
-
|
| 172 |
-
|
| 173 |
-
|
| 174 |
-
|
| 175 |
-
|
| 176 |
<option value="new"><?php echo $this->__('New Credit Card') ?></option>
|
| 177 |
</select>
|
| 178 |
</div>
|
| 179 |
</div>
|
| 180 |
</li>
|
| 181 |
-
|
| 182 |
<div id="value_<?php echo $num; ?>_<?php echo $c; ?>">
|
| 183 |
<li class="fields" style="margin-bottom: 5px;">
|
| 184 |
<div class="field">
|
|
@@ -196,28 +197,29 @@ $_code = $this->getMethodCode();
|
|
| 196 |
</div>
|
| 197 |
</li>
|
| 198 |
</div>
|
| 199 |
-
|
| 200 |
-
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
| 205 |
-
|
| 206 |
-
|
| 207 |
-
|
| 208 |
-
|
| 209 |
-
|
| 210 |
-
|
| 211 |
-
|
| 212 |
-
|
| 213 |
-
|
| 214 |
-
|
|
|
|
|
|
|
| 215 |
</div>
|
| 216 |
-
</
|
| 217 |
-
</
|
| 218 |
-
|
| 219 |
-
|
| 220 |
-
<?php endif; ?>
|
| 221 |
<div class="division"></div>
|
| 222 |
<div id="<?php echo $_code; ?>_new_credit_card_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 223 |
<?php if ($countCcs > 0) { ?>style="display:none"<?php } ?>>
|
|
@@ -373,11 +375,12 @@ $_code = $this->getMethodCode();
|
|
| 373 |
<select id="<?php echo $_code; ?>_new_credito_parcelamento_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 374 |
name="payment[<?php echo $_code; ?>_new_credito_parcelamento_<?php echo $num; ?>_<?php echo $c; ?>]"
|
| 375 |
onchange="checkInstallments(this, '<?php echo Mage::getUrl('', array('_secure' => true)); ?>');">
|
| 376 |
-
|
| 377 |
-
|
| 378 |
-
|
| 379 |
</select>
|
| 380 |
</div>
|
|
|
|
| 381 |
</div>
|
| 382 |
</li>
|
| 383 |
<?php endif; ?>
|
|
@@ -425,7 +428,9 @@ $_code = $this->getMethodCode();
|
|
| 425 |
|
| 426 |
|
| 427 |
<script type="text/javascript">
|
|
|
|
| 428 |
//<![CDATA[
|
|
|
|
| 429 |
Validation.addAllThese([
|
| 430 |
['validate-cc-exp-new', '<?php echo $this->jsQuoteEscape(Mage::helper('mundipagg')->__('Incorrect credit card expiration date.'))?>', function (v, elm) {
|
| 431 |
var ccExpMonth = v;
|
| 43 |
$data = $quote->getShippingAddress();
|
| 44 |
}
|
| 45 |
|
|
|
|
| 46 |
|
| 47 |
// Partial payment?
|
| 48 |
$isPartial = Mage::getSingleton('checkout/session')->getApprovalRequestSuccess();
|
| 49 |
|
| 50 |
+
$this->getInstallments();
|
| 51 |
+
|
| 52 |
+
$orderGrandTotal = $standard->getQuote()->getBaseGrandTotal();
|
| 53 |
if ($isPartial === 'partial'):
|
| 54 |
$order = $this->loadOrder();
|
| 55 |
$authorizedAmount = $order->getPaymentAuthorizationAmount();
|
| 152 |
<label class="required"><?php echo $this->__('Select a Credit Card or add a new one') ?>
|
| 153 |
<span class="required">*</span></label>
|
| 154 |
<div class="input-box">
|
|
|
|
| 155 |
<select id="<?php echo $_code; ?>_token_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 156 |
data="group_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 157 |
name="payment[<?php echo $_code; ?>_token_<?php echo $num; ?>_<?php echo $c; ?>]"
|
| 158 |
class="required-entry tokens group_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 159 |
onchange="token_or_not(<?php echo $num; ?>,<?php echo $c; ?>,this)">
|
| 160 |
<option value="">...</option>
|
| 161 |
+
<?php
|
| 162 |
+
$selected = '';
|
| 163 |
+
|
| 164 |
+
if ($countCcs == 1):
|
| 165 |
+
$selected = 'selected="selected"';
|
| 166 |
+
endif;
|
| 167 |
+
|
| 168 |
+
foreach ($ccs as $id => $cc):
|
| 169 |
+
|
| 170 |
+
if ($countCcs == 1) {
|
| 171 |
+
$currentSelectedToken = Mage::getSingleton('mundipagg/source_cctypes')->getCcTypeForLabel($cc->getCcType());
|
| 172 |
+
}
|
| 173 |
+
$dataType = $currentSelectedToken ? $currentSelectedToken : Mage::getSingleton('mundipagg/source_cctypes')->getCcTypeForLabel($cc->getCcType());
|
| 174 |
+
echo '<option value="' . $cc->getId() . '" ' . $selected . ' data="' . $dataType . '">' . $cc->getCcType() . ' ' . $cc->getCreditCardMask() . '</option>';
|
| 175 |
+
endforeach;
|
| 176 |
+
?>
|
| 177 |
<option value="new"><?php echo $this->__('New Credit Card') ?></option>
|
| 178 |
</select>
|
| 179 |
</div>
|
| 180 |
</div>
|
| 181 |
</li>
|
| 182 |
+
<?php if ($num != 1): ?>
|
| 183 |
<div id="value_<?php echo $num; ?>_<?php echo $c; ?>">
|
| 184 |
<li class="fields" style="margin-bottom: 5px;">
|
| 185 |
<div class="field">
|
| 197 |
</div>
|
| 198 |
</li>
|
| 199 |
</div>
|
| 200 |
+
<?php endif; ?>
|
| 201 |
+
<?php if ($installmentsHelper->isInstallmentsEnabled() && $_code != 'mundipagg_creditcardoneinstallment'): ?>
|
| 202 |
+
<div id="parcelamento_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 203 |
+
<?php if ($countCcs > 1): ?>style="display:none"<?php endif ?>>
|
| 204 |
+
<li class="fields" style="margin-bottom: 5px;">
|
| 205 |
+
<div class="field">
|
| 206 |
+
<label class="required"><?php echo $this->__('Credit options') ?>
|
| 207 |
+
<?php if ($num == 2): ?><!--<a href="javascript:void(0);" onclick="javascript:void(0);">(<?php /*echo $this->__('click to update') */ ?>)</a>--><?php endif ?></label>
|
| 208 |
+
<div class="input-box">
|
| 209 |
+
<?php $this->getInstallments(); ?>
|
| 210 |
+
<select id="<?php echo $_code; ?>_credito_parcelamento_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 211 |
+
name="payment[<?php echo $_code; ?>_credito_parcelamento_<?php echo $num; ?>_<?php echo $c; ?>]"
|
| 212 |
+
class="required-entry installment-token group_<?php echo $num; ?>_<?php echo $c; ?>">
|
| 213 |
+
<?php foreach ($this->getInstallments($currentSelectedToken) as $key => $parcel): ?>
|
| 214 |
+
<option value="<?php echo $key ?>"><?php echo $parcel ?></option>
|
| 215 |
+
<?php endforeach ?>
|
| 216 |
+
</select>
|
| 217 |
+
</div>
|
| 218 |
</div>
|
| 219 |
+
</li>
|
| 220 |
+
</div>
|
| 221 |
+
<?php endif; ?>
|
| 222 |
+
<?php endif; ?>
|
|
|
|
| 223 |
<div class="division"></div>
|
| 224 |
<div id="<?php echo $_code; ?>_new_credit_card_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 225 |
<?php if ($countCcs > 0) { ?>style="display:none"<?php } ?>>
|
| 375 |
<select id="<?php echo $_code; ?>_new_credito_parcelamento_<?php echo $num; ?>_<?php echo $c; ?>"
|
| 376 |
name="payment[<?php echo $_code; ?>_new_credito_parcelamento_<?php echo $num; ?>_<?php echo $c; ?>]"
|
| 377 |
onchange="checkInstallments(this, '<?php echo Mage::getUrl('', array('_secure' => true)); ?>');">
|
| 378 |
+
<?php foreach ($this->getInstallments() as $key => $parcel): ?>
|
| 379 |
+
<option value="<?php echo $key ?>"><?php echo $parcel ?></option>
|
| 380 |
+
<?php endforeach ?>
|
| 381 |
</select>
|
| 382 |
</div>
|
| 383 |
+
|
| 384 |
</div>
|
| 385 |
</li>
|
| 386 |
<?php endif; ?>
|
| 428 |
|
| 429 |
|
| 430 |
<script type="text/javascript">
|
| 431 |
+
|
| 432 |
//<