Skip to content

Commit 4dd3c6e

Browse files
ThiagoBarradasThiagoBarradas
committed
🐛 fixes saved cards, clear installments and 'authorize and capture'
1 parent 87a42b7 commit 4dd3c6e

File tree

15 files changed

+102
-43
lines changed

15 files changed

+102
-43
lines changed

‎Gateway/Transaction/Billet/ResourceGateway/Create/RequestBuilder.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class RequestBuilder implements BuilderInterface
3030
{
3131

3232
const MODULE_NAME = 'MundiPagg_MundiPagg';
33+
const NAME_METADATA = 'Magento 2';
3334

3435
protected $request;
3536
/** @var BoletoTransaction */
@@ -141,7 +142,8 @@ protected function createNewRequest($requestDataProvider)
141142

142143
$quote = $this->getCart()->getQuote();
143144
$order = $this->getOrderRequest();
144-
145+
$quote->reserveOrderId()->save();
146+
$order->code = $quote->getReservedOrderId();
145147
$order->payments = [
146148
[
147149
'amount' => $quote->getGrandTotal() * 100,
@@ -180,6 +182,7 @@ protected function createNewRequest($requestDataProvider)
180182
'address' => [
181183
'street' => $quote->getShippingAddress()->getStreetLine(1),
182184
'number' => $quote->getShippingAddress()->getStreetLine(2),
185+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
183186
'zip_code' => trim(str_replace('-','',$quote->getShippingAddress()->getPostCode())),
184187
'neighborhood' => $quote->getShippingAddress()->getStreetLine(4),
185188
'city' => $quote->getShippingAddress()->getCity(),
@@ -195,7 +198,8 @@ protected function createNewRequest($requestDataProvider)
195198
'description' => '.',
196199
'address' => [
197200
'street' => $quote->getShippingAddress()->getStreetLine(1),
198-
'number' => $quote->getShippingAddress()->getStreetLine(2) . ' ' . $quote->getShippingAddress()->getStreetLine(3),
201+
'number' => $quote->getShippingAddress()->getStreetLine(2),
202+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
199203
'zip_code' => trim(str_replace('-','',$quote->getShippingAddress()->getPostCode())),
200204
'neighborhood' => $quote->getShippingAddress()->getStreetLine(4),
201205
'city' => $quote->getShippingAddress()->getCity(),
@@ -207,7 +211,7 @@ protected function createNewRequest($requestDataProvider)
207211
$order->session_id = $requestDataProvider->getSessionId();
208212

209213
$order->metadata = [
210-
'module_name' => self::MODULE_NAME,
214+
'module_name' => self::NAME_METADATA,
211215
'module_version' => $this->getModuleHelper()->getVersion(self::MODULE_NAME),
212216
];
213217

‎Gateway/Transaction/BilletCreditCard/ResourceGateway/Create/RequestBuilder.php

+21-9
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class RequestBuilder implements BuilderInterface
3535
{
3636

3737
const MODULE_NAME = 'MundiPagg_MundiPagg';
38+
const NAME_METADATA = 'Magento 2';
3839

3940
protected $request;
4041
protected $requestDataProviderFactory;
@@ -351,7 +352,7 @@ protected function createTokenCard($requestDataProvider)
351352
];
352353

353354
$request->metadata = [
354-
'module_name' => self::MODULE_NAME,
355+
'module_name' => self::NAME_METADATA,
355356
'module_version' => $this->getModuleHelper()->getVersion(self::MODULE_NAME),
356357
];
357358

@@ -387,8 +388,12 @@ protected function createNewRequest($requestDataProvider)
387388

388389
$statement = $this->getConfigCreditCard()->getSoftDescription();
389390

390-
$capture = $this->getConfigBilletCreditCard()->getPaymentAction() == '‌authorize_capture' ? true : false;
391-
391+
if($this->getConfigBilletCreditCard()->getPaymentAction() == 'authorize_capture'){
392+
$capture = true;
393+
}else{
394+
$capture = false;
395+
}
396+
392397
$billetAmount = $quote->getPayment()->getCcBilletAmount() * 100;
393398

394399
if ($payment->getAdditionalInformation('cc_saved_card')) {
@@ -410,7 +415,8 @@ protected function createNewRequest($requestDataProvider)
410415
'card' => [
411416
'billing_address' => [
412417
'street' => $quote->getBillingAddress()->getStreetLine(1),
413-
'number' => $quote->getBillingAddress()->getStreetLine(2) . ' ' . $quote->getBillingAddress()->getStreetLine(3),
418+
'number' => $quote->getBillingAddress()->getStreetLine(2),
419+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
414420
'zip_code' => trim(str_replace('-','',$quote->getBillingAddress()->getPostCode())),
415421
'neighborhood' => $quote->getBillingAddress()->getStreetLine(4),
416422
'city' => $quote->getBillingAddress()->getCity(),
@@ -447,7 +453,8 @@ protected function createNewRequest($requestDataProvider)
447453
'card' => [
448454
'billing_address' => [
449455
'street' => $quote->getBillingAddress()->getStreetLine(1),
450-
'number' => $quote->getBillingAddress()->getStreetLine(2) . ' ' . $quote->getBillingAddress()->getStreetLine(3),
456+
'number' => $quote->getBillingAddress()->getStreetLine(2),
457+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
451458
'zip_code' => trim(str_replace('-','',$quote->getBillingAddress()->getPostCode())),
452459
'neighborhood' => $quote->getBillingAddress()->getStreetLine(4),
453460
'city' => $quote->getBillingAddress()->getCity(),
@@ -469,6 +476,8 @@ protected function createNewRequest($requestDataProvider)
469476
]
470477
];
471478
}
479+
$quote->reserveOrderId()->save();
480+
$order->code = $quote->getReservedOrderId();
472481

473482
$order->items = [];
474483

@@ -495,6 +504,7 @@ protected function createNewRequest($requestDataProvider)
495504
'address' => [
496505
'street' => $quote->getShippingAddress()->getStreetLine(1),
497506
'number' => $quote->getShippingAddress()->getStreetLine(2),
507+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
498508
'zip_code' => trim(str_replace('-','',$quote->getShippingAddress()->getPostCode())),
499509
'neighborhood' => $quote->getShippingAddress()->getStreetLine(4),
500510
'city' => $quote->getShippingAddress()->getCity(),
@@ -511,6 +521,7 @@ protected function createNewRequest($requestDataProvider)
511521
'address' => [
512522
'street' => $quote->getShippingAddress()->getStreetLine(1),
513523
'number' => $quote->getShippingAddress()->getStreetLine(2),
524+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
514525
'zip_code' => trim(str_replace('-','',$quote->getShippingAddress()->getPostCode())),
515526
'neighborhood' => $quote->getShippingAddress()->getStreetLine(4),
516527
'city' => $quote->getShippingAddress()->getCity(),
@@ -522,12 +533,12 @@ protected function createNewRequest($requestDataProvider)
522533
$order->session_id = $requestDataProvider->getSessionId();
523534

524535
$order->metadata = [
525-
'module_name' => self::MODULE_NAME,
536+
'module_name' => self::NAME_METADATA,
526537
'module_version' => $this->getModuleHelper()->getVersion(self::MODULE_NAME),
527538
];
528539

529540
if ($this->getConfigBilletCreditCard()->getAntifraudActive() && $quote->getGrandTotal() > $this->getConfigBilletCreditCard()->getAntifraudMinAmount()) {
530-
$order->antifraud_enabled = true;
541+
$order->antifraudEnabled = true;
531542
}
532543

533544
try {
@@ -571,7 +582,8 @@ protected function setCardToken($requestDataProvider, $customer, $quote)
571582
$request->cvv = $requestDataProvider->getSecurityCode();
572583
$request->billingAddress = [
573584
'street' => $quote->getBillingAddress()->getStreetLine(1),
574-
'number' => $quote->getBillingAddress()->getStreetLine(2) . ' ' . $quote->getBillingAddress()->getStreetLine(3),
585+
'number' => $quote->getBillingAddress()->getStreetLine(2),
586+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
575587
'zip_code' => trim(str_replace('-','',$quote->getBillingAddress()->getPostCode())),
576588
'neighborhood' => $quote->getBillingAddress()->getStreetLine(4),
577589
'city' => $quote->getBillingAddress()->getCity(),
@@ -583,7 +595,7 @@ protected function setCardToken($requestDataProvider, $customer, $quote)
583595
];
584596

585597
$request->metadata = [
586-
'module_name' => self::MODULE_NAME,
598+
'module_name' => self::NAME_METADATA,
587599
'module_version' => $this->getModuleHelper()->getVersion(self::MODULE_NAME),
588600
];
589601

‎Gateway/Transaction/CreditCard/ResourceGateway/Create/RequestBuilder.php

+23-10
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class RequestBuilder implements BuilderInterface
3131
{
3232

3333
const MODULE_NAME = 'MundiPagg_MundiPagg';
34+
const NAME_METADATA = 'Magento 2';
3435

3536
protected $request;
3637
protected $requestDataProviderFactory;
@@ -316,7 +317,7 @@ protected function createTokenCard($requestDataProvider)
316317
];
317318

318319
$request->metadata = [
319-
'module_name' => self::MODULE_NAME,
320+
'module_name' => self::NAME_METADATA,
320321
'module_version' => $this->getModuleHelper()->getVersion(self::MODULE_NAME),
321322
];
322323

@@ -348,9 +349,13 @@ protected function createNewRequest($requestDataProvider)
348349
$statement = $this->getConfigCreditCard()->getSoftDescription();
349350

350351
$order = $this->getOrderRequest();
351-
352-
$capture = $this->getConfigCreditCard()->getPaymentAction() == '‌authorize_capture' ? true : false;
353-
352+
if($this->getConfigCreditCard()->getPaymentAction() == 'authorize_capture')
353+
{
354+
$capture = true;
355+
}else{
356+
$capture = false;
357+
}
358+
354359
if ($payment->getAdditionalInformation('cc_saved_card')) {
355360

356361
$model = $this->getCardsFactory();
@@ -369,7 +374,8 @@ protected function createNewRequest($requestDataProvider)
369374
'card' => [
370375
'billing_address' => [
371376
'street' => $quote->getBillingAddress()->getStreetLine(1),
372-
'number' => $quote->getBillingAddress()->getStreetLine(2) . ' ' . $quote->getBillingAddress()->getStreetLine(3),
377+
'number' => $quote->getBillingAddress()->getStreetLine(2),
378+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
373379
'zip_code' => trim(str_replace('-','',$quote->getBillingAddress()->getPostCode())),
374380
'neighborhood' => $quote->getBillingAddress()->getStreetLine(4),
375381
'city' => $quote->getBillingAddress()->getCity(),
@@ -396,7 +402,8 @@ protected function createNewRequest($requestDataProvider)
396402
'card' => [
397403
'billing_address' => [
398404
'street' => $quote->getBillingAddress()->getStreetLine(1),
399-
'number' => $quote->getBillingAddress()->getStreetLine(2) . ' ' . $quote->getBillingAddress()->getStreetLine(3),
405+
'number' => $quote->getBillingAddress()->getStreetLine(2),
406+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
400407
'zip_code' => trim(str_replace('-','',$quote->getBillingAddress()->getPostCode())),
401408
'neighborhood' => $quote->getBillingAddress()->getStreetLine(4),
402409
'city' => $quote->getBillingAddress()->getCity(),
@@ -408,6 +415,9 @@ protected function createNewRequest($requestDataProvider)
408415
]
409416
];
410417
}
418+
419+
$quote->reserveOrderId()->save();
420+
$order->code = $quote->getReservedOrderId();
411421

412422
$order->items = [];
413423

@@ -435,6 +445,7 @@ protected function createNewRequest($requestDataProvider)
435445
'address' => [
436446
'street' => $quote->getShippingAddress()->getStreetLine(1),
437447
'number' => $quote->getShippingAddress()->getStreetLine(2),
448+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
438449
'zip_code' => trim(str_replace('-','',$quote->getShippingAddress()->getPostCode())),
439450
'neighborhood' => $quote->getShippingAddress()->getStreetLine(4),
440451
'city' => $quote->getShippingAddress()->getCity(),
@@ -451,6 +462,7 @@ protected function createNewRequest($requestDataProvider)
451462
'address' => [
452463
'street' => $quote->getShippingAddress()->getStreetLine(1),
453464
'number' => $quote->getShippingAddress()->getStreetLine(2),
465+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
454466
'zip_code' => trim(str_replace('-','',$quote->getShippingAddress()->getPostCode())),
455467
'neighborhood' => $quote->getShippingAddress()->getStreetLine(4),
456468
'city' => $quote->getShippingAddress()->getCity(),
@@ -462,12 +474,12 @@ protected function createNewRequest($requestDataProvider)
462474
$order->session_id = $requestDataProvider->getSessionId();
463475

464476
$order->metadata = [
465-
'module_name' => self::MODULE_NAME,
477+
'module_name' => self::NAME_METADATA,
466478
'module_version' => $this->getModuleHelper()->getVersion(self::MODULE_NAME),
467479
];
468480

469481
if ($this->getConfigCreditCard()->getAntifraudActive() && $quote->getGrandTotal() > $this->getConfigCreditCard()->getAntifraudMinAmount()) {
470-
$order->antifraud_enabled = true;
482+
$order->antifraudEnabled = true;
471483
}
472484

473485
try {
@@ -511,7 +523,8 @@ protected function setCardToken($payment, $customer, $quote)
511523
$request->cvv = $payment->getSecurityCode();
512524
$request->billingAddress = [
513525
'street' => $quote->getBillingAddress()->getStreetLine(1),
514-
'number' => $quote->getBillingAddress()->getStreetLine(2) . ' ' . $quote->getBillingAddress()->getStreetLine(3),
526+
'number' => $quote->getBillingAddress()->getStreetLine(2),
527+
'complement' => $quote->getShippingAddress()->getStreetLine(3),
515528
'zip_code' => trim(str_replace('-','',$quote->getBillingAddress()->getPostCode())),
516529
'neighborhood' => $quote->getBillingAddress()->getStreetLine(4),
517530
'city' => $quote->getBillingAddress()->getCity(),
@@ -523,7 +536,7 @@ protected function setCardToken($payment, $customer, $quote)
523536
];
524537

525538
$request->metadata = [
526-
'module_name' => self::MODULE_NAME,
539+
'module_name' => self::NAME_METADATA,
527540
'module_version' => $this->getModuleHelper()->getVersion(self::MODULE_NAME),
528541
];
529542

‎Gateway/Transaction/TwoCreditCard/Config/Config.php

+8
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,12 @@ public function getAntifraudMinAmount()
4747
{
4848
return $this->getConfig(static::PATH_ANTIFRAUD_MIN_AMOUNT);
4949
}
50+
51+
/**
52+
* @return string
53+
*/
54+
public function getSoftDescription()
55+
{
56+
return $this->getConfig(static::PATH_SOFT_DESCRIPTION);
57+
}
5058
}

‎Gateway/Transaction/TwoCreditCard/Config/ConfigInterface.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ interface ConfigInterface
1818
const PATH_PAYMENT_ACTION = 'payment/mundipagg_two_creditcard/payment_action';
1919
const PATH_ANTIFRAUD_ACTIVE = 'payment/mundipagg_two_creditcard/antifraud_active';
2020
const PATH_ANTIFRAUD_MIN_AMOUNT = 'payment/mundipagg_two_creditcard/antifraud_min_amount';
21-
21+
const PATH_SOFT_DESCRIPTION = 'payment/mundipagg_creditcard/soft_description';
22+
2223
/**
2324
* @return bool
2425
*/
@@ -38,4 +39,9 @@ public function getAntifraudActive();
3839
* @return string
3940
*/
4041
public function getAntifraudMinAmount();
42+
43+
/**
44+
* @return string
45+
*/
46+
public function getSoftDescription();
4147
}

‎Gateway/Transaction/TwoCreditCard/ResourceGateway/Capture/RequestBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ protected function createCaptureChargeRequest($requestDataProvider)
335335
/**
336336
* @return int
337337
*/
338-
protected function getInvoiceTotalInCents(): int
338+
protected function getInvoiceTotalInCents()
339339
{
340340
$invoiceDetails = $this->getPaymentData()->getOrder()->getInvoiceCollection();
341341

0 commit comments

Comments
 (0)