Merge pull request vindi#11 from bizcommerce/master

feat: Do not allow purchases with installments greater than the plan installments

Api/PixConfigurationInterface.php

@@ -7,20 +7,10 @@
 
 interface PixConfigurationInterface
 {
-
- const PATH_ENABLED_DOCUMENT = 'payment/vindi_pix/enabled_document';
  const PATH_INFO_MESSAGE = 'checkout/vindi_pix/info_message';
  const PATH_INFO_MESSAGE_ONEPAGE_SUCCESS = 'checkout/vindi_pix/info_message_onepage_success';
  const PATH_QR_CODE_WARNING_MESSAGE = 'checkout/vindi_pix/qr_code_warning_message';
 
- /**
- * @param string $scopeType
- * @param string|null $scopeCode
- *
- * @return bool
- */
- public function isEnabledDocument(string $scopeType = ScopeInterface::SCOPE_STORE, string $scopeCode = null);
-
  /**
  * @param string $scopeType
  * @param string|null $scopeCode

Block/Info/BankSlipPix.php

@@ -5,6 +5,7 @@
 use Magento\Backend\Block\Template\Context;
 use Magento\Framework\Pricing\Helper\Data;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Payment\Block\Info;
 use Vindi\Payment\Api\PixConfigurationInterface;
 use Vindi\Payment\Model\Payment\PaymentMethod;
@@ -32,6 +33,9 @@ class BankSlipPix extends Info
  */
  protected $pixConfiguration;
 
+ /** @var TimezoneInterface */
+ protected $timezone;
+
  /**
  * @var Json
  */
@@ -53,12 +57,14 @@ public function __construct(
  Context $context,
  PixConfigurationInterface $pixConfiguration,
  Json $json,
+ TimezoneInterface $timezone,
  array $data = []
  ) {
  parent::__construct($context, $data);
  $this->paymentMethod = $paymentMethod;
  $this->currency = $currency;
  $this->pixConfiguration = $pixConfiguration;
+ $this->timezone = $timezone;
  $this->json = $json;
  }
 
@@ -164,16 +170,16 @@ protected function isValidToPayment($timestampMaxDays)
  return false;
  }
 
- return $timestampMaxDays >= strtotime("now");
+ return $timestampMaxDays >= $this->timezone->scopeTimeStamp();
  }
 
  /**
- * @return mixed
+ * @return string
  * @throws \Magento\Framework\Exception\LocalizedException
  */
- protected function getMaxDaysToPayment()
+ protected function getMaxDaysToPayment(): string
  {
- return $this->getOrder()->getPayment()->getAdditionalInformation('max_days_to_keep_waiting_payment');
+ return (string) $this->getOrder()->getPayment()->getAdditionalInformation('max_days_to_keep_waiting_payment');
  }
 
  public function getPrintUrl()

Block/Info/Pix.php

@@ -6,6 +6,7 @@
 use Magento\Backend\Block\Template\Context;
 use Magento\Framework\Pricing\Helper\Data;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Payment\Block\Info;
 use Vindi\Payment\Api\PixConfigurationInterface;
 use Vindi\Payment\Model\Payment\PaymentMethod;
@@ -33,33 +34,30 @@ class Pix extends Info
  */
  protected $pixConfiguration;
 
+ /** @var TimezoneInterface */
+ protected $timezone;
+
  /**
  * @var Json
  */
  protected $json;
 
  protected $paymentMethod;
 
- /**
- * @param PaymentMethod $paymentMethod
- * @param Data $currency
- * @param Context $context
- * @param PixConfigurationInterface $pixConfiguration
- * @param Json $json
- * @param array $data
- */
  public function __construct(
  PaymentMethod $paymentMethod,
  Data $currency,
  Context $context,
  PixConfigurationInterface $pixConfiguration,
+ TimezoneInterface $timezone,
  Json $json,
  array $data = []
  ) {
  parent::__construct($context, $data);
  $this->paymentMethod = $paymentMethod;
  $this->currency = $currency;
  $this->pixConfiguration = $pixConfiguration;
+ $this->timezone = $timezone;
  $this->json = $json;
  }
 
@@ -167,15 +165,15 @@ protected function isValidToPayment($timestampMaxDays)
  return false;
  }
 
- return $timestampMaxDays >= strtotime("now");
+ return $timestampMaxDays >= $this->timezone->scopeTimeStamp();
  }
 
  /**
- * @return mixed
+ * @return string
  * @throws \Magento\Framework\Exception\LocalizedException
  */
- protected function getMaxDaysToPayment()
+ protected function getMaxDaysToPayment(): string
  {
- return $this->getOrder()->getPayment()->getAdditionalInformation('max_days_to_keep_waiting_payment');
+ return (string) $this->getOrder()->getPayment()->getAdditionalInformation('max_days_to_keep_waiting_payment');
  }
 }

Helper/Data.php

@@ -151,8 +151,8 @@ public static function sanitizeItemSku($code)
  "[^a-zA-Z0-9-]",
  "-",
  strtr(
- utf8_decode(trim(preg_replace('/[ -]+/', '-', $code))),
- utf8_decode("áàãâéêíóôõúüñçÁÀÃÂÉÊÍÓÔÕÚÜÑÇ"),
+ mb_convert_encoding(trim(preg_replace('/[ -]+/', '-', $code)), 'ISO-8859-1', 'UTF-8'),
+ mb_convert_encoding("áàãâéêíóôõúüñçÁÀÃÂÉÊÍÓÔÕÚÜÑÇ", 'ISO-8859-1', 'UTF-8'),
  "aaaaeeiooouuncAAAAEEIOOOUUNC-"
  )
  ));

Helper/PixConfiguration.php

@@ -9,15 +9,6 @@
 
 class PixConfiguration extends AbstractHelper implements PixConfigurationInterface
 {
-
- /**
- * @inheritDoc
- */
- public function isEnabledDocument(string $scopeType = ScopeInterface::SCOPE_STORE, string $scopeCode = null)
- {
- return $this->scopeConfig->isSetFlag(static::PATH_ENABLED_DOCUMENT, $scopeType, $scopeCode);
- }
-
  /**
  * @inheritDoc
  */

Model/Bankslip/ConfigProvider.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Vindi\Payment\Model\Bankslip;
+
+use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+
+
+/**
+ * Class ConfigProvider
+ * @package Vindi\Payment\Model
+ */
+class ConfigProvider implements ConfigProviderInterface
+{
+ /**
+ * @var CustomerSession $customerSession
+ */
+ protected $customerSession;
+
+ /**
+ * @param CustomerSession $customerSession
+ */
+ public function __construct(
+ CustomerSession $customerSession
+ ) {
+ $this->customerSession = $customerSession;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getConfig()
+ {
+ $customerTaxvat = '';
+ $customer = $this->customerSession->getCustomer();
+ if ($customer && $customer->getTaxvat()) {
+ $customerTaxvat = $customer->getTaxvat();
+ }
+
+ return [
+ 'payment' => [
+ 'vindi_bankslip' => [
+ 'enabledDocument' => true,
+ 'customer_taxvat' => $customerTaxvat
+ ]
+ ]
+ ];
+ }
+}

Model/BankslipPix/ConfigProvider.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace Vindi\Payment\Model\Pix;
-
+namespace Vindi\Payment\Model\BankslipPix;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Vindi\Payment\Api\PixConfigurationInterface;
 
-
 /**
  * Class ConfigProvider
  * @package Vindi\Payment\Model
@@ -50,8 +48,8 @@ public function getConfig()
 
  return [
  'payment' => [
- 'vindi_pix' => [
- 'enabledDocument' => $this->pixConfiguration->isEnabledDocument(),
+ 'vindi_bankslippix' => [
+ 'enabledDocument' => true,
  'info_message' => $this->pixConfiguration->getInfoMessage(),
  'customer_taxvat' => $customerTaxvat
  ]

Model/ConfigProvider.php

@@ -190,13 +190,22 @@ private function getAttributeValue(ProductInterface $product, $attribute = '')
 
  public function getPaymentProfiles(): array
  {
+ $paymentProfiles = [];
  if ($this->customerSession->isLoggedIn()) {
  $customerId = $this->customerSession->getCustomerId();
  $this->paymentProfileCollection->addFieldToFilter('customer_id', $customerId);
- return $this->paymentProfileCollection->getItems();
+ $this->paymentProfileCollection->addFieldToFilter('cc_type', ['neq' => '']);
+ $this->paymentProfileCollection->addFieldToFilter('cc_type', ['neq' => null]);
+ foreach ($this->paymentProfileCollection as $paymentProfile) {
+ $paymentProfiles[] = [
+ 'id' => $paymentProfile->getId(),
+ 'card_number' => (string) $paymentProfile->getCcLast4(),
+ 'card_type' => (string) $paymentProfile->getCcType()
+ ];
+ }
  }
 
- return [];
+ return $paymentProfiles;
  }
 
  /**

Model/Payment/AbstractMethod.php

@@ -81,32 +81,32 @@ abstract class AbstractMethod extends OriginAbstractMethod
  /**
  * @var ProductManagementInterface
  */
- private $productManagement;
+ protected $productManagement;
 
  /**
  * @var \Vindi\Payment\Helper\Data
  */
- private $helperData;
+ protected $helperData;
 
  /**
  * @var PlanManagementInterface
  */
- private $planManagement;
+ protected $planManagement;
 
  /**
  * @var SubscriptionInterface
  */
- private $subscriptionRepository;
+ protected $subscriptionRepository;
 
  /**
  * @var PaymentProfileFactory
  */
- private $paymentProfileFactory;
+ protected $paymentProfileFactory;
 
  /**
  * @var PaymentProfileRepository
  */
- private $paymentProfileRepository;
+ protected $paymentProfileRepository;
 
  /**
  * @var ResourceConnection
@@ -329,7 +329,9 @@ protected function processPayment(InfoInterface $payment, $amount)
  ];
 
  if ($body['payment_method_code'] === PaymentMethod::CREDIT_CARD) {
- $paymentProfile = $this->createPaymentProfile($order, $payment, $customerId);
+ $paymentProfile = ($payment->getAdditionalInformation('payment_profile'))
+ ? $this->getPaymentProfile((int) $payment->getAdditionalInformation('payment_profile'))
+ : $this->createPaymentProfile($order, $payment, $customerId);
  $body['payment_profile'] = ['id' => $paymentProfile->getData('payment_profile_id')];
  }
 
@@ -350,13 +352,18 @@ protected function processPayment(InfoInterface $payment, $amount)
  return $this->handleError($order);
  }
 
+ protected function getPaymentProfile(int $paymentProfileId): PaymentProfile
+ {
+ return $this->paymentProfileRepository->getById($paymentProfileId);
+ }
+
  /**
  * @param InfoInterface $payment
  * @param OrderItemInterface $orderItem
  * @return mixed
  * @throws LocalizedException
  */
- private function handleSubscriptionOrder(InfoInterface $payment, OrderItemInterface $orderItem)
+ protected function handleSubscriptionOrder(InfoInterface $payment, OrderItemInterface $orderItem)
  {
  try {
  $order = $payment->getOrder();
@@ -436,7 +443,7 @@ private function handleSubscriptionOrder(InfoInterface $payment, OrderItemInterf
  * @return void
  * @throws \Exception
  */
- private function saveSubscriptionToDatabase(array $subscription, Order $order)
+ protected function saveSubscriptionToDatabase(array $subscription, Order $order)
  {
  $tableName = $this->resourceConnection->getTableName('vindi_subscription');
  $startAt = new \DateTime($subscription['start_at']);
@@ -466,7 +473,7 @@ private function saveSubscriptionToDatabase(array $subscription, Order $order)
  * @param Order $order
  * @return OrderItemInterface|bool
  */
- private function isSubscriptionOrder(Order $order)
+ protected function isSubscriptionOrder(Order $order)
  {
  foreach ($order->getItems() as $item) {
  try {
@@ -490,7 +497,7 @@ private function isSubscriptionOrder(Order $order)
  * @param Order $order
  * @throws LocalizedException
  */
- private function handleError(Order $order)
+ protected function handleError(Order $order)
  {
  $this->psrLogger->error(__(sprintf('Error on order payment %d.', $order->getId())));
  $message = __('There has been a payment confirmation error. Verify data and try again');
@@ -536,7 +543,7 @@ protected function handleBankSplitAdditionalInformation(InfoInterface $payment,
  * @param array $subscription
  * @return bool
  */
- private function successfullyPaid(array $body, $bill, array $subscription = [])
+ protected function successfullyPaid(array $body, $bill, array $subscription = [])
  {
  // nova validação para permitir pedidos com pagamento/fatura pendente
  if (!$bill) {