Invoice details UI revamped

merge-requests/404/head
Haroon Amjad 4 years ago
parent c91b8ce777
commit abcb71e86e

@ -1518,4 +1518,5 @@ const Map localizedValues = {
"requestedDate": { "en": "Reqeusted Date", "ar": "التاريخ " }, "requestedDate": { "en": "Reqeusted Date", "ar": "التاريخ " },
"callDuration": { "en": "Call Duration", "ar": "مدة الاتصال" }, "callDuration": { "en": "Call Duration", "ar": "مدة الاتصال" },
"alreadyRated": { "en": "This appointment has been previously evaluated.", "ar": "تم تقييم هذا الموعد مسبقاً" }, "alreadyRated": { "en": "This appointment has been previously evaluated.", "ar": "تم تقييم هذا الموعد مسبقاً" },
"insuranceCompany": { "en": "Insurance Company", "ar": "شركة تأمين" },
}; };

@ -2,39 +2,59 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
import 'package:diplomaticquarterapp/models/MyInvoices/DentalInvoiceDetailResponse.dart'; import 'package:diplomaticquarterapp/models/MyInvoices/DentalInvoiceDetailResponse.dart';
import 'package:diplomaticquarterapp/models/MyInvoices/GetDentalAppointmentsResponse.dart'; import 'package:diplomaticquarterapp/models/MyInvoices/GetDentalAppointmentsResponse.dart';
import 'package:diplomaticquarterapp/models/header_model.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart';
import 'package:diplomaticquarterapp/services/my_invoice_service/my_invoice_services.dart'; import 'package:diplomaticquarterapp/services/my_invoice_service/my_invoice_services.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart';
import 'package:diplomaticquarterapp/widgets/new_design/doctor_header.dart';
import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart'; import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/extensions/list_extension.dart'; import 'package:diplomaticquarterapp/extensions/list_extension.dart';
class InvoiceDetail extends StatelessWidget { class InvoiceDetail extends StatefulWidget {
final DoctorList doctor; final DoctorList doctor;
final ListDentalAppointments listDentalAppointments; final ListDentalAppointments listDentalAppointments;
final DentalInvoiceDetailResponse dentalInvoiceDetailResponse; final DentalInvoiceDetailResponse dentalInvoiceDetailResponse;
final BuildContext context; final BuildContext context;
InvoiceDetail(this.doctor, this.listDentalAppointments,
this.dentalInvoiceDetailResponse, this.context);
@override
_InvoiceDetailState createState() => _InvoiceDetailState();
}
class _InvoiceDetailState extends State<InvoiceDetail> {
dynamic totalServiceRate = 0; dynamic totalServiceRate = 0;
dynamic totalDiscount = 0; dynamic totalDiscount = 0;
dynamic totalVAT = 0; dynamic totalVAT = 0;
dynamic subTotal = 0; dynamic subTotal = 0;
dynamic grandTotal = 0;
InvoiceDetail(this.doctor, this.listDentalAppointments, this.dentalInvoiceDetailResponse, this.context); dynamic grandTotal = 0;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
generateInvoiceDetails(); generateInvoiceDetails();
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).myInvoice, appBarTitle: widget.doctor.doctorTitle != null
? widget.doctor.doctorTitle.toString()
: TranslationBase.of(context).dr +
" " +
widget.doctor.name.toString(),
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
showNewAppBar: true, showNewAppBar: true,
@ -43,163 +63,216 @@ class InvoiceDetail extends StatelessWidget {
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
DoctorView(doctor: doctor, isLiveCareAppointment: false, isShowFlag: false), // DoctorView(doctor: doctor, isLiveCareAppointment: false, isShowFlag: false),
Container( DoctorHeader(
margin: EdgeInsets.only(left: 10.0, right: 10.0), headerModel: HeaderModel(
padding: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0, bottom: 10.0), widget.doctor.name,
decoration: BoxDecoration( widget.doctor.doctorImageURL,
color: Colors.grey[800], widget.doctor.speciality,
borderRadius: BorderRadius.only( widget.doctor.clinicName,
topLeft: Radius.circular(8), widget.doctor.projectName,
topRight: Radius.circular(8), DateUtil.convertStringToDate(widget.doctor.date),
), null,
widget.doctor.nationalityFlagURL,
widget.doctor.doctorRate,
widget.doctor.actualDoctorRate,
widget.doctor.noOfPatientsRate,
projectViewModel.user.emailAddress),
onTap: () {
sendInvoiceEmail();
},
), ),
child: Table( Container(
child: Card(
elevation: 3.0,
shape: cardRadius(12),
margin: EdgeInsets.only(
left: 16, top: 8, right: 16, bottom: 16),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
TableRow(children: [ Table(
Text(TranslationBase.of(context).description, textAlign: TextAlign.center, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), columnWidths: {
Text(TranslationBase.of(context).quantity, textAlign: TextAlign.center, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), 0: FlexColumnWidth(2.0),
Text(TranslationBase.of(context).price, textAlign: TextAlign.center, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), 1: FlexColumnWidth(1.5),
Text(TranslationBase.of(context).total, textAlign: TextAlign.center, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), 2: FlexColumnWidth(1.5),
]), 3: FlexColumnWidth(1.5),
], },
children: fullData(context),
), ),
],
), ),
Container(
margin: EdgeInsets.only(top: 0.0, left: 10.0, right: 10.0),
padding: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0, bottom: 15.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(8),
bottomRight: Radius.circular(8),
)),
child: Table(children: fullData(context)),
), ),
Container(
margin: EdgeInsets.only(top: 3.0, left: 12.0, right: 12.0),
child: Divider(
color: Colors.grey[400],
thickness: 0.7,
), ),
), ),
Container( Container(
child: AppExpandableNotifier( width: double.infinity,
title: TranslationBase.of(context).patientShareTotal.toString() + " " + this.grandTotal.toString() + " " + TranslationBase.of(context).sar, child: Card(
isExpand: true, elevation: 3.0,
bodyWidget: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ shape: cardRadius(12),
Table( margin: EdgeInsets.only(
left: 16, top: 8, right: 16, bottom: 16),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
TableRow(children: [
Container( Container(
margin: EdgeInsets.only(top: 10.0), margin: EdgeInsets.only(bottom: 10.0),
child: Text(TranslationBase.of(context).discount, textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)), child: Text(TranslationBase.of(context).cardDetail,
style: TextStyle(
color: Colors.black,
letterSpacing: -0.64,
fontSize: 18.0,
fontWeight: FontWeight.bold)),
),
myRichText(
TranslationBase.of(context).insuranceCompany +
": ",
widget.dentalInvoiceDetailResponse
.listEInvoiceForDental[0].companyName,
projectViewModel.isArabic),
myRichText(
TranslationBase.of(context).insuranceID + ": ",
widget
.dentalInvoiceDetailResponse
.listEInvoiceForDental[0]
.insuranceID !=
null
? widget.dentalInvoiceDetailResponse
.listEInvoiceForDental[0].insuranceID
: "N/A",
projectViewModel.isArabic),
],
), ),
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text(this.totalDiscount.toString() + " " + TranslationBase.of(context).sar,
textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)),
), ),
]),
TableRow(children: [
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text(
TranslationBase.of(context).totalVAT.toString() + " (" + dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation[0].vATPercentage.toString() + "%): ",
textAlign: TextAlign.center,
style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)),
), ),
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text(num.tryParse(this.totalVAT.toString()).toStringAsFixed(2) + " " + TranslationBase.of(context).sar,
textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)),
), ),
]),
TableRow(children: [
Container( Container(
margin: EdgeInsets.only(top: 10.0), width: double.infinity,
child: Text(TranslationBase.of(context).total.toString() + ": ", textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)), child: Card(
), elevation: 3.0,
Container( shape: cardRadius(12),
margin: EdgeInsets.only(top: 10.0), margin: EdgeInsets.only(
child: left: 16, top: 8, right: 16, bottom: 16),
Text(this.subTotal.toString() + " " + TranslationBase.of(context).sar, textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)), child: Padding(
), padding: const EdgeInsets.all(15.0),
]), child: Column(
TableRow(children: [ crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container( Container(
margin: EdgeInsets.only(top: 10.0), margin: EdgeInsets.only(bottom: 10.0),
child: Text(TranslationBase.of(context).paid.toString() + ": ", textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)), child: Text(
TranslationBase.of(context).totalBalance,
style: TextStyle(
letterSpacing: -0.64,
color: Colors.black,
fontSize: 18.0,
fontWeight: FontWeight.bold)),
), ),
Container( Container(
margin: EdgeInsets.only(top: 10.0, bottom: 10.0), width: double.infinity,
child: Text(this.grandTotal.toString() + " " + TranslationBase.of(context).sar, padding: EdgeInsets.only(top: 10, bottom: 5),
textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)), child: Row(
), children: [
]), Expanded(
child: _getNormalText(
TranslationBase.of(context).discount),
),
Expanded(
child: _getNormalText(
this.totalDiscount.toString() +
" " +
TranslationBase.of(context).sar,
isBold: true),
)
], ],
), ),
]),
),
), ),
mDivider(Colors.grey[600]),
Container( Container(
margin: EdgeInsets.only(top: 3.0, left: 12.0, right: 12.0), width: double.infinity,
child: Divider( padding: EdgeInsets.only(top: 10, bottom: 5),
color: Colors.grey[400], child: Row(
thickness: 0.7, children: [
Expanded(
child: _getNormalText(
TranslationBase.of(context)
.totalVAT
.toString() +
" (" +
widget
.dentalInvoiceDetailResponse
.listEInvoiceForDental[0]
.listConsultation[0]
.vATPercentage
.toString() +
"%): "),
),
Expanded(
child: _getNormalText(
num.tryParse(this.totalVAT.toString())
.toStringAsFixed(2) +
" " +
TranslationBase.of(context).sar,
isBold: true),
)
],
), ),
), ),
mDivider(Colors.grey[600]),
Container( Container(
margin: EdgeInsets.only(top: 0.0, left: 10.0, right: 10.0), width: double.infinity,
padding: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0, bottom: 15.0), padding: EdgeInsets.only(top: 10, bottom: 5),
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(8))), child: Row(
child: Table(children: [ children: [
TableRow(children: [ Expanded(
Container( child: _getNormalText(
margin: EdgeInsets.only(top: 10.0), TranslationBase.of(context).total),
child: Text(TranslationBase.of(context).dentalInsurance + ": ", textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)), ),
Expanded(
child: _getNormalText(
this.subTotal.toString() +
" " +
TranslationBase.of(context).sar,
isBold: true),
)
],
), ),
Container(
margin: EdgeInsets.only(top: 10.0, bottom: 5.0),
child: Text(dentalInvoiceDetailResponse.listEInvoiceForDental[0].companyName, textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)),
), ),
]), mDivider(Colors.grey[600]),
TableRow(children: [
Container( Container(
margin: EdgeInsets.only(top: 10.0), width: double.infinity,
child: Text(TranslationBase.of(context).insuranceID + ": ", textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)), padding: EdgeInsets.only(top: 10, bottom: 5),
child: Row(
children: [
Expanded(
child: _getNormalText(
TranslationBase.of(context).paid),
),
Expanded(
child: _getNormalText(
this.grandTotal.toString() +
" " +
TranslationBase.of(context).sar,
isBold: true),
)
],
), ),
Container(
margin: EdgeInsets.only(top: 10.0, bottom: 10.0),
child: Text(dentalInvoiceDetailResponse.listEInvoiceForDental[0].insuranceID != null ? dentalInvoiceDetailResponse.listEInvoiceForDental[0].insuranceID : "N/A", textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.bold)),
), ),
]), ],
]), ),
), ),
)),
SizedBox( SizedBox(
height: 100.0, height: 100.0,
), ),
], ],
), ),
), ),
), ));
bottomSheet: Container(
width: MediaQuery.of(context).size.width,
color: Theme.of(context).scaffoldBackgroundColor,
margin: EdgeInsets.only(left: 15.0, right: 15.0, top: 10.0, bottom: 20.0),
child: DefaultButton(TranslationBase.of(context).sendEmail, () {
showDialog(
context: context,
child: ConfirmSendEmailDialog(
email: projectViewModel.user.emailAddress,
onTapSendEmail: () {
sendInvoiceEmail();
},
),
);
}),
),
);
} }
void generateInvoiceDetails() { void generateInvoiceDetails() {
@ -211,8 +284,10 @@ class InvoiceDetail extends StatelessWidget {
List<ListConsultation> listConsultations = new List(); List<ListConsultation> listConsultations = new List();
dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation.forEach((item) { widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation
var i = listConsultations.indexWhere((x) => x.procedureID == item.procedureID); .forEach((item) {
var i = listConsultations
.indexWhere((x) => x.procedureID == item.procedureID);
if (i <= -1) { if (i <= -1) {
listConsultations.add(item); listConsultations.add(item);
} }
@ -230,48 +305,92 @@ class InvoiceDetail extends StatelessWidget {
} }
sendInvoiceEmail() { sendInvoiceEmail() {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(widget.context);
MyInvoicesService myInvoicesService = new MyInvoicesService(); MyInvoicesService myInvoicesService = new MyInvoicesService();
myInvoicesService.sendDentalAppointmentInvoiceEmail(listDentalAppointments.projectID, listDentalAppointments.appointmentNo, context).then((res) { myInvoicesService
GifLoaderDialogUtils.hideDialog(context); .sendDentalAppointmentInvoiceEmail(
widget.listDentalAppointments.projectID,
widget.listDentalAppointments.appointmentNo,
widget.context)
.then((res) {
GifLoaderDialogUtils.hideDialog(widget.context);
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
AppToast.showSuccessToast(message: TranslationBase.of(context).emailSentSuccessfully); AppToast.showSuccessToast(
message: TranslationBase.of(widget.context).emailSentSuccessfully);
} else { } else {
AppToast.showErrorToast(message: res['ErrorEndUserMessage']); AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
} }
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(widget.context);
print(err); print(err);
AppToast.showErrorToast(message: err); AppToast.showErrorToast(message: err);
Navigator.of(context).pop(); Navigator.of(widget.context).pop();
}); });
} }
List<TableRow> fullData(context) { List<TableRow> fullData(context) {
List<TableRow> tableRow = []; List<TableRow> tableRow = [];
dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation.forEach((lab) {
tableRow.add( tableRow.add(
TableRow(children: [ TableRow(
Container( children: [
margin: EdgeInsets.only(top: 10.0), Utils.tableColumnTitle(TranslationBase.of(context).description),
child: Text(lab.procedureName, textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.w400)), Utils.tableColumnTitle(TranslationBase.of(context).quantity),
), Utils.tableColumnTitle(TranslationBase.of(context).price),
Container( Utils.tableColumnTitle(TranslationBase.of(context).total),
margin: EdgeInsets.only(top: 10.0), ],
child: Text(lab.quantity.toString(), textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.w400)),
),
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text(lab.price.toString() + " " + TranslationBase.of(context).sar, textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.w400)),
),
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text(lab.total.toString() + " " + TranslationBase.of(context).sar, textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontWeight: FontWeight.w400)),
), ),
);
// widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation
// .forEach((lab) {
for (int i = 0;
i <
widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0]
.listConsultation.length;
i++) {
tableRow.add(
TableRow(children: [
Utils.tableColumnValue(
'${widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation[i].procedureName}',
isLast: i ==
(widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0]
.listConsultation.length -
1)),
Utils.tableColumnValue(
'${widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation[i].quantity}',
isLast: i ==
(widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0]
.listConsultation.length -
1)),
Utils.tableColumnValue(
'${widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation[i].price.toString() + " " + TranslationBase.of(context).sar}',
isLast: i ==
(widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0]
.listConsultation.length -
1)),
Utils.tableColumnValue(
'${widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].listConsultation[i].total.toString() + " " + TranslationBase.of(context).sar}',
isLast: i ==
(widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0]
.listConsultation.length -
1)),
]), ]),
); );
}); }
return tableRow; return tableRow;
} }
_getNormalText(text, {bool isBold = false}) {
return Text(
text,
style: TextStyle(
fontSize: isBold ? 14 : 12,
letterSpacing: -0.5,
color: isBold ? Colors.black : Colors.grey[700],
fontWeight: FontWeight.w600,
),
);
}
} }

@ -95,7 +95,8 @@ class _MyInvoicesState extends State<MyInvoices> {
doctor.doctorImageURL = listDentalAppointments.doctorImageURL; doctor.doctorImageURL = listDentalAppointments.doctorImageURL;
doctor.projectID = listDentalAppointments.projectID; doctor.projectID = listDentalAppointments.projectID;
doctor.dayName = listDentalAppointments.invoiceNo; doctor.dayName = listDentalAppointments.invoiceNo;
doctor.clinicName = "InvoiceNo: " + listDentalAppointments.invoiceNo.toString(); doctor.clinicName = listDentalAppointments.invoiceNo.toString();
doctor.date = listDentalAppointments.appointmentDate;
myInvoicesService.getDentalAppointmentInvoice(listDentalAppointments.projectID, listDentalAppointments.appointmentNo, context).then((res) { myInvoicesService.getDentalAppointmentInvoice(listDentalAppointments.projectID, listDentalAppointments.appointmentNo, context).then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

@ -2306,6 +2306,8 @@ class TranslationBase {
String get alreadyRated => localizedValues["alreadyRated"][locale.languageCode]; String get alreadyRated => localizedValues["alreadyRated"][locale.languageCode];
String get insuranceCompany => localizedValues["insuranceCompany"][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save