Compare commits
No commits in common. "ddc115f4a884fa7991518f02fa83da2266e7fd7e" and "2b39d32799f25cf8031a2c1184cd9ae5f18f62bf" have entirely different histories.
ddc115f4a8
...
2b39d32799
@ -60,7 +60,7 @@ func (server *Server) renewAccessToken(ctx *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if time.Now().After(refreshPayload.ExpiredAt) {
|
if time.Now().After(refreshPayload.ExpiredAt) {
|
||||||
err := fmt.Errorf("Expired session")
|
err := fmt.Errorf("Exprired session")
|
||||||
ctx.JSON(http.StatusUnauthorized, errorResponse(err, ""))
|
ctx.JSON(http.StatusUnauthorized, errorResponse(err, ""))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -177,10 +177,10 @@ func (server *Server) loginUser(ctx *gin.Context) {
|
|||||||
RefreshTokenExpiresAt: refreshTokenPayload.ExpiredAt,
|
RefreshTokenExpiresAt: refreshTokenPayload.ExpiredAt,
|
||||||
}
|
}
|
||||||
|
|
||||||
res := BaseApiRespond("succes", userLoginResponse{
|
res := userLoginResponse{
|
||||||
UserTokenResponse: tokenResponse,
|
UserTokenResponse: tokenResponse,
|
||||||
UserMerchantResponse: newUserMerchantResponse(user),
|
UserMerchantResponse: newUserMerchantResponse(user),
|
||||||
})
|
}
|
||||||
|
|
||||||
ctx.JSON(http.StatusOK, res)
|
ctx.JSON(http.StatusOK, res)
|
||||||
}
|
}
|
||||||
|
@ -10,8 +10,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type SaleOrderProduct struct {
|
type SaleOrderProduct struct {
|
||||||
ProductID uuid.UUID `json:"id"`
|
ProductID uuid.UUID `json:"product_id"`
|
||||||
ProductName string `json:"name"`
|
ProductName string `json:"product_name"`
|
||||||
Quantity float64 `json:"quantity"`
|
Quantity float64 `json:"quantity"`
|
||||||
Sub_total float64 `json:"sub_total"`
|
Sub_total float64 `json:"sub_total"`
|
||||||
Price float64 `json:"price"`
|
Price float64 `json:"price"`
|
||||||
|
Loading…
Reference in New Issue
Block a user