Riyal symbol update & sent to stores VersionID 17.8

merge-update-with-lab-changes
haroon amjad 1 year ago
parent 0706d9f5f9
commit 7ed401fb1c

@ -353,7 +353,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal
var CHANNEL = 3; var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958'; var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20'; var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 17.7; var VERSION_ID = 17.8;
var SETUP_ID = '91877'; var SETUP_ID = '91877';
var LANGUAGE = 2; var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0; // var PATIENT_OUT_SA = 0;

@ -200,9 +200,11 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
Expanded( Expanded(
child: Row( child: Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
_getNormalText(value, isBold: isBold, isTotal: isTotal), _getNormalText(value, isBold: isBold, isTotal: isTotal),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
), ),

@ -1098,7 +1098,7 @@ class _BookSuccessState extends State<BookSuccess> {
padding: EdgeInsets.only(bottom: 10.0, left: 20, right: 20), padding: EdgeInsets.only(bottom: 10.0, left: 20, right: 20),
child: Row( child: Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16, color: Colors.white), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16, color: Colors.white),
mWidth(6), mWidth(6),
Text( Text(
text, text,
@ -1110,6 +1110,8 @@ class _BookSuccessState extends State<BookSuccess> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16, color: Colors.white) : Container(),
], ],
), ),
); );

@ -50,6 +50,7 @@ class _PickupLocationState extends State<PickupLocation> {
AppoitmentAllHistoryResultList? myAppointment; AppoitmentAllHistoryResultList? myAppointment;
HospitalsModel? _selectedHospital; HospitalsModel? _selectedHospital;
LocationDetails? _result; LocationDetails? _result;
LocationUtils? locationUtils; LocationUtils? locationUtils;
late ProjectViewModel projectViewModel; late ProjectViewModel projectViewModel;
@ -522,12 +523,16 @@ class _PickupLocationState extends State<PickupLocation> {
Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)), Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
Row( Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
(widget.patientER_RC.transportationDetails!.tripType == 1 ? ' ${widget.patientER_RC.patientERTransportationMethod!.priceTotal}' : ' ${(widget.patientER_RC.patientERTransportationMethod!.priceTotal * 2)}'), (widget.patientER_RC.transportationDetails!.tripType == 1
? ' ${widget.patientER_RC.patientERTransportationMethod!.priceTotal}'
: ' ${(widget.patientER_RC.patientERTransportationMethod!.priceTotal * 2)}'),
style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold), style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
], ],

@ -126,7 +126,7 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
flex: 1, flex: 1,
child: Row( child: Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
' ${widget.amRequestViewModel.amRequestModeList[index].priceTotal}', ' ${widget.amRequestViewModel.amRequestModeList[index].priceTotal}',
@ -136,6 +136,8 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
) )
@ -334,12 +336,14 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)), Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
Row( Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
(_way == Way.OneWay ? ' ${_erTransportationMethod.priceTotal}' : ' ${(_erTransportationMethod.priceTotal * 2)}'), (_way == Way.OneWay ? ' ${_erTransportationMethod.priceTotal}' : ' ${(_erTransportationMethod.priceTotal * 2)}'),
style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold), style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
], ],

@ -132,7 +132,7 @@ class _SummaryState extends State<Summary> {
Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)), Text(TranslationBase.of(context).patientShareTotalToDo, style: TextStyle(fontSize: 13.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
Row( Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
(widget.patientER_RC.transportationDetails!.tripType == 1 (widget.patientER_RC.transportationDetails!.tripType == 1
@ -140,6 +140,8 @@ class _SummaryState extends State<Summary> {
: ' ${(widget.patientER_RC.patientERTransportationMethod!.priceTotal * 2)}'), : ' ${(widget.patientER_RC.patientERTransportationMethod!.priceTotal * 2)}'),
style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold), style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
], ],

@ -279,8 +279,7 @@ class _EROnlineCheckInPaymentDetailsState extends State<EROnlineCheckInPaymentDe
width: MediaQuery.of(context).size.width * 0.75, width: MediaQuery.of(context).size.width * 0.75,
child: getPaymentMethods(), child: getPaymentMethods(),
), ),
_amountView(TranslationBase.of(context).patientShareTotalToDo, erOnlineCheckInPaymentDetailsResponse!.patientShareWithTax.toString(), _amountView(TranslationBase.of(context).patientShareTotalToDo, erOnlineCheckInPaymentDetailsResponse!.patientShareWithTax.toString(), isBold: true, isTotal: true),
isBold: true, isTotal: true),
SizedBox(height: 12), SizedBox(height: 12),
DefaultButton( DefaultButton(
TranslationBase.of(context).payNow.toUpperCase(), TranslationBase.of(context).payNow.toUpperCase(),
@ -601,9 +600,11 @@ class _EROnlineCheckInPaymentDetailsState extends State<EROnlineCheckInPaymentDe
Expanded( Expanded(
child: Row( child: Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
_getNormalText(value, isBold: isBold, isTotal: isTotal), _getNormalText(value, isBold: isBold, isTotal: isTotal),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
), ),

@ -13,10 +13,12 @@ import 'package:diplomaticquarterapp/uitl/app_toast.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.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/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -91,10 +93,18 @@ class RRTPlaceOrderPage extends StatelessWidget {
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Row(
children: [
projectViewModel!.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 18, height: 18),
mWidth(6),
Text( Text(
"${selectedProcedure.patientShareWithTax ?? '- - -'} ${localize.sar}", "${selectedProcedure.patientShareWithTax ?? '- - -'}",
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18), style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
), ),
mWidth(6),
projectViewModel!.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 18, height: 18) : Container(),
],
),
], ],
), ),
), ),
@ -213,8 +223,6 @@ class RRTPlaceOrderPage extends StatelessWidget {
Navigator.pop(_context); Navigator.pop(_context);
Navigator.pop(_context); Navigator.pop(_context);
gotoRRTRoot(); gotoRRTRoot();
}, },
); );
} }

@ -208,7 +208,7 @@ class RRTRequestPageState extends State<RRTRequestPage> {
Expanded( Expanded(
child: Row( child: Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 12, height: 12), projectViewModel!.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
amount, amount,
@ -218,6 +218,8 @@ class RRTRequestPageState extends State<RRTRequestPage> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
mWidth(6),
projectViewModel!.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
), ),
@ -242,7 +244,7 @@ class RRTRequestPageState extends State<RRTRequestPage> {
Expanded( Expanded(
child: Row( child: Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 12, height: 12), projectViewModel!.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
vat, vat,
@ -252,6 +254,8 @@ class RRTRequestPageState extends State<RRTRequestPage> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
mWidth(6),
projectViewModel!.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
), ),
@ -276,17 +280,14 @@ class RRTRequestPageState extends State<RRTRequestPage> {
Expanded( Expanded(
child: Row( child: Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 14, height: 14), projectViewModel!.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 14, height: 14),
mWidth(6), mWidth(6),
Text( Text(
total, total,
style: TextStyle( style: TextStyle(fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold, color: CustomColors.black),
fontSize: 14,
letterSpacing: -0.48,
fontWeight: FontWeight.bold,
color: CustomColors.black
),
), ),
mWidth(6),
projectViewModel!.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
), ),

@ -136,7 +136,7 @@ class _LiveCarePatmentPageState extends State<LiveCarePatmentPage> {
child: (widget.getERAppointmentFeesList.currency! == "ريال" || widget.getERAppointmentFeesList.currency! == "SAR") child: (widget.getERAppointmentFeesList.currency! == "ريال" || widget.getERAppointmentFeesList.currency! == "SAR")
? Row( ? Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
widget.getERAppointmentFeesList.amount!, widget.getERAppointmentFeesList.amount!,
@ -146,6 +146,8 @@ class _LiveCarePatmentPageState extends State<LiveCarePatmentPage> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
) )
: Text( : Text(
@ -179,7 +181,7 @@ class _LiveCarePatmentPageState extends State<LiveCarePatmentPage> {
child: (widget.getERAppointmentFeesList.currency! == "ريال" || widget.getERAppointmentFeesList.currency! == "SAR") child: (widget.getERAppointmentFeesList.currency! == "ريال" || widget.getERAppointmentFeesList.currency! == "SAR")
? Row( ? Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
widget.getERAppointmentFeesList.tax!, widget.getERAppointmentFeesList.tax!,
@ -189,6 +191,8 @@ class _LiveCarePatmentPageState extends State<LiveCarePatmentPage> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
) )
: Text( : Text(
@ -222,7 +226,7 @@ class _LiveCarePatmentPageState extends State<LiveCarePatmentPage> {
child: (widget.getERAppointmentFeesList.currency! == "ريال" || widget.getERAppointmentFeesList.currency! == "SAR") child: (widget.getERAppointmentFeesList.currency! == "ريال" || widget.getERAppointmentFeesList.currency! == "SAR")
? Row( ? Row(
children: [ children: [
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
mWidth(6), mWidth(6),
Text( Text(
widget.getERAppointmentFeesList.total!, widget.getERAppointmentFeesList.total!,
@ -232,6 +236,8 @@ class _LiveCarePatmentPageState extends State<LiveCarePatmentPage> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
) )
: Text( : Text(

@ -152,7 +152,7 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
), ),
Row( Row(
children: [ children: [
widget.advanceModel!.hospitalsModel!.projectOutSA! ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 20, height: 20), widget.advanceModel!.hospitalsModel!.projectOutSA! ? Container() : projectViewModel.isArabic ? Container() : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 20, height: 20),
mWidth(6), mWidth(6),
Text( Text(
widget.advanceModel!.hospitalsModel!.projectOutSA! ? '${widget.advanceModel!.amount} ' + TranslationBase.of(context).aed : '${widget.advanceModel!.amount}', widget.advanceModel!.hospitalsModel!.projectOutSA! ? '${widget.advanceModel!.amount} ' + TranslationBase.of(context).aed : '${widget.advanceModel!.amount}',
@ -163,6 +163,8 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
letterSpacing: -0.48, letterSpacing: -0.48,
), ),
), ),
mWidth(6),
widget.advanceModel!.hospitalsModel!.projectOutSA! ? Container() : projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 20, height: 20) : Container(),
], ],
) )
], ],

@ -99,6 +99,8 @@ class MyBalancePage extends StatelessWidget {
Row( Row(
children: [ children: [
projectViewModel.user!.outSA == 1 projectViewModel.user!.outSA == 1
? Container()
: projectViewModel.isArabic
? Container() ? Container()
: SvgPicture.asset( : SvgPicture.asset(
"assets/images/new/Saudi_Riyal_Symbol.svg", "assets/images/new/Saudi_Riyal_Symbol.svg",
@ -113,10 +115,19 @@ class MyBalancePage extends StatelessWidget {
fontSize: 24, fontSize: 24,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: -1.44, letterSpacing: -1.44,
height: 24 / 23, height: 24 / 21,
color: Colors.white, color: Colors.white,
), ),
), ),
mWidth(6),
projectViewModel.isArabic
? SvgPicture.asset(
"assets/images/new/Saudi_Riyal_Symbol.svg",
width: 22,
height: 22,
color: Colors.white,
)
: Container(),
], ],
), ),
Text( Text(
@ -174,11 +185,9 @@ class MyBalancePage extends StatelessWidget {
children: [ children: [
projectViewModel.user!.outSA == 1 projectViewModel.user!.outSA == 1
? Container() ? Container()
: Row( : projectViewModel.isArabic
children: [ ? Container()
SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16), : SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16),
],
),
mWidth(6), mWidth(6),
Text( Text(
amount.toStringAsFixed(2) + " " + (projectViewModel.user!.outSA == 1 ? TranslationBase.of(context).aed : ""), amount.toStringAsFixed(2) + " " + (projectViewModel.user!.outSA == 1 ? TranslationBase.of(context).aed : ""),
@ -189,6 +198,8 @@ class MyBalancePage extends StatelessWidget {
color: Color(0xff2E303A), color: Color(0xff2E303A),
), ),
), ),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
], ],
), ),
], ],

@ -1,7 +1,7 @@
name: diplomaticquarterapp name: diplomaticquarterapp
description: A new Flutter application. description: A new Flutter application.
version: 4.6.004+1 version: 4.6.005+1
environment: environment:
sdk: ">=3.0.0 <3.13.0" sdk: ">=3.0.0 <3.13.0"

Loading…
Cancel
Save