Updates & fixes

lib/config/config.dart

@@ -15,8 +15,8 @@ const PACKAGES_CUSTOMER = '/api/customers';
 const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
 const PACKAGES_ORDERS = '/api/orders';
 const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
- const BASE_URL = 'https://uat.hmgwebservices.com/';
+ // const BASE_URL = 'https://uat.hmgwebservices.com/';
-// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
 
 // Pharmacy UAT URLs
 //  const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@@ -600,7 +600,6 @@ const GET_PATIENT_ALL_PRES_ORD =
     'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
 const PATIENT_ER_INSERT_PRES_ORDER =
     'Services/Patients.svc/REST/PatientER_InsertPresOrder';
-const PHARMACY_MAKE_REVIEW = 'epharmacy/api/insertreviews';
 const BLOOD_DONATION_REGISTER_BLOOD_TYPE =
     'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
 const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION =
@@ -639,6 +638,7 @@ const GET_PRODUCT_DETAIL = "products/";
 const GET_LOCATION = "Services/Patients.svc/REST/GetPharmcyListBySKU";
 const GET_SPECIFICATION = "productspecification/";
 const GET_BRAND_ITEMS = "products";
+const PHARMACY_MAKE_REVIEW = 'insertreviews';
 
 // External API
 const ADD_ADDRESS_INFO = "addcustomeraddress";

lib/config/localized_values.dart

@@ -1746,4 +1746,5 @@ const Map localizedValues = {
 
   "yourTurn": {"en": "your turn is after", "ar": "دورك بعد"},
   "patients": {"en": "patients", "ar": "مرضي"},
+  "group": {"en": "Group", "ar": "مجموعة"},
 };

lib/pages/BookAppointment/DoctorProfile.dart

@@ -148,13 +148,12 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
                 onTap: (index) {
                   setState(() {
                     if (index == 1) {
-                      if (widget.doctor.clinicID == 17 || widget.doctor.clinicID == 23 || widget.doctor.clinicID == 47 || widget.isLiveCareAppointment) {
+                      // if (widget.doctor.clinicID == 17 || widget.doctor.clinicID == 23 || widget.doctor.clinicID == 47 || widget.isLiveCareAppointment) {
-                        _tabController.index = _tabController.previousIndex;
+                      //   _tabController.index = _tabController.previousIndex;
                         showFooterButton = false;
                       } else {
                         showFooterButton = true;
                       }
-                    }
                     print(showFooterButton);
                   });
                 },

lib/pages/BookAppointment/SearchResults.dart

@@ -52,7 +52,7 @@ class _SearchResultsState extends State<SearchResults> {
                   //widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList[_index].speciality = null;
                   return DoctorView(
                     doctor: widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList[_index],
-                    isLiveCareAppointment: widget.isLiveCareAppointment,
+                    isLiveCareAppointment: widget.isLiveCareAppointment ?? widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList[_index].isLiveCare,
                   );
                 },
                 separatorBuilder: (context, index) => SizedBox(height: 14),

lib/pages/BookAppointment/components/DocAvailableAppointments.dart

@@ -238,6 +238,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
     });
     openTimeSlotsPickerForDate(DateUtil.convertStringToDate(selectedDateJSON), docFreeSlots);
     _calendarController.selectedDate = DateUtil.convertStringToDate(selectedDateJSON);
+    _calendarController.displayDate = _calendarController.selectedDate;
     return _eventsParsed;
   }
 

lib/pages/landing/landing_page_pharmcy.dart

@@ -76,7 +76,7 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
           children: [
             PharmacyPage(),
             PharmacyCategorisePage(),
-            PharmacyProfilePage(moveToOrder: false),
+            PharmacyProfilePage(moveToOrder: false, changeTab: changeCurrentTab),
             CartOrderPage(changeTab: changeCurrentTab),
           ],
         ),

lib/pages/pharmacy/order/ProductReview.dart

@@ -333,7 +333,7 @@ class _ProductReviewPageState extends State<ProductReviewPage> {
               Navigator.push(
                 context,
                 MaterialPageRoute(builder: (context) {
-                  return PharmacyProfilePage();
+                  return PharmacyProfilePage(moveToOrder: true);
                 }),
               );
             },

lib/pages/pharmacy/profile/profile.dart

@@ -30,8 +30,9 @@ dynamic languageID;
 
 class PharmacyProfilePage extends StatefulWidget {
   final bool moveToOrder;
+  final Function(int) changeTab;
 
-  PharmacyProfilePage({@required this.moveToOrder});
+  PharmacyProfilePage({@required this.moveToOrder, this.changeTab});
 
   @override
   _ProfilePageState createState() => _ProfilePageState();
@@ -114,6 +115,9 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
         showPharmacyCart: false,
         showHomeAppBarIcon: false,
         isMainPharmacyPages: true,
+        backButtonTab: () {
+          widget.changeTab(0);
+        },
         body: user != null
             ? Container(
                 color: Colors.white,

lib/services/pharmacy_services/orderDetails_service.dart

@@ -58,7 +58,7 @@ class OrderDetailsService extends BaseService{
     reviewBody["store_id"] = 2;
     reviewBody["title"] = "";
     body['review'] = reviewBody;
-    await baseAppClient.post("$PHARMACY_MAKE_REVIEW",
+    await baseAppClient.postPharmacy("$PHARMACY_MAKE_REVIEW",
         onSuccess: (response, statusCode) async {
           /*
           "success": {

lib/uitl/translations_delegate_base.dart

@@ -2818,6 +2818,7 @@ class TranslationBase {
   String get requestedDateLiveCare => localizedValues["requestedDateLiveCare"][locale.languageCode];
   String get yourTurn => localizedValues["yourTurn"][locale.languageCode];
   String get patients => localizedValues["patients"][locale.languageCode];
+  String get group => localizedValues["group"][locale.languageCode];
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {