Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

updates

Browse Source
dev_3.3_AmbulanceRequestCR
haroon amjad 12 months ago
parent dd0099236d
commit 7c426b90e5
8 changed files with 100 additions and 81 deletions
Show Stats Download Patch File Download Diff File

6
lib/config/config.dart
Unescape Escape View File

@ -20,8 +20,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/'; // var BASE_URL = 'http://10.50.100.198:2018/';
// var BASE_URL = 'https://uat.hmgwebservices.com/'; var BASE_URL = 'https://uat.hmgwebservices.com/';
var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
@ -337,7 +337,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
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 = 11.0; var VERSION_ID = 11.1;
var SETUP_ID = '91877'; var SETUP_ID = '91877';
var LANGUAGE = 2; var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0; // var PATIENT_OUT_SA = 0;

54
lib/pages/BookAppointment/BookSuccess.dart
Unescape Escape View File

@ -239,30 +239,36 @@ class _BookSuccessState extends State<BookSuccess> {
), ),
], ],
), ),
mHeight(10.0), widget.isCash
Text( ? Column(
TranslationBase.of(context).cashAmountUpdateInsurance, children: [
style: TextStyle( mHeight(10.0),
fontSize: 14.0, Text(
fontWeight: FontWeight.w600, TranslationBase.of(context).cashAmountUpdateInsurance,
color: Color(0xff2E303A), style: TextStyle(
), fontSize: 14.0,
), fontWeight: FontWeight.w600,
mHeight(5.0), color: Color(0xff2E303A),
DefaultButton( ),
TranslationBase.of(context).updateInsuranceText, ),
() { mHeight(5.0),
Navigator.pop(context, null); DefaultButton(
Navigator.pushAndRemoveUntil( TranslationBase.of(context).updateInsuranceText,
context, () {
MaterialPageRoute(builder: (context) => LandingPage()), Navigator.pop(context, null);
(Route<dynamic> route) => false, Navigator.pushAndRemoveUntil(
); context,
Navigator.push(context, FadePage(page: InsuranceUpdate())); MaterialPageRoute(builder: (context) => LandingPage()),
}, (Route<dynamic> route) => false,
color: Color(0xff313A43), );
textColor: Colors.white, Navigator.push(context, FadePage(page: InsuranceUpdate()));
), },
color: Color(0xffEAA118),
textColor: Colors.white,
),
],
)
: Container(),
], ],
), ),
), ),

2
lib/pages/ToDoList/widgets/paymentDialog.dart
Unescape Escape View File

@ -139,7 +139,7 @@ class _PaymentDialogState extends State<PaymentDialog> {
); );
Navigator.push(context, FadePage(page: InsuranceUpdate())); Navigator.push(context, FadePage(page: InsuranceUpdate()));
}, },
color: Color(0xff313A43), color: Color(0xffEAA118),
textColor: Colors.white, textColor: Colors.white,
), ),
], ],

49
lib/pages/insurance/AttachInsuranceCardImageDialog.dart
Unescape Escape View File

@ -133,31 +133,32 @@ class _AttachInsuranceCardImageDialogState extends State<AttachInsuranceCardImag
Padding( Padding(
padding: const EdgeInsets.all(18.0), padding: const EdgeInsets.all(18.0),
child: child:
Text(TranslationBase.of(context).habibCallCenter, // Text(TranslationBase.of(context).habibCallCenter,
style: TextStyle( // style: TextStyle(
fontSize: 16, // fontSize: 16,
letterSpacing: -0.48, // letterSpacing: -0.48,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
), // ),
),
// DefaultButton(
// TranslationBase.of(context).updateInsuranceManually,
// () {
// Navigator.pop(context);
// Navigator.push(
// context,
// FadePage(
// page: UpdateInsuranceManually(
// patientIdentificationNo: widget.identificationNo,
// patientMobileNumber: widget.mobileNo,
// patientID: num.parse(widget.fileNo),
// ),
// ),
// );
// },
// textColor: Colors.white,
// color: CustomColors.accentColor,
// ), // ),
DefaultButton(
TranslationBase.of(context).updateInsuranceManually,
() {
Navigator.pop(context);
Navigator.push(
context,
FadePage(
page: UpdateInsuranceManually(
patientIdentificationNo: widget.identificationNo,
patientMobileNumber: widget.mobileNo,
patientID: num.parse(widget.fileNo),
),
),
);
},
textColor: Colors.white,
color: CustomColors.accentColor,
),
), ),
SizedBox( SizedBox(
height: 25.0, height: 25.0,

32
lib/pages/insurance/insurance_page.dart
Unescape Escape View File

@ -184,24 +184,24 @@ class InsurancePage extends StatelessWidget {
void updateManually(BuildContext context, String errorMsg, String patientIdentificationID, int patientID, String mobileNumber) { void updateManually(BuildContext context, String errorMsg, String patientIdentificationID, int patientID, String mobileNumber) {
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
confirmMessage: errorMsg + ". " + TranslationBase.of(context).habibCallCenter, // confirmMessage: errorMsg + ". " + TranslationBase.of(context).habibCallCenter,
okText: TranslationBase.of(context).ok, // okText: TranslationBase.of(context).ok,
cancelText: TranslationBase.of(context).cancel, // cancelText: TranslationBase.of(context).cancel,
// confirmMessage: errorMsg + ". " + TranslationBase.of(context).updateInsuranceManuallyDialog, confirmMessage: errorMsg + ". " + TranslationBase.of(context).updateInsuranceManuallyDialog,
// okText: TranslationBase.of(context).yes, okText: TranslationBase.of(context).yes,
// cancelText: TranslationBase.of(context).no, cancelText: TranslationBase.of(context).no,
okFunction: () => { okFunction: () => {
Navigator.pop(context), Navigator.pop(context),
// Navigator.push( Navigator.push(
// context, context,
// FadePage( FadePage(
// page: UpdateInsuranceManually( page: UpdateInsuranceManually(
// patientIdentificationNo: patientIdentificationID, patientIdentificationNo: patientIdentificationID,
// patientID: patientID, patientID: patientID,
// patientMobileNumber: mobileNumber, patientMobileNumber: mobileNumber,
// ), ),
// ), ),
// ), ),
}, },
cancelFunction: () => {}); cancelFunction: () => {});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);

8
lib/pages/login/register-info.dart
Unescape Escape View File

@ -730,7 +730,13 @@ class _RegisterInfo extends State<RegisterInfo> {
); );
Navigator.push(context, FadePage(page: InsuranceUpdate())); Navigator.push(context, FadePage(page: InsuranceUpdate()));
}, },
cancelFunction: () => {}); cancelFunction: () {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
);
});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
} }
}).catchError((err) { }).catchError((err) {

26
lib/pages/rateAppointment/rate_appointment_doctor.dart
Unescape Escape View File

@ -165,7 +165,7 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).later, TranslationBase.of(context).later,
() { () {
// if(widget.isFromRegistration) { if(widget.isFromRegistration) {
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
confirmMessage: TranslationBase.of(context).validInsurance, confirmMessage: TranslationBase.of(context).validInsurance,
@ -180,16 +180,22 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
); );
Navigator.push(context, FadePage(page: InsuranceUpdate())); Navigator.push(context, FadePage(page: InsuranceUpdate()));
}, },
cancelFunction: () => {}); cancelFunction: () {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
);
});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
// } else { } else {
// Navigator.pushReplacement( Navigator.pushReplacement(
// context, context,
// FadePage( FadePage(
// page: LandingPage(), page: LandingPage(),
// ), ),
// ); );
// } }
}, },
color: CustomColors.accentColor, color: CustomColors.accentColor,
textColor: Colors.white, textColor: Colors.white,

4
lib/widgets/in_app_browser/InAppBrowser.dart
Unescape Escape View File

@ -35,9 +35,9 @@ class MyInAppBrowser extends InAppBrowser {
// static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE
static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT
static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
// static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
// static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS

Write Preview
Loading…
Cancel
Save