From c4e273920c0c8e30ea9f00b74dfd21863aa34459 Mon Sep 17 00:00:00 2001
From: Ricardo Martins <ricardo@ricardomartins.net.br>
Date: Tue, 19 Nov 2019 17:08:35 +1100
Subject: [PATCH] =?UTF-8?q?v.=203.7.14=20*=20Melhoria=20nos=20dados=20que?=
 =?UTF-8?q?=20s=C3=A3o=20exibidos=20sobre=20os=20pedidos=20no=20admin.=20A?=
 =?UTF-8?q?gora=20=C3=A9=20poss=C3=ADvel=20clicar=20para=20ver=20a=20trans?=
 =?UTF-8?q?a=C3=A7=C3=A3o=20no=20PagSeguro.=20Al=C3=A9m=20disso,=20o=20tot?=
 =?UTF-8?q?al=20l=C3=ADquido=20a=20receber=20e=20valor=20das=20taxas=20tam?=
 =?UTF-8?q?b=C3=A9m=20s=C3=A3o=20exibidos=20no=20admin.=20*=20Melhoria=20n?=
 =?UTF-8?q?os=20tipos=20de=20dados=20do=20sistema=20que=20s=C3=A3o=20envia?=
 =?UTF-8?q?dos=20para=20aplica=C3=A7=C3=A3o.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RicardoMartins/PagSeguro/Helper/Data.php  | 22 +++++++++++++++++--
 .../PagSeguro/Model/Abstract.php              | 14 ++++++++++--
 .../RicardoMartins/PagSeguro/etc/config.xml   |  4 ++--
 .../form/info/cc.phtml                        | 10 +++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/app/code/community/RicardoMartins/PagSeguro/Helper/Data.php b/app/code/community/RicardoMartins/PagSeguro/Helper/Data.php
index 407ea50b..da664177 100644
--- a/app/code/community/RicardoMartins/PagSeguro/Helper/Data.php
+++ b/app/code/community/RicardoMartins/PagSeguro/Helper/Data.php
@@ -61,8 +61,7 @@ public function getSessionId()
                 CURLOPT_TIMEOUT         => 45,
                 CURLOPT_SSL_VERIFYPEER  => false,
                 CURLOPT_SSL_VERIFYHOST  => false,
-                CURLOPT_USERAGENT => $this->getUserAgent()
-    )
+                )
         );
 
         $response = null;
@@ -412,4 +411,23 @@ public function getUserAgent()
                            'magento' => $mageVersion);
         return json_encode($userAgent);
     }
+
+    /**
+     * Adds usage information about platform and module's versions
+     * @return array of headers
+     */
+    public function getCustomHeaders()
+    {
+        $psVersion = (string)Mage::getConfig()->getModuleConfig('RicardoMartins_PagSeguro')->version;
+        $mageVersion = Mage::getVersion();
+
+        $headers = array('Platform: Magento', 'Platform-Version: ' . $mageVersion, 'Module-Version: ' . $psVersion);
+
+        if (Mage::getConfig()->getModuleConfig('RicardoMartins_PagSeguroPro')) {
+            $psProVersion = (string)Mage::getConfig()->getModuleConfig('RicardoMartins_PagSeguroPro')->version;
+            $headers[] = 'Extra-Version: ' . $psProVersion;
+        }
+
+        return $headers;
+    }
 }
\ No newline at end of file
diff --git a/app/code/community/RicardoMartins/PagSeguro/Model/Abstract.php b/app/code/community/RicardoMartins/PagSeguro/Model/Abstract.php
index 0fb4080e..121f12db 100644
--- a/app/code/community/RicardoMartins/PagSeguro/Model/Abstract.php
+++ b/app/code/community/RicardoMartins/PagSeguro/Model/Abstract.php
@@ -165,11 +165,21 @@ public function proccessNotificatonResult(SimpleXMLElement $resultXML)
                         ->addObject($invoice)
                         ->addObject($invoice->getOrder())
                         ->save();
-                    $order->addStatusHistoryComment(sprintf('Fatura #%s criada com sucesso.', $invoice->getIncrementId()));
+                    $order->addStatusHistoryComment(
+                        sprintf('Fatura #%s criada com sucesso.', $invoice->getIncrementId())
+                    );
                 }
             }
 
             $payment->save();
+
+            if (isset($resultXML->feeAmount) && isset($resultXML->netAmount)) {
+                $payment
+                    ->setAdditionalInformation('fee_amount', floatval($resultXML->feeAmount))
+                    ->setAdditionalInformation('net_amount', floatval($resultXML->netAmount))
+                    ->save();
+            }
+
             $order->save();
             Mage::dispatchEvent(
                 'pagseguro_proccess_notification_after',
@@ -356,7 +366,7 @@ public function callApi($params, $payment, $type='transactions')
         curl_setopt($ch, CURLOPT_TIMEOUT, 45);
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        curl_setopt($ch, CURLOPT_USERAGENT, $helper->getUserAgent());
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $helper->getCustomHeaders());
         $response = '';
 
         try{
diff --git a/app/code/community/RicardoMartins/PagSeguro/etc/config.xml b/app/code/community/RicardoMartins/PagSeguro/etc/config.xml
index e8be3dfa..38a6a319 100644
--- a/app/code/community/RicardoMartins/PagSeguro/etc/config.xml
+++ b/app/code/community/RicardoMartins/PagSeguro/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <RicardoMartins_PagSeguro>
-            <version>3.7.13</version>
+            <version>3.7.14</version>
         </RicardoMartins_PagSeguro>
     </modules>
     <global>
@@ -144,7 +144,7 @@
                 <address_neighborhood_attribute>street_2</address_neighborhood_attribute>
                 <ws_url>https://ws.pagseguro.uol.com.br/v2/</ws_url>
                 <ws_url_app>https://ws.ricardomartins.net.br/pspro/v6/wspagseguro/v2/</ws_url_app>
-                <!--<ws_url_app>http://ws.local.com.br/pspro/v6/wspagseguro/v2/</ws_url_app>-->
+                <!--<ws_url_app>https://ws.local.com.br/pspro/v6/wspagseguro/v2/</ws_url_app>-->
                 <js_url>https://stc.pagseguro.uol.com.br/pagseguro/api/v2/checkout/pagseguro.directpayment.js</js_url>
                 <sandbox_ws_url>https://ws.sandbox.pagseguro.uol.com.br/v2/</sandbox_ws_url>
                 <sandbox_ws_url_app>https://ws.ricardomartins.net.br/pspro/v6/wspagseguro/sandbox/v2/</sandbox_ws_url_app>
diff --git a/app/design/adminhtml/base/default/template/ricardomartins_pagseguro/form/info/cc.phtml b/app/design/adminhtml/base/default/template/ricardomartins_pagseguro/form/info/cc.phtml
index 459442cd..92f6ec00 100644
--- a/app/design/adminhtml/base/default/template/ricardomartins_pagseguro/form/info/cc.phtml
+++ b/app/design/adminhtml/base/default/template/ricardomartins_pagseguro/form/info/cc.phtml
@@ -3,6 +3,9 @@
     <br/>
     <?php if($additional = $info->getAdditionalInformation()):?>
         Id Transação: <?php echo (isset($additional['transaction_id']))?$this->escapeHtml($additional['transaction_id']):'Desconhecido';?>
+        <?php if (isset($additional['transaction_id'])): ?>
+            <?php echo sprintf(' | <a href="%s" target="_blank">Ver no PagSeguro</a>', 'https://pagseguro.uol.com.br/transaction/details.jhtml?code=' . $this->escapeHtml($additional['transaction_id']));?>
+        <?php endif; ?>
         <br/>
     <?php endif;?>
     Bandeira: <?php echo ucfirst($this->escapeHtml($info->getCcType()));?>
@@ -12,4 +15,11 @@
         <br/>
         Parcelas: <?php echo $this->escapeHtml($additional['installment_quantity']);?>x <?php echo Mage::helper('core')->formatCurrency($additional['installment_value']);?>
     <?php endif;?>
+    <?php if(isset($additional['net_amount']) && isset($additional['fee_amount'])):?>
+        <br/>
+        Taxa PagSeguro: <?php echo  Mage::helper('core')->formatCurrency($additional['fee_amount']);?>
+        <br/>
+        Total líquido a receber: <?php echo  Mage::helper('core')->formatCurrency($additional['net_amount']);?>
+        <br/>
+    <?php endif;?>
 <?php endif; ?>
\ No newline at end of file