Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge tag 'Hotfix-45' into develop

Browse Source 
Finish Hotfix-45
This commit is contained in:
Fabio Narracci
2024-02-19 12:07:12 +01:00
parent e5a9e50742 baa0ddffd0
commit 31d5b67ddf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-engine/src/main/java/it/integry/ems/product/export/services/WoocommerceService.java
View File

@@ -62,7 +62,7 @@ public class WoocommerceService {
" CASE WHEN CONVERT(DATE, GETDATE()) BETWEEN ttb_anno_stag.data_iniz_ecomm AND ttb_anno_stag.data_fine_ecomm THEN 'NUOVA COLLEZIONE' ELSE 'OUTLET' END AS collezione , " +
" ttb_stag.descrizione AS stagione , " +
" ISNULL(ws.categoria_woocomm, mtb_aart.cod_msgr) AS categoria , " +
" CONVERT( DECIMAL(15, 2), dbo.f_CalcPrzMaxTextiles(ttb_style.cod_style, " + UtilityDB.valueToString(listino) + " , 'S' )) AS prezzo " +
" CONVERT( DECIMAL(15, 2), dbo.f_CalcPrzMaxTextiles(ttb_style.cod_style, " + UtilityDB.valueToString(listino) + " , 'N' )) AS prezzo " +
" FROM ttb_style " +
" INNER JOIN mtb_aart " +
" ON ttb_style.cod_style = mtb_aart.cod_mart " +
@@ -108,7 +108,7 @@ public class WoocommerceService {
" ), " +
" disponibile AS " +
" ( " +
" SELECT " +
" SELECT DISTINCT " +
" dettaglio.cod_style , " +
" dettaglio.cod_barre AS ean , " +
" dettaglio.pos , " +