diff --git a/src/main/java/com/unicenta/pos/payment/PaymentGatewayTeya.java b/src/main/java/com/unicenta/pos/payment/PaymentGatewayTeya.java
index 4d51f8c..bfb75c1 100644
--- a/src/main/java/com/unicenta/pos/payment/PaymentGatewayTeya.java
+++ b/src/main/java/com/unicenta/pos/payment/PaymentGatewayTeya.java
@@ -54,9 +54,9 @@ public class PaymentGatewayTeya implements PaymentGateway {
 
         double roundedValue = RoundUtils.round(payinfo.getTotal());
 
-        new Application().teyaTransaction(roundedValue, getPaymentWindow());
+        new Application().teyaTransaction(roundedValue, getPaymentWindow(), payinfo.m_sTransactionID);
 
-        while (!AppContext.getTeyaSuccessfulPayment()) {
+        while (AppContext.getTeyaPaymentResult() == null) {
             try {
                 log.info("uniCenta-oPos: waiting for payment to complete ....");
                 Thread.sleep(1000);
@@ -71,9 +71,9 @@ public class PaymentGatewayTeya implements PaymentGateway {
         payinfo.setVerification("Chip and Pin");
         payinfo.setChipAndPin(true);
         payinfo.paymentOK(
-                "Teya",
-                "Teya",
-                "Teya"
+                AppContext.getTeyaPaymentResult().getReferenceId(),
+                AppContext.getTeyaPaymentResult().getGatewayPaymentId(),
+                AppContext.getTeyaPaymentResult().getStatus()
         );
 
     }