|
@@ -79,6 +79,7 @@ class BillStatusBar {
|
|
|
bool get showCancelSubmit => _approvalStatus == 'SHCOUNT1';
|
|
bool get showCancelSubmit => _approvalStatus == 'SHCOUNT1';
|
|
|
|
|
|
|
|
bool get showReturn {
|
|
bool get showReturn {
|
|
|
|
|
+ if (onReturn == null) return false;
|
|
|
final s = _approvalStatus;
|
|
final s = _approvalStatus;
|
|
|
return (s == 'SHCOUNT4' || s == 'SHCOUNT6') && !_isClosed && !_isTransferred;
|
|
return (s == 'SHCOUNT4' || s == 'SHCOUNT6') && !_isClosed && !_isTransferred;
|
|
|
}
|
|
}
|
|
@@ -187,7 +188,7 @@ class BillStatusBar {
|
|
|
text: _editLabel(l10n),
|
|
text: _editLabel(l10n),
|
|
|
size: TDButtonSize.medium,
|
|
size: TDButtonSize.medium,
|
|
|
type: TDButtonType.outline,
|
|
type: TDButtonType.outline,
|
|
|
- shape: TDButtonShape.rectangle,
|
|
|
|
|
|
|
+ shape: TDButtonShape.round,
|
|
|
theme: TDButtonTheme.primary,
|
|
theme: TDButtonTheme.primary,
|
|
|
onTap: onEdit,
|
|
onTap: onEdit,
|
|
|
),
|
|
),
|
|
@@ -202,7 +203,7 @@ class BillStatusBar {
|
|
|
text: _submitLabel(l10n),
|
|
text: _submitLabel(l10n),
|
|
|
size: TDButtonSize.medium,
|
|
size: TDButtonSize.medium,
|
|
|
type: TDButtonType.fill,
|
|
type: TDButtonType.fill,
|
|
|
- shape: TDButtonShape.rectangle,
|
|
|
|
|
|
|
+ shape: TDButtonShape.round,
|
|
|
theme: TDButtonTheme.primary,
|
|
theme: TDButtonTheme.primary,
|
|
|
onTap: onSubmit,
|
|
onTap: onSubmit,
|
|
|
),
|
|
),
|
|
@@ -214,7 +215,7 @@ class BillStatusBar {
|
|
|
text: _cancelSubmitLabel(l10n),
|
|
text: _cancelSubmitLabel(l10n),
|
|
|
size: TDButtonSize.medium,
|
|
size: TDButtonSize.medium,
|
|
|
type: TDButtonType.fill,
|
|
type: TDButtonType.fill,
|
|
|
- shape: TDButtonShape.rectangle,
|
|
|
|
|
|
|
+ shape: TDButtonShape.round,
|
|
|
theme: TDButtonTheme.danger,
|
|
theme: TDButtonTheme.danger,
|
|
|
onTap: onCancelSubmit,
|
|
onTap: onCancelSubmit,
|
|
|
),
|
|
),
|
|
@@ -228,7 +229,7 @@ class BillStatusBar {
|
|
|
text: _returnLabel(l10n),
|
|
text: _returnLabel(l10n),
|
|
|
size: TDButtonSize.medium,
|
|
size: TDButtonSize.medium,
|
|
|
type: TDButtonType.fill,
|
|
type: TDButtonType.fill,
|
|
|
- shape: TDButtonShape.rectangle,
|
|
|
|
|
|
|
+ shape: TDButtonShape.round,
|
|
|
theme: TDButtonTheme.primary,
|
|
theme: TDButtonTheme.primary,
|
|
|
onTap: onReturn,
|
|
onTap: onReturn,
|
|
|
),
|
|
),
|