From 95ce32b3b4d3957a90ad0e999f75396063c22b94 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 9 May 2008 05:59:47 +0000 Subject: [PATCH] finish usps address standardization --- httemplate/docs/credits.html | 1 + httemplate/docs/license.html | 4 ++ httemplate/edit/cust_main.cgi | 141 ++++++++++++++++++++++++++++++++++++------ httemplate/images/cross.png | Bin 0 -> 655 bytes httemplate/images/error.png | Bin 0 -> 666 bytes httemplate/images/tick.png | Bin 0 -> 537 bytes 6 files changed, 128 insertions(+), 18 deletions(-) create mode 100644 httemplate/images/cross.png create mode 100644 httemplate/images/error.png create mode 100644 httemplate/images/tick.png diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html index 9d4c5e96f..3c5564da3 100644 --- a/httemplate/docs/credits.html +++ b/httemplate/docs/credits.html @@ -68,6 +68,7 @@ Troy Hammonds
Sean Hanson
Dale Hege
Kelly Hickel
+Mark James
Frederico Caldeira Knabben
Greg Kuhnert
Randall Lucas
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html index fa758788c..8764d7300 100644 --- a/httemplate/docs/license.html +++ b/httemplate/docs/license.html @@ -106,5 +106,9 @@ Perl backend version © 2005 Nathan Schmidt Contains public domain artwork from openclipart.org by mimooh and other authors. +

+Contains icons from famfamfam.com by Mark James, +licensed under the terms of the Creative Commons Attribution 2.5 License. + diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index 3d727dd2c..891227838 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -4,6 +4,8 @@ ' onUnload="myclose()"' ) %> +<% include('/elements/init_overlib.html') %> + <% include('/elements/error.html') %>

@@ -299,40 +301,143 @@ function bottomfixup(what) { //'state', state_el.options[ state_el.selectedIndex ].value, 'zip', document.bottomform.elements['zip'].value, - 'ship_company', document.bottomform.elements['company'].value, - 'ship_address1', document.bottomform.elements['address1'].value, - 'ship_address2', document.bottomform.elements['address2'].value, - 'ship_city', document.bottomform.elements['city'].value, - 'ship_state', document.bottomform.elements['state'].value, + 'ship_company', document.bottomform.elements['ship_company'].value, + 'ship_address1', document.bottomform.elements['ship_address1'].value, + 'ship_address2', document.bottomform.elements['ship_address2'].value, + 'ship_city', document.bottomform.elements['ship_city'].value, + 'ship_state', document.bottomform.elements['ship_state'].value, //'ship_state', state_el.options[ state_el.selectedIndex ].value, - 'ship_zip', document.bottomform.elements['zip'].value + 'ship_zip', document.bottomform.elements['ship_zip'].value ); address_standardize( cust_main, update_address ); } +var standardize_address; + function update_address(arg) { var argsHash = eval('(' + arg + ')'); - var address1 = argsHash['address1']; - var zip = argsHash['zip']; var changed = argsHash['address_standardized']; var ship_changed = argsHash['ship_address_standardized']; - alert(address1); - alert(zip); - alert(changed); - alert(ship_changed); + //yay closures + standardize_address = function () { + + if ( changed ) { + document.bottomform.elements['company'].value = argsHash['new_company']; + document.bottomform.elements['address1'].value = argsHash['new_address1']; + document.bottomform.elements['address2'].value = argsHash['new_address2']; + document.bottomform.elements['city'].value = argsHash['new_city']; + document.bottomform.elements['state'].value = argsHash['new_state']; + //'state', state_el.options[ state_el.selectedIndex ].value, + document.bottomform.elements['zip'].value = argsHash['new_zip']; + } -% if ( $conf->exists('cust_main-auto_standardize_address') ) { - // XXX this path not handled yet -% } else { - // XXX well, this path not handled yet either. popup a confirmation popup -% } + if ( ship_changed ) { + document.bottomform.elements['ship_company'].value = argsHash['new_ship_company']; + document.bottomform.elements['ship_address1'].value = argsHash['new_ship_address1']; + document.bottomform.elements['ship_address2'].value = argsHash['new_ship_address2']; + document.bottomform.elements['ship_city'].value = argsHash['new_ship_city']; + document.bottomform.elements['ship_state'].value = argsHash['new_ship_state']; + //'state', state_el.options[ state_el.selectedIndex ].value, + document.bottomform.elements['ship_zip'].value = argsHash['new_ship_zip']; + } + + } + + if ( changed || ship_changed ) { - document.bottomform.submit(); +% if ( $conf->exists('cust_main-auto_standardize_address') ) { + + standardize_address(); + document.bottomform.submit(); + +% } else { + + // popup a confirmation popup + + var confirm_change = + '

Confirm address standardization

' + + ''; + + if ( changed ) { + + confirm_change = confirm_change + + '' + + ''; + // + ''; + + if ( argsHash['company'] || argsHash['new_company'] ) { + confirm_change = confirm_change + + ''; + } + + confirm_change = confirm_change + + '' + + '' + + '' + + ''; + + } + + if ( ship_changed ) { + + confirm_change = confirm_change + + '' + + ''; + // + ''; + + if ( argsHash['ship_company'] || argsHash['new_ship_company'] ) { + confirm_change = confirm_change + + ''; + } + + confirm_change = confirm_change + + '' + + '' + + '' + + ''; + + } + + var addresses = 'address'; + var height = 268; + if ( changed && ship_changed ) { + addresses = 'addresses'; + height = 396; // #what + } + + confirm_change = confirm_change + + '' + + '' + + + '
Entered billing addressStandardized billing address
  
' + argsHash['company'] + + '' + argsHash['new_company'] + '
' + argsHash['address1'] + + '' + argsHash['new_address1'] + '
' + argsHash['address2'] + + '' + argsHash['new_address2'] + '
' + argsHash['city'] + ', ' + argsHash['state'] + ' ' + argsHash['zip'] + + '' + argsHash['new_city'] + ', ' + argsHash['new_state'] + ' ' + argsHash['new_zip'] + '
  
Entered service addressStandardized service address
  
' + argsHash['ship_company'] + + '' + argsHash['new_ship_company'] + '
' + argsHash['ship_address1'] + + '' + argsHash['new_ship_address1'] + '
' + argsHash['ship_address2'] + + '' + argsHash['new_ship_address2'] + '
' + argsHash['ship_city'] + ', ' + argsHash['ship_state'] + ' ' + argsHash['ship_zip'] + + '' + argsHash['new_ship_city'] + ', ' + argsHash['new_ship_state'] + ' ' + argsHash['new_ship_zip'] + '
  
' + + '' + + '' + + '' + + '
' + + '
'; + + overlib( confirm_change, CAPTION, 'Confirm address standardization', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, height, BGCOLOR, '#333399', CGCOLOR, '#333399', TEXTSIZE, 3 ); + +% } + + } else { + + document.bottomform.submit(); + + } } diff --git a/httemplate/images/cross.png b/httemplate/images/cross.png new file mode 100644 index 0000000000000000000000000000000000000000..1514d51a3cf1b67e1c5b9ada36f1fd474e2d214a GIT binary patch literal 655 zcmV;A0&x9_P)uEoyT++I zn$b9r%cFfhHe2K68PkBu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5YW zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsGH z#=Z{USAQA>NY(}X7=3{K8#eOSYYtbpBV}~vsBnU!_?2tr-P=|^T zED%wc9ezHgW@NMb!^uT_|SvCpFLJylbx zY%bpaTGI8IYXMN$9w<3j9VkA~NYOKEQXsj?6a9_hcwfU$acAhJhB)zb_w@MVUEy@S zX&I>K-R!bhu3?(6bHWIg$HEl7{9g>>&l_qdd+UYb(1~BCo9LptNq&8>!yoJ3Ui(i5 zRJ|XnYBklL!{@$-7=3mJ>P@1c=7Oc79e-V7yf+%lD2!I;Y&nXBZ>=B!5?CB>LvEx6 znI%n)qqi$#X#wKB(U7XP2P=+4{b@j#r%9-K(8UqtSDk>0UKzf*HM9yqMZ1D!$2MdZ zR=`U>0zhOH1XqN?nY@AQqB7)Fp4{v&dKXvb43hZKvnN8;Po;+jY*}~*Z|W9Q0W%{D z^T}Cc<|r(Su=1K=P5>Z4 zg`et&Va}tdzBS-G-ZcO)zCWpJvGQwrHZ`@wpM420ac@bI5~KkTFfGEM3sPWO8co4^fI6lPnA)Y{ef%@{+SnoUk0+dW+*{8WvF8}}l07*qoM6N<$g7cXs A&j0`b literal 0 HcmV?d00001 diff --git a/httemplate/images/tick.png b/httemplate/images/tick.png new file mode 100644 index 0000000000000000000000000000000000000000..a9925a06ab02db30c1e7ead9c701c15bc63145cb GIT binary patch literal 537 zcmV+!0_OdRP)Hs{AQG2a)rMyf zFQK~pm1x3+7!nu%-M`k}``c>^00{o_1pjWJUTfl8mg=3qGEl8H@}^@w`VUx0_$uy4 z2FhRqKX}xI*?Tv1DJd8z#F#0c%*~rM30HE1@2o5m~}ZyoWhqv>ql{V z1ZGE0lgcoK^lx+eqc*rAX1Ky;Xx3U%u#zG!m-;eD1Qsn@kf3|F9qz~|95=&g3(7!X zB}JAT>RU;a%vaNOGnJ%e1=K6eAh43c(QN8RQ6~GP%O}Jju$~Ld*%`mO1p