Merge branch 'refs/heads/master' into added-iwallet-apm

# Conflicts:
#	src/model/PaymentProvider.ts

samples/payment/InitPaycellDCBApmPayment.js

@@ -0,0 +1,34 @@
+const Craftgate = require('../../dist');
+
+const craftgate = new Craftgate.Client({
+    apiKey: 'api-key',
+    secretKey: 'secret-key',
+    baseUrl: 'https://sandbox-api.craftgate.io'
+});
+
+const request = {
+    apmType: Craftgate.Model.ApmType.PaycellDCB,
+    price: 1.0,
+    paidPrice: 1.0,
+    currency: Craftgate.Model.Currency.TRY,
+    paymentGroup: Craftgate.Model.PaymentGroup.ListingOrSubscription,
+    conversationId: 'conversationId',
+    callbackUrl: 'callback',
+    items: [
+        {
+            name: 'Item 1',
+            price: 0.4,
+            externalId: '123d1297-839e-4bd6-a13b-4be31a6e12a8'
+        },
+        {
+            name: 'Item 2',
+            price: 0.6,
+            externalId: '789d1297-839e-4bd6-a13b-4be31a6e13f7'
+        }
+    ],
+    additionalParams: {"paycellGsmNumber": "5305289290"}
+};
+
+craftgate.payment().initApmPayment(request)
+    .then(result => console.info('Paycell DCB Apm init payment successful', result))
+    .catch(err => console.error('Failed to init Paycell DCB Apm payment', err));

src/model/ApmType.ts

@@ -24,6 +24,7 @@ enum ApmType {
   IsPay = 'ISPAY',
   Chippin = 'CHIPPIN',
   Bizum = 'BIZUM',
+  PaycellDCB = 'PAYCELL_DCB',
   Paymob = 'PAYMOB'
 }
 

src/model/PaymentMethod.ts

@@ -13,7 +13,9 @@ enum PaymentMethod {
   InstantTransfer = 'INSTANT_TRANSFER',
   Stripe = 'STRIPE',
   Multinet = 'MULTINET',
-  MultinetGift = 'MULTINET_GIFT'
+  MultinetGift = 'MULTINET_GIFT',
+  Bizum = 'BIZUM',
+  PaycellDCB = 'PAYCELL_DCB'
 }
 
 export default PaymentMethod;

src/model/PaymentProvider.ts

@@ -30,6 +30,7 @@ enum PaymentProvider {
   Chippin = 'CHIPPIN',
   Paymob = 'PAYMOB',
   Bizum = 'BIZUM',
+  PaycellDCB = 'PAYCELL_DCB',
   IWallet = 'IWALLET',
   Offline = 'OFFLINE'
 }