this closes #1, and closes #2

Marjoel · Mar 28, 2017 · bce5b52 · bce5b52
1 parent e899b35
commit bce5b52
Show file tree

Hide file tree

Showing 3 changed files with 144 additions and 143 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@
 
 | Versão | Notas | Compatibilidade |
 | ------ | ----- | --------------- |
+| 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 |

diff --git a/v2.0.X - v2.1.X - v2.2.X/upload/system/library/pagseguro/pagseguro.class.php b/v2.0.X - v2.1.X - v2.2.X/upload/system/library/pagseguro/pagseguro.class.php
@@ -132,7 +132,7 @@ private function getNotificationUrl($config) {
 	}
 
 	private function getRedirectUrl($properties, $config) {
-		return $config->redirect_url . "&orderId=" . strval($properties["order_id"]);
+		return $config->redirect_url;
 	}
 
 	private function getCancelUrl($config) {

diff --git a/v2.3.X/upload/system/library/pagseguro/pagseguro.class.php b/v2.3.X/upload/system/library/pagseguro/pagseguro.class.php
@@ -1,142 +1,142 @@
-<?php
-require_once "PagSeguroLibrary.php";
-
-class PagSeguro {
-	public function __construct() {
-	}
-
-	public function getConfig() {
-		return (object) parse_ini_file("pagseguro-config.ini");
-	} 
-
-	public function createOrder($properties, $config) {
-		PagSeguroConfig::setApplicationCharset("UTF-8");
-		$pagseguro = new PagSeguroPaymentRequest();
-
-		$pagseguro->setCurrency($this->getCurrencyCode($properties));
-		$pagseguro->setSenderCpf($this->getDocument($properties));
-		$pagseguro->setSenderName($this->getCustomerName($properties));
-		$pagseguro->setSenderEmail($this->getCustomerEmail($properties));
-		$pagseguro->setShippingType($this->getFreightType($config));
-		$pagseguro->setShippingAddress($this->getShippingInformation($properties));
-		$pagseguro->setReference($this->getReference($properties));
-
-		$pagseguro->setRedirectUrl($this->getRedirectUrl($properties, $config));
-		$pagseguro->setNotificationURL($this->getNotificationUrl($config));
-
-		$products = $this->getProducts($properties);
-		foreach ($products as $product) {
-			$pagseguro->addItem($product);
-		}
-
-		$cellphone = $this->getCustomerCellPhone($properties);
-		if(strlen($cellphone) > 0) {
-			$pagseguro->setSenderPhone(substr($cellphone, 0, 2), substr($cellphone, 2, strlen($cellphone) - 1));
-		}
-
-		$discount = $this->getDiscount($properties);
-		$cost = $this->getShippingCost($properties);
-		$extra = ($cost >= $discount) ? ($cost - $discount) : (($discount - $cost)*-1);
-		$pagseguro->setExtraAmount($extra);
-
-		try {
-			$orderId = $pagseguro->register(new PagSeguroAccountCredentials($config->email, $config->token));
-        }
-		catch (PagSeguroServiceException $e) {
-        	print($e->getOneLineMessage());
-        }
-		return $orderId;
-	}
-
-	private function getShippingCost($properties) {
-		return $properties["shipping"]["cost"];
-	}
-
-	private function getCurrencyCode($properties) {
-		return strval($properties["currency_code"]);
-	}
-
-	private function getReference($properties) {
-		return strval($properties["order_id"]);
-	}
-
-	private function getDiscount($properties) {
-		return strval($properties["discount"]);
-	}
-
-	private function getCustomerName($properties) {
-		return ($properties["firstname"]." ".$properties["lastname"]);
-	}
-
-	private function getCustomerEmail($properties) {
-		return $properties["email"];
-	}
-
-	private function getFreightType($config) {
-		if($config->freight) {
-			return $config->freight;
-		}
-		return 3;
-	}
-
-	private function getDocument($properties) {
-		return strval(preg_replace("/[^0-9]/", "", $properties["customer_document"]));
-	}
-
-	private function getCustomerCellPhone($properties) {
-		$cellphone = strval(preg_replace("/[^0-9]/", "", $properties["customer_cellphone"]));
-		$cellphone = ltrim($cellphone, "0");
-
-		if(strlen($cellphone) < 9) {
-			$cellphone = "";
-		}
-		return $cellphone;
-	}
-
-	private function getShippingInformation($properties){
-		return array(
-			"street" => $properties["address_street"],
-			"number" => strval($properties["address_number"]),
-			"complement" => $properties["address_complement"],
-			"district" => $properties["address_district"],
-			"postalCode" => $this->unMask($properties["shipping_postcode"]),
-			"city" => $properties["shipping_city"],
-			"state" => $properties["shipping_zone_code"],
-			"country" => $properties["shipping_iso_code_3"]
-		);
-	}
-
-	private function unMask($value) {
-		return strval(preg_replace("/[^0-9]/", "", $value));
-	}
-
-	private function getProducts($properties) {
-		$products = $properties["products"];
-		$productDetails = array();
-		$i = 0;
-
-		foreach ($products as $key => $value) {
-			$productDetails[$i] = array(
-				"id" => $value["product_id"],
-				"amount" => $value["price"],
-				"quantity" => strval($value["quantity"]),
-				"description" => substr($value["name"], 0, (strlen($value["name"]) > 80 ? 80 : strlen($value["name"])))
-			);
-			$i++;
-		}
-		return $productDetails;
-	}
-
-	private function getNotificationUrl($config) {
-		return $config->notification_url;
-	}
-
-	private function getRedirectUrl($properties, $config) {
-		return $config->redirect_url . "&orderId=" . strval($properties["order_id"]);
-	}
-
-	private function getCancelUrl($config) {
-		return $config->cancel_url;
-	}
-}
-?>
+<?php
+require_once "PagSeguroLibrary.php";
+
+class PagSeguro {
+	public function __construct() {
+	}
+
+	public function getConfig() {
+		return (object) parse_ini_file("pagseguro-config.ini");
+	}
+
+	public function createOrder($properties, $config) {
+		PagSeguroConfig::setApplicationCharset("UTF-8");
+		$pagseguro = new PagSeguroPaymentRequest();
+
+		$pagseguro->setCurrency($this->getCurrencyCode($properties));
+		$pagseguro->setSenderCpf($this->getDocument($properties));
+		$pagseguro->setSenderName($this->getCustomerName($properties));
+		$pagseguro->setSenderEmail($this->getCustomerEmail($properties));
+		$pagseguro->setShippingType($this->getFreightType($config));
+		$pagseguro->setShippingAddress($this->getShippingInformation($properties));
+		$pagseguro->setReference($this->getReference($properties));
+
+		$pagseguro->setRedirectUrl($this->getRedirectUrl($properties, $config));
+		$pagseguro->setNotificationURL($this->getNotificationUrl($config));
+
+		$products = $this->getProducts($properties);
+		foreach ($products as $product) {
+			$pagseguro->addItem($product);
+		}
+
+		$cellphone = $this->getCustomerCellPhone($properties);
+		if(strlen($cellphone) > 0) {
+			$pagseguro->setSenderPhone(substr($cellphone, 0, 2), substr($cellphone, 2, strlen($cellphone) - 1));
+		}
+
+		$discount = $this->getDiscount($properties);
+		$cost = $this->getShippingCost($properties);
+		$extra = ($cost >= $discount) ? ($cost - $discount) : (($discount - $cost)*-1);
+		$pagseguro->setExtraAmount($extra);
+
+		try {
+			$orderId = $pagseguro->register(new PagSeguroAccountCredentials($config->email, $config->token));
+        }
+		catch (PagSeguroServiceException $e) {
+        	print($e->getOneLineMessage());
+        }
+		return $orderId;
+	}
+
+	private function getShippingCost($properties) {
+		return $properties["shipping"]["cost"];
+	}
+
+	private function getCurrencyCode($properties) {
+		return strval($properties["currency_code"]);
+	}
+
+	private function getReference($properties) {
+		return strval($properties["order_id"]);
+	}
+
+	private function getDiscount($properties) {
+		return strval($properties["discount"]);
+	}
+
+	private function getCustomerName($properties) {
+		return ($properties["firstname"]." ".$properties["lastname"]);
+	}
+
+	private function getCustomerEmail($properties) {
+		return $properties["email"];
+	}
+
+	private function getFreightType($config) {
+		if($config->freight) {
+			return $config->freight;
+		}
+		return 3;
+	}
+
+	private function getDocument($properties) {
+		return strval(preg_replace("/[^0-9]/", "", $properties["customer_document"]));
+	}
+
+	private function getCustomerCellPhone($properties) {
+		$cellphone = strval(preg_replace("/[^0-9]/", "", $properties["customer_cellphone"]));
+		$cellphone = ltrim($cellphone, "0");
+
+		if(strlen($cellphone) < 9) {
+			$cellphone = "";
+		}
+		return $cellphone;
+	}
+
+	private function getShippingInformation($properties){
+		return array(
+			"street" => $properties["address_street"],
+			"number" => strval($properties["address_number"]),
+			"complement" => $properties["address_complement"],
+			"district" => $properties["address_district"],
+			"postalCode" => $this->unMask($properties["shipping_postcode"]),
+			"city" => $properties["shipping_city"],
+			"state" => $properties["shipping_zone_code"],
+			"country" => $properties["shipping_iso_code_3"]
+		);
+	}
+
+	private function unMask($value) {
+		return strval(preg_replace("/[^0-9]/", "", $value));
+	}
+
+	private function getProducts($properties) {
+		$products = $properties["products"];
+		$productDetails = array();
+		$i = 0;
+
+		foreach ($products as $key => $value) {
+			$productDetails[$i] = array(
+				"id" => $value["product_id"],
+				"amount" => $value["price"],
+				"quantity" => strval($value["quantity"]),
+				"description" => substr($value["name"], 0, (strlen($value["name"]) > 80 ? 80 : strlen($value["name"])))
+			);
+			$i++;
+		}
+		return $productDetails;
+	}
+
+	private function getNotificationUrl($config) {
+		return $config->notification_url;
+	}
+
+	private function getRedirectUrl($properties, $config) {
+		return $config->redirect_url;
+	}
+
+	private function getCancelUrl($config) {
+		return $config->cancel_url;
+	}
+}
+?>