From 16fde520a71f364cc8c941290ab293b6d7cd98ef Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 22 Apr 2014 17:14:43 -0700 Subject: [PATCH] show display_custnum on quick payment entry, RT#28616 --- httemplate/elements/customer-table.html | 58 ++++++++++++++++++---------- httemplate/misc/cust_main_note-import.cgi | 2 +- httemplate/misc/xmlhttp-cust_main-search.cgi | 7 +++- 3 files changed, 44 insertions(+), 23 deletions(-) diff --git a/httemplate/elements/customer-table.html b/httemplate/elements/customer-table.html index 75e682d92..83abad010 100644 --- a/httemplate/elements/customer-table.html +++ b/httemplate/elements/customer-table.html @@ -72,30 +72,33 @@ Example: function update_customer(searchrow, customerArray) { + var display_custnum_obj = document.getElementById('display_custnum'+searchrow); var custnum_obj = document.getElementById('custnum'+searchrow); var customer = document.getElementById('customer'+searchrow); var customer_select = document.getElementById('cust_select'+searchrow); - custnum_obj.disabled = false; - custnum_obj.style.backgroundColor = '#ffffff'; + display_custnum_obj.disabled = false; + display_custnum_obj.style.backgroundColor = '#ffffff'; customer.disabled = false; customer.style.backgroundColor = '#ffffff'; if ( customerArray.length == 0 ) { - custnum_obj.value = 'Not found'; + custnum_obj.value = ''; + display_custnum_obj.value = 'Not found'; customer.value = 'Not found'; - custnum_obj.style.color = '#ff0000'; + display_custnum_obj.style.color = '#ff0000'; customer.style.color = '#ff0000'; customer.style.display = ''; customer_select.style.display = 'none'; return false; - } else if ( customerArray.length == 6 ) { + } else if ( customerArray.length >= 6 ) { custnum_obj.value = customerArray[0]; - custnum_obj.style.color = '#000000'; + display_custnum_obj.value = customerArray[6]; + display_custnum_obj.style.color = '#000000'; customer.value = customerArray[1]; update_balance_text(searchrow, customerArray[2]); @@ -139,7 +142,6 @@ Example: customer.style.display = ''; customer_select.style.display = 'none'; - var custnum_obj = document.getElementById('custnum'+searchrow); update_balance_text(searchrow, ''); update_status_text(searchrow, ''); update_status_color(searchrow, '#000000'); @@ -164,11 +166,12 @@ Example: this.style.color = '#000000' - var custnum_obj = this; + var display_custnum_obj = this; var searchrow = this.getAttribute('rownum'); - var custnum = this.value; + var custnum_obj = document.getElementById('custnum'+searchrow); + var display_custnum = this.value; - if ( custnum == 'searching...' || custnum == 'Not found' || custnum == '' ) + if ( display_custnum == 'searching...' || display_custnum == 'Not found' || display_custnum == '' ) return; if ( this.getAttribute('magic') == 'nosearch' ) { @@ -241,7 +244,7 @@ Example: } - custnum_search(custnum, search_custnum_update ); + custnum_search(display_custnum, search_custnum_update ); } @@ -266,7 +269,7 @@ Example: var invnum = document.getElementById('invnum'+searchrow); invnum.value = ''; - var custnum_obj = document.getElementById('custnum'+searchrow); + var custnum_obj = document.getElementById('display_custnum'+searchrow); custnum_obj.value = 'searching...'; custnum_obj.disabled = true; custnum_obj.style.color = '#000000'; @@ -329,6 +332,7 @@ Example: var customer = this.options[this.selectedIndex].text; var searchrow = this.getAttribute('rownum'); + var display_custnum_obj = document.getElementById('display_custnum'+searchrow); var custnum_obj = document.getElementById('custnum'+searchrow); var customer_obj = document.getElementById('customer'+searchrow); var balance_obj = document.getElementById('balance'+searchrow); @@ -338,6 +342,7 @@ Example: } else if ( custnum_balance_status == 'cancel' ) { + display_custnum_obj.value = ''; custnum_obj.value = ''; custnum_obj.style.color = '#000000'; @@ -421,16 +426,22 @@ Example: " + rownum = "<% $row %>" + > + " rownum = "<% $row %>" > @@ -629,15 +640,22 @@ Example: var custnum_cell = document.createElement('TD'); + var display_custnum_input = document.createElement('INPUT'); + display_custnum_input.setAttribute('name', 'display_custnum'+<% $opt{prefix} %>rownum); + display_custnum_input.setAttribute('id', 'display_custnum'+<% $opt{prefix} %>rownum); + display_custnum_input.style.textAlign = 'right'; + display_custnum_input.setAttribute('size', 8); + display_custnum_input.setAttribute('maxlength', 12); + display_custnum_input.setAttribute('rownum', <% $opt{prefix} %>rownum); + display_custnum_input.onfocus = clearhint_custnum; + display_custnum_input.onchange = <% $opt{prefix} %>search_custnum; + custnum_cell.appendChild(display_custnum_input); + var custnum_input = document.createElement('INPUT'); + custnum_input.type = 'hidden'; custnum_input.setAttribute('name', 'custnum'+<% $opt{prefix} %>rownum); custnum_input.setAttribute('id', 'custnum'+<% $opt{prefix} %>rownum); - custnum_input.style.textAlign = 'right'; - custnum_input.setAttribute('size', 8); - custnum_input.setAttribute('maxlength', 12); custnum_input.setAttribute('rownum', <% $opt{prefix} %>rownum); - custnum_input.onfocus = clearhint_custnum; - custnum_input.onchange = <% $opt{prefix} %>search_custnum; custnum_cell.appendChild(custnum_input); row.appendChild(custnum_cell); diff --git a/httemplate/misc/cust_main_note-import.cgi b/httemplate/misc/cust_main_note-import.cgi index 186289517..2e7dc8b65 100644 --- a/httemplate/misc/cust_main_note-import.cgi +++ b/httemplate/misc/cust_main_note-import.cgi @@ -49,7 +49,7 @@ if ( customerArray.length == 0 ) { custnum_obj.value = 'Not found'; custnum_obj.style.color = '#ff0000'; - } else if ( customerArray.length == 5 ) { + } else if ( customerArray.length >= 5 ) { var name = customerArray[1]; opt(customer_select,custnum,name,'#000000'); customer_select.selectedIndex = customer_select.length - 1; diff --git a/httemplate/misc/xmlhttp-cust_main-search.cgi b/httemplate/misc/xmlhttp-cust_main-search.cgi index 73c9ff8ec..b3bf4681b 100644 --- a/httemplate/misc/xmlhttp-cust_main-search.cgi +++ b/httemplate/misc/xmlhttp-cust_main-search.cgi @@ -17,7 +17,8 @@ % $_->balance, % $_->ucfirst_status, % $_->statuscolor, -% scalar($_->open_cust_bill) +% scalar($_->open_cust_bill), +% $_->display_custnum, % ], % @cust_main % ]; @@ -66,7 +67,8 @@ sub findbycustnum { $c->balance, $c->ucfirst_status, $c->statuscolor, - scalar($c->open_cust_bill) + scalar($c->open_cust_bill), + $c->display_custnum, ]; } @@ -94,6 +96,7 @@ sub findbycustnum_or_agent_custid { $_->ucfirst_status, $_->statuscolor, scalar($_->open_cust_bill), + $_->display_custnum, ], qsearch({ -- 2.11.0