diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ab924a87..0840cec0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb" />
     </list>
     <ignored path="$PROJECT_DIR$/.bundle/" />
     <ignored path="$PROJECT_DIR$/components/" />
@@ -47,71 +44,51 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="20170824110103_create_inventory_definitions.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb">
+      <file leaf-file-name="load_commissioners.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/origami/product_commissions/load_commissioners.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+            <state relative-caret-position="199">
+              <caret line="74" column="27" lean-forward="false" selection-start-line="74" selection-start-column="27" selection-end-line="74" selection-end-column="27" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="298">
-              <caret line="38" column="11" lean-forward="false" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+            <state relative-caret-position="247">
+              <caret line="267" column="32" lean-forward="true" selection-start-line="267" selection-start-column="32" selection-end-line="267" selection-end-column="32" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/_form.html.erb">
+      <file leaf-file-name="sale_edit_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="18">
-              <caret line="1" column="37" lean-forward="false" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
+            <state relative-caret-position="69">
+              <caret line="62" column="21" lean-forward="false" selection-start-line="62" selection-start-column="21" selection-end-line="62" selection-end-column="21" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="inventory_definitions_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/inventory/inventory_definitions_controller.rb">
+      <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="270">
-              <caret line="15" column="9" lean-forward="false" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
+            <state relative-caret-position="182">
+              <caret line="95" column="25" lean-forward="false" selection-start-line="95" selection-start-column="25" selection-end-line="95" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="inventory_definition.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/inventory_definition.rb">
+      <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="0">
-              <caret line="0" column="6" lean-forward="false" selection-start-line="0" selection-start-column="6" selection-end-line="0" 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/inventory/inventory_definitions/index.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>
-      </file>
-      <file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/new.html.erb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="162">
-              <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
+            <state relative-caret-position="280">
+              <caret line="183" column="9" lean-forward="false" selection-start-line="183" selection-start-column="9" selection-end-line="183" selection-end-column="9" />
               <folding />
             </state>
           </provider>
@@ -143,6 +120,7 @@
       <find>mom</find>
       <find>gem &quot;select2-rails&quot;</find>
       <find>custom_excel</find>
+      <find>load</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -168,8 +146,6 @@
         <option value="$PROJECT_DIR$/app/views/settings/commissioners/new.html.erb" />
         <option value="$PROJECT_DIR$/app/models/commissioner.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$/app/views/settings/commissions/index.html.erb" />
         <option value="$PROJECT_DIR$/app/models/sale.rb" />
         <option value="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" />
@@ -179,7 +155,6 @@
         <option value="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" />
         <option value="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" />
         <option value="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" />
-        <option value="$PROJECT_DIR$/config/routes.rb" />
         <option value="$PROJECT_DIR$/app/models/promotion.rb" />
         <option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
         <option value="$PROJECT_DIR$/app/models/commission.rb" />
@@ -202,6 +177,9 @@
         <option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
         <option value="$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
+        <option value="$PROJECT_DIR$/config/routes.rb" />
+        <option value="$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb" />
       </list>
     </option>
   </component>
@@ -270,6 +248,20 @@
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="controllers" 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="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="origami" 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="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="settings" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
@@ -281,15 +273,38 @@
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
+              <item name="origami" 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="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory_definitions" type="462c0819:PsiDirectoryNode" />
+              <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="origami" type="462c0819:PsiDirectoryNode" />
+              <item name="product_commissions" 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="settings" 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="settings" type="462c0819:PsiDirectoryNode" />
+              <item name="commissions" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
@@ -319,14 +334,16 @@
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/app/views/settings" />
-      <recent name="$PROJECT_DIR$/app/controllers/settings" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/app/views/origami" />
       <recent name="$PROJECT_DIR$/app/controllers/origami" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/app/views/origami/product_commissions" />
+      <recent name="$PROJECT_DIR$/app/views/settings/commissions" />
+      <recent name="$PROJECT_DIR$/app/views/settings" />
+      <recent name="$PROJECT_DIR$/app/controllers/settings" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -707,12 +724,12 @@
       <workItem from="1503457057830" duration="7166000" />
       <workItem from="1503472116907" duration="50209000" />
       <workItem from="1503843212665" duration="21267000" />
-      <workItem from="1503909487511" duration="54855000" />
+      <workItem from="1503909487511" duration="65887000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="207473000" />
+    <option name="totallyTimeSpent" value="218505000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -735,9 +752,9 @@
       <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.34890965" 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.34994808" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39252338" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3561786" 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.3561786" 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="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" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -795,45 +812,6 @@
     <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="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/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/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">
@@ -874,14 +852,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/routes.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="489">
-          <caret line="102" column="31" lean-forward="false" selection-start-line="102" selection-start-column="31" selection-end-line="102" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/controllers/api/bill_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -922,14 +892,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="572" column="0" lean-forward="false" selection-start-line="572" selection-start-column="0" selection-end-line="578" selection-end-column="3" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activesupport-5.1.3/lib/active_support/core_ext/object/blank.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="184">
@@ -998,14 +960,6 @@
         </state>
       </provider>
     </entry>
-    <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="249">
-          <caret line="122" column="46" lean-forward="true" selection-start-line="122" selection-start-column="46" selection-end-line="122" selection-end-column="46" />
-          <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="216">
@@ -1167,14 +1121,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="1" column="37" lean-forward="false" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/index.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1199,18 +1145,90 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+        <state relative-caret-position="287">
+          <caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/app/views/inventory/inventory_definitions/_form.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="38" column="11" lean-forward="false" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+        <state relative-caret-position="180">
+          <caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="2988">
+          <caret line="166" column="35" lean-forward="false" selection-start-line="166" selection-start-column="35" selection-end-line="166" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/routes.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="183" column="9" lean-forward="false" selection-start-line="183" selection-start-column="9" selection-end-line="183" selection-end-column="9" />
+          <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="1066">
+          <caret line="64" column="5" lean-forward="false" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="95" column="25" lean-forward="false" selection-start-line="95" selection-start-column="25" selection-end-line="95" selection-end-column="25" />
+          <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="224">
+          <caret line="265" column="6" lean-forward="false" selection-start-line="265" selection-start-column="6" selection-end-line="265" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="69">
+          <caret line="62" column="21" lean-forward="false" selection-start-line="62" selection-start-column="21" selection-end-line="62" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/origami/product_commissions/load_commissioners.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="199">
+          <caret line="74" column="27" lean-forward="false" selection-start-line="74" selection-start-column="27" selection-end-line="74" selection-end-column="27" />
+          <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="247">
+          <caret line="267" column="32" lean-forward="true" selection-start-line="267" selection-start-column="32" selection-end-line="267" selection-end-column="32" />
           <folding />
         </state>
       </provider>
diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index 2bf38113..ada68f59 100644
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -61,6 +61,26 @@ class Origami::ProductCommissionsController < ApplicationController
     end
   end
 
+  def load_commissioners
+    sale_id = params[:sale_id]
+    @table_id = params[:table_id]
+    @saleobj = Sale.find(sale_id)
+
+    @commissioners = []
+  end
+
+  def select_sale_item
+    sale_item_id = params[:sale_item_id]
+    @selected_sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
+    @product_commission = ProductCommission.find_by_sale_item_id(@selected_sale_item.id)
+    unless @product_commission.nil?
+      selected_commissioner = @product_commission.commissioner
+    end
+    @commissioners = Commissioner.active.all
+
+    render json: {commissioner: @commissioners, selected_commissioner: selected_commissioner}
+  end
+
   def set_commissioner_to_sale_item
     # byebug
     deselect = false
diff --git a/app/controllers/settings/commissions_controller.rb b/app/controllers/settings/commissions_controller.rb
index 2fe85807..deaf566a 100644
--- a/app/controllers/settings/commissions_controller.rb
+++ b/app/controllers/settings/commissions_controller.rb
@@ -64,31 +64,6 @@ class Settings::CommissionsController < ApplicationController
     end
   end
 
-  def load_commissioners
-    sale_id = params[:sale_id]
-    @table_id = params[:table_id]
-    @saleobj = Sale.find(sale_id)
-
-    @commissioners = []
-  end
-
-  def select_sale_item
-    # byebug
-    sale_item_id = params[:sale_item_id]
-    @selected_sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
-    @product_commission = ProductCommission.find_by_sale_item_id(@selected_sale_item.id)
-    unless @product_commission.nil?
-      selected_commissioner = @product_commission.commissioner
-    end
-    @commissioners = Commissioner.active.all
-
-    # respond_to do |format|
-    #   format.json {render json: {[@commissioners],[@selected_sale_item]}}
-    #   # format.html {render @commissioners}
-    # end
-    render json: {commissioner: @commissioners, selected_commissioner: selected_commissioner}
-  end
-
   private
   # Use callbacks to share common setup or constraints between actions.
   def set_commission
diff --git a/app/views/settings/commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb
similarity index 100%
rename from app/views/settings/commissions/load_commissioners.html.erb
rename to app/views/origami/product_commissions/load_commissioners.html.erb
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 7ac413d0..bea1f981 100644
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -39,9 +39,18 @@
             <% end %>
           </div>
         </div>
-        <div class="row">
-          <div class="col-md-12"><%= f.input :promo_day %></div>
+
+        <div class="row checkboxes">
+         <%= f.hidden_field :promo_day, :value => "", :class => "form-control col-md-1" %> 
+          <div class="col-md-1"><input class="select" type="checkbox" name="Sunday" value="0" id="0"> Sun</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Monday" value="1" id="1">Mon</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Tuesday" value="2" id="2"> Tue</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Wednesday" value="3" id="3"> Wed</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Thursday" value="4" id="4">Thu</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Friday" value="5" id="5">Fri</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Saturday" value="6" id="6">Sat</div>
         </div>
+      
         <div class="row">
           <div class="col-md-6">
             <%= f.input :promo_type,input_html: { class: "" },
@@ -133,6 +142,8 @@
   </div>
 <% end %>
 <script>
+
+
 $(document).ready(function(){
   $('#promotion_promo_start_date').datetimepicker({
     timepicker:false,
@@ -150,6 +161,39 @@ $(document).ready(function(){
     datepicker:false,
     format:'H:m'
   });
+
+
+
+
+  var form = document.getElementById("new_promotion");
+  var inputs = form.getElementsByTagName("input");
+  var arr = [];
+  var count = 0;
+  var day = "[";
+ 
+$(".select").click(function() {
+    
+      // debugger;
+      day = "[";
+      for (var j = 8; j <=15; j += 1){
+        if (inputs[j].type === "checkbox" && inputs[j].checked)
+          {
+            if(day == "["){
+              day = day + (inputs[j].value);
+            }
+            else{
+              day = day + "," + (inputs[j].value);
+            }
+          }
+          if(j==15)
+          {
+            day = day + "]";
+          }
+       }
+      document.getElementById("promotion_promo_day").value = '';
+      document.getElementById("promotion_promo_day").value = day;
+  }); 
+     
   $("#promotion_original_product").select2();
   $(".item_code_place").select2();
   $(".item_code_place").on('change', function(event) {
diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb
index b0cfd599..3274fae1 100644
--- a/app/views/settings/promotions/index.html.erb
+++ b/app/views/settings/promotions/index.html.erb
@@ -39,7 +39,13 @@
           <td><%= pro.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td>
           <td><%= pro.promo_day %></td>
           <td>
-            <%= MenuItem.find_by_item_code(pro.original_product).name  rescue "-"%>
+            <% item = MenuItemInstance.find_by_item_instance_code(pro.original_product)%>
+            <% if item.nil? %>
+              <%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
+            <% else %>
+              <%= item.menu_item.name rescue "-" %>
+               - <%= item.item_instance_name rescue "-" %>
+            <% end %>
           </td>
           <% if Employee.exists?(pro.created_by) %>
           <td><%= Employee.find(pro.created_by).name %></td>
diff --git a/app/views/settings/promotions/new.html.erb b/app/views/settings/promotions/new.html.erb
index 321aa4d1..13918973 100644
--- a/app/views/settings/promotions/new.html.erb
+++ b/app/views/settings/promotions/new.html.erb
@@ -10,7 +10,11 @@
     <%= render 'form', promotion: @promotion %>
 </div>
 <script>
-$("#promotion_promo_code").val(Math.random().toString(36).slice(5) + Math.random().toString(36).slice(5));
+ var r_id = Math.random().toString(36).slice(5);
+ if(r_id.length > 16){
+	r_id = r_id.substring(0, 15);
+	}
+ $("#promotion_promo_code").val(r_id);
 // $( "#fromtime" ).timepicker();
 // $( "#totime" ).timepicker({ 'scrollDefault': 'now' });
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 344eab43..8dcdb956 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -179,6 +179,12 @@ Rails.application.routes.draw do
 
     resources :addorders
     resources :in_juties
+
+    # product_commission
+    get 'table/:table_id/sale/:sale_id/load_commissioners' => 'product_commissions#load_commissioners', as: 'load_commissioners'
+    post 'select_sale_item' => 'product_commissions#select_sale_item', as: 'select_sale_item'
+    post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item', as: 'select_commissioner'
+
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -302,12 +308,6 @@ Rails.application.routes.draw do
 
   end
 
-  # commissions
-  get 'origami/table/:table_id/sale/:sale_id/load_commissioners' => 'settings/commissions#load_commissioners', as: 'load_commissioners'
-  post 'origami/select_sale_item' => 'settings/commissions#select_sale_item', as: 'select_sale_item'
-  # product_commission
-  post 'origami/select_commissioner' => 'origami/product_commissions#set_commissioner_to_sale_item', as: 'select_commissioner'
-
   #--------- Transactions Sections ------------#
   namespace :transactions do
     resources :sales