From 1cbea173df9d600b81207cf02c4feeb0df456a9a Mon Sep 17 00:00:00 2001
From: Zin Lin Phyo <zinlin.phyo@code2lab.com>
Date: Mon, 28 Aug 2017 18:17:22 +0630
Subject: [PATCH] product commission transaction in commissioner

---
 .idea/sxrestaurant.iml                        |   1 +
 .idea/workspace.xml                           | 542 ++++++++----------
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   6 +
 app/assets/javascripts/application.js         |   1 +
 app/assets/stylesheets/application.scss       |   1 +
 .../settings/commissioners_controller.rb      |  54 +-
 app/models/commission.rb                      |  11 +
 app/models/product_commission.rb              |   2 -
 .../settings/commissioners/_form.html.erb     |  20 +
 .../settings/commissioners/index.html.erb     |   6 +-
 .../settings/commissioners/show.html.erb      | 151 +++--
 app/views/settings/commissions/index.html.erb |   4 +-
 config/routes.rb                              |   2 +
 ...170825034141_create_product_commissions.rb |   2 +-
 .../20170825090115_create_commissioners.rb    |   2 +-
 .../20170825093252_create_commissions.rb      |   4 +-
 17 files changed, 460 insertions(+), 350 deletions(-)

diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml
index 2a0f8404..0413cc5e 100644
--- a/.idea/sxrestaurant.iml
+++ b/.idea/sxrestaurant.iml
@@ -64,6 +64,7 @@
     <orderEntry type="library" scope="PROVIDED" name="httparty (v0.15.5, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.6, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.7.0, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jquery-datatables-rails (v3.4.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-datetimepicker-rails (v2.4.1.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.3.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v6.0.1, rbenv: 2.3.3) [gem]" level="application" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8a05bbbf..9a72e6a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/reports/commission/index.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/reports/commission/index.xls.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sxrestaurant.iml" afterPath="$PROJECT_DIR$/.idea/sxrestaurant.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <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$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/javascripts/application.js" afterPath="$PROJECT_DIR$/app/assets/javascripts/application.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/settings/commissioners_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/product_commission.rb" afterPath="$PROJECT_DIR$/app/models/product_commission.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissions/index.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissions/index.html.erb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" />
     </list>
     <ignored path="$PROJECT_DIR$/.bundle/" />
     <ignored path="$PROJECT_DIR$/components/" />
@@ -23,7 +33,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1503657224858" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
+    <SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1503909504914" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
     <SUITE FILE_PATH="coverage/sxrestaurant@db_migrate__sxrestaurant.coverage" NAME="db:migrate: sxrestaurant Coverage Results" MODIFIED="1503652404616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
     <SUITE FILE_PATH="coverage/sxrestaurant@Rails_console__sxrestaurant.coverage" NAME="Rails console: sxrestaurant Coverage Results" MODIFIED="1503651318886" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
   </component>
@@ -50,91 +60,61 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="shiftsale_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/reports/shiftsale_controller.rb">
+      <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb">
           <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" />
+            <state relative-caret-position="450">
+              <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
               <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/shiftsale/index.html.erb">
+        <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/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" />
+            <state relative-caret-position="286">
+              <caret line="31" column="15" lean-forward="false" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" />
               <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">
+      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/show.html.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" />
+            <state relative-caret-position="65">
+              <caret line="58" column="84" lean-forward="false" selection-start-line="58" selection-start-column="84" selection-end-line="58" selection-end-column="84" />
               <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">
+      <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Gemfile">
           <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" />
+            <state relative-caret-position="152">
+              <caret line="104" column="34" lean-forward="true" selection-start-line="104" selection-start-column="34" selection-end-line="104" selection-end-column="34" />
               <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">
+      <file leaf-file-name="commissioners_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb">
           <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" />
+            <state relative-caret-position="151">
+              <caret line="75" column="27" lean-forward="true" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
               <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">
+      <file leaf-file-name="product_commission.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/product_commission.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" />
+              <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -143,8 +123,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="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" />
+            <state relative-caret-position="5184">
+              <caret line="288" column="0" lean-forward="false" selection-start-line="288" selection-start-column="0" selection-end-line="288" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -173,6 +153,7 @@
       <find>origami_commissions_path</find>
       <find>green</find>
       <find>reports_dailysale_index_path</find>
+      <find>mom</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -185,9 +166,6 @@
         <option value="$PROJECT_DIR$/app/views/origami/commissions/_form.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/index.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/show.html.erb" />
-        <option value="$PROJECT_DIR$/Gemfile" />
-        <option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
-        <option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
         <option value="$PROJECT_DIR$/app/views/origami/commissioners/index.html.erb" />
         <option value="$PROJECT_DIR$/db/migrate/20170823075203_create_in_juties.rb" />
         <option value="$PROJECT_DIR$/db/migrate/20170823081747_create_in_juties.rb" />
@@ -198,40 +176,43 @@
         <option value="$PROJECT_DIR$/db/migrate/20170823034140_create_product_commissions.rb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb" />
         <option value="$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb" />
-        <option value="$PROJECT_DIR$/app/models/product_commission.rb" />
         <option value="$PROJECT_DIR$/app/models/menu_item.rb" />
         <option value="$PROJECT_DIR$/app/models/sale_item.rb" />
-        <option value="$PROJECT_DIR$/app/models/sale.rb" />
         <option value="$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.html.erb" />
         <option value="$PROJECT_DIR$/db/migrate/20170821093252_create_commissions.rb" />
         <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$/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" />
         <option value="$PROJECT_DIR$/app/views/settings/commissions/new.html.erb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissions/show.html.erb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissions/_form.html.erb" />
-        <option value="$PROJECT_DIR$/app/models/commission.rb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissions/index.html.erb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissioners/new.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb" />
         <option value="$PROJECT_DIR$/app/models/commissioner.rb" />
-        <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$/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" />
+        <option value="$PROJECT_DIR$/app/views/settings/commissions/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/models/sale.rb" />
+        <option value="$PROJECT_DIR$/app/models/commission.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/settings/commissioners/_form.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" />
+        <option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
+        <option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
+        <option value="$PROJECT_DIR$/app/models/product_commission.rb" />
+        <option value="$PROJECT_DIR$/config/routes.rb" />
+        <option value="$PROJECT_DIR$/Gemfile" />
+        <option value="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" />
+        <option value="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" />
       </list>
     </option>
   </component>
@@ -256,9 +237,9 @@
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="1441" />
+    <option name="x" value="1440" />
     <option name="y" value="22" />
-    <option name="width" value="1919" />
+    <option name="width" value="1920" />
     <option name="height" value="693" />
   </component>
   <component name="ProjectLevelVcsManager">
@@ -280,6 +261,8 @@
     </navigator>
     <panes>
       <pane id="Scope" />
+      <pane id="RailsProjectView" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -511,8 +494,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="RailsProjectView" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -913,12 +894,13 @@
       <workItem from="1503406983258" duration="261000" />
       <workItem from="1503457057830" duration="7166000" />
       <workItem from="1503472116907" duration="50209000" />
-      <workItem from="1503843212665" duration="11074000" />
+      <workItem from="1503843212665" duration="21267000" />
+      <workItem from="1503909487511" duration="6539000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142425000" />
+    <option name="totallyTimeSpent" value="159157000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -930,19 +912,18 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1441" y="22" width="1919" height="693" extended-state="0" />
-    <editor active="true" />
+    <frame x="1440" y="22" width="1920" height="693" extended-state="0" />
     <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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14643237" 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="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="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="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" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41327915" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41536865" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -961,112 +942,15 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="9" />
+      <option name="time" value="11" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="31" lean-forward="false" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/settings/accounts_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="58" lean-forward="false" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="58" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/commissioners_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="15" lean-forward="false" selection-start-line="0" selection-start-column="15" selection-end-line="0" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/accounts/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="30" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/_commissioner.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/home/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-390">
-          <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/home/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3361">
-          <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/models/seed_generator.rb">
-      <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/settings/commissioners/edit.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="3" column="50" lean-forward="false" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/index.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/settings/commissioners/show.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/settings/commissions/_commission.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/settings/commissions/edit.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="72">
           <caret line="4" column="48" lean-forward="false" selection-start-line="4" selection-start-column="48" selection-end-line="4" selection-end-column="48" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1074,7 +958,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="72">
           <caret line="4" column="48" lean-forward="false" selection-start-line="4" selection-start-column="48" selection-end-line="4" selection-end-column="48" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1082,7 +965,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="18">
           <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1090,7 +972,6 @@
       <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>
@@ -1114,15 +995,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="308">
           <caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/commission.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="1" column="51" lean-forward="false" selection-start-line="1" selection-start-column="51" selection-end-line="1" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1130,15 +1002,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="72">
           <caret line="4" column="35" lean-forward="true" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="32" column="61" lean-forward="false" selection-start-line="32" selection-start-column="61" selection-end-line="32" selection-end-column="61" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1146,7 +1009,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
           <caret line="8" column="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1154,7 +1016,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
           <caret line="6" column="4" lean-forward="false" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="127" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1162,7 +1023,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="324">
           <caret line="18" column="21" lean-forward="true" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1170,7 +1030,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="33" lean-forward="false" selection-start-line="0" selection-start-column="33" selection-end-line="0" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1178,7 +1037,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-913">
           <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>
@@ -1190,22 +1048,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="17" column="55" lean-forward="false" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="55" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="477">
-          <caret line="40" column="51" lean-forward="false" selection-start-line="40" selection-start-column="51" selection-end-line="40" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="269">
@@ -1218,7 +1060,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="386">
           <caret line="176" column="16" lean-forward="true" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1226,23 +1067,6 @@
       <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>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="551">
-          <caret line="46" column="74" lean-forward="true" selection-start-line="46" selection-start-column="74" selection-end-line="46" selection-end-column="74" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1274,23 +1098,6 @@
       <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$/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>
-    <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>
@@ -1298,15 +1105,6 @@
       <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>
@@ -1314,23 +1112,6 @@
       <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>
@@ -1338,7 +1119,6 @@
       <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>
@@ -1362,14 +1142,194 @@
       <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" />
+        <state relative-caret-position="162">
+          <caret line="54" column="66" lean-forward="false" selection-start-line="54" selection-start-column="66" selection-end-line="54" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="142">
+          <caret line="19" column="27" lean-forward="true" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170403135934_create_orders.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="3" column="112" lean-forward="true" selection-start-line="3" selection-start-column="112" selection-end-line="3" selection-end-column="112" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170701101420_create_sales.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <caret line="2" column="37" lean-forward="true" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="332">
+          <caret line="829" column="2" lean-forward="true" selection-start-line="829" selection-start-column="2" selection-end-line="833" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/seeds.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3790">
+          <caret line="16" column="53" lean-forward="true" selection-start-line="16" selection-start-column="53" selection-end-line="16" selection-end-column="53" />
+        </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="36">
+          <caret line="2" column="11" lean-forward="false" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/commission.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <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="90">
+          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <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="18">
+          <caret line="1" column="47" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="47" />
+          <folding />
+        </state>
+      </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="53" lean-forward="false" selection-start-line="8" selection-start-column="53" selection-end-line="8" selection-end-column="53" />
+          <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="113">
+          <caret line="24" column="48" lean-forward="false" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="48" />
+        </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="163">
+          <caret line="30" column="84" lean-forward="false" selection-start-line="30" selection-start-column="45" selection-end-line="30" selection-end-column="84" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/application.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="23" column="40" lean-forward="false" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <marker date="1503905476000" expanded="true" signature="1979:2006" ph="..." />
+            <marker date="1503905476000" expanded="true" signature="2802:2829" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <caret line="2" column="23" lean-forward="true" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="311">
+          <caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/routes.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5184">
+          <caret line="288" column="0" lean-forward="false" selection-start-line="288" selection-start-column="0" selection-end-line="288" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rbenv/shims/bundle">
+      <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/models/product_commission.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Gemfile">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="104" column="34" lean-forward="true" selection-start-line="104" selection-start-column="34" selection-end-line="104" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="75" column="27" lean-forward="true" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="31" column="15" lean-forward="false" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="65">
+          <caret line="58" column="84" lean-forward="false" selection-start-line="58" selection-start-column="84" selection-end-line="58" selection-end-column="84" />
           <folding />
         </state>
       </provider>
diff --git a/Gemfile b/Gemfile
index 44a85e51..c0783d50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,6 +53,7 @@ gem 'to_xls-rails'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
+gem 'jquery-datatables-rails', '~> 3.4.0'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
diff --git a/Gemfile.lock b/Gemfile.lock
index f2d875dd..8fca836c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,6 +89,11 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
+    jquery-datatables-rails (3.4.0)
+      actionpack (>= 3.1)
+      jquery-rails
+      railties (>= 3.1)
+      sass-rails
     jquery-datetimepicker-rails (2.4.1.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
@@ -266,6 +271,7 @@ DEPENDENCIES
   font-awesome-rails
   httparty (~> 0.15.5)
   jbuilder (~> 2.5)
+  jquery-datatables-rails (~> 3.4.0)
   jquery-datetimepicker-rails
   jquery-rails
   jquery-ui-rails
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 675bca2e..89f95729 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -21,6 +21,7 @@
 //= require jquery-ui
 //= require bootstrap-datepicker
 //= require jquery.datetimepicker
+//= require dataTables/jquery.dataTables
 
 $(document).on('turbolinks:load', function() {
   $('.datepicker').datepicker({
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 6ff7113c..6cd24771 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -5,6 +5,7 @@
 @import "jquery-ui";
 @import "bootstrap-datepicker3";
 @import "jquery.datetimepicker";
+@import "dataTables/jquery.dataTables";
 
 /* Show it is fixed to the top */
 // body {
diff --git a/app/controllers/settings/commissioners_controller.rb b/app/controllers/settings/commissioners_controller.rb
index 26560c01..d4d1fa53 100644
--- a/app/controllers/settings/commissioners_controller.rb
+++ b/app/controllers/settings/commissioners_controller.rb
@@ -27,13 +27,19 @@ class Settings::CommissionersController < ApplicationController
   def create
     @commissioner = Commissioner.new(commissioner_params)
     @commissioner.created_by = current_user.id
+    unless @commissioner.joined_date.nil?
+      @commissioner.joined_date = @commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d')
+    end
+    unless @commissioner.resigned_date.nil?
+      @commissioner.resigned_date = @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d')
+    end
     respond_to do |format|
       if @commissioner.save
-        format.html { redirect_to  settings_commissioners_path , notice: 'Commissioner was successfully created.' }
-        format.json { render :show, status: :created, location: @commissioner }
+        format.html {redirect_to settings_commissioners_path, notice: 'Commissioner was successfully created.'}
+        format.json {render :show, status: :created, location: @commissioner}
       else
-        format.html { render :new }
-        format.json { render json: @commissioner.errors, status: :unprocessable_entity }
+        format.html {render :new}
+        format.json {render json: @commissioner.errors, status: :unprocessable_entity}
       end
     end
   end
@@ -43,11 +49,11 @@ class Settings::CommissionersController < ApplicationController
   def update
     respond_to do |format|
       if @commissioner.update(commissioner_params)
-        format.html { redirect_to  settings_commissioner_path(@commissioner) , notice: 'Commissioner was successfully updated.' }
-        format.json { render :show, status: :ok, location: @commissioner }
+        format.html {redirect_to settings_commissioner_path(@commissioner), notice: 'Commissioner was successfully updated.'}
+        format.json {render :show, status: :ok, location: @commissioner}
       else
-        format.html { render :edit }
-        format.json { render json: @commissioner.errors, status: :unprocessable_entity }
+        format.html {render :edit}
+        format.json {render json: @commissioner.errors, status: :unprocessable_entity}
       end
     end
   end
@@ -57,19 +63,31 @@ class Settings::CommissionersController < ApplicationController
   def destroy
     @commissioner.destroy
     respond_to do |format|
-      format.html { redirect_to  settings_commissioners_path , notice: 'Commissioner was successfully destroyed.' }
-      format.json { head :no_content }
+      format.html {redirect_to settings_commissioners_path, notice: 'Commissioner was successfully destroyed.'}
+      format.json {head :no_content}
     end
   end
 
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_commissioner
-      @commissioner = Commissioner.find(params[:id])
+  def get_transaction_by_commissioner
+    commissioner_id = params[:commissioner_id]
+    @transactions = []
+    @product_commissions = ProductCommission.where(commissioner_id: commissioner_id).order('updated_at desc')
+    @product_commissions.each_with_index do |p, i|
+      @transactions[i] = []
+      @transactions[i] << p
+      @transactions[i] << p.commission.menu_item.name
     end
+    render json: @transactions
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def commissioner_params
-      params.require(:commissioner).permit(:name,:emp_id,:created_by,:commission_id,:joined_date,:resigned_date, :is_active)
-    end
+  private
+  # Use callbacks to share common setup or constraints between actions.
+  def set_commissioner
+    @commissioner = Commissioner.find(params[:id])
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def commissioner_params
+    params.require(:commissioner).permit(:name, :emp_id, :created_by, :commission_id, :joined_date, :resigned_date, :is_active)
+  end
 end
diff --git a/app/models/commission.rb b/app/models/commission.rb
index 2a724d7e..055d9618 100644
--- a/app/models/commission.rb
+++ b/app/models/commission.rb
@@ -1,5 +1,16 @@
 class Commission < ApplicationRecord
+  self.primary_key = 'commission_id'
+
+  # primary key - need to be unique
+  before_create :generate_custom_id
+
   belongs_to :menu_item, foreign_key: 'product_code'
   has_many :commissioners
   has_many :product_commissions
+
+  private
+
+  def generate_custom_id
+    self.commission_id = SeedGenerator.generate_id(self.class.name, 'COM')
+  end
 end
diff --git a/app/models/product_commission.rb b/app/models/product_commission.rb
index 59e64b79..1f3b6423 100644
--- a/app/models/product_commission.rb
+++ b/app/models/product_commission.rb
@@ -5,7 +5,5 @@ class ProductCommission < ApplicationRecord
   belongs_to :sale_item, foreign_key: 'sale_item_id'
   belongs_to :sale, foreign_key: 'sale_id'
 
-  def self.check_product_commission(sale_item_id)
 
-  end
 end
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb
index c17e59a3..e2d9d120 100644
--- a/app/views/settings/commissioners/_form.html.erb
+++ b/app/views/settings/commissioners/_form.html.erb
@@ -10,6 +10,10 @@
         <%= f.label :commission_id, 'Commission' %><br/>
         <%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, {prompt: 'Select a Product'}, {class: 'form-control'} %>
         <br/>
+        <%= f.label :joined_date %><br/>
+        <%= f.text_field :joined_date, {class: 'form-control', id: 'joined_date', readonly: true} %><br/>
+        <%= f.label :resigned_date %><br/>
+        <%= f.text_field :resigned_date, {class: 'form-control', id: 'resigned_date', readonly: true} %><br/>
         <label><%= f.check_box :is_active %> Active </label>
       </div>
       <br/>
@@ -20,3 +24,19 @@
       </div>
   <% end %>
 </div>
+
+<script type="text/javascript">
+
+    $(document).ready(function () {
+        $('#joined_date').datepicker({
+            format: 'yyyy-mm-dd',
+            autoclose: true
+        });
+
+        $('#resigned_date').datepicker({
+            format: 'yyyy-mm-dd',
+            autoclose: true
+        });
+    });
+
+</script>
diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb
index f0229432..e6c1fdc9 100644
--- a/app/views/settings/commissioners/index.html.erb
+++ b/app/views/settings/commissioners/index.html.erb
@@ -16,8 +16,10 @@
       <th>Name</th>
       <th>Employee Name</th>
       <th>Commission type</th>
+      <th>Joined Date</th>
+      <th>Resigned Date</th>
       <th>Active</th>
-      <th colspan="3"></th>
+      <th colspan="4"></th>
     </tr>
     </thead>
 
@@ -29,6 +31,8 @@
             <%= commissioner.employee.name rescue '-' %>
           </td>
           <td><%= commissioner.commission.menu_item.name rescue '-' %></td>
+          <td><%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
+          <td><%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
           <td><%= commissioner.is_active %></td>
           <td><%= link_to 'Show', settings_commissioner_path(commissioner) %></td>
           <td><%= link_to 'Edit', edit_settings_commissioner_path(commissioner) %></td>
diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb
index 5af55c54..7f2005c6 100644
--- a/app/views/settings/commissioners/show.html.erb
+++ b/app/views/settings/commissioners/show.html.erb
@@ -7,41 +7,126 @@
   </span>
   </ul>
 </div>
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Commissioner</h4>
-    <table class="table">
 
-      <tbody>
+<!-- Nav tabs -->
+<ul class="nav nav-tabs" role="tablist">
+  <li class="nav-item">
+    <a class="nav-link active" data-toggle="tab" href="#info" role="tab">Info</a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link" data-toggle="tab" href="#transaction" id="transaction_tab" role="tab">Transaction</a>
+  </li>
+</ul>
+<!-- Nav tabs - End -->
 
-      <tr>
-        <td style="width:20%">Name</td>
-        <td><%= @commissioner.name %></td>
-      </tr>
-      <tr>
-        <td style="width:20%">Employee Name</td>
-        <td>
-          <%= @commissioner.employee.name rescue '-' %>
-        </td>
-      </tr>
-      <tr>
-        <td style="width:20%">Commission Type</td>
-        <td><%= @commissioner.commission.menu_item.name rescue '-' %></td>
-      </tr>
-      <tr>
-        <td style="width:20%">Active</td>
-        <td><%= @commissioner.is_active %></td>
-      </tr>
-      <tr>
-        <td style="width:20%">Created By</td>
-        <td><%= Employee.find(@commissioner.created_by).name %></td>
-      </tr>
-      </tbody>
-    </table>
-    <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %>
-    <%= link_to 'Edit', edit_settings_commissioner_path(@commissioner), class: 'btn btn-info' %>
-    <%= link_to 'Destroy', settings_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
+<div class="tab-content">
+  <!--- Panel 0 - Info -->
+  <div class="tab-pane active" id="info" role="tabpanel" style="max-height:670px; overflow:auto">
+    <div class="card">
+      <div class="card-block">
+        <table class="table">
+          <tbody>
+          <tr>
+            <td style="width:20%">Name</td>
+            <td><%= @commissioner.name %></td>
+          </tr>
+          <tr>
+            <td style="width:20%">Employee Name</td>
+            <td><%= @commissioner.employee.name rescue '-' %></td>
+          </tr>
+          <tr>
+            <td style="width:20%">Commission Type</td>
+            <td><%= @commissioner.commission.menu_item.name rescue '-' %></td>
+          </tr>
+          <tr>
+            <td style="width:20%">Joined Date</td>
+            <td><%= @commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
+          </tr>
+          <tr>
+            <td style="width:20%">Resigned Date</td>
+            <td><%= @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
+          </tr>
+          <tr>
+            <td style="width:20%">Active</td>
+            <td><%= @commissioner.is_active %></td>
+          </tr>
+          <tr>
+            <td style="width:20%">Created By</td>
+            <td><%= Employee.find(@commissioner.created_by).name %></td>
+          </tr>
+          </tbody>
+        </table>
+        <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %>
+        <%= link_to 'Edit', edit_settings_commissioner_path(@commissioner), class: 'btn btn-info' %>
+        <%= link_to 'Destroy', settings_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
+      </div>
+    </div>
   </div>
-</div>
+  <!--- Panel 1 - Transaction -->
+  <div class="tab-pane" id="transaction" role="tabpanel" style="max-height:670px; overflow:auto">
+    <div class="card">
+      <div class="card-block">
+
+        <table class="table" id="myTable">
+          <thead>
+          <tr>
+            <th><%= 'Product Type' %></th>
+            <th><%= 'Product Name' %></th>
+            <th><%= 'Qty' %></th>
+            <th><%= 'Price' %></th>
+            <th><%= 'Amount' %></th>
+            <th><%= 'Date' %></th>
+          </tr>
+          </thead>
+          <tbody>
+
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+  <br/>
 
 </div>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+
+        $("#transaction_tab").click(function () {
+            get_transaction();
+        });
+
+        function get_transaction() {
+            var commissioner_id = <%= @commissioner.id %>
+            paramlist = 'commissioner_id=' + commissioner_id ;
+            $.ajax({
+                type: 'GET',
+                url: '<%= settings_get_transaction_by_commissioner_path() %>',
+                data: paramlist,
+                success: function (data) {
+//                    $('#myTable').DataTable().destroy();
+                    $('#myTable tbody > tr').remove();
+                    $.each(data, function (i, item) {
+                        tr = "<tr>" + "<td>" + data[i][0].product_type + "</td>" + "<td>" + data[i][1] + "</td>" + "<td>" + data[i][0].qty + "</td>" + "<td>" + data[i][0].price + "</td>" + "<td>" + data[i][0].amount + "</td>" + "<td>" + new Date(data[i][0].updated_at).toISOString().split('T')[0] + "</td>" + "</tr>";
+                        $('#myTable tbody').append(tr);
+                    });
+//                    $('#myTable').DataTable({
+//                        data: data,
+//                        columns: [
+//                            {data: 'product_type'},
+//                            {data: 'product_code'},
+//                            {data: 'commission_id'},
+//                            {data: 'qty'},
+//                            {data: 'price'},
+//                            {data: 'amount'}
+//                        ],
+//                        "order": [[0, "desc"]]
+//                    });
+                }
+            });
+
+        }
+
+    });
+</script>
diff --git a/app/views/settings/commissions/index.html.erb b/app/views/settings/commissions/index.html.erb
index 63304d2f..a30fda08 100644
--- a/app/views/settings/commissions/index.html.erb
+++ b/app/views/settings/commissions/index.html.erb
@@ -14,8 +14,8 @@
     <thead>
     <tr>
       <th>Product Name</th>
+      <th>Commission Type</th>
       <th>Amount</th>
-      <th>Commission type</th>
       <th>Active</th>
       <th colspan="3"></th>
     </tr>
@@ -25,8 +25,8 @@
     <% @commissions.each do |commission| %>
         <tr>
           <td><%= commission.menu_item.name rescue '-' %></td>
-          <td><%= commission.amount rescue '-' %></td>
           <td><%= commission.commission_type rescue '-' %></td>
+          <td><%= commission.amount rescue '-' %></td>
           <td><%= commission.is_active rescue '-' %></td>
           <td><%= link_to 'Show', settings_commissions_path(commission) %></td>
           <td><%= link_to 'Edit', edit_settings_commission_path(commission) %></td>
diff --git a/config/routes.rb b/config/routes.rb
index 7008cc47..3b88e88e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -296,6 +296,8 @@ Rails.application.routes.draw do
     resources :commissions
     resources :commissioners
 
+    get '/get_transactions_by_commissioner' => 'commissioners#get_transaction_by_commissioner', as:'get_transaction_by_commissioner'
+
   end
 
   # commissions
diff --git a/db/migrate/20170825034141_create_product_commissions.rb b/db/migrate/20170825034141_create_product_commissions.rb
index d8686b69..f083bf68 100644
--- a/db/migrate/20170825034141_create_product_commissions.rb
+++ b/db/migrate/20170825034141_create_product_commissions.rb
@@ -4,7 +4,7 @@ class CreateProductCommissions < ActiveRecord::Migration[5.1]
     create_table :product_commissions do |t|
       t.string :product_type
       t.string :product_code
-      t.integer :commission_id
+      t.string :commission_id
       t.integer :commissioner_id
       t.decimal :qty, precision: 10, scale: 2, default: 0.00
       t.string :sale_id
diff --git a/db/migrate/20170825090115_create_commissioners.rb b/db/migrate/20170825090115_create_commissioners.rb
index fe32a35a..1794b5c7 100644
--- a/db/migrate/20170825090115_create_commissioners.rb
+++ b/db/migrate/20170825090115_create_commissioners.rb
@@ -5,7 +5,7 @@ class CreateCommissioners < ActiveRecord::Migration[5.1]
       t.string :name
       t.string :emp_id
       t.string :created_by
-      t.integer :commission_id
+      t.string :commission_id
       t.datetime :joined_date
       t.datetime :resigned_date
       t.boolean :is_active, default: true
diff --git a/db/migrate/20170825093252_create_commissions.rb b/db/migrate/20170825093252_create_commissions.rb
index 74706f3a..8c344fbc 100644
--- a/db/migrate/20170825093252_create_commissions.rb
+++ b/db/migrate/20170825093252_create_commissions.rb
@@ -1,7 +1,9 @@
 class CreateCommissions < ActiveRecord::Migration[5.1]
   # rake db:migrate:down VERSION=20170825093252
   def change
-    create_table :commissions do |t|
+    create_table :commissions, id: false do |t|
+      t.string :commission_id, limit: 16, primary_key: true # custom primary key
+
       t.string :product_type
       t.string :product_code
       t.string :commission_type