pharmacy fixes

merge-requests/574/head
haroon amjad 4 years ago
parent 2ebff634c4
commit c05772c63a

@ -1,10 +1,10 @@
import 'PointsDetails.dart'; import 'PointsDetails.dart';
class PointsAmountPerday { class PointsAmountPerday {
double amountPerDay; num amountPerDay;
String day; String day;
List<PointsDetails> pointsDetails; List<PointsDetails> pointsDetails;
double pointsPerDay; num pointsPerDay;
String transationDate; String transationDate;
PointsAmountPerday( PointsAmountPerday(

@ -1,11 +1,11 @@
class PointsDetails { class PointsDetails {
int accNumber; int accNumber;
String accountStatus; String accountStatus;
double amount; num amount;
int lineItemNo; int lineItemNo;
String operationType; String operationType;
double points; num points;
double purchasePoints; num purchasePoints;
int subTransactionType; int subTransactionType;
String subTransactionTypeDescription; String subTransactionTypeDescription;
String transactionDate; String transactionDate;

@ -39,8 +39,12 @@ class LacumService extends BaseService{
super.error = ""; super.error = "";
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['IdentificationNo'] = user.patientIdentificationNo; // body['IdentificationNo'] = user.patientIdentificationNo;
body['AccountNumber'] = "${lacumInformation.yahalaAccountNo}"; // body['AccountNumber'] = "${lacumInformation.yahalaAccountNo}";
body['IdentificationNo'] = "2076117163";
body['AccountNumber'] = "2019000006";
body['IsDetailsRequired'] = true; body['IsDetailsRequired'] = true;
try { try {

@ -77,7 +77,6 @@ class PharmacyAddressesViewModel extends BaseViewModel {
await _pharmacyAddressService.addCustomerAddress(sendingAddress); await _pharmacyAddressService.addCustomerAddress(sendingAddress);
} else { } else {
await _pharmacyAddressService.editCustomerAddress(sendingAddress).then((value) async { await _pharmacyAddressService.editCustomerAddress(sendingAddress).then((value) async {
// await _pharmacyAddressService.getAddresses();
}); });
} }
@ -85,6 +84,8 @@ class PharmacyAddressesViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
await Future.delayed(Duration(milliseconds: 800));
getAddressesList();
} }
} }
@ -96,6 +97,8 @@ class PharmacyAddressesViewModel extends BaseViewModel {
setState(ViewState.Error); setState(ViewState.Error);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
await Future.delayed(Duration(milliseconds: 800));
getAddressesList();
} }
} }

@ -314,26 +314,24 @@ class _AddressItemWidgetState extends State<AddressItemWidget> {
textColor: Color(0x99FF0000), textColor: Color(0x99FF0000),
handler: () { handler: () {
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
// context: context, context: context,
title: TranslationBase.of(context).deleteAddress, title: TranslationBase.of(context).deleteAddress,
//"Are you sure want to delete",
confirmMessage: "${widget.address.address1} ${widget.address.address2}", confirmMessage: "${widget.address.address1} ${widget.address.address2}",
okText: TranslationBase.of(context).delete, okText: TranslationBase.of(context).delete,
cancelText: TranslationBase.of(context).cancel_nocaps, cancelText: TranslationBase.of(context).cancel_nocaps,
okFunction: () => { okFunction: () => {
widget.model.deleteAddresses(widget.address).then((_) { ConfirmDialog.closeAlertDialog(context),
ConfirmDialog.closeAlertDialog(context); setState(() {
AppToast.showErrorToast( widget.model.deleteAddresses(widget.address).then((_) {
message: TranslationBase.of(context).deletedAddress, AppToast.showSuccessToast(
// "Address has been deleted" message: TranslationBase.of(context).deletedAddress,
); );
}) // widget.model.getAddressesList();
});
}),
}, },
cancelFunction: () => {}); cancelFunction: () => {});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
setState(() {
widget.model.deleteAddresses(widget.address);
});
}, },
icon: Icon( icon: Icon(
Icons.delete, Icons.delete,

@ -104,7 +104,7 @@ class PharmacyAddressService extends BaseService {
response['customers'][0]['addresses'].forEach((item) { response['customers'][0]['addresses'].forEach((item) {
addresses.add(AddressInfo.fromJson(item)); addresses.add(AddressInfo.fromJson(item));
}); });
getAddresses(); // getAddresses();
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;

@ -1011,7 +1011,7 @@ class TranslationBase {
String get deleteAddress => localizedValues['deleteAddress'][locale.languageCode]; String get deleteAddress => localizedValues['deleteAddress'][locale.languageCode];
String get deletedAddress => localizedValues['deletedAddress'][locale.languageCode]; String get deletedAddress => localizedValues['deletedAddres'][locale.languageCode];
String get addNewAddress => localizedValues['addNewAddress'][locale.languageCode]; String get addNewAddress => localizedValues['addNewAddress'][locale.languageCode];

Loading…
Cancel
Save