25-2/7/1
This commit is contained in:
@@ -19,6 +19,7 @@ import '../../constant/links.dart';
|
||||
import '../../main.dart';
|
||||
import '../../print.dart';
|
||||
import '../functions/crud.dart';
|
||||
import '../functions/encrypt_decrypt.dart';
|
||||
import '../functions/toast.dart';
|
||||
import 'paymob/paymob_wallet.dart';
|
||||
|
||||
@@ -155,15 +156,9 @@ class PaymentController extends GetxController {
|
||||
paymentIntentClientSecret: clientSecret,
|
||||
merchantDisplayName: AppInformation.appName,
|
||||
billingDetails: BillingDetails(
|
||||
name: box.read(BoxName.nameDriver) == null
|
||||
? box.read(BoxName.name).toString()
|
||||
: box.read(BoxName.nameDriver).toString(),
|
||||
email: box.read(BoxName.emailDriver) == null
|
||||
? box.read(BoxName.email).toString()
|
||||
: box.read(BoxName.emailDriver).toString(),
|
||||
phone: box.read(BoxName.phoneDriver) == null
|
||||
? box.read(BoxName.phone).toString()
|
||||
: box.read(BoxName.phoneDriver).toString(),
|
||||
name: encryptionHelper.decryptData(box.read(BoxName.nameDriver)),
|
||||
email: encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
|
||||
phone: encryptionHelper.decryptData(box.read(BoxName.phoneDriver)),
|
||||
address: Address(
|
||||
city: 'city',
|
||||
country: box.read(BoxName.countryCode), //'United States'
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import '../../constant/api_key.dart';
|
||||
import '../../main.dart';
|
||||
import '../functions/encrypt_decrypt.dart';
|
||||
|
||||
class PaymobManager extends GetxController {
|
||||
String authanticationToken1 = "";
|
||||
@@ -132,11 +133,13 @@ class PaymobManager extends GetxController {
|
||||
"amount_cents": amount,
|
||||
"currency": currency,
|
||||
"billing_data": {
|
||||
"first_name": box.read(BoxName.nameDriver) ?? box.read(BoxName.name),
|
||||
"last_name": box.read(BoxName.lastNameDriver) ?? box.read(BoxName.name),
|
||||
"email": box.read(BoxName.emailDriver) ?? box.read(BoxName.email),
|
||||
"first_name":
|
||||
encryptionHelper.decryptData(box.read(BoxName.nameDriver)),
|
||||
"last_name":
|
||||
encryptionHelper.decryptData(box.read(BoxName.lastNameDriver)),
|
||||
"email": encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
|
||||
"phone_number":
|
||||
box.read(BoxName.phoneDriver) ?? box.read(BoxName.phone),
|
||||
encryptionHelper.decryptData(box.read(BoxName.phoneDriver)),
|
||||
"apartment": "NA",
|
||||
"floor": "NA",
|
||||
"street": "NA",
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:sefer_driver/constant/box_name.dart';
|
||||
import 'package:sefer_driver/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:sefer_driver/main.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -223,10 +224,11 @@ class PaymobBillingData {
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return {
|
||||
"email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
|
||||
"first_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
|
||||
"last_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
|
||||
"phone_number": box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver),
|
||||
"email": encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
|
||||
"first_name": box.read(BoxName.nameDriver),
|
||||
"last_name": box.read(BoxName.nameDriver),
|
||||
"phone_number":
|
||||
encryptionHelper.decryptData(box.read(BoxName.phoneDriver)),
|
||||
"apartment": apartment ?? "NA",
|
||||
"floor": floor ?? "NA",
|
||||
"building": building ?? "NA",
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:sefer_driver/constant/box_name.dart';
|
||||
import 'package:sefer_driver/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:sefer_driver/main.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -266,10 +267,10 @@ class PaymobBillingDataWallet {
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return {
|
||||
"email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
|
||||
"email": encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
|
||||
"first_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
|
||||
"last_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
|
||||
"phone_number": box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver),
|
||||
"phone_number": (box.read(BoxName.phoneWallet)),
|
||||
"apartment": apartment ?? "NA",
|
||||
"floor": floor ?? "NA",
|
||||
"building": building ?? "NA",
|
||||
|
||||
Reference in New Issue
Block a user