Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixeed payment history #1632

Merged
merged 1 commit into from
May 7, 2024
Merged

fixeed payment history #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions db/structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,17 +552,17 @@ type WorkspaceUsersData struct {
}

type WorkspaceFeatures struct {
ID uint `json:"id"`
Uuid string `json:"uuid"`
WorkspaceUuid string `json:"workspace_uuid"`
Name string `json:"name"`
Brief string `json:"brief"`
Requirements string `json:"requirements"`
Architecture string `json:"architecture"`
Created *time.Time `json:"created"`
Updated *time.Time `json:"updated"`
CreatedBy string `json:"created_by"`
UpdatedBy string `json:"updated_by"`
ID uint `json:"id"`
Uuid string `json:"uuid"`
WorkspaceUuid string `json:"workspace_uuid"`
Name string `json:"name"`
Brief string `json:"brief"`
Requirements string `json:"requirements"`
Architecture string `json:"architecture"`
Created *time.Time `json:"created"`
Updated *time.Time `json:"updated"`
CreatedBy string `json:"created_by"`
UpdatedBy string `json:"updated_by"`
}

type BountyRoles struct {
Expand Down Expand Up @@ -689,11 +689,11 @@ type NewPaymentHistory struct {
}

type PaymentHistoryData struct {
PaymentHistory NewPaymentHistory
SenderName string `json:"sender_name"`
ReceiverName string `json:"receiver_name"`
SenderImg string `json:"sender_img"`
ReceiverImg string `json:"receiver_img"`
NewPaymentHistory
SenderName string `json:"sender_name"`
ReceiverName string `json:"receiver_name"`
SenderImg string `json:"sender_img"`
ReceiverImg string `json:"receiver_img"`
}

type PaymentData struct {
Expand Down
10 changes: 5 additions & 5 deletions handlers/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,11 +640,11 @@ func GetPaymentHistory(w http.ResponseWriter, r *http.Request) {
sender := db.DB.GetPersonByPubkey(payment.SenderPubKey)
receiver := db.DB.GetPersonByPubkey(payment.ReceiverPubKey)
paymentData := db.PaymentHistoryData{
PaymentHistory: payment,
SenderName: sender.UniqueName,
SenderImg: sender.Img,
ReceiverName: receiver.UniqueName,
ReceiverImg: receiver.Img,
NewPaymentHistory: payment,
SenderName: sender.UniqueName,
SenderImg: sender.Img,
ReceiverName: receiver.UniqueName,
ReceiverImg: receiver.Img,
}
paymentHistoryData = append(paymentHistoryData, paymentData)
}
Expand Down
Loading