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

Payment terms

This commit is contained in:
Hillel Coren 2020-05-25 20:16:24 +03:00
parent b1aac6e1fb
commit f5dfea44ae
12 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/redux/app/app_state.dart
View File

@ -45,16 +45,11 @@ import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_vm.dart';
import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart';
import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart';
import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart';
// STARTER: import - do not remove comment // STARTER: import - do not remove comment
import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart';
import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart';
import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart';
import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart';
import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart';
import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_state.dart';
import 'package:invoiceninja_flutter/redux/user/user_state.dart'; import 'package:invoiceninja_flutter/redux/user/user_state.dart';
import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart';
import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart';

4
lib/redux/payment_term/payment_term_actions.dart
View File

@ -260,8 +260,8 @@ void handlePaymentTermAction(
} }
final store = StoreProvider.of<AppState>(context); final store = StoreProvider.of<AppState>(context);
final state = store.state; //final state = store.state;
final CompanyEntity company = state.company; //final CompanyEntity company = state.company;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final paymentTerm = paymentTerms.first as PaymentTermEntity; final paymentTerm = paymentTerms.first as PaymentTermEntity;
final paymentTermIds = final paymentTermIds =

3
lib/ui/payment_term/edit/payment_term_edit.dart
View File

@ -35,7 +35,7 @@ class _PaymentTermEditState extends State<PaymentTermEdit> {
_controllers.forEach((controller) => controller.removeListener(_onChanged)); _controllers.forEach((controller) => controller.removeListener(_onChanged));
final paymentTerm = widget.viewModel.paymentTerm; //final paymentTerm = widget.viewModel.paymentTerm;
// STARTER: read value - do not remove comment // STARTER: read value - do not remove comment
_controllers.forEach((controller) => controller.addListener(_onChanged)); _controllers.forEach((controller) => controller.addListener(_onChanged));
@ -68,7 +68,6 @@ class _PaymentTermEditState extends State<PaymentTermEdit> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final viewModel = widget.viewModel; final viewModel = widget.viewModel;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final paymentTerm = viewModel.paymentTerm;
return EditScaffold( return EditScaffold(
title: localization.editPaymentTerm, title: localization.editPaymentTerm,

1
lib/ui/payment_term/edit/payment_term_edit_vm.dart
View File

@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';

7
lib/ui/payment_term/payment_term_list.dart
View File

@ -1,18 +1,11 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/models/payment_term_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart';
import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart';
import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
import 'package:invoiceninja_flutter/ui/payment_term/payment_term_presenter.dart';
import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart';
import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_vm.dart';

4
lib/ui/payment_term/payment_term_list_item.dart
View File

@ -78,11 +78,11 @@ class PaymentTermListItem extends StatelessWidget {
Expanded( Expanded(
child: Text( child: Text(
paymentTerm.name, paymentTerm.name,
style: Theme.of(context).textTheme.title, style: Theme.of(context).textTheme.headline6,
), ),
), ),
Text(formatNumber(paymentTerm.listDisplayAmount, context), Text(formatNumber(paymentTerm.listDisplayAmount, context),
style: Theme.of(context).textTheme.title), style: Theme.of(context).textTheme.headline6),
], ],
), ),
), ),

1
lib/ui/payment_term/payment_term_list_vm.dart
View File

@ -4,7 +4,6 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'
import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart';
import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/ui/design/design_presenter.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';

6
lib/ui/payment_term/payment_term_presenter.dart
View File

@ -1,7 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
class PaymentTermPresenter extends EntityPresenter { class PaymentTermPresenter extends EntityPresenter {
@ -11,8 +9,8 @@ class PaymentTermPresenter extends EntityPresenter {
@override @override
Widget getField({String field, BuildContext context}) { Widget getField({String field, BuildContext context}) {
final state = StoreProvider.of<AppState>(context).state; //final state = StoreProvider.of<AppState>(context).state;
final paymentTerm = entity as InvoiceEntity; //final paymentTerm = entity as InvoiceEntity;
switch (field) { switch (field) {
} }

1
lib/ui/payment_term/payment_term_screen.dart
View File

@ -11,7 +11,6 @@ import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart';
import 'package:invoiceninja_flutter/ui/app/forms/save_cancel_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/forms/save_cancel_buttons.dart';
import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart';
import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/list_filter.dart';
import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_vm.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart';

2
lib/ui/payment_term/view/payment_term_view.dart
View File

@ -19,7 +19,7 @@ class _PaymentTermViewState extends State<PaymentTermView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final viewModel = widget.viewModel; final viewModel = widget.viewModel;
final userCompany = viewModel.state.userCompany; //final userCompany = viewModel.state.userCompany;
final paymentTerm = viewModel.paymentTerm; final paymentTerm = viewModel.paymentTerm;
return ViewScaffold( return ViewScaffold(

1
lib/ui/settings/device_settings_list.dart
View File

@ -7,7 +7,6 @@ import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
import 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart';
import 'package:invoiceninja_flutter/utils/icons.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart';

4
stubs/ui/stub/stub_list_item
View File

@ -75,11 +75,11 @@ class StubListItem extends StatelessWidget {
Expanded( Expanded(
child: Text( child: Text(
stub.name, stub.name,
style: Theme.of(context).textTheme.title, style: Theme.of(context).textTheme.headline6,
), ),
), ),
Text(formatNumber(stub.listDisplayAmount, context), Text(formatNumber(stub.listDisplayAmount, context),
style: Theme.of(context).textTheme.title), style: Theme.of(context).textTheme.headline6),
], ],
), ),
), ),