RetailCRM-Mirror/mg-transport-telegram
1
0
Fork 0
mirror of synced 2024-11-23 12:36:02 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40 from gwinn/release

Browse Source 
fix markdown
This commit is contained in:
Alex Lushpai 2018-09-14 00:32:09 +03:00 committed by GitHub
commit 01b5fb405b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/routing.go
View File

@ -513,7 +513,7 @@ func mgWebhookHandler(c *gin.Context) {
mb += msg.Data.Product.Img mb += msg.Data.Product.Img
} }
} else if msg.Data.Type == v1.MsgTypeOrder { } else if msg.Data.Type == v1.MsgTypeOrder {
mb = "**Заказ" mb = "Заказ"
if msg.Data.Order.Number != "" { if msg.Data.Order.Number != "" {
mb += " " + msg.Data.Order.Number mb += " " + msg.Data.Order.Number
@ -523,7 +523,7 @@ func mgWebhookHandler(c *gin.Context) {
mb += fmt.Sprintf(" (%s)", msg.Data.Order.Date) mb += fmt.Sprintf(" (%s)", msg.Data.Order.Date)
} }
mb += "**\n" mb += "\n"
if len(msg.Data.Order.Items) > 0 { if len(msg.Data.Order.Items) > 0 {
for _, v := range msg.Data.Order.Items { for _, v := range msg.Data.Order.Items {
mb += fmt.Sprintf("%s %v x %v %s\n", v.Name, v.Quantity.Value, v.Price.Value, currency[strings.ToLower(v.Price.Currency)]) mb += fmt.Sprintf("%s %v x %v %s\n", v.Name, v.Quantity.Value, v.Price.Value, currency[strings.ToLower(v.Price.Currency)])
@ -536,10 +536,6 @@ func mgWebhookHandler(c *gin.Context) {
} }
m := tgbotapi.NewMessage(cid, mb) m := tgbotapi.NewMessage(cid, mb)
if msg.Data.Type == v1.MsgTypeProduct || msg.Data.Type == v1.MsgTypeOrder {
m.ParseMode = "Markdown"
}
if msg.Data.QuoteExternalID != "" { if msg.Data.QuoteExternalID != "" {
qid, err := strconv.Atoi(msg.Data.QuoteExternalID) qid, err := strconv.Atoi(msg.Data.QuoteExternalID)
if err != nil { if err != nil {