From 502c6564f964170323ca6519548300a554c9f575 Mon Sep 17 00:00:00 2001 From: "jamie.priest" Date: Mon, 17 Aug 2009 12:19:49 +0000 Subject: [PATCH] had a stab at bringing the email output inline with the fds see ticket #550 git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12254 248e525c-4dfb-0310-94bc-949c084e9493 --- Modules/mip_quotation.pck | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/Modules/mip_quotation.pck b/Modules/mip_quotation.pck index c6039c5..fc11425 100644 --- a/Modules/mip_quotation.pck +++ b/Modules/mip_quotation.pck @@ -1002,11 +1002,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); BEGIN pl('produce_enquiry_entry_details' ,$$PLSQL_LINE); - al(' '); - al(' '); - al(get_system_name || - ' recorded the following details against this enquiry:'); - + SELECT enty_code INTO l_enty_code FROM enquiries @@ -1239,10 +1235,22 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); l_email_subject VARCHAR2(240); l_email_recipient VARCHAR2(240) := get_internal_user_recipient; l_qute_id quotes.id%TYPE; + l_postcode enquiries.install_postcode%TYPE; + l_shortcode parties.shortcode%TYPE; BEGIN pl('email_internal_users:entry:p_enqu_id=' || p_enqu_id || ', p_email_reason=' || p_email_reason ,$$PLSQL_LINE); + SELECT p.shortcode + INTO l_shortcode + FROM v_latest_rt_code_for_enro v, parties p + WHERE rt_code='ENQ SUPP' + AND v.enqu_id = p_enqu_id + AND p.id = v.prty_id; + SELECT e.install_postcode + INTO l_postcode + FROM enquiries e + WHERE e.id = p_enqu_id; open_body; IF p_email_reason = gc_int_q_acc_notification THEN -- Scenario five: Accepted quote + system data @@ -1253,8 +1261,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); al('Enquiry reference number: ' || p_enqu_id); al(' '); al('Please process this enquiry, as the quotation has been accepted.'); - al(' '); - + al(' '); SELECT qute_id INTO l_qute_id FROM quote_events quev @@ -1262,10 +1269,14 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); WHERE qute.enqu_id = p_enqu_id AND quev.qute_id = qute.id AND quev.qust_code = 'ACCEPTED'; - + --Insert Supplier Shortcode, Enquiry Ref and Network here new in purging update(09) + al('Supplier Shortcode: ' || l_shortcode); + al('Enquiry Reference: ' || p_enqu_id); + al('Network: ' || mip_regions.get_region_for_postcode(l_postcode)); + --get all the other fields for the enquiry to display produce_enquiry_entry_details(p_enqu_id); produce_quote_summary(l_qute_id); - + -- al(' '); al('Regards'); al(' '); @@ -1288,7 +1299,10 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); WHERE qute.enqu_id = p_enqu_id AND quev.qute_id = qute.id AND quev.qust_code = 'INP'; - + --Insert Supplier Shortcode, Enquiry Ref and Network here new in purging update(09) + al('Supplier Shortcode: ' || l_shortcode); + al('Enquiry Reference: ' || p_enqu_id); + al('Network: ' || mip_regions.get_region_for_postcode(l_postcode)); produce_enquiry_entry_details(p_enqu_id); produce_reasoning_summary(p_enqu_id); @@ -1763,7 +1777,6 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); l_valid := mip_tripartite.valid_enquiry(p_rec => p_rec ,p_tab_messages => l_tab_messages); - -- processing an enquiry that has not passed the tripartite agreement -- infers a processing error IF NOT l_valid THEN @@ -1791,7 +1804,6 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); l_valid := mip_tripartite.valid_enquiry(p_enqu_id => p_enqu_id ,p_tab_messages => l_tab_messages); - -- processing an enquiry that has not passed the tripartite agreement -- infers a processing error IF NOT l_valid THEN