Skip to content

Commit

Permalink
Merge branch 'release/v0.0.87'
Browse files Browse the repository at this point in the history
  • Loading branch information
@lmquang
lmquang committed Apr 13, 2023
2 parents c09b896 + fa08327 commit 1bc73bd
Show file tree
Hide file tree
Showing 10 changed files with 840 additions and 51 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM surnet/alpine-wkhtmltopdf:3.10-0.12.5-full as wkhtmltopdf
FROM surnet/alpine-wkhtmltopdf:3.17.0-0.12.6-full as wkhtmltopdf

FROM golang:1.18-alpine as builder
RUN mkdir /build
Expand All @@ -9,7 +9,7 @@ ENV GOOS=linux GOARCH=amd64 CGO_ENABLED=0
RUN go install -v ./...
RUN go install -v github.com/rubenv/sql-migrate/sql-migrate@latest

FROM alpine:3.15
FROM alpine:3.17.3

RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories && \
echo http://dl-cdn.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories && \
Expand Down
281 changes: 280 additions & 1 deletion docs/docs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5299,6 +5299,12 @@ const docTemplate = `{
"id": {
"type": "string"
},
"intermediaryBankAddress": {
"type": "string"
},
"intermediaryBankName": {
"type": "string"
},
"name": {
"type": "string"
},
Expand All @@ -5319,6 +5325,59 @@ const docTemplate = `{
}
}
},
"model.BaseSalary": {
"type": "object",
"properties": {
"batch": {
"type": "integer"
},
"category": {
"type": "string"
},
"company_account_amount": {
"type": "integer"
},
"contract_amount": {
"type": "integer"
},
"createdAt": {
"type": "string"
},
"currency": {
"$ref": "#/definitions/model.Currency"
},
"currency_id": {
"type": "string"
},
"deletedAt": {
"$ref": "#/definitions/gorm.DeletedAt"
},
"effective_date": {
"type": "string"
},
"employee": {
"$ref": "#/definitions/model.Employee"
},
"employee_id": {
"type": "string"
},
"id": {
"type": "string"
},
"insurance_amount": {
"type": "integer"
},
"personal_account_amount": {
"type": "integer"
},
"type": {
"type": "string"
},
"updatedAt": {
"type": "string"
}
}
},
"model.Chapter": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -5424,6 +5483,35 @@ const docTemplate = `{
}
}
},
"model.CommissionExplain": {
"type": "object",
"properties": {
"amount": {
"type": "integer"
},
"bucket_id": {
"type": "integer"
},
"formatted_amount": {
"type": "string"
},
"id": {
"type": "string"
},
"month": {
"type": "integer"
},
"name": {
"type": "string"
},
"todo_id": {
"type": "integer"
},
"year": {
"type": "integer"
}
}
},
"model.CompanyContactInfo": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -5600,12 +5688,15 @@ const docTemplate = `{
"avatar": {
"type": "string"
},
"base_salary": {
"$ref": "#/definitions/model.BaseSalary"
},
"basecampAttachableSGID": {
"type": "string"
},
"basecampID": {
"description": "social services",
"type": "string"
"type": "integer"
},
"city": {
"type": "string"
Expand Down Expand Up @@ -5661,6 +5752,9 @@ const docTemplate = `{
"$ref": "#/definitions/model.EmployeeStack"
}
},
"employee_salary": {
"$ref": "#/definitions/model.EmployeeSalary"
},
"fullName": {
"description": "basic info",
"type": "string"
Expand Down Expand Up @@ -5938,6 +6032,59 @@ const docTemplate = `{
}
}
},
"model.EmployeeSalary": {
"type": "object",
"properties": {
"actual_pay_day": {
"type": "integer"
},
"bonus_amount": {
"type": "integer"
},
"bonus_detail": {
"type": "array",
"items": {
"type": "integer"
}
},
"commission_amount": {
"type": "integer"
},
"commission_detail": {
"type": "array",
"items": {
"type": "integer"
}
},
"employee_id": {
"type": "string"
},
"is_done": {
"type": "boolean"
},
"month": {
"type": "integer"
},
"plan_pay_day": {
"type": "integer"
},
"reimbursement_amount": {
"type": "integer"
},
"reimbursement_detail": {
"type": "array",
"items": {
"type": "integer"
}
},
"total_amount": {
"type": "integer"
},
"year": {
"type": "integer"
}
}
},
"model.EmployeeStack": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6252,6 +6399,103 @@ const docTemplate = `{
}
}
},
"model.Payroll": {
"type": "object",
"properties": {
"base_salary_amount": {
"type": "integer"
},
"commission_amount": {
"type": "integer"
},
"commission_explain": {
"type": "array",
"items": {
"type": "integer"
}
},
"commission_explains": {
"description": "CommissionExplains is commission explains in email template",
"type": "array",
"items": {
"$ref": "#/definitions/model.CommissionExplain"
}
},
"contract_amount": {
"type": "integer"
},
"conversion_amount": {
"type": "integer"
},
"due_date": {
"type": "string"
},
"employee": {
"$ref": "#/definitions/model.Employee"
},
"employee_id": {
"type": "string"
},
"id": {
"type": "string"
},
"is_paid": {
"type": "boolean"
},
"month": {
"type": "integer"
},
"project_bonus": {
"type": "integer"
},
"project_bonus_explain": {
"type": "array",
"items": {
"type": "integer"
}
},
"project_bonus_explains": {
"description": "ProjectBonusExplains is project bonus explains in email template",
"type": "array",
"items": {
"$ref": "#/definitions/model.ProjectBonusExplain"
}
},
"total": {
"type": "integer"
},
"total_allowance": {
"description": "TotalAllowance is amount of allowance in email template",
"type": "number"
},
"total_explain": {
"type": "array",
"items": {
"type": "integer"
}
},
"twAmount": {
"description": "TotalAllowance is amount of allowance in email template",
"type": "number"
},
"twFee": {
"type": "number"
},
"twRate": {
"description": "TWRate is rate of allowance in email template",
"type": "number"
},
"user_rank_snapshot": {
"type": "array",
"items": {
"type": "integer"
}
},
"year": {
"type": "integer"
}
}
},
"model.Position": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6382,6 +6626,35 @@ const docTemplate = `{
}
}
},
"model.ProjectBonusExplain": {
"type": "object",
"properties": {
"amount": {
"type": "integer"
},
"bucket_id": {
"type": "integer"
},
"description": {
"type": "string"
},
"formatted_amount": {
"type": "string"
},
"month": {
"type": "integer"
},
"name": {
"type": "string"
},
"todo_id": {
"type": "integer"
},
"year": {
"type": "integer"
}
}
},
"model.ProjectHead": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -8480,6 +8753,12 @@ const docTemplate = `{
"id": {
"type": "string"
},
"intermediaryBankAddress": {
"type": "string"
},
"intermediaryBankName": {
"type": "string"
},
"name": {
"type": "string"
},
Expand Down
Loading

0 comments on commit 1bc73bd

Please sign in to comment.