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

Clean up code

This commit is contained in:
Hillel Coren 2023-04-18 15:43:52 +03:00
parent 158d2b5d35
commit 3d1aea4b3b
8 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/money.dart'; import 'package:invoiceninja_flutter/utils/money.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:invoiceninja_flutter/utils/strings.dart'; import 'package:invoiceninja_flutter/utils/strings.dart';
part 'invoice_model.g.dart'; part 'invoice_model.g.dart';
@ -1030,10 +1029,8 @@ abstract class InvoiceEntity extends Object
actions.add(EntityAction.stop); actions.add(EntityAction.stop);
} }
if (supportsLatestFeatures()) { actions.add(EntityAction.updatePrices);
actions.add(EntityAction.updatePrices); actions.add(EntityAction.increasePrices);
actions.add(EntityAction.increasePrices);
}
} else { } else {
if (!isCancelledOrReversed) { if (!isCancelledOrReversed) {
if (multiselect) { if (multiselect) {
@ -1041,9 +1038,7 @@ abstract class InvoiceEntity extends Object
} else { } else {
actions.add(EntityAction.sendEmail); actions.add(EntityAction.sendEmail);
if (isUnpaid) { if (isUnpaid) {
if (supportsLatestFeatures()) { actions.add(EntityAction.schedule);
actions.add(EntityAction.schedule);
}
} }
} }
} }

3
lib/data/repositories/credit_repository.dart
View File

@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart';
import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/data/web_client.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:invoiceninja_flutter/utils/serialization.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart';
class CreditRepository { class CreditRepository {
@ -121,7 +120,7 @@ class CreditRepository {
'template': 'email_template_$template', 'template': 'email_template_$template',
'body': body, 'body': body,
'subject': subject, 'subject': subject,
if (supportsLatestFeatures()) 'cc_email': ccEmail, 'cc_email': ccEmail,
}; };
final dynamic response = await webClient.post( final dynamic response = await webClient.post(

3
lib/data/repositories/invoice_repository.dart
View File

@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart';
import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/data/web_client.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:invoiceninja_flutter/utils/serialization.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart';
class InvoiceRepository { class InvoiceRepository {
@ -135,7 +134,7 @@ class InvoiceRepository {
'template': 'email_template_$template', 'template': 'email_template_$template',
'body': body, 'body': body,
'subject': subject, 'subject': subject,
if (supportsLatestFeatures()) 'cc_email': ccEmail, 'cc_email': ccEmail,
}; };
final dynamic response = await webClient.post( final dynamic response = await webClient.post(

3
lib/data/repositories/purchase_order_repository.dart
View File

@ -7,7 +7,6 @@ import 'package:invoiceninja_flutter/data/models/serializers.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/data/web_client.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class PurchaseOrderRepository { class PurchaseOrderRepository {
const PurchaseOrderRepository({ const PurchaseOrderRepository({
@ -129,7 +128,7 @@ class PurchaseOrderRepository {
'template': 'email_template_$template', 'template': 'email_template_$template',
'body': body, 'body': body,
'subject': subject, 'subject': subject,
if (supportsLatestFeatures()) 'cc_email': ccEmail, 'cc_email': ccEmail,
}; };
final dynamic response = await webClient.post( final dynamic response = await webClient.post(

3
lib/data/repositories/quote_repository.dart
View File

@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart';
import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/data/web_client.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:invoiceninja_flutter/utils/serialization.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart';
class QuoteRepository { class QuoteRepository {
@ -132,7 +131,7 @@ class QuoteRepository {
'template': 'email_template_$template', 'template': 'email_template_$template',
'body': body, 'body': body,
'subject': subject, 'subject': subject,
if (supportsLatestFeatures()) 'cc_email': ccEmail, 'cc_email': ccEmail,
}; };
final dynamic response = await webClient.post( final dynamic response = await webClient.post(

25
lib/ui/settings/invoice_design.dart
View File

@ -1071,19 +1071,18 @@ class _InvoiceDesignState extends State<InvoiceDesign>
), ),
), ),
), ),
if (supportsLatestFeatures()) FormCard(
FormCard( isLast: true,
isLast: true, child: SwitchListTile(
child: SwitchListTile( title: Text(localization.shareInvoiceQuoteColumns),
title: Text(localization.shareInvoiceQuoteColumns), value: settings.shareInvoiceQuoteColumns ?? true,
value: settings.shareInvoiceQuoteColumns ?? true, activeColor: Theme.of(context).colorScheme.secondary,
activeColor: Theme.of(context).colorScheme.secondary, onChanged: (value) {
onChanged: (value) { viewModel.onSettingsChanged(settings.rebuild(
viewModel.onSettingsChanged(settings.rebuild( (b) => b..shareInvoiceQuoteColumns = value));
(b) => b..shareInvoiceQuoteColumns = value)); },
}, ),
), )
)
], ],
), ),
if (settings.shareInvoiceQuoteColumns == false) if (settings.shareInvoiceQuoteColumns == false)

16
lib/ui/settings/payment_settings.dart
View File

@ -18,7 +18,6 @@ import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
import 'package:invoiceninja_flutter/ui/settings/payment_settings_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/payment_settings_vm.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class PaymentSettings extends StatefulWidget { class PaymentSettings extends StatefulWidget {
const PaymentSettings({ const PaymentSettings({
@ -247,14 +246,13 @@ class _PaymentSettingsState extends State<PaymentSettings> {
decimal: true, signed: true), decimal: true, signed: true),
), ),
), ),
if (supportsLatestFeatures()) BoolDropdownButton(
BoolDropdownButton( label: localization.clientInitiatedPayments,
label: localization.clientInitiatedPayments, value: settings.clientInitiatedPayments,
value: settings.clientInitiatedPayments, helpLabel: localization.clientInitiatedPaymentsHelp,
helpLabel: localization.clientInitiatedPaymentsHelp, onChanged: (value) => viewModel.onSettingsChanged(
onChanged: (value) => viewModel.onSettingsChanged(settings settings.rebuild((b) => b..clientInitiatedPayments = value)),
.rebuild((b) => b..clientInitiatedPayments = value)), ),
),
if (settings.clientInitiatedPayments == true) if (settings.clientInitiatedPayments == true)
Padding( Padding(
padding: const EdgeInsets.only(top: 16), padding: const EdgeInsets.only(top: 16),

37
lib/ui/settings/task_settings.dart
View File

@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/ui/settings/task_settings_vm.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/icons.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';
class TaskSettings extends StatefulWidget { class TaskSettings extends StatefulWidget {
const TaskSettings({ const TaskSettings({
@ -124,25 +123,23 @@ class _TaskSettingsState extends State<TaskSettings> {
onChanged: (value) => viewModel.onCompanyChanged( onChanged: (value) => viewModel.onCompanyChanged(
company.rebuild((b) => b..showTaskEndDate = value)), company.rebuild((b) => b..showTaskEndDate = value)),
), ),
if (supportsLatestFeatures()) ...[ SwitchListTile(
SwitchListTile( activeColor: Theme.of(context).colorScheme.secondary,
activeColor: Theme.of(context).colorScheme.secondary, title: Text(localization.showTaskItemDescription),
title: Text(localization.showTaskItemDescription), value: settings.showTaskItemDescription,
value: settings.showTaskItemDescription, subtitle: Text(localization.showTaskItemDescriptionHelp),
subtitle: Text(localization.showTaskItemDescriptionHelp), onChanged: (value) => viewModel.onSettingsChanged(settings
onChanged: (value) => viewModel.onSettingsChanged(settings .rebuild((b) => b..showTaskItemDescription = value)),
.rebuild((b) => b..showTaskItemDescription = value)), ),
), SwitchListTile(
SwitchListTile( activeColor: Theme.of(context).colorScheme.secondary,
activeColor: Theme.of(context).colorScheme.secondary, title: Text(localization.allowBillableTaskItems),
title: Text(localization.allowBillableTaskItems), value: settings.allowBillableTaskItems,
value: settings.allowBillableTaskItems, subtitle: Text(localization.allowBillableTaskItemsHelp),
subtitle: Text(localization.allowBillableTaskItemsHelp), onChanged: (value) => viewModel.onSettingsChanged(
onChanged: (value) => viewModel.onSettingsChanged(settings settings.rebuild((b) => b..allowBillableTaskItems = value)),
.rebuild((b) => b..allowBillableTaskItems = value)), ),
), ],
],
]
]), ]),
if (!viewModel.state.settingsUIState.isFiltered) if (!viewModel.state.settingsUIState.isFiltered)
Padding( Padding(