diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7344fd3d..e9bc7171 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -174,20 +174,20 @@
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 1d29e155..7b816250 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/';
- // var BASE_URL = 'https://uat.hmgwebservices.com/';
-var BASE_URL = 'https://hmgwebservices.com/';
+ var BASE_URL = 'https://uat.hmgwebservices.com/';
+// var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'http://10.201.204.103/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
@@ -354,7 +354,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 18.4;
+var VERSION_ID = 18.5;
var SETUP_ID = '91877';
var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0;
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index d083c422..36afccdd 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -187,7 +187,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232
- // body['PatientID'] = 2007395; //4609100
+ // body['PatientID'] = 814121; //4609100
// body['TokenID'] = "@dm!n";
// Patient ID: 3027574
diff --git a/lib/core/service/medical/reports_service.dart b/lib/core/service/medical/reports_service.dart
index 46d2c23f..bd0b2027 100644
--- a/lib/core/service/medical/reports_service.dart
+++ b/lib/core/service/medical/reports_service.dart
@@ -195,6 +195,7 @@ class ReportsService extends BaseService {
body['ClinicName'] = clinicName;
body['ProjectID'] = projectID;
body['InvoiceNo'] = invoiceNo;
+ body['InvoiceNo_VP'] = invoiceNo;
body['PrintedByName'] = user.firstName! + " " + user.lastName!;
dynamic response;
diff --git a/lib/pages/medical/balance/my_balance_page.dart b/lib/pages/medical/balance/my_balance_page.dart
index dc664cf8..462c71c2 100644
--- a/lib/pages/medical/balance/my_balance_page.dart
+++ b/lib/pages/medical/balance/my_balance_page.dart
@@ -120,14 +120,16 @@ class MyBalancePage extends StatelessWidget {
),
),
mWidth(6),
- projectViewModel.isArabic
- ? SvgPicture.asset(
- "assets/images/new/Saudi_Riyal_Symbol.svg",
- width: 22,
- height: 22,
- color: Colors.white,
- )
- : Container(),
+ projectViewModel.user!.outSA == 1
+ ? Container()
+ : projectViewModel.isArabic
+ ? SvgPicture.asset(
+ "assets/images/new/Saudi_Riyal_Symbol.svg",
+ width: 22,
+ height: 22,
+ color: Colors.white,
+ )
+ : Container(),
],
),
Text(
@@ -199,7 +201,11 @@ class MyBalancePage extends StatelessWidget {
),
),
mWidth(6),
- projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
+ projectViewModel.user!.outSA == 1
+ ? Container()
+ : projectViewModel.isArabic
+ ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16)
+ : Container(),
],
),
],
diff --git a/lib/pages/medical/reports/report_list_widget.dart b/lib/pages/medical/reports/report_list_widget.dart
index 1f29c967..425e39ae 100644
--- a/lib/pages/medical/reports/report_list_widget.dart
+++ b/lib/pages/medical/reports/report_list_widget.dart
@@ -209,8 +209,15 @@ class ReportListWidget extends StatelessWidget {
GifLoaderDialogUtils.showMyDialog(AppGlobal.context);
ReportsService _reportsService = locator();
_reportsService
- .getMedicalReportPDF(report.projectName!, report.clinicDescription!, report.doctorName, DateUtil.convertDateToString(report.requestDate!), report.invoiceNo.toString(), report.projectID!,
- DateUtil.convertDateToString(report.requestDate!), report.setupId!)
+ .getMedicalReportPDF(
+ report.projectName!,
+ report.clinicDescription!,
+ report.doctorName,
+ DateUtil.convertDateToString(report.requestDate!),
+ (Utils.isVidaPlusProject(projectViewModel, report.projectID!) ? report.invoiceNo_VP.toString() : report.invoiceNo.toString()),
+ report.projectID!,
+ DateUtil.convertDateToString(report.requestDate!),
+ report.setupId!)
.then((value) async {
GifLoaderDialogUtils.hideDialog(AppGlobal.context);
String path = await _createFileFromString(value["MedicalReportBase64"], "pdf");
diff --git a/pubspec.yaml b/pubspec.yaml
index 979aecac..54cbd1ec 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: diplomaticquarterapp
description: A new Flutter application.
-version: 4.6.011+1
+version: 4.6.092+4050092
environment:
sdk: ">=3.0.0 <3.13.0"