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

Update labels

This commit is contained in:
Hillel Coren 2018-09-27 19:11:40 +03:00
parent b39b9aeafe
commit d9e390508d
19 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,7 +359,7 @@ abstract class ClientEntity extends Object
final actions = <EntityAction>[]; final actions = <EntityAction>[];
if (includeCreate && user.canCreate(EntityType.client) && isActive) { if (includeCreate && user.canCreate(EntityType.client) && isActive) {
actions.add(EntityAction.invoice); actions.add(EntityAction.newInvoice);
} }
if (actions.isNotEmpty) { if (actions.isNotEmpty) {

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

@ -390,14 +390,14 @@ abstract class InvoiceEntity extends Object
} }
if (user.canEditEntity(this) && client.hasEmailAddress) { if (user.canEditEntity(this) && client.hasEmailAddress) {
actions.add(EntityAction.email); actions.add(EntityAction.sendEmail);
} }
if (user.canEditEntity(this) && if (user.canEditEntity(this) &&
user.canCreate(EntityType.payment) && user.canCreate(EntityType.payment) &&
isUnpaid && isUnpaid &&
!isQuote) { !isQuote) {
actions.add(EntityAction.payment); actions.add(EntityAction.enterPayment);
} }
if (isQuote && quoteInvoiceId > 0) { if (isQuote && quoteInvoiceId > 0) {

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

@ -43,11 +43,11 @@ class EntityAction extends EnumClass {
static const EntityAction cloneToQuote = _$cloneToQuote; static const EntityAction cloneToQuote = _$cloneToQuote;
static const EntityAction convert = _$convert; static const EntityAction convert = _$convert;
static const EntityAction download = _$download; static const EntityAction download = _$download;
static const EntityAction email = _$email; static const EntityAction sendEmail = _$sendEmail;
static const EntityAction markSent = _$markSent; static const EntityAction markSent = _$markSent;
static const EntityAction invoice = _$invoice; static const EntityAction newInvoice = _$newInvoice;
static const EntityAction viewInvoice = _$viewInvoice; static const EntityAction viewInvoice = _$viewInvoice;
static const EntityAction payment = _$payment; static const EntityAction enterPayment = _$enterPayment;
static const EntityAction pdf = _$pdf; static const EntityAction pdf = _$pdf;
static const EntityAction more = _$more; static const EntityAction more = _$more;

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

@ -27,11 +27,11 @@ const EntityAction _$cloneToInvoice = const EntityAction._('cloneToInvoice');
const EntityAction _$cloneToQuote = const EntityAction._('cloneToQuote'); const EntityAction _$cloneToQuote = const EntityAction._('cloneToQuote');
const EntityAction _$convert = const EntityAction._('convert'); const EntityAction _$convert = const EntityAction._('convert');
const EntityAction _$download = const EntityAction._('download'); const EntityAction _$download = const EntityAction._('download');
const EntityAction _$email = const EntityAction._('email'); const EntityAction _$sendEmail = const EntityAction._('sendEmail');
const EntityAction _$markSent = const EntityAction._('markSent'); const EntityAction _$markSent = const EntityAction._('markSent');
const EntityAction _$invoice = const EntityAction._('invoice'); const EntityAction _$newInvoice = const EntityAction._('newInvoice');
const EntityAction _$viewInvoice = const EntityAction._('viewInvoice'); const EntityAction _$viewInvoice = const EntityAction._('viewInvoice');
const EntityAction _$payment = const EntityAction._('payment'); const EntityAction _$enterPayment = const EntityAction._('enterPayment');
const EntityAction _$pdf = const EntityAction._('pdf'); const EntityAction _$pdf = const EntityAction._('pdf');
const EntityAction _$more = const EntityAction._('more'); const EntityAction _$more = const EntityAction._('more');
@ -53,16 +53,16 @@ EntityAction _$valueOf(String name) {
return _$convert; return _$convert;
case 'download': case 'download':
return _$download; return _$download;
case 'email': case 'sendEmail':
return _$email; return _$sendEmail;
case 'markSent': case 'markSent':
return _$markSent; return _$markSent;
case 'invoice': case 'newInvoice':
return _$invoice; return _$newInvoice;
case 'viewInvoice': case 'viewInvoice':
return _$viewInvoice; return _$viewInvoice;
case 'payment': case 'enterPayment':
return _$payment; return _$enterPayment;
case 'pdf': case 'pdf':
return _$pdf; return _$pdf;
case 'more': case 'more':
@ -82,11 +82,11 @@ final BuiltSet<EntityAction> _$values =
_$cloneToQuote, _$cloneToQuote,
_$convert, _$convert,
_$download, _$download,
_$email, _$sendEmail,
_$markSent, _$markSent,
_$invoice, _$newInvoice,
_$viewInvoice, _$viewInvoice,
_$payment, _$enterPayment,
_$pdf, _$pdf,
_$more, _$more,
]); ]);

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

@ -179,7 +179,7 @@ abstract class PaymentEntity extends Object
final actions = <EntityAction>[]; final actions = <EntityAction>[];
if (user.canEditEntity(this) && client.hasEmailAddress) { if (user.canEditEntity(this) && client.hasEmailAddress) {
actions.add(EntityAction.email); actions.add(EntityAction.sendEmail);
} }
if (actions.isNotEmpty) { if (actions.isNotEmpty) {

4
lib/redux/auth/auth_middleware.dart
View File

@ -28,7 +28,7 @@ List<Middleware<AppState>> createStoreAuthMiddleware([
} }
void _saveAuthLocal(dynamic action) async { void _saveAuthLocal(dynamic action) async {
await FlutterKeychain.put(key: kKeychainEmail, value: action.email); await FlutterKeychain.put(key: kKeychainEmail, value: action.sendEmail);
if (formatApiUrlReadable(action.url) != kAppUrl) { if (formatApiUrlReadable(action.url) != kAppUrl) {
await FlutterKeychain.put( await FlutterKeychain.put(
@ -70,7 +70,7 @@ Middleware<AppState> _createLoginRequest(AuthRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) { return (Store<AppState> store, dynamic action, NextDispatcher next) {
repository repository
.login( .login(
email: action.email, email: action.sendEmail,
password: action.password, password: action.password,
url: action.url, url: action.url,
secret: action.secret, secret: action.secret,

4
lib/redux/invoice/invoice_middleware.dart
View File

@ -213,9 +213,9 @@ Middleware<AppState> _saveInvoice(InvoiceRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) { return (Store<AppState> store, dynamic action, NextDispatcher next) {
repository repository
.saveData( .saveData(
store.state.selectedCompany, store.state.authState, action.invoice) store.state.selectedCompany, store.state.authState, action.newInvoice)
.then((InvoiceEntity invoice) { .then((InvoiceEntity invoice) {
if (action.invoice.isNew) { if (action.newInvoice.isNew) {
store.dispatch(AddInvoiceSuccess(invoice)); store.dispatch(AddInvoiceSuccess(invoice));
} else { } else {
store.dispatch(SaveInvoiceSuccess(invoice)); store.dispatch(SaveInvoiceSuccess(invoice));

8
lib/redux/invoice/invoice_reducer.dart
View File

@ -38,9 +38,9 @@ Reducer<int> selectedIdReducer = combineReducers([
TypedReducer<int, ViewInvoice>( TypedReducer<int, ViewInvoice>(
(int selectedId, dynamic action) => action.invoiceId), (int selectedId, dynamic action) => action.invoiceId),
TypedReducer<int, AddInvoiceSuccess>( TypedReducer<int, AddInvoiceSuccess>(
(int selectedId, dynamic action) => action.invoice.id), (int selectedId, dynamic action) => action.newInvoice.id),
TypedReducer<int, ShowEmailInvoice>( TypedReducer<int, ShowEmailInvoice>(
(int selectedId, dynamic action) => action.invoice.id), (int selectedId, dynamic action) => action.newInvoice.id),
]); ]);
final editingReducer = combineReducers<InvoiceEntity>([ final editingReducer = combineReducers<InvoiceEntity>([
@ -63,7 +63,7 @@ InvoiceEntity _clearEditing(InvoiceEntity client, dynamic action) {
} }
InvoiceEntity _updateEditing(InvoiceEntity invoice, dynamic action) { InvoiceEntity _updateEditing(InvoiceEntity invoice, dynamic action) {
return action.invoice; return action.newInvoice;
} }
InvoiceEntity _addInvoiceItem(InvoiceEntity invoice, AddInvoiceItem action) { InvoiceEntity _addInvoiceItem(InvoiceEntity invoice, AddInvoiceItem action) {
@ -254,7 +254,7 @@ InvoiceState _convertQuoteSuccess(
InvoiceState _updateInvoice(InvoiceState invoiceState, dynamic action) { InvoiceState _updateInvoice(InvoiceState invoiceState, dynamic action) {
return invoiceState return invoiceState
.rebuild((b) => b..map[action.invoice.id] = action.invoice); .rebuild((b) => b..map[action.newInvoice.id] = action.newInvoice);
} }
InvoiceState _setLoadedInvoices( InvoiceState _setLoadedInvoices(

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

@ -148,13 +148,13 @@ Middleware<AppState> _restorePayment(PaymentRepository repository) {
Middleware<AppState> _savePayment(PaymentRepository repository) { Middleware<AppState> _savePayment(PaymentRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) { return (Store<AppState> store, dynamic action, NextDispatcher next) {
final PaymentEntity payment = action.payment; final PaymentEntity payment = action.enterPayment;
final bool sendEmail = payment.isNew ? store.state.uiState.emailPayment : false; final bool sendEmail = payment.isNew ? store.state.uiState.emailPayment : false;
repository repository
.saveData( .saveData(
store.state.selectedCompany, store.state.authState, action.payment, sendEmail: sendEmail) store.state.selectedCompany, store.state.authState, action.enterPayment, sendEmail: sendEmail)
.then((PaymentEntity payment) { .then((PaymentEntity payment) {
if (action.payment.isNew) { if (action.enterPayment.isNew) {
store.dispatch(AddPaymentSuccess(payment)); store.dispatch(AddPaymentSuccess(payment));
} else { } else {
store.dispatch(SavePaymentSuccess(payment)); store.dispatch(SavePaymentSuccess(payment));
@ -175,7 +175,7 @@ Middleware<AppState> _emailPayment(PaymentRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) { return (Store<AppState> store, dynamic action, NextDispatcher next) {
repository repository
.saveData( .saveData(
store.state.selectedCompany, store.state.authState, action.payment, sendEmail: true) store.state.selectedCompany, store.state.authState, action.enterPayment, sendEmail: true)
.then((PaymentEntity payment) { .then((PaymentEntity payment) {
store.dispatch(SavePaymentSuccess(payment)); store.dispatch(SavePaymentSuccess(payment));
action.completer.complete(null); action.completer.complete(null);

4
lib/redux/payment/payment_reducer.dart
View File

@ -17,7 +17,7 @@ Reducer<int> selectedIdReducer = combineReducers([
TypedReducer<int, ViewPayment>( TypedReducer<int, ViewPayment>(
(int selectedId, dynamic action) => action.paymentId), (int selectedId, dynamic action) => action.paymentId),
TypedReducer<int, AddPaymentSuccess>( TypedReducer<int, AddPaymentSuccess>(
(int selectedId, dynamic action) => action.payment.id), (int selectedId, dynamic action) => action.enterPayment.id),
]); ]);
final editingReducer = combineReducers<PaymentEntity>([ final editingReducer = combineReducers<PaymentEntity>([
@ -36,7 +36,7 @@ PaymentEntity _clearEditing(PaymentEntity payment, SelectCompany action) {
} }
PaymentEntity _updateEditing(PaymentEntity payment, dynamic action) { PaymentEntity _updateEditing(PaymentEntity payment, dynamic action) {
return action.payment; return action.enterPayment;
} }
final paymentListReducer = combineReducers<ListUIState>([ final paymentListReducer = combineReducers<ListUIState>([

4
lib/ui/client/client_list.dart
View File

@ -50,7 +50,7 @@ class ClientList extends StatelessWidget {
if (user.canCreate(EntityType.invoice)) { if (user.canCreate(EntityType.invoice)) {
actions.add(EntityActionListTile( actions.add(EntityActionListTile(
client: client, client: client,
entityAction: EntityAction.invoice, entityAction: EntityAction.newInvoice,
mainContext: context, mainContext: context,
viewModel: viewModel, viewModel: viewModel,
)); ));
@ -58,7 +58,7 @@ class ClientList extends StatelessWidget {
if (user.canCreate(EntityType.payment)) { if (user.canCreate(EntityType.payment)) {
actions.add(EntityActionListTile( actions.add(EntityActionListTile(
client: client, client: client,
entityAction: EntityAction.payment, entityAction: EntityAction.enterPayment,
mainContext: context, mainContext: context,
viewModel: viewModel, viewModel: viewModel,
)); ));

4
lib/ui/client/client_list_vm.dart
View File

@ -82,12 +82,12 @@ class ClientListVM {
onEntityAction: (context, client, action) { onEntityAction: (context, client, action) {
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
switch (action) { switch (action) {
case EntityAction.invoice: case EntityAction.newInvoice:
store.dispatch(EditInvoice( store.dispatch(EditInvoice(
invoice: InvoiceEntity().rebuild((b) => b.clientId = client.id), invoice: InvoiceEntity().rebuild((b) => b.clientId = client.id),
context: context)); context: context));
break; break;
case EntityAction.payment: case EntityAction.enterPayment:
store.dispatch(EditPayment( store.dispatch(EditPayment(
payment: PaymentEntity(company: state.selectedCompany) payment: PaymentEntity(company: state.selectedCompany)
.rebuild((b) => b.clientId = client.id), .rebuild((b) => b.clientId = client.id),

4
lib/ui/invoice/invoice_list_vm.dart
View File

@ -146,7 +146,7 @@ class InvoiceListVM extends EntityListVM {
snackBarCompleter(context, localization.markedInvoiceAsSent), snackBarCompleter(context, localization.markedInvoiceAsSent),
invoice.id)); invoice.id));
break; break;
case EntityAction.email: case EntityAction.sendEmail:
store.dispatch(ShowEmailInvoice( store.dispatch(ShowEmailInvoice(
completer: completer:
snackBarCompleter(context, localization.emailedInvoice), snackBarCompleter(context, localization.emailedInvoice),
@ -161,7 +161,7 @@ class InvoiceListVM extends EntityListVM {
store.dispatch( store.dispatch(
EditQuote(context: context, quote: invoice.cloneToQuote)); EditQuote(context: context, quote: invoice.cloneToQuote));
break; break;
case EntityAction.payment: case EntityAction.enterPayment:
store.dispatch(EditPayment( store.dispatch(EditPayment(
context: context, context: context,
payment: invoice.createPayment(state.selectedCompany))); payment: invoice.createPayment(state.selectedCompany)));

6
lib/ui/invoice/view/invoice_view_vm.dart
View File

@ -71,7 +71,7 @@ class EntityViewVM {
bool operator ==(dynamic other) => bool operator ==(dynamic other) =>
client == other.client && client == other.client &&
company == other.company && company == other.company &&
invoice == other.invoice && invoice == other.newInvoice &&
isSaving == other.isSaving && isSaving == other.isSaving &&
isDirty == other.isDirty; isDirty == other.isDirty;
@ -170,7 +170,7 @@ class InvoiceViewVM extends EntityViewVM {
snackBarCompleter(context, localization.markedInvoiceAsSent), snackBarCompleter(context, localization.markedInvoiceAsSent),
invoice.id)); invoice.id));
break; break;
case EntityAction.email: case EntityAction.sendEmail:
store.dispatch(ShowEmailInvoice( store.dispatch(ShowEmailInvoice(
completer: completer:
snackBarCompleter(context, localization.emailedInvoice), snackBarCompleter(context, localization.emailedInvoice),
@ -202,7 +202,7 @@ class InvoiceViewVM extends EntityViewVM {
store.dispatch( store.dispatch(
EditQuote(context: context, quote: invoice.cloneToQuote)); EditQuote(context: context, quote: invoice.cloneToQuote));
break; break;
case EntityAction.payment: case EntityAction.enterPayment:
store.dispatch(EditPayment( store.dispatch(EditPayment(
context: context, context: context,
payment: invoice.createPayment(state.selectedCompany))); payment: invoice.createPayment(state.selectedCompany)));

2
lib/ui/payment/payment_list_vm.dart
View File

@ -95,7 +95,7 @@ class PaymentListVM {
onEntityAction: (context, payment, action) { onEntityAction: (context, payment, action) {
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
switch (action) { switch (action) {
case EntityAction.email: case EntityAction.sendEmail:
store.dispatch(EmailPaymentRequest( store.dispatch(EmailPaymentRequest(
snackBarCompleter(context, localization.emailedPayment), snackBarCompleter(context, localization.emailedPayment),
payment)); payment));

2
lib/ui/payment/view/payment_view_vm.dart
View File

@ -77,7 +77,7 @@ class PaymentViewVM {
onActionSelected: (BuildContext context, EntityAction action) { onActionSelected: (BuildContext context, EntityAction action) {
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
switch (action) { switch (action) {
case EntityAction.email: case EntityAction.sendEmail:
store.dispatch(EmailPaymentRequest( store.dispatch(EmailPaymentRequest(
popCompleter( popCompleter(
context, localization.emailedPayment), context, localization.emailedPayment),

2
lib/ui/quote/quote_list_vm.dart
View File

@ -119,7 +119,7 @@ class QuoteListVM extends EntityListVM {
snackBarCompleter(context, localization.markedQuoteAsSent), snackBarCompleter(context, localization.markedQuoteAsSent),
quote.id)); quote.id));
break; break;
case EntityAction.email: case EntityAction.sendEmail:
store.dispatch(ShowEmailQuote( store.dispatch(ShowEmailQuote(
completer: snackBarCompleter(context, localization.emailedQuote), completer: snackBarCompleter(context, localization.emailedQuote),
quote: quote, quote: quote,

2
lib/ui/quote/view/quote_view_vm.dart
View File

@ -130,7 +130,7 @@ class QuoteViewVM extends EntityViewVM {
snackBarCompleter(context, localization.markedQuoteAsSent), snackBarCompleter(context, localization.markedQuoteAsSent),
quote.id)); quote.id));
break; break;
case EntityAction.email: case EntityAction.sendEmail:
store.dispatch(ShowEmailQuote( store.dispatch(ShowEmailQuote(
completer: completer:
snackBarCompleter(context, localization.emailedQuote), snackBarCompleter(context, localization.emailedQuote),

6
lib/utils/icons.dart
View File

@ -12,7 +12,7 @@ IconData getEntityActionIcon(EntityAction entityAction) {
return Icons.control_point_duplicate; return Icons.control_point_duplicate;
case EntityAction.markSent: case EntityAction.markSent:
return Icons.publish; return Icons.publish;
case EntityAction.email: case EntityAction.sendEmail:
return Icons.send; return Icons.send;
case EntityAction.archive: case EntityAction.archive:
return Icons.archive; return Icons.archive;
@ -24,8 +24,8 @@ IconData getEntityActionIcon(EntityAction entityAction) {
return Icons.check_box; return Icons.check_box;
case EntityAction.viewInvoice: case EntityAction.viewInvoice:
return Icons.insert_drive_file; return Icons.insert_drive_file;
case EntityAction.invoice: case EntityAction.newInvoice:
case EntityAction.payment: case EntityAction.enterPayment:
return Icons.add_circle_outline; return Icons.add_circle_outline;
default: default:
return null; return null;