Merge branch 'main' of https://github.com/boltcard/boltcard into origin/getcardapi
# Conflicts: # db/db.go # internalapi/updateboltcard.go
This commit is contained in:
commit
af26b86288
5 changed files with 23 additions and 22 deletions
|
|
@ -17,6 +17,15 @@ func Updateboltcard(w http.ResponseWriter, r *http.Request) {
|
|||
return
|
||||
}
|
||||
|
||||
enable_flag_str := r.URL.Query().Get("enable")
|
||||
enable_flag, err := strconv.ParseBool(enable_flag_str)
|
||||
if err != nil {
|
||||
msg := "updateboltcard: enable is not a valid boolean"
|
||||
log.Warn(msg)
|
||||
resp_err.Write_message(w, msg)
|
||||
return
|
||||
}
|
||||
|
||||
tx_max_str := r.URL.Query().Get("tx_max")
|
||||
tx_max, err := strconv.Atoi(tx_max_str)
|
||||
if err != nil {
|
||||
|
|
@ -35,15 +44,6 @@ func Updateboltcard(w http.ResponseWriter, r *http.Request) {
|
|||
return
|
||||
}
|
||||
|
||||
enable_flag_str := r.URL.Query().Get("enable")
|
||||
enable_flag, err := strconv.ParseBool(enable_flag_str)
|
||||
if err != nil {
|
||||
msg := "updateboltcard: enable is not a valid boolean"
|
||||
log.Warn(msg)
|
||||
resp_err.Write_message(w, msg)
|
||||
return
|
||||
}
|
||||
|
||||
card_name := r.URL.Query().Get("card_name")
|
||||
|
||||
// check if card_name exists
|
||||
|
|
@ -69,7 +69,7 @@ func Updateboltcard(w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
// update the card record
|
||||
|
||||
err = db.Update_card(card_name, tx_max, day_max, enable_flag)
|
||||
err = db.Update_card(card_name, enable_flag, tx_max, day_max)
|
||||
if err != nil {
|
||||
log.Warn(err.Error())
|
||||
return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue