Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / browse / part_pkg_taxproduct / compliance_solutions.html

diff --git a/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html b/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html
index 78c1b0a..b5936da 100644 (file)
--- a/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html
+++ b/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html
@@ -8,10 +8,12 @@
 
 $().ready(function() {
 
+
   $('#taxproduct_submit').on('click', function() {
+    var service_code = $('#service_code').val().split(' ');
     select_taxproduct(
-      $('#service_code').val(),
-      $('#service_code').val() + ' ' + $('#service_code :selected').text()
+      service_code[0],
+      service_code[1] + ' ' + $('#service_code :selected').text()
     );
   });
 });
@@ -51,6 +53,9 @@ function category_changed(what) {
       jopt( $('#product_code'), '', 'Select product code' );
 
       var part_pkg_taxproduct = reply.part_pkg_taxproduct;
+      if ( part_pkg_taxproduct.length == 0 ) {
+        alert('No compliance solutions product codes found; did you run freeside-compliance_solutions-import?');
+      }
       for ( var s = 0; s < part_pkg_taxproduct.length; s=s+2 ) {
         var product_code = part_pkg_taxproduct[s];
         var description = part_pkg_taxproduct[s+1];