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

Expenses

This commit is contained in:
Hillel Coren 2019-06-14 12:26:07 +03:00
parent 4ad28040c7
commit 1fe33ed0f9
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ui/invoice/view/invoice_view.dart
View File

@ -15,6 +15,7 @@ import 'package:invoiceninja_flutter/ui/app/icon_message.dart';
import 'package:invoiceninja_flutter/ui/app/invoice/invoice_item_view.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/invoice_item_view.dart';
import 'package:invoiceninja_flutter/ui/app/two_value_header.dart'; import 'package:invoiceninja_flutter/ui/app/two_value_header.dart';
import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart';
import 'package:invoiceninja_flutter/utils/icons.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
class InvoiceView extends StatefulWidget { class InvoiceView extends StatefulWidget {
@ -102,7 +103,7 @@ class _InvoiceViewState extends State<InvoiceView> {
color: Theme.of(context).canvasColor, color: Theme.of(context).canvasColor,
child: ListTile( child: ListTile(
title: Text(client?.displayName ?? ''), title: Text(client?.displayName ?? ''),
leading: Icon(FontAwesomeIcons.users, size: 18.0), leading: Icon(getEntityIcon(EntityType.client), size: 18.0),
trailing: Icon(Icons.navigate_next), trailing: Icon(Icons.navigate_next),
onTap: () => viewModel.onClientPressed(context), onTap: () => viewModel.onClientPressed(context),
onLongPress: () => viewModel.onClientPressed(context, true), onLongPress: () => viewModel.onClientPressed(context, true),

8
lib/ui/payment/view/payment_view.dart
View File

@ -102,8 +102,8 @@ class _PaymentViewState extends State<PaymentView> {
title: Text(client.displayName ?? ''), title: Text(client.displayName ?? ''),
leading: Icon(FontAwesomeIcons.users, size: 18.0), leading: Icon(FontAwesomeIcons.users, size: 18.0),
trailing: Icon(Icons.navigate_next), trailing: Icon(Icons.navigate_next),
onTap: () => viewModel.onTapClient(context), onTap: () => viewModel.onClientPressed(context),
onLongPress: () => viewModel.onTapClient(context, true), onLongPress: () => viewModel.onClientPressed(context, true),
), ),
), ),
Container( Container(
@ -116,8 +116,8 @@ class _PaymentViewState extends State<PaymentView> {
title: Text('${localization.invoice} ${invoice.invoiceNumber}'), title: Text('${localization.invoice} ${invoice.invoiceNumber}'),
leading: Icon(FontAwesomeIcons.filePdf, size: 18.0), leading: Icon(FontAwesomeIcons.filePdf, size: 18.0),
trailing: Icon(Icons.navigate_next), trailing: Icon(Icons.navigate_next),
onTap: () => viewModel.onTapInvoice(context), onTap: () => viewModel.onInvoicePressed(context),
onLongPress: () => viewModel.onTapInvoice(context, true), onLongPress: () => viewModel.onInvoicePressed(context, true),
), ),
), ),
Container( Container(

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

@ -39,8 +39,8 @@ class PaymentViewVM {
@required this.company, @required this.company,
@required this.onActionSelected, @required this.onActionSelected,
@required this.onEditPressed, @required this.onEditPressed,
@required this.onTapClient, @required this.onClientPressed,
@required this.onTapInvoice, @required this.onInvoicePressed,
@required this.isSaving, @required this.isSaving,
@required this.isLoading, @required this.isLoading,
@required this.isDirty, @required this.isDirty,
@ -61,11 +61,11 @@ class PaymentViewVM {
onEditPressed: (BuildContext context) { onEditPressed: (BuildContext context) {
store.dispatch(EditPayment(payment: payment, context: context)); store.dispatch(EditPayment(payment: payment, context: context));
}, },
onTapClient: (context, [bool longPress = false]) => store.dispatch( onClientPressed: (context, [bool longPress = false]) => store.dispatch(
longPress longPress
? EditClient(client: client, context: context) ? EditClient(client: client, context: context)
: ViewClient(clientId: client.id, context: context)), : ViewClient(clientId: client.id, context: context)),
onTapInvoice: (context, [bool longPress = false]) => store.dispatch( onInvoicePressed: (context, [bool longPress = false]) => store.dispatch(
longPress longPress
? EditInvoice( ? EditInvoice(
invoice: state.invoiceState.map[payment.invoiceId], invoice: state.invoiceState.map[payment.invoiceId],
@ -101,8 +101,8 @@ class PaymentViewVM {
final CompanyEntity company; final CompanyEntity company;
final Function(BuildContext, EntityAction) onActionSelected; final Function(BuildContext, EntityAction) onActionSelected;
final Function(BuildContext) onEditPressed; final Function(BuildContext) onEditPressed;
final Function(BuildContext, [bool]) onTapInvoice; final Function(BuildContext, [bool]) onInvoicePressed;
final Function(BuildContext, [bool]) onTapClient; final Function(BuildContext, [bool]) onClientPressed;
final bool isSaving; final bool isSaving;
final bool isLoading; final bool isLoading;
final bool isDirty; final bool isDirty;