diff --git a/lib/analytics/flows/advance_payments.dart b/lib/analytics/flows/advance_payments.dart index db52eb59..37f18068 100644 --- a/lib/analytics/flows/advance_payments.dart +++ b/lib/analytics/flows/advance_payments.dart @@ -67,10 +67,10 @@ class AdvancePayments{ } // R046 - payment_success({@required String appointment_type, clinic, hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ + payment_success({@required String hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ logger('payment_success', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type_online' : clinic, + // 'appointment_type' : appointment_type, + // 'clinic_type_online' : clinic, 'payment_method' : payment_method, 'payment_type' : payment_type, 'hospital_name' : hospital, diff --git a/lib/analytics/flows/appointments.dart b/lib/analytics/flows/appointments.dart index 720fbb52..c405bc6a 100644 --- a/lib/analytics/flows/appointments.dart +++ b/lib/analytics/flows/appointments.dart @@ -41,8 +41,8 @@ class Appointment{ // R018.1 book_appointment_select_clinic({@required String appointment_type, clinic}){ - // appointment_type: regular | livecare - // clinic_type : $clinic_type + // appointment_type: regular | livecare + // clinic_type : $clinic_type logger('book_appointment_select_clinic', parameters: { 'appointment_type' : appointment_type, 'clinic_type' : clinic @@ -101,15 +101,15 @@ class Appointment{ // R023 book_appointment_date_selection({@required String appointment_type, @required day, @required DoctorList doctor}){ logger('book_appointment_date_selection', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, - 'appointment_day' : day - }); + 'appointment_type' : appointment_type, + 'clinic_type' : doctor.clinicName, + 'hospital_name' : doctor.projectName, + 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name' : doctor.name, + 'doctor_nationality' : doctor.nationalityName, + 'doctor_gender' : doctor.genderDescription, + 'appointment_day' : day + }); } // R024.1 @@ -182,7 +182,7 @@ class Appointment{ // R049.1 // should be for appointment flow appointment_actions(AppoitmentAllHistoryResultList appointment, String action){ - logger('to_do_list_pay_now', parameters: { + logger('appointment_actions', parameters: { 'action_type' : action, 'flow_type' : GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, 'appointment_type' : appointment.appointmentType, @@ -232,14 +232,16 @@ class Appointment{ // R036 payment_success({@required String appointment_type, clinic, hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ - // appointment_type - // clinic_type_online - // payment_method - // payment_type: 'appointment' - // hospital_name - // transaction_number - // transaction_amount - // transaction_currency + logger('payment_success', parameters: { + 'appointment_type' : appointment_type, + 'payment_method' : payment_method, + 'payment_type' : payment_type, + 'hospital_name' : hospital, + 'clinic_type_online' : clinic, + 'transaction_number' : txn_number, + 'transaction_amount' : txn_amount, + 'transaction_currency' : txn_currency, + }); } @@ -260,15 +262,14 @@ class Appointment{ // R053 // Note : - Payment flow beyond this step are same as listed under ‘Advance Payment’ section of this document appointment_details_cancel({@required AppoitmentAllHistoryResultList appointment}){ - logger('appointment_details_cancel', parameters: { - }); - } - - appointment_cancel(){ logger('cancel_appointment', parameters: { 'flow_type' : GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, + 'appointment_type' : appointment.appointmentType, + 'clinic_type_online' : appointment.clinicName, + 'hospital_name' : appointment.projectName, + 'doctor_name' : (appointment.doctorName == null || appointment.doctorName == '') ? appointment.doctorNameObj : appointment.doctorName, + 'payment_type' : 'appointment', }); } - } \ No newline at end of file diff --git a/lib/pages/medical/balance/confirm_payment_page.dart b/lib/pages/medical/balance/confirm_payment_page.dart index bf2b2e29..f361d166 100644 --- a/lib/pages/medical/balance/confirm_payment_page.dart +++ b/lib/pages/medical/balance/confirm_payment_page.dart @@ -406,7 +406,13 @@ class _ConfirmPaymentPageState extends State { service.checkPaymentStatus(transID, AppGlobal.context).then((res) { String paymentInfo = res['Response_Message']; if (paymentInfo == 'Success') { + String txn_ref = res['Merchant_Reference']; + String amount = res['Amount']; + String payment_method = res['PaymentMethod']; + final currency = projectViewModel.user.outSA == 0 ? "sar" : 'aed'; createAdvancePayment(res, appo); + projectViewModel.analytics.advancePayments.payment_success( + payment_type: 'wallet', payment_method: payment_method, txn_amount: "$amount", txn_currency: currency, txn_number: txn_ref, hospital: widget.advanceModel.hospitalsModel.name); } else { GifLoaderDialogUtils.hideDialog(AppGlobal.context); AppToast.showErrorToast(message: res['Response_Message']);