Mhamdans17 commited on
Commit ·
77568d0
1
Parent(s): d98be82
feat: add created_by_name for manual cashier input
Browse files- controllers/member_controller.go +12 -10
- models/models.go +6 -5
controllers/member_controller.go
CHANGED
|
@@ -38,9 +38,10 @@ func CreateMember(c *gin.Context) {
|
|
| 38 |
companyID := *user.CompanyID
|
| 39 |
|
| 40 |
var input struct {
|
| 41 |
-
MemberID
|
| 42 |
-
Name
|
| 43 |
-
Phone
|
|
|
|
| 44 |
}
|
| 45 |
|
| 46 |
if err := c.ShouldBindJSON(&input); err != nil {
|
|
@@ -56,13 +57,14 @@ func CreateMember(c *gin.Context) {
|
|
| 56 |
}
|
| 57 |
|
| 58 |
newMember := models.Member{
|
| 59 |
-
CompanyID:
|
| 60 |
-
MemberCode:
|
| 61 |
-
Name:
|
| 62 |
-
Phone:
|
| 63 |
-
Points:
|
| 64 |
-
CreatedByID:
|
| 65 |
-
|
|
|
|
| 66 |
}
|
| 67 |
|
| 68 |
if err := config.DB.Create(&newMember).Error; err != nil {
|
|
|
|
| 38 |
companyID := *user.CompanyID
|
| 39 |
|
| 40 |
var input struct {
|
| 41 |
+
MemberID string `json:"member_id" binding:"required"`
|
| 42 |
+
Name string `json:"name" binding:"required"`
|
| 43 |
+
Phone string `json:"phone"`
|
| 44 |
+
CreatedByName string `json:"created_by_name"`
|
| 45 |
}
|
| 46 |
|
| 47 |
if err := c.ShouldBindJSON(&input); err != nil {
|
|
|
|
| 57 |
}
|
| 58 |
|
| 59 |
newMember := models.Member{
|
| 60 |
+
CompanyID: companyID,
|
| 61 |
+
MemberCode: input.MemberID,
|
| 62 |
+
Name: input.Name,
|
| 63 |
+
Phone: input.Phone,
|
| 64 |
+
Points: 0,
|
| 65 |
+
CreatedByID: &user.ID,
|
| 66 |
+
CreatedByName: input.CreatedByName,
|
| 67 |
+
BranchID: user.BranchID,
|
| 68 |
}
|
| 69 |
|
| 70 |
if err := config.DB.Create(&newMember).Error; err != nil {
|
models/models.go
CHANGED
|
@@ -53,11 +53,12 @@ type Member struct {
|
|
| 53 |
MemberCode string `gorm:"column:member_id;type:varchar(50);not null;uniqueIndex:uq_company_member" json:"member_id"`
|
| 54 |
Name string `gorm:"type:varchar(100);not null" json:"name"`
|
| 55 |
Phone string `gorm:"type:varchar(20)" json:"phone"`
|
| 56 |
-
Points
|
| 57 |
-
BranchID
|
| 58 |
-
CreatedByID
|
| 59 |
-
|
| 60 |
-
|
|
|
|
| 61 |
Branch *Branch `gorm:"foreignKey:BranchID" json:"branch,omitempty"`
|
| 62 |
CreatedBy *User `gorm:"foreignKey:CreatedByID" json:"created_by,omitempty"`
|
| 63 |
}
|
|
|
|
| 53 |
MemberCode string `gorm:"column:member_id;type:varchar(50);not null;uniqueIndex:uq_company_member" json:"member_id"`
|
| 54 |
Name string `gorm:"type:varchar(100);not null" json:"name"`
|
| 55 |
Phone string `gorm:"type:varchar(20)" json:"phone"`
|
| 56 |
+
Points int `gorm:"default:0" json:"points"`
|
| 57 |
+
BranchID *uint `gorm:"index" json:"branch_id"`
|
| 58 |
+
CreatedByID *uint `gorm:"index" json:"created_by_id"`
|
| 59 |
+
CreatedByName string `gorm:"type:varchar(100)" json:"created_by_name"`
|
| 60 |
+
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
| 61 |
+
Company *Company `gorm:"foreignKey:CompanyID" json:"company,omitempty"`
|
| 62 |
Branch *Branch `gorm:"foreignKey:BranchID" json:"branch,omitempty"`
|
| 63 |
CreatedBy *User `gorm:"foreignKey:CreatedByID" json:"created_by,omitempty"`
|
| 64 |
}
|