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

Settings

This commit is contained in:
Hillel Coren 2019-11-07 12:54:10 +02:00
parent 6e43a8517d
commit f83b62d5e8
7 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/ui/app/invoice/tax_rate_dropdown.dart
View File

@ -1,19 +1,18 @@
import 'package:built_collection/built_collection.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.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/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart';
class TaxRateDropdown extends StatefulWidget { class TaxRateDropdown extends StatefulWidget {
const TaxRateDropdown({ const TaxRateDropdown({
@required this.taxRates,
@required this.labelText, @required this.labelText,
@required this.onSelected, @required this.onSelected,
this.initialTaxName = '', this.initialTaxName = '',
this.initialTaxRate = 0.0, this.initialTaxRate = 0.0,
}); });
final BuiltList<TaxRateEntity> taxRates;
final String labelText; final String labelText;
final Function(TaxRateEntity) onSelected; final Function(TaxRateEntity) onSelected;
final String initialTaxName; final String initialTaxName;
@ -29,18 +28,17 @@ class _TaxRateDropdownState extends State<TaxRateDropdown> {
@override @override
void didChangeDependencies() { void didChangeDependencies() {
final taxRates = widget.taxRates; final taxState = StoreProvider.of<AppState>(context).state.taxRateState;
final taxRates = taxState.list.map((id) => taxState.map[id]).toList();
_selectedTaxRate = taxRates.firstWhere( _selectedTaxRate = taxRates.firstWhere(
(taxRate) => (taxRate) =>
taxRate.name == widget.initialTaxName && taxRate.name == widget.initialTaxName &&
taxRate.rate == widget.initialTaxRate, taxRate.rate == widget.initialTaxRate,
orElse: () => orElse: () => TaxRateEntity(
TaxRateEntity( name: widget.initialTaxName, rate: widget.initialTaxRate));
name: widget.initialTaxName, rate: widget.initialTaxRate));
if (_selectedTaxRate.rate != 0) if (_selectedTaxRate.rate != 0) {
{
_textController.text = _formatTaxRate(_selectedTaxRate); _textController.text = _formatTaxRate(_selectedTaxRate);
} }
@ -54,13 +52,13 @@ class _TaxRateDropdownState extends State<TaxRateDropdown> {
} }
String _formatTaxRate(TaxRateEntity taxRate) { String _formatTaxRate(TaxRateEntity taxRate) {
return '${formatNumber(taxRate.rate, context, return '${formatNumber(taxRate.rate, context, formatNumberType: FormatNumberType.percent)} ${taxRate.name}';
formatNumberType: FormatNumberType.percent)} ${taxRate.name}';
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final taxRates = widget.taxRates; final taxState = StoreProvider.of<AppState>(context).state.taxRateState;
final taxRates = taxState.list.map((id) => taxState.map[id]).toList();
if (taxRates.isEmpty) { if (taxRates.isEmpty) {
return Container(); return Container();
@ -68,20 +66,19 @@ class _TaxRateDropdownState extends State<TaxRateDropdown> {
final options = taxRates final options = taxRates
.where((taxRate) => taxRate.archivedAt == null) .where((taxRate) => taxRate.archivedAt == null)
.map((taxRate) => .map((taxRate) => PopupMenuItem<TaxRateEntity>(
PopupMenuItem<TaxRateEntity>( value: taxRate,
value: taxRate, child: Row(
child: Row( children: <Widget>[
children: <Widget>[ SizedBox(
SizedBox( width: 70.0,
width: 70.0, child: Text(formatNumber(taxRate.rate, context,
child: Text(formatNumber(taxRate.rate, context, formatNumberType: FormatNumberType.percent)),
formatNumberType: FormatNumberType.percent)), ),
Text(taxRate.name),
],
), ),
Text(taxRate.name), ))
],
),
))
.toList(); .toList();
options.insert( options.insert(

2
lib/ui/company_gateway/edit/company_gateway_edit.dart
View File

@ -644,7 +644,6 @@ class _FeesEditorState extends State<FeesEditor> {
), ),
if (company.settings.enableFirstItemTaxRate) if (company.settings.enableFirstItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onChanged(companyGateway.rebuild((b) => b viewModel.onChanged(companyGateway.rebuild((b) => b
..taxRate1 = taxRate.rate ..taxRate1 = taxRate.rate
@ -655,7 +654,6 @@ class _FeesEditorState extends State<FeesEditor> {
), ),
if (company.settings.enableSecondItemTaxRate) if (company.settings.enableSecondItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onChanged(companyGateway.rebuild((b) => b viewModel.onChanged(companyGateway.rebuild((b) => b
..taxRate2 = taxRate.rate ..taxRate2 = taxRate.rate

2
lib/ui/expense/edit/expense_edit_settings.dart
View File

@ -114,7 +114,6 @@ class ExpenseEditSettingsState extends State<ExpenseEditSettings> {
children: <Widget>[ children: <Widget>[
if (company.settings.enableFirstItemTaxRate) if (company.settings.enableFirstItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onChanged(expense.rebuild((b) => b viewModel.onChanged(expense.rebuild((b) => b
..taxRate1 = taxRate.rate ..taxRate1 = taxRate.rate
@ -125,7 +124,6 @@ class ExpenseEditSettingsState extends State<ExpenseEditSettings> {
), ),
if (company.settings.enableSecondItemTaxRate) if (company.settings.enableSecondItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onChanged(expense.rebuild((b) => b viewModel.onChanged(expense.rebuild((b) => b
..taxRate2 = taxRate.rate ..taxRate2 = taxRate.rate

2
lib/ui/invoice/edit/invoice_edit_details.dart
View File

@ -278,7 +278,6 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
: Container(), : Container(),
if (company.settings.enableFirstInvoiceTaxRate) if (company.settings.enableFirstInvoiceTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onChanged(invoice.applyTax(taxRate)), viewModel.onChanged(invoice.applyTax(taxRate)),
labelText: localization.tax, labelText: localization.tax,
@ -287,7 +286,6 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
), ),
if (company.settings.enableSecondInvoiceTaxRate) if (company.settings.enableSecondInvoiceTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => viewModel onSelected: (taxRate) => viewModel
.onChanged(invoice.applyTax(taxRate, isSecond: true)), .onChanged(invoice.applyTax(taxRate, isSecond: true)),
labelText: localization.tax, labelText: localization.tax,

2
lib/ui/invoice/edit/invoice_edit_items.dart
View File

@ -257,7 +257,6 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
: Container(), : Container(),
if (company.settings.enableFirstItemTaxRate) if (company.settings.enableFirstItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) { onSelected: (taxRate) {
_taxRate1 = taxRate; _taxRate1 = taxRate;
_onChanged(); _onChanged();
@ -268,7 +267,6 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
), ),
if (company.settings.enableSecondItemTaxRate) if (company.settings.enableSecondItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) { onSelected: (taxRate) {
_taxRate2 = taxRate; _taxRate2 = taxRate;
_onChanged(); _onChanged();

2
lib/ui/product/edit/product_edit.dart
View File

@ -210,7 +210,6 @@ class _ProductEditState extends State<ProductEdit> {
), ),
if (company.settings.enableFirstItemTaxRate) if (company.settings.enableFirstItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onChanged(product.rebuild((b) => b viewModel.onChanged(product.rebuild((b) => b
..taxRate1 = taxRate.rate ..taxRate1 = taxRate.rate
@ -221,7 +220,6 @@ class _ProductEditState extends State<ProductEdit> {
), ),
if (company.settings.enableSecondItemTaxRate) if (company.settings.enableSecondItemTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onChanged(product.rebuild((b) => b viewModel.onChanged(product.rebuild((b) => b
..taxRate2 = taxRate.rate ..taxRate2 = taxRate.rate

7
lib/ui/settings/tax_settings.dart
View File

@ -30,7 +30,6 @@ class _TaxSettingsState extends State<TaxSettings> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final viewModel = widget.viewModel; final viewModel = widget.viewModel;
final company = viewModel.company;
final settings = viewModel.settings; final settings = viewModel.settings;
final state = viewModel.state; final state = viewModel.state;
@ -54,6 +53,7 @@ class _TaxSettingsState extends State<TaxSettings> {
onChanged: (value) => viewModel.onSettingsChanged( onChanged: (value) => viewModel.onSettingsChanged(
settings.rebuild((b) => b..numberOfItemTaxRates = value)), settings.rebuild((b) => b..numberOfItemTaxRates = value)),
), ),
SizedBox(height: 15),
BoolDropdownButton( BoolDropdownButton(
iconData: FontAwesomeIcons.percent, iconData: FontAwesomeIcons.percent,
label: localization.inclusiveTaxes, label: localization.inclusiveTaxes,
@ -64,11 +64,10 @@ class _TaxSettingsState extends State<TaxSettings> {
], ],
), ),
if (settings.enableFirstInvoiceTaxRate && if (settings.enableFirstInvoiceTaxRate &&
state.taskState.list.isNotEmpty) state.taxRateState.list.isNotEmpty)
FormCard( FormCard(
children: <Widget>[ children: <Widget>[
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onSettingsChanged(settings.rebuild((b) => b viewModel.onSettingsChanged(settings.rebuild((b) => b
..defaultTaxName1 = taxRate.name ..defaultTaxName1 = taxRate.name
@ -79,7 +78,6 @@ class _TaxSettingsState extends State<TaxSettings> {
), ),
if (settings.enableSecondInvoiceTaxRate) if (settings.enableSecondInvoiceTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onSettingsChanged(settings.rebuild((b) => b viewModel.onSettingsChanged(settings.rebuild((b) => b
..defaultTaxName2 = taxRate.name ..defaultTaxName2 = taxRate.name
@ -90,7 +88,6 @@ class _TaxSettingsState extends State<TaxSettings> {
), ),
if (settings.enableThirdInvoiceTaxRate) if (settings.enableThirdInvoiceTaxRate)
TaxRateDropdown( TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => onSelected: (taxRate) =>
viewModel.onSettingsChanged(settings.rebuild((b) => b viewModel.onSettingsChanged(settings.rebuild((b) => b
..defaultTaxName3 = taxRate.name ..defaultTaxName3 = taxRate.name