From 42d37cc881a95560e4bf2f7cc259b96ecc743ddd Mon Sep 17 00:00:00 2001
From: Ricardo Martins <ricardo@ricardomartins.net.br>
Date: Fri, 20 Apr 2018 10:53:48 +1000
Subject: [PATCH] =?UTF-8?q?v.3.6.1=20-=20Pequena=20corre=C3=A7=C3=A3o=20qu?=
 =?UTF-8?q?e=20impedia=20usu=C3=A1rios=20do=20modulo=20PRO=20no=20modelo?=
 =?UTF-8?q?=20de=20assinatura=20de=20utilizar=20o=20Kiosk=20mode=20-=20Cor?=
 =?UTF-8?q?re=C3=A7=C3=A3o=20na=20forma=20como=20as=20exceptions=20eram=20?=
 =?UTF-8?q?devolvidas=20para=20o=20cliente=20final=20no=20modo=20kiosk.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PagSeguro/controllers/KioskController.php              | 7 +++++--
 app/code/community/RicardoMartins/PagSeguro/etc/config.xml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/community/RicardoMartins/PagSeguro/controllers/KioskController.php b/app/code/community/RicardoMartins/PagSeguro/controllers/KioskController.php
index e487df07..003371d6 100644
--- a/app/code/community/RicardoMartins/PagSeguro/controllers/KioskController.php
+++ b/app/code/community/RicardoMartins/PagSeguro/controllers/KioskController.php
@@ -23,6 +23,7 @@ public function preDispatch()
     public function createOrderAction()
     {
         $kHelper = Mage::helper('ricardomartins_pagseguro/kiosk');
+        $pHelper = Mage::helper('ricardomartins_pagseguro');
         if (!$kHelper->isActive()) {
             return $this->redirectException($kHelper->__('Kiosk is not active.'));
         }
@@ -76,13 +77,15 @@ public function createOrderAction()
             'itemAmount1' => number_format($product->getFinalPrice(), 2, '.', ''),
             'shippingAddressRequired' => false,
             'redirectURL' => $successUrl,
-            'notificationURL' => Mage::getUrl('ricardomartins_pagseguro/notification')
+            'notificationURL' => Mage::getUrl('ricardomartins_pagseguro/notification'),
+            'email' => $pHelper->getMerchantEmail(),
+            'token' => $pHelper->getToken()
         );
 
         try{
             $checkout = Mage::getModel('ricardomartins_pagseguro/abstract')->callApi($params, null, 'checkout');
         }catch (Exception $e) {
-            $this->redirectException($e->getMessage());
+            return $this->redirectException($e->getMessage());
         }
 
         if(!isset($checkout->code)){
diff --git a/app/code/community/RicardoMartins/PagSeguro/etc/config.xml b/app/code/community/RicardoMartins/PagSeguro/etc/config.xml
index cbd4d169..19e97e3e 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.6.0</version>
+            <version>3.6.1</version>
         </RicardoMartins_PagSeguro>
     </modules>
     <global>