Merge pull request #21 from pagseguro/desenvolvimento

Desenvolvimento
pagseguro · Jan 24, 2017 · ddd01d4 · ddd01d4
2 parents 6331971 + 6d763ee
commit ddd01d4
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 102 deletions.
diff --git a/Block/Adminhtml/Conciliation.php b/Block/Adminhtml/Conciliation.php
@@ -1,15 +1,7 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: esilva
- * Date: 12/07/16
- * Time: 10:12
- */
 
 namespace UOL\PagSeguro\Block\Adminhtml;
 
-namespace UOL\PagSeguro\Block\Payment;
-
 class Conciliation extends \Magento\Framework\View\Element\Template
 {
     public function _prepareLayout()

diff --git a/Block/Product/View/Installments.php b/Block/Product/View/Installments.php
@@ -37,10 +37,6 @@ class Installments extends Template
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry;
-     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
     /**
      * InstallmentMethod auto-generated factory
      * @var \UOL\PagSeguro\Model\Direct\InstallmentsMethod
@@ -53,11 +49,9 @@ class Installments extends Template
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
         \UOL\PagSeguro\Model\Direct\InstallmentsMethodFactory $installmentFactory
     ) {
         $this->_coreRegistry = $context->getRegistry();
-        $this->_scopeConfig = $scopeConfigInterface;
         $this->_installmentFactory = $installmentFactory;
         parent::__construct($context);
     }

diff --git a/Controller/Adminhtml/Refund/Request.php b/Controller/Adminhtml/Refund/Request.php
@@ -24,7 +24,7 @@
 namespace UOL\PagSeguro\Controller\Adminhtml\Refund;
 
 use UOL\PagSeguro\Controller\Ajaxable;
-use UOL\PagSeguro\Model\Transactions\Methods\Refund;
+use UOL\PagSeguro\Model\Transactions\Methods;
 
 /**
  * Class Request
@@ -49,7 +49,7 @@ public function __construct(
      */
     public function execute()
     {
-        $refund = new Refund(
+        $refund = new Methods\Refund(
               $this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
               $this->_objectManager->create('Magento\Framework\App\ResourceConnection'),
               $this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),

diff --git a/Controller/Direct.php b/Controller/Direct.php
diff --git a/Controller/Payment/Direct.php b/Controller/Payment/Direct.php
@@ -21,13 +21,13 @@
  *  @license   http://www.apache.org/licenses/LICENSE-2.0
  */
 
-namespace UOL\PagSeguro\Controller\Direct;
+namespace UOL\PagSeguro\Controller\Payment;
 
 /**
- * Class Checkout
+ * Class Direct
  * @package UOL\PagSeguro\Controller\Payment
  */
-class Payment extends \Magento\Framework\App\Action\Action
+class Direct extends \Magento\Framework\App\Action\Action
 {
 
     /** @var \Magento\Framework\View\Result\PageFactory */

diff --git a/Controller/Payment/Request.php b/Controller/Payment/Request.php
@@ -32,9 +32,6 @@
  */
 class Request extends \Magento\Framework\App\Action\Action
 {
-
-    /** @var \Magento\Framework\View\Result\PageFactory */
-    protected $_resultRedirectFactory;
 
     /**
      * @var \Magento\Checkout\Model\Session
@@ -52,14 +49,10 @@ class Request extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+        \Magento\Framework\App\Action\Context $context
     ) {
         parent::__construct($context);
 
-        /** @var \Magento\Framework\Controller\Result\RedirectFactory _resultPageFactory*/
-        $this->_resultRedirectFactory = $resultRedirectFactory;
-
         /** @var \Magento\Checkout\Model\Session _checkoutSession */
         $this->_checkoutSession = $this->_objectManager->create('\Magento\Checkout\Model\Session');
 
@@ -80,7 +73,7 @@ public function __construct(
     public function execute()
     {
         try {
-            return $this->_resultRedirectFactory->create()->setPath($this->_payment->createPaymentRequest());
+            return $this->_redirect($this->_payment->createPaymentRequest());
         } catch (\Exception $exception) {
             /** @var \Magento\Sales\Model\Order $order */
             $order = $this->_objectManager->create('\Magento\Sales\Model\Order')->load(
@@ -90,6 +83,7 @@ public function execute()
             $order->addStatusToHistory('pagseguro_cancelada', null, true);
             /** save order */
             $order->save();
+
             return $this->_redirect('pagseguro/payment/failure');
         }
     }

diff --git a/Model/Transactions/Methods/Abandoned.php b/Model/Transactions/Methods/Abandoned.php
@@ -101,7 +101,6 @@ class Abandoned extends Method
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
-        \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Backend\Model\Session $session,
@@ -113,8 +112,6 @@ public function __construct(
     ) {
         /** @var \Magento\Framework\App\Config\ScopeConfigInterface _scopeConfig */
         $this->_scopeConfig = $scopeConfigInterface;
-        /** @var \Magento\Framework\App\ResourceConnection _resource */
-        $this->_resource = $resourceConnection;
         /** @var  \Magento\Backend\Model\Session  _session */
         $this->_session = $session;
         /** @var \Magento\Sales\Model\Order _order */

diff --git a/Model/Transactions/Methods/Cancellation.php b/Model/Transactions/Methods/Cancellation.php
@@ -53,11 +53,6 @@ class Cancellation extends Method
      */
     protected $_scopeConfig;
 
-    /**
-     * @var \Magento\Framework\App\ResourceConnection
-     */
-    protected $_resource;
-
     /**
      * @var \Magento\Sales\Model\ResourceModel\Grid
      */
@@ -94,7 +89,6 @@ class Cancellation extends Method
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
-        \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Backend\Model\Session $session,
         \Magento\Sales\Model\Order $order,
@@ -104,8 +98,6 @@ public function __construct(
     ) {
         /** @var \Magento\Framework\App\Config\ScopeConfigInterface _scopeConfig */
         $this->_scopeConfig = $scopeConfigInterface;
-        /** @var \Magento\Framework\App\ResourceConnection _resource */
-        $this->_resource = $resourceConnection;
         /** @var  \Magento\Backend\Model\Session  _session */
         $this->_session = $session;
         /** @var \Magento\Sales\Model\Order _order */

diff --git a/Model/Transactions/Methods/Conciliation.php b/Model/Transactions/Methods/Conciliation.php
@@ -94,7 +94,6 @@ class Conciliation extends Method
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
-        \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Backend\Model\Session $session,
         \Magento\Sales\Model\Order $order,
@@ -104,8 +103,6 @@ public function __construct(
     ) {
         /** @var \Magento\Framework\App\Config\ScopeConfigInterface _scopeConfig */
         $this->_scopeConfig = $scopeConfigInterface;
-        /** @var \Magento\Framework\App\ResourceConnection _resource */
-        $this->_resource = $resourceConnection;
         /** @var  \Magento\Backend\Model\Session  _session */
         $this->_session = $session;
         /** @var \Magento\Sales\Model\Order _order */

diff --git a/Model/Transactions/Methods/Refund.php b/Model/Transactions/Methods/Refund.php
@@ -53,11 +53,6 @@ class Refund extends Method
      */
     protected $_scopeConfig;
 
-    /**
-     * @var \Magento\Framework\App\ResourceConnection
-     */
-    protected $_resource;
-
     /**
      * @var \Magento\Sales\Model\ResourceModel\Grid
      */
@@ -94,7 +89,6 @@ class Refund extends Method
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
-        \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Backend\Model\Session $session,
         \Magento\Sales\Model\Order $order,
@@ -104,8 +98,6 @@ public function __construct(
     ) {
         /** @var \Magento\Framework\App\Config\ScopeConfigInterface _scopeConfig */
         $this->_scopeConfig = $scopeConfigInterface;
-        /** @var \Magento\Framework\App\ResourceConnection _resource */
-        $this->_resource = $resourceConnection;
         /** @var  \Magento\Backend\Model\Session  _session */
         $this->_session = $session;
         /** @var \Magento\Sales\Model\Order _order */

diff --git a/Observer/CreatePagSeguroOrder.php b/Observer/CreatePagSeguroOrder.php
@@ -45,13 +45,13 @@ class CreatePagSeguroOrder implements ObserverInterface
     protected $_scopeConfig;
 
     /**
-     * @var UOL\PagSeguro\Model\System\Config\Environment 
+     * @var \UOL\PagSeguro\Model\System\Config\Environment
      */
     protected $_environment;
 
     /**
      * Automatic generated factory class
-     * @var UOL\PagSeguro\Model\OrdersFactory;
+     * @var \UOL\PagSeguro\Model\OrdersFactory;
      */
     protected $_ordersFactory;
 
@@ -61,15 +61,10 @@ class CreatePagSeguroOrder implements ObserverInterface
     protected $_context;
 
     /**
-     * @var Magento\Sales\Model\ResourceModel\Grid;
+     * @var \Magento\Sales\Model\ResourceModel\Grid;
      */
     protected $_grid;
 
-    /**
-     * @var Magento\Sales\Model\ResourceModel\Grid;
-     */
-    protected $_resource;
-
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface
@@ -80,15 +75,13 @@ public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
-        \Magento\Framework\App\ResourceConnection $resourceConnection,
         \UOL\PagSeguro\Model\OrdersFactory $ordersFactory,
         \UOL\PagSeguro\Model\System\Config\Environment $environmentConfig
     ) {
         $this->_objectManager = $objectManager;
         $this->_scopeConfig = $scopeConfigInterface;
         $this->_environment = $environmentConfig;
         $this->_ordersFactory = $ordersFactory;
-        $this->_resource = $resourceConnection;
         // Unavaliable for DI
         $this->_grid = new Grid($context, 'pagseguro_orders', 'sales_order_grid', 'order_id');
     }
@@ -154,10 +147,13 @@ private function getEnvironmentName($environment)
     private function updateSalesOrderGridEnvironment($orderId, $environment)
     {
         $environmentName = $this->getEnvironmentName($environment);
+
+        $resource = $this->_objectManager->create('Magento\Framework\App\ResourceConnection');
+
         //Getting connection
-        $connection  = $this->_resource->getConnection();
+        $connection  = $resource->getConnection();
         //Getting full table name
-        $tableName = $this->_resource->getTableName('sales_order_grid');
+        $tableName = $resource->getTableName('sales_order_grid');
         //Update sales_order_grid query
         $mapsDeleteQuery = "UPDATE $tableName SET environment='$environmentName' WHERE entity_id=$orderId";
         $connection->query($mapsDeleteQuery);

diff --git a/composer.json b/composer.json
@@ -7,15 +7,7 @@
 	],
 	"require": {
 	    "php": "~5.5.0|~5.6.0|~7.0.0",
-	    "pagseguro/pagseguro-php-sdk":"*"
-	},
-	"extra": {
-	  "map": [
-		[
-		    "*",
-		    "UOL/PagSeguro"
-		]
-	    ]
+	    "pagseguro/pagseguro-php-sdk": "3.*"
 	},
 	"autoload": {
 	  "files": [

diff --git a/view/frontend/templates/direct/payment.phtml b/view/frontend/templates/direct/payment.phtml
@@ -106,6 +106,9 @@
                         <span id="card_total">R$ 00,00</span>
                     </div>
                 </div>
+		<div align="right">
+                    Esta compra está sendo feita no Brasil <img src="<?php echo $this->getViewFileUrl('UOL_PagSeguro::images/flag-origin-country.png'); ?>">
+                </div>
                 <button class="btn-pagseguro --align-right" id="payment-credit-card">Concluir</button>
             </form>
         </div><!-- /.item-tab#credit-card -->
@@ -143,6 +146,9 @@
                         </label>
                     </div>
                 </div><!-- /.form-group -->
+		<div align="right">
+                    Esta compra está sendo feita no Brasil <img src="<?php echo $this->getViewFileUrl('UOL_PagSeguro::images/flag-origin-country.png'); ?>">
+                </div>
                 <button class="btn-pagseguro --align-right" id="payment-debit">Concluir</button>
             </form>
         </div><!-- /.item-tab#debit-online -->
@@ -155,6 +161,9 @@
                         <input class="form-control cpf-cnpj-mask" id="document-boleto" name="document" type="text">
                     </div>
                 </div>
+		<div align="right">
+                    Esta compra está sendo feita no Brasil <img src="<?php echo $this->getViewFileUrl('UOL_PagSeguro::images/flag-origin-country.png'); ?>">
+                </div>
                 <button class="btn-pagseguro --align-right" id="payment-boleto">Concluir</button>
             </form>
             <ul class="list-warning">
@@ -316,7 +325,8 @@
                     if (val === true) {
                         var $el = $el.val();
                     }
-                    return $el.replace(/[/ -. ]+/g, '').trim();
+                    $el = $el.replace(/[^0-9]+/g, '').trim();
+            		return $el;
                 } catch(e) {
                     alert('Ops, algo deu errado! Recarregue a página');
                 };

diff --git a/view/frontend/web/images/flag-origin-country.png b/view/frontend/web/images/flag-origin-country.png