Billing screen change, take 2.

Added code from Aron at MI2 for the modal re-open and view log screens. Moved EOB to the left nav as posting
DiscoverAndChange · May 7, 2016 · 5c2fd9c · 5c2fd9c
1 parent f271c1e
commit 5c2fd9c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 26 deletions.
diff --git a/interface/billing/billing_process.php b/interface/billing/billing_process.php
@@ -290,10 +290,18 @@ function process_form($ar) {
 <?php if (function_exists(html_header_show)) html_header_show(); ?>
 
 <link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
+<script type="text/javascript" src="../../library/js/jquery-1.9.1.min.js"></script>
+<script>
+ $(document).ready( function() {
+ $("#close-link").click( function() {
+ window.close();
+ });
+ });
+</script>
 
 </head>
 <body class="body_top">
-<br><p><h3><?php xl('Billing queue results:','e'); ?></h3><a href="billing_report.php">back</a><ul>
+<br><p><h3><?php echo xlt('Billing queue results'); ?>:</h3><a href="#" id="close-link"><?php echo xlt('Close'); ?></a><ul>
 <?php
 foreach ($bill_info as $infoline) {
  echo nl2br($infoline);

diff --git a/interface/billing/billing_report.php b/interface/billing/billing_report.php
@@ -507,26 +507,6 @@ class='link_submit' ><?php echo '['.xlt('End Of Day Report').']' ?></a>
  </td>
  </tr>
  <?php } ?>
-
- <tr>
- <td>&nbsp;</td>
- <td>
- <?php
- $acct_config = $GLOBALS['oer_config']['ws_accounting'];
- if($acct_config['enabled']) {
- if($acct_config['enabled'] !== 2) {
- print '<span class=text><a href="javascript:void window.open(\'' . $acct_config['url_path'] . '\')">' . '['. xlt("SQL-Ledger") .']' . '</a> &nbsp; </span>';
- }
- if (acl_check('acct', 'rep')) {
- print '<span class=text><a href="javascript:void window.open(\'sl_receipts_report.php\')" onclick="top.restoreSession()">' . '['. xlt('Reports') .']'. '</a> &nbsp; </span>';
- }
- if (acl_check('acct', 'eob')) {
- print '<span class=text><a href="javascript:void window.open(\'sl_eob_search.php\')" onclick="top.restoreSession()">' . '['.xlt('EOBs') .']' . '</a></span>';
- }
- }
- ?>
- </td>
- </tr>
  <tr>
  <td>&nbsp;</td>
  <td>
@@ -536,7 +516,7 @@ class='link_submit' ><?php echo '['.xlt('End Of Day Report').']' ?></a>
  title="Process all queued bills to create electronic data (and print if requested)"><?php echo '['. xlt('Start Batch Processing') .']' ?></a>
  &nbsp;
  -->
- <a href='customize_log.php' onclick='top.restoreSession()' target='_blank' class='link_submit'
+ <a href='#' id="view-log-link" class='link_submit'
  title='<?php xla('See messages from the last set of generated claims'); ?>'><?php echo '['. xlt('View Log') .']'?></a>
  <?php } ?>
  </td>
@@ -563,8 +543,8 @@ class='link_submit' ><?php echo '['.xlt('End Of Day Report').']' ?></a>
 <center>
 <span class='text' style="display:inline">
 <?php if (file_exists($EXPORT_INC)) { ?>
-<input type="submit" class="subbtn" name="bn_external" value="Export Billing" title="<?php echo xla('Export to external billing system') ?>">
-<input type="submit" class="subbtn" name="bn_mark" value="Mark as Cleared" title="<?php echo xla('Mark as billed but skip billing') ?>">
+<input type="submit" data-open-popup="true" class="subbtn" name="bn_external" value="Export Billing" title="<?php echo xla('Export to external billing system') ?>">
+<input type="submit" data-open-popup="true" class="subbtn" name="bn_mark" value="Mark as Cleared" title="<?php echo xla('Mark as billed but skip billing') ?>">
 <?php } else { ?>
 <!--
 <input type="submit" class="subbtn" name="bn_hcfa_print" value="Queue HCFA &amp; Print" title="<?php echo xla('Queue for HCFA batch processing and printing') ?>">
@@ -586,8 +566,8 @@ class='link_submit' ><?php echo '['.xlt('End Of Day Report').']' ?></a>
 <input type="submit" class="subbtn" style="width:175px;" name="bn_hcfa_txt_file" value="<?php echo xla('Generate CMS 1500 TEXT')?>"
  title="<?php echo xla('Making batch text files for uploading to Clearing House and will mark as billed')?>"
  onclick="MarkAsCleared(3)">
-<input type="submit" class="subbtn" name="bn_mark" value="<?php echo xla('Mark as Cleared')?>" title="<?php echo xla('Post to accounting and mark as billed')?>">
-<input type="submit" class="subbtn" name="bn_reopen" value="<?php echo xla('Re-Open')?>" title="<?php echo xla('Mark as not billed')?>">
+<input type="submit" data-open-popup="true" class="subbtn" name="bn_mark" value="<?php echo xla('Mark as Cleared')?>" title="<?php echo xla('Post to accounting and mark as billed')?>">
+<input type="submit" data-open-popup="true" class="subbtn" name="bn_reopen" value="<?php echo xla('Re-Open')?>" title="<?php echo xla('Mark as not billed')?>">
 <!--
 <input type="submit" class="subbtn" name="bn_electronic_file" value="Make Electronic Batch &amp; Clear" title="<?php echo xla('Download billing file, post to accounting and mark as billed')?>">
 -->
@@ -1179,6 +1159,33 @@ class='link_submit' ><?php echo '['.xlt('End Of Day Report').']' ?></a>
  echo "alert('".addslashes($alertmsg)."');\n";
 }
 ?>
+$(document).ready(function() {
+ $("#view-log-link").click( function() {
+ top.restoreSession();
+ dlgopen('customize_log.php', '_blank', 500, 400);
+ });
+
+ $('input[type="submit"]').click( function() {
+ top.restoreSession();
+ $(this).attr('data-clicked', true);
+ });
+
+ $('form[name="update_form"]').submit( function(e) {
+ var clickedButton = $("input[type=submit][data-clicked='true'")[0];
+
+ // clear clicked button indicator
+ $('input[type="submit"]').attr('data-clicked', false);
+
+ if ( !clickedButton || $(clickedButton).attr("data-open-popup") !== "true" ) {
+ $(this).removeAttr("target");
+ return top.restoreSession(); 
+ } else {
+ top.restoreSession();
+ var w = window.open('about:blank','Popup_Window','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=300,left = 312,top = 234');
+ this.target = 'Popup_Window';
+ }
+ });
+});
 </script>
 <input type="hidden" name="divnos" id="divnos" value="<?php echo attr($divnos) ?>"/>
 <input type='hidden' name='ajax_mode' id='ajax_mode' value='' />

diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php
@@ -150,6 +150,7 @@
  'ere' => array(xl('e-Rx EPCS') , 1, 'eRx.php?page=epcs-admin'),
  'pay' => array(xl('Payment') , 1, '../patient_file/front_payment.php'),
  'edi' => array(xl('EDI History') , 0, 'billing/edih_view.php'),
+ 'eob' => array(xl('Posting') , 0, 'billing/sl_eob_search.php'),
  'dld' => array(xl('Display Documents'), 0, 'main/display_documents.php')
  );
  $primary_docs['npa']=array(xl('Batch Payments') , 0, 'billing/new_payment.php');
@@ -187,6 +188,7 @@
  $disallowed['cht'] = !is_readable("$webserver_root/custom/chart_tracker.php");
 
  $disallowed['pre'] = !(acl_check('patients', 'med'));
+ $disallowed['eob'] = !(acl_check('acct', 'eob'));
 
  // Helper functions for treeview generation.
  function genTreeLink($frame, $name, $title, $mono=false) {
@@ -1349,6 +1351,7 @@ function selpopup(selobj) {
  <?php genMiscLink('RBot','bil','1',xl('Checkout'),'patient_file/pos_checkout.php?framed=1'); ?> 
  <?php if (! $GLOBALS['simplified_demographics']) genTreeLink('RTop','bil',xl('Billing')); ?>
  <?php genTreeLink('RTop','npa',xl('Batch Payments'),false,2);?>
+ <?php genMiscLink('RTop','eob','0',xl('Posting'), 'billing/sl_eob_search.php'); ?>
  <?php if ($GLOBALS['enable_edihistory_in_left_menu'] && acl_check('acct', 'eob')) genTreeLink('RTop','edi',xl('EDI History'),false,2);?>
  </ul>
  </li>