added commission report

.idea/workspace.xml

@@ -2,33 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/controllers/origami/commissioners_controller.rb" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/_commissioner.json.jbuilder" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/reports/commission/index.html.erb" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/_form.html.erb" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/reports/commission/index.xls.erb" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/edit.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/index.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/index.json.jbuilder" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/new.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/show.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/show.json.jbuilder" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/_commission.json.jbuilder" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/_form.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/edit.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/index.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/index.json.jbuilder" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/new.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/show.html.erb" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/show.json.jbuilder" afterPath="" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/db/migrate/20170818090115_create_commissioners.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/db/migrate/20170821093252_create_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/settings.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/settings.scss" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/commission.rb" afterPath="$PROJECT_DIR$/app/models/commission.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/commissioner.rb" afterPath="$PROJECT_DIR$/app/models/commissioner.rb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/layouts/_header.html.erb" afterPath="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
     </list>
@@ -72,31 +50,91 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="commissioners_controller.rb" pinned="false" current-in-tab="false">
+      <file leaf-file-name="shiftsale_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb">
+        <entry file="file://$PROJECT_DIR$/app/controllers/reports/shiftsale_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="551">
+            <state relative-caret-position="72">
-              <caret line="46" column="74" lean-forward="true" selection-start-line="46" selection-start-column="74" selection-end-line="46" selection-end-column="74" />
+              <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="product_commissions_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="164">
-              <caret line="65" column="12" lean-forward="true" selection-start-line="65" selection-start-column="12" selection-end-line="65" selection-end-column="12" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/shiftsale/index.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
+            <state relative-caret-position="234">
-              <caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
+              <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index.xls.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/shiftsale/index.xls.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="54">
+              <caret line="3" column="12" lean-forward="true" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="_shift_sale_report_filter.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="216">
+              <caret line="12" column="31" lean-forward="true" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="_header.html.erb" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="216">
+              <caret line="57" column="22" lean-forward="true" selection-start-line="57" selection-start-column="22" selection-end-line="57" selection-end-column="22" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="commission_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/reports/commission_controller.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="126">
+              <caret line="7" column="36" lean-forward="true" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.html.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-351">
+              <caret line="10" column="8" lean-forward="true" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index.xls.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.xls.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1782">
+              <caret line="99" column="6" lean-forward="false" selection-start-line="99" selection-start-column="6" selection-end-line="99" selection-end-column="6" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="_commission_report_filter.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="180">
+              <caret line="10" column="54" lean-forward="true" selection-start-line="10" selection-start-column="54" selection-end-line="10" selection-end-column="54" />
               <folding />
             </state>
           </provider>
@@ -105,68 +143,8 @@
       <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/config/routes.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="486">
+            <state relative-caret-position="396">
-              <caret line="304" column="35" lean-forward="false" selection-start-line="304" selection-start-column="16" selection-end-line="304" selection-end-column="35" />
+              <caret line="325" column="51" lean-forward="true" selection-start-line="325" selection-start-column="51" selection-end-line="325" selection-end-column="51" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="commissions_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="76" column="12" lean-forward="true" selection-start-line="76" selection-start-column="12" selection-end-line="76" selection-end-column="12" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="20170825034141_create_product_commissions.rb" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="10" column="28" lean-forward="true" selection-start-line="10" selection-start-column="28" selection-end-line="10" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="shiftsale_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/reports/shiftsale_controller.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="54">
-              <caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="20170825090115_create_commissioners.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="7" column="30" lean-forward="false" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="load_commissioners.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
-              <caret line="165" column="52" lean-forward="false" selection-start-line="165" selection-start-column="33" selection-end-line="165" selection-end-column="52" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="settings.scss" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/settings.scss">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="653">
-              <caret line="89" column="16" lean-forward="false" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -194,6 +172,7 @@
       <find>order_item</find>
       <find>origami_commissions_path</find>
       <find>green</find>
+      <find>reports_dailysale_index_path</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -202,10 +181,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/app/models/employee.rb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissioners/_form.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissioners/show.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissioners/_commissioners.html.erb" />
         <option value="$PROJECT_DIR$/app/models/product.rb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/_form.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/index.html.erb" />
@@ -233,8 +208,6 @@
         <option value="$PROJECT_DIR$/db/migrate/20170818090115_create_commissioners.rb" />
         <option value="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" />
         <option value="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" />
-        <option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissioners/edit.html.erb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissions/edit.html.erb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb" />
@@ -249,10 +222,16 @@
         <option value="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" />
         <option value="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" />
-        <option value="$PROJECT_DIR$/config/routes.rb" />
         <option value="$PROJECT_DIR$/app/assets/stylesheets/settings.scss" />
         <option value="$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb" />
         <option value="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
+        <option value="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" />
+        <option value="$PROJECT_DIR$/app/views/reports/commission/index.xls.erb" />
+        <option value="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
+        <option value="$PROJECT_DIR$/config/routes.rb" />
+        <option value="$PROJECT_DIR$/app/views/reports/commission/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
       </list>
     </option>
   </component>
@@ -448,6 +427,29 @@
               <item name="origami" type="462c0819:PsiDirectoryNode" />
               <item name="home" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
+              <item name="commission" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
+              <item name="shiftsale" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
@@ -911,12 +913,12 @@
       <workItem from="1503406983258" duration="261000" />
       <workItem from="1503457057830" duration="7166000" />
       <workItem from="1503472116907" duration="50209000" />
-      <workItem from="1503843212665" duration="9186000" />
+      <workItem from="1503843212665" duration="11074000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="140537000" />
+    <option name="totallyTimeSpent" value="142425000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -929,12 +931,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="1441" y="22" width="1919" height="693" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19445924" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917964" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17412141" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4882943" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4882943" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3759086" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37798545" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -963,64 +966,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/controllers/crm/customers_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1350">
-          <caret line="75" column="50" lean-forward="true" selection-start-line="75" selection-start-column="50" selection-end-line="75" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/new.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/_new_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2533">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/_crm_customer.json.jbuilder">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/edit.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/transactions/sales/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="27" lean-forward="true" selection-start-line="0" selection-start-column="27" selection-end-line="0" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/transactions/sales_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1458">
-          <caret line="81" column="4" lean-forward="false" selection-start-line="81" selection-start-column="4" selection-end-line="81" selection-end-column="4" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
@@ -1077,14 +1022,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="31" column="62" lean-forward="false" selection-start-line="31" selection-start-column="62" selection-end-line="31" selection-end-column="62" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/models/seed_generator.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1317,14 +1254,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/routes.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="304" column="35" lean-forward="false" selection-start-line="304" selection-start-column="16" selection-end-line="304" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="368">
@@ -1349,14 +1278,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/reports/shiftsale_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
@@ -1366,9 +1287,89 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="8" column="42" lean-forward="true" selection-start-line="8" selection-start-column="42" selection-end-line="8" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/reports/shiftsale_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="72">
+          <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/shiftsale/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/shiftsale/index.xls.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="3" column="12" lean-forward="true" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="12" column="31" lean-forward="true" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/routes.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="325" column="51" lean-forward="true" selection-start-line="325" selection-start-column="51" selection-end-line="325" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.xls.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1782">
+          <caret line="99" column="6" lean-forward="false" selection-start-line="99" selection-start-column="6" selection-end-line="99" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="10" column="28" lean-forward="true" selection-start-line="10" selection-start-column="28" selection-end-line="10" selection-end-column="28" />
+          <caret line="10" column="54" lean-forward="true" selection-start-line="10" selection-start-column="54" selection-end-line="10" selection-end-column="54" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-351">
+          <caret line="10" column="8" lean-forward="true" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/reports/commission_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="7" column="36" lean-forward="true" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="57" column="22" lean-forward="true" selection-start-line="57" selection-start-column="22" selection-end-line="57" selection-end-column="22" />
           <folding />
         </state>
       </provider>

app/controllers/reports/commission_controller.rb

@@ -0,0 +1,50 @@
+class Reports::CommissionController < BaseReportController
+  # authorize_resource :class => false
+
+  def index
+
+    from, to = get_date_range_from_params
+    @shift = ''
+    if params[:shift_name].to_i != 0
+      @shift = ShiftSale.find(params[:shift_name])
+    end
+    @sale_data = Sale.get_by_shiftsales(from,to,@shift)
+    @from       = from
+    @to         = to
+    if @shift.present?
+
+      @shift_from = @shift.shift_started_at.nil? ? '-' : @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
+      @shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
+      @shift_data = @shift
+    end
+
+    respond_to do |format|
+      format.html
+      format.xls
+    end
+  end
+
+  def show
+    from, to  = get_date_range_from_params
+
+    @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+
+    date_arr = Array.new
+    @sale_data.each do |sale|
+      local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
+      local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
+      opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
+      closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
+      shift_id = sale.id.nil? ? '-' : sale.id
+      str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
+      date_arr.push(str)
+    end
+
+    out = {:status => 'ok', :message => date_arr}
+
+    respond_to do |format|
+      format.json { render json: out }
+    end
+  end
+end
+

app/views/layouts/_header.html.erb

@@ -55,6 +55,7 @@
             <li><%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %></li>
+            <!--<li><% link_to "Commission Report", reports_commission_index_path, :tabindex =>"-1" %></li>-->
           </ul>
         </li>
         <li class="navbar-nav mr-auto">

app/views/reports/commission/_commission_report_filter.html.erb

@@ -0,0 +1,119 @@
+<div class="row">
+  <div class="col-md-12">
+    <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+        <% if period_type != false %>
+            <div class="row">
+              <div class="form-group col-md-2">
+                <label>Select Period</label>
+                <select name="period" id="sel_period" class="form-control">
+                  <option value="0">Today</option>
+                  <option value="1">Yesterday</option>
+                  <option value="2">This week</option>
+                  <option value="3">Last week</option>
+                  <option value="4">Last 7 days</option>
+                  <option value="5">This month</option>
+                  <option value="6">Last month</option>
+                  <option value="7">Last 30 days</option>
+                  <option value="8">This year</option>
+                  <option value="9">Last year</option>
+                </select>
+              </div>
+
+              <div class="form-group col-md-3">
+                <!-- <label class="">Select Shift Period</label> -->
+                <label class="">From</label>
+                <input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+              </div>
+              <div class="form-group col-md-3">
+                <label class="">To</label>
+                <input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+              </div>
+              <div class="form-group col-md-2">
+                <label class="">All Shift</label>
+                <select class="form-control select" name="shift_name" id="shift_name" >
+                </select>
+              </div>
+              <div class="form-group col-md-2 margin-top-20">
+                <input type="submit" value="Generate Report" class='btn btn-primary'>
+              </div>
+            </div>
+        <% end %>
+
+    <% end %>
+  </div>
+</div>
+
+<script type="text/javascript">
+    $(function(){
+        $('#custom_excel').hide();
+
+        $('#custom_excel').click(function(){
+            var url = $('#custom_excel').attr('data-url');
+            $('#frm_report').attr('action',url)
+            $('#frm_report').submit();
+            // window.location = url;
+        });
+
+        var item = $('#item').val();
+        var payment_type = $('#payment_type');
+
+        if(item == 'order'){
+            $('#cashier').hide();
+            $('#waiter').show();
+            if(payment_type){
+                $('#payment_type').hide();
+            }
+        }
+        else if(item == 'sale'){
+            $('#waiter').hide();
+            $('#cashier').show();
+        }
+        else{
+            $('#waiter').hide();
+            $('#cashier').show();
+            $("#item").val('sale');
+        }
+    });
+
+    //Reset the form to pervious values
+    <% if params[:shift_name].to_i > 0%>
+    shift_id = '<%= params[:shift_name] %>'
+    local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>'
+    var shift = $('#shift_name');
+    str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+    shift.append(str);
+    <% end %>
+    $("#from").val("<%=params[:from]%>");
+    $("#to").val("<%=params[:to]%>");
+    $("#sel_period").val(<%=params[:period]%>);
+    $("#sel_sale_type").val(<%=params[:sale_type]%>);
+
+    <% if params[:period_type] == 1 || params[:period_type] == "1" %>
+    $("#rd_period_type_1").attr("checked","checked");
+    <% else %>
+    $("#rd_period_type_0").attr("checked","checked");
+    <% end %>
+    $(".btn-group button").removeClass("active");
+    <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+    $("#btn_report_type_<%= report_type %>").addClass("active");
+
+    $('#item').change(function(){
+        var item = $('#item').val();
+        var payment_type = $('#payment_type');
+
+        if(item == 'sale'){
+            $('#waiter').hide();
+            $('#cashier').show();
+            if(payment_type){
+                $('#payment_type').show();
+            }
+        }
+        else{
+            $('#cashier').hide();
+            $('#waiter').show();
+            if(payment_type){
+                $('#payment_type').hide();
+            }
+        }
+    });
+</script>

app/views/reports/commission/index.html.erb

@@ -0,0 +1,211 @@
+<div class="page-header">
+  <ul class="breadcrumb">
+    <li><a href="<%= dashboard_path %>">Home</a></li>
+    <li>Commission Report</li>
+  </ul>
+</div>
+
+<div class="container">
+  <%= render :partial=>'commission_report_filter',
+             :locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_commission_index_path} %>
+  <hr />
+</div>
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-12 text-right">
+      <a href="javascript:export_to('<%=reports_commission_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+    </div>
+  </div>
+</div>
+
+<div class="container margin-top-20">
+  <!-- <div class="span11">
+  <div id="report_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div>
+</div> -->
+  <div class="card row">
+    <div class="table-responsive">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>
+            - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%>
+
+          </th>
+        </tr>
+        <% if @shift_from %>
+            <tr>
+              <% if @shift_data.employee %>
+                  <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+              <% end %>
+              <th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+            </tr>
+        <% end %>
+        <tr>
+          <th>Cashier Station</th>
+          <th>Cashier Name</th>
+          <th>Shift Name</th>
+          <!-- <th>Void Amount</th> -->
+          <th>Cash Payment</th>
+          <!-- <th>Credit Charges</th> -->
+          <th>Credit Payment</th>
+          <!-- <th>FOC Payment</th> -->
+          <th>Other Payment</th>
+          <!-- <th>Grand Total
+            <br/>Rounding Adj</th> -->
+          <!-- <th>Rounding Adj</th> -->
+          <th>Grand Total</th>
+        </tr>
+        </thead>
+        <tbody>
+        <% void = 0%>
+        <% cash = 0%>
+        <% credit = 0%>
+        <% accept_credit = 0%>
+        <% foc = 0%>
+        <% card = 0%>
+        <% total = 0%>
+        <% rounding_adj = 0%>
+        <% g_total = 0 %>
+
+        <% @sale_data.each do |result|%>
+            <tr>
+              <td>
+                <%= result.cashier_terminal.name  rescue '-'%>
+              </td>
+              <td>
+                <%= result.employee.name  rescue '-'%>
+              </td>
+              <td><%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> -
+                <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-'  %>
+              </td>
+              <!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
+              <td><%= sprintf "%.2f",result.cash_sales.to_f.to_d  rescue '-'%></td>
+              <td><%= sprintf "%.2f",result.credit_sales.to_f.to_d  rescue '-'%></td>
+              <!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
+              <!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
+					  <td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->
+              <td><%= sprintf "%.2f",result.other_sales.to_f.to_d  rescue '-'%></td>
+              <td><%= sprintf "%.2f",result.grand_total.to_f.to_d  rescue '-'%></td>
+
+              <!--  <td><%= sprintf "%.2f",result.rounding_adj.to_f.to_d  rescue '-'%></td>	 -->
+              <% grand_total = result.grand_total.to_f %>
+              <!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->
+            </tr>
+            <% cash += result.cash_sales.to_f %>
+            <% credit += result.credit_sales.to_f %>
+            <% card += result.other_sales.to_f %>
+
+            <% total += result.grand_total.to_f %>
+            <% g_total += grand_total.to_f %>
+
+        <% end %>
+
+        <tr style="border-top: 3px solid grey;">
+          <td colspan="3"></td>
+          <!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
+          <td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
+          <td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
+          <!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
+          <!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
+          <td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
+          <!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
+          <!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->
+          <td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+<script>
+    $(function(){
+
+        var check_arr = [];
+
+        $('#sel_period').change(function(){
+
+            search_by_period();
+
+        });
+
+        function search_by_period(){
+            var period = $('#sel_period').val();
+            var period_type = 0;
+            var from = "";
+            var to = "";
+
+            show_shift_name(period,period_type,from,to,'shift_item');
+        }
+
+        $('#from').change(function(){
+            search_by_date();
+        });
+
+        $('#to').change(function(){
+            search_by_date();
+        });
+
+        function search_by_date(){
+            var from = $('#from').val();
+            var to = $('#to').val();
+            var period = 0;
+            var period_type = 1;
+
+            if(to != '' && from != ''){
+                shift_name = from + ',' + to;
+
+                check_arr.push(to);
+
+                console.log(check_arr.length)
+                if(check_arr.length == 1){
+                    show_shift_name(period,period_type,from,to,'shift_item');
+                }
+                if(check_arr.length == 3){
+                    check_arr = [];
+                }
+            }
+
+        }
+
+        function show_shift_name(period,period_type,from,to,shift_item){
+            var shift = $('#shift_name');
+
+            shift.empty();
+
+            var str = '';
+            var param_shift = '';
+            var param_shift = '<%= params[:shift_name] rescue '-'%>';
+
+            url = '<%= reports_get_shift_by_date_path %>';
+
+            $.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
+
+                str = '<option value="0">--- All Shift ---</option>';
+                $(data.message).each(function(index){
+
+                    var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
+                    var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
+                    var shift_id = data.message[index].shift_id ;
+                    if(param_shift != ''){
+                        if(shift_id == param_shift){
+                            selected = 'selected = "selected"';
+                        }
+                        else{
+                            selected = '';
+                        }
+                    }else{
+                        selected = '';
+                    }
+                    str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
+
+                    // console.log(sh_date)
+                })
+                shift.append(str);
+            });
+        }
+
+    });
+</script>
+
+

app/views/reports/commission/index.xls.erb

@@ -0,0 +1,100 @@
+<div class="container margin-top-20">
+  <!-- <div class="span11">
+  <div id="report_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div>
+</div> -->
+  <div class="card row">
+    <div class="table-responsive">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>
+            - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%>
+
+          </th>
+        </tr>
+        <% if @shift_from %>
+            <tr>
+              <% if @shift_data.employee %>
+                  <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+              <% end %>
+              <th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+            </tr>
+        <% end %>
+
+        <tr>
+          <th>Cashier Station</th>
+          <th>Cashier Name</th>
+          <th>Shift Name</th>
+          <!-- <th>Void Amount</th> -->
+          <th>Cash Payment</th>
+          <!-- <th>Credit Charges</th> -->
+          <th>Credit Payment</th>
+          <!-- <th>FOC Payment</th> -->
+          <th>Other Payment</th>
+          <!-- <th>Grand Total
+            <br/>Rounding Adj</th> -->
+          <!-- <th>Rounding Adj</th> -->
+          <th>Grand Total</th>
+        </tr>
+        </thead>
+        <tbody>
+        <% void = 0%>
+        <% cash = 0%>
+        <% credit = 0%>
+        <% accept_credit = 0%>
+        <% foc = 0%>
+        <% card = 0%>
+        <% total = 0%>
+        <% rounding_adj = 0%>
+        <% g_total = 0 %>
+
+        <% @sale_data.each do |result|%>
+            <tr>
+              <td>
+                <%= result.cashier_terminal.name  rescue '-'%>
+              </td>
+              <td>
+                <%= result.employee.name  rescue '-'%>
+              </td>
+              <td><%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> -
+                <%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-'  %>
+              </td>
+              <!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
+              <td><%= sprintf "%.2f",result.cash_sales.to_f.to_d  rescue '-'%></td>
+              <td><%= sprintf "%.2f",result.credit_sales.to_f.to_d  rescue '-'%></td>
+              <!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
+              <!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
+					  <td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->
+              <td><%= sprintf "%.2f",result.other_sales.to_f.to_d  rescue '-'%></td>
+              <td><%= sprintf "%.2f",result.grand_total.to_f.to_d  rescue '-'%></td>
+
+              <!--  <td><%= sprintf "%.2f",result.rounding_adj.to_f.to_d  rescue '-'%></td>	 -->
+              <% grand_total = result.grand_total.to_f %>
+              <!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->
+            </tr>
+            <% cash += result.cash_sales.to_f %>
+            <% credit += result.credit_sales.to_f %>
+            <% card += result.other_sales.to_f %>
+
+            <% total += result.grand_total.to_f %>
+            <% g_total += grand_total.to_f %>
+
+        <% end %>
+
+        <tr style="border-top: 3px solid grey;">
+          <td colspan="3"></td>
+          <!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
+          <td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
+          <td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
+          <!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
+          <!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
+          <td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
+          <!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
+          <!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->
+          <td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

config/routes.rb

@@ -323,6 +323,7 @@ Rails.application.routes.draw do
     resources :shiftsale, :only => [:index, :show]
     resources :credit_payment, :only => [:index, :show]
     resources :void_sale, :only => [:index, :show]
+    resources :commission, :only => [:index, :show]
 
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
   end