Lakum fixes

merge-update-with-lab-changes
haroon amjad 4 years ago
parent ed65b38dd9
commit 7ffc467552

@ -2,35 +2,35 @@ import 'PointsAmountPerYear.dart';
import 'PointsDetails.dart'; import 'PointsDetails.dart';
class LakumInquiryInformationObjVersion { class LakumInquiryInformationObjVersion {
int accountNumber; num accountNumber;
String accountStatus; String accountStatus;
String barCode; String barCode;
int consumedPoints; num consumedPoints;
String consumedPointsAmount; String consumedPointsAmount;
List<PointsAmountPerYear> consumedPointsAmountPerYear; List<PointsAmountPerYear> consumedPointsAmountPerYear;
List<PointsDetails> consumedPointsDetails; List<PointsDetails> consumedPointsDetails;
String createdDate; String createdDate;
int expiredPoints; num expiredPoints;
String expiryDate; String expiryDate;
int gainedPoints; num gainedPoints;
List<PointsAmountPerYear> gainedPointsAmountPerYear; List<PointsAmountPerYear> gainedPointsAmountPerYear;
List<PointsDetails> gainedPointsDetails; List<PointsDetails> gainedPointsDetails;
String lakumMessageStatus; String lakumMessageStatus;
String memberName; String memberName;
String memberUniversalId; String memberUniversalId;
String mobileNumber; String mobileNumber;
int pointsBalance; num pointsBalance;
int pointsBalanceAmount; num pointsBalanceAmount;
int pointsWillBeExpired; num pointsWillBeExpired;
String prefLang; String prefLang;
int statusCode; num statusCode;
int transferPoints; num transferPoints;
List<PointsAmountPerYear> transferPointsAmountPerYear; List<PointsAmountPerYear> transferPointsAmountPerYear;
List<PointsDetails> transferPointsDetails; List<PointsDetails> transferPointsDetails;
dynamic waitingPoints; dynamic waitingPoints;
dynamic loyalityAmount; dynamic loyalityAmount;
dynamic loyalityPoints; dynamic loyalityPoints;
int purchaseRate; num purchaseRate;
LakumInquiryInformationObjVersion( LakumInquiryInformationObjVersion(
{this.accountNumber, {this.accountNumber,

@ -1,10 +1,10 @@
import 'PointsAmountPerMonth.dart'; import 'PointsAmountPerMonth.dart';
class PointsAmountPerYear { class PointsAmountPerYear {
int amountPerYear; num amountPerYear;
List<PointsAmountPerMonth> pointsAmountPerMonth; List<PointsAmountPerMonth> pointsAmountPerMonth;
int pointsPerYear; num pointsPerYear;
int year; num year;
PointsAmountPerYear( PointsAmountPerYear(
{this.amountPerYear, {this.amountPerYear,

@ -11,7 +11,7 @@ class PaymentCheckoutData {
LacumAccountInformation lacumInformation; LacumAccountInformation lacumInformation;
bool cartDataVisible; bool cartDataVisible;
ShippingOption shippingOption; ShippingOption shippingOption;
int usedLakumPoints; num usedLakumPoints;
PaymentCheckoutData({this.address, this.paymentOption, this.lacumInformation, this.cartDataVisible = false, this.shippingOption, this.usedLakumPoints = 0}); PaymentCheckoutData({this.address, this.paymentOption, this.lacumInformation, this.cartDataVisible = false, this.shippingOption, this.usedLakumPoints = 0});

@ -271,7 +271,6 @@ class _PrescriptionDetailsPageState extends State<PrescriptionDetailsPage> {
}); });
}); });
}); });
print("Has Reminder: " + hasReminder.toString());
} }
cancelReminders() async { cancelReminders() async {

@ -1,24 +1,7 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/payment-checkout-data.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/payment_bottom_widget.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/payment-method-select-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/widgets/ProductOrderPreviewItem.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -37,6 +20,7 @@ class _LakumWidgetState extends State<LakumWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectProvider = Provider.of(context); ProjectViewModel projectProvider = Provider.of(context);
_pointsController.text = widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount.toString();
return Container( return Container(
color: Colors.white, color: Colors.white,
@ -80,74 +64,39 @@ class _LakumWidgetState extends State<LakumWidget> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
Container( Container(
margin: projectProvider.isArabic margin: projectProvider.isArabic ? EdgeInsets.only(right: 4) : EdgeInsets.only(left: 4),
? EdgeInsets.only(right: 4)
: EdgeInsets.only(left: 4),
width: 60, width: 60,
height: 50, height: 50,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide: borderSide: BorderSide(color: Colors.black, width: 0.2),
BorderSide(color: Colors.black, width: 0.2),
gapPadding: 0, gapPadding: 0,
borderRadius: projectProvider.isArabic borderRadius: projectProvider.isArabic
? BorderRadius.only( ? BorderRadius.only(topRight: Radius.circular(8), bottomRight: Radius.circular(8))
topRight: Radius.circular(8), : BorderRadius.only(topLeft: Radius.circular(8), bottomLeft: Radius.circular(8)),
bottomRight: Radius.circular(8))
: BorderRadius.only(
topLeft: Radius.circular(8),
bottomLeft: Radius.circular(8)),
), ),
disabledBorder: OutlineInputBorder( disabledBorder: OutlineInputBorder(
borderSide: borderSide: BorderSide(color: Colors.black, width: 0.4),
BorderSide(color: Colors.black, width: 0.4),
gapPadding: 0, gapPadding: 0,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(topLeft: Radius.circular(8), bottomLeft: Radius.circular(8)),
topLeft: Radius.circular(8),
bottomLeft: Radius.circular(8)),
), ),
), ),
controller: _pointsController, controller: _pointsController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: widget color: widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount > 0 ? Colors.black : Colors.grey,
.model
.paymentCheckoutData
.lacumInformation
.lakumInquiryInformationObjVersion
.pointsBalanceAmount >
0
? Colors.black
: Colors.grey,
), ),
enabled: widget enabled: widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount == 0 ? false : true,
.model
.paymentCheckoutData
.lacumInformation
.lakumInquiryInformationObjVersion
.pointsBalanceAmount ==
0
? false
: true,
onChanged: (val) { onChanged: (val) {
var value = int.tryParse(val); var value = int.tryParse(val);
if (value != null && if (value != null && value <= widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount) {
value <= widget.model.paymentCheckoutData.usedLakumPoints = value;
widget
.model
.paymentCheckoutData
.lacumInformation
.lakumInquiryInformationObjVersion
.pointsBalanceAmount) {
widget.model.paymentCheckoutData.usedLakumPoints =
value;
} else { } else {
widget.model.paymentCheckoutData.usedLakumPoints = 0; widget.model.paymentCheckoutData.usedLakumPoints = 0;
} }
_pointsController.text = _pointsController.text = "${widget.model.paymentCheckoutData.usedLakumPoints}";
"${widget.model.paymentCheckoutData.usedLakumPoints}";
}, },
), ),
), ),
@ -158,12 +107,8 @@ class _LakumWidgetState extends State<LakumWidget> {
color: Color(0xff3666E0), color: Color(0xff3666E0),
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
borderRadius: projectProvider.isArabic borderRadius: projectProvider.isArabic
? BorderRadius.only( ? BorderRadius.only(topLeft: Radius.circular(6), bottomLeft: Radius.circular(6))
topLeft: Radius.circular(6), : BorderRadius.only(topRight: Radius.circular(6), bottomRight: Radius.circular(6)),
bottomLeft: Radius.circular(6))
: BorderRadius.only(
topRight: Radius.circular(6),
bottomRight: Radius.circular(6)),
border: Border.fromBorderSide(BorderSide( border: Border.fromBorderSide(BorderSide(
color: Color(0xff3666E0), color: Color(0xff3666E0),
width: 0.8, width: 0.8,

@ -370,8 +370,8 @@ class LacumPointsWidget extends StatelessWidget {
final MediaQueryData mediaQuery; final MediaQueryData mediaQuery;
final int pointType; // 1. balance, 2. gained, 3. consume, 4. transfer final int pointType; // 1. balance, 2. gained, 3. consume, 4. transfer
final String title; final String title;
final int riyal; final num riyal;
final int point; final num point;
Color titleColor; Color titleColor;
final List<PointsAmountPerYear> pointsAmountPerYear; final List<PointsAmountPerYear> pointsAmountPerYear;

Loading…
Cancel
Save