Compare commits

...

2 Commits

Author SHA1 Message Date
MEHMETKECECI
fd5b8a2954 Merge remote-tracking branch 'origin/master' 2026-02-14 16:16:47 +03:00
MEHMETKECECI
14b3d86782 Merge remote-tracking branch 'origin/master' 2026-02-14 15:57:28 +03:00
3 changed files with 11 additions and 2 deletions

View File

@@ -4,6 +4,8 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"log" "log"
"os"
"strings"
_ "github.com/microsoft/go-mssqldb" _ "github.com/microsoft/go-mssqldb"
) )
@@ -11,8 +13,11 @@ import (
var MssqlDB *sql.DB var MssqlDB *sql.DB
func ConnectMSSQL() { func ConnectMSSQL() {
//connString := "sqlserver://sa:Gil_0150@10.0.0.9:1433?databaseName=BAGGI_V3" connString := strings.TrimSpace(os.Getenv("MSSQL_CONN"))
connString := "sqlserver://sa:Gil_0150@100.127.221.13:1433?databaseName=BAGGI_V3" if connString == "" {
// Fallback keeps existing behavior if env is missing.
connString = "sqlserver://sa:Gil_0150@100.127.221.13:1433?databaseName=BAGGI_V3"
}
var err error var err error
MssqlDB, err = sql.Open("sqlserver", connString) MssqlDB, err = sql.Open("sqlserver", connString)

View File

@@ -81,6 +81,7 @@ func UpdateOrderHandler(w http.ResponseWriter, r *http.Request) {
_ = json.NewEncoder(w).Encode(map[string]any{ _ = json.NewEncoder(w).Encode(map[string]any{
"code": "ORDER_UPDATE_FAILED", "code": "ORDER_UPDATE_FAILED",
"message": "Sipariş kaydedilirken beklenmeyen bir hata oluştu.", "message": "Sipariş kaydedilirken beklenmeyen bir hata oluştu.",
"detail": err.Error(),
}) })
return return
} }

View File

@@ -2743,6 +2743,7 @@ export const useOrderEntryStore = defineStore('orderentry', {
$q.notify({ $q.notify({
type: 'negative', type: 'negative',
message: message:
err?.response?.data?.detail ||
err?.response?.data?.message || err?.response?.data?.message ||
err?.message || err?.message ||
'Kayıt sırasında hata' 'Kayıt sırasında hata'
@@ -3067,6 +3068,7 @@ export const useOrderEntryStore = defineStore('orderentry', {
orderLineId = orderLineId =
safeStr(lineIdMap?.[bedenKey]) || safeStr(lineIdMap?.[bedenKey]) ||
safeStr(lineIdMap?.[bedenPayload]) || safeStr(lineIdMap?.[bedenPayload]) ||
safeStr(lineIdMap?.[' ']) ||
safeStr(row.OrderLineID) safeStr(row.OrderLineID)
} }
@@ -3096,6 +3098,7 @@ export const useOrderEntryStore = defineStore('orderentry', {
orderLineId = orderLineId =
safeStr(lineIdMap?.[bedenKey]) || safeStr(lineIdMap?.[bedenKey]) ||
safeStr(lineIdMap?.[bedenPayload]) || safeStr(lineIdMap?.[bedenPayload]) ||
safeStr(lineIdMap?.[' ']) ||
(Object.keys(map).length === 1 (Object.keys(map).length === 1
? safeStr(row.OrderLineID) ? safeStr(row.OrderLineID)
: '') : '')