From d8dc2d2e562da9039c5e668339b8cdca4c18a5b0 Mon Sep 17 00:00:00 2001 From: Marjoel Date: Sat, 8 Apr 2017 13:44:15 -0300 Subject: [PATCH] this closes #2 --- README.md | 2 ++ .../upload/admin/controller/payment/pagseguro.php | 1 + .../upload/admin/view/template/payment/pagseguro.tpl | 9 +++++++++ .../view/theme/default/template/payment/pagseguro.tpl | 8 +++++--- .../upload/system/library/pagseguro/pagseguro-config.ini | 2 ++ .../admin/controller/extension/payment/pagseguro.php | 1 + .../admin/view/template/extension/payment/pagseguro.tpl | 9 +++++++++ .../default/template/extension/payment/pagseguro.tpl | 8 +++++--- .../upload/system/library/pagseguro/pagseguro-config.ini | 2 ++ 9 files changed, 36 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 072ef73..da13a17 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ | Versão | Notas | Compatibilidade | | ------ | ----- | --------------- | +| 1.0.4 | Removendo bug da mensagem "Ops, Houve um problema e não foi possível exibir a página.". | 2.0.X, 2.1.X, 2.2.X, 2.3.X | | 1.0.3 | Removendo bug da mensagem "Ops, Houve um problema e não foi possível exibir a página.". | 2.0.X, 2.1.X, 2.2.X, 2.3.X | | 1.0.2 | Removendo algumas validações inválidas. | 2.0.X, 2.1.X, 2.2.X, 2.3.X | | 1.0.1 | Resolvendo bug da imagem do PagSeguro ao selecionar o método de pagamento. | 2.0.X, 2.1.X, 2.2.X, 2.3.X | @@ -21,6 +22,7 @@ ## To dos +- [ ] [Adicionar funcionalidade de sandbox do PagSeguro.](https://github.com/Marjoel/pagseguro-opencart/issues/4 "Issue aberta") - [ ] Adicionar funcionalidade de oferecer desconto quando o PagSeguro for escolhido como forma de pagamento. ## Contribua diff --git a/v2.0.X - v2.1.X - v2.2.X/upload/admin/controller/payment/pagseguro.php b/v2.0.X - v2.1.X - v2.2.X/upload/admin/controller/payment/pagseguro.php index aa7c7b2..da75a3e 100755 --- a/v2.0.X - v2.1.X - v2.2.X/upload/admin/controller/payment/pagseguro.php +++ b/v2.0.X - v2.1.X - v2.2.X/upload/admin/controller/payment/pagseguro.php @@ -50,6 +50,7 @@ public function index() { $data["notification_url"] = $this->getUrlBase() . $config->notification_url; $data["redirect_url"] = $this->getUrlBase() . $config->redirect_url; $data["cancel_url"] = $this->getUrlBase() . $config->cancel_url; + $data["version"] = $config->version; /* get all fields */ $fields = $this->getAllFields(); diff --git a/v2.0.X - v2.1.X - v2.2.X/upload/admin/view/template/payment/pagseguro.tpl b/v2.0.X - v2.1.X - v2.2.X/upload/admin/view/template/payment/pagseguro.tpl index 70f860c..1842a77 100755 --- a/v2.0.X - v2.1.X - v2.2.X/upload/admin/view/template/payment/pagseguro.tpl +++ b/v2.0.X - v2.1.X - v2.2.X/upload/admin/view/template/payment/pagseguro.tpl @@ -19,6 +19,10 @@ #pagseguro-support { margin: 30px 35px -35px 35px; } + + #pagseguro-copyright { + text-align: center; + } @@ -450,6 +454,11 @@ + + diff --git a/v2.0.X - v2.1.X - v2.2.X/upload/catalog/view/theme/default/template/payment/pagseguro.tpl b/v2.0.X - v2.1.X - v2.2.X/upload/catalog/view/theme/default/template/payment/pagseguro.tpl index 9cb17a3..b8e4b92 100755 --- a/v2.0.X - v2.1.X - v2.2.X/upload/catalog/view/theme/default/template/payment/pagseguro.tpl +++ b/v2.0.X - v2.1.X - v2.2.X/upload/catalog/view/theme/default/template/payment/pagseguro.tpl @@ -9,8 +9,8 @@
- - + +
@@ -23,7 +23,9 @@ dataType: 'json', success: function(json) { $('#pagseguro input').attr('data-order', json.code); - + $('#pagseguro span').hide(); + $('#pagseguro input').show(); + setTimeout(function() { startPagSeguro(); diff --git a/v2.0.X - v2.1.X - v2.2.X/upload/system/library/pagseguro/pagseguro-config.ini b/v2.0.X - v2.1.X - v2.2.X/upload/system/library/pagseguro/pagseguro-config.ini index 0e7c6fb..dfe6351 100644 --- a/v2.0.X - v2.1.X - v2.2.X/upload/system/library/pagseguro/pagseguro-config.ini +++ b/v2.0.X - v2.1.X - v2.2.X/upload/system/library/pagseguro/pagseguro-config.ini @@ -6,3 +6,5 @@ notification_url = "index.php?route=payment/pagseguro/callback" auto_start = false auto_start_delay = 1 + +version = 1.0.4 diff --git a/v2.3.X/upload/admin/controller/extension/payment/pagseguro.php b/v2.3.X/upload/admin/controller/extension/payment/pagseguro.php index 70b7093..18b1091 100755 --- a/v2.3.X/upload/admin/controller/extension/payment/pagseguro.php +++ b/v2.3.X/upload/admin/controller/extension/payment/pagseguro.php @@ -41,6 +41,7 @@ public function index() { $data["notification_url"] = $this->getUrlBase() . $config->notification_url; $data["redirect_url"] = $this->getUrlBase() . $config->redirect_url; $data["cancel_url"] = $this->getUrlBase() . $config->cancel_url; + $data["version"] = $config->version; /* get all fields */ $fields = $this->getAllFields(); diff --git a/v2.3.X/upload/admin/view/template/extension/payment/pagseguro.tpl b/v2.3.X/upload/admin/view/template/extension/payment/pagseguro.tpl index 70f860c..1842a77 100755 --- a/v2.3.X/upload/admin/view/template/extension/payment/pagseguro.tpl +++ b/v2.3.X/upload/admin/view/template/extension/payment/pagseguro.tpl @@ -19,6 +19,10 @@ #pagseguro-support { margin: 30px 35px -35px 35px; } + + #pagseguro-copyright { + text-align: center; + } @@ -450,6 +454,11 @@ + + diff --git a/v2.3.X/upload/catalog/view/theme/default/template/extension/payment/pagseguro.tpl b/v2.3.X/upload/catalog/view/theme/default/template/extension/payment/pagseguro.tpl index 9cb17a3..b8e4b92 100755 --- a/v2.3.X/upload/catalog/view/theme/default/template/extension/payment/pagseguro.tpl +++ b/v2.3.X/upload/catalog/view/theme/default/template/extension/payment/pagseguro.tpl @@ -9,8 +9,8 @@
- - + +
@@ -23,7 +23,9 @@ dataType: 'json', success: function(json) { $('#pagseguro input').attr('data-order', json.code); - + $('#pagseguro span').hide(); + $('#pagseguro input').show(); + setTimeout(function() { startPagSeguro(); diff --git a/v2.3.X/upload/system/library/pagseguro/pagseguro-config.ini b/v2.3.X/upload/system/library/pagseguro/pagseguro-config.ini index 62cbabb..d7756be 100644 --- a/v2.3.X/upload/system/library/pagseguro/pagseguro-config.ini +++ b/v2.3.X/upload/system/library/pagseguro/pagseguro-config.ini @@ -6,3 +6,5 @@ notification_url = "index.php?route=extension/payment/pagseguro/callback" auto_start = false auto_start_delay = 1 + +version = 1.0.4