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

Correct trial

This commit is contained in:
Hillel Coren 2021-07-20 12:47:28 +03:00
parent 66bb6fb2fb
commit 605cdc599a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/data/models/task_model.dart
View File

@ -673,12 +673,12 @@ abstract class TaskEntity extends Object
? -1
: taskA.isInvoiced
? 999999
: taskStatusMap[taskA.statusId].statusOrder;
: (taskStatusMap[taskA.statusId]?.statusOrder ?? 0);
final taskBStatus = taskB.isRunning
? -1
: taskB.isInvoiced
? 999999
: taskStatusMap[taskB.statusId].statusOrder;
: (taskStatusMap[taskB.statusId]?.statusOrder ?? 0);
response = taskAStatus.compareTo(taskBStatus);
break;
default:

2
lib/ui/app/edit_scaffold.dart
View File

@ -76,7 +76,7 @@ class EditScaffold extends StatelessWidget {
if (!state.isProPlan || state.account.isTrial) {
if (kAdvancedSettings.contains(state.uiState.baseSubRoute)) {
showUpgradeBanner = true;
if (!state.isProPlan && isEnabled) {
if (!state.isProPlan && !state.account.isTrial && isEnabled) {
isCancelEnabled = true;
isEnabled = false;
}