Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Incorrect Label bulk_email_payment under Payments contextual menu #336

This commit is contained in:
Hillel Coren 2021-09-22 10:18:38 +03:00
parent 888171d185
commit d577425b9d
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/data/models/models.dart
View File

@ -65,7 +65,7 @@ class EntityAction extends EnumClass {
static const EntityAction bulkEmailInvoice = _$bulkEmailInvoice; static const EntityAction bulkEmailInvoice = _$bulkEmailInvoice;
static const EntityAction bulkEmailQuote = _$bulkEmailQuote; static const EntityAction bulkEmailQuote = _$bulkEmailQuote;
static const EntityAction bulkEmailCredit = _$bulkEmailCredit; static const EntityAction bulkEmailCredit = _$bulkEmailCredit;
static const EntityAction bulkEmailPayment = _$bulkEmailPayment; static const EntityAction emailPayment = _$emailPayment;
static const EntityAction markSent = _$markSent; static const EntityAction markSent = _$markSent;
static const EntityAction markPaid = _$markPaid; static const EntityAction markPaid = _$markPaid;
static const EntityAction newClient = _$newClient; static const EntityAction newClient = _$newClient;

9
lib/data/models/models.g.dart
View File

@ -31,8 +31,7 @@ const EntityAction _$bulkEmailInvoice =
const EntityAction._('bulkEmailInvoice'); const EntityAction._('bulkEmailInvoice');
const EntityAction _$bulkEmailQuote = const EntityAction._('bulkEmailQuote'); const EntityAction _$bulkEmailQuote = const EntityAction._('bulkEmailQuote');
const EntityAction _$bulkEmailCredit = const EntityAction._('bulkEmailCredit'); const EntityAction _$bulkEmailCredit = const EntityAction._('bulkEmailCredit');
const EntityAction _$bulkEmailPayment = const EntityAction _$emailPayment = const EntityAction._('emailPayment');
const EntityAction._('bulkEmailPayment');
const EntityAction _$markSent = const EntityAction._('markSent'); const EntityAction _$markSent = const EntityAction._('markSent');
const EntityAction _$markPaid = const EntityAction._('markPaid'); const EntityAction _$markPaid = const EntityAction._('markPaid');
const EntityAction _$newClient = const EntityAction._('newClient'); const EntityAction _$newClient = const EntityAction._('newClient');
@ -114,8 +113,8 @@ EntityAction _$valueOf(String name) {
return _$bulkEmailQuote; return _$bulkEmailQuote;
case 'bulkEmailCredit': case 'bulkEmailCredit':
return _$bulkEmailCredit; return _$bulkEmailCredit;
case 'bulkEmailPayment': case 'emailPayment':
return _$bulkEmailPayment; return _$emailPayment;
case 'markSent': case 'markSent':
return _$markSent; return _$markSent;
case 'markPaid': case 'markPaid':
@ -205,7 +204,7 @@ final BuiltSet<EntityAction> _$values =
_$bulkEmailInvoice, _$bulkEmailInvoice,
_$bulkEmailQuote, _$bulkEmailQuote,
_$bulkEmailCredit, _$bulkEmailCredit,
_$bulkEmailPayment, _$emailPayment,
_$markSent, _$markSent,
_$markPaid, _$markPaid,
_$newClient, _$newClient,

4
lib/data/models/payment_model.dart
View File

@ -383,7 +383,7 @@ abstract class PaymentEntity extends Object
bool multiselect = false}) { bool multiselect = false}) {
final actions = <EntityAction>[]; final actions = <EntityAction>[];
if (!isDeleted && !multiselect) { if (!isDeleted) {
if (userCompany.canEditEntity(this)) { if (userCompany.canEditEntity(this)) {
if (!multiselect) { if (!multiselect) {
if (includeEdit) { if (includeEdit) {
@ -400,7 +400,7 @@ abstract class PaymentEntity extends Object
} }
if (client != null && client.hasEmailAddress) { if (client != null && client.hasEmailAddress) {
actions.add(EntityAction.bulkEmailPayment); actions.add(EntityAction.emailPayment);
} }
} }
} }

2
lib/redux/payment/payment_actions.dart
View File

@ -343,7 +343,7 @@ void handlePaymentAction(
)); ));
}); });
break; break;
case EntityAction.bulkEmailPayment: case EntityAction.emailPayment:
store.dispatch(EmailPaymentRequest( store.dispatch(EmailPaymentRequest(
snackBarCompleter<Null>(context, localization.emailedPayment), snackBarCompleter<Null>(context, localization.emailedPayment),
paymentIds)); paymentIds));

2
lib/redux/payment/payment_middleware.dart
View File

@ -252,7 +252,7 @@ Middleware<AppState> _emailPayment(PaymentRepository repository) {
final action = dynamicAction as EmailPaymentRequest; final action = dynamicAction as EmailPaymentRequest;
repository repository
.bulkAction(store.state.credentials, action.paymentIds, .bulkAction(store.state.credentials, action.paymentIds,
EntityAction.bulkEmailPayment) EntityAction.emailPayment)
.then((List<PaymentEntity> payments) { .then((List<PaymentEntity> payments) {
store.dispatch(EmailPaymentSuccess()); store.dispatch(EmailPaymentSuccess());
action.completer.complete(null); action.completer.complete(null);

2
lib/utils/icons.dart
View File

@ -25,13 +25,13 @@ IconData getEntityActionIcon(EntityAction entityAction) {
return Icons.public; return Icons.public;
case EntityAction.markPaid: case EntityAction.markPaid:
return Icons.payment; return Icons.payment;
case EntityAction.bulkEmailPayment:
case EntityAction.bulkEmailCredit: case EntityAction.bulkEmailCredit:
case EntityAction.bulkEmailInvoice: case EntityAction.bulkEmailInvoice:
case EntityAction.bulkEmailQuote: case EntityAction.bulkEmailQuote:
case EntityAction.emailQuote: case EntityAction.emailQuote:
case EntityAction.emailInvoice: case EntityAction.emailInvoice:
case EntityAction.emailCredit: case EntityAction.emailCredit:
case EntityAction.emailPayment:
case EntityAction.resendInvite: case EntityAction.resendInvite:
return Icons.send; return Icons.send;
case EntityAction.archive: case EntityAction.archive: