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

Task and decimal fixes

This commit is contained in:
Hillel Coren 2019-03-28 12:49:30 -04:00
parent 6d7c653486
commit 8cf3005d13
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/client/edit/client_edit_settings.dart
View File

@ -138,7 +138,7 @@ class ClientEditSettingsState extends State<ClientEditSettings> {
), ),
TextFormField( TextFormField(
controller: _taskRateController, controller: _taskRateController,
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.taskRate, labelText: localization.taskRate,
), ),

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

@ -193,7 +193,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.partialDeposit, labelText: localization.partialDeposit,
), ),
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
), ),
invoice.partial != null && invoice.partial > 0 invoice.partial != null && invoice.partial > 0
? DatePicker( ? DatePicker(
@ -221,7 +221,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.discount, labelText: localization.discount,
), ),
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
), ),
), ),
const SizedBox( const SizedBox(
@ -274,7 +274,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
labelText: company labelText: company
.getCustomFieldLabel(CustomFieldType.surcharge1), .getCustomFieldLabel(CustomFieldType.surcharge1),
), ),
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
) )
: Container(), : Container(),
company.getCustomFieldLabel(CustomFieldType.surcharge2).isNotEmpty company.getCustomFieldLabel(CustomFieldType.surcharge2).isNotEmpty
@ -284,7 +284,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
labelText: company labelText: company
.getCustomFieldLabel(CustomFieldType.surcharge2), .getCustomFieldLabel(CustomFieldType.surcharge2),
), ),
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
) )
: Container(), : Container(),
company.enableInvoiceTaxes company.enableInvoiceTaxes

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

@ -237,7 +237,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
), ),
TextFormField( TextFormField(
controller: _costController, controller: _costController,
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.unitCost, labelText: localization.unitCost,
), ),
@ -245,7 +245,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
company.hasInvoiceField('quantity') company.hasInvoiceField('quantity')
? TextFormField( ? TextFormField(
controller: _qtyController, controller: _qtyController,
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.quantity, labelText: localization.quantity,
), ),
@ -254,7 +254,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
company.hasInvoiceField('discount') company.hasInvoiceField('discount')
? TextFormField( ? TextFormField(
controller: _discountController, controller: _discountController,
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.discount, labelText: localization.discount,
), ),

2
lib/ui/payment/edit/payment_edit.dart
View File

@ -178,7 +178,7 @@ class _PaymentEditState extends State<PaymentEdit> {
? TextFormField( ? TextFormField(
controller: _amountController, controller: _amountController,
autocorrect: false, autocorrect: false,
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.amount, labelText: localization.amount,
), ),

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

@ -184,7 +184,7 @@ class _ProductEditState extends State<ProductEdit> {
TextFormField( TextFormField(
key: Key(ProductKeys.cost), key: Key(ProductKeys.cost),
controller: _costController, controller: _costController,
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.cost, labelText: localization.cost,
), ),

4
lib/ui/project/edit/project_edit.dart
View File

@ -186,14 +186,14 @@ class _ProjectEditState extends State<ProjectEdit> {
}, },
), ),
TextFormField( TextFormField(
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
controller: _hoursController, controller: _hoursController,
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.budgetedHours, labelText: localization.budgetedHours,
), ),
), ),
TextFormField( TextFormField(
keyboardType: TextInputType.number, keyboardType: TextInputType.numberWithOptions(decimal: true),
controller: _taskRateController, controller: _taskRateController,
decoration: InputDecoration( decoration: InputDecoration(
labelText: localization.taskRate, labelText: localization.taskRate,

2
lib/ui/task/view/task_view.dart
View File

@ -59,7 +59,7 @@ class _TaskViewState extends State<TaskView> {
// TODO Remove isNotEmpty check in v2 // TODO Remove isNotEmpty check in v2
if (company.taskStatusMap.isNotEmpty && (task.taskStatusId ?? 0) > 0) { if (company.taskStatusMap.isNotEmpty && (task.taskStatusId ?? 0) > 0) {
fields[localization.status] = fields[localization.status] =
company.taskStatusMap[task.taskStatusId].name ?? ''; company.taskStatusMap[task.taskStatusId]?.name ?? '';
} }
if (task.customValue1.isNotEmpty) { if (task.customValue1.isNotEmpty) {