paymentRequestID added in the request

merge-update-with-lab-changes
haroon amjad 2 years ago
parent ee5fb615db
commit 41cd55e02b

@ -42,8 +42,9 @@ class ResponseInpatientAdvanceInfo {
num requestedAmount; num requestedAmount;
String setupId; String setupId;
int status; int status;
int paymentRequestID;
ResponseInpatientAdvanceInfo({this.admissionNo, this.admissionReqNo, this.createdOn, this.patientId, this.projectId, this.requestedAmount, this.setupId, this.status}); ResponseInpatientAdvanceInfo({this.admissionNo, this.admissionReqNo, this.createdOn, this.patientId, this.projectId, this.requestedAmount, this.setupId, this.status, this.paymentRequestID});
ResponseInpatientAdvanceInfo.fromJson(Map<String, dynamic> json) { ResponseInpatientAdvanceInfo.fromJson(Map<String, dynamic> json) {
admissionNo = json['admissionNo']; admissionNo = json['admissionNo'];
@ -54,6 +55,7 @@ class ResponseInpatientAdvanceInfo {
requestedAmount = json['requestedAmount']; requestedAmount = json['requestedAmount'];
setupId = json['setupId']; setupId = json['setupId'];
status = json['status']; status = json['status'];
paymentRequestID = json['PaymentRequestId'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -66,6 +68,7 @@ class ResponseInpatientAdvanceInfo {
data['requestedAmount'] = this.requestedAmount; data['requestedAmount'] = this.requestedAmount;
data['setupId'] = this.setupId; data['setupId'] = this.setupId;
data['status'] = this.status; data['status'] = this.status;
data['PaymentRequestId'] = this.paymentRequestID;
return data; return data;
} }
} }

@ -146,82 +146,84 @@ class _InPatientPendingAdvancePaymentState extends State<InPatientPendingAdvance
), ),
mHeight(12), mHeight(12),
// Expanded(child: Container()), // Expanded(child: Container()),
widget.isHasData ? Container( widget.isHasData
decoration: cardRadius(12.0), ? Container(
margin: EdgeInsets.zero, decoration: cardRadius(12.0),
padding: EdgeInsets.all(12.0), margin: EdgeInsets.zero,
child: Column( padding: EdgeInsets.all(12.0),
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Row( children: [
mainAxisAlignment: MainAxisAlignment.spaceBetween, Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceBetween,
Text( children: [
TranslationBase.of(context).patientShareTotalToDo, Text(
style: TextStyle( TranslationBase.of(context).patientShareTotalToDo,
fontWeight: FontWeight.bold, style: TextStyle(
fontSize: 16, fontWeight: FontWeight.bold,
letterSpacing: -0.64, fontSize: 16,
letterSpacing: -0.64,
),
),
Text(
TranslationBase.of(context).sar + " ${widget.inPatientAdvanceResponseModel.responseInpatientAdvanceInfo[0].requestedAmount}",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 24,
letterSpacing: -0.64,
),
),
],
), ),
), SizedBox(height: 12),
Text( Text(
TranslationBase.of(context).sar + " ${widget.inPatientAdvanceResponseModel.responseInpatientAdvanceInfo[0].requestedAmount}", TranslationBase.of(context).YouCanPayByTheFollowingOptions,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontSize: 14.0,
fontSize: 24, fontWeight: FontWeight.w600,
letterSpacing: -0.64, color: Color(0xff2B353E),
letterSpacing: -0.64,
),
), ),
), SizedBox(height: 12),
], SizedBox(
), width: MediaQuery.of(context).size.width * 0.75,
SizedBox(height: 12), child: getPaymentMethods(),
Text( ),
TranslationBase.of(context).YouCanPayByTheFollowingOptions, SizedBox(height: 12),
style: TextStyle( DefaultButton(
fontSize: 14.0, TranslationBase.of(context).payNow.toUpperCase(),
fontWeight: FontWeight.w600, () {
color: Color(0xff2B353E), getInPatientPaymentLink(false);
letterSpacing: -0.64, },
), // : null,
), color: CustomColors.green,
SizedBox(height: 12), disabledColor: CustomColors.grey2,
SizedBox( ),
width: MediaQuery.of(context).size.width * 0.75, SizedBox(height: 12),
child: getPaymentMethods(), Text(
), TranslationBase.of(context).copyLinkTxt,
SizedBox(height: 12), style: TextStyle(
DefaultButton( fontSize: 14.0,
TranslationBase.of(context).payNow.toUpperCase(), fontWeight: FontWeight.w600,
() { color: Color(0xff2B353E),
getInPatientPaymentLink(false); letterSpacing: -0.64,
}, ),
// : null, ),
color: CustomColors.green, SizedBox(height: 12),
disabledColor: CustomColors.grey2, DefaultButton(
), TranslationBase.of(context).copyLink.toUpperCase(),
SizedBox(height: 12), () {
Text( getInPatientPaymentLink(true);
TranslationBase.of(context).copyLinkTxt, },
style: TextStyle( svgIcon: "assets/images/new/copy.svg",
fontSize: 14.0, color: CustomColors.accentColor,
fontWeight: FontWeight.w600, disabledColor: CustomColors.grey2,
color: Color(0xff2B353E), ),
letterSpacing: -0.64, ],
), ),
), )
SizedBox(height: 12), : Container(),
DefaultButton(
TranslationBase.of(context).copyLink.toUpperCase(),
() {
getInPatientPaymentLink(true);
},
svgIcon: "assets/images/new/copy.svg",
color: CustomColors.accentColor,
disabledColor: CustomColors.grey2,
),
],
),
) : Container(),
], ],
), ),
); );
@ -260,6 +262,7 @@ class _InPatientPendingAdvancePaymentState extends State<InPatientPendingAdvance
widget.inPatientAdvanceResponseModel.responseInpatientAdvanceInfo[0].requestedAmount, widget.inPatientAdvanceResponseModel.responseInpatientAdvanceInfo[0].requestedAmount,
projectViewModel.user.patientIdentificationNo, projectViewModel.user.patientIdentificationNo,
clinicID, clinicID,
widget.inPatientAdvanceResponseModel.responseInpatientAdvanceInfo[0].paymentRequestID,
context) context)
.then((res) { .then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

@ -107,7 +107,7 @@ class ClinicListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> getInPatientPaymentLink(int projectID, int admissionNo, int orderID, String name, String email, num amount, String nationalID, int clinicID, context) async { Future<Map> getInPatientPaymentLink(int projectID, int admissionNo, int orderID, String name, String email, num amount, String nationalID, int clinicID, int paymentRequestID, context) async {
Map<String, dynamic> request; Map<String, dynamic> request;
// request = {"ProjectID": projectID, "AdmissionReqNo": admissionReqNo, "AdmissionNo": admissionNo}; // request = {"ProjectID": projectID, "AdmissionReqNo": admissionReqNo, "AdmissionNo": admissionNo};
@ -125,6 +125,7 @@ class ClinicListService extends BaseService {
"SourceType": "1", "SourceType": "1",
"NationalID": nationalID, "NationalID": nationalID,
"ClinicID": clinicID, "ClinicID": clinicID,
"PaymentRequestId": paymentRequestID,
"createdBy": 102 "createdBy": 102
}; };

Loading…
Cancel
Save