From 6c828682b9a19db36cc3a8c5303ea21fee4c7327 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Tue, 2 Jan 2018 17:18:44 -0800
Subject: [PATCH] updated sales by item report

---
 interface/reports/sales_by_item.php | 180 ++++++++++++++++--------------------
 1 file changed, 82 insertions(+), 98 deletions(-)

diff --git a/interface/reports/sales_by_item.php b/interface/reports/sales_by_item.php
index 89a3a0a06..0b892ef7b 100644
--- a/interface/reports/sales_by_item.php
+++ b/interface/reports/sales_by_item.php
@@ -2,37 +2,25 @@
 /**
  * This is a report of sales by item description.
  *
- * Copyright (C) 2015-2016 Terry Hill <terry@lillysystems.com>
- * Copyright (C) 2006-2016 Rod Roark <rod@sunsetsystems.com>
- * Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
- *
- * LICENSE: This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
- *
- * @package OpenEMR
- * @author  Rod Roark <rod@sunsetsystems.com>
- * @author  Terry Hill <terry@lillysystems.com>
- * @author  Brady Miller <brady.g.miller@gmail.com>
- * @link    http://www.open-emr.org
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Rod Roark <rod@sunsetsystems.com>
+ * @author    Terry Hill <terry@lillysystems.com>
+ * @author    Brady Miller <brady.g.miller@gmail.com>
+ * @copyright Copyright (c) 2006-2016 Rod Roark <rod@sunsetsystems.com>
+ * @copyright Copyright (c) 2015-2016 Terry Hill <terry@lillysystems.com>
+ * @copyright Copyright (c) 2017 Brady Miller <brady.g.miller@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
 
 
-
-use OpenEMR\Core\Header;
-
 require_once("../globals.php");
 require_once("$srcdir/patient.inc");
 require_once("$srcdir/acl.inc");
 require_once "$srcdir/options.inc.php";
 
+use OpenEMR\Core\Header;
+
 $form_provider  = $_POST['form_provider'];
 if ($_POST['form_refresh'] || $_POST['form_csvexport']) {
     $form_details  = $_POST['form_details']      ? true : false;
@@ -103,9 +91,10 @@ function thisLineItem($patient_id, $encounter_id, $rowcat, $description, $transd
             $catleft = " "; ?>
   </td>
   <td class="detail" colspan="3">
-        <?php if ($_POST['form_details']) {
+        <?php
+        if ($_POST['form_details']) {
             echo xlt('Total for') . ' ';
-}
+        }
 
         echo text(display_desc($product)); ?>
   </td>
@@ -214,11 +203,12 @@ function thisLineItem($patient_id, $encounter_id, $rowcat, $description, $transd
   <td>
    &nbsp;
   </td>
-    <?php } if ($GLOBALS['sales_report_invoice'] == 1 || $GLOBALS['sales_report_invoice'] == 2) { ?>
+        <?php } ?>
+        <?php if ($GLOBALS['sales_report_invoice'] == 1 || $GLOBALS['sales_report_invoice'] == 2) { ?>
   <td>
     <?php echo text($pat_name); ?>
   </td>
-    <?php } ?>
+        <?php } ?>
   <td class="detail">
     <?php if ($GLOBALS['sales_report_invoice'] == 0 || $GLOBALS['sales_report_invoice'] == 2) { ?>
    <a href='../patient_file/pos_checkout.php?ptid=<?php echo attr($patient_id); ?>&enc=<?php echo attr($encounter_id); ?>'>
@@ -234,7 +224,7 @@ if ($GLOBALS['sales_report_invoice'] == 1) {
   <td>
    &nbsp;
   </td>
-    <?php } ?>
+        <?php } ?>
       <td align="right">
         <?php echo text($qty); ?>
       </td>
@@ -254,13 +244,12 @@ if ($GLOBALS['sales_report_invoice'] == 1) {
 } // end function
 
 if (! acl_check('acct', 'rep')) {
-    die(xl("Unauthorized access."));
+    die(xlt("Unauthorized access."));
 }
 
-
-  $form_from_date = fixDate($_POST['form_from_date'], date('Y-m-d'));
-  $form_to_date   = fixDate($_POST['form_to_date'], date('Y-m-d'));
-  $form_facility  = $_POST['form_facility'];
+$form_from_date = (isset($_POST['form_from_date'])) ? DateToYYYYMMDD($_POST['form_from_date']) : date('Y-m-d');
+$form_to_date   = (isset($_POST['form_to_date'])) ? DateToYYYYMMDD($_POST['form_to_date']) : date('Y-m-d');
+$form_facility  = $_POST['form_facility'];
 
 if ($_POST['form_csvexport']) {
     header("Pragma: public");
@@ -283,7 +272,7 @@ if ($_POST['form_csvexport']) {
         }
 
         if ($GLOBALS['sales_report_invoice'] == 1) {
-             echo '"ID",';
+            echo '"ID",';
         }
 
         echo '"Qty",';
@@ -300,61 +289,58 @@ else {
 <html>
 <head>
 
-<?php Header::setupHeader(['datetime-picker', 'report-helper']); ?>
-
-<style type="text/css">
-
-/* specifically include & exclude from printing */
-@media print {
-  #report_parameters {
-      visibility: hidden;
-      display: none;
-  }
-  #report_parameters_daterange {
-      visibility: visible;
-      display: inline;
-  }
-  #report_results {
-     margin-top: 30px;
-  }
-}
+    <title><?php echo xlt('Sales by Item'); ?></title>
 
-/* specifically exclude some from the screen */
-@media screen {
-  #report_parameters_daterange {
-      visibility: hidden;
-      display: none;
-  }
-}
-
-table.mymaintable, table.mymaintable td {
-border: 1px solid #aaaaaa;
-border-collapse: collapse;
-}
-table.mymaintable td {
-padding: 1pt 4pt 1pt 4pt;
-}
+    <?php Header::setupHeader(['datetime-picker', 'report-helper']); ?>
 
-</style>
-
-<script language="JavaScript">
-
-$(document).ready(function() {
-oeFixedHeaderSetup(document.getElementById('mymaintable'));
-var win = top.printLogSetup ? top : opener.top;
-win.printLogSetup(document.getElementById('printbutton'));
-
-$('.datepicker').datetimepicker({
-<?php $datetimepicker_timepicker = false; ?>
-<?php $datetimepicker_showseconds = false; ?>
-<?php $datetimepicker_formatInput = false; ?>
-<?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
-<?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
-});
-});
+    <style type="text/css">
+        /* specifically include & exclude from printing */
+        @media print {
+            #report_parameters {
+                visibility: hidden;
+               display: none;
+            }
+            #report_parameters_daterange {
+                visibility: visible;
+                display: inline;
+            }
+            #report_results {
+               margin-top: 30px;
+            }
+        }
 
-</script>
+        /* specifically exclude some from the screen */
+        @media screen {
+            #report_parameters_daterange {
+                visibility: hidden;
+              display: none;
+            }
+        }
 
+        table.mymaintable, table.mymaintable td {
+            border: 1px solid #aaaaaa;
+            border-collapse: collapse;
+        }
+        table.mymaintable td {
+            padding: 1pt 4pt 1pt 4pt;
+        }
+    </style>
+
+    <script language="JavaScript">
+        $(document).ready(function() {
+            oeFixedHeaderSetup(document.getElementById('mymaintable'));
+            var win = top.printLogSetup ? top : opener.top;
+            win.printLogSetup(document.getElementById('printbutton'));
+
+            $('.datepicker').datetimepicker({
+                <?php $datetimepicker_timepicker = false; ?>
+                <?php $datetimepicker_showseconds = false; ?>
+                <?php $datetimepicker_formatInput = true; ?>
+                <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
+                <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
+            });
+        });
+    </script>
 </head>
 
 <title><?php echo xlt('Sales by Item') ?></title>
@@ -363,7 +349,7 @@ $('.datepicker').datetimepicker({
 
 <span class='title'><?php echo xlt('Report'); ?> - <?php echo xlt('Sales by Item'); ?></span>
 
-<form method='post' action='sales_by_item.php' id='theform'>
+<form method='post' action='sales_by_item.php' id='theform' onsubmit='return top.restoreSession()'>
 
 <div id="report_parameters">
 <input type='hidden' name='form_refresh' id='form_refresh' value=''/>
@@ -384,15 +370,13 @@ $('.datepicker').datetimepicker({
             <?php echo xlt('From'); ?>:
           </td>
           <td>
-            <input type='text' class='datepicker form-control' name='form_from_date' id="form_from_date" size='10' value='<?php echo attr($form_from_date) ?>'
-              title='yyyy-mm-dd'>
+            <input type='text' class='datepicker form-control' name='form_from_date' id="form_from_date" size='10' value='<?php echo attr(oeFormatShortDate($form_from_date)); ?>'>
           </td>
           <td class='control-label'>
             <?php echo xlt('To'); ?>:
           </td>
           <td>
-            <input type='text' class='datepicker form-control' name='form_to_date' id="form_to_date" size='10' value='<?php echo attr($form_to_date) ?>'
-              title='yyyy-mm-dd'>
+            <input type='text' class='datepicker form-control' name='form_to_date' id="form_to_date" size='10' value='<?php echo attr(oeFormatShortDate($form_to_date)); ?>'>
           </td>
       </tr>
   </table>
@@ -429,9 +413,7 @@ $('.datepicker').datetimepicker({
           </td>
           <td>
             <div class='checkbox'>
-           <label><input type='checkbox' name='form_details'<?php  if ($form_details) {
-                echo ' checked';
-} ?>>
+           <label><input type='checkbox' name='form_details'<?php echo ($form_details) ? ' checked' : ''; ?>>
             <?php echo xlt('Details'); ?></label>
             </div>
           </td>
@@ -456,7 +438,7 @@ $('.datepicker').datetimepicker({
                             <a href='#' class='btn btn-default btn-transmit' onclick='$("#form_refresh").attr("value",""); $("#form_csvexport").attr("value","true"); $("#theform").submit();'>
                                 <?php echo xlt('CSV Export'); ?>
                             </a>
-                        <?php } ?>
+                    <?php } ?>
                   </div>
               </div>
            </td>
@@ -482,9 +464,10 @@ if ($_POST['form_refresh'] || $_POST['form_csvexport']) {
     <?php echo xlt('Item'); ?>
  </th>
  <th>
-    <?php if ($form_details) {
+    <?php
+    if ($form_details) {
         echo xlt('Date');
-} ?>
+    } ?>
  </th>
     <?php if ($GLOBALS['sales_report_invoice'] == 2) {?>
   <th>
@@ -646,9 +629,10 @@ if ($_POST['form_refresh'] || $_POST['form_csvexport']) {
     $catleft = " "; ?>
   </td>
   <td class="detail" colspan="3">
-    <?php if ($_POST['form_details']) {
+    <?php
+    if ($_POST['form_details']) {
         echo xlt('Total for') . ' ';
-}
+    }
 
     echo text(display_desc($product)); ?>
   </td>
-- 
2.11.4.GIT