Merge master into turkonay-integration

Author: semihshn

src/main/java/io/craftgate/model/ApmAdditionalAction.java

@@ -7,6 +7,7 @@ public enum ApmAdditionalAction {
     SHOW_HTML_CONTENT,
     WAIT_FOR_WEBHOOK,
     APPROVAL_REQUIRED,
+    VERIFY_REQUIRED,
     SHOW_QR_CODE,
     NONE
 }

src/main/java/io/craftgate/model/ApmType.java

@@ -1,39 +1,51 @@
 package io.craftgate.model;
 
 public enum ApmType {
+    // APM
+    ALIPAY,
+    AFTERPAY,
+    CHIPPIN,
+    KASPI,
+    KLARNA,
+    ISPAY,
+    IWALLET,
     PAPARA,
+    PAPEL,
+    PAYCELL,
+    PAYMOB,
     PAYONEER,
-    SODEXO,
-    SODEXO_GIFT,
-    EDENRED,
-    EDENRED_GIFT,
     PAYPAL,
-    KLARNA,
-    AFTERPAY,
-    KASPI,
-    INSTANT_TRANSFER,
     STRIPE,
     TOMPAY,
-    TOM_FINANCE,
-    MASLAK,
-    ALFABANK,
-    PAYCELL,
-    HASO,
+    APPLEPAY,
+    GOOGLEPAY,
+    CASH_ON_DELIVERY,
+    FUND_TRANSFER,
+    INSTANT_TRANSFER,
+    BIZUM,
+    PAYLANDS_MB_WAY,
+
+    // FOOD & GIFT CARDS
+    EDENRED,
+    EDENRED_GIFT,
     METROPOL,
     MULTINET,
     MULTINET_GIFT,
     MULTINET_NEO_GIFT,
-    ISPAY,
-    ZIP,
-    VODAFONE_DCB,
-    CHIPPIN,
-    PAYMOB,
-    BIZUM,
-    PAYLANDS_MB_WAY,
-    PAYCELL_DCB,
-    IWALLET,
-    FUND_TRANSFER,
+    SODEXO,
+    SODEXO_GIFT,
     SETCARD,
-    PAPEL,
-    CASH_ON_DELIVERY
+    TOKENFLEX,
+    TOKENFLEX_GIFT,
+
+    // BNPL
+    ALFABANK,
+    DKB,
+    MASLAK,
+    HASO,
+    PAYCELL_DCB,
+    TOM_FINANCE,
+    VODAFONE_DCB,
+    ALBARAKA,
+    ZIP
 }

src/main/java/io/craftgate/model/BnplCartItemType.java

@@ -6,6 +6,7 @@ public enum BnplCartItemType {
     MOBILE_PHONE_PRICE_BELOW_REGULATION_LIMIT,
     TABLET,
     COMPUTER,
+    TABLET_WITH_CAMPAIGN,
     CONSTRUCTION_MARKET,
     GOLD,
     DIGITAL_PRODUCTS,

src/main/java/io/craftgate/model/PaymentAuthenticationType.java

@@ -4,5 +4,12 @@ public enum PaymentAuthenticationType {
 
     THREE_DS,
     NON_THREE_DS,
-    BKM_EXPRESS
+    BKM_EXPRESS,
+    THREE_DS_FALLBACK_TO_NON_THREE_DS,
+    GOOGLEPAY,
+    APPLEPAY,
+    YKB_WORLD_PAY,
+    YKB_WORLD_PAY_SHOPPING_LOAN,
+    GARANTI_PAY,
+    JUZDAN
 }

src/main/java/io/craftgate/model/PaymentMethod.java

@@ -10,15 +10,34 @@ public enum PaymentMethod {
     SODEXO_GIFT,
     EDENRED,
     EDENRED_GIFT,
+    TOKENFLEX,
+    TOKENFLEX_GIFT,
     ALIPAY,
     PAYPAL,
     KLARNA,
     AFTERPAY,
     INSTANT_TRANSFER,
     STRIPE,
+    HEPSIPAY,
+    GARANTI_PAY,
+    JUZDAN,
+    YKB_WORLD_PAY,
+    YKB_WORLD_PAY_SHOPPING_LOAN,
     MULTINET,
     MULTINET_GIFT,
     MULTINET_NEO_GIFT,
+    METROPOL,
+    ISPAY,
+    PAYMOB,
+    VODAFONE_DCB,
+    KASPI,
     BIZUM,
-    PAYCELL_DCB
+    PAYLANDS_MB_WAY,
+    ZIP,
+    DKB,
+    PAYCELL_DCB,
+    SETCARD,
+    IWALLET,
+    PAPEL,
+    BKM_EXPRESS
 }

src/main/java/io/craftgate/model/PaymentProvider.java

@@ -7,11 +7,14 @@ public enum PaymentProvider {
     MASTERPASS,
     GARANTI_PAY,
     YKB_WORLD_PAY,
+    YKB_WORLD_PAY_SHOPPING_LOAN,
     PAPARA,
     PAYONEER,
     SODEXO,
     EDENRED,
-    INSTANT_TRANSFER,
+    TOKENFLEX,
+    METROPOL,
+    IWALLET,
     ALIPAY,
     PAYPAL,
     KLARNA,
@@ -21,25 +24,25 @@ public enum PaymentProvider {
     HEPSIPAY,
     STRIPE,
     KASPI,
+    INSTANT_TRANSFER,
     MASLAK,
     TOMPAY,
     TOM_FINANCE,
     ALFABANK,
-    PAYCELL,
+    ZIP,
+    DKB,
     HASO,
-    METROPOL,
+    PAYCELL,
     MULTINET,
-    ISPAY,
-    ZIP,
-    VODAFONE,
     CHIPPIN,
+    ISPAY,
     PAYMOB,
+    VODAFONE,
     BIZUM,
     PAYLANDS_MB_WAY,
-    PAYCELL_DCB,
-    IWALLET,
     SETCARD,
     PAPEL,
+    ALBARAKA,
     BKM_EXPRESS,
-    OFFLINE,
+    OFFLINE
 }

src/main/java/io/craftgate/model/PosIntegrator.java

@@ -2,45 +2,58 @@
 
 public enum PosIntegrator {
 
-    YKB,
-    GARANTI,
-    ISBANK,
+    ADYEN,
     AKBANK,
-    ZIRAATBANK,
-    ZIRAATBANK_INNOVA,
-    ZIRAATKATILIM,
-    KUVEYTTURK,
-    HALKBANK,
+    AKBANK_VPOS,
+    ALGORITMA,
+    ANADOLUBANK,
+    BIRLESIK_ODEME,
+    BRAINTREE,
+    CHECKOUT,
     DENIZBANK,
-    VAKIFBANK,
-    VAKIFKATILIM,
-    FINANSBANK,
+    ELEKSE,
     FIBABANK,
     FIBABANK_ASSECO,
-    ANADOLUBANK,
-    PARAM_POS,
+    FINANSBANK,
+    FINANSKATILIM,
+    GARANTI,
+    HALKBANK,
+    HALKBANK_VPOS,
+    HALKODE,
+    HALYKBANK,
+    INGBANK,
+    ISBANK,
+    ISBANK_VPOS,
     IYZICO,
-    SIPAY,
-    PAYNET,
-    PAYTR,
-    BIRLESIK_ODEME,
+    KUVEYTTURK,
     MOKA,
-    STRIPE,
-    TEB,
-    IPARA,
-    OZAN,
-    BRAINTREE,
+    MONEYPAY,
     NKOLAY,
-    PAYTABS,
-    PAYBULL,
-    ELEKSE,
-    ALGORITMA,
+    NUVEI,
+    PAPEL,
+    PARAM_POS,
+    PAYBYME,
     PAYCELL,
-    TAMI,
+    PAYLANDS,
+    PAYMOB,
+    PAYNET,
+    PAYTABS,
+    PAYTR,
     QNB_PAY,
-    AKBANK_VPOS,
-    BIN_PAY,
-    TAP,
+    REDSYS,
     RUBIK,
+    SIPAY,
+    STRIPE,
+    TAMI,
+    TAP,
+    TEB,
+    TRPOS,
     TURKONAY,
+    VAKIFBANK,
+    VAKIFKATILIM,
+    WORLDPAY,
+    YKB,
+    ZIRAATBANK,
+    ZIRAATBANK_INNOVA,
+    ZIRAATKATILIM,
 }

src/main/java/io/craftgate/model/Reward.java

@@ -10,5 +10,6 @@
 public class Reward {
     private BigDecimal cardRewardMoney;
     private BigDecimal firmRewardMoney;
+    private BigDecimal mileRewardMoney;
     private BigDecimal totalRewardMoney;
 }

src/main/java/io/craftgate/model/WebhookEventType.java

@@ -15,7 +15,7 @@ public enum WebhookEventType {
     BNPL_NOTIFICATION,
     BANK_ACCOUNT_TRACKING_RECORD,
     BKM_EXPRESS_PAYMENT_NOTIFICATION,
-
     MULTI_PAYMENT_COMPLETED,
-    MULTI_PAYMENT_EXPIRED
+    MULTI_PAYMENT_EXPIRED,
+    REPORT_GENERATED
 }