release: module update from ifthenpay/dev_prestashop_1.7_aio (ifthenp…

…ay/dev_prestashop_1.7_aio@4a425be)
ifthenpay · Sep 1, 2023 · cd003ae · cd003ae
1 parent 3e24abd
commit cd003ae
Show file tree

Hide file tree

Showing 36 changed files with 375 additions and 355 deletions.
diff --git a/versao 1.7 ou superior/ifthenpay/classes/Admin/Payments/MultibancoAdminOrder.php b/versao 1.7 ou superior/ifthenpay/classes/Admin/Payments/MultibancoAdminOrder.php
@@ -27,7 +27,7 @@
 namespace PrestaShop\Module\Ifthenpay\Admin\Payments;
 
 if (!defined('_PS_VERSION_')) {
-    exit;
+	exit;
 }
 
 
@@ -37,42 +37,39 @@
 class MultibancoAdminOrder extends MultibancoBase implements AdminOrderInterface
 {
 
-    public function setSmartyVariables($paymentInDatabase)
-    {
-        if ($paymentInDatabase) {
-            $this->smartyDefaultData->setEntidade($this->paymentDataFromDb['entidade']);
-            $this->smartyDefaultData->setReferencia($this->paymentDataFromDb['referencia']);
-            $this->smartyDefaultData->setValidade(
-                (isset($this->paymentDataFromDb['validade']) && $this->paymentDataFromDb['validade'] != '') ?
-                    (new \DateTime($this->paymentDataFromDb['validade']))->format('d-m-Y') : ''
-            );
-        } else {
-            $this->smartyDefaultData->setEntidade($this->paymentGatewayResultData->entidade);
-            $this->smartyDefaultData->setReferencia($this->paymentGatewayResultData->referencia);
-            $this->smartyDefaultData->setValidade(
-                (isset($this->paymentDataFromDb['validade']) && $this->paymentDataFromDb['validade'] != '') ?
-                    (new \DateTime($this->paymentGatewayResultData->validade))->format('d-m-Y') : ''
-            );
-        }
-    }
+	public function setSmartyVariables($paymentInDatabase)
+	{
+		if ($paymentInDatabase) {
+			$this->smartyDefaultData->setEntidade($this->paymentDataFromDb['entidade']);
+			$this->smartyDefaultData->setReferencia($this->paymentDataFromDb['referencia']);
+			$this->smartyDefaultData->setValidade(
+				(isset($this->paymentDataFromDb['validade']) && $this->paymentDataFromDb['validade'] != '') ?
+				(new \DateTime($this->paymentDataFromDb['validade']))->format('d-m-Y') : ''
+			);
+		} else {
+			$this->smartyDefaultData->setEntidade($this->paymentGatewayResultData->entidade);
+			$this->smartyDefaultData->setReferencia($this->paymentGatewayResultData->referencia);
+			$this->smartyDefaultData->setValidade($this->paymentGatewayResultData->validade);
+		}
+	}
 
-    public function getAdminOrder()
-    {
-        $this->setPaymentModel('multibanco');
-        $this->getFromDatabaseById();
-        if (!empty($this->paymentDataFromDb)) {
-            $this->setSmartyVariables(true);
-        } else {
-            $this->setGatewayBuilderData();
-            $this->paymentGatewayResultData = $this->ifthenpayGateway->execute(
-                $this->paymentDefaultData->paymentMethod,
-                $this->gatewayBuilder,
-                strval($this->paymentDefaultData->order->id),
-                strval($this->paymentDefaultData->order->getOrdersTotalPaid())
-            )->getData();
-            $this->saveToDatabase();
-            $this->setSmartyVariables(false);
-        }
-        return $this;
-    }
+	public function getAdminOrder()
+	{
+		$this->setPaymentModel('multibanco');
+		$this->getFromDatabaseById();
+		if (!empty($this->paymentDataFromDb)) {
+			$this->setSmartyVariables(true);
+		} else {
+			$this->setGatewayBuilderData();
+			$this->paymentGatewayResultData = $this->ifthenpayGateway->execute(
+				$this->paymentDefaultData->paymentMethod,
+				$this->gatewayBuilder,
+				strval($this->paymentDefaultData->order->id),
+				strval($this->paymentDefaultData->order->getOrdersTotalPaid())
+			)->getData();
+			$this->saveToDatabase();
+			$this->setSmartyVariables(false);
+		}
+		return $this;
+	}
 }
diff --git a/versao 1.7 ou superior/ifthenpay/classes/Base/Payments/MultibancoBase.php b/versao 1.7 ou superior/ifthenpay/classes/Base/Payments/MultibancoBase.php
@@ -60,6 +60,8 @@ protected function updateDatabase()
 		$this->setPaymentModel('multibanco', $this->paymentDataFromDb['id_ifthenpay_multibanco']);
 		$this->paymentModel->entidade = $this->paymentGatewayResultData->entidade;
 		$this->paymentModel->referencia = $this->paymentGatewayResultData->referencia;
+		$this->paymentModel->request_id = isset($this->paymentGatewayResultData->idPedido) ? $this->paymentGatewayResultData->idPedido : null;
+		$this->paymentModel->validade = isset($this->paymentGatewayResultData->validade) ? $this->paymentGatewayResultData->validade : null;
 		$this->paymentModel->update();
 	}
 
@@ -69,4 +71,4 @@ protected function setEmailVariables()
 		$this->emailDefaultData['{entidade}'] = $this->paymentGatewayResultData ? $this->paymentGatewayResultData->entidade : $this->paymentDataFromDb['entidade'];
 		$this->emailDefaultData['{referencia}'] = $this->paymentGatewayResultData ? $this->paymentGatewayResultData->referencia : $this->paymentDataFromDb['referencia'];
 	}
-}
+}
diff --git a/versao 1.7 ou superior/ifthenpay/classes/Base/Payments/PayshopBase.php b/versao 1.7 ou superior/ifthenpay/classes/Base/Payments/PayshopBase.php
@@ -26,48 +26,49 @@
 namespace PrestaShop\Module\Ifthenpay\Base\Payments;
 
 if (!defined('_PS_VERSION_')) {
-    exit;
+	exit;
 }
 
 use PrestaShop\Module\Ifthenpay\Base\PaymentBase;
 
 class PayshopBase extends PaymentBase
 {
-    protected function setGatewayBuilderData()
-    {
-        $this->gatewayBuilder->setPayshopKey(\Configuration::get('IFTHENPAY_PAYSHOP_KEY'));
-        $this->gatewayBuilder->setValidade(\Configuration::get('IFTHENPAY_PAYSHOP_VALIDADE'));
-    }
+	protected function setGatewayBuilderData()
+	{
+		$this->gatewayBuilder->setPayshopKey(\Configuration::get('IFTHENPAY_PAYSHOP_KEY'));
+		$this->gatewayBuilder->setValidade(\Configuration::get('IFTHENPAY_PAYSHOP_VALIDADE'));
+	}
 
-    protected function saveToDatabase()
-    {
-        $this->paymentModel->id_transacao = $this->paymentGatewayResultData->idPedido;
-        $this->paymentModel->referencia = $this->paymentGatewayResultData->referencia;
-        $this->paymentModel->validade = $this->paymentGatewayResultData->validade;
-        $this->paymentModel->order_id = $this->paymentDefaultData->order->id;
-        $this->paymentModel->status = 'pending';
-        $this->paymentModel->save();
-    }
+	protected function saveToDatabase()
+	{
+		$this->paymentModel->id_transacao = $this->paymentGatewayResultData->idPedido;
+		$this->paymentModel->referencia = $this->paymentGatewayResultData->referencia;
+		$this->paymentModel->validade = $this->paymentGatewayResultData->validade;
+		$this->paymentModel->order_id = $this->paymentDefaultData->order->id;
+		$this->paymentModel->status = 'pending';
+		$this->paymentModel->save();
+	}
 
-    protected function updateDatabase()
-    {
-        $this->setPaymentModel('payshop', $this->paymentDataFromDb['id_ifthenpay_payshop']);
-        $this->paymentModel->referencia = $this->paymentGatewayResultData->referencia;
-        $this->paymentModel->id_transacao = $this->paymentGatewayResultData->idPedido;
-        $this->paymentModel->update();
-    }
+	protected function updateDatabase()
+	{
+		$this->setPaymentModel('payshop', $this->paymentDataFromDb['id_ifthenpay_payshop']);
+		$this->paymentModel->referencia = $this->paymentGatewayResultData->referencia;
+		$this->paymentModel->id_transacao = $this->paymentGatewayResultData->idPedido;
+		$this->paymentModel->validade = $this->paymentGatewayResultData->validade;
+		$this->paymentModel->update();
+	}
 
-    protected function setEmailVariables()
-    {
-        $this->emailDefaultData['{referencia}'] = $this->paymentGatewayResultData ? $this->paymentGatewayResultData->referencia : $this->paymentDataFromDb['referencia'];
+	protected function setEmailVariables()
+	{
+		$this->emailDefaultData['{referencia}'] = $this->paymentGatewayResultData ? $this->paymentGatewayResultData->referencia : $this->paymentDataFromDb['referencia'];
 
-        // format validity date if not already formated
-        $validade = $this->paymentGatewayResultData ? $this->paymentGatewayResultData->validade : $this->paymentDataFromDb['validade'];
-        if (!strpos($validade, "-")) {
-            $validade = (new \DateTime($validade))->format('d-m-Y');
-        }
+		// format validity date if not already formated
+		$validade = $this->paymentGatewayResultData ? $this->paymentGatewayResultData->validade : $this->paymentDataFromDb['validade'];
+		if (!strpos($validade, "-")) {
+			$validade = (new \DateTime($validade))->format('d-m-Y');
+		}
 
-        $this->emailDefaultData['{validade}'] = $validade;
+		$this->emailDefaultData['{validade}'] = $validade;
 
-    }
+	}
 }