Ou pague com cartão
+{$metaLabel}: {$documentNumber}
"; + } + + /** + * @param string $addressType + * + * @return string + */ + private function getDocumentMetaNameByAddressType(string $addressType): string + { + return "_{$addressType}_document"; + } + + /** + * @param string $cpf + * + * @return bool + */ + private function isValidCpf(string $cpf): bool + { + if (!$this->isValidCpfFormat($cpf)) { + return false; + } + + for ($digit = 9; $digit < 11; $digit ++) { + if (!$this->isValidCpfDigit($cpf, $digit)) { + return false; + } + } + + return true; + } + + /** + * @param string $cpf + * + * @return bool + */ + private function isValidCpfFormat(string $cpf): bool + { + // Check if CPF length is exactly 11 and not all digits are the same + return strlen($cpf) === 11 && !preg_match('/(\d)\1{10}/', $cpf); + } + + /** + * @param string $cpf + * @param int $digit + * + * @return bool + */ + private function isValidCpfDigit(string $cpf, int $digit): bool + { + $calculatedDigit = $this->calculateCpfDigit($cpf, $digit); + + return $cpf[$digit] == $calculatedDigit; + } + + /** + * @param string $cpf + * @param int $digit + * + * @return int + */ + private function calculateCpfDigit(string $cpf, int $digit): int + { + $sum = 0; + + for ($i = 0; $i < $digit; $i ++) { + $sum += $cpf[$i] * (($digit + 1) - $i); + } + + $remainder = (10 * $sum) % 11; + + return ($remainder === 10) ? 0 : $remainder; + } + + /** + * @param string $cnpj + * + * @return bool + */ + private function isValidCnpj(string $cnpj): bool + { + if (!$this->isValidCnpjFormat($cnpj)) { + return false; + } + + $firstCheckDigit = $this->calculateCnpjCheckDigit(substr($cnpj, 0, 12), 5); + if ($cnpj[12] != $firstCheckDigit) { + return false; + } + + $secondCheckDigit = $this->calculateCnpjCheckDigit(substr($cnpj, 0, 13), 6); + + return $cnpj[13] == $secondCheckDigit; + } + + /** + * @param string $cnpj + * + * @return bool + */ + private function isValidCnpjFormat(string $cnpj): bool + { + // Check if CNPJ is 14 characters long and not a sequence of repeated digits + return strlen($cnpj) == 14 && !preg_match('/(\d)\1{13}/', $cnpj); + } + + /** + * @param string $cnpj + * @param int $initialWeight + * + * @return int + */ + private function calculateCnpjCheckDigit(string $cnpj, int $initialWeight): int + { + $sum = 0; + $weight = $initialWeight; + + for ($i = 0; $i < strlen($cnpj); $i ++) { + $sum += $cnpj[$i] * $weight; + $weight = ($weight == 2) ? 9 : $weight - 1; + } + + $remainder = $sum % 11; + + return ($remainder < 2) ? 0 : 11 - $remainder; + } +} diff --git a/src/Controller/Gateways/CreditCard.php b/src/Controller/Gateways/CreditCard.php index a7bf4072..5fb1873d 100644 --- a/src/Controller/Gateways/CreditCard.php +++ b/src/Controller/Gateways/CreditCard.php @@ -148,7 +148,7 @@ public function field_cc_operation_type() 'type' => 'select', 'title' => __('Operation Type', 'woo-pagarme-payments'), 'class' => 'wc-enhanced-select', - 'default' => $this->config->getCcOperationType() ?? 1, + 'default' => $this->config->getCcOperationType() ?? 2, 'options' => array( 1 => __('Authorize', 'woo-pagarme-payments'), 2 => __('Authorize and Capture', 'woo-pagarme-payments'), diff --git a/src/Controller/Gateways/Voucher.php b/src/Controller/Gateways/Voucher.php index 28b0f670..d35e73c8 100644 --- a/src/Controller/Gateways/Voucher.php +++ b/src/Controller/Gateways/Voucher.php @@ -36,7 +36,7 @@ class Voucher extends AbstractGateway const VOUCHER_CARD_BRANDS_FIELD_NAME = 'Voucher Card Brands'; - const DEFAULT_BRANDS = ['alelo', 'sodexo', 'vr']; + const DEFAULT_BRANDS = ['alelo', 'sodexo', 'ticket', 'vr']; /** * @return void diff --git a/src/Controller/HubAccounts.php b/src/Controller/HubAccounts.php index 178c19e0..a1cffbe5 100644 --- a/src/Controller/HubAccounts.php +++ b/src/Controller/HubAccounts.php @@ -171,16 +171,6 @@ private function getHubAccountErrorsNotices() $noticesList = [ Account::ACCOUNT_DISABLED => 'Your account is disabled on Pagar.me Dash. ' . 'Please, contact our support team to enable it.', - Account::DOMAIN_EMPTY => [ - 'message' => 'No domain registered on Pagar.me Dash. Please enter your website\'s domain on the Dash ' - . 'to be able to process payment in your store.', - 'buttons' => $this->getHubNoticeButtons('account-config') - ], - Account::DOMAIN_INCORRECT => [ - 'message' => 'The registered domain is different from the URL of your website. Please correct the ' - . 'domain configured on the Dash to be able to process payment in your store.', - 'buttons' => $this->getHubNoticeButtons('account-config') - ], Account::WEBHOOK_INCORRECT => [ 'message' => 'The URL for receiving webhook registered in Pagar.me Dash is different from the URL of ' . 'your website. Please, click the button below to access the Hub and click the Delete > Confirm ' diff --git a/src/Controller/Settings.php b/src/Controller/Settings.php index 2177667a..30383725 100644 --- a/src/Controller/Settings.php +++ b/src/Controller/Settings.php @@ -143,6 +143,18 @@ private function setSectionsFields(array $value = null) 'options' => $this->yesNoOptions->toLabelsArray(), 'default' => strtolower(Yesno::NO), ], + [ + 'fieldObject' => Select::class, + 'id' => 'modify_address', + 'title' => 'Modify address fields', + 'options' => $this->yesNoOptions->toLabelsArray(), + 'default' => strtolower(Yesno::YES), + 'description' => [ + 'format' => "Corrects the 'label' and 'placeholder' attributes of the 'Address' and " + . "'Complement' fields to instruct users on how to fill them in correctly.", + 'values' => [] + ], + ], [ 'fieldObject' => Select::class, 'id' => 'allow_no_address', diff --git a/src/Helper/Utils.php b/src/Helper/Utils.php index c1c74a62..776103c0 100644 --- a/src/Helper/Utils.php +++ b/src/Helper/Utils.php @@ -487,28 +487,43 @@ public static function build_customer_address_from_order(Order $order) * * @return array|string[] */ - public static function build_document_from_order(Order $order) - { - if (!empty($order->get_meta('billing_cpf'))) { - return array( - 'type' => 'individual', - 'value' => $order->get_meta('billing_cpf'), - ); - } - - if (!empty($order->get_meta('billing_cnpj'))) { - return array( - 'type' => 'company', - 'value' => $order->get_meta('billing_cnpj'), - ); + public static function build_document_from_order(Order $order): array + { + $documentFields = [ + 'billing_cpf', + 'billing_cnpj', + 'billing_document', + 'wc_billing/address/document' + ]; + + foreach ($documentFields as $field) { + if (!empty($order->get_meta($field))) { + $document = $order->get_meta($field); + return [ + 'type' => self::getCustomerTypeByDocumentNumber($document), + 'value' => $document + ]; + } } return array( 'type' => '', - 'value' => '', + 'value' => '' ); } + public static function getCustomerTypeByDocumentNumber($document): string + { + $documentNumber = preg_replace('/\D/', '', $document ?? ''); + return strlen($documentNumber) === 14 ? 'company' : 'individual'; + } + + public static function getDocumentTypeByDocumentNumber($document): string + { + $documentNumber = preg_replace('/\D/', '', $document ?? ''); + return strlen($documentNumber) === 14 ? 'cnpj' : 'cpf'; + } + /** * @param Order $order * @@ -606,4 +621,60 @@ public static function isCheckoutBlock() { return WC_Blocks_Utils::has_block_in_page(wc_get_page_id('checkout'), 'woocommerce/checkout'); } + + /** + * @param $path + * @param $fileName + * + * @return string + */ + private static function getScriptUrl($path, $fileName): string + { + return Core::plugins_url('assets/javascripts/' . $path . '/' . $fileName . '.js'); + } + + /** + * @param array $deps + * + * @return array + */ + private static function setScriptDeps(array $deps = []): array + { + $defaultDeps = ['jquery']; + $mergedDeps = array_merge($defaultDeps, $deps); + + return array_unique($mergedDeps); + } + + /** + * @param $path + * @param $fileName + * + * @return false|int + */ + private static function getScriptVersion($path, $fileName) + { + return Core::filemtime('assets/javascripts/' . $path . '/' . $fileName . '.js'); + } + + /** + * + * + * @param string $path The path to the script file, starting after the folders `assets/javascript/[path]` + * @param string $fileName The file name, without the extension `.js` + * @param array $deps Array of dependencies. `jquery` is added automatically + * + * @return array Returns an array with three keys: `src`, `deps` and `ver`, to be used with `wp_register_script` + */ + public static function getRegisterScriptParameters(string $path, string $fileName, array $deps = []): array + { + $path = rtrim($path, '/'); + $fileName = trim($fileName); + + return [ + 'src' => self::getScriptUrl($path, $fileName), + 'deps' => self::setScriptDeps($deps), + 'ver' => self::getScriptVersion($path, $fileName) + ]; + } } diff --git a/src/Model/Checkout.php b/src/Model/Checkout.php index e684f52f..7fa8bca9 100644 --- a/src/Model/Checkout.php +++ b/src/Model/Checkout.php @@ -21,6 +21,7 @@ use Woocommerce\Pagarme\Model\Payment\Data\Card; use Woocommerce\Pagarme\Model\Payment\Data\Multicustomers; use Woocommerce\Pagarme\Model\Payment\Data\PaymentRequestInterface; +use Woocommerce\Pagarme\Service\CardService; class Checkout { @@ -72,6 +73,7 @@ public function __construct( public function validateCheckout($fields, $errors) { if ( + isset($fields['billing_number']) && $fields['billing_number'] === 0 && !key_exists('billing_number_required', $errors->errors) ) { @@ -82,6 +84,7 @@ public function validateCheckout($fields, $errors) } if ( $fields['ship_to_different_address'] && + isset($fields['shipping_number']) && $fields['shipping_number'] === 0 && !key_exists('shipping_number_required', $errors->errors) ) { @@ -123,6 +126,7 @@ public function process(WC_Order $wc_order = null, string $type = CheckoutTypes: if ($type === CheckoutTypes::TRANSPARENT_VALUE) { $fields = $this->convertCheckoutObject($_POST[PaymentRequestInterface::PAGARME_PAYMENT_REQUEST_KEY]); $fields['recurrence_cycle'] = Subscription::getRecurrenceCycle(); + $this->formatFieldsWhenIsSubscription($fields, $wc_order); $attempts = intval($wc_order->get_meta('_pagarme_attempts') ?? 0) + 1; $wc_order->update_meta_data("_pagarme_attempts", $attempts); $response = $this->orders->create_order( @@ -142,8 +146,8 @@ public function process(WC_Order $wc_order = null, string $type = CheckoutTypes: $order->update_meta("attempts", $attempts); $this->addAuthenticationOnMetaData($order, $fields); if ($response) { + do_action("on_pagarme_response", $response); WC()->cart->empty_cart(); - do_action("on_pagarme_response", $wc_order->get_id(), $response); $order->update_meta('transaction_id', $response->getPagarmeId()->getValue()); $order->update_meta('pagarme_id', $response->getPagarmeId()->getValue()); $order->update_meta('pagarme_status', $response->getStatus()->getStatus()); @@ -158,6 +162,30 @@ public function process(WC_Order $wc_order = null, string $type = CheckoutTypes: return false; } } + private function formatFieldsWhenIsSubscription(&$fields, $wc_order) + { + if(Subscription::hasSubscriptionProductInCart() == false){ + return; + } + if ($fields['payment_method'] === 'credit_card') { + $fields['card_id'] = $this->getCardId($fields, $wc_order); + // If same, return payment_origin in $fields + $subscription = new Subscription(); + $subscription->isSameCardInSubscription($fields, $wc_order); + unset($fields['pagarmetoken1']); + } + } + + private function getCardId($fields, $wc_order) + { + if($fields['card_id']){ + return $fields['card_id']; + } + $customer = new Customer($wc_order->get_customer_id()); + $cardService = new CardService(); + $pagarmeCard = $cardService->create($fields['pagarmetoken1'], $customer->getPagarmeCustomerId()); + return $pagarmeCard['cardId']; + } private function convertCheckoutObject(PaymentRequestInterface $paymentRequest) { @@ -212,6 +240,9 @@ private function convertCheckoutObject(PaymentRequestInterface $paymentRequest) private function extractGooglePayToken(&$fields, $paymentRequest) { + if(!$paymentRequest->getDataByKey('googlepay')){ + return; + } $fields['googlepay']['token'] = $paymentRequest->getDataByKey('googlepay'); } diff --git a/src/Model/Config.php b/src/Model/Config.php index 65fb1123..88f76dca 100644 --- a/src/Model/Config.php +++ b/src/Model/Config.php @@ -269,6 +269,11 @@ public function getMulticustomers() return $this->isEnabled('multicustomers'); } + public function getModifyAddress() + { + return $this->isEnabled('modify_address'); + } + public function getAllowNoAddress() { return $this->isEnabled('allow_no_address'); diff --git a/src/Model/Customer.php b/src/Model/Customer.php index 5b4e20a7..1259cbe9 100644 --- a/src/Model/Customer.php +++ b/src/Model/Customer.php @@ -7,7 +7,6 @@ exit(0); } -use Woocommerce\Pagarme\Helper\Utils; use Pagarme\Core\Payment\Repositories\SavedCardRepository as CoreSavedCardRepository; use Pagarme\Core\Payment\Repositories\CustomerRepository as CoreCustomerRepository; use Woocommerce\Pagarme\Service\CustomerService; @@ -33,11 +32,11 @@ class Customer * @param CoreCustomerRepository $customerRepository */ /** phpcs:disable */ - public function __construct($ID, $cardRepository, $customerRepository) + public function __construct($ID, $cardRepository = null, $customerRepository = null) { $this->ID = (int) $ID; - $this->cardRepository = $cardRepository; - $this->customerRepository = $customerRepository; + $this->cardRepository = $cardRepository ?? new CoreSavedCardRepository(); + $this->customerRepository = $customerRepository ?? new CoreCustomerRepository(); } public function __get($prop_name) @@ -125,6 +124,11 @@ public function getPagarmeCustomerId() return $customer->getPagarmeId()->getValue(); } + /** + * @param string $code + * @param string $pagarmeId + * @return void + */ public function savePagarmeCustomerId($code, $pagarmeId) { $customerService = new CustomerService(); @@ -133,4 +137,22 @@ public function savePagarmeCustomerId($code, $pagarmeId) $customer->setPagarmeId($pagarmeId); $customerService->saveOnPlatform($customer); } + + /** + * @param \WC_Order $wcOrder + * @param boolean|null $createIfNotExists create customer on Pagar.me if not exists + * @return string|\Exception + */ + public function getPagarmeCustomerIdByOrder($wcOrder, $createIfNotExists = true) + { + $customer = $this->customerRepository->findByCode($wcOrder->get_customer_id()); + if ($customer) { + return $customer->getPagarmeId()->getValue(); + } + if (!$createIfNotExists) { + throw new \Exception('Customer not found'); + } + $customer = new CustomerService(); + return $customer->createCustomerByOrder($wcOrder); + } } \ No newline at end of file diff --git a/src/Model/Payment/AbstractPayment.php b/src/Model/Payment/AbstractPayment.php index e0a45ffc..e0260b73 100644 --- a/src/Model/Payment/AbstractPayment.php +++ b/src/Model/Payment/AbstractPayment.php @@ -236,6 +236,7 @@ protected function getBillingAddressFromCustomer($customer, WC_Order $wc_order) if (empty($addressArray)) { $addressArray = $this->getCustomerAddressFromWcOrder($wc_order); } + return [ 'street' => $addressArray["street"], 'complement' => $addressArray["complement"], diff --git a/src/Model/Payment/Voucher/Brands/Ticket.php b/src/Model/Payment/Voucher/Brands/Ticket.php new file mode 100644 index 00000000..a790a6dd --- /dev/null +++ b/src/Model/Payment/Voucher/Brands/Ticket.php @@ -0,0 +1,32 @@ +orders = new Orders; $this->addSupportToSubscription(); $this->setPaymentEnabled(); + $this->logger = new LogService('Renew Subscription'); + parent::__construct($this->logger); } private function addSupportToSubscription(): void @@ -80,9 +80,9 @@ private function addSupportToSubscription(): void ); add_action( 'on_pagarme_response', - [$this, 'addMetaDataCardByResponse'], + [$this, 'saveCardInSubscriptionUsingOrderResponse'], 10, - 2 + 1 ); add_filter( 'woocommerce_subscriptions_update_payment_via_pay_shortcode', @@ -102,31 +102,6 @@ private function setPaymentEnabled() } } - /** - * @return Config - */ - public function getConfig() - { - return $this->config; - } - - public function addMetaDataCardByResponse($orderId, $response) - { - $cardData = $this->getCardDataByResponse($response); - $this->addMetaDataCard($orderId, $cardData); - } - - public function addMetaDataCard($orderId, $cardData) - { - if (!$cardData) { - return; - } - $subscriptions = wcs_get_subscriptions_for_order($orderId); - foreach ($subscriptions as $subscription) { - $this->saveCardInSubscription($cardData, $subscription); - } - } - /** * @param float $amountToCharge * @param WC_Order $order @@ -140,8 +115,7 @@ public function processSubscription($amountToCharge, WC_Order $wc_order) wp_send_json_error(__('Invalid order', 'woo-pagarme-payments')); } $order = new Order($wc_order->get_id()); - $this->createCustomerPagarmeIdOnPlatformIfNotExists($wc_order->get_customer_id(), - $order->get_meta('subscription_renewal')); + $this->getPagarmeCustomer($wc_order); $fields = $this->convertOrderObject($order); $response = $this->orders->create_order( @@ -150,8 +124,9 @@ public function processSubscription($amountToCharge, WC_Order $wc_order) $fields ); - $order->payment_method = $fields['payment_method']; + $order->update_meta('payment_method', $fields['payment_method']); if ($response) { + $this->addChargeIdInProcessSubscription($response, $wc_order->get_id()); $order->update_meta('transaction_id', $response->getPagarmeId()->getValue()); $order->update_meta('pagarme_id', $response->getPagarmeId()->getValue()); $order->update_meta('pagarme_status', $response->getStatus()->getStatus()); @@ -175,17 +150,32 @@ public function processSubscription($amountToCharge, WC_Order $wc_order) } } + public function addChargeIdInProcessSubscription($response, $orderId){ + $subscription = $this->getSubscription($orderId); + + if ($subscription->get_payment_method() != 'woo-pagarme-payments-credit_card') { + return; + } + $cardData = $this->getCardToProcessSubscription($subscription); + + if (isset($cardData['chargeId']) && !empty($cardData['chargeId'])) { + return; + } + $this->saveCardInSubscriptionUsingOrderResponse($response); + } + public function processChangePaymentSubscription($subscription) { try { - $subscription = new \WC_Subscription($subscription); + $subscription = new WC_Subscription($subscription); $newPaymentMethod = wc_clean($_POST['payment_method']); + $this->saveCardInSubscriptionOrder(["payment_method" => $newPaymentMethod], $subscription); if ('woo-pagarme-payments-credit_card' == $newPaymentMethod) { $pagarmeCustomer = $this->getPagarmeCustomer($subscription); $cardResponse = $this->createCreditCard($pagarmeCustomer); - $this->saveCardInSubscription($cardResponse, $subscription); - \WC_Subscriptions_Change_Payment_Gateway::update_payment_method($subscription, $newPaymentMethod); + $this->saveCardInSubscriptionOrder($cardResponse, $subscription); } + \WC_Subscriptions_Change_Payment_Gateway::update_payment_method($subscription, $newPaymentMethod); return [ 'result' => 'success', 'redirect' => $this->payment->get_return_url($subscription) @@ -213,7 +203,7 @@ public function processFreeTrialSubscription($wcOrder) if ('credit_card' == $paymentMethod) { $pagarmeCustomer = $this->getPagarmeCustomer($wcOrder); $cardResponse = $this->createCreditCard($pagarmeCustomer); - $this->addMetaDataCard($wcOrder->get_id(), $cardResponse); + $this->saveCardDataToOrderAndSubscriptions($wcOrder->get_id(), $cardResponse); } WC()->cart->empty_cart(); $order = new Order($wcOrder->get_id()); @@ -239,98 +229,74 @@ public function processFreeTrialSubscription($wcOrder) } } - private function createCustomerPagarmeIdOnPlatformIfNotExists($customerCode, $subscriptionId) + /** + * @return boolean + */ + public static function hasSubscriptionProductInCart() { - $customer = new Customer($customerCode, new SavedCardRepository(), new CustomerRepository()); - if($customer->getPagarmeCustomerId() !== false) { - return; + if (!self::hasSubscriptionPlugin()) { + return false; } - $subscription = new \WC_Subscription($subscriptionId); - $customerId = $this->getPagarmeIdFromLastValidOrder($subscription); - $customer->savePagarmeCustomerId($customerCode, $customerId); + return \WC_Subscriptions_Cart::cart_contains_subscription() || wcs_cart_contains_renewal(); } - private function getPagarmeIdFromLastValidOrder($subscription) + /** + * @return boolean + */ + public function hasOneInstallmentPeriodInCart() { - foreach ($subscription->get_related_orders() as $orderId) { - $order = new Order($orderId); - if(!$order->get_meta('pagarme_response_data')){ - continue; - } - $pagarmeResponse = json_decode($order->get_meta('pagarme_response_data'), true); - if(!array_key_exists('customer', $pagarmeResponse)) { - continue; - } - return $pagarmeResponse['customer']['pagarmeId']; + if (!$this->hasSubscriptionPlugin()) { + return false; } - throw new \Exception("Unable to find a PagarId in previous request responses"); - } - - private function getPagarmeCustomer($subscription) - { - $customer = new Customer($subscription->get_user_id(), new SavedCardRepository(), new CustomerRepository()); - if (!$customer->getPagarmeCustomerId()) { - $customer = new CustomerService(); - return $customer->createCustomerByOrder($subscription); + $cartProducts = WC()->cart->cart_contents; + $productsPeriods = []; + foreach ($cartProducts ?? [] as $product) { + $productsPeriods[] = WC_Subscriptions_Product::get_period($product['product_id']); } - return $customer->getPagarmeCustomerId(); - } - private function createCreditCard($pagarmeCustomer) - { - $data = wc_clean($_POST['pagarme']); - $card = new CardService(); - if ($data['credit_card']['cards'][1]['wallet-id']) { - $cardId = $data['credit_card']['cards'][1]['wallet-id']; - return $card->getCard($cardId, $pagarmeCustomer); - } - $cardInfo = $data['credit_card']['cards'][1]; - $response = $card->create($cardInfo['token'], $pagarmeCustomer); - if (array_key_exists('save-card', $cardInfo) && $cardInfo['save-card'] === "1") { - $card->saveOnWalletPlatform($response); + $noInstallmentsPeriods = array_intersect(self::ONE_INSTALLMENT_PERIODS, $productsPeriods); + if (!empty($noInstallmentsPeriods)) { + return true; } - return $response; - } + return false; + } /** - * Save card information on table post_meta - * @param array $card - * @param \WC_Subscription $subscription - * @return void + * @return boolean */ - private function saveCardInSubscription(array $card, \WC_Subscription $subscription) + public static function hasSubscriptionFreeTrial() { - $key = '_pagarme_payment_subscription'; - $value = json_encode($card); - if (FeatureCompatibilization::isHposActivated()) { - $subscription->update_meta_data($key, Utils::rm_tags($value)); - $subscription->save(); - return; + if (!self::hasSubscriptionPlugin()) { + return false; } - update_metadata('post', $subscription->get_id(), $key, $value); - $subscription->save(); + return self::hasSubscriptionProductInCart() && \WC_Subscriptions_Cart::all_cart_items_have_free_trial(); } /** - * @param WC_Order $order + * @param Order $order + * * @return array */ private function convertOrderObject(Order $order) { $fields = [ - 'payment_method' => $this->formatPaymentMethod($order->wc_order->get_payment_method()) + 'payment_method' => $this->formatPaymentMethod($order->getWcOrder()->get_payment_method()) ]; - $card = $this->getCardSubscriptionData($order); - if ($card !== null) { - $fields['card_order_value'] = $order->wc_order->get_total(); + + $card = $this->getCardData($order->getWcOrder()); + + if (!empty($card)) { + $fields['card_order_value'] = $order->getWcOrder()->get_total(); $fields['brand'] = $card['brand']; $fields['installments'] = 1; $fields['card_id'] = $card['cardId']; $fields['pagarmetoken'] = $card['cardId']; $fields['recurrence_cycle'] = "subsequent"; + $fields['payment_origin'] = isset($card['chargeId']) ? ["charge_id" => $card['chargeId']] : null; } + return $fields; } @@ -344,34 +310,38 @@ private function formatPaymentMethod($paymentMethod) return str_replace('-', '_', $paymentMethod); } - private function getCardSubscriptionData($order) + /** + * @param $orderId + * + * @return WC_Subscription|null + */ + protected function getSubscription($orderId) { - $cardData = $order->get_meta("pagarme_payment_subscription"); - if (!$cardData) { - return false; + $subscription = $this->getAllSubscriptionsForOrder($orderId); + if(!$subscription) { + return null; } - return json_decode($cardData, true); + return current($subscription); } - - private function getCardDataByResponse($response) + /** + * @param $order int + * @return array + */ + protected function getAllSubscriptionsForOrder($orderId) { - $charges = $this->getChargesByResponse($response); - $transactions = $this->getTransactionsByCharges($charges); - $cardData = $this->getCardDataByTransaction($transactions); - if (!$cardData) { - return $cardData; + $order = wc_get_order($orderId); + $subscriptions = wcs_get_subscriptions_for_renewal_order($order); + if (!$subscriptions) { + $subscriptions = wcs_get_subscriptions_for_order($order); } - return [ - 'cardId' => $cardData->getPagarmeId(), - 'brand' => $cardData->getBrand()->getName(), - 'holder_name' => $cardData->getOwnerName(), - 'first_six_digits' => $cardData->getFirstSixDigits()->getValue(), - 'last_four_digits' => $cardData->getLastFourDigits()->getValue() - ]; + return $subscriptions; } - private function getChargesByResponse($response) + /** + * @return \Pagarme\Core\Kernel\Aggregates\Charge|boolean; + */ + protected function getChargesByResponse($response) { if (!$response) { return false; @@ -379,46 +349,32 @@ private function getChargesByResponse($response) return current($response->getCharges()); } - private function getTransactionsByCharges($charge) - { - if (!$charge) { - return false; - } - return current($charge->getTransactions()); - } - - private function getCardDataByTransaction($transactions) - { - if (!$transactions) { - return false; - } - return $transactions->getCardData(); - } - /** - * @return boolean + * @param \Pagarme\Core\Kernel\Aggregates\Charge $charge + * @return \Pagarme\Core\Kernel\Aggregates\Transaction|boolean */ - public static function hasSubscriptionProductInCart() + protected function getTransactionsByCharges($charge) { - if (!self::hasSubscriptionPlugin()) { + if (!$charge) { return false; } - return \WC_Subscriptions_Cart::cart_contains_subscription() || wcs_cart_contains_renewal(); + return current($charge->getTransactions()); } /** - * @return boolean + * @param \Pagarme\Core\Kernel\Aggregates\Transaction $transactions + * @return \Pagarme\Core\Payment\Aggregates\SavedCard|boolean */ - public static function hasSubscriptionFreeTrial() + protected function getCardDataByTransaction($transactions) { - if (!self::hasSubscriptionPlugin()) { + if (!$transactions) { return false; } - return self::hasSubscriptionProductInCart() && \WC_Subscriptions_Cart::all_cart_items_have_free_trial(); + return $transactions->getCardData(); } /** - * @return boolean + * @return string|null */ public static function getRecurrenceCycle() { @@ -453,10 +409,7 @@ public static function isChangePaymentSubscription() public static function canUpdatePaymentMethod($update, $new_payment_method, $subscription) { - if ('woo-pagarme-payments-credit_card' === $new_payment_method) { - $update = false; - } - return $update; + return false; } /** @@ -466,25 +419,34 @@ public function allowInstallments(): bool { return wc_string_to_bool($this->config->getData('cc_subscription_installments')); } + /** - * @return boolean + * @param $fields array + * @param $order WC_Order + * @return void */ - public function hasOneInstallmentPeriodInCart(): bool { - if (!$this->hasSubscriptionPlugin()) { - return false; - } - - $cartProducts = WC()->cart->cart_contents; - $productsPeriods = []; - foreach ($cartProducts ?? [] as $product) { - $productsPeriods[] = WC_Subscriptions_Product::get_period($product['product_id']); + public function isSameCardInSubscription(&$fields, $order) + { + $subscription = $this->getSubscription($order->get_id()); + $dataCard = $this->getCardToProcessSubscription($order); + if(empty($dataCard)){ + return; } - - $noInstallmentsPeriods = array_intersect(self::ONE_INSTALLMENT_PERIODS, $productsPeriods); - if (!empty($noInstallmentsPeriods)) { - return true; + if($dataCard['cardId'] == $fields['card_id']){ + $fields['payment_origin'] = ["charge_id" => $dataCard['chargeId']]; + return; } + unset($dataCard['chargeId']); + $this->saveCardInSubscriptionOrder($dataCard, $subscription); + } - return false; + /** + * @param \WC_Order $wcOrder + * @return string|\Exception + */ + private function getPagarmeCustomer($wcOrder) + { + $customer = new Customer($wcOrder->get_customer_id()); + return $customer->getPagarmeCustomerIdByOrder($wcOrder, true); } } diff --git a/src/Model/SubscriptionMeta.php b/src/Model/SubscriptionMeta.php new file mode 100644 index 00000000..042416cb --- /dev/null +++ b/src/Model/SubscriptionMeta.php @@ -0,0 +1,158 @@ +logger = $logger; + } + /** + * @param int $orderId + * @param \Pagarme\Core\Kernel\Aggregates\Order $response + * @return void + */ + public function saveCardInSubscriptionUsingOrderResponse($response) + { + $platformOrder = $response->getPlatformOrder()->getPlatformOrder(); + $subscription = $this->getSubscription($platformOrder->get_id()); + if($subscription == null) { + return; + } + $subscriptionCard = $this->getCardToProcessSubscription($subscription); + $cardData = $this->getCardDataByResponse($response); + if ( + isset($subscriptionCard['chargeId']) && + wcs_order_contains_early_renewal($platformOrder) == true + ) { + return; + } + $this->saveCardDataToOrderAndSubscriptions($platformOrder->get_id(), $cardData); + } + + public function saveCardDataToOrderAndSubscriptions($orderId, $cardData) + { + if (!$cardData) { + return; + } + + $order = wc_get_order($orderId); + $this->saveCardInSubscriptionOrder($cardData, $order); + $subscriptions = $this->getAllSubscriptionsForOrder($orderId); + foreach ($subscriptions as $subscription) { + $this->saveCardInSubscriptionOrder($cardData, $subscription); + } + } + + protected function createCreditCard($pagarmeCustomer) + { + $data = wc_clean($_POST['pagarme']); + $card = new CardService(); + if ($data['credit_card']['cards'][1]['wallet-id']) { + $cardId = $data['credit_card']['cards'][1]['wallet-id']; + return $card->getCard($cardId, $pagarmeCustomer); + } + $cardInfo = $data['credit_card']['cards'][1]; + $response = $card->create($cardInfo['token'], $pagarmeCustomer); + if (array_key_exists('save-card', $cardInfo) && $cardInfo['save-card'] === "1") { + $card->saveOnWalletPlatform($response); + } + return $response; + } + + /** + * Save card information on table post_meta or wc_order_meta + * + * @param array $card + * @param WC_Subscription|WC_Order $order + * + * @return void + */ + protected function saveCardInSubscriptionOrder(array $card, $order) + { + if ( + empty($card) + || (!is_a($order, 'WC_Order') && !is_a($order, 'WC_Subscription')) + ) { + return; + } + $value = json_encode($card); + if (FeatureCompatibilization::isHposActivated()) { + $order->update_meta_data(self::PAYMENT_DATA_KEY, Utils::rm_tags($value)); + $order->save(); + return; + } + update_metadata('post', $order->get_id(), self::PAYMENT_DATA_KEY, $value); + $order->save(); + } + + /** + * @param \WC_Order | \WC_Subscription $order + * @return array + */ + protected function getCardToProcessSubscription($order) + { + $cardData = get_metadata( + 'post', + $order->get_id(), + self::PAYMENT_DATA_KEY, + true + ); + + if (empty($cardData) && FeatureCompatibilization::isHposActivated()) { + $cardData = $order->get_meta(self::PAYMENT_DATA_KEY); + } + + if (empty($cardData)) { + $this->logger->info('Card data not found in the current order.'); + return null; + } + + return json_decode($cardData, true); + } + + /** + * @param mixed $response + * @return mixed + */ + protected function getCardDataByResponse($response) + { + $charges = $this->getChargesByResponse($response); + $transactions = $this->getTransactionsByCharges($charges); + $cardData = $this->getCardDataByTransaction($transactions); + if (!$cardData) { + return $cardData; + } + return [ + 'cardId' => $cardData->getPagarmeId(), + 'brand' => $cardData->getBrand()->getName(), + 'holder_name' => $cardData->getOwnerName(), + 'first_six_digits' => $cardData->getFirstSixDigits()->getValue(), + 'last_four_digits' => $cardData->getLastFourDigits()->getValue(), + 'chargeId' => $charges->getPagarmeId(), + ]; + } + + /** + * @param $order + * @return array|null + */ + protected function getCardData($order) + { + $card = $this->getCardToProcessSubscription($order); + + if (empty($card)) { + $subscription = $this->getSubscription($order->ID); + return $this->getCardToProcessSubscription($subscription); + } + + return $card; + } +} \ No newline at end of file diff --git a/src/Service/CustomerService.php b/src/Service/CustomerService.php index 2b12432f..e04ed5cc 100644 --- a/src/Service/CustomerService.php +++ b/src/Service/CustomerService.php @@ -3,6 +3,7 @@ namespace Woocommerce\Pagarme\Service; use WC_Customer; +use Woocommerce\Pagarme\Helper\Utils; use Woocommerce\Pagarme\Model\CoreAuth; use Pagarme\Core\Middle\Model\Customer; use Pagarme\Core\Middle\Proxy\CustomerProxy; @@ -63,33 +64,47 @@ public function createAddress($addressData) $address->setStreet($addressData['street']); $address->setNumber($addressData['number']); $address->setComplement($addressData['complement']); + return $address; } - + public function extractCustomerDataByWcOrder($wcOrder) { $billingData = $wcOrder->get_data()['billing']; + $document = $wcOrder->get_meta('_billing_cpf'); if (empty($document)) { $document = $wcOrder->get_meta('_billing_cnpj'); } - return [ + if (empty($document)) { + $document = $wcOrder->get_meta('_billing_document'); + } + + $customerData = [ 'code' => $wcOrder->get_customer_id(), 'email' => $billingData['email'], 'name' => $billingData['first_name'] . ' ' . $billingData['last_name'], 'document' => $document, - 'document_type' => empty($wcOrder->get_meta('_billing_cnpj')) ? 'cpf' : 'cnpj', + 'document_type' => Utils::getDocumentTypeByDocumentNumber($document), 'home_phone' => $billingData['phone'], 'mobile_phone' => $wcOrder->get_meta('_billing_cellphone'), 'street' => $billingData['street'], - 'neighborhood' => $billingData['neighborhood'], - 'number' => $billingData['number'], 'country' => $billingData['country'], 'city' => $billingData['city'], 'state' => $billingData['state'], 'complement' => $billingData['complement'], 'zipcode' => $billingData['postcode'] ]; + + if (!empty($billingData['number'])) { + $customerData['number'] = $billingData['number']; + } + + if (!empty($billingData['neighborhood'])) { + $customerData['neighborhood'] = $billingData['neighborhood']; + } + + return $customerData; } public function saveOnPlatform($customer) @@ -116,4 +131,4 @@ public function save($customer) $wcCustomer->add_meta_data('_pagarme_customer_id', $customer->getPagarmeId(), true); $wcCustomer->save(); } -} \ No newline at end of file +} diff --git a/tests/Block/Checkout/GatewayTest.php b/tests/Block/Checkout/GatewayTest.php index 8259af90..51fc3f3e 100644 --- a/tests/Block/Checkout/GatewayTest.php +++ b/tests/Block/Checkout/GatewayTest.php @@ -49,7 +49,7 @@ public function testCartTotalsWithoutOrderPayShouldReturnCartTotal() $orderMock = Mockery::mock(WC_Order::class); $orderMock->shouldReceive('get_total') - ->andReturn(10); + ->andReturn(10); Brain\Monkey\Functions\stubs([ 'wc_get_order' => $orderMock diff --git a/tests/Model/CheckoutTest.php b/tests/Model/CheckoutTest.php index a6410e90..c160efa2 100644 --- a/tests/Model/CheckoutTest.php +++ b/tests/Model/CheckoutTest.php @@ -11,6 +11,7 @@ use Woocommerce\Pagarme\Model\Gateway; use Woocommerce\Pagarme\Model\Checkout; use Woocommerce\Pagarme\Controller\Orders; +use Woocommerce\Pagarme\Model\Subscription; use Woocommerce\Pagarme\Model\WooOrderRepository; use Woocommerce\Pagarme\Model\Payment\Data\PaymentRequestInterface; use Woocommerce\Pagarme\Model\Payment\Data\PaymentRequest; @@ -44,6 +45,7 @@ public function tearDown(): void Brain\Monkey\tearDown(); } + public function testProcessWithTdsAuthenticatedCreditCardPaymentMethodShouldSetAuthenticationNode() { $gatewayMock = Mockery::mock(Gateway::class); @@ -51,6 +53,10 @@ public function testProcessWithTdsAuthenticatedCreditCardPaymentMethodShouldSetA $ordersMock = Mockery::mock(Orders::class); $wooOrderRepositoryMock = Mockery::mock(WooOrderRepository::class); + $subscriptionMock = Mockery::mock('alias:'.Subscription::class); + $subscriptionMock->shouldReceive('hasSubscriptionProductInCart')->andReturn(false); + $subscriptionMock->shouldReceive('getRecurrenceCycle')->andReturn(null); + $_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest'; $_SERVER['REQUEST_METHOD'] = 'POST'; @@ -85,6 +91,9 @@ public function testProcessWithTdsAuthenticatedCreditCardPaymentMethodShouldSetA $subscriptionMock = Mockery::mock('alias:Woocommerce\Pagarme\Model\Subscription'); $subscriptionMock->shouldReceive('getRecurrenceCycle') ->andReturnNull(); + + $subscriptionMock->shouldReceive('getPaymentOrigin') + ->andReturnNull(); $orderIdMock = Mockery::mock(OrderId::class); $orderIdMock->shouldReceive('getValue') @@ -130,6 +139,7 @@ public function testProcessWithTdsAuthenticatedCreditCardPaymentMethodShouldSetA ->andReturn($wcOrderMock); $orderModelMock->shouldReceive('update_meta') ->andReturn([]); + $wcCheckoutMock = Mockery::mock(WC_Cart::class); $wcCheckoutMock->shouldReceive('empty_cart') ->andReturnSelf(); diff --git a/vendor/pagarme/ecommerce-module-core/src/Kernel/Services/APIService.php b/vendor/pagarme/ecommerce-module-core/src/Kernel/Services/APIService.php index 5611cc92..3a9f2cc9 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Kernel/Services/APIService.php +++ b/vendor/pagarme/ecommerce-module-core/src/Kernel/Services/APIService.php @@ -2,6 +2,7 @@ namespace Pagarme\Core\Kernel\Services; +use Automattic\WooCommerce\Blocks\Utils\CartCheckoutUtils; use Exception; use PagarmeCoreApiLib\APIException; use PagarmeCoreApiLib\Configuration; @@ -171,6 +172,7 @@ private function getRequestMetaData($orderRequest) $metadata->moduleVersion = $versionService->getModuleVersion(); $metadata->coreVersion = $versionService->getCoreVersion(); $metadata->platformVersion = $versionService->getPlatformVersion(); + $metadata->checkoutBlocks = CartCheckoutUtils::is_checkout_block_default(); if($this->hasCreditCardInPayments($orderRequest->payments) && !empty(MPSetup::getInstallmentType())){ $metadata->interestType = MPSetup::getInstallmentType(); } diff --git a/vendor/pagarme/ecommerce-module-core/src/Kernel/ValueObjects/CardBrand.php b/vendor/pagarme/ecommerce-module-core/src/Kernel/ValueObjects/CardBrand.php index 165e8850..18fb4dbe 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Kernel/ValueObjects/CardBrand.php +++ b/vendor/pagarme/ecommerce-module-core/src/Kernel/ValueObjects/CardBrand.php @@ -26,6 +26,7 @@ final class CardBrand extends AbstractValueObject CONST SODEXO_PREMIUM = "SodexoPremium"; CONST SODEXO_REFEICAO = "SodexoRefeicao"; CONST SODEXO_COMBUSTIVEL = "SodexoCombustivel"; + CONST TICKET = "Ticket"; CONST VR = "VR"; CONST ALELO = "Alelo"; CONST BANESE = "Banese"; @@ -134,6 +135,11 @@ static public function sodexocombustivel() return new self(self::SODEXO_COMBUSTIVEL); } + static public function ticket() + { + return new self(self::TICKET); + } + static public function vr() { return new self(self::VR); diff --git a/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Account.php b/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Account.php index b4f61292..6bcedd5f 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Account.php +++ b/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Account.php @@ -11,10 +11,6 @@ class Account extends ModelWithErrors { const ACCOUNT_DISABLED = 'accountDisabled'; - const DOMAIN_EMPTY = 'domainEmpty'; - - const DOMAIN_INCORRECT = 'domainIncorrect'; - const WEBHOOK_INCORRECT = 'webhookIncorrect'; const MULTIPAYMENTS_DISABLED = 'multiPaymentsDisabled'; @@ -242,7 +238,6 @@ public function setDebitCardSettings($debitCardSettings) public function validate($storeSettings = null) { $this->validateAccountEnabled(); - $this->validateDomain($storeSettings); $this->validateWebhooks($storeSettings); $this->validateMultiBuyer(); $this->validateMultiPayments(); @@ -265,34 +260,6 @@ private function validateAccountEnabled() } } - /** - * @param StoreSettings|null $storeSettings - * @return void - */ - private function validateDomain($storeSettings = null) - { - $domains = $this->getDomains(); - if (empty($domains) && (empty($storeSettings) || !$storeSettings->isSandbox())) { - $this->addError(self::DOMAIN_EMPTY); - return; - } - - if ($this->canNotValidateUrlSetting($storeSettings)) { - return; - } - - $siteUrls = $storeSettings->getStoreUrls(); - foreach ($domains as $domain) { - foreach ($siteUrls as $siteUrl) { - if (strpos($siteUrl, $domain) !== false) { - return; - } - } - } - - $this->addError(self::DOMAIN_INCORRECT); - } - /** * @param StoreSettings|null $storeSettings * @return void diff --git a/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Customer/Address.php b/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Customer/Address.php index 10c777a7..e0609ca9 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Customer/Address.php +++ b/vendor/pagarme/ecommerce-module-core/src/Middle/Model/Customer/Address.php @@ -93,15 +93,24 @@ public function getNumber() { return $this->number ?? ""; } - + public function getComplement() { return $this->complement ?? ""; } - + public function getLine1() { - $address = [$this->getNumber(), $this->getStreet(), $this->getNeighborhood()]; + if (!empty($this->getNumber())) { + $address[] = $this->getNumber(); + } + + $address[] = $this->getStreet(); + + if (!empty($this->getNeighborhood())) { + $address[] = $this->getNeighborhood(); + } + return implode(self::ADDRESS_SEPARATOR, $address); } diff --git a/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Address.php b/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Address.php index a692f65a..b1ac1372 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Address.php +++ b/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Address.php @@ -78,8 +78,7 @@ public function setNumber($number) $this->number = substr($numberWithoutLineBreaks, 0, 15); - if (empty($this->number) && ($this->number === null || !is_numeric(trim($this->number)))) { - + if (!empty($this->number) && !is_numeric(trim($this->number))) { $inputName = $this->i18n->getDashboard('number'); $message = $this->i18n->getDashboard( "The %s should not be empty!", @@ -107,14 +106,8 @@ public function getStreet() */ public function setStreet($street) { - $streetWithoutComma = str_replace( - self::ADDRESS_LINE_SEPARATOR, - '', - $street ?? '' - ); - $streetWithoutLineBreaks = StringFunctionsHelper::removeLineBreaks( - $streetWithoutComma + $street ); $this->street = substr($streetWithoutLineBreaks, 0, 64); @@ -137,7 +130,7 @@ public function setStreet($street) */ public function getNeighborhood() { - return $this->neighborhood; + return $this->neighborhood ?? ''; } /** @@ -159,17 +152,6 @@ public function setNeighborhood($neighborhood) $this->neighborhood = substr($neighborhoodWithoutLineBreaks, 0, 64); - if (empty($this->neighborhood)) { - - $inputName = $this->i18n->getDashboard('neighborhood'); - $message = $this->i18n->getDashboard( - "The %s should not be empty!", - $inputName - ); - - throw new \Exception($message, 400); - } - return $this; } @@ -289,12 +271,17 @@ public function setCountry($country) public function getLine1() { - $line = []; - $line[] = $this->getNumber(); + if ($this->getNumber()) { + $line[] = $this->getNumber(); + } + $line[] = $this->getStreet(); - $line[] = $this->getNeighborhood(); - return implode (self::ADDRESS_LINE_SEPARATOR, $line); + if ($this->getNeighborhood()) { + $line[] = $this->getNeighborhood(); + } + + return implode(self::ADDRESS_LINE_SEPARATOR, $line); } public function getLine2() @@ -336,7 +323,7 @@ public function setState($state) /** * Specify data which should be serialized to JSON * @link https://php.net/manual/en/jsonserializable.jsonserialize.php - * @return string data which can be serialized by json_encode, + * @return \stdClass data which can be serialized by json_encode, * which is a value of any type other than a resource. * @since 5.4.0 */ @@ -345,10 +332,10 @@ public function jsonSerialize() { $obj = new \stdClass(); - $obj->number = $this->number; $obj->street = $this->street; - $obj->neighborhood = $this->neighborhood; + $obj->number = $this->number; $obj->complement = $this->complement; + $obj->neighborhood = $this->neighborhood; $obj->zipCode = $this->zipCode; $obj->city = $this->city; $obj->state = $this->state; @@ -366,16 +353,16 @@ public function convertToSDKRequest() { $addressRequest = new CreateAddressRequest(); - $addressRequest->city = $this->getCity(); + $addressRequest->street = $this->getStreet(); + $addressRequest->number = $this->getNumber(); $addressRequest->complement = $this->getComplement(); - $addressRequest->country = $this->getCountry(); - $addressRequest->line1 = $this->getLine1(); - $addressRequest->line2 = $this->getLine2(); $addressRequest->neighborhood = $this->getNeighborhood(); - $addressRequest->number = $this->getNumber(); + $addressRequest->city = $this->getCity(); $addressRequest->state = $this->getState(); - $addressRequest->street = $this->getStreet(); + $addressRequest->country = $this->getCountry(); $addressRequest->zipCode = $this->getZipCode(); + $addressRequest->line1 = $this->getLine1(); + $addressRequest->line2 = $this->getLine2(); return $addressRequest; } diff --git a/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Payments/AbstractCreditCardPayment.php b/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Payments/AbstractCreditCardPayment.php index c2fcf176..a3d5dbf2 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Payments/AbstractCreditCardPayment.php +++ b/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Payments/AbstractCreditCardPayment.php @@ -24,6 +24,8 @@ abstract class AbstractCreditCardPayment extends AbstractPayment /** @var string */ protected $recurrenceCycle; /** @var string */ + protected $paymentOrigin; + /** @var string */ protected $statementDescriptor; /** @var boolean */ protected $capture; @@ -140,6 +142,16 @@ public function setRecurrenceCycle($recurrenceCycle) $this->recurrenceCycle = $recurrenceCycle; } + public function getPaymentOrigin() + { + return $this->paymentOrigin; + } + + public function setPaymentOrigin($paymentOrigin) + { + $this->paymentOrigin = $paymentOrigin; + } + /** * @return string */ @@ -262,6 +274,7 @@ protected function convertToPrimitivePaymentRequest() $cardRequest->capture = $this->isCapture(); $cardRequest->installments = $this->getInstallments(); $cardRequest->recurrenceCycle = $this->getRecurrenceCycle(); + $cardRequest->paymentOrigin = $this->getPaymentOrigin(); $cardRequest->statementDescriptor = $this->getStatementDescriptor(); if (!empty($this->getAuthentication())) { $cardRequest->authentication = $this->getAuthenticationSDK(); diff --git a/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/AddressFactory.php b/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/AddressFactory.php index 7e8b4403..7ada97b5 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/AddressFactory.php +++ b/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/AddressFactory.php @@ -14,8 +14,8 @@ public function createFromJson($json) $address->setStreet($data->street); $address->setNumber($data->number); - $address->setNeighborhood($data->neighborhood); $address->setComplement($data->complement); + $address->setNeighborhood($data->neighborhood); $address->setCity($data->city); $address->setState($data->state); $address->setZipCode($data->zipCode); @@ -23,4 +23,4 @@ public function createFromJson($json) return $address; } -} \ No newline at end of file +} diff --git a/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/PaymentFactory.php b/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/PaymentFactory.php index 62e419e0..74f86d7f 100644 --- a/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/PaymentFactory.php +++ b/vendor/pagarme/ecommerce-module-core/src/Payment/Factories/PaymentFactory.php @@ -128,6 +128,7 @@ private function createBasePayments( $payment->setAmount($cardData->amount); $payment->setInstallments($cardData->installments); $payment->setRecurrenceCycle($cardData->recurrenceCycle ?? null); + $payment->setPaymentOrigin($cardData->paymentOrigin ?? null); if (!empty($cardData->authentication)) { $payment->setAuthentication(Authentication::createFromStdClass($cardData->authentication)); } diff --git a/vendor/pagarme/pagarmecoreapi/src/Models/CreateCreditCardPaymentRequest.php b/vendor/pagarme/pagarmecoreapi/src/Models/CreateCreditCardPaymentRequest.php index 3852ade3..7c665ca4 100644 --- a/vendor/pagarme/pagarmecoreapi/src/Models/CreateCreditCardPaymentRequest.php +++ b/vendor/pagarme/pagarmecoreapi/src/Models/CreateCreditCardPaymentRequest.php @@ -120,6 +120,13 @@ class CreateCreditCardPaymentRequest implements JsonSerializable */ public $recurrenceCycle; + /** + * Defines whether the card has been used one or more times. + * @maps payment_origin + * @var string|null $paymentOrigin public property + */ + public $paymentOrigin; + /** * Constructor to set initial or default values of member properties * @param integer $installments Initialization value for $this->installments @@ -145,11 +152,13 @@ class CreateCreditCardPaymentRequest implements JsonSerializable * >recurrencyCycle * @param string $recurrenceCycle Initialization value for $this- * >recurrenceCycle + * @param string $paymentOrigin Initialization value for $this- + * >paymentOrigin */ public function __construct() { switch (func_num_args()) { - case 16: + case 17: $this->installments = func_get_arg(0); $this->statementDescriptor = func_get_arg(1); $this->card = func_get_arg(2); @@ -166,6 +175,7 @@ public function __construct() $this->operationType = func_get_arg(13); $this->recurrencyCycle = func_get_arg(14); $this->recurrenceCycle = func_get_arg(15); + $this->paymentOrigin = func_get_arg(16); break; default: @@ -198,6 +208,7 @@ public function jsonSerialize() $json['operation_type'] = $this->operationType; $json['recurrency_cycle'] = $this->recurrencyCycle; $json['recurrence_cycle'] = $this->recurrenceCycle; + $json['payment_origin'] = $this->paymentOrigin; return $json; } diff --git a/webpack.config.js b/webpack.config.js index 658602b4..3ccbb043 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,7 +11,6 @@ module.exports = { new DependencyExtractionWebpackPlugin(), ], entry: { - // googlepay: './assets/javascripts/front/reactCheckout/payments/GooglePay/index.js', pix: './assets/javascripts/front/reactCheckout/payments/Pix/index.js', billet: './assets/javascripts/front/reactCheckout/payments/Billet/index.js', credit_card: './assets/javascripts/front/reactCheckout/payments/CreditCard/index.js', diff --git a/woo-pagarme-payments.php b/woo-pagarme-payments.php index 51b2d877..04ad4b0b 100644 --- a/woo-pagarme-payments.php +++ b/woo-pagarme-payments.php @@ -1,7 +1,7 @@ + ?>'; - $message .= __('Please, make sure to include them for Pagar.me module to work.', 'woo-pagarme-payments'); - $message .= '
'; $message .= sprintf( - __('You can install %s or any other plugin of your choice to add the missing fields. %sRead ' - . 'documentation »%s', 'woo-pagarme-payments'), - sprintf( - 'Brazilian Market on WooCommerce', - BRAZILIAN_MARKET_URL - ), + __("Please, make sure to include them for Pagar.me plugin to work. If you are customizing the " + . "checkout, the address fields must have the 'name' attribute exactly as listed above. %sRead " + . "documentation »%s", "woo-pagarme-payments"), sprintf( '', PAGARME_REQUIREMENTS_URL ), '' ); + $message .= '
'; wcmpRenderAdminNoticeHtml($message); } @@ -289,6 +291,12 @@ function wcmpLoadInstances() do_action('wcmp_init'); } +/** + * @return void + * @uses wcmpAdminNoticeWoocommerce() + * @uses wcmpAdminNoticePermalink() + * @uses wcmpAdminNoticeCheckoutFields() + */ function wcmpPluginsLoadedCheck() { $woocommerce = class_exists('WooCommerce'); @@ -311,9 +319,20 @@ function wcmpPluginsLoadedCheck() } add_action('plugins_loaded', 'wcmpPluginsLoadedCheck', 0); -add_action( 'before_woocommerce_init', 'checkCompatibilityWithFeatures', 0); +add_action('before_woocommerce_init', 'checkCompatibilityWithFeatures', 0); add_action('woocommerce_blocks_loaded', 'addWoocommerceSupportedBlocks'); +function hasAnyBillingDocument($missingFields) +{ + $hasCpf = in_array('billing_cpf', $missingFields); + $hasCnpj = in_array('billing_cnpj', $missingFields); + $hasDocument = in_array('billing_document', $missingFields); + + return ($hasCpf && (!$hasCnpj || !$hasDocument)) + || ($hasCnpj && (!$hasCpf || !$hasDocument)) + || ($hasDocument && (!$hasCpf || !$hasCnpj)); +} + function checkCompatibilityWithFeatures() { $compatibilization = new FeatureCompatibilization(); @@ -334,8 +353,8 @@ function versionUpdateWarning($currentVersion, $newVersion) if ($currentVersionMajorPart >= $newVersionMajorPart) { return; } -?> -