File tree Expand file tree Collapse file tree 5 files changed +19
-3
lines changed
app/features/home/transaction Expand file tree Collapse file tree 5 files changed +19
-3
lines changed Original file line number Diff line number Diff line change @@ -73,9 +73,14 @@ mat-toolbar {
7373
7474 button .returned {
7575 color : white ;
76- border-color : var ( --ion-color-danger ) ;
76+ border-color : #e31587 ;
7777 background-color : #e31587 ;
7878 }
79+
80+ button .missed {
81+ color : #e31587 ;
82+ border-color : #e31587 ;
83+ }
7984}
8085
8186.column {
Original file line number Diff line number Diff line change @@ -41,7 +41,10 @@ export async function getStatus(
4141) {
4242 const resolvedEmail = await email ;
4343 if ( transaction . expired ) {
44- return Status . Returned ;
44+ if ( transaction . sender === resolvedEmail ) {
45+ return Status . Returned ;
46+ }
47+ return Status . Missed ;
4548 }
4649 if ( ! transaction . fulfilled_at ) {
4750 if ( transaction . receiver_email === resolvedEmail ) {
@@ -59,6 +62,7 @@ enum Status {
5962 waitingToBeAccepted = 'waitingToBeAccepted' ,
6063 InProgress = 'inProgress' ,
6164 Returned = 'returned' ,
65+ Missed = 'missed' ,
6266 Delivered = 'delivered' ,
6367 Accepted = 'accepted' ,
6468}
Original file line number Diff line number Diff line change @@ -61,8 +61,13 @@ mat-toolbar {
6161
6262 button .returned {
6363 color : white ;
64- border-color : var ( --ion-color-danger ) ;
64+ border-color : #e31587 ;
6565 background-color : #e31587 ;
6666 }
67+
68+ button .missed {
69+ color : #e31587 ;
70+ border-color : #e31587 ;
71+ }
6772 }
6873}
Original file line number Diff line number Diff line change 146146 "accepted" : " Accepted" ,
147147 "delivered" : " Delivered" ,
148148 "returned" : " Returned" ,
149+ "missed" : " Returned" ,
149150 "inProgress" : " In Progress" ,
150151 "waitingToBeAccepted" : " In Progress" ,
151152 "null" : " Not Provided"
Original file line number Diff line number Diff line change 145145 "accepted" : " 已接收" ,
146146 "delivered" : " 已送出" ,
147147 "returned" : " 已退回" ,
148+ "missed" : " 已退回" ,
148149 "inProgress" : " 等待中" ,
149150 "waitingToBeAccepted" : " 等待中" ,
150151 "null" : " 未提供"
You can’t perform that action at this time.
0 commit comments