Dusk/TurtleMail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed COD display bug in log

Browse Source
This commit is contained in:
Sica
2025-03-26 00:08:20 +01:00
parent 91142ac27c
commit 00e8a9dd2f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TurtleMail.lua
+7 -6
View File
@@ -32,7 +32,7 @@ TurtleMail.calendar = m.Calendar.new()
function TurtleMail:init() function TurtleMail:init()
self.debug( "TurtleMail.init" ) self.debug( "TurtleMail.init" )
self.update_frame = m.api.CreateFrame( 'Frame', "TurtleMailFrame", m.api.MailFrame ) self.update_frame = m.api.CreateFrame( "Frame", "TurtleMailFrame", m.api.MailFrame )
self.update_frame:SetScript( "OnUpdate", self.on_update ) self.update_frame:SetScript( "OnUpdate", self.on_update )
-- Register events -- Register events
@@ -231,7 +231,7 @@ function TurtleMail.ADDON_LOADED()
if not m.api.TurtleMail_Log[ "Settings" ].first_run then if not m.api.TurtleMail_Log[ "Settings" ].first_run then
m.api.TurtleMail_Log[ "Settings" ].first_run = version m.api.TurtleMail_Log[ "Settings" ].first_run = version
m.info ( "New in |cffeda55fv1.4|r: Enable logging with |cffabd473/tm log|r" ) m.info( "New in |cffeda55fv1.4|r: Enable logging with |cffabd473/tm log|r" )
end end
if m.api.UIPanelWindows[ "MailFrame" ] then if m.api.UIPanelWindows[ "MailFrame" ] then
@@ -1027,6 +1027,7 @@ function TurtleMail.sendmail_send()
m.sendmail_state.money = 0 m.sendmail_state.money = 0
end end
if m.sendmail_state.cod then if m.sendmail_state.cod then
m.sendmail_state.cod = amount
m.api.SetSendMailCOD( amount ) m.api.SetSendMailCOD( amount )
else else
m.sendmail_state.money = 0 m.sendmail_state.money = 0
@@ -1160,7 +1161,6 @@ function TurtleMail.log.load()
m.api.TurtleMailLogTitleText:SetText( L[ "Log" ] ) m.api.TurtleMailLogTitleText:SetText( L[ "Log" ] )
m.api.MailFrameTab3:SetText( L[ "Log" ] ) m.api.MailFrameTab3:SetText( L[ "Log" ] )
--local font_file = m.api.pfUI and m.api.pfUI.version and m.api.pfUI.font_default or "FONTS\\ARIALN.TTF"
local font_file = m.pfui_skin_enabled and m.api.pfUI.font_default or "FONTS\\ARIALN.TTF" local font_file = m.pfui_skin_enabled and m.api.pfUI.font_default or "FONTS\\ARIALN.TTF"
local font_size = 11 local font_size = 11
@@ -1487,7 +1487,8 @@ function TurtleMail.log.populate( log_type, index )
end end
m.api.TurtleMailLogTitleText:SetText( string.format( "%s %s", L[ log_type ], L[ "Log" ] ) ) m.api.TurtleMailLogTitleText:SetText( string.format( "%s %s", L[ log_type ], L[ "Log" ] ) )
m.api.TurtleMailLogStatusText:SetText( string.format( "Showing %d-%d of %d", (index == 0 and log_count == 0) and index or index + 1, math.min( log_count, index + 10 ), log_count ) ) m.api.TurtleMailLogStatusText:SetText( string.format( "Showing %d-%d of %d", (index == 0 and log_count == 0) and index or index + 1,
math.min( log_count, index + 10 ), log_count ) )
for i = 1, 10 do for i = 1, 10 do
if log[ index + i ] then if log[ index + i ] then
@@ -1515,8 +1516,8 @@ function TurtleMail.log.populate( log_type, index )
if entry.money and entry.money > 0 then if entry.money and entry.money > 0 then
local cod = (entry.cod and entry.cod > 0) and "COD: " or " " local cod = (entry.cod and entry.cod > 0) and "COD: " or " "
m.api[ "TurtleMailLogItem" .. i .. "Money" ]:SetText( cod .. m.format_money( entry.money ) ) m.api[ "TurtleMailLogItem" .. i .. "Money" ]:SetText( cod .. m.format_money( entry.money ) )
elseif entry.cod and entry.cod > 0 then elseif entry.cod then
m.api[ "TurtleMailLogItem" .. i .. "Money" ]:SetText( "COD: " .. m.format_money( entry.cod ) ) m.api[ "TurtleMailLogItem" .. i .. "Money" ]:SetText( "COD" .. (entry.cod > 1 and (": " .. m.format_money( entry.cod )) or "") )
else else
m.api[ "TurtleMailLogItem" .. i .. "Money" ]:SetText( "" ) m.api[ "TurtleMailLogItem" .. i .. "Money" ]:SetText( "" )
end end
TurtleMail.toc
+1 -1
View File
@@ -2,7 +2,7 @@
## Interface: 11200 ## Interface: 11200
## Title: |cffabd473Turtle|cffffffffMail ## Title: |cffabd473Turtle|cffffffffMail
## Author: shirsig/sica ## Author: shirsig/sica
## Version: 1.4 ## Version: 1.4.1
## Notes: Mailbox enhancement ## Notes: Mailbox enhancement
## SavedVariables: TurtleMail_AutoCompleteNames ## SavedVariables: TurtleMail_AutoCompleteNames
## SavedVariablesPerCharacter: TurtleMail_To TurtleMail_Point TurtleMail_Log ## SavedVariablesPerCharacter: TurtleMail_To TurtleMail_Point TurtleMail_Log