payme-mini-app 0.6.3 → 0.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -74,7 +74,7 @@ dependencies {
74
74
  //noinspection GradleDynamicVersion
75
75
  implementation "com.facebook.react:react-native:+"
76
76
  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
77
- implementation 'com.github.PayME-Miniapp:native-android:0.0.89'
77
+ implementation 'com.github.PayME-Miniapp:native-android:0.0.90'
78
78
  }
79
79
 
80
80
  if (isNewArchitectureEnabled()) {
@@ -80,10 +80,11 @@ class RNPayMEMiniAppModule(reactContext: ReactApplicationContext) :
80
80
 
81
81
  if (action == "DEPOSIT" || action == "WITHDRAW" || action == "TRANSFER") {
82
82
  val description = if (data?.hasKey("description") == true) data.getString("description") else ""
83
+ val extraData = if (data?.hasKey("extraData") == true) data.getMap("extraData")?.toHashMap() else null
83
84
  val isBackToApp = if (data?.hasKey("isBackToApp") == true) data.getBoolean("isBackToApp") else true
84
85
  val isShowResult = if (data?.hasKey("isShowResult") == true) data.getBoolean("isShowResult") else true
85
86
  val amount = if (data?.hasKey("amount") == true) data.getInt("amount") else null
86
- val additionalData = DepositWithdrawTransferData(description, amount, isBackToApp, isShowResult)
87
+ val additionalData = DepositWithdrawTransferData(description, amount, extraData, isBackToApp, isShowResult)
87
88
  val openMiniAppData = getOpenMiniAppData(action, phone, additionalData)
88
89
  payMEMiniApp?.openMiniApp(
89
90
  getTypeOpenMiniApp(type),
@@ -93,9 +94,10 @@ class RNPayMEMiniAppModule(reactContext: ReactApplicationContext) :
93
94
  }
94
95
  if (action == "SERVICE") {
95
96
  val service = data?.getString("service") ?: ""
97
+ val extraData = if (data?.hasKey("extraData") == true) data.getMap("extraData")?.toHashMap() else null
96
98
  val isBackToApp = if (data?.hasKey("isBackToApp") == true) data.getBoolean("isBackToApp") else true
97
99
  val isShowResult = if (data?.hasKey("isShowResult") == true) data.getBoolean("isShowResult") else true
98
- val additionalData = ServiceData(service, isBackToApp, isShowResult)
100
+ val additionalData = ServiceData(service, extraData, isBackToApp, isShowResult)
99
101
  val openMiniAppData = getOpenMiniAppData(action, phone, additionalData)
100
102
  payMEMiniApp?.openMiniApp(
101
103
  getTypeOpenMiniApp(type),
@@ -108,10 +110,11 @@ class RNPayMEMiniAppModule(reactContext: ReactApplicationContext) :
108
110
  val amount = data?.getInt("amount")
109
111
  val note = if (data?.hasKey("note") == true) data.getString("note") else ""
110
112
  val ipnUrl = if (data?.hasKey("ipnUrl") == true) data.getString("ipnUrl") else ""
113
+ val extraData = if (data?.hasKey("extraData") == true) data.getMap("extraData")?.toHashMap() else null
111
114
  val isShowResult = if (data?.hasKey("isShowResult") == true) data.getBoolean("isShowResult") else true
112
115
  var paymentData: PaymentData?= null
113
116
  if (amount != null && transactionId != null) {
114
- paymentData = PaymentData(transactionId, amount, note, ipnUrl, isShowResult)
117
+ paymentData = PaymentData(transactionId, amount, note, ipnUrl, extraData, isShowResult)
115
118
  }
116
119
  val openMiniAppData = getOpenMiniAppData(action, phone, paymentData)
117
120
  payMEMiniApp?.openMiniApp(
@@ -122,10 +125,11 @@ class RNPayMEMiniAppModule(reactContext: ReactApplicationContext) :
122
125
  }
123
126
  if (action == "PAYMENT") {
124
127
  val transaction = data?.getString("transaction")
128
+ val extraData = if (data?.hasKey("extraData") == true) data.getMap("extraData")?.toHashMap() else null
125
129
  val isShowResult = if (data?.hasKey("isShowResult") == true) data.getBoolean("isShowResult") else true
126
130
  var paymentData: PaymentDirectData?= null
127
131
  if (transaction != null) {
128
- paymentData = PaymentDirectData(transaction, isShowResult)
132
+ paymentData = PaymentDirectData(transaction, extraData, isShowResult)
129
133
  }
130
134
  val openMiniAppData = getOpenMiniAppData(action, phone, paymentData)
131
135
  payMEMiniApp?.openMiniApp(
@@ -139,11 +143,12 @@ class RNPayMEMiniAppModule(reactContext: ReactApplicationContext) :
139
143
  val bankNumber = data?.getString("bankNumber")
140
144
  val swiftCode = data?.getString("swiftCode")
141
145
  val cardHolder = data?.getString("cardHolder")
146
+ val extraData = if (data?.hasKey("extraData") == true) data.getMap("extraData")?.toHashMap() else null
142
147
  val note = if (data?.hasKey("note") == true) data.getString("note") else ""
143
148
  val isShowResult = if (data?.hasKey("isShowResult") == true) data.getBoolean("isShowResult") else true
144
149
  var transferQRData: TransferQRData?= null
145
150
  if (amount != null && bankNumber != null && swiftCode != null && cardHolder != null) {
146
- transferQRData = TransferQRData(amount, bankNumber, swiftCode, cardHolder, note, isShowResult)
151
+ transferQRData = TransferQRData(amount, bankNumber, swiftCode, cardHolder, note, extraData, isShowResult)
147
152
  }
148
153
  val openMiniAppData = getOpenMiniAppData(action, phone, transferQRData)
149
154
  payMEMiniApp?.openMiniApp(
@@ -44,31 +44,38 @@ class RNPayMEMiniApp: RCTEventEmitter, PayMEDelegate {
44
44
  return PayMEPaymentParam(
45
45
  amount: data["amount"] as! Int, transactionId: data["transactionId"] as! String,
46
46
  note: data["note"] as? String, ipnUrl: data["ipnUrl"] as? String,
47
+ extraData: data["extraData"] as? [String: Any],
47
48
  isShowResult: data["isShowResult"] as? Bool)
48
49
  case "PAYMENT":
49
50
  return PayMEPaymentDirectParam(
50
- transaction: data["transaction"] as! String, isShowResult: data["isShowResult"] as? Bool)
51
+ transaction: data["transaction"] as! String,
52
+ extraData: data["extraData"] as? [String: Any],
53
+ isShowResult: data["isShowResult"] as? Bool)
51
54
  case "TRANSFER_QR":
52
55
  return PayMETransferQRParam(
53
56
  amount: data["amount"] as! Int, swiftCode: data["swiftCode"] as! String,
54
57
  bankNumber: data["bankNumber"] as! String, cardHolder: data["cardHolder"] as! String,
55
- note: data["note"] as? String,
58
+ note: data["note"] as? String, extraData: data["extraData"] as? [String: Any],
56
59
  isShowResult: data["isShowResult"] as? Bool)
57
60
  case "SERVICE":
58
61
  return PayMEServiceParam(
59
- service: data["service"] as! String, isBackToApp: data["isBackToApp"] as? Bool,
62
+ service: data["service"] as! String, extraData: data["extraData"] as? [String: Any],
63
+ isBackToApp: data["isBackToApp"] as? Bool,
60
64
  isShowResult: data["isShowResult"] as? Bool)
61
65
  case "DEPOSIT":
62
66
  return PayMEPayParam(
63
- amount: data["amount"] as? Int, description: data["description"] as? String,
67
+ amount: data["amount"] as? Int, extraData: data["extraData"] as? [String: Any],
68
+ description: data["description"] as? String,
64
69
  isBackToApp: data["isBackToApp"] as? Bool, isShowResult: data["isShowResult"] as? Bool)
65
70
  case "WITHDRAW":
66
71
  return PayMEPayParam(
67
- amount: data["amount"] as? Int, description: data["description"] as? String,
72
+ amount: data["amount"] as? Int, extraData: data["extraData"] as? [String: Any],
73
+ description: data["description"] as? String,
68
74
  isBackToApp: data["isBackToApp"] as? Bool, isShowResult: data["isShowResult"] as? Bool)
69
75
  case "TRANSFER":
70
76
  return PayMEPayParam(
71
- amount: data["amount"] as? Int, description: data["description"] as? String,
77
+ amount: data["amount"] as? Int, extraData: data["extraData"] as? [String: Any],
78
+ description: data["description"] as? String,
72
79
  isBackToApp: data["isBackToApp"] as? Bool, isShowResult: data["isShowResult"] as? Bool)
73
80
  default: fatalError("Invalid action!")
74
81
  }
@@ -3,10 +3,12 @@ type PayMEPaymentParam = {
3
3
  transactionId: string;
4
4
  note?: string;
5
5
  ipnUrl: string;
6
+ extraData?: Record<string, any>;
6
7
  isShowResult?: boolean;
7
8
  };
8
9
  type PayMEPaymentDirectParam = {
9
10
  transaction: string;
11
+ extraData?: Record<string, any>;
10
12
  isShowResult?: boolean;
11
13
  };
12
14
  type PayMETransferQRParam = {
@@ -15,16 +17,19 @@ type PayMETransferQRParam = {
15
17
  swiftCode: string;
16
18
  cardHolder: string;
17
19
  note?: string;
20
+ extraData?: Record<string, any>;
18
21
  isShowResult?: boolean;
19
22
  };
20
23
  type PayMEServiceParam = {
21
24
  service: string;
25
+ extraData?: Record<string, any>;
22
26
  isBackToApp?: boolean;
23
27
  isShowResult?: boolean;
24
28
  };
25
29
  type PayMEPayParam = {
26
30
  amount?: number;
27
31
  description?: string;
32
+ extraData?: Record<string, any>;
28
33
  isBackToApp?: boolean;
29
34
  isShowResult?: boolean;
30
35
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.type.d.ts","sourceRoot":"","sources":["../../src/index.type.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,oBAAoB,CAAA;CAAE,GACpE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,uBAAuB,CAAA;CAAE,GACpE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,GAC7D;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,CAAA;CAAE,GAC1D;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,YAAY,GAAG,SAAS,CAAC;AAEhD,MAAM,MAAM,SAAS,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAE9D,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,OAAO,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC"}
1
+ {"version":3,"file":"index.type.d.ts","sourceRoot":"","sources":["../../src/index.type.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,oBAAoB,CAAA;CAAE,GACpE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,uBAAuB,CAAA;CAAE,GACpE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,GAC7D;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,CAAA;CAAE,GAC1D;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,YAAY,GAAG,SAAS,CAAC;AAEhD,MAAM,MAAM,SAAS,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAE9D,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,OAAO,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "payme-mini-app",
3
- "version": "0.6.3",
3
+ "version": "0.6.5",
4
4
  "description": "Thư viện tích hợp PayME Miniapp",
5
5
  "main": "lib/commonjs/index",
6
6
  "module": "lib/module/index",
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
16
16
  s.swift_versions = "5.0"
17
17
  s.source_files = "ios/**/*.{h,m,mm,swift}"
18
18
 
19
- s.dependency "PayME-Miniapp", "0.2.35"
19
+ s.dependency "PayME-Miniapp", "0.2.36"
20
20
  s.dependency "React-Core"
21
21
  s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }
22
22
  # Don't install the dependencies when we run `pod install` in the old architecture.
package/src/index.type.ts CHANGED
@@ -3,11 +3,13 @@ type PayMEPaymentParam = {
3
3
  transactionId: string;
4
4
  note?: string;
5
5
  ipnUrl: string;
6
+ extraData?: Record<string, any>;
6
7
  isShowResult?: boolean;
7
8
  };
8
9
 
9
10
  type PayMEPaymentDirectParam = {
10
11
  transaction: string;
12
+ extraData?: Record<string, any>;
11
13
  isShowResult?: boolean;
12
14
  };
13
15
 
@@ -17,11 +19,13 @@ type PayMETransferQRParam = {
17
19
  swiftCode: string;
18
20
  cardHolder: string;
19
21
  note?: string;
22
+ extraData?: Record<string, any>;
20
23
  isShowResult?: boolean;
21
24
  };
22
25
 
23
26
  type PayMEServiceParam = {
24
27
  service: string;
28
+ extraData?: Record<string, any>;
25
29
  isBackToApp?: boolean;
26
30
  isShowResult?: boolean;
27
31
  };
@@ -29,6 +33,7 @@ type PayMEServiceParam = {
29
33
  type PayMEPayParam = {
30
34
  amount?: number;
31
35
  description?: string;
36
+ extraData?: Record<string, any>;
32
37
  isBackToApp?: boolean;
33
38
  isShowResult?: boolean;
34
39
  };