From d9eeb11a5f32c1ae391230e8cfaf71d6bacd2dd8 Mon Sep 17 00:00:00 2001 From: hillelcoren Date: Sun, 3 Jul 2022 19:14:02 +0000 Subject: [PATCH] Admin Portal - Profile --- public/main.profile.dart.js | 1735 ++++++++++++++++++----------------- 1 file changed, 902 insertions(+), 833 deletions(-) diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js index 8047c039c4..c1566cc97b 100644 --- a/public/main.profile.dart.js +++ b/public/main.profile.dart.js @@ -99115,7 +99115,7 @@ this.store = t0; }, clientReport(userCompany, reportsUIState, clientMap, userMap, groupMap, staticState) { - var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, client, contact, row, t9, t10, currencyId, currencyId0, t11, exchangeRate, t12, value, t13, t14, t15, value0, value1, value2, value3, value4, value5, value6, value7, t16, t17, value8, value9, value10, value11, t18, t19, value12, value13, value14, value15, value16, t20, value17, value18, value19, value20, value21, t21, t22, t23, t24, t25, t26, t27, t28, value22, value23, t29, value24, t30, value25, skip, t31, value26, t32, t33, currencyId1, selectedColumns, _null = null, + var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, client, contact, row, t9, t10, currencyId, currencyId0, t11, exchangeRate, t12, value, t13, t14, t15, value0, t16, value1, t17, value2, t18, value3, t19, t20, t21, value4, value5, value6, value7, t22, t23, value8, value9, value10, value11, value12, t24, value13, value14, value15, value16, value17, t25, t26, t27, t28, t29, t30, t31, t32, value18, value19, t33, value20, t34, value21, skip, t35, value22, t36, t37, currencyId1, selectedColumns, _null = null, data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), entities = A._setArrayType([], type$.JSArray_legacy_BaseEntity), t1 = userCompany.settings, @@ -99142,232 +99142,232 @@ currencyId0 = t6.settings.currencyId; t11 = currencyId0 == null; exchangeRate = A.getExchangeRate(t9, currencyId, t11 ? "1" : currencyId0); - for (t12 = new J.ArrayIterator(t3, t3.length, t5), value = client.id, t13 = client.createdAt, t14 = client.updatedAt, t15 = client.archivedAt > 0, value0 = client.paidToDate, value1 = value0 * exchangeRate, value2 = client.creditBalance, value3 = value2 * exchangeRate, value4 = client.balance, value5 = value4 * exchangeRate, value6 = value4 + value0, value7 = value6 * exchangeRate, t16 = client.createdUserId, t17 = client.assignedUserId, value8 = client.vatNumber, value9 = client.idNumber, value10 = client.number, value11 = client.phone, t18 = staticState.countryMap, t19 = client.shippingCountryId, value12 = client.shippingPostalCode, value13 = client.shippingState, value14 = client.shippingCity, value15 = client.shippingAddress2, value16 = client.shippingAddress1, t20 = client.countryId, value17 = client.postalCode, value18 = client.state, value19 = client.city, value20 = client.address2, value21 = client.address1, t21 = client.customValue4, t22 = client.customValue3, t23 = client.customValue2, t24 = client.customValue1, t25 = staticState.sizeMap, t26 = client.sizeId, t27 = staticState.industryMap, t28 = client.industryId, value22 = client.publicNotes, value23 = client.privateNotes, t29 = staticState.languageMap, value24 = client.website, t30 = client.groupId, value25 = client.displayName, t13 *= 1000, t14 *= 1000, t10 = t10.languageId, skip = false; t12.moveNext$0();) { - t31 = t12.__interceptors$_current; - switch (t31) { + for (t12 = new J.ArrayIterator(t3, t3.length, t5), value = client.id, t13 = client.createdAt, t14 = client.updatedAt, t15 = client.archivedAt > 0, value0 = client.paidToDate, t16 = value0 * exchangeRate, value1 = client.creditBalance, t17 = value1 * exchangeRate, value2 = client.balance, t18 = value2 * exchangeRate, value3 = value2 + value0, t19 = value3 * exchangeRate, t20 = client.createdUserId, t21 = client.assignedUserId, value4 = client.vatNumber, value5 = client.idNumber, value6 = client.number, value7 = client.phone, t22 = staticState.countryMap, t23 = client.shippingCountryId, value8 = client.shippingPostalCode, value9 = client.shippingState, value10 = client.shippingCity, value11 = client.shippingAddress2, value12 = client.shippingAddress1, t24 = client.countryId, value13 = client.postalCode, value14 = client.state, value15 = client.city, value16 = client.address2, value17 = client.address1, t25 = client.customValue4, t26 = client.customValue3, t27 = client.customValue2, t28 = client.customValue1, t29 = staticState.sizeMap, t30 = client.sizeId, t31 = staticState.industryMap, t32 = client.industryId, value18 = client.publicNotes, value19 = client.privateNotes, t33 = staticState.languageMap, value20 = client.website, t34 = client.groupId, value21 = client.displayName, t13 *= 1000, t14 *= 1000, t10 = t10.languageId, skip = false; t12.moveNext$0();) { + t35 = t12.__interceptors$_current; + switch (t35) { case B.ClientReportFields_0: - value26 = value; + value22 = value; break; case B.ClientReportFields_1: - value26 = value25; + value22 = value21; break; case B.ClientReportFields_2: - t32 = groupMap._map$_map.$index(0, t30); - value26 = t32 == null ? _null : t32.name; - if (value26 == null) - value26 = ""; + t36 = groupMap._map$_map.$index(0, t34); + value22 = t36 == null ? _null : t36.name; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_3: - value26 = value24; + value22 = value20; break; case B.ClientReportFields_4: - t32 = t9._map$_map.$index(0, currencyId); - value26 = t32 == null ? _null : t32.name; - if (value26 == null) - value26 = ""; + t36 = t9._map$_map.$index(0, currencyId); + value22 = t36 == null ? _null : t36.name; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_5: - t32 = t29._map$_map.$index(0, t10); - value26 = t32 == null ? _null : t32.name; - if (value26 == null) - value26 = ""; + t36 = t33._map$_map.$index(0, t10); + value22 = t36 == null ? _null : t36.name; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_6: - value26 = value23; + value22 = value19; break; case B.ClientReportFields_7: - value26 = value22; + value22 = value18; break; case B.ClientReportFields_8: - t32 = t27._map$_map.$index(0, t28); - value26 = t32 == null ? _null : t32.name; - if (value26 == null) - value26 = ""; + t36 = t31._map$_map.$index(0, t32); + value22 = t36 == null ? _null : t36.name; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_9: - t32 = t25._map$_map.$index(0, t26); - value26 = t32 == null ? _null : t32.name; - if (value26 == null) - value26 = ""; + t36 = t29._map$_map.$index(0, t30); + value22 = t36 == null ? _null : t36.name; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_23: - value26 = A.presentCustomField(t6, "client1", t24); + value22 = A.presentCustomField(t6, "client1", t28); break; case B.ClientReportFields_24: - value26 = A.presentCustomField(t6, "client2", t23); + value22 = A.presentCustomField(t6, "client2", t27); break; case B.ClientReportFields_25: - value26 = A.presentCustomField(t6, "client3", t22); + value22 = A.presentCustomField(t6, "client3", t26); break; case B.ClientReportFields_26: - value26 = A.presentCustomField(t6, "client4", t21); + value22 = A.presentCustomField(t6, "client4", t25); break; case B.ClientReportFields_10: - value26 = value21; + value22 = value17; break; case B.ClientReportFields_11: - value26 = value20; + value22 = value16; break; case B.ClientReportFields_12: - value26 = value19; + value22 = value15; break; case B.ClientReportFields_13: - value26 = value18; + value22 = value14; break; case B.ClientReportFields_14: - value26 = value17; + value22 = value13; break; case B.ClientReportFields_16: - t32 = t18._map$_map.$index(0, t20); - value26 = t32 == null ? _null : t32.name; - if (value26 == null) - value26 = ""; + t36 = t22._map$_map.$index(0, t24); + value22 = t36 == null ? _null : t36.name; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_17: - value26 = value16; + value22 = value12; break; case B.ClientReportFields_18: - value26 = value15; + value22 = value11; break; case B.ClientReportFields_19: - value26 = value14; + value22 = value10; break; case B.ClientReportFields_20: - value26 = value13; + value22 = value9; break; case B.ClientReportFields_21: - value26 = value12; + value22 = value8; break; case B.ClientReportFields_22: - t32 = t18._map$_map.$index(0, t19); - value26 = t32 == null ? _null : t32.name; - if (value26 == null) - value26 = ""; + t36 = t22._map$_map.$index(0, t23); + value22 = t36 == null ? _null : t36.name; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_15: - value26 = value11; + value22 = value7; break; case B.ClientReportFields_37: - value26 = value10; + value22 = value6; break; case B.ClientReportFields_38: - value26 = value9; + value22 = value5; break; case B.ClientReportFields_39: - value26 = value8; + value22 = value4; break; case B.ClientReportFields_28: - t32 = userMap._map$_map.$index(0, t17); - if (t32 == null) - value26 = _null; + t36 = userMap._map$_map.$index(0, t21); + if (t36 == null) + value22 = _null; else { - t33 = B.JSString_methods.trim$0(t32.firstName + " " + t32.lastName); - t32 = t33.length !== 0 ? t33 : t32.email; - value26 = t32; + t37 = B.JSString_methods.trim$0(t36.firstName + " " + t36.lastName); + t36 = t37.length !== 0 ? t37 : t36.email; + value22 = t36; } - if (value26 == null) - value26 = ""; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_27: - t32 = userMap._map$_map.$index(0, t16); - if (t32 == null) - value26 = _null; + t36 = userMap._map$_map.$index(0, t20); + if (t36 == null) + value22 = _null; else { - t33 = B.JSString_methods.trim$0(t32.firstName + " " + t32.lastName); - t32 = t33.length !== 0 ? t33 : t32.email; - value26 = t32; + t37 = B.JSString_methods.trim$0(t36.firstName + " " + t36.lastName); + t36 = t37.length !== 0 ? t37 : t36.email; + value22 = t36; } - if (value26 == null) - value26 = ""; + if (value22 == null) + value22 = ""; break; case B.ClientReportFields_40: - value26 = B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); + value22 = B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); break; case B.ClientReportFields_41: - value26 = contact.firstName; + value22 = contact.firstName; break; case B.ClientReportFields_42: - value26 = contact.lastName; + value22 = contact.lastName; break; case B.ClientReportFields_43: - value26 = contact.email; + value22 = contact.email; break; case B.ClientReportFields_44: - value26 = contact.phone; + value22 = contact.phone; break; case B.ClientReportFields_45: - value26 = A.presentCustomField(t6, "contact1", contact.customValue1); + value22 = A.presentCustomField(t6, "contact1", contact.customValue1); break; case B.ClientReportFields_46: - value26 = A.presentCustomField(t6, "contact2", contact.customValue2); + value22 = A.presentCustomField(t6, "contact2", contact.customValue2); break; case B.ClientReportFields_47: - value26 = A.presentCustomField(t6, "contact3", contact.customValue3); + value22 = A.presentCustomField(t6, "contact3", contact.customValue3); break; case B.ClientReportFields_48: - value26 = A.presentCustomField(t6, "contact4", contact.customValue4); + value22 = A.presentCustomField(t6, "contact4", contact.customValue4); break; case B.ClientReportFields_49: - t32 = contact.lastLogin; - t32 *= 1000; - t33 = new A.DateTime(t32, true); - t33.DateTime$_withValue$2$isUtc(t32, true); - value26 = t33.toIso8601String$0(); + t36 = contact.lastLogin; + t36 *= 1000; + t37 = new A.DateTime(t36, true); + t37.DateTime$_withValue$2$isUtc(t36, true); + value22 = t37.toIso8601String$0(); break; case B.ClientReportFields_32: - value26 = value6; + value22 = value3; break; case B.ClientReportFields_29: - value26 = value4; + value22 = value2; break; case B.ClientReportFields_30: - value26 = value2; + value22 = value1; break; case B.ClientReportFields_31: - value26 = value0; + value22 = value0; break; case B.ClientReportFields_36: - value26 = value7; + value22 = A.round(t19, 2); break; case B.ClientReportFields_33: - value26 = value5; + value22 = A.round(t18, 2); break; case B.ClientReportFields_34: - value26 = value3; + value22 = A.round(t17, 2); break; case B.ClientReportFields_35: - value26 = value1; + value22 = A.round(t16, 2); break; case B.ClientReportFields_50: - t32 = t15 && true; - value26 = !t32 && true; + t36 = t15 && true; + value22 = !t36 && true; break; case B.ClientReportFields_52: - t32 = new A.DateTime(t14, true); - t32.DateTime$_withValue$2$isUtc(t14, true); - value26 = t32.toIso8601String$0(); + t36 = new A.DateTime(t14, true); + t36.DateTime$_withValue$2$isUtc(t14, true); + value22 = t36.toIso8601String$0(); break; case B.ClientReportFields_51: - t32 = new A.DateTime(t13, true); - t32.DateTime$_withValue$2$isUtc(t13, true); - value26 = t32.toIso8601String$0(); + t36 = new A.DateTime(t13, true); + t36.DateTime$_withValue$2$isUtc(t13, true); + value22 = t36.toIso8601String$0(); break; default: - value26 = ""; + value22 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t31), _null, reportsUIState, userCompany, value26)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t35), _null, reportsUIState, userCompany, value22)) skip = true; - t32 = J.getInterceptor$(value26); - if (t32.get$runtimeType(value26) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value26, client.get$entityType(), value)); - else if (t32.get$runtimeType(value26) === B.Type_double_K1J || t32.get$runtimeType(value26) === B.Type_int_tHn) { - if (B.JSArray_methods.contains$1(A._setArrayType([B.ClientReportFields_33, B.ClientReportFields_34, B.ClientReportFields_35, B.ClientReportFields_36], t1), t31)) + t36 = J.getInterceptor$(value22); + if (t36.get$runtimeType(value22) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value22, client.get$entityType(), value)); + else if (t36.get$runtimeType(value22) === B.Type_double_K1J || t36.get$runtimeType(value22) === B.Type_int_tHn) { + if (B.JSArray_methods.contains$1(A._setArrayType([B.ClientReportFields_33, B.ClientReportFields_34, B.ClientReportFields_35, B.ClientReportFields_36], t1), t35)) currencyId1 = t11 ? "1" : currencyId0; else currencyId1 = currencyId; - row.push(new A.ReportNumberValue(value26, _null, currencyId1, exchangeRate, client.get$entityType(), value)); + row.push(new A.ReportNumberValue(value22, _null, currencyId1, exchangeRate, client.get$entityType(), value)); } else - row.push(new A.ReportStringValue(A.S(value26), client.get$entityType(), value)); + row.push(new A.ReportStringValue(A.S(value22), client.get$entityType(), value)); } if (!skip) { data.push(row); @@ -99402,7 +99402,7 @@ clientReport_closure4: function clientReport_closure4() { }, contactReport(userCompany, reportsUIState, clientMap, userMap, staticState) { - var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, client, t9, t10, t11, t12, t13, value, value0, value1, value2, t14, t15, value3, value4, value5, value6, t16, value7, value8, value9, value10, value11, t17, value12, value13, value14, value15, value16, t18, t19, t20, t21, t22, t23, value17, value18, t24, value19, value20, t25, row, t26, currencyId, currencyId0, t27, exchangeRate, t28, value21, value22, value23, value24, t29, t30, t31, t32, t33, skip, t34, value25, t35, t36, currencyId1, selectedColumns, _null = null, + var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, client, t9, t10, t11, t12, t13, value, value0, value1, value2, t14, t15, value3, value4, value5, value6, t16, value7, value8, value9, value10, value11, t17, value12, value13, value14, value15, value16, t18, t19, t20, t21, t22, t23, value17, value18, t24, value19, value20, t25, row, t26, currencyId, currencyId0, t27, exchangeRate, t28, t29, t30, t31, t32, t33, t34, t35, t36, t37, skip, t38, value21, t39, t40, currencyId1, selectedColumns, _null = null, data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), t1 = userCompany.settings, reportSettings = t1 == null ? _null : t1.reportSettings, @@ -99428,226 +99428,226 @@ currencyId0 = t6.settings.currencyId; t27 = currencyId0 == null; exchangeRate = A.getExchangeRate(t26, currencyId, t27 ? "1" : currencyId0); - for (t28 = new J.ArrayIterator(t3, t3.length, t5), value21 = value * exchangeRate, value22 = value0 * exchangeRate, value23 = value1 * exchangeRate, value24 = value2 * exchangeRate, t29 = staticState.countryMap, t30 = staticState.sizeMap, t31 = staticState.industryMap, t32 = staticState.languageMap, t33 = t24.languageId, skip = false; t28.moveNext$0();) { - t34 = t28.__interceptors$_current; - switch (t34) { + for (t28 = new J.ArrayIterator(t3, t3.length, t5), t29 = value * exchangeRate, t30 = value0 * exchangeRate, t31 = value1 * exchangeRate, t32 = value2 * exchangeRate, t33 = staticState.countryMap, t34 = staticState.sizeMap, t35 = staticState.industryMap, t36 = staticState.languageMap, t37 = t24.languageId, skip = false; t28.moveNext$0();) { + t38 = t28.__interceptors$_current; + switch (t38) { case B.ContactReportFields_0: - value25 = t25.id; + value21 = t25.id; break; case B.ContactReportFields_1: - value25 = value20; + value21 = value20; break; case B.ContactReportFields_2: - value25 = value19; + value21 = value19; break; case B.ContactReportFields_3: - t35 = t26._map$_map.$index(0, currencyId); - value25 = t35 == null ? _null : t35.name; - if (value25 == null) - value25 = ""; + t39 = t26._map$_map.$index(0, currencyId); + value21 = t39 == null ? _null : t39.name; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_4: - t35 = t32._map$_map.$index(0, t33); - value25 = t35 == null ? _null : t35.name; - if (value25 == null) - value25 = ""; + t39 = t36._map$_map.$index(0, t37); + value21 = t39 == null ? _null : t39.name; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_5: - value25 = value18; + value21 = value18; break; case B.ContactReportFields_6: - value25 = value17; + value21 = value17; break; case B.ContactReportFields_7: - t35 = t31._map$_map.$index(0, t23); - value25 = t35 == null ? _null : t35.name; - if (value25 == null) - value25 = ""; + t39 = t35._map$_map.$index(0, t23); + value21 = t39 == null ? _null : t39.name; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_8: - t35 = t30._map$_map.$index(0, t22); - value25 = t35 == null ? _null : t35.name; - if (value25 == null) - value25 = ""; + t39 = t34._map$_map.$index(0, t22); + value21 = t39 == null ? _null : t39.name; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_22: - value25 = A.presentCustomField(t6, "client1", t21); + value21 = A.presentCustomField(t6, "client1", t21); break; case B.ContactReportFields_23: - value25 = A.presentCustomField(t6, "client2", t20); + value21 = A.presentCustomField(t6, "client2", t20); break; case B.ContactReportFields_24: - value25 = A.presentCustomField(t6, "client3", t19); + value21 = A.presentCustomField(t6, "client3", t19); break; case B.ContactReportFields_25: - value25 = A.presentCustomField(t6, "client4", t18); + value21 = A.presentCustomField(t6, "client4", t18); break; case B.ContactReportFields_9: - value25 = value16; + value21 = value16; break; case B.ContactReportFields_10: - value25 = value15; + value21 = value15; break; case B.ContactReportFields_11: - value25 = value14; + value21 = value14; break; case B.ContactReportFields_12: - value25 = value13; + value21 = value13; break; case B.ContactReportFields_13: - value25 = value12; + value21 = value12; break; case B.ContactReportFields_15: - t35 = t29._map$_map.$index(0, t17); - value25 = t35 == null ? _null : t35.name; - if (value25 == null) - value25 = ""; + t39 = t33._map$_map.$index(0, t17); + value21 = t39 == null ? _null : t39.name; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_16: - value25 = value11; + value21 = value11; break; case B.ContactReportFields_17: - value25 = value10; + value21 = value10; break; case B.ContactReportFields_18: - value25 = value9; + value21 = value9; break; case B.ContactReportFields_19: - value25 = value8; + value21 = value8; break; case B.ContactReportFields_20: - value25 = value7; + value21 = value7; break; case B.ContactReportFields_21: - t35 = t29._map$_map.$index(0, t16); - value25 = t35 == null ? _null : t35.name; - if (value25 == null) - value25 = ""; + t39 = t33._map$_map.$index(0, t16); + value21 = t39 == null ? _null : t39.name; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_14: - value25 = value6; + value21 = value6; break; case B.ContactReportFields_36: - value25 = value5; + value21 = value5; break; case B.ContactReportFields_37: - value25 = value4; + value21 = value4; break; case B.ContactReportFields_38: - value25 = value3; + value21 = value3; break; case B.ContactReportFields_27: - t35 = userMap._map$_map.$index(0, t15); - if (t35 == null) - value25 = _null; + t39 = userMap._map$_map.$index(0, t15); + if (t39 == null) + value21 = _null; else { - t36 = B.JSString_methods.trim$0(t35.firstName + " " + t35.lastName); - t35 = t36.length !== 0 ? t36 : t35.email; - value25 = t35; + t40 = B.JSString_methods.trim$0(t39.firstName + " " + t39.lastName); + t39 = t40.length !== 0 ? t40 : t39.email; + value21 = t39; } - if (value25 == null) - value25 = ""; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_26: - t35 = userMap._map$_map.$index(0, t14); - if (t35 == null) - value25 = _null; + t39 = userMap._map$_map.$index(0, t14); + if (t39 == null) + value21 = _null; else { - t36 = B.JSString_methods.trim$0(t35.firstName + " " + t35.lastName); - t35 = t36.length !== 0 ? t36 : t35.email; - value25 = t35; + t40 = B.JSString_methods.trim$0(t39.firstName + " " + t39.lastName); + t39 = t40.length !== 0 ? t40 : t39.email; + value21 = t39; } - if (value25 == null) - value25 = ""; + if (value21 == null) + value21 = ""; break; case B.ContactReportFields_39: - value25 = B.JSString_methods.trim$0(t25.firstName + " " + t25.lastName); + value21 = B.JSString_methods.trim$0(t25.firstName + " " + t25.lastName); break; case B.ContactReportFields_40: - value25 = t25.firstName; + value21 = t25.firstName; break; case B.ContactReportFields_41: - value25 = t25.lastName; + value21 = t25.lastName; break; case B.ContactReportFields_42: - value25 = t25.email; + value21 = t25.email; break; case B.ContactReportFields_43: - value25 = t25.phone; + value21 = t25.phone; break; case B.ContactReportFields_44: - value25 = A.presentCustomField(t6, "contact1", t25.customValue1); + value21 = A.presentCustomField(t6, "contact1", t25.customValue1); break; case B.ContactReportFields_45: - value25 = A.presentCustomField(t6, "contact2", t25.customValue2); + value21 = A.presentCustomField(t6, "contact2", t25.customValue2); break; case B.ContactReportFields_46: - value25 = A.presentCustomField(t6, "contact3", t25.customValue3); + value21 = A.presentCustomField(t6, "contact3", t25.customValue3); break; case B.ContactReportFields_47: - value25 = A.presentCustomField(t6, "contact4", t25.customValue4); + value21 = A.presentCustomField(t6, "contact4", t25.customValue4); break; case B.ContactReportFields_48: - t35 = t25.lastLogin; - t35 *= 1000; - t36 = new A.DateTime(t35, true); - t36.DateTime$_withValue$2$isUtc(t35, true); - value25 = t36.toIso8601String$0(); + t39 = t25.lastLogin; + t39 *= 1000; + t40 = new A.DateTime(t39, true); + t40.DateTime$_withValue$2$isUtc(t39, true); + value21 = t40.toIso8601String$0(); break; case B.ContactReportFields_31: - value25 = t25.isPrimary ? value2 : 0; + value21 = t25.isPrimary ? value2 : 0; break; case B.ContactReportFields_28: - value25 = t25.isPrimary ? value1 : 0; + value21 = t25.isPrimary ? value1 : 0; break; case B.ContactReportFields_29: - value25 = t25.isPrimary ? value0 : 0; + value21 = t25.isPrimary ? value0 : 0; break; case B.ContactReportFields_30: - value25 = t25.isPrimary ? value : 0; + value21 = t25.isPrimary ? value : 0; break; case B.ContactReportFields_35: - value25 = t25.isPrimary ? value24 : 0; + value21 = t25.isPrimary ? A.round(t32, 2) : 0; break; case B.ContactReportFields_32: - value25 = t25.isPrimary ? value23 : 0; + value21 = t25.isPrimary ? A.round(t31, 2) : 0; break; case B.ContactReportFields_33: - value25 = t25.isPrimary ? value22 : 0; + value21 = t25.isPrimary ? A.round(t30, 2) : 0; break; case B.ContactReportFields_34: - value25 = t25.isPrimary ? value21 : 0; + value21 = t25.isPrimary ? A.round(t29, 2) : 0; break; case B.ContactReportFields_49: - t35 = t13 && true; - value25 = !t35 && true; + t39 = t13 && true; + value21 = !t39 && true; break; case B.ContactReportFields_51: - t35 = new A.DateTime(t12, true); - t35.DateTime$_withValue$2$isUtc(t12, true); - value25 = t35.toIso8601String$0(); + t39 = new A.DateTime(t12, true); + t39.DateTime$_withValue$2$isUtc(t12, true); + value21 = t39.toIso8601String$0(); break; case B.ContactReportFields_50: - t35 = new A.DateTime(t11, true); - t35.DateTime$_withValue$2$isUtc(t11, true); - value25 = t35.toIso8601String$0(); + t39 = new A.DateTime(t11, true); + t39.DateTime$_withValue$2$isUtc(t11, true); + value21 = t39.toIso8601String$0(); break; default: - value25 = ""; + value21 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t34), _null, reportsUIState, userCompany, value25)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t38), _null, reportsUIState, userCompany, value21)) skip = true; - t35 = J.getInterceptor$(value25); - if (t35.get$runtimeType(value25) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value25, client.get$entityType(), t10)); - else if (t35.get$runtimeType(value25) === B.Type_double_K1J || t35.get$runtimeType(value25) === B.Type_int_tHn) { - if (B.JSArray_methods.contains$1(A._setArrayType([B.ContactReportFields_32, B.ContactReportFields_33, B.ContactReportFields_34, B.ContactReportFields_35], t1), t34)) + t39 = J.getInterceptor$(value21); + if (t39.get$runtimeType(value21) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value21, client.get$entityType(), t10)); + else if (t39.get$runtimeType(value21) === B.Type_double_K1J || t39.get$runtimeType(value21) === B.Type_int_tHn) { + if (B.JSArray_methods.contains$1(A._setArrayType([B.ContactReportFields_32, B.ContactReportFields_33, B.ContactReportFields_34, B.ContactReportFields_35], t1), t38)) currencyId1 = t27 ? "1" : currencyId0; else currencyId1 = currencyId; - row.push(new A.ReportNumberValue(value25, _null, currencyId1, exchangeRate, client.get$entityType(), t10)); + row.push(new A.ReportNumberValue(value21, _null, currencyId1, exchangeRate, client.get$entityType(), t10)); } else - row.push(new A.ReportStringValue(A.S(value25), client.get$entityType(), t10)); + row.push(new A.ReportStringValue(A.S(value21), client.get$entityType(), t10)); } if (!skip) data.push(row); @@ -99681,7 +99681,7 @@ contactReport_closure4: function contactReport_closure4() { }, creditReport(userCompany, reportsUIState, creditMap, clientMap, userMap, staticState) { - var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, credit, t9, client, contact, value, row, value0, t10, value1, t11, value2, value3, value4, value5, value6, t12, value7, t13, t14, t15, value8, value9, value10, value11, value12, value13, value14, value15, value16, value17, t16, value18, value19, value20, t17, value21, value22, value23, value24, t18, t19, t20, t21, value25, value26, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, value39, value40, t22, skip, t23, value41, t24, t25, currencyId, selectedColumns, _null = null, + var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, credit, t9, client, contact, value, row, value0, t10, value1, t11, value2, value3, value4, value5, value6, t12, value7, t13, t14, t15, value8, value9, value10, value11, value12, value13, value14, value15, value16, value17, t16, value18, value19, value20, t17, value21, value22, value23, value24, t18, t19, t20, t21, value25, value26, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, t22, t23, t24, skip, t25, value39, t26, t27, currencyId, selectedColumns, _null = null, data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), entities = A._setArrayType([], type$.JSArray_legacy_BaseEntity), t1 = userCompany.settings, @@ -99712,254 +99712,254 @@ if (!t6.reportIncludeDrafts && credit.statusId === "1") continue; row = A._setArrayType([], t7); - for (t9 = new J.ArrayIterator(t3, t3.length, t5), value0 = credit.id, t10 = credit.entityType, value1 = client.number, t11 = client.shippingCountryId, value2 = client.shippingPostalCode, value3 = client.shippingState, value4 = client.shippingCity, value5 = client.state, value6 = client.website, t12 = contact == null, value7 = client.phone, t13 = credit.createdUserId, t14 = credit.assignedUserId, t15 = client.settings, value8 = client.city, value9 = credit.privateNotes, value10 = credit.publicNotes, value11 = credit.taxRate1, value12 = credit.taxName1, value13 = credit.taxRate2, value14 = credit.taxName2, value15 = client.vatNumber, value16 = client.postalCode, value17 = credit.exchangeRate, t16 = client.countryId, value18 = credit.amount, value19 = credit.taxAmount, value20 = value18 - value19, t17 = credit.createdAt, value21 = credit.customSurcharge4, value22 = credit.customSurcharge3, value23 = credit.customSurcharge2, value24 = credit.customSurcharge1, t18 = credit.customValue4, t19 = credit.customValue3, t20 = credit.customValue2, t21 = credit.customValue1, value25 = credit.autoBill, value26 = credit.partialDueDate, value27 = credit.partial, value28 = credit.dueDate, value29 = credit.date, value30 = credit.poNumber, value31 = credit.discount, value32 = credit.number, value33 = client.shippingAddress2, value34 = client.shippingAddress1, value35 = client.address2, value36 = client.address1, value37 = client.balance, value38 = credit.balance, value39 = value38 / value17, value40 = value18 / value17, t17 *= 1000, t22 = t6.settings, skip = false; t9.moveNext$0();) { - t23 = t9.__interceptors$_current; - switch (t23) { + for (t9 = new J.ArrayIterator(t3, t3.length, t5), value0 = credit.id, t10 = credit.entityType, value1 = client.number, t11 = client.shippingCountryId, value2 = client.shippingPostalCode, value3 = client.shippingState, value4 = client.shippingCity, value5 = client.state, value6 = client.website, t12 = contact == null, value7 = client.phone, t13 = credit.createdUserId, t14 = credit.assignedUserId, t15 = client.settings, value8 = client.city, value9 = credit.privateNotes, value10 = credit.publicNotes, value11 = credit.taxRate1, value12 = credit.taxName1, value13 = credit.taxRate2, value14 = credit.taxName2, value15 = client.vatNumber, value16 = client.postalCode, value17 = credit.exchangeRate, t16 = client.countryId, value18 = credit.amount, value19 = credit.taxAmount, value20 = value18 - value19, t17 = credit.createdAt, value21 = credit.customSurcharge4, value22 = credit.customSurcharge3, value23 = credit.customSurcharge2, value24 = credit.customSurcharge1, t18 = credit.customValue4, t19 = credit.customValue3, t20 = credit.customValue2, t21 = credit.customValue1, value25 = credit.autoBill, value26 = credit.partialDueDate, value27 = credit.partial, value28 = credit.dueDate, value29 = credit.date, value30 = credit.poNumber, value31 = credit.discount, value32 = credit.number, value33 = client.shippingAddress2, value34 = client.shippingAddress1, value35 = client.address2, value36 = client.address1, value37 = client.balance, value38 = credit.balance, t22 = value38 / value17, t23 = value18 / value17, t17 *= 1000, t24 = t6.settings, skip = false; t9.moveNext$0();) { + t25 = t9.__interceptors$_current; + switch (t25) { case B.CreditReportFields_0: - value41 = value0; + value39 = value0; break; case B.CreditReportFields_1: - value41 = value18; + value39 = value18; break; case B.CreditReportFields_2: - value41 = value38; + value39 = value38; break; case B.CreditReportFields_3: - value41 = value40; + value39 = A.round(t23, 2); break; case B.CreditReportFields_4: - value41 = value39; + value39 = A.round(t22, 2); break; case B.CreditReportFields_5: - value41 = client.displayName; + value39 = client.displayName; break; case B.CreditReportFields_7: - value41 = value37; + value39 = value37; break; case B.CreditReportFields_8: - value41 = value36; + value39 = value36; break; case B.CreditReportFields_9: - value41 = value35; + value39 = value35; break; case B.CreditReportFields_11: - value41 = value34; + value39 = value34; break; case B.CreditReportFields_12: - value41 = value33; + value39 = value33; break; case B.CreditReportFields_18: - value41 = B.Map_qBa3g.$index(0, credit.get$calculatedStatusId()); - if (value41 == null) - value41 = ""; + value39 = B.Map_qBa3g.$index(0, credit.get$calculatedStatusId()); + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_19: - value41 = value32; + value39 = value32; break; case B.CreditReportFields_20: - value41 = value31; + value39 = value31; break; case B.CreditReportFields_21: - value41 = value30; + value39 = value30; break; case B.CreditReportFields_22: - value41 = value29; + value39 = value29; break; case B.CreditReportFields_23: - value41 = value28; + value39 = value28; break; case B.CreditReportFields_24: - value41 = value27; + value39 = value27; break; case B.CreditReportFields_25: - value41 = value26; + value39 = value26; break; case B.CreditReportFields_26: - value41 = value25; + value39 = value25; break; case B.CreditReportFields_27: - value41 = A.presentCustomField(t6, "invoice1", t21); + value39 = A.presentCustomField(t6, "invoice1", t21); break; case B.CreditReportFields_28: - value41 = A.presentCustomField(t6, "invoice2", t20); + value39 = A.presentCustomField(t6, "invoice2", t20); break; case B.CreditReportFields_29: - value41 = A.presentCustomField(t6, "invoice3", t19); + value39 = A.presentCustomField(t6, "invoice3", t19); break; case B.CreditReportFields_30: - value41 = A.presentCustomField(t6, "invoice4", t18); + value39 = A.presentCustomField(t6, "invoice4", t18); break; case B.CreditReportFields_31: - value41 = value24; + value39 = value24; break; case B.CreditReportFields_32: - value41 = value23; + value39 = value23; break; case B.CreditReportFields_33: - value41 = value22; + value39 = value22; break; case B.CreditReportFields_34: - value41 = value21; + value39 = value21; break; case B.CreditReportFields_35: - t24 = new A.DateTime(t17, true); - t24.DateTime$_withValue$2$isUtc(t17, true); - value41 = t24.toIso8601String$0(); + t26 = new A.DateTime(t17, true); + t26.DateTime$_withValue$2$isUtc(t17, true); + value39 = t26.toIso8601String$0(); break; case B.CreditReportFields_36: - t24 = new A.DateTime(t17, true); - t24.DateTime$_withValue$2$isUtc(t17, true); - value41 = t24.toIso8601String$0(); + t26 = new A.DateTime(t17, true); + t26.DateTime$_withValue$2$isUtc(t17, true); + value39 = t26.toIso8601String$0(); break; case B.CreditReportFields_37: - value41 = value; + value39 = value; break; case B.CreditReportFields_38: - value41 = value19; + value39 = value19; break; case B.CreditReportFields_39: - value41 = value20; + value39 = value20; break; case B.CreditReportFields_40: - value41 = credit.get$netBalance(); + value39 = credit.get$netBalance(); break; case B.CreditReportFields_10: - t24 = staticState.countryMap._map$_map.$index(0, t16); - value41 = t24 == null ? _null : t24.name; - if (value41 == null) - value41 = ""; + t26 = staticState.countryMap._map$_map.$index(0, t16); + value39 = t26 == null ? _null : t26.name; + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_41: - value41 = value17; + value39 = value17; break; case B.CreditReportFields_46: - value41 = value16; + value39 = value16; break; case B.CreditReportFields_44: - value41 = value15; + value39 = value15; break; case B.CreditReportFields_51: - value41 = value12; + value39 = value12; break; case B.CreditReportFields_48: - value41 = value11; + value39 = value11; break; case B.CreditReportFields_52: - value41 = value14; + value39 = value14; break; case B.CreditReportFields_49: - value41 = value13; + value39 = value13; break; case B.CreditReportFields_53: - value41 = value12; + value39 = value12; break; case B.CreditReportFields_50: - value41 = value11; + value39 = value11; break; case B.CreditReportFields_42: - value41 = value10; + value39 = value10; break; case B.CreditReportFields_43: - value41 = value9; + value39 = value9; break; case B.CreditReportFields_45: - value41 = value8; + value39 = value8; break; case B.CreditReportFields_54: - t24 = staticState.currencyMap; - t25 = t15.currencyId; - t25 = t24._map$_map.$index(0, t25); - value41 = t25 == null ? _null : t25.name; - if (value41 == null) - value41 = ""; + t26 = staticState.currencyMap; + t27 = t15.currencyId; + t27 = t26._map$_map.$index(0, t27); + value39 = t27 == null ? _null : t27.name; + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_55: - value41 = credit.get$isViewed(); + value39 = credit.get$isViewed(); break; case B.CreditReportFields_56: - t24 = userMap._map$_map.$index(0, t14); - if (t24 == null) - value41 = _null; + t26 = userMap._map$_map.$index(0, t14); + if (t26 == null) + value39 = _null; else { - t25 = B.JSString_methods.trim$0(t24.firstName + " " + t24.lastName); - t24 = t25.length !== 0 ? t25 : t24.email; - value41 = t24; + t27 = B.JSString_methods.trim$0(t26.firstName + " " + t26.lastName); + t26 = t27.length !== 0 ? t27 : t26.email; + value39 = t26; } - if (value41 == null) - value41 = ""; + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_57: - t24 = userMap._map$_map.$index(0, t13); - if (t24 == null) - value41 = _null; + t26 = userMap._map$_map.$index(0, t13); + if (t26 == null) + value39 = _null; else { - t25 = B.JSString_methods.trim$0(t24.firstName + " " + t24.lastName); - t24 = t25.length !== 0 ? t25 : t24.email; - value41 = t24; + t27 = B.JSString_methods.trim$0(t26.firstName + " " + t26.lastName); + t26 = t27.length !== 0 ? t27 : t26.email; + value39 = t26; } - if (value41 == null) - value41 = ""; + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_58: - value41 = value7; + value39 = value7; break; case B.CreditReportFields_59: - value41 = t12 ? _null : contact.email; - if (value41 == null) - value41 = ""; + value39 = t12 ? _null : contact.email; + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_61: - value41 = t12 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); - if (value41 == null) - value41 = ""; + value39 = t12 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_60: - value41 = t12 ? _null : contact.phone; - if (value41 == null) - value41 = ""; + value39 = t12 ? _null : contact.phone; + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_47: - value41 = value6; + value39 = value6; break; case B.CreditReportFields_13: - value41 = value5; + value39 = value5; break; case B.CreditReportFields_14: - value41 = value4; + value39 = value4; break; case B.CreditReportFields_15: - value41 = value3; + value39 = value3; break; case B.CreditReportFields_16: - value41 = value2; + value39 = value2; break; case B.CreditReportFields_17: - t24 = staticState.countryMap._map$_map.$index(0, t11); - value41 = t24 == null ? _null : t24.name; - if (value41 == null) - value41 = ""; + t26 = staticState.countryMap._map$_map.$index(0, t11); + value39 = t26 == null ? _null : t26.name; + if (value39 == null) + value39 = ""; break; case B.CreditReportFields_6: - value41 = value1; + value39 = value1; break; default: - value41 = ""; + value39 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t23), _null, reportsUIState, userCompany, value41)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t25), _null, reportsUIState, userCompany, value39)) skip = true; - t24 = J.getInterceptor$(value41); - if (t24.get$runtimeType(value41) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value41, t10, value0)); - else if (t24.get$runtimeType(value41) === B.Type_double_K1J || t24.get$runtimeType(value41) === B.Type_int_tHn) { + t26 = J.getInterceptor$(value39); + if (t26.get$runtimeType(value39) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value39, t10, value0)); + else if (t26.get$runtimeType(value39) === B.Type_double_K1J || t26.get$runtimeType(value39) === B.Type_int_tHn) { currencyId = t15.currencyId; - if (B.JSArray_methods.contains$1(A._setArrayType([B.CreditReportFields_3, B.CreditReportFields_4], t1), t23)) { - currencyId = t22.currencyId; + if (B.JSArray_methods.contains$1(A._setArrayType([B.CreditReportFields_3, B.CreditReportFields_4], t1), t25)) { + currencyId = t24.currencyId; if (currencyId == null) currencyId = "1"; } - row.push(new A.ReportNumberValue(value41, _null, currencyId, value17, t10, value0)); + row.push(new A.ReportNumberValue(value39, _null, currencyId, value17, t10, value0)); } else - row.push(new A.ReportStringValue(value41, t10, value0)); + row.push(new A.ReportStringValue(value39, t10, value0)); } if (!skip) { data.push(row); @@ -100477,7 +100477,7 @@ lineItemReport_closure10: function lineItemReport_closure10() { }, invoiceReport(userCompany, reportsUIState, invoiceMap, clientMap, userMap, vendorMap, projectMap, staticState) { - var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, invoice, t9, client, contact, value, row, value0, t10, value1, t11, t12, value2, value3, t13, value4, value5, value6, value7, value8, t14, value9, t15, t16, t17, t18, t19, value10, value11, value12, value13, value14, value15, value16, value17, value18, t20, value19, value20, value21, value22, t21, value23, value24, value25, value26, t22, t23, t24, t25, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, value39, value40, value41, value42, value43, value44, value45, t26, skip, t27, value46, t28, t29, currencyId, selectedColumns, _null = null, + var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, invoice, t9, client, contact, value, row, value0, t10, value1, t11, t12, value2, value3, t13, value4, value5, value6, value7, value8, t14, value9, t15, t16, t17, t18, t19, value10, value11, value12, value13, value14, value15, value16, value17, value18, t20, value19, t21, t22, value20, value21, value22, t23, value23, value24, value25, value26, t24, t25, t26, t27, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, value39, value40, value41, value42, value43, value44, t28, t29, skip, t30, value45, t31, t32, currencyId, selectedColumns, _null = null, data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), entities = A._setArrayType([], type$.JSArray_legacy_BaseEntity), t1 = userCompany.settings, @@ -100508,303 +100508,337 @@ if (!t6.reportIncludeDrafts && invoice.statusId === "1") continue; row = A._setArrayType([], t7); - for (t9 = new J.ArrayIterator(t3, t3.length, t5), value0 = invoice.id, t10 = invoice.entityType, value1 = invoice.balance, t11 = t10 === B.EntityType_invoice, t12 = invoice.statusId, value2 = t12 === "4", value3 = client.number, t13 = client.shippingCountryId, value4 = client.shippingPostalCode, value5 = client.shippingState, value6 = client.shippingCity, value7 = client.state, value8 = client.website, t14 = contact == null, value9 = client.phone, t15 = invoice.vendorId, t16 = invoice.projectId, t17 = invoice.createdUserId, t18 = invoice.assignedUserId, t19 = client.settings, value10 = client.city, value11 = invoice.privateNotes, value12 = invoice.publicNotes, value13 = invoice.taxRate1, value14 = invoice.taxName1, value15 = invoice.taxRate2, value16 = invoice.taxName2, value17 = client.vatNumber, value18 = client.postalCode, t20 = client.countryId, value19 = invoice.exchangeRate, value20 = invoice.amount, value21 = invoice.taxAmount, value22 = value20 - value21, t21 = invoice.createdAt, value23 = invoice.customSurcharge4, value24 = invoice.customSurcharge3, value25 = invoice.customSurcharge2, value26 = invoice.customSurcharge1, t22 = invoice.customValue4, t23 = invoice.customValue3, t24 = invoice.customValue2, t25 = invoice.customValue1, value27 = invoice.autoBill, value28 = invoice.partialDueDate, value29 = invoice.partial, value30 = invoice.dueDate, value31 = invoice.reminderLastSent, value32 = invoice.reminder3Sent, value33 = invoice.reminder2Sent, value34 = invoice.reminder1Sent, value35 = invoice.date, value36 = invoice.poNumber, value37 = invoice.discount, value38 = invoice.number, value39 = client.shippingAddress2, value40 = client.shippingAddress1, value41 = client.address2, value42 = client.address1, value43 = client.balance, value44 = client.displayName, t12 = t12 !== "1", value45 = value20 / value19, t21 *= 1000, t26 = t6.settings, skip = false; t9.moveNext$0();) { - t27 = t9.__interceptors$_current; - switch (t27) { + for (t9 = new J.ArrayIterator(t3, t3.length, t5), value0 = invoice.id, t10 = invoice.entityType, value1 = invoice.balance, t11 = t10 === B.EntityType_invoice, t12 = invoice.statusId, value2 = t12 === "4", value3 = client.number, t13 = client.shippingCountryId, value4 = client.shippingPostalCode, value5 = client.shippingState, value6 = client.shippingCity, value7 = client.state, value8 = client.website, t14 = contact == null, value9 = client.phone, t15 = invoice.vendorId, t16 = invoice.projectId, t17 = invoice.createdUserId, t18 = invoice.assignedUserId, t19 = client.settings, value10 = client.city, value11 = invoice.privateNotes, value12 = invoice.publicNotes, value13 = invoice.taxRate1, value14 = invoice.taxName1, value15 = invoice.taxRate2, value16 = invoice.taxName2, value17 = client.vatNumber, value18 = client.postalCode, t20 = client.countryId, value19 = invoice.exchangeRate, t21 = t12 === "5", t22 = t10 === B.EntityType_purchaseOrder, value20 = invoice.amount, value21 = invoice.taxAmount, value22 = value20 - value21, t23 = invoice.createdAt, value23 = invoice.customSurcharge4, value24 = invoice.customSurcharge3, value25 = invoice.customSurcharge2, value26 = invoice.customSurcharge1, t24 = invoice.customValue4, t25 = invoice.customValue3, t26 = invoice.customValue2, t27 = invoice.customValue1, value27 = invoice.autoBill, value28 = invoice.partialDueDate, value29 = invoice.partial, value30 = invoice.dueDate, value31 = invoice.reminderLastSent, value32 = invoice.reminder3Sent, value33 = invoice.reminder2Sent, value34 = invoice.reminder1Sent, value35 = invoice.date, value36 = invoice.poNumber, value37 = invoice.discount, value38 = invoice.number, value39 = client.shippingAddress2, value40 = client.shippingAddress1, value41 = client.address2, value42 = client.address1, value43 = client.balance, value44 = client.displayName, t12 = t12 !== "1", t28 = value20 / value19, t23 *= 1000, t29 = t6.settings, skip = false; t9.moveNext$0();) { + t30 = t9.__interceptors$_current; + switch (t30) { case B.InvoiceReportFields_0: - value46 = value0; + value45 = value0; break; case B.InvoiceReportFields_1: - value46 = value20; + if (!(t11 && t21)) + t31 = t22 && value2; + else + t31 = true; + value45 = t31 ? 0 : value20; break; case B.InvoiceReportFields_2: - value46 = t12 ? value1 : value20; + if (!(t11 && t21)) + t31 = t22 && value2; + else + t31 = true; + if (t31) + value45 = 0; + else + value45 = t12 ? value1 : value20; break; case B.InvoiceReportFields_3: - value46 = value45; + if (!(t11 && t21)) + t31 = t22 && value2; + else + t31 = true; + value45 = t31 ? 0 : A.round(t28, 2); break; case B.InvoiceReportFields_4: - value46 = (t12 ? value1 : value20) / value19; + if (!(t11 && t21)) + t31 = t22 && value2; + else + t31 = true; + if (t31) + value45 = 0; + else + value45 = A.round((t12 ? value1 : value20) / value19, 2); break; case B.InvoiceReportFields_5: - value46 = value44; + value45 = value44; break; case B.InvoiceReportFields_7: - value46 = value43; + value45 = value43; break; case B.InvoiceReportFields_8: - value46 = value42; + value45 = value42; break; case B.InvoiceReportFields_9: - value46 = value41; + value45 = value41; break; case B.InvoiceReportFields_14: - value46 = value40; + value45 = value40; break; case B.InvoiceReportFields_15: - value46 = value39; + value45 = value39; break; case B.InvoiceReportFields_21: - value46 = B.Map_j34mP.$index(0, invoice.get$calculatedStatusId()); - if (value46 == null) - value46 = ""; + value45 = B.Map_j34mP.$index(0, invoice.get$calculatedStatusId()); + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_22: - value46 = value38; + value45 = value38; break; case B.InvoiceReportFields_23: - value46 = value37; + value45 = value37; break; case B.InvoiceReportFields_24: - value46 = value36; + value45 = value36; break; case B.InvoiceReportFields_25: - value46 = value35; + value45 = value35; break; case B.InvoiceReportFields_47: - value46 = value34; + value45 = value34; break; case B.InvoiceReportFields_48: - value46 = value33; + value45 = value33; break; case B.InvoiceReportFields_49: - value46 = value32; + value45 = value32; break; case B.InvoiceReportFields_50: - value46 = value31; + value45 = value31; break; case B.InvoiceReportFields_27: - value46 = t11 && value2 ? -1 : invoice.get$age(); + value45 = t11 && value2 ? -1 : invoice.get$age(); break; case B.InvoiceReportFields_26: - value46 = value30; + value45 = value30; break; case B.InvoiceReportFields_28: - value46 = value29; + value45 = value29; break; case B.InvoiceReportFields_29: - value46 = value28; + value45 = value28; break; case B.InvoiceReportFields_30: - value46 = value27; + value45 = value27; break; case B.InvoiceReportFields_31: - value46 = A.presentCustomField(t6, "invoice1", t25); + value45 = A.presentCustomField(t6, "invoice1", t27); break; case B.InvoiceReportFields_32: - value46 = A.presentCustomField(t6, "invoice2", t24); + value45 = A.presentCustomField(t6, "invoice2", t26); break; case B.InvoiceReportFields_33: - value46 = A.presentCustomField(t6, "invoice3", t23); + value45 = A.presentCustomField(t6, "invoice3", t25); break; case B.InvoiceReportFields_34: - value46 = A.presentCustomField(t6, "invoice4", t22); + value45 = A.presentCustomField(t6, "invoice4", t24); break; case B.InvoiceReportFields_35: - value46 = invoice.get$hasExpenses(); + value45 = invoice.get$hasExpenses(); break; case B.InvoiceReportFields_36: - value46 = invoice.get$hasTasks(); + value45 = invoice.get$hasTasks(); break; case B.InvoiceReportFields_37: - value46 = value26; + value45 = value26; break; case B.InvoiceReportFields_38: - value46 = value25; + value45 = value25; break; case B.InvoiceReportFields_39: - value46 = value24; + value45 = value24; break; case B.InvoiceReportFields_40: - value46 = value23; + value45 = value23; break; case B.InvoiceReportFields_41: - t28 = new A.DateTime(t21, true); - t28.DateTime$_withValue$2$isUtc(t21, true); - value46 = t28.toIso8601String$0(); + t31 = new A.DateTime(t23, true); + t31.DateTime$_withValue$2$isUtc(t23, true); + value45 = t31.toIso8601String$0(); break; case B.InvoiceReportFields_42: - t28 = new A.DateTime(t21, true); - t28.DateTime$_withValue$2$isUtc(t21, true); - value46 = t28.toIso8601String$0(); + t31 = new A.DateTime(t23, true); + t31.DateTime$_withValue$2$isUtc(t23, true); + value45 = t31.toIso8601String$0(); break; case B.InvoiceReportFields_43: - value46 = value; + value45 = value; break; case B.InvoiceReportFields_44: - value46 = value21; + if (!(t11 && t21)) + t31 = t22 && value2; + else + t31 = true; + value45 = t31 ? 0 : value21; break; case B.InvoiceReportFields_45: - value46 = value22; + if (!(t11 && t21)) + t31 = t22 && value2; + else + t31 = true; + value45 = t31 ? 0 : value22; break; case B.InvoiceReportFields_46: - value46 = invoice.get$netBalanceOrAmount(); + if (!(t11 && t21)) + t31 = t22 && value2; + else + t31 = true; + value45 = t31 ? 0 : invoice.get$netBalanceOrAmount(); break; case B.InvoiceReportFields_51: - value46 = value19; + value45 = value19; break; case B.InvoiceReportFields_13: - t28 = staticState.countryMap._map$_map.$index(0, t20); - value46 = t28 == null ? _null : t28.name; - if (value46 == null) - value46 = ""; + t31 = staticState.countryMap._map$_map.$index(0, t20); + value45 = t31 == null ? _null : t31.name; + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_12: - value46 = value18; + value45 = value18; break; case B.InvoiceReportFields_10: - value46 = value17; + value45 = value17; break; case B.InvoiceReportFields_58: - value46 = value14; + value45 = value14; break; case B.InvoiceReportFields_55: - value46 = value13; + value45 = value13; break; case B.InvoiceReportFields_59: - value46 = value16; + value45 = value16; break; case B.InvoiceReportFields_56: - value46 = value15; + value45 = value15; break; case B.InvoiceReportFields_60: - value46 = value14; + value45 = value14; break; case B.InvoiceReportFields_57: - value46 = value13; + value45 = value13; break; case B.InvoiceReportFields_52: - value46 = value12; + value45 = value12; break; case B.InvoiceReportFields_53: - value46 = value11; + value45 = value11; break; case B.InvoiceReportFields_11: - value46 = value10; + value45 = value10; break; case B.InvoiceReportFields_61: - t28 = staticState.currencyMap; - t29 = t19.currencyId; - t29 = t28._map$_map.$index(0, t29); - value46 = t29 == null ? _null : t29.name; - if (value46 == null) - value46 = ""; + t31 = staticState.currencyMap; + t32 = t19.currencyId; + t32 = t31._map$_map.$index(0, t32); + value45 = t32 == null ? _null : t32.name; + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_62: - value46 = invoice.get$isViewed(); + value45 = invoice.get$isViewed(); break; case B.InvoiceReportFields_63: - t28 = userMap._map$_map.$index(0, t18); - if (t28 == null) - value46 = _null; + t31 = userMap._map$_map.$index(0, t18); + if (t31 == null) + value45 = _null; else { - t29 = B.JSString_methods.trim$0(t28.firstName + " " + t28.lastName); - t28 = t29.length !== 0 ? t29 : t28.email; - value46 = t28; + t32 = B.JSString_methods.trim$0(t31.firstName + " " + t31.lastName); + t31 = t32.length !== 0 ? t32 : t31.email; + value45 = t31; } - if (value46 == null) - value46 = ""; + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_64: - t28 = userMap._map$_map.$index(0, t17); - if (t28 == null) - value46 = _null; + t31 = userMap._map$_map.$index(0, t17); + if (t31 == null) + value45 = _null; else { - t29 = B.JSString_methods.trim$0(t28.firstName + " " + t28.lastName); - t28 = t29.length !== 0 ? t29 : t28.email; - value46 = t28; + t32 = B.JSString_methods.trim$0(t31.firstName + " " + t31.lastName); + t31 = t32.length !== 0 ? t32 : t31.email; + value45 = t31; } - if (value46 == null) - value46 = ""; + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_65: - t28 = projectMap._map$_map.$index(0, t16); - value46 = (t28 == null ? A.ProjectEntity_ProjectEntity(_null, _null, _null, _null) : t28).name; + t31 = projectMap._map$_map.$index(0, t16); + value45 = (t31 == null ? A.ProjectEntity_ProjectEntity(_null, _null, _null, _null) : t31).name; break; case B.InvoiceReportFields_66: - t28 = vendorMap._map$_map.$index(0, t15); - value46 = (t28 == null ? A.VendorEntity_VendorEntity(_null, _null, _null) : t28).name; + t31 = vendorMap._map$_map.$index(0, t15); + value45 = (t31 == null ? A.VendorEntity_VendorEntity(_null, _null, _null) : t31).name; break; case B.InvoiceReportFields_67: - value46 = t11 && value2; + value45 = t11 && value2; break; case B.InvoiceReportFields_68: - value46 = value9; + value45 = value9; break; case B.InvoiceReportFields_69: - value46 = t14 ? _null : contact.email; - if (value46 == null) - value46 = ""; + value45 = t14 ? _null : contact.email; + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_71: - value46 = t14 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); - if (value46 == null) - value46 = ""; + value45 = t14 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_70: - value46 = t14 ? _null : contact.phone; - if (value46 == null) - value46 = ""; + value45 = t14 ? _null : contact.phone; + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_54: - value46 = value8; + value45 = value8; break; case B.InvoiceReportFields_16: - value46 = value7; + value45 = value7; break; case B.InvoiceReportFields_17: - value46 = value6; + value45 = value6; break; case B.InvoiceReportFields_18: - value46 = value5; + value45 = value5; break; case B.InvoiceReportFields_19: - value46 = value4; + value45 = value4; break; case B.InvoiceReportFields_20: - t28 = staticState.countryMap._map$_map.$index(0, t13); - value46 = t28 == null ? _null : t28.name; - if (value46 == null) - value46 = ""; + t31 = staticState.countryMap._map$_map.$index(0, t13); + value45 = t31 == null ? _null : t31.name; + if (value45 == null) + value45 = ""; break; case B.InvoiceReportFields_6: - value46 = value3; + value45 = value3; break; case B.InvoiceReportFields_72: - value46 = t11 && value2 || invoice.get$age() >= 30 ? 0 : value1; + value45 = t11 && value2 || invoice.get$age() >= 30 ? 0 : value1; break; case B.InvoiceReportFields_73: - value46 = t11 && value2 || invoice.get$age() < 30 || invoice.get$age() >= 60 ? 0 : value1; + value45 = t11 && value2 || invoice.get$age() < 30 || invoice.get$age() >= 60 ? 0 : value1; break; case B.InvoiceReportFields_74: - value46 = t11 && value2 || invoice.get$age() < 60 || invoice.get$age() >= 90 ? 0 : value1; + value45 = t11 && value2 || invoice.get$age() < 60 || invoice.get$age() >= 90 ? 0 : value1; break; case B.InvoiceReportFields_75: - value46 = t11 && value2 || invoice.get$age() < 90 || invoice.get$age() >= 120 ? 0 : value1; + value45 = t11 && value2 || invoice.get$age() < 90 || invoice.get$age() >= 120 ? 0 : value1; break; case B.InvoiceReportFields_76: - value46 = t11 && value2 || invoice.get$age() < 120 ? 0 : value1; + value45 = t11 && value2 || invoice.get$age() < 120 ? 0 : value1; break; default: - value46 = ""; + value45 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t27), _null, reportsUIState, userCompany, value46)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t30), _null, reportsUIState, userCompany, value45)) skip = true; - t28 = J.getInterceptor$(value46); - if (t28.get$runtimeType(value46) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value46, t10, value0)); - else if (t27 === B.InvoiceReportFields_27) - row.push(new A.ReportAgeValue(value46, t19.currencyId, t10, value0)); - else if (t28.get$runtimeType(value46) === B.Type_double_K1J || t28.get$runtimeType(value46) === B.Type_int_tHn) { + t31 = J.getInterceptor$(value45); + if (t31.get$runtimeType(value45) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value45, t10, value0)); + else if (t30 === B.InvoiceReportFields_27) + row.push(new A.ReportAgeValue(value45, t19.currencyId, t10, value0)); + else if (t31.get$runtimeType(value45) === B.Type_double_K1J || t31.get$runtimeType(value45) === B.Type_int_tHn) { currencyId = t19.currencyId; - if (B.JSArray_methods.contains$1(A._setArrayType([B.InvoiceReportFields_3, B.InvoiceReportFields_4], t1), t27)) { - currencyId = t26.currencyId; + if (B.JSArray_methods.contains$1(A._setArrayType([B.InvoiceReportFields_3, B.InvoiceReportFields_4], t1), t30)) { + currencyId = t29.currencyId; if (currencyId == null) currencyId = "1"; } - row.push(new A.ReportNumberValue(value46, _null, currencyId, value19, t10, value0)); + row.push(new A.ReportNumberValue(value45, _null, currencyId, value19, t10, value0)); } else - row.push(new A.ReportStringValue(value46, t10, value0)); + row.push(new A.ReportStringValue(value45, t10, value0)); } if (!skip) { data.push(row); @@ -101201,7 +101235,7 @@ value18 = value0; break; case B.PaymentReportFields_27: - value18 = payment.get$completedAmount() * value0; + value18 = A.round(payment.get$completedAmount() * value0, 2); break; case B.PaymentReportFields_28: t20 = paymentInvoiceMap.$index(0, value); @@ -101787,7 +101821,7 @@ profitAndLossReport_closure5: function profitAndLossReport_closure5() { }, purchaseOrderReport(userCompany, reportsUIState, purchaseOrderMap, clientMap, vendorMap, userMap, staticState) { - var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, t9, purchaseOrder, t10, vendor, contact, value, row, t11, t12, value0, value1, value2, t13, value3, t14, t15, currencyId, value4, value5, value6, value7, value8, value9, value10, value11, value12, t16, value13, value14, value15, value16, t17, t18, value17, value18, value19, value20, value21, value22, t19, t20, t21, t22, value23, value24, value25, value26, value27, value28, value29, value30, value31, value32, value33, value34, t23, skip, t24, value35, t25, t26, currencyId0, selectedColumns, _null = null, + var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, t9, purchaseOrder, t10, vendor, contact, value, row, t11, t12, value0, value1, value2, t13, value3, t14, t15, currencyId, value4, value5, value6, value7, value8, value9, value10, value11, value12, t16, value13, value14, value15, value16, t17, t18, value17, value18, value19, value20, value21, value22, t19, t20, t21, t22, value23, value24, value25, value26, value27, value28, value29, value30, value31, value32, value33, t23, t24, skip, t25, value34, t26, t27, currencyId0, selectedColumns, _null = null, _s14_ = "purchase_order", data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), entities = A._setArrayType([], type$.JSArray_legacy_BaseEntity), @@ -101819,218 +101853,218 @@ if (!t7.reportIncludeDrafts && purchaseOrder.statusId === "1") continue; row = A._setArrayType([], t8); - for (t10 = new J.ArrayIterator(t3, t3.length, t5), t11 = purchaseOrder.id, t12 = purchaseOrder.entityType, value0 = vendor.number, value1 = vendor.state, value2 = vendor.website, t13 = contact == null, value3 = vendor.phone, t14 = purchaseOrder.createdUserId, t15 = purchaseOrder.assignedUserId, currencyId = vendor.currencyId, value4 = vendor.city, value5 = purchaseOrder.privateNotes, value6 = purchaseOrder.publicNotes, value7 = purchaseOrder.taxRate1, value8 = purchaseOrder.taxName1, value9 = purchaseOrder.taxRate2, value10 = purchaseOrder.taxName2, value11 = vendor.vatNumber, value12 = vendor.postalCode, t16 = vendor.countryId, value13 = purchaseOrder.exchangeRate, value14 = purchaseOrder.amount, value15 = purchaseOrder.taxAmount, value16 = value14 - value15, t17 = t12 === B.EntityType_quote, t18 = purchaseOrder.statusId, value17 = purchaseOrder.archivedAt, value18 = purchaseOrder.updatedAt, value19 = purchaseOrder.customSurcharge4, value20 = purchaseOrder.customSurcharge3, value21 = purchaseOrder.customSurcharge2, value22 = purchaseOrder.customSurcharge1, t19 = purchaseOrder.customValue4, t20 = purchaseOrder.customValue3, t21 = purchaseOrder.customValue2, t22 = purchaseOrder.customValue1, value23 = purchaseOrder.autoBill, value24 = purchaseOrder.partial, value25 = purchaseOrder.dueDate, value26 = purchaseOrder.date, value27 = purchaseOrder.partialDueDate, value28 = purchaseOrder.poNumber, value29 = purchaseOrder.discount, value30 = vendor.address2, value31 = vendor.address1, value32 = vendor.name, value33 = purchaseOrder.number, value34 = value14 / value13, t23 = t7.settings, skip = false; t10.moveNext$0();) { - t24 = t10.__interceptors$_current; - switch (t24) { + for (t10 = new J.ArrayIterator(t3, t3.length, t5), t11 = purchaseOrder.id, t12 = purchaseOrder.entityType, value0 = vendor.number, value1 = vendor.state, value2 = vendor.website, t13 = contact == null, value3 = vendor.phone, t14 = purchaseOrder.createdUserId, t15 = purchaseOrder.assignedUserId, currencyId = vendor.currencyId, value4 = vendor.city, value5 = purchaseOrder.privateNotes, value6 = purchaseOrder.publicNotes, value7 = purchaseOrder.taxRate1, value8 = purchaseOrder.taxName1, value9 = purchaseOrder.taxRate2, value10 = purchaseOrder.taxName2, value11 = vendor.vatNumber, value12 = vendor.postalCode, t16 = vendor.countryId, value13 = purchaseOrder.exchangeRate, value14 = purchaseOrder.amount, value15 = purchaseOrder.taxAmount, value16 = value14 - value15, t17 = t12 === B.EntityType_quote, t18 = purchaseOrder.statusId, value17 = purchaseOrder.archivedAt, value18 = purchaseOrder.updatedAt, value19 = purchaseOrder.customSurcharge4, value20 = purchaseOrder.customSurcharge3, value21 = purchaseOrder.customSurcharge2, value22 = purchaseOrder.customSurcharge1, t19 = purchaseOrder.customValue4, t20 = purchaseOrder.customValue3, t21 = purchaseOrder.customValue2, t22 = purchaseOrder.customValue1, value23 = purchaseOrder.autoBill, value24 = purchaseOrder.partial, value25 = purchaseOrder.dueDate, value26 = purchaseOrder.date, value27 = purchaseOrder.partialDueDate, value28 = purchaseOrder.poNumber, value29 = purchaseOrder.discount, value30 = vendor.address2, value31 = vendor.address1, value32 = vendor.name, value33 = purchaseOrder.number, t23 = value14 / value13, t24 = t7.settings, skip = false; t10.moveNext$0();) { + t25 = t10.__interceptors$_current; + switch (t25) { case B.PurchaseOrderReportFields_0: - value35 = value14; + value34 = value14; break; case B.PurchaseOrderReportFields_1: - value35 = value14; + value34 = value14; break; case B.PurchaseOrderReportFields_2: - value35 = value34; + value34 = A.round(t23, 2); break; case B.PurchaseOrderReportFields_10: - value35 = value33; + value34 = value33; break; case B.PurchaseOrderReportFields_3: - value35 = value32; + value34 = value32; break; case B.PurchaseOrderReportFields_5: - value35 = value31; + value34 = value31; break; case B.PurchaseOrderReportFields_6: - value35 = value30; + value34 = value30; break; case B.PurchaseOrderReportFields_9: - value35 = B.Map_qBWJv.$index(0, purchaseOrder.get$calculatedStatusId()); - if (value35 == null) - value35 = ""; + value34 = B.Map_qBWJv.$index(0, purchaseOrder.get$calculatedStatusId()); + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_11: - value35 = value29; + value34 = value29; break; case B.PurchaseOrderReportFields_12: - value35 = value28; + value34 = value28; break; case B.PurchaseOrderReportFields_14: - value35 = value27; + value34 = value27; break; case B.PurchaseOrderReportFields_13: - value35 = value26; + value34 = value26; break; case B.PurchaseOrderReportFields_15: - value35 = value25; + value34 = value25; break; case B.PurchaseOrderReportFields_16: - value35 = value24; + value34 = value24; break; case B.PurchaseOrderReportFields_17: - value35 = value23; + value34 = value23; break; case B.PurchaseOrderReportFields_18: - value35 = A.presentCustomField(t7, "invoice1", t22); + value34 = A.presentCustomField(t7, "invoice1", t22); break; case B.PurchaseOrderReportFields_19: - value35 = A.presentCustomField(t7, "invoice2", t21); + value34 = A.presentCustomField(t7, "invoice2", t21); break; case B.PurchaseOrderReportFields_20: - value35 = A.presentCustomField(t7, "invoice3", t20); + value34 = A.presentCustomField(t7, "invoice3", t20); break; case B.PurchaseOrderReportFields_21: - value35 = A.presentCustomField(t7, "invoice4", t19); + value34 = A.presentCustomField(t7, "invoice4", t19); break; case B.PurchaseOrderReportFields_22: - value35 = value22; + value34 = value22; break; case B.PurchaseOrderReportFields_23: - value35 = value21; + value34 = value21; break; case B.PurchaseOrderReportFields_24: - value35 = value20; + value34 = value20; break; case B.PurchaseOrderReportFields_25: - value35 = value19; + value34 = value19; break; case B.PurchaseOrderReportFields_26: - value35 = value18; + value34 = value18; break; case B.PurchaseOrderReportFields_27: - value35 = value17; + value34 = value17; break; case B.PurchaseOrderReportFields_28: - value35 = value; + value34 = value; break; case B.PurchaseOrderReportFields_29: - value35 = t17 && B.JSArray_methods.contains$1(A._setArrayType(["3", "4"], t6), t18); + value34 = t17 && B.JSArray_methods.contains$1(A._setArrayType(["3", "4"], t6), t18); break; case B.PurchaseOrderReportFields_30: - value35 = value15; + value34 = value15; break; case B.PurchaseOrderReportFields_31: - value35 = value16; + value34 = value16; break; case B.PurchaseOrderReportFields_32: - value35 = value13; + value34 = value13; break; case B.PurchaseOrderReportFields_8: - t25 = staticState.countryMap._map$_map.$index(0, t16); - value35 = t25 == null ? _null : t25.name; - if (value35 == null) - value35 = ""; + t26 = staticState.countryMap._map$_map.$index(0, t16); + value34 = t26 == null ? _null : t26.name; + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_37: - value35 = value12; + value34 = value12; break; case B.PurchaseOrderReportFields_35: - value35 = value11; + value34 = value11; break; case B.PurchaseOrderReportFields_42: - value35 = value8; + value34 = value8; break; case B.PurchaseOrderReportFields_39: - value35 = value7; + value34 = value7; break; case B.PurchaseOrderReportFields_43: - value35 = value10; + value34 = value10; break; case B.PurchaseOrderReportFields_40: - value35 = value9; + value34 = value9; break; case B.PurchaseOrderReportFields_44: - value35 = value8; + value34 = value8; break; case B.PurchaseOrderReportFields_41: - value35 = value7; + value34 = value7; break; case B.PurchaseOrderReportFields_33: - value35 = value6; + value34 = value6; break; case B.PurchaseOrderReportFields_34: - value35 = value5; + value34 = value5; break; case B.PurchaseOrderReportFields_36: - value35 = value4; + value34 = value4; break; case B.PurchaseOrderReportFields_45: - t25 = staticState.currencyMap._map$_map.$index(0, currencyId); - value35 = t25 == null ? _null : t25.name; - if (value35 == null) - value35 = ""; + t26 = staticState.currencyMap._map$_map.$index(0, currencyId); + value34 = t26 == null ? _null : t26.name; + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_46: - value35 = purchaseOrder.get$isViewed(); + value34 = purchaseOrder.get$isViewed(); break; case B.PurchaseOrderReportFields_47: - t25 = userMap._map$_map.$index(0, t15); - if (t25 == null) - value35 = _null; + t26 = userMap._map$_map.$index(0, t15); + if (t26 == null) + value34 = _null; else { - t26 = B.JSString_methods.trim$0(t25.firstName + " " + t25.lastName); - t25 = t26.length !== 0 ? t26 : t25.email; - value35 = t25; + t27 = B.JSString_methods.trim$0(t26.firstName + " " + t26.lastName); + t26 = t27.length !== 0 ? t27 : t26.email; + value34 = t26; } - if (value35 == null) - value35 = ""; + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_48: - t25 = userMap._map$_map.$index(0, t14); - if (t25 == null) - value35 = _null; + t26 = userMap._map$_map.$index(0, t14); + if (t26 == null) + value34 = _null; else { - t26 = B.JSString_methods.trim$0(t25.firstName + " " + t25.lastName); - t25 = t26.length !== 0 ? t26 : t25.email; - value35 = t25; + t27 = B.JSString_methods.trim$0(t26.firstName + " " + t26.lastName); + t26 = t27.length !== 0 ? t27 : t26.email; + value34 = t26; } - if (value35 == null) - value35 = ""; + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_49: - value35 = value3; + value34 = value3; break; case B.PurchaseOrderReportFields_50: - value35 = t13 ? _null : contact.email; - if (value35 == null) - value35 = ""; + value34 = t13 ? _null : contact.email; + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_52: - value35 = t13 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); - if (value35 == null) - value35 = ""; + value34 = t13 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_51: - value35 = t13 ? _null : contact.phone; - if (value35 == null) - value35 = ""; + value34 = t13 ? _null : contact.phone; + if (value34 == null) + value34 = ""; break; case B.PurchaseOrderReportFields_38: - value35 = value2; + value34 = value2; break; case B.PurchaseOrderReportFields_7: - value35 = value1; + value34 = value1; break; case B.PurchaseOrderReportFields_4: - value35 = value0; + value34 = value0; break; default: - value35 = ""; + value34 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t24), _null, reportsUIState, userCompany, value35)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t25), _null, reportsUIState, userCompany, value34)) skip = true; - t25 = J.getInterceptor$(value35); - if (t25.get$runtimeType(value35) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value35, t12, t11)); - else if (t25.get$runtimeType(value35) === B.Type_double_K1J || t25.get$runtimeType(value35) === B.Type_int_tHn) { - if (B.JSArray_methods.contains$1(A._setArrayType([B.PurchaseOrderReportFields_2], t1), t24)) { - currencyId0 = t23.currencyId; + t26 = J.getInterceptor$(value34); + if (t26.get$runtimeType(value34) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value34, t12, t11)); + else if (t26.get$runtimeType(value34) === B.Type_double_K1J || t26.get$runtimeType(value34) === B.Type_int_tHn) { + if (B.JSArray_methods.contains$1(A._setArrayType([B.PurchaseOrderReportFields_2], t1), t25)) { + currencyId0 = t24.currencyId; if (currencyId0 == null) currencyId0 = "1"; } else currencyId0 = currencyId; - row.push(new A.ReportNumberValue(value35, _null, currencyId0, value13, t12, t11)); + row.push(new A.ReportNumberValue(value34, _null, currencyId0, value13, t12, t11)); } else - row.push(new A.ReportStringValue(value35, t12, t11)); + row.push(new A.ReportStringValue(value34, t12, t11)); } if (!skip) { data.push(row); @@ -102224,7 +102258,7 @@ lineItemReport_closure4: function lineItemReport_closure4() { }, quoteReport(userCompany, reportsUIState, quoteMap, clientMap, vendorMap, userMap, staticState) { - var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, t9, quote, t10, client, contact, value, row, t11, t12, value0, t13, value1, value2, value3, value4, value5, t14, value6, t15, t16, t17, value7, value8, value9, value10, value11, value12, value13, value14, value15, t18, value16, value17, value18, value19, t19, t20, value20, value21, value22, value23, value24, value25, t21, t22, t23, t24, value26, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, value39, value40, t25, skip, t26, value41, t27, t28, currencyId, selectedColumns, _null = null, + var defaultColumns, t2, t3, columns, t4, t5, t6, t7, t8, t9, quote, t10, client, contact, value, row, t11, t12, value0, t13, value1, value2, value3, value4, value5, t14, value6, t15, t16, t17, value7, value8, value9, value10, value11, value12, value13, value14, value15, t18, value16, value17, value18, value19, t19, t20, value20, value21, value22, value23, value24, value25, t21, t22, t23, t24, value26, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, value39, t25, t26, skip, t27, value40, t28, t29, currencyId, selectedColumns, _null = null, data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), entities = A._setArrayType([], type$.JSArray_legacy_BaseEntity), t1 = userCompany.settings, @@ -102255,244 +102289,244 @@ if (!t7.reportIncludeDrafts && quote.statusId === "1") continue; row = A._setArrayType([], t8); - for (t10 = new J.ArrayIterator(t3, t3.length, t5), t11 = quote.id, t12 = quote.entityType, value0 = client.number, t13 = client.shippingCountryId, value1 = client.shippingPostalCode, value2 = client.shippingState, value3 = client.shippingCity, value4 = client.state, value5 = client.website, t14 = contact == null, value6 = client.phone, t15 = quote.createdUserId, t16 = quote.assignedUserId, t17 = client.settings, value7 = client.city, value8 = quote.privateNotes, value9 = quote.publicNotes, value10 = quote.taxRate1, value11 = quote.taxName1, value12 = quote.taxRate2, value13 = quote.taxName2, value14 = client.vatNumber, value15 = client.postalCode, t18 = client.countryId, value16 = quote.exchangeRate, value17 = quote.amount, value18 = quote.taxAmount, value19 = value17 - value18, t19 = t12 === B.EntityType_quote, t20 = quote.statusId, value20 = quote.archivedAt, value21 = quote.updatedAt, value22 = quote.customSurcharge4, value23 = quote.customSurcharge3, value24 = quote.customSurcharge2, value25 = quote.customSurcharge1, t21 = quote.customValue4, t22 = quote.customValue3, t23 = quote.customValue2, t24 = quote.customValue1, value26 = quote.autoBill, value27 = quote.partial, value28 = quote.dueDate, value29 = quote.date, value30 = quote.partialDueDate, value31 = quote.poNumber, value32 = quote.discount, value33 = client.shippingAddress2, value34 = client.shippingAddress1, value35 = client.address2, value36 = client.address1, value37 = client.balance, value38 = client.displayName, value39 = quote.number, value40 = value17 / value16, t25 = t7.settings, skip = false; t10.moveNext$0();) { - t26 = t10.__interceptors$_current; - switch (t26) { + for (t10 = new J.ArrayIterator(t3, t3.length, t5), t11 = quote.id, t12 = quote.entityType, value0 = client.number, t13 = client.shippingCountryId, value1 = client.shippingPostalCode, value2 = client.shippingState, value3 = client.shippingCity, value4 = client.state, value5 = client.website, t14 = contact == null, value6 = client.phone, t15 = quote.createdUserId, t16 = quote.assignedUserId, t17 = client.settings, value7 = client.city, value8 = quote.privateNotes, value9 = quote.publicNotes, value10 = quote.taxRate1, value11 = quote.taxName1, value12 = quote.taxRate2, value13 = quote.taxName2, value14 = client.vatNumber, value15 = client.postalCode, t18 = client.countryId, value16 = quote.exchangeRate, value17 = quote.amount, value18 = quote.taxAmount, value19 = value17 - value18, t19 = t12 === B.EntityType_quote, t20 = quote.statusId, value20 = quote.archivedAt, value21 = quote.updatedAt, value22 = quote.customSurcharge4, value23 = quote.customSurcharge3, value24 = quote.customSurcharge2, value25 = quote.customSurcharge1, t21 = quote.customValue4, t22 = quote.customValue3, t23 = quote.customValue2, t24 = quote.customValue1, value26 = quote.autoBill, value27 = quote.partial, value28 = quote.dueDate, value29 = quote.date, value30 = quote.partialDueDate, value31 = quote.poNumber, value32 = quote.discount, value33 = client.shippingAddress2, value34 = client.shippingAddress1, value35 = client.address2, value36 = client.address1, value37 = client.balance, value38 = client.displayName, value39 = quote.number, t25 = value17 / value16, t26 = t7.settings, skip = false; t10.moveNext$0();) { + t27 = t10.__interceptors$_current; + switch (t27) { case B.QuoteReportFields_0: - value41 = value17; + value40 = value17; break; case B.QuoteReportFields_1: - value41 = value17; + value40 = value17; break; case B.QuoteReportFields_2: - value41 = value40; + value40 = A.round(t25, 2); break; case B.QuoteReportFields_17: - value41 = value39; + value40 = value39; break; case B.QuoteReportFields_3: - value41 = value38; + value40 = value38; break; case B.QuoteReportFields_5: - value41 = value37; + value40 = value37; break; case B.QuoteReportFields_6: - value41 = value36; + value40 = value36; break; case B.QuoteReportFields_7: - value41 = value35; + value40 = value35; break; case B.QuoteReportFields_10: - value41 = value34; + value40 = value34; break; case B.QuoteReportFields_11: - value41 = value33; + value40 = value33; break; case B.QuoteReportFields_16: - value41 = B.Map_IF4bq.$index(0, quote.get$calculatedStatusId()); - if (value41 == null) - value41 = ""; + value40 = B.Map_IF4bq.$index(0, quote.get$calculatedStatusId()); + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_18: - value41 = value32; + value40 = value32; break; case B.QuoteReportFields_19: - value41 = value31; + value40 = value31; break; case B.QuoteReportFields_21: - value41 = value30; + value40 = value30; break; case B.QuoteReportFields_20: - value41 = value29; + value40 = value29; break; case B.QuoteReportFields_22: - value41 = value28; + value40 = value28; break; case B.QuoteReportFields_23: - value41 = value27; + value40 = value27; break; case B.QuoteReportFields_24: - value41 = value26; + value40 = value26; break; case B.QuoteReportFields_25: - value41 = A.presentCustomField(t7, "invoice1", t24); + value40 = A.presentCustomField(t7, "invoice1", t24); break; case B.QuoteReportFields_26: - value41 = A.presentCustomField(t7, "invoice2", t23); + value40 = A.presentCustomField(t7, "invoice2", t23); break; case B.QuoteReportFields_27: - value41 = A.presentCustomField(t7, "invoice3", t22); + value40 = A.presentCustomField(t7, "invoice3", t22); break; case B.QuoteReportFields_28: - value41 = A.presentCustomField(t7, "invoice4", t21); + value40 = A.presentCustomField(t7, "invoice4", t21); break; case B.QuoteReportFields_29: - value41 = value25; + value40 = value25; break; case B.QuoteReportFields_30: - value41 = value24; + value40 = value24; break; case B.QuoteReportFields_31: - value41 = value23; + value40 = value23; break; case B.QuoteReportFields_32: - value41 = value22; + value40 = value22; break; case B.QuoteReportFields_33: - value41 = value21; + value40 = value21; break; case B.QuoteReportFields_34: - value41 = value20; + value40 = value20; break; case B.QuoteReportFields_35: - value41 = value; + value40 = value; break; case B.QuoteReportFields_36: - value41 = t19 && B.JSArray_methods.contains$1(A._setArrayType(["3", "4"], t6), t20); + value40 = t19 && B.JSArray_methods.contains$1(A._setArrayType(["3", "4"], t6), t20); break; case B.QuoteReportFields_37: - value41 = value18; + value40 = value18; break; case B.QuoteReportFields_38: - value41 = value19; + value40 = value19; break; case B.QuoteReportFields_39: - value41 = value16; + value40 = value16; break; case B.QuoteReportFields_9: - t27 = staticState.countryMap._map$_map.$index(0, t18); - value41 = t27 == null ? _null : t27.name; - if (value41 == null) - value41 = ""; + t28 = staticState.countryMap._map$_map.$index(0, t18); + value40 = t28 == null ? _null : t28.name; + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_44: - value41 = value15; + value40 = value15; break; case B.QuoteReportFields_42: - value41 = value14; + value40 = value14; break; case B.QuoteReportFields_49: - value41 = value11; + value40 = value11; break; case B.QuoteReportFields_46: - value41 = value10; + value40 = value10; break; case B.QuoteReportFields_50: - value41 = value13; + value40 = value13; break; case B.QuoteReportFields_47: - value41 = value12; + value40 = value12; break; case B.QuoteReportFields_51: - value41 = value11; + value40 = value11; break; case B.QuoteReportFields_48: - value41 = value10; + value40 = value10; break; case B.QuoteReportFields_40: - value41 = value9; + value40 = value9; break; case B.QuoteReportFields_41: - value41 = value8; + value40 = value8; break; case B.QuoteReportFields_43: - value41 = value7; + value40 = value7; break; case B.QuoteReportFields_52: - t27 = staticState.currencyMap; - t28 = t17.currencyId; - t28 = t27._map$_map.$index(0, t28); - value41 = t28 == null ? _null : t28.name; - if (value41 == null) - value41 = ""; + t28 = staticState.currencyMap; + t29 = t17.currencyId; + t29 = t28._map$_map.$index(0, t29); + value40 = t29 == null ? _null : t29.name; + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_53: - value41 = quote.get$isViewed(); + value40 = quote.get$isViewed(); break; case B.QuoteReportFields_54: - t27 = userMap._map$_map.$index(0, t16); - if (t27 == null) - value41 = _null; + t28 = userMap._map$_map.$index(0, t16); + if (t28 == null) + value40 = _null; else { - t28 = B.JSString_methods.trim$0(t27.firstName + " " + t27.lastName); - t27 = t28.length !== 0 ? t28 : t27.email; - value41 = t27; + t29 = B.JSString_methods.trim$0(t28.firstName + " " + t28.lastName); + t28 = t29.length !== 0 ? t29 : t28.email; + value40 = t28; } - if (value41 == null) - value41 = ""; + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_55: - t27 = userMap._map$_map.$index(0, t15); - if (t27 == null) - value41 = _null; + t28 = userMap._map$_map.$index(0, t15); + if (t28 == null) + value40 = _null; else { - t28 = B.JSString_methods.trim$0(t27.firstName + " " + t27.lastName); - t27 = t28.length !== 0 ? t28 : t27.email; - value41 = t27; + t29 = B.JSString_methods.trim$0(t28.firstName + " " + t28.lastName); + t28 = t29.length !== 0 ? t29 : t28.email; + value40 = t28; } - if (value41 == null) - value41 = ""; + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_56: - value41 = value6; + value40 = value6; break; case B.QuoteReportFields_57: - value41 = t14 ? _null : contact.email; - if (value41 == null) - value41 = ""; + value40 = t14 ? _null : contact.email; + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_59: - value41 = t14 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); - if (value41 == null) - value41 = ""; + value40 = t14 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_58: - value41 = t14 ? _null : contact.phone; - if (value41 == null) - value41 = ""; + value40 = t14 ? _null : contact.phone; + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_45: - value41 = value5; + value40 = value5; break; case B.QuoteReportFields_8: - value41 = value4; + value40 = value4; break; case B.QuoteReportFields_12: - value41 = value3; + value40 = value3; break; case B.QuoteReportFields_13: - value41 = value2; + value40 = value2; break; case B.QuoteReportFields_14: - value41 = value1; + value40 = value1; break; case B.QuoteReportFields_15: - t27 = staticState.countryMap._map$_map.$index(0, t13); - value41 = t27 == null ? _null : t27.name; - if (value41 == null) - value41 = ""; + t28 = staticState.countryMap._map$_map.$index(0, t13); + value40 = t28 == null ? _null : t28.name; + if (value40 == null) + value40 = ""; break; case B.QuoteReportFields_4: - value41 = value0; + value40 = value0; break; default: - value41 = ""; + value40 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t26), _null, reportsUIState, userCompany, value41)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t27), _null, reportsUIState, userCompany, value40)) skip = true; - t27 = J.getInterceptor$(value41); - if (t27.get$runtimeType(value41) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value41, t12, t11)); - else if (t27.get$runtimeType(value41) === B.Type_double_K1J || t27.get$runtimeType(value41) === B.Type_int_tHn) { + t28 = J.getInterceptor$(value40); + if (t28.get$runtimeType(value40) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value40, t12, t11)); + else if (t28.get$runtimeType(value40) === B.Type_double_K1J || t28.get$runtimeType(value40) === B.Type_int_tHn) { currencyId = t17.currencyId; - if (B.JSArray_methods.contains$1(A._setArrayType([B.QuoteReportFields_2], t1), t26)) { - currencyId = t25.currencyId; + if (B.JSArray_methods.contains$1(A._setArrayType([B.QuoteReportFields_2], t1), t27)) { + currencyId = t26.currencyId; if (currencyId == null) currencyId = "1"; } - row.push(new A.ReportNumberValue(value41, _null, currencyId, value16, t12, t11)); + row.push(new A.ReportNumberValue(value40, _null, currencyId, value16, t12, t11)); } else - row.push(new A.ReportStringValue(value41, t12, t11)); + row.push(new A.ReportStringValue(value40, t12, t11)); } if (!skip) { data.push(row); @@ -102736,7 +102770,7 @@ recurringExpenseReport_closure4: function recurringExpenseReport_closure4() { }, recurringInvoiceReport(userCompany, reportsUIState, invoiceMap, clientMap, userMap, vendorMap, projectMap, staticState) { - var t2, reportSettings, invoiceReportSettings, defaultColumns, t3, t4, columns, t5, t6, t7, t8, t9, invoice, t10, client, contact, value, row, value0, t11, value1, t12, value2, value3, t13, t14, value4, value5, value6, value7, value8, t15, value9, t16, value10, t17, t18, t19, t20, t21, value11, value12, value13, value14, value15, value16, value17, value18, value19, t22, value20, value21, value22, value23, t23, value24, value25, value26, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, value39, value40, value41, value42, value43, value44, value45, value46, t24, skip, t25, value47, t26, t27, currencyId, selectedColumns, _null = null, + var t2, reportSettings, invoiceReportSettings, defaultColumns, t3, t4, columns, t5, t6, t7, t8, t9, invoice, t10, client, contact, value, row, value0, t11, value1, t12, value2, value3, t13, t14, value4, value5, value6, value7, value8, t15, value9, t16, value10, t17, t18, t19, t20, t21, value11, value12, value13, value14, value15, value16, value17, value18, value19, t22, value20, value21, value22, value23, t23, value24, value25, value26, value27, value28, value29, value30, value31, value32, value33, value34, value35, value36, value37, value38, value39, value40, value41, value42, value43, value44, value45, t24, t25, skip, t26, value46, t27, t28, currencyId, selectedColumns, _null = null, _s17_ = "recurring_invoice", data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), entities = A._setArrayType([], type$.JSArray_legacy_BaseEntity), @@ -102771,276 +102805,276 @@ if (!t7.reportIncludeDrafts && invoice.statusId === "1") continue; row = A._setArrayType([], t8); - for (t10 = new J.ArrayIterator(t4, t4.length, t6), value0 = invoice.id, t11 = invoice.entityType, value1 = client.number, t12 = invoice.remainingCycles, value2 = A.S(t12), t12 = t12 === -1, value3 = invoice.nextSendDate, t13 = invoice.frequencyId, t14 = client.shippingCountryId, value4 = client.shippingPostalCode, value5 = client.shippingState, value6 = client.shippingCity, value7 = client.state, value8 = client.website, t15 = contact == null, value9 = client.phone, t16 = t11 === B.EntityType_invoice, value10 = invoice.statusId === "4", t17 = invoice.vendorId, t18 = invoice.projectId, t19 = invoice.createdUserId, t20 = invoice.assignedUserId, t21 = client.settings, value11 = client.city, value12 = invoice.privateNotes, value13 = invoice.publicNotes, value14 = invoice.taxRate1, value15 = invoice.taxName1, value16 = invoice.taxRate2, value17 = invoice.taxName2, value18 = client.vatNumber, value19 = client.postalCode, t22 = client.countryId, value20 = invoice.exchangeRate, value21 = invoice.amount, value22 = invoice.taxAmount, value23 = value21 - value22, t23 = invoice.createdAt, value24 = invoice.customSurcharge4, value25 = invoice.customSurcharge3, value26 = invoice.customSurcharge2, value27 = invoice.customSurcharge1, value28 = invoice.customValue4, value29 = invoice.customValue3, value30 = invoice.customValue2, value31 = invoice.customValue1, value32 = invoice.autoBill, value33 = invoice.reminderLastSent, value34 = invoice.reminder3Sent, value35 = invoice.reminder2Sent, value36 = invoice.reminder1Sent, value37 = invoice.poNumber, value38 = invoice.discount, value39 = invoice.number, value40 = client.shippingAddress2, value41 = client.shippingAddress1, value42 = client.address2, value43 = client.address1, value44 = client.balance, value45 = client.displayName, value46 = value21 / value20, t23 *= 1000, t24 = t7.settings, skip = false; t10.moveNext$0();) { - t25 = t10.__interceptors$_current; - switch (t25) { + for (t10 = new J.ArrayIterator(t4, t4.length, t6), value0 = invoice.id, t11 = invoice.entityType, value1 = client.number, t12 = invoice.remainingCycles, value2 = A.S(t12), t12 = t12 === -1, value3 = invoice.nextSendDate, t13 = invoice.frequencyId, t14 = client.shippingCountryId, value4 = client.shippingPostalCode, value5 = client.shippingState, value6 = client.shippingCity, value7 = client.state, value8 = client.website, t15 = contact == null, value9 = client.phone, t16 = t11 === B.EntityType_invoice, value10 = invoice.statusId === "4", t17 = invoice.vendorId, t18 = invoice.projectId, t19 = invoice.createdUserId, t20 = invoice.assignedUserId, t21 = client.settings, value11 = client.city, value12 = invoice.privateNotes, value13 = invoice.publicNotes, value14 = invoice.taxRate1, value15 = invoice.taxName1, value16 = invoice.taxRate2, value17 = invoice.taxName2, value18 = client.vatNumber, value19 = client.postalCode, t22 = client.countryId, value20 = invoice.exchangeRate, value21 = invoice.amount, value22 = invoice.taxAmount, value23 = value21 - value22, t23 = invoice.createdAt, value24 = invoice.customSurcharge4, value25 = invoice.customSurcharge3, value26 = invoice.customSurcharge2, value27 = invoice.customSurcharge1, value28 = invoice.customValue4, value29 = invoice.customValue3, value30 = invoice.customValue2, value31 = invoice.customValue1, value32 = invoice.autoBill, value33 = invoice.reminderLastSent, value34 = invoice.reminder3Sent, value35 = invoice.reminder2Sent, value36 = invoice.reminder1Sent, value37 = invoice.poNumber, value38 = invoice.discount, value39 = invoice.number, value40 = client.shippingAddress2, value41 = client.shippingAddress1, value42 = client.address2, value43 = client.address1, value44 = client.balance, value45 = client.displayName, t24 = value21 / value20, t23 *= 1000, t25 = t7.settings, skip = false; t10.moveNext$0();) { + t26 = t10.__interceptors$_current; + switch (t26) { case B.RecurringInvoiceReportFields_0: - value47 = value0; + value46 = value0; break; case B.RecurringInvoiceReportFields_1: - value47 = value21; + value46 = value21; break; case B.RecurringInvoiceReportFields_2: - value47 = value46; + value46 = A.round(t24, 2); break; case B.RecurringInvoiceReportFields_3: - value47 = value45; + value46 = value45; break; case B.RecurringInvoiceReportFields_5: - value47 = value44; + value46 = value44; break; case B.RecurringInvoiceReportFields_6: - value47 = value43; + value46 = value43; break; case B.RecurringInvoiceReportFields_7: - value47 = value42; + value46 = value42; break; case B.RecurringInvoiceReportFields_12: - value47 = value41; + value46 = value41; break; case B.RecurringInvoiceReportFields_13: - value47 = value40; + value46 = value40; break; case B.RecurringInvoiceReportFields_19: - value47 = B.Map_j34mP.$index(0, invoice.get$calculatedStatusId()); - if (value47 == null) - value47 = ""; + value46 = B.Map_j34mP.$index(0, invoice.get$calculatedStatusId()); + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_20: - value47 = value39; + value46 = value39; break; case B.RecurringInvoiceReportFields_21: - value47 = value38; + value46 = value38; break; case B.RecurringInvoiceReportFields_22: - value47 = value37; + value46 = value37; break; case B.RecurringInvoiceReportFields_40: - value47 = value36; + value46 = value36; break; case B.RecurringInvoiceReportFields_41: - value47 = value35; + value46 = value35; break; case B.RecurringInvoiceReportFields_42: - value47 = value34; + value46 = value34; break; case B.RecurringInvoiceReportFields_43: - value47 = value33; + value46 = value33; break; case B.RecurringInvoiceReportFields_23: - value47 = value32; + value46 = value32; break; case B.RecurringInvoiceReportFields_24: - value47 = value31; + value46 = value31; break; case B.RecurringInvoiceReportFields_25: - value47 = value30; + value46 = value30; break; case B.RecurringInvoiceReportFields_26: - value47 = value29; + value46 = value29; break; case B.RecurringInvoiceReportFields_27: - value47 = value28; + value46 = value28; break; case B.RecurringInvoiceReportFields_28: - value47 = invoice.get$hasExpenses(); + value46 = invoice.get$hasExpenses(); break; case B.RecurringInvoiceReportFields_29: - value47 = invoice.get$hasTasks(); + value46 = invoice.get$hasTasks(); break; case B.RecurringInvoiceReportFields_30: - value47 = value27; + value46 = value27; break; case B.RecurringInvoiceReportFields_31: - value47 = value26; + value46 = value26; break; case B.RecurringInvoiceReportFields_32: - value47 = value25; + value46 = value25; break; case B.RecurringInvoiceReportFields_33: - value47 = value24; + value46 = value24; break; case B.RecurringInvoiceReportFields_34: - t26 = new A.DateTime(t23, true); - t26.DateTime$_withValue$2$isUtc(t23, true); - value47 = t26.toIso8601String$0(); + t27 = new A.DateTime(t23, true); + t27.DateTime$_withValue$2$isUtc(t23, true); + value46 = t27.toIso8601String$0(); break; case B.RecurringInvoiceReportFields_35: - t26 = new A.DateTime(t23, true); - t26.DateTime$_withValue$2$isUtc(t23, true); - value47 = t26.toIso8601String$0(); + t27 = new A.DateTime(t23, true); + t27.DateTime$_withValue$2$isUtc(t23, true); + value46 = t27.toIso8601String$0(); break; case B.RecurringInvoiceReportFields_36: - value47 = value; + value46 = value; break; case B.RecurringInvoiceReportFields_37: - value47 = value22; + value46 = value22; break; case B.RecurringInvoiceReportFields_38: - value47 = value23; + value46 = value23; break; case B.RecurringInvoiceReportFields_39: - value47 = invoice.get$netBalanceOrAmount(); + value46 = invoice.get$netBalanceOrAmount(); break; case B.RecurringInvoiceReportFields_44: - value47 = value20; + value46 = value20; break; case B.RecurringInvoiceReportFields_11: - t26 = staticState.countryMap._map$_map.$index(0, t22); - value47 = t26 == null ? _null : t26.name; - if (value47 == null) - value47 = ""; + t27 = staticState.countryMap._map$_map.$index(0, t22); + value46 = t27 == null ? _null : t27.name; + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_10: - value47 = value19; + value46 = value19; break; case B.RecurringInvoiceReportFields_8: - value47 = value18; + value46 = value18; break; case B.RecurringInvoiceReportFields_51: - value47 = value15; + value46 = value15; break; case B.RecurringInvoiceReportFields_48: - value47 = value14; + value46 = value14; break; case B.RecurringInvoiceReportFields_52: - value47 = value17; + value46 = value17; break; case B.RecurringInvoiceReportFields_49: - value47 = value16; + value46 = value16; break; case B.RecurringInvoiceReportFields_53: - value47 = value15; + value46 = value15; break; case B.RecurringInvoiceReportFields_50: - value47 = value14; + value46 = value14; break; case B.RecurringInvoiceReportFields_45: - value47 = value13; + value46 = value13; break; case B.RecurringInvoiceReportFields_46: - value47 = value12; + value46 = value12; break; case B.RecurringInvoiceReportFields_9: - value47 = value11; + value46 = value11; break; case B.RecurringInvoiceReportFields_54: - t26 = staticState.currencyMap; - t27 = t21.currencyId; - t27 = t26._map$_map.$index(0, t27); - value47 = t27 == null ? _null : t27.name; - if (value47 == null) - value47 = ""; + t27 = staticState.currencyMap; + t28 = t21.currencyId; + t28 = t27._map$_map.$index(0, t28); + value46 = t28 == null ? _null : t28.name; + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_55: - t26 = userMap._map$_map.$index(0, t20); - if (t26 == null) - value47 = _null; + t27 = userMap._map$_map.$index(0, t20); + if (t27 == null) + value46 = _null; else { - t27 = B.JSString_methods.trim$0(t26.firstName + " " + t26.lastName); - t26 = t27.length !== 0 ? t27 : t26.email; - value47 = t26; + t28 = B.JSString_methods.trim$0(t27.firstName + " " + t27.lastName); + t27 = t28.length !== 0 ? t28 : t27.email; + value46 = t27; } - if (value47 == null) - value47 = ""; + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_56: - t26 = userMap._map$_map.$index(0, t19); - if (t26 == null) - value47 = _null; + t27 = userMap._map$_map.$index(0, t19); + if (t27 == null) + value46 = _null; else { - t27 = B.JSString_methods.trim$0(t26.firstName + " " + t26.lastName); - t26 = t27.length !== 0 ? t27 : t26.email; - value47 = t26; + t28 = B.JSString_methods.trim$0(t27.firstName + " " + t27.lastName); + t27 = t28.length !== 0 ? t28 : t27.email; + value46 = t27; } - if (value47 == null) - value47 = ""; + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_57: - t26 = projectMap._map$_map.$index(0, t18); - value47 = (t26 == null ? A.ProjectEntity_ProjectEntity(_null, _null, _null, _null) : t26).name; + t27 = projectMap._map$_map.$index(0, t18); + value46 = (t27 == null ? A.ProjectEntity_ProjectEntity(_null, _null, _null, _null) : t27).name; break; case B.RecurringInvoiceReportFields_58: - t26 = vendorMap._map$_map.$index(0, t17); - value47 = (t26 == null ? A.VendorEntity_VendorEntity(_null, _null, _null) : t26).name; + t27 = vendorMap._map$_map.$index(0, t17); + value46 = (t27 == null ? A.VendorEntity_VendorEntity(_null, _null, _null) : t27).name; break; case B.RecurringInvoiceReportFields_59: - value47 = t16 && value10; + value46 = t16 && value10; break; case B.RecurringInvoiceReportFields_60: - value47 = value9; + value46 = value9; break; case B.RecurringInvoiceReportFields_61: - value47 = t15 ? _null : contact.email; - if (value47 == null) - value47 = ""; + value46 = t15 ? _null : contact.email; + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_63: - value47 = t15 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); - if (value47 == null) - value47 = ""; + value46 = t15 ? _null : B.JSString_methods.trim$0(contact.firstName + " " + contact.lastName); + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_62: - value47 = t15 ? _null : contact.phone; - if (value47 == null) - value47 = ""; + value46 = t15 ? _null : contact.phone; + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_47: - value47 = value8; + value46 = value8; break; case B.RecurringInvoiceReportFields_14: - value47 = value7; + value46 = value7; break; case B.RecurringInvoiceReportFields_15: - value47 = value6; + value46 = value6; break; case B.RecurringInvoiceReportFields_16: - value47 = value5; + value46 = value5; break; case B.RecurringInvoiceReportFields_17: - value47 = value4; + value46 = value4; break; case B.RecurringInvoiceReportFields_18: - t26 = staticState.countryMap._map$_map.$index(0, t14); - value47 = t26 == null ? _null : t26.name; - if (value47 == null) - value47 = ""; + t27 = staticState.countryMap._map$_map.$index(0, t14); + value46 = t27 == null ? _null : t27.name; + if (value46 == null) + value46 = ""; break; case B.RecurringInvoiceReportFields_64: - value47 = t1.lookup$1(B.Map_tOn4d.$index(0, t13)); + value46 = t1.lookup$1(B.Map_tOn4d.$index(0, t13)); break; case B.RecurringInvoiceReportFields_65: - value47 = value3; + value46 = value3; break; case B.RecurringInvoiceReportFields_66: if (t12) { t1.toString; - t26 = J.$index$asx($.$get$LocalizationsProvider__localizedValues().$index(0, t1.localeCode), "endless"); - value47 = t26 == null ? "" : t26; + t27 = J.$index$asx($.$get$LocalizationsProvider__localizedValues().$index(0, t1.localeCode), "endless"); + value46 = t27 == null ? "" : t27; } else - value47 = value2; + value46 = value2; break; case B.RecurringInvoiceReportFields_4: - value47 = value1; + value46 = value1; break; default: - value47 = ""; + value46 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t25), _null, reportsUIState, userCompany, value47)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t26), _null, reportsUIState, userCompany, value46)) skip = true; - t26 = J.getInterceptor$(value47); - if (t26.get$runtimeType(value47) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value47, t11, value0)); - else if (t26.get$runtimeType(value47) === B.Type_double_K1J || t26.get$runtimeType(value47) === B.Type_int_tHn) { + t27 = J.getInterceptor$(value46); + if (t27.get$runtimeType(value46) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value46, t11, value0)); + else if (t27.get$runtimeType(value46) === B.Type_double_K1J || t27.get$runtimeType(value46) === B.Type_int_tHn) { currencyId = t21.currencyId; - if (B.JSArray_methods.contains$1(A._setArrayType([B.RecurringInvoiceReportFields_2], t2), t25)) { - currencyId = t24.currencyId; + if (B.JSArray_methods.contains$1(A._setArrayType([B.RecurringInvoiceReportFields_2], t2), t26)) { + currencyId = t25.currencyId; if (currencyId == null) currencyId = "1"; } - row.push(new A.ReportNumberValue(value47, _null, currencyId, value20, t11, value0)); + row.push(new A.ReportNumberValue(value46, _null, currencyId, value20, t11, value0)); } else - row.push(new A.ReportStringValue(value47, t11, value0)); + row.push(new A.ReportStringValue(value46, t11, value0)); } if (!skip) { data.push(row); @@ -103800,7 +103834,7 @@ return new A.ReportsScreenVM(state, t4, t2, groupTotals, new A.ReportsScreenVM_fromStore_closure(state, reportSettings, store), new A.ReportsScreenVM_fromStore_closure0(_box_1, state, groupTotals), new A.ReportsScreenVM_fromStore_closure1(store, report), new A.ReportsScreenVM_fromStore_closure2(store, state), new A.ReportsScreenVM_fromStore_closure3(store, state), new A.ReportsScreenVM_fromStore_closure4(state, store)); }, calculateReportTotals(company, currencyMap, reportResult, reportSettings, reportState) { - var t3, t4, t5, t6, line, i, row, columnIndex, toZone, groupCell, group, t7, t8, age, date, j, cell, column, cellValue, rate, rows, sortedColumns, + var groupCurrencies, line, shouldConverCurrencies, i, row, columnIndex, toZone, groupCell, group, j, cell, column, currencyId, t3, t4, t5, t6, t7, t8, age, date, cellValue, rate, rows, sortedColumns, t1 = type$.legacy_String, totals = A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.legacy_Map_of_legacy_String_and_legacy_double), data = reportResult.data, @@ -103808,7 +103842,38 @@ t2 = reportState.group; if (t2.length === 0) return new A.GroupTotals(null, null); - for (t3 = reportState.subgroup, t4 = t3 === "week", t5 = t3 === "month", t3 = t3 === "year", t6 = type$.legacy_double, line = "## ERROR: colum not found - " + t2, i = 0; i < data.length; ++i) { + groupCurrencies = A.LinkedHashMap_LinkedHashMap$_empty(t1, type$.legacy_Map_of_legacy_String_and_legacy_String); + for (line = "## ERROR: colum not found - " + t2, shouldConverCurrencies = false, i = 0; i < data.length; ++i) { + row = data[i]; + columnIndex = B.JSArray_methods.indexOf$1(columns, t2); + if (columnIndex === -1) { + toZone = $.printToZone; + if (toZone == null) + A.printString(line); + else + toZone.call$1(line); + continue; + } + groupCell = row[columnIndex]; + group = groupCell.get$stringValue(groupCell); + if (!groupCurrencies.containsKey$1(0, group)) + groupCurrencies.$indexSet(0, group, A.LinkedHashMap_LinkedHashMap$_empty(t1, t1)); + for (j = 0; j < row.length; ++j) { + cell = row[j]; + column = columns[j]; + if (cell instanceof A.ReportNumberValue) { + currencyId = groupCurrencies.$index(0, group).$index(0, column); + if (currencyId == null) + currencyId = ""; + if (currencyId.length !== 0 && currencyId !== cell.currencyId) { + shouldConverCurrencies = true; + break; + } + groupCurrencies.$index(0, group).$indexSet(0, column, cell.currencyId); + } + } + } + for (t3 = reportState.subgroup, t4 = t3 === "week", t5 = t3 === "month", t3 = t3 === "year", t6 = type$.legacy_double, i = 0; i < data.length; ++i) { row = data[i]; columnIndex = B.JSArray_methods.indexOf$1(columns, t2); if (columnIndex === -1) { @@ -103869,11 +103934,13 @@ if (t7 || cell instanceof A.ReportAgeValue || cell instanceof A.ReportDurationValue) { if (!totals.$index(0, group).containsKey$1(0, column)) totals.$index(0, group).$indexSet(0, column, 0); + if (t7) + totals.$index(0, group).$indexSet(0, A.S(column) + "_currency_id", A.parseDouble(cell.currencyId, false)); if (t7) { t7 = cell.currencyId; if (t7 != null) { t8 = company.settings.currencyId; - t7 = t7 !== (t8 == null ? "1" : t8); + t7 = t7 !== (t8 == null ? "1" : t8) && shouldConverCurrencies; } else t7 = false; } else @@ -400695,79 +400762,80 @@ }; A.SidebarFooter.prototype = { build$1(_, context) { - var t4, t5, t6, t7, t8, _null = null, + var account, t4, t5, t6, t7, t8, _null = null, _s10_ = "user_guide", store = A.StoreProvider_of(context, type$.legacy_AppState), state = A._lateReadCheck(store.__Store__state, "_state"), prefState = state.prefState, t1 = A.Localizations_of(context, B.Type_AppLocalization_KyD, type$.legacy_AppLocalization), t2 = state.userCompanyStates, - t3 = state.uiState.selectedCompanyIndex, - account = t2._list[t3].userCompany.account; - t3 = A.Theme_of(context).bottomAppBarColor; - t2 = type$.JSArray_legacy_Widget; - t4 = A._setArrayType([], t2); + t3 = state.uiState.selectedCompanyIndex; + t2 = t2._list; + account = t2[t3].userCompany.account; + t4 = A.Theme_of(context).bottomAppBarColor; + t5 = type$.JSArray_legacy_Widget; + t6 = A._setArrayType([], t5); if (state.get$isMenuCollapsed()) - B.JSArray_methods.addAll$1(t4, A._setArrayType([A.Expanded$(new A.SizedBox(_null, _null, _null, _null), 1)], t2)); + B.JSArray_methods.addAll$1(t6, A._setArrayType([A.Expanded$(new A.SizedBox(_null, _null, _null, _null), 1)], t5)); else { - t2 = A._setArrayType([], t2); - t5 = A.cleanApiUrl(state.authState.url); - if (t5 !== "https://demo.invoiceninja.com") + t5 = A._setArrayType([], t5); + t7 = A.cleanApiUrl(state.authState.url); + if (t7 !== "https://demo.invoiceninja.com") if (!state.get$isHosted() && !account.isSchedulerRunning) { - t5 = prefState.enableTooltips ? t1.get$error(t1) : ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNc9P_4294198070, _null), _null, new A.SidebarFooter_build_closure(context, t1, store), B.EdgeInsets_8_8_8_8, _null, t5, _null)); + t2 = prefState.enableTooltips ? t1.get$error(t1) : ""; + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNc9P_4294198070, _null), _null, new A.SidebarFooter_build_closure(context, t1, store), B.EdgeInsets_8_8_8_8, _null, t2, _null)); } else if (state.get$credentials(state).token.length === 0) { - t5 = prefState.enableTooltips ? t1.get$error(t1) : ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNc9P_4294198070, _null), _null, new A.SidebarFooter_build_closure0(context), B.EdgeInsets_8_8_8_8, _null, t5, _null)); - } else if (!state.get$isHosted() && state.get$isUpdateAvailable()) { - t5 = prefState.enableTooltips ? t1.get$updateAvailable() : ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, A.Theme_of(context).colorScheme.secondary, _null), _null, new A.SidebarFooter_build_closure1(context), B.EdgeInsets_8_8_8_8, _null, t5, _null)); + t2 = prefState.enableTooltips ? t1.get$error(t1) : ""; + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNc9P_4294198070, _null), _null, new A.SidebarFooter_build_closure0(context), B.EdgeInsets_8_8_8_8, _null, t2, _null)); + } else if (!state.get$isHosted() && !t2[t3].userCompany.account.disableAutoUpdate && state.get$isUpdateAvailable()) { + t2 = prefState.enableTooltips ? t1.get$updateAvailable() : ""; + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, A.Theme_of(context).colorScheme.secondary, _null), _null, new A.SidebarFooter_build_closure1(context), B.EdgeInsets_8_8_8_8, _null, t2, _null)); } else if (state.get$isHosted() && A.getUnconnectedStripeAccount(state) != null) - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNZaB_4294940672, _null), _null, new A.SidebarFooter_build_closure2(context), B.EdgeInsets_8_8_8_8, _null, _null, _null)); + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNZaB_4294940672, _null), _null, new A.SidebarFooter_build_closure2(context), B.EdgeInsets_8_8_8_8, _null, _null, _null)); else { - t5 = !state.dismissedNativeWarning && !prefState.hideDesktopWarning; - if (t5) - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_58446_MaterialIcons_null_false, B.MaterialColor_Map_JNZaB_4294940672, _null), _null, new A.SidebarFooter_build_closure3(context, t1, store), B.EdgeInsets_8_8_8_8, _null, _null, _null)); + t2 = !state.dismissedNativeWarning && !prefState.hideDesktopWarning; + if (t2) + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_58446_MaterialIcons_null_false, B.MaterialColor_Map_JNZaB_4294940672, _null), _null, new A.SidebarFooter_build_closure3(context, t1, store), B.EdgeInsets_8_8_8_8, _null, _null, _null)); } - t5 = A.Icon$(B.IconData_58307_MaterialIcons_null_false, _null, _null); - t6 = prefState.enableTooltips; - t7 = t6 ? t1.get$contactUs() : ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t5, _null, new A.SidebarFooter_build_closure4(context), B.EdgeInsets_8_8_8_8, _null, t7, _null)); + t2 = A.Icon$(B.IconData_58307_MaterialIcons_null_false, _null, _null); + t3 = prefState.enableTooltips; + t7 = t3 ? t1.get$contactUs() : ""; + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t2, _null, new A.SidebarFooter_build_closure4(context), B.EdgeInsets_8_8_8_8, _null, t7, _null)); t7 = A.Icon$(B.IconData_58051_MaterialIcons_null_false, _null, _null); - t5 = t6 ? t1.get$supportForum() : ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t7, _null, new A.SidebarFooter_build_closure5(), B.EdgeInsets_8_8_8_8, _null, t5, _null)); - t5 = A.Icon$(B.IconData_58123_MaterialIcons_null_true, _null, _null); - if (t6) { + t2 = t3 ? t1.get$supportForum() : ""; + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t7, _null, new A.SidebarFooter_build_closure5(), B.EdgeInsets_8_8_8_8, _null, t2, _null)); + t2 = A.Icon$(B.IconData_58123_MaterialIcons_null_true, _null, _null); + if (t3) { t1.toString; t7 = $.$get$LocalizationsProvider__localizedValues(); t8 = J.$index$asx(t7.$index(0, t1.localeCode), _s10_); t7 = t8 == null ? J.$index$asx(t7.$index(0, "en"), _s10_) : t8; } else t7 = ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t5, _null, new A.SidebarFooter_build_closure6(state), B.EdgeInsets_8_8_8_8, _null, t7, _null)); + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t2, _null, new A.SidebarFooter_build_closure6(state), B.EdgeInsets_8_8_8_8, _null, t7, _null)); t7 = A.Icon$(B.IconData_58173_MaterialIcons_null_false, _null, _null); - t5 = t6 ? t1.get$about() : ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t7, _null, new A.SidebarFooter_build_closure7(context), B.EdgeInsets_8_8_8_8, _null, t5, _null)); - t5 = state.lastError; - if (t5.length !== 0) { - t5 = A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNc9P_4294198070, _null); - t7 = t6 ? t1.get$error(t1) : ""; - t2.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t5, _null, new A.SidebarFooter_build_closure8(context, state), B.EdgeInsets_8_8_8_8, _null, t7, _null)); + t2 = t3 ? t1.get$about() : ""; + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t7, _null, new A.SidebarFooter_build_closure7(context), B.EdgeInsets_8_8_8_8, _null, t2, _null)); + t2 = state.lastError; + if (t2.length !== 0) { + t2 = A.Icon$(B.IconData_59083_MaterialIcons_null_false, B.MaterialColor_Map_JNc9P_4294198070, _null); + t7 = t3 ? t1.get$error(t1) : ""; + t5.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t2, _null, new A.SidebarFooter_build_closure8(context, state), B.EdgeInsets_8_8_8_8, _null, t7, _null)); } - t2.push(new A.Spacer(_null)); + t5.push(new A.Spacer(_null)); if (A.getLayout(context) !== B.AppLayout_mobile && prefState.menuSidebarMode === B.AppSidebarMode_collapse) { - if (t6) { + if (t3) { t1.toString; t1 = J.$index$asx($.$get$LocalizationsProvider__localizedValues().$index(0, t1.localeCode), "hide_menu"); if (t1 == null) t1 = ""; } else t1 = ""; - t2.push(new A.AppBorder(A.Tooltip$(A.InkWell$(false, _null, true, new A.Padding(B.EdgeInsets_8_0_8_0, A.Icon$(B.IconData_57694_MaterialIcons_null_true, _null, _null), _null), _null, true, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, new A.SidebarFooter_build_closure9(store), _null, _null, _null, _null, _null, _null), t1), _null, _null, true, false, _null)); + t5.push(new A.AppBorder(A.Tooltip$(A.InkWell$(false, _null, true, new A.Padding(B.EdgeInsets_8_0_8_0, A.Icon$(B.IconData_57694_MaterialIcons_null_true, _null, _null), _null), _null, true, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, new A.SidebarFooter_build_closure9(store), _null, _null, _null, _null, _null, _null), t1), _null, _null, true, false, _null)); } - B.JSArray_methods.addAll$1(t4, t2); + B.JSArray_methods.addAll$1(t6, t5); } - return A.Material$(B.Duration_200000, true, _null, A.Row$(t4, B.CrossAxisAlignment_3, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), B.Clip_0, t3, 0, _null, _null, _null, _null, _null, B.MaterialType_0); + return A.Material$(B.Duration_200000, true, _null, A.Row$(t6, B.CrossAxisAlignment_3, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), B.Clip_0, t4, 0, _null, _null, _null, _null, _null, B.MaterialType_0); } }; A.SidebarFooter_build_closure.prototype = { @@ -426893,7 +426961,7 @@ t12 = t1.applied; t13 = _this.$this; t14 = type$.JSArray_legacy_Widget; - t9 = A._setArrayType([A.EntityHeader$(t1, t6, t5.get$applied(), A.formatNumber(t12, context, t10, _null, B.FormatNumberType_0, true, _null, false), t4, t3, t11), new A.ListDivider(_null), A.EntityListTile$(t9, t13._widget.isFilter, _null)], t14); + t9 = A._setArrayType([A.EntityHeader$(t1, t6, t5.get$applied(), A.formatNumber(t12, context, t10, _null, B.FormatNumberType_0, true, _null, false), t4, t3, t11), new A.ListDivider(_null), A.EntityListTile$(t9, t13._widget.isFilter, t9.get$primaryContact().email)], t14); for (t3 = t1.get$invoicePaymentables(), t4 = t3.length, t6 = t2.userCompanyStates, t2 = t2.uiState, t10 = t1.clientId, _i = 0; _i < t3.length; t3.length === t4 || (0, A.throwConcurrentModificationError)(t3), ++_i) { paymentable = t3[_i]; t11 = t13._widget.isFilter; @@ -435760,7 +435828,8 @@ value = J.$add$ansx(value, " (") + B.JSInt_methods.toString$0(J.floor$0$n(values.$index(0, "count"))) + ")"; } else if (columnType === B.ReportColumnType_3) { t6 = values.$index(0, column); - value = A.formatNumber(t6, context, _null, _null, t5.$eq(column, "quantity") ? B.FormatNumberType_3 : B.FormatNumberType_0, true, _null, false); + t5 = t5.$eq(column, "quantity") ? B.FormatNumberType_3 : B.FormatNumberType_0; + value = A.formatNumber(t6, context, _null, B.JSInt_methods.toString$0(J.round$0$n(values.$index(0, A.S(column) + "_currency_id"))), t5, true, _null, false); } else value = columnType === B.ReportColumnType_6 ? A.formatDuration(new A.Duration(1000000 * J.toInt$0$n(values.$index(0, column))), true) : ""; cells.push(new A.DataCell(new A.Text(value, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), new A.ReportResult_tableRow_closure0(group, column, groupBy, context, reportState, t1, store)));