Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -3,6 +3,7 @@ package mailer
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"encoding/base64"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
@@ -138,11 +139,13 @@ func (m *Mailer) Send(ctx context.Context, msg Message) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func buildMIME(from string, to []string, subject, contentType, body string) string {
|
func buildMIME(from string, to []string, subject, contentType, body string) string {
|
||||||
// Subject UTF-8 basit hali (gerekirse sonra MIME encoded-word ekleriz)
|
// Encode Subject to UTF-8
|
||||||
|
encodedSubject := "=?UTF-8?B?" + base64.StdEncoding.EncodeToString([]byte(subject)) + "?="
|
||||||
|
|
||||||
headers := []string{
|
headers := []string{
|
||||||
"From: " + from,
|
"From: " + from,
|
||||||
"To: " + strings.Join(to, ", "),
|
"To: " + strings.Join(to, ", "),
|
||||||
"Subject: " + subject,
|
"Subject: " + encodedSubject,
|
||||||
"MIME-Version: 1.0",
|
"MIME-Version: 1.0",
|
||||||
"Content-Type: " + contentType,
|
"Content-Type: " + contentType,
|
||||||
"",
|
"",
|
||||||
|
|||||||
@@ -562,7 +562,7 @@ func sendProductionUpdateMails(db *sql.DB, ml *mailer.GraphMailer, orderHeaderID
|
|||||||
subject := fmt.Sprintf("%s tarafından %s Nolu Sipariş Güncellendi (Üretim)", actor, orderNo)
|
subject := fmt.Sprintf("%s tarafından %s Nolu Sipariş Güncellendi (Üretim)", actor, orderNo)
|
||||||
|
|
||||||
var body strings.Builder
|
var body strings.Builder
|
||||||
body.WriteString("<html><body>")
|
body.WriteString("<html><head><meta charset='utf-8'></head><body>")
|
||||||
body.WriteString(fmt.Sprintf("<p><b>Sipariş No:</b> %s</p>", orderNo))
|
body.WriteString(fmt.Sprintf("<p><b>Sipariş No:</b> %s</p>", orderNo))
|
||||||
body.WriteString(fmt.Sprintf("<p><b>Cari:</b> %s</p>", currAccCode))
|
body.WriteString(fmt.Sprintf("<p><b>Cari:</b> %s</p>", currAccCode))
|
||||||
body.WriteString(fmt.Sprintf("<p><b>Piyasa:</b> %s (%s)</p>", marketTitle, marketCode))
|
body.WriteString(fmt.Sprintf("<p><b>Piyasa:</b> %s (%s)</p>", marketTitle, marketCode))
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
icon="save"
|
icon="save"
|
||||||
label="Secili Degisiklikleri Kaydet"
|
label="Secili Degisiklikleri Kaydet"
|
||||||
:loading="store.saving"
|
:loading="store.saving"
|
||||||
|
:disable="store.loading"
|
||||||
@click="onBulkSubmit"
|
@click="onBulkSubmit"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -101,6 +102,7 @@
|
|||||||
<q-checkbox
|
<q-checkbox
|
||||||
size="sm"
|
size="sm"
|
||||||
:model-value="!!selectedMap[props.row.RowKey]"
|
:model-value="!!selectedMap[props.row.RowKey]"
|
||||||
|
:disable="store.saving"
|
||||||
@update:model-value="(val) => toggleRowSelection(props.row.RowKey, val)"
|
@update:model-value="(val) => toggleRowSelection(props.row.RowKey, val)"
|
||||||
/>
|
/>
|
||||||
</q-td>
|
</q-td>
|
||||||
@@ -393,6 +395,10 @@
|
|||||||
</q-card-actions>
|
</q-card-actions>
|
||||||
</q-card>
|
</q-card>
|
||||||
</q-dialog>
|
</q-dialog>
|
||||||
|
<q-inner-loading :showing="store.saving">
|
||||||
|
<q-spinner-gears size="50px" color="primary" />
|
||||||
|
<div class="q-mt-md text-subtitle1">Degisiklikler kaydediliyor, lutfen bekleyiniz...</div>
|
||||||
|
</q-inner-loading>
|
||||||
</q-page>
|
</q-page>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user