diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js index 998f8bd496..def45253c9 100644 --- a/public/main.profile.dart.js +++ b/public/main.profile.dart.js @@ -61440,7 +61440,7 @@ if (B.JSString_methods.startsWith$1(url, "https://invoicing.co")) secret = ""; t1 = type$.legacy_String; - headers = A.LinkedHashMap_LinkedHashMap$_literal(["X-CLIENT-VERSION", "5.0.98", "X-API-SECRET", secret, "X-Requested-With", "XMLHttpRequest", "Content-Type", "application/json; charset=utf-8"], t1, t1); + headers = A.LinkedHashMap_LinkedHashMap$_literal(["X-CLIENT-VERSION", "5.0.99", "X-API-SECRET", secret, "X-Requested-With", "XMLHttpRequest", "Content-Type", "application/json; charset=utf-8"], t1, t1); if (token.length !== 0) headers.$indexSet(0, "X-API-Token", token); if ((idToken == null ? "" : idToken).length !== 0) @@ -61463,9 +61463,9 @@ else if (serverVersion == null) throw A.wrapException("Error: please check that Invoice Ninja v5 is installed on the server"); else { - t2 = A.Version__compare(A.Version_parse("5.0.98"), A.Version_parse(minClientVersion)); + t2 = A.Version__compare(A.Version_parse("5.0.99"), A.Version_parse(minClientVersion)); if (t2 < 0) - throw A.wrapException("Error: client not supported, please update to the latest version [Current v5.0.98 < Minimum v" + A.S(minClientVersion) + "]"); + throw A.wrapException("Error: client not supported, please update to the latest version [Current v5.0.99 < Minimum v" + A.S(minClientVersion) + "]"); else { t2 = A.Version__compare(A.Version_parse(serverVersion), A.Version_parse("5.0.4")); if (t2 < 0) @@ -92148,16 +92148,17 @@ UpgradeDialog: function UpgradeDialog(t0) { this.key = t0; }, - _UpgradeDialogState: function _UpgradeDialogState(t0, t1, t2, t3) { + _UpgradeDialogState: function _UpgradeDialogState(t0, t1, t2, t3, t4) { var _ = this; - _._inAppPurchase = t0; + _._upgrade_dialog$_scrollController = t0; + _._inAppPurchase = t1; _._upgrade_dialog$_subscription = null; - _._upgrade_dialog$_products = t1; - _._purchases = t2; + _._upgrade_dialog$_products = t2; + _._purchases = t3; _._purchasePending = _._isAvailable = false; _._loading = true; _._widget = _._queryProductError = null; - _._debugLifecycleState = t3; + _._debugLifecycleState = t4; _._framework$_element = null; }, _UpgradeDialogState_initState_closure: function _UpgradeDialogState_initState_closure(t0) { @@ -328474,6 +328475,7 @@ t1 = A.convertDateTimeToSqlDate(null); b.get$_invoice_model$_$this()._date = t1; b.get$_invoice_model$_$this()._dueDate = ""; + b.get$_invoice_model$_$this()._partialDueDate = ""; B.JSArray_methods.clear$0(b.get$documents().get$_safeList()); t1 = b.get$lineItems(); t2 = this.$this; @@ -359702,7 +359704,7 @@ version = "v" + (t1 == null ? "" : t1); if (version.length !== 0) version += "-"; - return B.JSString_methods.$add(version + A.getPlatformLetter(), B.JSArray_methods.get$last("5.0.98".split("."))); + return B.JSString_methods.$add(version + A.getPlatformLetter(), B.JSArray_methods.get$last("5.0.99".split("."))); }, get$historyList() { var _this = this, @@ -417336,8 +417338,9 @@ else isEnabled = false; t6 = t2[t4].userCompany; - if (t6.isOwner) - if (t6.account.trialStarted.length === 0) { + if (t6.isOwner) { + t6 = t6.account; + if (t6.trialStarted.length === 0 && t6.plan === "" && !A.isIOS()) { t5.toString; t6 = $.$get$LocalizationsProvider__localizedValues(); t7 = t5.localeCode; @@ -417354,7 +417357,7 @@ t8 = ""; upgradeMessage = t8; } - else { + } else { t5.toString; t6 = $.$get$LocalizationsProvider__localizedValues(); t7 = t5.localeCode; @@ -423766,7 +423769,8 @@ t1 = A.StoreProvider_of(context, t1).__Store__state_A; t1 === $ && A.throwUnnamedLateFieldNI(); if (!t1.get$isPaidAccount()) - A.isApple(); + if (A.isApple()) + A.isIOS(); } t9.push(A.DrawerTile$(company, _null, A.getEntityIcon(B.EntityType_dashboard), _null, new A._MenuDrawerState_build_closure8(store), new A._MenuDrawerState_build_closure9(), t4.get$dashboard())); t1 = A.getEntityIcon(B.EntityType_client); @@ -427203,7 +427207,7 @@ }; A.UpgradeDialog.prototype = { createState$0() { - return new A._UpgradeDialogState(A.InAppPurchase__getOrCreateInstance(), A._setArrayType([], type$.JSArray_legacy_ProductDetails), A._setArrayType([], type$.JSArray_legacy_PurchaseDetails), B._StateLifecycle_0); + return new A._UpgradeDialogState(A.ScrollController$(0, true), A.InAppPurchase__getOrCreateInstance(), A._setArrayType([], type$.JSArray_legacy_ProductDetails), A._setArrayType([], type$.JSArray_legacy_PurchaseDetails), B._StateLifecycle_0); } }; A._UpgradeDialogState.prototype = { @@ -427274,13 +427278,15 @@ return A._asyncStartSync($async$initStoreInfo$0, $async$completer); }, dispose$0() { + var _this = this; if ($.$get$Platform_isIOS()) { - this._inAppPurchase.toString; + _this._inAppPurchase.toString; type$.legacy_InAppPurchaseStoreKitPlatformAddition._as($.InAppPurchasePlatformAddition__instance).toString; $.$get$SKPaymentQueueWrapper__singleton().setDelegate$1(null); } - this._upgrade_dialog$_subscription.cancel$0(0); - this.super$State$dispose(); + _this._upgrade_dialog$_subscription.cancel$0(0); + _this._upgrade_dialog$_scrollController.dispose$0(); + _this.super$State$dispose(); }, build$1(context) { var t4, t5, t6, _this = this, _null = null, @@ -427290,11 +427296,12 @@ stack = A._setArrayType([], t2), t3 = _this._queryProductError; if (t3 == null) { - t3 = A._setArrayType([], t2); + t3 = _this._upgrade_dialog$_scrollController; + t4 = A._setArrayType([], t2); if ($.$get$Platform_isIOS()) - t3.push(new A.Padding(B.EdgeInsets_0_0_0_16, A.Text$("Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user's Account Settings after purchase.", _null, _null, _null, _null, _null, A.TextStyle$(_null, _null, B.MaterialColor_Map_HFpTk_4288585374, _null, _null, _null, _null, _null, _null, _null, _null, 12, _null, _null, _null, _null, _null, true, _null, _null, _null, _null, _null, _null, _null, _null), _null, _null, _null), _null)); - t3.push(_this._buildProductList$0()); - stack.push(A.ListView$(t3, _null, _null, _null, B.Axis_1, false)); + t4.push(new A.Padding(B.EdgeInsets_0_0_0_16, A.Text$("Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user's Account Settings after purchase.", _null, _null, _null, _null, _null, A.TextStyle$(_null, _null, B.MaterialColor_Map_HFpTk_4288585374, _null, _null, _null, _null, _null, _null, _null, _null, 12, _null, _null, _null, _null, _null, true, _null, _null, _null, _null, _null, _null, _null, _null), _null, _null, _null), _null)); + t4.push(_this._buildProductList$0()); + stack.push(A.Scrollbar$(A.ListView$(t4, t3, _null, _null, B.Axis_1, false), t3, true)); } else stack.push(A.Center$(A.Text$(t3, _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, _null)); if (_this._purchasePending) @@ -427601,26 +427608,24 @@ }; A._UpgradeDialogState__buildProductList_closure1.prototype = { call$1(productDetails) { - var t5, _null = null, + var t4, t5, _null = null, _s8_ = "activate", - t1 = productDetails.id, - previousPurchase = this.purchases.$index(0, t1), - description = productDetails.description, - t2 = A.Text$(description.length === 0 && t1 === "enterprise_plan_10" ? "One month of the Enterprise Plan (10 users)" : description, _null, _null, _null, _null, _null, _null, _null, _null, _null), - t3 = A.TextButton_styleFrom(_null, _null, B.Color_4281236786, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, B.Color_4294967295, _null, _null, _null, _null, _null, _null), - t4 = this.$this; + previousPurchase = this.purchases.$index(0, productDetails.id), + t1 = A.Text$(productDetails.description, _null, _null, _null, _null, _null, _null, _null, _null, _null), + t2 = A.TextButton_styleFrom(_null, _null, B.Color_4281236786, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, B.Color_4294967295, _null, _null, _null, _null, _null, _null), + t3 = this.$this; if (previousPurchase != null) { - t1 = t4._framework$_element; - t1.toString; - t1 = A.Localizations_of(t1, B.Type_AppLocalization_KyD, type$.legacy_AppLocalization); - t1.toString; + t4 = t3._framework$_element; + t4.toString; + t4 = A.Localizations_of(t4, B.Type_AppLocalization_KyD, type$.legacy_AppLocalization); + t4.toString; t5 = $.$get$LocalizationsProvider__localizedValues(); - t1 = J.$index$asx(t5.$index(0, t1.localeCode), _s8_); - if (t1 == null) - t1 = J.$index$asx(t5.$index(0, "en"), _s8_); + t4 = J.$index$asx(t5.$index(0, t4.localeCode), _s8_); + if (t4 == null) + t4 = J.$index$asx(t5.$index(0, "en"), _s8_); } else - t1 = productDetails.price; - return A.ListTile$(false, _null, _null, _null, true, _null, _null, false, _null, _null, _null, _null, false, _null, _null, A.Column$(A._setArrayType([A.TextButton$(false, A.Text$(t1, _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, _null, new A._UpgradeDialogState__buildProductList__closure(t4, previousPurchase, productDetails, this.account), t3), new A.SizedBox(_null, 20, _null, _null)], type$.JSArray_legacy_Widget), B.CrossAxisAlignment_0, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null, t2, _null, _null); + t4 = productDetails.price; + return A.ListTile$(false, _null, _null, _null, true, _null, _null, false, _null, _null, _null, _null, false, _null, _null, A.Column$(A._setArrayType([A.TextButton$(false, A.Text$(t4, _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, _null, new A._UpgradeDialogState__buildProductList__closure(t3, previousPurchase, productDetails, this.account), t2), new A.SizedBox(_null, 20, _null, _null)], type$.JSArray_legacy_Widget), B.CrossAxisAlignment_0, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null, t1, _null, _null); }, $signature: 2377 }; @@ -465226,7 +465231,7 @@ else t7 = false; if (t7) { - if (account.trialStarted.length === 0 && account.plan === "") { + if (account.trialStarted.length === 0 && account.plan === "" && !A.isIOS()) { t7 = J.$index$asx(t5.$index(0, t6), _s16_); if (t7 == null) t7 = J.$index$asx(t5.$index(0, _s2_), _s16_);