M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-06-18 14:51:38 +03:00
parent 492fec7a28
commit 7db8b6cf5a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
svc/routes/wholesale_campaigns.go
View File

@@ -51,8 +51,8 @@ SELECT
COALESCE(NULLIF(BTRIM(code),''),'') AS code, COALESCE(NULLIF(BTRIM(code),''),'') AS code,
COALESCE(NULLIF(BTRIM(title),''),'') AS title, COALESCE(NULLIF(BTRIM(title),''),'') AS title,
COALESCE(is_active, TRUE) AS is_active, COALESCE(is_active, TRUE) AS is_active,
COALESCE(to_char(dtst, 'YYYY-MM-DD HH24:MI:SS'), '') AS dtst, COALESCE(to_char(dtst, 'DD.MM.YYYY'), '') AS dtst,
COALESCE(to_char(dtfn, 'YYYY-MM-DD HH24:MI:SS'), '') AS dtfn, COALESCE(to_char(dtfn, 'DD.MM.YYYY'), '') AS dtfn,
COALESCE(discount_rate, 0)::float8 AS discount_rate, COALESCE(discount_rate, 0)::float8 AS discount_rate,
COALESCE(NULLIF(BTRIM(notes),''),'') AS notes COALESCE(NULLIF(BTRIM(notes),''),'') AS notes
FROM sdcampaign FROM sdcampaign
@@ -486,7 +486,7 @@ SELECT
COALESCE(sc.code,'') AS code, COALESCE(sc.code,'') AS code,
COALESCE(sc.title,'') AS title, COALESCE(sc.title,'') AS title,
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate, COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS at COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'DD.MM.YYYY'), '') AS at
FROM zbggcampaign z FROM zbggcampaign z
LEFT JOIN sdcampaign sc LEFT JOIN sdcampaign sc
ON sc.id = z.sdcampaign_id ON sc.id = z.sdcampaign_id
@@ -877,7 +877,7 @@ SELECT
COALESCE(sc.code,'') AS code, COALESCE(sc.code,'') AS code,
COALESCE(sc.title,'') AS title, COALESCE(sc.title,'') AS title,
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate, COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS campaign_last_dttm COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'DD.MM.YYYY'), '') AS campaign_last_dttm
FROM latest l FROM latest l
LEFT JOIN zbggcampaign z LEFT JOIN zbggcampaign z
ON z.id = l.z_id ON z.id = l.z_id