updated changes for payment worklist.

assets/langs/ar-SA.json

@@ -544,5 +544,19 @@
   "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.",
   "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
   "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
-  "open": "يفتح"
+  "open": "يفتح",
+  "requesterOperatingUnit":"وحدة تشغيل مقدم الطلب",
+  "prepareEmpNum":"إعداد رقم الموظف",
+  "supplierInfo" : "معلومات المورد",
+  "supplierAcNo": "رقم حساب المورد",
+  "supplierAcName": "اسم حساب المورد",
+  "supplierIBAN" : "رقم IBAN للمورد",
+  "supplierCRNo" :"رقم السجل التجاري",
+  "suppliedAcNo" : "رقم الحساب المقدم",
+  "patientRefundInvoice" : "فاتورة استرداد الأموال للمريض",
+  "patientNumber" : "رقم المريض",
+  "patientName" : "اسم المريض",
+  "invoiceDate" : "تاريخ الفاتورة",
+  "refundInvoice" :"فاتورة الاسترجاع",
+  "hospitalClinic" : "عيادة المستشفى"
 }

assets/langs/en-US.json

@@ -563,5 +563,19 @@
   "open": "open",
   "addAtLeastOneAttachment": "Please add at least one attachment.",
   "pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.",
-  "youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit."
+  "youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit.",
+  "requesterOperatingUnit":"Requester Operating Unit",
+  "prepareEmpNum":"Prepare Employee Num",
+  "supplierInfo" : "Supplier Information",
+  "supplierAcNo": "Supplier Account No",
+  "supplierAcName":"Supplier Account Name",
+  "supplierIBAN" : "Supplier IBAN",
+  "supplierCRNo" : "CR Number",
+  "suppliedAcNo" : "Supplied Account No.",
+  "patientRefundInvoice" : "Patient Refund Invoice",
+  "patientNumber" : "Patient Number",
+  "patientName" : "Patient Name",
+  "invoiceDate" : "Invoice Date",
+  "refundInvoice" :"Refund Invoice",
+  "hospitalClinic" : "Hospital Clinic"
 }

lib/generated/codegen_loader.g.dart

@@ -558,9 +558,11 @@ class CodegenLoader extends AssetLoader {
     "requesterEmpNum":"رقم الموظف الذي قدم الطلب",
     "requesterEmpName":"اسم الموظف مقدم الطلب",
     "prepareEmpName":"إعداد اسم الموظف",
+    "prepareEmpNum":"إعداد رقم الموظف",
     "requesterPositionName":"اسم الوظيفة لمقدم الطلب",
     "preparePositionName":"إعداد اسم الوظيفة",
     "requesterPayrollName":"اسم مقدم الطلب",
+    "requesterOperatingUnit":"وحدة تشغيل مقدم الطلب",
     "payingORGName":"اسم المنظمة الدافعة",
     "requestAmount":"مبلغ الطلب",
     "typeofPayment":"نوع الدفع",
@@ -1158,7 +1160,22 @@ class CodegenLoader extends AssetLoader {
     "pOAmount":"PO Amount",
     "versionStatus":"Version Status",
     "supplierNo":"Supplier No",
-    "general":"General"
+    "general":"General",
+    "prepareEmpNum":"Prepare Employee Num",
+    "requesterOperatingUnit":"Requester Operating Unit",
+     "supplierInfo" : "Supplier Information",
+    "supplierNum": "Supplier Number",
+    "supplierAcNo": "Supplier Account Number",
+    "supplierAcName" : 'Supplier Account Name',
+    "supplierIBAN" : 'Supplier IBAN',
+    "supplierCRNo" : 'CR Number',
+    "suppliedAcNo" : 'Supplied Account No.',
+    "patientRefundInvoice" : 'Patient Refund Invoice',
+    "patientNumber" : 'Patient Number',
+    "patientName" : 'Patient Name',
+    "invoiceDate" : 'Invoice Date',
+    "refundInvoice" : 'Refund Invoice',
+    "hospitalClinic" : 'Hospital Clinic',
   };
   static const Map<String, Map<String, dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
 }

lib/generated/locale_keys.g.dart

@@ -557,9 +557,11 @@ abstract class  LocaleKeys {
   static const requesterEmpNum ='requesterEmpNum';
   static const requesterEmpName ='requesterEmpName';
   static const prepareEmpName ='prepareEmpName';
+  static const prepareEmpNum ='prepareEmpNum';
   static const requesterPositionName ='requesterPositionName';
   static const preparePositionName ='preparePositionName';
   static const requesterPayrollName ='requesterPayrollName';
+  static const requesterOperatingUnit ='requesterOperatingUnit';
   static const payingORGName ='payingORGName';
   static const requestAmount ='requestAmount';
   static const typeofPayment ='typeofPayment';
@@ -575,5 +577,16 @@ abstract class  LocaleKeys {
   static const  versionStatus ='versionStatus';
   static const  supplierNo ='supplierNo';
   static const general ="general";
-
+  static const supplierInfo = 'supplierInfo';
+  static const supplierAcNo = 'supplierAcNo';
+  static const supplierAcName = 'supplierAcName';
+  static const supplierIBAN = 'Supplier IBAN';
+  static const supplierCRNo = 'CR Number';
+  static const suppliedAcNo = 'Supplied Account No.';
+  static const patientRefundInvoice = "patientRefundInvoice";
+  static const patientNumber = 'Patient Number';
+  static const  patientName = 'Patient Name';
+  static const  invoiceDate = 'Invoice Date';
+  static const  refundInvoice = 'Refund Invoice';
+  static const hospitalClinic = 'Hospital Clinic';
 }

lib/ui/work_list/worklist_fragments/info_fragments.dart

@@ -739,7 +739,7 @@ class InfoFragment extends StatelessWidget {
                 ItemDetailViewCol(
                     LocaleKeys.requestNumber.tr(), data.paymentDetailsList![0].requestNumber ?? ""),
                 ItemDetailViewCol( LocaleKeys.requesterEmpNum.tr(),
-                    data.paymentDetailsList![0].requesterEmployeeName ?? ""),
+                    data.paymentDetailsList![0].requesterEmployeeNumber ?? ""),
               ),
               ItemDetailGrid(
                 ItemDetailViewCol( LocaleKeys.requestDate.tr(),
@@ -748,18 +748,25 @@ class InfoFragment extends StatelessWidget {
                 ItemDetailViewCol(
                     LocaleKeys.requesterEmpName.tr(),  data.paymentDetailsList![0].requesterEmployeeName ?? ""),
               ),
+              ItemDetailGrid(
+                ItemDetailViewCol( LocaleKeys.prepareEmpNum.tr(),
+                    data.paymentDetailsList![0].prepareEmployeeNumber ?? ""),
+                ItemDetailViewCol(
+                    LocaleKeys.requesterPositionName.tr(), data.paymentDetailsList![0].requesterPositionName ?? ""),
+              ),
               ItemDetailGrid(
                 ItemDetailViewCol( LocaleKeys.prepareEmpName.tr(),
                     data.paymentDetailsList![0].prepareEmployeeName ?? ""),
                 ItemDetailViewCol(
-                    LocaleKeys.requesterPositionName.tr(), data.paymentDetailsList![0].requesterPositionName ?? ""),
+                    LocaleKeys.requesterPayrollName.tr(), data.paymentDetailsList![0].requesterPayrollName ?? ""),
               ),
               ItemDetailGrid(
                 ItemDetailViewCol( LocaleKeys.preparePositionName.tr(),
                     data.paymentDetailsList![0].preparePositionName ?? ""),
-                ItemDetailViewCol(
-                    LocaleKeys.requesterPayrollName.tr(), data.paymentDetailsList![0].requesterPayrollName ?? ""),
+                  ItemDetailViewCol( LocaleKeys.requesterOperatingUnit.tr(),
+                      data.paymentDetailsList![0].requesterOperatingUnits ?? "")
               ),
+
             ],
           ).objectContainerView(),
         if (data!.paymentDetailsList!.isNotEmpty)
@@ -843,7 +850,62 @@ class InfoFragment extends StatelessWidget {
               ),
             ],
           ).objectContainerView(),
-      ],
+
+        if (data!.supplierInformationList!.isNotEmpty &&  data.supplierInformationList![0].supplierNumber !="")
+          Column(
+            children: [
+              LocaleKeys.supplierInfo.tr().toText14(color: MyColors.textMixColor),
+              ItemDetailGrid(
+                ItemDetailViewCol(
+                    LocaleKeys.supplierNo.tr(), data.supplierInformationList![0].supplierNumber ?? ""),
+                ItemDetailViewCol(LocaleKeys.supplierName.tr(),
+                    data.supplierInformationList![0].supplierName.toString() ?? ""),
+              ),
+              ItemDetailGrid(
+                ItemDetailViewCol(LocaleKeys.supplierAcNo.tr(),
+                    data.supplierInformationList![0].supplierBankAccountNumber  ?? ""),
+                ItemDetailViewCol(
+                    LocaleKeys.supplierAcName.tr(), data.supplierInformationList![0].supplierBankAccountName ??
+                    "" ),
+              ),
+              ItemDetailGrid(
+                ItemDetailViewCol(LocaleKeys.supplierCRNo.tr(),
+                    data.supplierInformationList![0].crNumber?? ""),
+                ItemDetailViewCol(  LocaleKeys.supplierIBAN.tr(), data.supplierInformationList![0].supplierBankIban ??
+                    "" ),
+              ),
+
+            ],
+          ).objectContainerView(),
+        //
+        if (data!.refundInvoiceList!.isNotEmpty &&  data.refundInvoiceList![0].patientNumber !="" )
+          Column(
+            children: [
+              LocaleKeys.patientRefundInvoice.tr().toText14(color: MyColors.textMixColor),
+              ItemDetailGrid(
+                ItemDetailViewCol(
+                    LocaleKeys.patientNumber.tr(), data.refundInvoiceList![0].patientNumber?? ""),
+                ItemDetailViewCol(LocaleKeys.hospitalClinic.tr(),
+                    data.refundInvoiceList![0].hospitalClinic.toString() ?? ""),
+              ),
+              ItemDetailGrid(
+                ItemDetailViewCol(LocaleKeys.patientName.tr(),
+                    data.refundInvoiceList![0].patientName  ?? ""),
+                ItemDetailViewCol(
+                    LocaleKeys.amount.tr(), data.refundInvoiceList![0].amount.toString() ??
+                    "" ),
+              ),
+              ItemDetailGrid(
+                ItemDetailViewCol(LocaleKeys.invoiceDate.tr(),
+    DateUtil.formatDateToDate(
+    DateUtil.convertStringToDate( data.refundInvoiceList![0].invoicedDate), false)?? ""),
+                ItemDetailViewCol(  LocaleKeys.refundInvoice.tr(), data.refundInvoiceList![0].invoiceNumber ??
+                    "" ),
+              ),
+
+            ],
+          ).objectContainerView(),
+       ],
     );
   }
 }