2.5/cart-expirydate-issue

optimisthub · Dec 23, 2021 · 557a6f4 · 557a6f4
1 parent 8372dde
commit 557a6f4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/core/library/Moka_Gateway.php b/core/library/Moka_Gateway.php
@@ -371,8 +371,7 @@ public function process_payment( $orderId )
                     )
                 );  
             } 
-
-
+
             $payOrder           = $this->optimisthubMoka->initializePayment($orderDetails);
             $callbackUrl        = data_get($payOrder, 'Data.Url');
             $callbackHash       = data_get($payOrder, 'Data.CodeForHash');
@@ -557,7 +556,7 @@ private function formatOrder( $orderId )
                 'CardHolderFullName'    => (string) data_get($postData, $this->id.'-name-oncard'),
                 'CardNumber'            => (string) self::formatCartNumber(data_get($postData, $this->id.'-card-number')),
                 'ExpMonth'              => (string) data_get($expriyDate,'month' ),
-                'ExpYear'               => (string) '20'.data_get($expriyDate,'year' ),
+                'ExpYear'               => (string) self::formatExpiryDate(data_get($expriyDate,'year' )),
                 'CvcNumber'             => (string) data_get($postData, $this->id.'-card-cvc'),
                 'Amount'                => (string) self::calculateComissionRate(data_get($postData, $this->id.'-order-total'),$currentComission),
                 'Currency'              => (string) $order->get_currency() == 'TRY' ? 'TL' : $order->get_currency() ,
@@ -888,6 +887,24 @@ private function formatBaksetProducts( $order )
 
             return $output;
         }
+
+        /**
+         * Format Card expriyDate
+         *
+         * @param [type] $str
+         * @return void
+         */
+        private function formatExpiryDate($str)
+        {
+            $output = $str;
+            $lenght = strlen($str);
+            if($lenght>=3)
+            {
+                $output = substr($str,-2);
+            }
+
+            return '20'.$output;
+        }
 
     }
 }
diff --git a/readme.md b/readme.md
@@ -33,6 +33,9 @@ Moka Pos, Moka Pay plugin;
 
 ### Changelog 
 
+#### Version 2.5
+- Issue : Card Expiry Date validation issue fixed. 
+
 #### Version 2.4
 - Feature : Added Order Prefix for multiple domain usage.