diff --git a/builder/build_pricing_path_base.pg.sql b/builder/build_pricing_path_base.pg.sql index 1e8808f..33e7e4a 100644 --- a/builder/build_pricing_path_base.pg.sql +++ b/builder/build_pricing_path_base.pg.sql @@ -67,11 +67,11 @@ sequenced AS ( ARRAY[ CASE WHEN s.func = 'Price' THEN - RPAD(s.entity || ':' || s.attr, 17, ' ') || ' + ' || LPAD(to_char(s.val, 'FM9999999990.00000'), 10, ' ') + RPAD(s.entity || ':' || s.attr, 17, ' ') || ' + ' || LPAD(to_char(s.val, 'FM9999999990.00000'), 10, ' ') || ' ' || CASE WHEN s.entity = 'Anchor' THEN 'Base Price' ELSE s.entity END WHEN s.func = 'Factor' THEN - RPAD(s.entity || ':' || s.attr, 17, ' ') || ' + ' || LPAD(to_char(COALESCE(NULLIF(CASE WHEN s.func = 'Price' THEN s.val END, NULL), 0) * (s.val - 1), 'FM9999999990.00000'), 10, ' ') + RPAD(s.entity || ':' || s.attr, 17, ' ') || ' + ' || LPAD(to_char(COALESCE(NULLIF(CASE WHEN s.func = 'Price' THEN s.val END, NULL), 0) * (s.val - 1), 'FM9999999990.00000'), 10, ' ') || ' ' || s.entity ELSE - RPAD(s.entity || ':' || s.attr, 17, ' ') || ' ' || LPAD(to_char(s.val, 'FM9999999990.00000'), 10, ' ') + RPAD(s.entity || ':' || s.attr, 17, ' ') || ' ' || LPAD(to_char(s.val, 'FM9999999990.00000'), 10, ' ') || ' ' || s.entity END ] math FROM @@ -101,11 +101,11 @@ sequenced AS ( ARRAY[ CASE WHEN o.func = 'Price' THEN - RPAD(o.entity || ':' || o.attr, 17, ' ') || ' + ' || LPAD(to_char(o.val, 'FM9999999990.00000'), 10, ' ') + RPAD(o.entity || ':' || o.attr, 17, ' ') || ' + ' || LPAD(to_char(o.val, 'FM9999999990.00000'), 10, ' ') || ' Fixed Charge' --|| to_char(o.val,'$FM90.000') WHEN o.func = 'Factor' THEN - RPAD(o.entity || ':' || o.attr, 17, ' ') || ' + ' || LPAD(to_char(COALESCE(c.base, 0) * (o.val - 1), 'FM9999999990.00000'), 10, ' ') + RPAD(o.entity || ':' || o.attr, 17, ' ') || ' + ' || LPAD(to_char(COALESCE(c.base, 0) * (o.val - 1), 'FM9999999990.00000'), 10, ' ') || ' ' || to_char((o.val -1)*100,'FM990.09%') ELSE - RPAD(o.entity || ':' || o.attr, 17, ' ') || ' ' || LPAD(to_char(o.val, 'FM9999999990.00000'), 10, ' ') + RPAD(o.entity || ':' || o.attr, 17, ' ') || ' ' || LPAD(to_char(o.val, 'FM9999999990.00000'), 10, ' ') || ' Price Adder: ' || o.val END ] ELSE diff --git a/procs/single_price_call.ms.sql b/procs/single_price_call.ms.sql index 36c887c..d6dc2ff 100644 --- a/procs/single_price_call.ms.sql +++ b/procs/single_price_call.ms.sql @@ -494,11 +494,7 @@ BEGIN ELSE '' END AS type, ----------------------note------------------------------------------------- CASE WHEN value <> '' THEN - CASE WHEN CHARINDEX('Anchor',value) <> 0 THEN - 'Base Floor' - ELSE - CASE SUBSTRING(value,19,1) WHEN '+' THEN 'Price' ELSE 'Premium' END - END + SUBSTRING(value,32,12) ELSE '' END AS note FROM @queue q OUTER APPLY OPENJSON(q.expl, '$.target_math')