diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart index ad0caac49..4c2e72dab 100644 --- a/lib/data/models/client_model.dart +++ b/lib/data/models/client_model.dart @@ -315,7 +315,7 @@ abstract class ClientEntity extends Object @BuiltValueField(wireName: 'is_tax_exempt') bool get isTaxExempt; - @BuiltValueField(wireName: 'tax_data_temp') + @BuiltValueField(wireName: 'tax_info') TaxDataEntity get taxData; BuiltList get contacts; diff --git a/lib/data/models/client_model.g.dart b/lib/data/models/client_model.g.dart index 5a389bb3b..d0653a973 100644 --- a/lib/data/models/client_model.g.dart +++ b/lib/data/models/client_model.g.dart @@ -221,7 +221,7 @@ class _$ClientEntitySerializer implements StructuredSerializer { 'is_tax_exempt', serializers.serialize(object.isTaxExempt, specifiedType: const FullType(bool)), - 'tax_data_temp', + 'tax_info', serializers.serialize(object.taxData, specifiedType: const FullType(TaxDataEntity)), 'contacts', @@ -461,7 +461,7 @@ class _$ClientEntitySerializer implements StructuredSerializer { result.isTaxExempt = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; break; - case 'tax_data_temp': + case 'tax_info': result.taxData.replace(serializers.deserialize(value, specifiedType: const FullType(TaxDataEntity)) as TaxDataEntity); break; diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index c64c6a7cf..e3dc26aa7 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -628,7 +628,7 @@ abstract class InvoiceEntity extends Object @BuiltValueField(serialize: false) bool get saveDefaultFooter; - @BuiltValueField(wireName: 'tax_data_temp') + @BuiltValueField(wireName: 'tax_info') TaxDataEntity get taxData; bool get isApproved { diff --git a/lib/data/models/invoice_model.g.dart b/lib/data/models/invoice_model.g.dart index fff7f7831..5c59e6c97 100644 --- a/lib/data/models/invoice_model.g.dart +++ b/lib/data/models/invoice_model.g.dart @@ -282,7 +282,7 @@ class _$InvoiceEntitySerializer implements StructuredSerializer { serializers.serialize(object.activities, specifiedType: const FullType( BuiltList, const [const FullType(ActivityEntity)])), - 'tax_data_temp', + 'tax_info', serializers.serialize(object.taxData, specifiedType: const FullType(TaxDataEntity)), 'created_at', @@ -711,7 +711,7 @@ class _$InvoiceEntitySerializer implements StructuredSerializer { BuiltList, const [const FullType(ActivityEntity)])) as BuiltList); break; - case 'tax_data_temp': + case 'tax_info': result.taxData.replace(serializers.deserialize(value, specifiedType: const FullType(TaxDataEntity)) as TaxDataEntity); break; diff --git a/lib/data/models/tax_model.dart b/lib/data/models/tax_model.dart index 02b52386b..13e6c0084 100644 --- a/lib/data/models/tax_model.dart +++ b/lib/data/models/tax_model.dart @@ -10,9 +10,16 @@ abstract class TaxDataEntity return _$TaxDataEntity._( citySalesTax: 0, cityTaxCode: '', - cityUseTax: 0, countySalesTax: 0, countyTaxCode: '', + geoCity: '', + geoCounty: '', + geoPostalCode: '', + geoState: '', + stateSalesTax: 0, + taxSales: 0, + /* + cityUseTax: 0, countyUseTax: 0, district1Code: '', district1SalesTax: 0, @@ -31,17 +38,12 @@ abstract class TaxDataEntity district5UseTax: 0, districtSalesTax: 0, districtUseTax: 0, - geoCity: '', - geoCounty: '', - geoPostalCode: '', - geoState: '', originDestination: '', - stateSalesTax: 0, stateUseTax: 0, - taxSales: 0, taxUse: 0, txbFreight: '', txbService: '', + */ ); } @@ -52,43 +54,50 @@ abstract class TaxDataEntity String get geoCounty; String get geoState; double get taxSales; - double get taxUse; - String get txbService; - String get txbFreight; double get stateSalesTax; - double get stateUseTax; double get citySalesTax; - double get cityUseTax; String get cityTaxCode; double get countySalesTax; - double get countyUseTax; String get countyTaxCode; - double get districtSalesTax; - double get districtUseTax; - String get district1Code; - double get district1SalesTax; - double get district1UseTax; - String get district2Code; - double get district2SalesTax; - double get district2UseTax; - String get district3Code; - double get district3SalesTax; - double get district3UseTax; - String get district4Code; - double get district4SalesTax; - double get district4UseTax; - String get district5Code; - double get district5SalesTax; - double get district5UseTax; - String get originDestination; + //double get taxUse; + //String get txbService; + //String get txbFreight; + //double get stateUseTax; + //double get cityUseTax; + //double get countyUseTax; + //double get districtSalesTax; + //double get districtUseTax; + //String get district1Code; + //double get district1SalesTax; + //double get district1UseTax; + //String get district2Code; + //double get district2SalesTax; + //double get district2UseTax; + //String get district3Code; + //double get district3SalesTax; + //double get district3UseTax; + //String get district4Code; + //double get district4SalesTax; + //double get district4UseTax; + //String get district5Code; + //double get district5SalesTax; + //double get district5UseTax; + //String get originDestination; // ignore: unused_element static void _initializeBuilder(TaxDataEntityBuilder builder) => builder ..citySalesTax = 0 ..cityTaxCode = '' - ..cityUseTax = 0 ..countySalesTax = 0 ..countyTaxCode = '' + ..geoCity = '' + ..geoCounty = '' + ..geoPostalCode = '' + ..geoState = '' + ..stateSalesTax = 0 + ..taxSales = 0; + /* + ..cityUseTax = 0 ..countyUseTax = 0 ..district1Code = '' ..district1SalesTax = 0 @@ -107,17 +116,12 @@ abstract class TaxDataEntity ..district5UseTax = 0 ..districtSalesTax = 0 ..districtUseTax = 0 - ..geoCity = '' - ..geoCounty = '' - ..geoPostalCode = '' - ..geoState = '' ..originDestination = '' - ..stateSalesTax = 0 ..stateUseTax = 0 - ..taxSales = 0 ..taxUse = 0 ..txbFreight = '' ..txbService = ''; + */ static Serializer get serializer => _$taxDataEntitySerializer; } diff --git a/lib/data/models/tax_model.g.dart b/lib/data/models/tax_model.g.dart index 683a4c8a5..da676a6f7 100644 --- a/lib/data/models/tax_model.g.dart +++ b/lib/data/models/tax_model.g.dart @@ -40,93 +40,21 @@ class _$TaxDataEntitySerializer implements StructuredSerializer { 'taxSales', serializers.serialize(object.taxSales, specifiedType: const FullType(double)), - 'taxUse', - serializers.serialize(object.taxUse, - specifiedType: const FullType(double)), - 'txbService', - serializers.serialize(object.txbService, - specifiedType: const FullType(String)), - 'txbFreight', - serializers.serialize(object.txbFreight, - specifiedType: const FullType(String)), 'stateSalesTax', serializers.serialize(object.stateSalesTax, specifiedType: const FullType(double)), - 'stateUseTax', - serializers.serialize(object.stateUseTax, - specifiedType: const FullType(double)), 'citySalesTax', serializers.serialize(object.citySalesTax, specifiedType: const FullType(double)), - 'cityUseTax', - serializers.serialize(object.cityUseTax, - specifiedType: const FullType(double)), 'cityTaxCode', serializers.serialize(object.cityTaxCode, specifiedType: const FullType(String)), 'countySalesTax', serializers.serialize(object.countySalesTax, specifiedType: const FullType(double)), - 'countyUseTax', - serializers.serialize(object.countyUseTax, - specifiedType: const FullType(double)), 'countyTaxCode', serializers.serialize(object.countyTaxCode, specifiedType: const FullType(String)), - 'districtSalesTax', - serializers.serialize(object.districtSalesTax, - specifiedType: const FullType(double)), - 'districtUseTax', - serializers.serialize(object.districtUseTax, - specifiedType: const FullType(double)), - 'district1Code', - serializers.serialize(object.district1Code, - specifiedType: const FullType(String)), - 'district1SalesTax', - serializers.serialize(object.district1SalesTax, - specifiedType: const FullType(double)), - 'district1UseTax', - serializers.serialize(object.district1UseTax, - specifiedType: const FullType(double)), - 'district2Code', - serializers.serialize(object.district2Code, - specifiedType: const FullType(String)), - 'district2SalesTax', - serializers.serialize(object.district2SalesTax, - specifiedType: const FullType(double)), - 'district2UseTax', - serializers.serialize(object.district2UseTax, - specifiedType: const FullType(double)), - 'district3Code', - serializers.serialize(object.district3Code, - specifiedType: const FullType(String)), - 'district3SalesTax', - serializers.serialize(object.district3SalesTax, - specifiedType: const FullType(double)), - 'district3UseTax', - serializers.serialize(object.district3UseTax, - specifiedType: const FullType(double)), - 'district4Code', - serializers.serialize(object.district4Code, - specifiedType: const FullType(String)), - 'district4SalesTax', - serializers.serialize(object.district4SalesTax, - specifiedType: const FullType(double)), - 'district4UseTax', - serializers.serialize(object.district4UseTax, - specifiedType: const FullType(double)), - 'district5Code', - serializers.serialize(object.district5Code, - specifiedType: const FullType(String)), - 'district5SalesTax', - serializers.serialize(object.district5SalesTax, - specifiedType: const FullType(double)), - 'district5UseTax', - serializers.serialize(object.district5UseTax, - specifiedType: const FullType(double)), - 'originDestination', - serializers.serialize(object.originDestination, - specifiedType: const FullType(String)), ]; return result; @@ -164,34 +92,14 @@ class _$TaxDataEntitySerializer implements StructuredSerializer { result.taxSales = serializers.deserialize(value, specifiedType: const FullType(double)) as double; break; - case 'taxUse': - result.taxUse = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'txbService': - result.txbService = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; - case 'txbFreight': - result.txbFreight = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; case 'stateSalesTax': result.stateSalesTax = serializers.deserialize(value, specifiedType: const FullType(double)) as double; break; - case 'stateUseTax': - result.stateUseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; case 'citySalesTax': result.citySalesTax = serializers.deserialize(value, specifiedType: const FullType(double)) as double; break; - case 'cityUseTax': - result.cityUseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; case 'cityTaxCode': result.cityTaxCode = serializers.deserialize(value, specifiedType: const FullType(String)) as String; @@ -200,86 +108,10 @@ class _$TaxDataEntitySerializer implements StructuredSerializer { result.countySalesTax = serializers.deserialize(value, specifiedType: const FullType(double)) as double; break; - case 'countyUseTax': - result.countyUseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; case 'countyTaxCode': result.countyTaxCode = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; - case 'districtSalesTax': - result.districtSalesTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'districtUseTax': - result.districtUseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district1Code': - result.district1Code = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; - case 'district1SalesTax': - result.district1SalesTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district1UseTax': - result.district1UseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district2Code': - result.district2Code = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; - case 'district2SalesTax': - result.district2SalesTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district2UseTax': - result.district2UseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district3Code': - result.district3Code = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; - case 'district3SalesTax': - result.district3SalesTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district3UseTax': - result.district3UseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district4Code': - result.district4Code = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; - case 'district4SalesTax': - result.district4SalesTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district4UseTax': - result.district4UseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district5Code': - result.district5Code = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; - case 'district5SalesTax': - result.district5SalesTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'district5UseTax': - result.district5UseTax = serializers.deserialize(value, - specifiedType: const FullType(double)) as double; - break; - case 'originDestination': - result.originDestination = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - break; } } @@ -500,63 +332,15 @@ class _$TaxDataEntity extends TaxDataEntity { @override final double taxSales; @override - final double taxUse; - @override - final String txbService; - @override - final String txbFreight; - @override final double stateSalesTax; @override - final double stateUseTax; - @override final double citySalesTax; @override - final double cityUseTax; - @override final String cityTaxCode; @override final double countySalesTax; @override - final double countyUseTax; - @override final String countyTaxCode; - @override - final double districtSalesTax; - @override - final double districtUseTax; - @override - final String district1Code; - @override - final double district1SalesTax; - @override - final double district1UseTax; - @override - final String district2Code; - @override - final double district2SalesTax; - @override - final double district2UseTax; - @override - final String district3Code; - @override - final double district3SalesTax; - @override - final double district3UseTax; - @override - final String district4Code; - @override - final double district4SalesTax; - @override - final double district4UseTax; - @override - final String district5Code; - @override - final double district5SalesTax; - @override - final double district5UseTax; - @override - final String originDestination; factory _$TaxDataEntity([void Function(TaxDataEntityBuilder) updates]) => (new TaxDataEntityBuilder()..update(updates))._build(); @@ -567,35 +351,11 @@ class _$TaxDataEntity extends TaxDataEntity { this.geoCounty, this.geoState, this.taxSales, - this.taxUse, - this.txbService, - this.txbFreight, this.stateSalesTax, - this.stateUseTax, this.citySalesTax, - this.cityUseTax, this.cityTaxCode, this.countySalesTax, - this.countyUseTax, - this.countyTaxCode, - this.districtSalesTax, - this.districtUseTax, - this.district1Code, - this.district1SalesTax, - this.district1UseTax, - this.district2Code, - this.district2SalesTax, - this.district2UseTax, - this.district3Code, - this.district3SalesTax, - this.district3UseTax, - this.district4Code, - this.district4SalesTax, - this.district4UseTax, - this.district5Code, - this.district5SalesTax, - this.district5UseTax, - this.originDestination}) + this.countyTaxCode}) : super._() { BuiltValueNullFieldError.checkNotNull( geoPostalCode, r'TaxDataEntity', 'geoPostalCode'); @@ -606,63 +366,16 @@ class _$TaxDataEntity extends TaxDataEntity { geoState, r'TaxDataEntity', 'geoState'); BuiltValueNullFieldError.checkNotNull( taxSales, r'TaxDataEntity', 'taxSales'); - BuiltValueNullFieldError.checkNotNull(taxUse, r'TaxDataEntity', 'taxUse'); - BuiltValueNullFieldError.checkNotNull( - txbService, r'TaxDataEntity', 'txbService'); - BuiltValueNullFieldError.checkNotNull( - txbFreight, r'TaxDataEntity', 'txbFreight'); BuiltValueNullFieldError.checkNotNull( stateSalesTax, r'TaxDataEntity', 'stateSalesTax'); - BuiltValueNullFieldError.checkNotNull( - stateUseTax, r'TaxDataEntity', 'stateUseTax'); BuiltValueNullFieldError.checkNotNull( citySalesTax, r'TaxDataEntity', 'citySalesTax'); - BuiltValueNullFieldError.checkNotNull( - cityUseTax, r'TaxDataEntity', 'cityUseTax'); BuiltValueNullFieldError.checkNotNull( cityTaxCode, r'TaxDataEntity', 'cityTaxCode'); BuiltValueNullFieldError.checkNotNull( countySalesTax, r'TaxDataEntity', 'countySalesTax'); - BuiltValueNullFieldError.checkNotNull( - countyUseTax, r'TaxDataEntity', 'countyUseTax'); BuiltValueNullFieldError.checkNotNull( countyTaxCode, r'TaxDataEntity', 'countyTaxCode'); - BuiltValueNullFieldError.checkNotNull( - districtSalesTax, r'TaxDataEntity', 'districtSalesTax'); - BuiltValueNullFieldError.checkNotNull( - districtUseTax, r'TaxDataEntity', 'districtUseTax'); - BuiltValueNullFieldError.checkNotNull( - district1Code, r'TaxDataEntity', 'district1Code'); - BuiltValueNullFieldError.checkNotNull( - district1SalesTax, r'TaxDataEntity', 'district1SalesTax'); - BuiltValueNullFieldError.checkNotNull( - district1UseTax, r'TaxDataEntity', 'district1UseTax'); - BuiltValueNullFieldError.checkNotNull( - district2Code, r'TaxDataEntity', 'district2Code'); - BuiltValueNullFieldError.checkNotNull( - district2SalesTax, r'TaxDataEntity', 'district2SalesTax'); - BuiltValueNullFieldError.checkNotNull( - district2UseTax, r'TaxDataEntity', 'district2UseTax'); - BuiltValueNullFieldError.checkNotNull( - district3Code, r'TaxDataEntity', 'district3Code'); - BuiltValueNullFieldError.checkNotNull( - district3SalesTax, r'TaxDataEntity', 'district3SalesTax'); - BuiltValueNullFieldError.checkNotNull( - district3UseTax, r'TaxDataEntity', 'district3UseTax'); - BuiltValueNullFieldError.checkNotNull( - district4Code, r'TaxDataEntity', 'district4Code'); - BuiltValueNullFieldError.checkNotNull( - district4SalesTax, r'TaxDataEntity', 'district4SalesTax'); - BuiltValueNullFieldError.checkNotNull( - district4UseTax, r'TaxDataEntity', 'district4UseTax'); - BuiltValueNullFieldError.checkNotNull( - district5Code, r'TaxDataEntity', 'district5Code'); - BuiltValueNullFieldError.checkNotNull( - district5SalesTax, r'TaxDataEntity', 'district5SalesTax'); - BuiltValueNullFieldError.checkNotNull( - district5UseTax, r'TaxDataEntity', 'district5UseTax'); - BuiltValueNullFieldError.checkNotNull( - originDestination, r'TaxDataEntity', 'originDestination'); } @override @@ -681,35 +394,11 @@ class _$TaxDataEntity extends TaxDataEntity { geoCounty == other.geoCounty && geoState == other.geoState && taxSales == other.taxSales && - taxUse == other.taxUse && - txbService == other.txbService && - txbFreight == other.txbFreight && stateSalesTax == other.stateSalesTax && - stateUseTax == other.stateUseTax && citySalesTax == other.citySalesTax && - cityUseTax == other.cityUseTax && cityTaxCode == other.cityTaxCode && countySalesTax == other.countySalesTax && - countyUseTax == other.countyUseTax && - countyTaxCode == other.countyTaxCode && - districtSalesTax == other.districtSalesTax && - districtUseTax == other.districtUseTax && - district1Code == other.district1Code && - district1SalesTax == other.district1SalesTax && - district1UseTax == other.district1UseTax && - district2Code == other.district2Code && - district2SalesTax == other.district2SalesTax && - district2UseTax == other.district2UseTax && - district3Code == other.district3Code && - district3SalesTax == other.district3SalesTax && - district3UseTax == other.district3UseTax && - district4Code == other.district4Code && - district4SalesTax == other.district4SalesTax && - district4UseTax == other.district4UseTax && - district5Code == other.district5Code && - district5SalesTax == other.district5SalesTax && - district5UseTax == other.district5UseTax && - originDestination == other.originDestination; + countyTaxCode == other.countyTaxCode; } @override @@ -720,35 +409,11 @@ class _$TaxDataEntity extends TaxDataEntity { _$hash = $jc(_$hash, geoCounty.hashCode); _$hash = $jc(_$hash, geoState.hashCode); _$hash = $jc(_$hash, taxSales.hashCode); - _$hash = $jc(_$hash, taxUse.hashCode); - _$hash = $jc(_$hash, txbService.hashCode); - _$hash = $jc(_$hash, txbFreight.hashCode); _$hash = $jc(_$hash, stateSalesTax.hashCode); - _$hash = $jc(_$hash, stateUseTax.hashCode); _$hash = $jc(_$hash, citySalesTax.hashCode); - _$hash = $jc(_$hash, cityUseTax.hashCode); _$hash = $jc(_$hash, cityTaxCode.hashCode); _$hash = $jc(_$hash, countySalesTax.hashCode); - _$hash = $jc(_$hash, countyUseTax.hashCode); _$hash = $jc(_$hash, countyTaxCode.hashCode); - _$hash = $jc(_$hash, districtSalesTax.hashCode); - _$hash = $jc(_$hash, districtUseTax.hashCode); - _$hash = $jc(_$hash, district1Code.hashCode); - _$hash = $jc(_$hash, district1SalesTax.hashCode); - _$hash = $jc(_$hash, district1UseTax.hashCode); - _$hash = $jc(_$hash, district2Code.hashCode); - _$hash = $jc(_$hash, district2SalesTax.hashCode); - _$hash = $jc(_$hash, district2UseTax.hashCode); - _$hash = $jc(_$hash, district3Code.hashCode); - _$hash = $jc(_$hash, district3SalesTax.hashCode); - _$hash = $jc(_$hash, district3UseTax.hashCode); - _$hash = $jc(_$hash, district4Code.hashCode); - _$hash = $jc(_$hash, district4SalesTax.hashCode); - _$hash = $jc(_$hash, district4UseTax.hashCode); - _$hash = $jc(_$hash, district5Code.hashCode); - _$hash = $jc(_$hash, district5SalesTax.hashCode); - _$hash = $jc(_$hash, district5UseTax.hashCode); - _$hash = $jc(_$hash, originDestination.hashCode); _$hash = $jf(_$hash); return _$hash; } @@ -761,35 +426,11 @@ class _$TaxDataEntity extends TaxDataEntity { ..add('geoCounty', geoCounty) ..add('geoState', geoState) ..add('taxSales', taxSales) - ..add('taxUse', taxUse) - ..add('txbService', txbService) - ..add('txbFreight', txbFreight) ..add('stateSalesTax', stateSalesTax) - ..add('stateUseTax', stateUseTax) ..add('citySalesTax', citySalesTax) - ..add('cityUseTax', cityUseTax) ..add('cityTaxCode', cityTaxCode) ..add('countySalesTax', countySalesTax) - ..add('countyUseTax', countyUseTax) - ..add('countyTaxCode', countyTaxCode) - ..add('districtSalesTax', districtSalesTax) - ..add('districtUseTax', districtUseTax) - ..add('district1Code', district1Code) - ..add('district1SalesTax', district1SalesTax) - ..add('district1UseTax', district1UseTax) - ..add('district2Code', district2Code) - ..add('district2SalesTax', district2SalesTax) - ..add('district2UseTax', district2UseTax) - ..add('district3Code', district3Code) - ..add('district3SalesTax', district3SalesTax) - ..add('district3UseTax', district3UseTax) - ..add('district4Code', district4Code) - ..add('district4SalesTax', district4SalesTax) - ..add('district4UseTax', district4UseTax) - ..add('district5Code', district5Code) - ..add('district5SalesTax', district5SalesTax) - ..add('district5UseTax', district5UseTax) - ..add('originDestination', originDestination)) + ..add('countyTaxCode', countyTaxCode)) .toString(); } } @@ -819,35 +460,15 @@ class TaxDataEntityBuilder double get taxSales => _$this._taxSales; set taxSales(double taxSales) => _$this._taxSales = taxSales; - double _taxUse; - double get taxUse => _$this._taxUse; - set taxUse(double taxUse) => _$this._taxUse = taxUse; - - String _txbService; - String get txbService => _$this._txbService; - set txbService(String txbService) => _$this._txbService = txbService; - - String _txbFreight; - String get txbFreight => _$this._txbFreight; - set txbFreight(String txbFreight) => _$this._txbFreight = txbFreight; - double _stateSalesTax; double get stateSalesTax => _$this._stateSalesTax; set stateSalesTax(double stateSalesTax) => _$this._stateSalesTax = stateSalesTax; - double _stateUseTax; - double get stateUseTax => _$this._stateUseTax; - set stateUseTax(double stateUseTax) => _$this._stateUseTax = stateUseTax; - double _citySalesTax; double get citySalesTax => _$this._citySalesTax; set citySalesTax(double citySalesTax) => _$this._citySalesTax = citySalesTax; - double _cityUseTax; - double get cityUseTax => _$this._cityUseTax; - set cityUseTax(double cityUseTax) => _$this._cityUseTax = cityUseTax; - String _cityTaxCode; String get cityTaxCode => _$this._cityTaxCode; set cityTaxCode(String cityTaxCode) => _$this._cityTaxCode = cityTaxCode; @@ -857,108 +478,12 @@ class TaxDataEntityBuilder set countySalesTax(double countySalesTax) => _$this._countySalesTax = countySalesTax; - double _countyUseTax; - double get countyUseTax => _$this._countyUseTax; - set countyUseTax(double countyUseTax) => _$this._countyUseTax = countyUseTax; - String _countyTaxCode; String get countyTaxCode => _$this._countyTaxCode; set countyTaxCode(String countyTaxCode) => _$this._countyTaxCode = countyTaxCode; - double _districtSalesTax; - double get districtSalesTax => _$this._districtSalesTax; - set districtSalesTax(double districtSalesTax) => - _$this._districtSalesTax = districtSalesTax; - - double _districtUseTax; - double get districtUseTax => _$this._districtUseTax; - set districtUseTax(double districtUseTax) => - _$this._districtUseTax = districtUseTax; - - String _district1Code; - String get district1Code => _$this._district1Code; - set district1Code(String district1Code) => - _$this._district1Code = district1Code; - - double _district1SalesTax; - double get district1SalesTax => _$this._district1SalesTax; - set district1SalesTax(double district1SalesTax) => - _$this._district1SalesTax = district1SalesTax; - - double _district1UseTax; - double get district1UseTax => _$this._district1UseTax; - set district1UseTax(double district1UseTax) => - _$this._district1UseTax = district1UseTax; - - String _district2Code; - String get district2Code => _$this._district2Code; - set district2Code(String district2Code) => - _$this._district2Code = district2Code; - - double _district2SalesTax; - double get district2SalesTax => _$this._district2SalesTax; - set district2SalesTax(double district2SalesTax) => - _$this._district2SalesTax = district2SalesTax; - - double _district2UseTax; - double get district2UseTax => _$this._district2UseTax; - set district2UseTax(double district2UseTax) => - _$this._district2UseTax = district2UseTax; - - String _district3Code; - String get district3Code => _$this._district3Code; - set district3Code(String district3Code) => - _$this._district3Code = district3Code; - - double _district3SalesTax; - double get district3SalesTax => _$this._district3SalesTax; - set district3SalesTax(double district3SalesTax) => - _$this._district3SalesTax = district3SalesTax; - - double _district3UseTax; - double get district3UseTax => _$this._district3UseTax; - set district3UseTax(double district3UseTax) => - _$this._district3UseTax = district3UseTax; - - String _district4Code; - String get district4Code => _$this._district4Code; - set district4Code(String district4Code) => - _$this._district4Code = district4Code; - - double _district4SalesTax; - double get district4SalesTax => _$this._district4SalesTax; - set district4SalesTax(double district4SalesTax) => - _$this._district4SalesTax = district4SalesTax; - - double _district4UseTax; - double get district4UseTax => _$this._district4UseTax; - set district4UseTax(double district4UseTax) => - _$this._district4UseTax = district4UseTax; - - String _district5Code; - String get district5Code => _$this._district5Code; - set district5Code(String district5Code) => - _$this._district5Code = district5Code; - - double _district5SalesTax; - double get district5SalesTax => _$this._district5SalesTax; - set district5SalesTax(double district5SalesTax) => - _$this._district5SalesTax = district5SalesTax; - - double _district5UseTax; - double get district5UseTax => _$this._district5UseTax; - set district5UseTax(double district5UseTax) => - _$this._district5UseTax = district5UseTax; - - String _originDestination; - String get originDestination => _$this._originDestination; - set originDestination(String originDestination) => - _$this._originDestination = originDestination; - - TaxDataEntityBuilder() { - TaxDataEntity._initializeBuilder(this); - } + TaxDataEntityBuilder(); TaxDataEntityBuilder get _$this { final $v = _$v; @@ -968,35 +493,11 @@ class TaxDataEntityBuilder _geoCounty = $v.geoCounty; _geoState = $v.geoState; _taxSales = $v.taxSales; - _taxUse = $v.taxUse; - _txbService = $v.txbService; - _txbFreight = $v.txbFreight; _stateSalesTax = $v.stateSalesTax; - _stateUseTax = $v.stateUseTax; _citySalesTax = $v.citySalesTax; - _cityUseTax = $v.cityUseTax; _cityTaxCode = $v.cityTaxCode; _countySalesTax = $v.countySalesTax; - _countyUseTax = $v.countyUseTax; _countyTaxCode = $v.countyTaxCode; - _districtSalesTax = $v.districtSalesTax; - _districtUseTax = $v.districtUseTax; - _district1Code = $v.district1Code; - _district1SalesTax = $v.district1SalesTax; - _district1UseTax = $v.district1UseTax; - _district2Code = $v.district2Code; - _district2SalesTax = $v.district2SalesTax; - _district2UseTax = $v.district2UseTax; - _district3Code = $v.district3Code; - _district3SalesTax = $v.district3SalesTax; - _district3UseTax = $v.district3UseTax; - _district4Code = $v.district4Code; - _district4SalesTax = $v.district4SalesTax; - _district4UseTax = $v.district4UseTax; - _district5Code = $v.district5Code; - _district5SalesTax = $v.district5SalesTax; - _district5UseTax = $v.district5UseTax; - _originDestination = $v.originDestination; _$v = null; } return this; @@ -1029,38 +530,15 @@ class TaxDataEntityBuilder geoState, r'TaxDataEntity', 'geoState'), taxSales: BuiltValueNullFieldError.checkNotNull( taxSales, r'TaxDataEntity', 'taxSales'), - taxUse: BuiltValueNullFieldError.checkNotNull( - taxUse, r'TaxDataEntity', 'taxUse'), - txbService: BuiltValueNullFieldError.checkNotNull( - txbService, r'TaxDataEntity', 'txbService'), - txbFreight: BuiltValueNullFieldError.checkNotNull( - txbFreight, r'TaxDataEntity', 'txbFreight'), - stateSalesTax: BuiltValueNullFieldError.checkNotNull(stateSalesTax, r'TaxDataEntity', 'stateSalesTax'), - stateUseTax: BuiltValueNullFieldError.checkNotNull(stateUseTax, r'TaxDataEntity', 'stateUseTax'), - citySalesTax: BuiltValueNullFieldError.checkNotNull(citySalesTax, r'TaxDataEntity', 'citySalesTax'), - cityUseTax: BuiltValueNullFieldError.checkNotNull(cityUseTax, r'TaxDataEntity', 'cityUseTax'), - cityTaxCode: BuiltValueNullFieldError.checkNotNull(cityTaxCode, r'TaxDataEntity', 'cityTaxCode'), - countySalesTax: BuiltValueNullFieldError.checkNotNull(countySalesTax, r'TaxDataEntity', 'countySalesTax'), - countyUseTax: BuiltValueNullFieldError.checkNotNull(countyUseTax, r'TaxDataEntity', 'countyUseTax'), - countyTaxCode: BuiltValueNullFieldError.checkNotNull(countyTaxCode, r'TaxDataEntity', 'countyTaxCode'), - districtSalesTax: BuiltValueNullFieldError.checkNotNull(districtSalesTax, r'TaxDataEntity', 'districtSalesTax'), - districtUseTax: BuiltValueNullFieldError.checkNotNull(districtUseTax, r'TaxDataEntity', 'districtUseTax'), - district1Code: BuiltValueNullFieldError.checkNotNull(district1Code, r'TaxDataEntity', 'district1Code'), - district1SalesTax: BuiltValueNullFieldError.checkNotNull(district1SalesTax, r'TaxDataEntity', 'district1SalesTax'), - district1UseTax: BuiltValueNullFieldError.checkNotNull(district1UseTax, r'TaxDataEntity', 'district1UseTax'), - district2Code: BuiltValueNullFieldError.checkNotNull(district2Code, r'TaxDataEntity', 'district2Code'), - district2SalesTax: BuiltValueNullFieldError.checkNotNull(district2SalesTax, r'TaxDataEntity', 'district2SalesTax'), - district2UseTax: BuiltValueNullFieldError.checkNotNull(district2UseTax, r'TaxDataEntity', 'district2UseTax'), - district3Code: BuiltValueNullFieldError.checkNotNull(district3Code, r'TaxDataEntity', 'district3Code'), - district3SalesTax: BuiltValueNullFieldError.checkNotNull(district3SalesTax, r'TaxDataEntity', 'district3SalesTax'), - district3UseTax: BuiltValueNullFieldError.checkNotNull(district3UseTax, r'TaxDataEntity', 'district3UseTax'), - district4Code: BuiltValueNullFieldError.checkNotNull(district4Code, r'TaxDataEntity', 'district4Code'), - district4SalesTax: BuiltValueNullFieldError.checkNotNull(district4SalesTax, r'TaxDataEntity', 'district4SalesTax'), - district4UseTax: BuiltValueNullFieldError.checkNotNull(district4UseTax, r'TaxDataEntity', 'district4UseTax'), - district5Code: BuiltValueNullFieldError.checkNotNull(district5Code, r'TaxDataEntity', 'district5Code'), - district5SalesTax: BuiltValueNullFieldError.checkNotNull(district5SalesTax, r'TaxDataEntity', 'district5SalesTax'), - district5UseTax: BuiltValueNullFieldError.checkNotNull(district5UseTax, r'TaxDataEntity', 'district5UseTax'), - originDestination: BuiltValueNullFieldError.checkNotNull(originDestination, r'TaxDataEntity', 'originDestination')); + stateSalesTax: BuiltValueNullFieldError.checkNotNull( + stateSalesTax, r'TaxDataEntity', 'stateSalesTax'), + citySalesTax: BuiltValueNullFieldError.checkNotNull( + citySalesTax, r'TaxDataEntity', 'citySalesTax'), + cityTaxCode: BuiltValueNullFieldError.checkNotNull( + cityTaxCode, r'TaxDataEntity', 'cityTaxCode'), + countySalesTax: + BuiltValueNullFieldError.checkNotNull(countySalesTax, r'TaxDataEntity', 'countySalesTax'), + countyTaxCode: BuiltValueNullFieldError.checkNotNull(countyTaxCode, r'TaxDataEntity', 'countyTaxCode')); replace(_$result); return _$result; } diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart index e5e45a3b6..b680f26a0 100644 --- a/lib/ui/invoice/edit/invoice_edit_desktop.dart +++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart @@ -1122,7 +1122,7 @@ class InvoiceEditDesktopState extends State ), ), ]), - if (false && company.calculateTaxes) + if (company.calculateTaxes) Padding( padding: const EdgeInsets.only(left: 10, right: 16), diff --git a/lib/ui/invoice/edit/invoice_tax_details.dart b/lib/ui/invoice/edit/invoice_tax_details.dart index ccc0cf1c9..aebb3b33b 100644 --- a/lib/ui/invoice/edit/invoice_tax_details.dart +++ b/lib/ui/invoice/edit/invoice_tax_details.dart @@ -15,9 +15,9 @@ class InvoiceTaxDetails extends StatelessWidget { @override Widget build(BuildContext context) { final localization = AppLocalization.of(context); - //final state = StoreProvider.of(context).state; - //final client = state.clientState.get(invoice.id); - //final company = state.company; + final state = StoreProvider.of(context).state; + final client = state.clientState.get(invoice.id); + final taxData = invoice.isNew ? client.taxData : invoice.taxData; return AlertDialog( title: Text(localization.taxDetails),