this closes #2

Marjoel · Apr 8, 2017 · d8dc2d2 · d8dc2d2
1 parent bce5b52
commit d8dc2d2
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -14,13 +14,15 @@
 
 | 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 |
 | 1.0    | Integração com as APIs de pagamento e notificação. | 2.0.X, 2.1.X, 2.2.X, 2.3.X |
 
 ## 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
@@ -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
@@ -19,6 +19,10 @@
 	#pagseguro-support {
 		margin: 30px 35px -35px 35px;
 	}
+
+	#pagseguro-copyright {
+		text-align: center;
+	}
 </style>
 
 <?php echo $header; ?>
@@ -450,6 +454,11 @@
 							</div>
 						</div>
 					</div>
+
+                    <div id="pagseguro-copyright">
+                        <p>Módulo <a href="https://github.com/Marjoel/pagseguro-opencart" target="_blank">PagSeguro</a> by <a href="https://www.marjoel.com" target="_blank">Marjoel Moreira</a></p>
+                        <p>Versão <?php echo $version; ?></p>
+                    </div>
 				</form>
 			</div>
 		</div>

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
@@ -9,8 +9,8 @@
 <div id="pagseguro">
 	<div class="buttons">
 		<div class="pull-right">
-			<input type="submit" value="<?php echo $button; ?>" class="btn btn-primary" data-order="" onclick="startPagSeguro()" />
-			<span style="display:none;"><?php echo $loading; ?></span>
+			<input style="display:none;" type="submit" value="<?php echo $button; ?>" class="btn btn-primary" data-order="" onclick="startPagSeguro()" />
+			<span><?php echo $loading; ?></span>
 		</div>
 	</div>
 </div>
@@ -23,7 +23,9 @@
 		dataType: 'json',
 		success: function(json) {
 			$('#pagseguro input').attr('data-order', json.code);
-			
+			$('#pagseguro span').hide();
+			$('#pagseguro input').show();
+
 			<?php if($auto_start) { ?>
 				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
@@ -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
@@ -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
@@ -19,6 +19,10 @@
 	#pagseguro-support {
 		margin: 30px 35px -35px 35px;
 	}
+
+	#pagseguro-copyright {
+		text-align: center;
+	}
 </style>
 
 <?php echo $header; ?>
@@ -450,6 +454,11 @@
 							</div>
 						</div>
 					</div>
+
+                    <div id="pagseguro-copyright">
+                        <p>Módulo <a href="https://github.com/Marjoel/pagseguro-opencart" target="_blank">PagSeguro</a> by <a href="https://www.marjoel.com" target="_blank">Marjoel Moreira</a></p>
+                        <p>Versão <?php echo $version; ?></p>
+                    </div>
 				</form>
 			</div>
 		</div>

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
@@ -9,8 +9,8 @@
 <div id="pagseguro">
 	<div class="buttons">
 		<div class="pull-right">
-			<input type="submit" value="<?php echo $button; ?>" class="btn btn-primary" data-order="" onclick="startPagSeguro()" />
-			<span style="display:none;"><?php echo $loading; ?></span>
+			<input style="display:none;" type="submit" value="<?php echo $button; ?>" class="btn btn-primary" data-order="" onclick="startPagSeguro()" />
+			<span><?php echo $loading; ?></span>
 		</div>
 	</div>
 </div>
@@ -23,7 +23,9 @@
 		dataType: 'json',
 		success: function(json) {
 			$('#pagseguro input').attr('data-order', json.code);
-			
+			$('#pagseguro span').hide();
+			$('#pagseguro input').show();
+
 			<?php if($auto_start) { ?>
 				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
@@ -6,3 +6,5 @@ notification_url = "index.php?route=extension/payment/pagseguro/callback"
 
 auto_start = false
 auto_start_delay = 1
+
+version = 1.0.4