[freeside-commits] branch master updated. 5dabafc5e63ae7559ca6d2867e653660b981e639

[Ivan]

The branch, master has been updated
       via  5dabafc5e63ae7559ca6d2867e653660b981e639 (commit)
       via  5ac72e74de9e105c8952eee7cf905ab9116926e1 (commit)
       via  3baaec7890cb90834878c915b589a2eaf2ee437c (commit)
      from  fba604e65e810922ce0269cc887b5c57ce135352 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5dabafc5e63ae7559ca6d2867e653660b981e639
Merge: 5ac72e7 fba604e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Oct 14 17:04:23 2017 -0700

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


commit 5ac72e74de9e105c8952eee7cf905ab9116926e1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Oct 14 17:04:17 2017 -0700

    show compliance solutions JSON, RT#77789

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index d347c06..6d7520b 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -695,6 +695,7 @@ sub tables_hashref {
         'statementnum', 'int', 'NULL', '', '', '', #invoice aggregate statements
         'agent_invid',  'int', 'NULL', '', '', '', #(varchar?) importing legacy
         'promised_date', @date_type,       '', '',
+        'taxengine_request', 'text', 'NULL', '', '', '',
         
         'pending',     'char', 'NULL',  1, '', '',
       ],
@@ -732,6 +733,7 @@ sub tables_hashref {
         'statementnum', 'int', 'NULL', '', '', '', #invoice aggregate statements
         'agent_invid',  'int', 'NULL', '', '', '', #(varchar?) importing legacy
         'promised_date', @date_type,       '', '',
+        'taxengine_request', 'text', 'NULL', '', '', '',
 
         #void fields
         'void_date', @date_type, '', '', 
diff --git a/FS/FS/TaxEngine/compliance_solutions.pm b/FS/FS/TaxEngine/compliance_solutions.pm
index 1f0c166..33b6a3e 100644
--- a/FS/FS/TaxEngine/compliance_solutions.pm
+++ b/FS/FS/TaxEngine/compliance_solutions.pm
@@ -226,6 +226,7 @@ sub make_taxlines {
     }
   );
   warn $request_json if $DEBUG > 1;
+  $cust_bill->taxengine_request($request_json);
 
   my $soap = SOAP::Lite->service("http://tcms1.csilongwood.com/cgi-bin/taxcalc.wsdl");
 
diff --git a/httemplate/view/cust_bill-taxengine_request.html b/httemplate/view/cust_bill-taxengine_request.html
new file mode 100644
index 0000000..991e65f
--- /dev/null
+++ b/httemplate/view/cust_bill-taxengine_request.html
@@ -0,0 +1,14 @@
+<& /elements/header-popup.html &>
+<% $cust_bill->taxengine_request |h %>
+<& /elements/footer-popup.html &>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+  unless $curuser->access_right('View invoices');
+
+my $invnum = $cgi->param('invnum');
+my $cust_bill = qsearchs('cust_bill', { invnum=>$invnum });
+
+</%init>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index e35d7f1..762eec0 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -171,6 +171,18 @@ function change_invoice_mode(obj) {
 &>
 %   $br++;
 % }
+% if ( $cust_bill->taxengine_request ) { # inefficient
+<% $br ? '|' : '' %>
+<& /elements/popup_link.html,
+  'action'      => 'cust_bill-taxengine_request.html?invnum=' . $cust_bill->invnum,
+  'label'       => mt('View raw tax engine request'),
+  'actionlabel' => mt('Tax engine request'),
+  'width'       => 1050,
+  'height'      => 600,
+  'title'       => emt('Tax engine request'),
+&>
+%   $br++;
+% }
 
 <BR><BR>
 

commit 3baaec7890cb90834878c915b589a2eaf2ee437c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Oct 14 17:04:04 2017 -0700

    no AGPL on customer self-service

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 4ab596d..91fbbe2 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -36,7 +36,9 @@ All rights reserved<BR>
     option) any later version.
 
 <P>
-    At your option, you may also redistribute and/or modify the
+    At your option, you may also redistribute and/or modify the files in 
+    fs_selfservice/drupal/ fs_selfservice/wordpress/ fs_selfservice/perl/ and
+    fs_selfservice/java/ directories and the
     fs_selfservice/php/freeside.class.php file (but not the rest of the
     software) under the terms of the GNU Lesser General Public License as
     published by the Free Software Foundation, either version 3 of the License,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Schema.pm                                  |    2 ++
 FS/FS/TaxEngine/compliance_solutions.pm          |    1 +
 httemplate/docs/license.html                     |    4 +++-
 httemplate/view/cust_bill-taxengine_request.html |   14 ++++++++++++++
 httemplate/view/cust_bill.cgi                    |   12 ++++++++++++
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 httemplate/view/cust_bill-taxengine_request.html