Merge branch 'master' into dev

This commit is contained in:
Joseph Ferano 2022-05-17 08:40:20 +07:00
commit a06d1ef383

View File

@ -109,7 +109,7 @@ let getStoreItems (storeId : string) =
buy_price,sell_price,rate_limit,expiration,drop_chance,can_trade,can_consume,attack_power,defense_power,class_name,max_stack,mods buy_price,sell_price,rate_limit,expiration,drop_chance,can_trade,can_consume,attack_power,defense_power,class_name,max_stack,mods
FROM store_item FROM store_item
JOIN item i on store_item.item_id = i.id JOIN item i on store_item.item_id = i.id
WHERE store_id = @sid; WHERE store_id = @sid AND store_item.unlisted = false
""" """
|> Sql.executeAsync (fun reader -> { |> Sql.executeAsync (fun reader -> {
StoreId = reader.string "store_id" StoreId = reader.string "store_id"
@ -129,7 +129,7 @@ let getStoreItemBySymbol (itemSymbol : string) =
buy_price,sell_price,rate_limit,expiration,drop_chance,can_trade,can_consume,attack_power,defense_power,class_name,max_stack,mods buy_price,sell_price,rate_limit,expiration,drop_chance,can_trade,can_consume,attack_power,defense_power,class_name,max_stack,mods
FROM store_item FROM store_item
JOIN item i on store_item.item_id = i.id JOIN item i on store_item.item_id = i.id
WHERE item_id = @iid; WHERE item_id = @iid
""" """
|> Sql.executeRowAsync (fun reader -> { |> Sql.executeRowAsync (fun reader -> {
StoreId = reader.string "store_id" StoreId = reader.string "store_id"