Skip to content
Snippets Groups Projects
Commit 0280dfc1 authored by okarpenko's avatar okarpenko
Browse files

Merge branch 'MAGETWO-35583' into BUGS

Conflicts:
	app/code/Magento/Payment/Block/Info/Cc.php
parents 0535b74f 3b710bd2
No related merge requests found
...@@ -78,7 +78,7 @@ class Cc extends \Magento\Payment\Block\Info ...@@ -78,7 +78,7 @@ class Cc extends \Magento\Payment\Block\Info
public function getCcExpDate() public function getCcExpDate()
{ {
$date = new \DateTime('now', new \DateTimeZone($this->_localeDate->getConfigTimezone())); $date = new \DateTime('now', new \DateTimeZone($this->_localeDate->getConfigTimezone()));
$date->setDate($this->getInfo()->getCcExpYear(),$this->getInfo()->getCcExpMonth(), 1); $date->setDate($this->getInfo()->getCcExpYear(), $this->getInfo()->getCcExpMonth() + 1, 0);
return $date; return $date;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment