diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5eaab1be..aa32b1ed 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,121 +2,34 @@
 <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/assets/javascripts/inventory_definitions.coffee" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/assets/javascripts/stock_check_items.coffee" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/assets/javascripts/stock_checks.coffee" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/assets/javascripts/stock_journals.coffee" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/assets/stylesheets/inventory_definitions.scss" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/assets/stylesheets/stock_check_items.scss" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/assets/stylesheets/stock_checks.scss" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/assets/stylesheets/stock_journals.scss" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/base_inventory_controller.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/inventory/inventory_controller.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/inventory/inventory_definitions_controller.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/inventory/stock_check_items_controller.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/inventory/stock_checks_controller.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/inventory/stock_journals_controller.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/helpers/inventory_definitions_helper.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/helpers/stock_check_items_helper.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/helpers/stock_checks_helper.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/helpers/stock_journals_helper.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/models/inventory_definition.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/models/stock_check.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/models/stock_check_item.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/models/stock_journal.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory/index.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/_form.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/_inventory_definition.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/edit.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/index.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/index.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/new.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/show.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/inventory_definitions/show.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/_form.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/_stock_check_item.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/edit.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/index.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/index.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/new.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/show.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_check_items/show.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/_form.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/_stock_check.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/edit.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/index.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/index.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/new.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/show.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_checks/show.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/_form.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/_stock_journal.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/edit.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/index.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/index.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/new.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/show.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/inventory/stock_journals/show.json.jbuilder" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/layouts/inventory.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/assign_in_juty.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/edit_in_juty.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/db/migrate/20170824110103_create_inventory_definitions.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/db/migrate/20170824110117_create_stock_journals.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/db/migrate/20170824110125_create_stock_checks.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/db/migrate/20170824110130_create_stock_check_items.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/controllers/inventory_definitions_controller_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/controllers/stock_check_items_controller_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/controllers/stock_checks_controller_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/controllers/stock_journals_controller_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/helpers/inventory_definitions_helper_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/helpers/stock_check_items_helper_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/helpers/stock_checks_helper_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/helpers/stock_journals_helper_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/models/inventory_definition_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/models/stock_check_item_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/models/stock_check_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/models/stock_journal_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/requests/inventory_definitions_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/requests/stock_check_items_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/requests/stock_checks_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/requests/stock_journals_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/routing/inventory_definitions_routing_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/routing/stock_check_items_routing_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/routing/stock_checks_routing_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/routing/stock_journals_routing_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/inventory_definitions/edit.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/inventory_definitions/index.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/inventory_definitions/new.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/inventory_definitions/show.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_check_items/edit.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_check_items/index.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_check_items/new.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_check_items/show.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_checks/edit.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_checks/index.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_checks/new.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_checks/show.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_journals/edit.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_journals/index.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_journals/new.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/views/stock_journals/show.html.erb_spec.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/system/inventory_definitions_test.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/system/stock_check_items_test.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/system/stock_checks_test.rb" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/system/stock_journals_test.rb" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/controllers/origami/commissioners_controller.rb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/_commissioner.json.jbuilder" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/_form.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/edit.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/index.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/index.json.jbuilder" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/new.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/show.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/show.json.jbuilder" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/_commission.json.jbuilder" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/_form.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/edit.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/index.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/index.json.jbuilder" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/new.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/show.html.erb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/show.json.jbuilder" afterPath="" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/db/migrate/20170818090115_create_commissioners.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/db/migrate/20170821093252_create_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/settings/promotions_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/settings/promotions_controller.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/promotion.rb" afterPath="$PROJECT_DIR$/app/models/promotion.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/promotion_product.rb" afterPath="$PROJECT_DIR$/app/models/promotion_product.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/sale.rb" afterPath="$PROJECT_DIR$/app/models/sale.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/home/dashboard.html.erb" afterPath="$PROJECT_DIR$/app/views/home/dashboard.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/home/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/promotions/index.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/promotions/index.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/settings.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/settings.scss" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/commission.rb" afterPath="$PROJECT_DIR$/app/models/commission.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/commissioner.rb" afterPath="$PROJECT_DIR$/app/models/commissioner.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/layouts/_header.html.erb" afterPath="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
     </list>
     <ignored path="$PROJECT_DIR$/.bundle/" />
@@ -131,26 +44,39 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <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@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>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_TABLE_DETAILS" value="true" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <expand>
+      <path>
+        <item name="" type="eadb38e5:DatabaseStructure$Root" />
+        <item name="SXRestaurants_development@localhost" type="e3449647:DbNodeDescriptor" />
+      </path>
+      <path>
+        <item name="" type="eadb38e5:DatabaseStructure$Root" />
+        <item name="SXRestaurants_development@localhost" type="e3449647:DbNodeDescriptor" />
+        <item name="SXRestaurants_development" type="e3449647:DbNodeDescriptor" />
+      </path>
+    </expand>
+    <select />
+  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="load_commissioners.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.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="353">
-              <caret line="174" column="74" lean-forward="false" selection-start-line="174" selection-start-column="74" selection-end-line="174" selection-end-column="74" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="commissions_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="605">
-              <caret line="87" column="92" lean-forward="false" selection-start-line="87" selection-start-column="92" selection-end-line="87" selection-end-column="92" />
+            <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>
@@ -159,159 +85,88 @@
       <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="356">
-              <caret line="79" column="24" lean-forward="false" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
+            <state relative-caret-position="164">
+              <caret line="65" column="12" lean-forward="true" selection-start-line="65" selection-start-column="12" selection-end-line="65" selection-end-column="12" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="20170823034141_create_product_commissions.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb">
+      <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
-              <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+            <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>
       </file>
-      <file leaf-file-name="routes.rb" pinned="false" current-in-tab="true">
+      <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="253">
-              <caret line="93" column="85" lean-forward="false" selection-start-line="93" selection-start-column="85" selection-end-line="93" selection-end-column="85" />
+            <state relative-caret-position="486">
+              <caret line="304" column="35" lean-forward="false" selection-start-line="304" selection-start-column="16" selection-end-line="304" selection-end-column="35" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="commissioner.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/commissioner.rb">
+      <file leaf-file-name="commissions_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="72">
-              <caret line="4" column="2" lean-forward="false" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="31" />
+            <state relative-caret-position="368">
+              <caret line="76" column="12" lean-forward="true" selection-start-line="76" selection-start-column="12" selection-end-line="76" selection-end-column="12" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="product_commission.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/product_commission.rb">
+      <file leaf-file-name="20170825034141_create_product_commissions.rb" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="5" column="16" lean-forward="false" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
+            <state relative-caret-position="180">
+              <caret line="10" column="28" lean-forward="true" selection-start-line="10" selection-start-column="28" selection-end-line="10" selection-end-column="28" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="sale.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
+      <file leaf-file-name="shiftsale_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/reports/shiftsale_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="6" column="25" lean-forward="false" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
-              <folding>
-                <marker date="1503645309000" expanded="true" signature="5437:5922" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="6728:6996" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="7108:7855" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="7289:7471" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="7692:7778" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="7783:7833" ph="##..." />
-                <marker date="1503645309000" expanded="true" signature="7883:8538" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="8038:8270" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="8054:8262" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="8618:9999" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="9025:9954" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="9067:9946" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="9088:9936" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="9383:9718" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="9729:9854" ph="##..." />
-                <marker date="1503645309000" expanded="true" signature="10049:11455" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="10474:11409" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="10516:11401" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="10537:11391" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="10837:11172" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="11184:11309" ph="##..." />
-                <marker date="1503645309000" expanded="true" signature="11496:11696" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="11561:11669" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="11729:12193" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="11851:11970" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="11975:12187" ph="##..." />
-                <marker date="1503645309000" expanded="true" signature="12216:12279" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="12357:12776" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="12379:12770" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="12811:13358" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="12816:12987" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="12993:13351" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="13415:14192" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="13420:13595" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="13601:13705" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="13711:14185" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="14233:15031" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="14238:14300" ph="##..." />
-                <marker date="1503645309000" expanded="true" signature="14393:15000" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="14491:14990" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="14662:14977" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="15070:18882" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="16561:18853" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="17801:18844" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="18946:19825" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="19868:20061" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="19872:20057" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="20105:20589" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="20616:21494" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="21566:27367" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="21817:27214" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="23253:23473" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="25119:25339" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="26886:27106" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="27452:28880" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="27514:27943" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="27576:27935" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="27970:28876" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="28955:29679" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="29205:29675" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="29719:30523" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="29941:30202" ph="##..." />
-                <marker date="1503645309000" expanded="true" signature="30208:30444" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="30599:32496" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="30603:31016" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="30659:31010" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="31020:32492" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="32911:32984" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="33007:33197" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="33051:33175" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="33068:33167" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="33222:33405" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="33268:33381" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="33285:33373" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="33429:33641" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="33474:33618" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="33491:33610" ph="if ... end" />
-                <marker date="1503645309000" expanded="true" signature="33667:33853" ph=" ... end" />
-                <marker date="1503645309000" expanded="true" signature="33708:33831" ph="do ... end" />
-                <marker date="1503645309000" expanded="true" signature="33728:33822" ph="if ... end" />
-              </folding>
+            <state relative-caret-position="54">
+              <caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="sale_item.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/sale_item.rb">
+      <file leaf-file-name="20170825090115_create_commissioners.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="126">
-              <caret line="7" column="31" lean-forward="false" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+              <caret line="7" column="30" lean-forward="false" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="menu_item.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/menu_item.rb">
+      <file leaf-file-name="load_commissioners.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="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" />
+            <state relative-caret-position="297">
+              <caret line="165" column="52" lean-forward="false" selection-start-line="165" selection-start-column="33" selection-end-line="165" selection-end-column="52" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="settings.scss" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/settings.scss">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="653">
+              <caret line="89" column="16" lean-forward="false" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -336,6 +191,9 @@
       <find>edit</find>
       <find>sale_item</find>
       <find>commissioner</find>
+      <find>order_item</find>
+      <find>origami_commissions_path</find>
+      <find>green</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -344,30 +202,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/orders/show.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/sales/show.html.erb" />
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/app/views/home/show.html.erb" />
-        <option value="$PROJECT_DIR$/app/models/ability.rb" />
-        <option value="$PROJECT_DIR$/app/views/origami/sale_edit/edit.html.erb" />
-        <option value="$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb" />
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/db/migrate/20170818051922_create_commissioner.rb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170818090115_create_commissioners.rb" />
-        <option value="$PROJECT_DIR$/app/controllers/origami/commissioners_controller.rb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissioners/edit.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissioners/new.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissions/edit.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissions/new.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/home/index.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/home/dashboard.html.erb" />
         <option value="$PROJECT_DIR$/app/models/employee.rb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissioners/_form.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissioners/show.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissioners/_commissioners.html.erb" />
-        <option value="$PROJECT_DIR$/db/migrate/20170821093252_create_commissions.rb" />
         <option value="$PROJECT_DIR$/app/models/product.rb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/_form.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/commissions/index.html.erb" />
@@ -386,29 +224,63 @@
         <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/commission.rb" />
-        <option value="$PROJECT_DIR$/app/models/commissioner.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/controllers/origami/product_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$/db/migrate/20170825034141_create_product_commissions.rb" />
+        <option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/settings/commissioners/edit.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/settings/commissions/edit.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb" />
+        <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$/config/routes.rb" />
+        <option value="$PROJECT_DIR$/app/assets/stylesheets/settings.scss" />
+        <option value="$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
       </list>
     </option>
   </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsFlowSettings">
+    <service-enabled>false</service-enabled>
+    <exe-path />
+    <annotation-enable>false</annotation-enable>
+    <other-services-enabled>false</other-services-enabled>
+    <auto-save>true</auto-save>
+  </component>
   <component name="JsGulpfileManager">
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
+  <component name="LogFilters">
+    <option name="FILTER_ERRORS" value="false" />
+    <option name="FILTER_WARNINGS" value="false" />
+    <option name="FILTER_INFO" value="false" />
+    <option name="FILTER_DEBUG" value="false" />
+    <option name="CUSTOM_FILTER" />
+  </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="1442" />
+    <option name="x" value="1441" />
     <option name="y" value="22" />
-    <option name="width" value="1920" />
-    <option name="height" value="721" />
+    <option name="width" value="1919" />
+    <option name="height" value="693" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
@@ -428,7 +300,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="RailsProjectView" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -442,12 +313,71 @@
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" 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="assets" 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="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="javascripts" 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="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="javascripts" type="462c0819:PsiDirectoryNode" />
+              <item name="crm" 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="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="javascripts" 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="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="stylesheets" 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="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="stylesheets" 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="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="stylesheets" 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="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="api" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
@@ -455,6 +385,20 @@
               <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="reports" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="settings" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
@@ -472,7 +416,22 @@
               <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="crm" 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="crm" type="462c0819:PsiDirectoryNode" />
+              <item name="customers" 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="layouts" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
@@ -480,15 +439,6 @@
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
               <item name="origami" type="462c0819:PsiDirectoryNode" />
-              <item name="commissioners" 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="commissions" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
@@ -498,6 +448,52 @@
               <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="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="commissioners" 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" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="transactions" 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="transactions" type="462c0819:PsiDirectoryNode" />
+              <item name="orders" 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="transactions" type="462c0819:PsiDirectoryNode" />
+              <item name="sales" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
@@ -513,6 +509,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="RailsProjectView" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -522,8 +519,15 @@
     <property name="add_unversioned_files" value="$PROJECT_DIR$/config/database.yml" />
     <property name="SearchEverywhereHistoryKey" value="header&#9;FILE&#9;file:///Users/zinlinphyo/Documents/projectX/code2lab/ror/sxrestaurant/app/views/layouts/_header.html.erb" />
     <property name="Ruby.ViewRefParam.DefaultExtension" value="html.erb" />
+    <property name="RakeTaksPopup.undocumentedIncluded" value="false" />
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+    <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" />
@@ -551,7 +555,7 @@
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
       <envs />
-      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
       <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
       <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
         <COVERAGE_PATTERN ENABLED="true">
@@ -559,10 +563,10 @@
         </COVERAGE_PATTERN>
       </EXTENSION>
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
-      <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
-      <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
+      <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3002" />
+      <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="192.168.1.141" />
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />
-      <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
+      <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="puma" />
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
     </configuration>
@@ -590,6 +594,25 @@
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" />
       <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
     </configuration>
+    <configuration name="Rails console: sxrestaurant" type="IrbRunConfigurationType" factoryName="IRB console" temporary="true">
+      <module name="sxrestaurant" />
+      <IRB_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <IRB_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$" />
+      <IRB_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+      <IRB_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+      <IRB_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+      <envs />
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <IRB_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/bin/rails" />
+      <IRB_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="console" />
+      <IRB_RUN_CONFIG NAME="IS_RAILS_CONSOLE" VALUE="true" />
+    </configuration>
     <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
       <node-interpreter>project</node-interpreter>
       <node-options />
@@ -780,6 +803,30 @@
       <envs />
       <method />
     </configuration>
+    <configuration name="db:migrate: sxrestaurant" type="RakeRunConfigurationType" factoryName="Rake" temporary="true">
+      <module name="sxrestaurant" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+      <envs>
+        <env name="RAILS_ENV" value="development" />
+      </envs>
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="db:migrate" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE="" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
+      <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
+    </configuration>
     <configuration name="spec: sxrestaurant" type="RakeRunConfigurationType" factoryName="Rake">
       <module name="sxrestaurant" />
       <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -826,12 +873,20 @@
       <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
       <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
     </configuration>
-    <list size="4">
-      <item index="0" class="java.lang.String" itemvalue="Rake.test: sxrestaurant" />
-      <item index="1" class="java.lang.String" itemvalue="Rake.spec: sxrestaurant" />
-      <item index="2" class="java.lang.String" itemvalue="Rails.Production: sxrestaurant" />
-      <item index="3" class="java.lang.String" itemvalue="Rails.Development: sxrestaurant" />
+    <list size="6">
+      <item index="0" class="java.lang.String" itemvalue="Rails.Production: sxrestaurant" />
+      <item index="1" class="java.lang.String" itemvalue="Rails.Development: sxrestaurant" />
+      <item index="2" class="java.lang.String" itemvalue="Rake.test: sxrestaurant" />
+      <item index="3" class="java.lang.String" itemvalue="Rake.spec: sxrestaurant" />
+      <item index="4" class="java.lang.String" itemvalue="IRB console.Rails console: sxrestaurant" />
+      <item index="5" class="java.lang.String" itemvalue="Rake.db:migrate: sxrestaurant" />
     </list>
+    <recent_temporary>
+      <list size="2">
+        <item index="0" class="java.lang.String" itemvalue="Rake.db:migrate: sxrestaurant" />
+        <item index="1" class="java.lang.String" itemvalue="IRB console.Rails console: sxrestaurant" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
@@ -855,34 +910,43 @@
       <workItem from="1503328001970" duration="20307000" />
       <workItem from="1503406983258" duration="261000" />
       <workItem from="1503457057830" duration="7166000" />
-      <workItem from="1503472116907" duration="36940000" />
+      <workItem from="1503472116907" duration="50209000" />
+      <workItem from="1503843212665" duration="9186000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="118082000" />
+    <option name="totallyTimeSpent" value="140537000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1442" y="22" width="1920" height="721" extended-state="0" />
-    <editor active="true" />
+    <frame x="1441" y="22" width="1919" 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.19169329" 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.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19445924" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917964" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32671756" sideWeight="0.5" order="1" 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.49160305" 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.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17412141" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4882943" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="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.32977098" sideWeight="0.5" order="9" 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.4" 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.41327915" 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" />
       <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" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3258786" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" 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" />
     </layout>
   </component>
@@ -893,215 +957,21 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="9" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/app/controllers/crm/customers_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="471">
-          <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
+        <state relative-caret-position="1350">
+          <caret line="75" column="50" lean-forward="true" selection-start-line="75" selection-start-column="50" selection-end-line="75" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissioners/edit.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="3" column="40" lean-forward="false" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/edit.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="4" column="23" lean-forward="false" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/new.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="5" column="18" lean-forward="false" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
-        </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="-1142">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </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="-1679">
-          <caret line="12" column="26" lean-forward="false" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
-        </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="28">
-          <caret line="68" column="0" lean-forward="false" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/home/dashboard.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="35" lean-forward="false" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/sale_edit/apply_void.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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/sale_edit/cancel_all_void.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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="35" column="35" lean-forward="false" selection-start-line="35" selection-start-column="35" selection-end-line="35" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/sale_edit/edit.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-827">
-          <caret line="8" column="36" lean-forward="false" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
-        </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="108">
-          <caret line="6" column="33" lean-forward="false" selection-start-line="6" selection-start-column="33" selection-end-line="6" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/table_invoices/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1296">
-          <caret line="72" column="8" lean-forward="false" selection-start-line="72" selection-start-column="8" selection-end-line="72" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/employee.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="2" column="25" lean-forward="false" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissioners/new.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="8" lean-forward="false" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissioners/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="9" column="82" lean-forward="false" selection-start-line="9" selection-start-column="72" selection-end-line="9" selection-end-column="82" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissioners/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="28" column="34" lean-forward="false" selection-start-line="28" selection-start-column="34" selection-end-line="28" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/product.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="1" column="29" lean-forward="false" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="26" column="57" lean-forward="false" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="73">
-          <caret line="16" column="10" lean-forward="false" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Gemfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="501">
-          <caret line="117" column="32" lean-forward="false" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
-          <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="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
-        </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="90">
-          <caret line="5" column="32" lean-forward="false" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissioners/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170823075203_create_in_juties.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="26" lean-forward="false" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170823081747_create_in_juties.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/spec/models/in_juty_spec.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/new.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1109,18 +979,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/_new_form.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="1" column="69" lean-forward="true" selection-start-line="1" selection-start-column="69" selection-end-line="1" selection-end-column="69" />
+        <state relative-caret-position="-2533">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/_crm_customer.json.jbuilder">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/in_juty.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/edit.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/transactions/sales/_form.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="27" lean-forward="true" selection-start-line="0" selection-start-column="27" selection-end-line="0" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/transactions/sales_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1458">
+          <caret line="81" column="4" lean-forward="false" selection-start-line="81" selection-start-column="4" selection-end-line="81" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <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>
@@ -1133,47 +1045,15 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissioners/_commissioners_form.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/settings/accounts/_form.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
+        <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/origami/home/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-285">
-          <caret line="64" column="18" lean-forward="false" selection-start-line="64" selection-start-column="18" selection-end-line="64" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index_bk.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="427">
-          <caret line="245" column="76" lean-forward="false" selection-start-line="245" selection-start-column="76" selection-end-line="245" selection-end-column="76" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170403161857_create_sale_items.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" column="85" lean-forward="true" selection-start-line="10" selection-start-column="85" selection-end-line="10" selection-end-column="85" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/db/migrate/20170821093252_create_commissions.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="5" column="31" lean-forward="true" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb">
+    <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" />
@@ -1181,15 +1061,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/views/home/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="345" column="8" lean-forward="true" selection-start-line="345" selection-start-column="8" selection-end-line="345" selection-end-column="8" />
+        <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/models/promotion.rb">
+    <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/views/layouts/_header.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="31" column="62" lean-forward="false" selection-start-line="31" selection-start-column="62" selection-end-line="31" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/seed_generator.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1197,174 +1093,282 @@
         </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>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/new.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>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/show.json.jbuilder">
+      <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>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/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$/db/migrate/20170331024749_create_menu_items.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="6" column="26" lean-forward="true" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170408105938_create_seed_generators.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/commissions/show.html.erb">
+      <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="54">
-          <caret line="3" column="31" lean-forward="false" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
+        <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>
+    <entry file="file://$PROJECT_DIR$/app/models/order_item.rb">
+      <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>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/new.html.erb">
+      <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>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/_form.html.erb">
+      <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>
+    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/CRM.js">
+      <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>
+    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/_form.html.erb">
+      <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>
+    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/CRM.scss">
+      <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>
     <entry file="file://$PROJECT_DIR$/app/models/commissioner.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="4" column="2" lean-forward="false" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="31" />
+        <state relative-caret-position="36">
+          <caret line="2" column="53" lean-forward="false" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/menu_item.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb">
       <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" />
+        <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/models/sale_item.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="7" column="31" lean-forward="false" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+        <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/models/sale.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="25" lean-forward="false" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
-          <folding>
-            <marker date="1503645309000" expanded="true" signature="5437:5922" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="6728:6996" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="7108:7855" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="7289:7471" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="7692:7778" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="7783:7833" ph="##..." />
-            <marker date="1503645309000" expanded="true" signature="7883:8538" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="8038:8270" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="8054:8262" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="8618:9999" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="9025:9954" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="9067:9946" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="9088:9936" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="9383:9718" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="9729:9854" ph="##..." />
-            <marker date="1503645309000" expanded="true" signature="10049:11455" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="10474:11409" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="10516:11401" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="10537:11391" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="10837:11172" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="11184:11309" ph="##..." />
-            <marker date="1503645309000" expanded="true" signature="11496:11696" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="11561:11669" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="11729:12193" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="11851:11970" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="11975:12187" ph="##..." />
-            <marker date="1503645309000" expanded="true" signature="12216:12279" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="12357:12776" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="12379:12770" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="12811:13358" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="12816:12987" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="12993:13351" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="13415:14192" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="13420:13595" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="13601:13705" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="13711:14185" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="14233:15031" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="14238:14300" ph="##..." />
-            <marker date="1503645309000" expanded="true" signature="14393:15000" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="14491:14990" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="14662:14977" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="15070:18882" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="16561:18853" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="17801:18844" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="18946:19825" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="19868:20061" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="19872:20057" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="20105:20589" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="20616:21494" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="21566:27367" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="21817:27214" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="23253:23473" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="25119:25339" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="26886:27106" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="27452:28880" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="27514:27943" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="27576:27935" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="27970:28876" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="28955:29679" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="29205:29675" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="29719:30523" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="29941:30202" ph="##..." />
-            <marker date="1503645309000" expanded="true" signature="30208:30444" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="30599:32496" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="30603:31016" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="30659:31010" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="31020:32492" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="32911:32984" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="33007:33197" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="33051:33175" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="33068:33167" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="33222:33405" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="33268:33381" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="33285:33373" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="33429:33641" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="33474:33618" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="33491:33610" ph="if ... end" />
-            <marker date="1503645309000" expanded="true" signature="33667:33853" ph=" ... end" />
-            <marker date="1503645309000" expanded="true" signature="33708:33831" ph="do ... end" />
-            <marker date="1503645309000" expanded="true" signature="33728:33822" ph="if ... end" />
-          </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="90">
-          <caret line="5" column="16" lean-forward="false" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
+        <state relative-caret-position="269">
+          <caret line="579" column="40" lean-forward="false" selection-start-line="579" selection-start-column="33" selection-end-line="579" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/origami.scss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="605">
-          <caret line="87" column="92" lean-forward="false" selection-start-line="87" selection-start-column="92" selection-end-line="87" selection-end-column="92" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/settings.scss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="174" column="74" lean-forward="false" selection-start-line="174" selection-start-column="74" selection-end-line="174" selection-end-column="74" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-          </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="356">
-          <caret line="79" column="24" lean-forward="false" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
+        <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$/db/migrate/20170823034141_create_product_commissions.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+        <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>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="165" column="52" lean-forward="false" selection-start-line="165" selection-start-column="33" selection-end-line="165" selection-end-column="52" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/config/routes.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="93" column="85" lean-forward="false" selection-start-line="93" selection-start-column="85" selection-end-line="93" selection-end-column="85" />
+        <state relative-caret-position="486">
+          <caret line="304" column="35" lean-forward="false" selection-start-line="304" selection-start-column="16" selection-end-line="304" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="76" column="12" lean-forward="true" selection-start-line="76" selection-start-column="12" selection-end-line="76" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="164">
+          <caret line="65" column="12" lean-forward="true" selection-start-line="65" selection-start-column="12" selection-end-line="65" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/reports/bksaleitem_controller.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/controllers/reports/shiftsale_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <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="180">
+          <caret line="10" column="28" lean-forward="true" selection-start-line="10" selection-start-column="28" selection-end-line="10" selection-end-column="28" />
           <folding />
         </state>
       </provider>
diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss
index ec02f7c4..e17a0f93 100644
--- a/app/assets/stylesheets/settings.scss
+++ b/app/assets/stylesheets/settings.scss
@@ -60,4 +60,31 @@ ul.dropdown-menu li a{
 
  .padding-10 {
  	padding: 10px;
- }
\ No newline at end of file
+ }
+
+/* Colors */
+.purple {
+  background-color:#7a62d3;
+}
+
+.orange{
+  background-color:#FF7F50;
+}
+
+.red {
+  background-color:#ff0000;
+}
+
+.green{
+  background-color: #009900;
+}
+
+.orange{
+  background-color: #FF8C00;
+}
+
+.blue{
+  background-color: blue;
+}
+
+/* End Colors */
\ No newline at end of file
diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index e2cba46c..2bf38113 100644
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -62,15 +62,16 @@ class Origami::ProductCommissionsController < ApplicationController
   end
 
   def set_commissioner_to_sale_item
+    # byebug
     deselect = false
     sale_item_id = params[:sale_item_id]
     commissioner_id = params[:commissioner_id]
     @sale_item = SaleItem.find(sale_item_id)
     @menu_item = MenuItem.find_by_item_code(@sale_item.product_code)
-    @commission = Commission.where('product_id = ? AND is_active = ?', @menu_item.id, true).take
+    @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.id, true).take
     @commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take
     @product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take
-    # byebug
+
     if !@product_commission.nil?
       if @product_commission.commissioner_id == @commissioner.id
         @product_commission.destroy
@@ -81,7 +82,8 @@ class Origami::ProductCommissionsController < ApplicationController
       end
     else
       @product_commission = ProductCommission.new
-      @product_commission.product_id = @menu_item.id
+      @product_commission.product_code = @menu_item.id
+      @product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type
       unless @commission.nil?
         @product_commission.commission_id = @commission.id
         if @commission.commission_type == 'Percentage'
diff --git a/app/controllers/origami/commissioners_controller.rb b/app/controllers/settings/commissioners_controller.rb
similarity index 79%
rename from app/controllers/origami/commissioners_controller.rb
rename to app/controllers/settings/commissioners_controller.rb
index 096887ce..26560c01 100644
--- a/app/controllers/origami/commissioners_controller.rb
+++ b/app/controllers/settings/commissioners_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CommissionersController < BaseOrigamiController
+class Settings::CommissionersController < ApplicationController
   before_action :set_commissioner, only: [:show, :edit, :update, :destroy]
 
   # GET /commissioners
@@ -29,7 +29,7 @@ class Origami::CommissionersController < BaseOrigamiController
     @commissioner.created_by = current_user.id
     respond_to do |format|
       if @commissioner.save
-        format.html { redirect_to  origami_commissioners_path , notice: 'Commissioner was successfully created.' }
+        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 }
@@ -43,7 +43,7 @@ class Origami::CommissionersController < BaseOrigamiController
   def update
     respond_to do |format|
       if @commissioner.update(commissioner_params)
-        format.html { redirect_to  origami_commissioner_path(@commissioner) , notice: 'Commissioner was successfully updated.' }
+        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 }
@@ -57,7 +57,7 @@ class Origami::CommissionersController < BaseOrigamiController
   def destroy
     @commissioner.destroy
     respond_to do |format|
-      format.html { redirect_to  origami_commissioners_path , notice: 'Commissioner was successfully destroyed.' }
+      format.html { redirect_to  settings_commissioners_path , notice: 'Commissioner was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -70,6 +70,6 @@ class Origami::CommissionersController < BaseOrigamiController
 
     # 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_type, :is_active)
+      params.require(:commissioner).permit(:name,:emp_id,:created_by,:commission_id,:joined_date,:resigned_date, :is_active)
     end
 end
diff --git a/app/controllers/origami/commissions_controller.rb b/app/controllers/settings/commissions_controller.rb
similarity index 81%
rename from app/controllers/origami/commissions_controller.rb
rename to app/controllers/settings/commissions_controller.rb
index db49a188..2fe85807 100644
--- a/app/controllers/origami/commissions_controller.rb
+++ b/app/controllers/settings/commissions_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CommissionsController < BaseOrigamiController
+class Settings::CommissionsController < ApplicationController
   before_action :set_commission, only: [:show, :edit, :update, :destroy]
 
   # GET /commissions
@@ -27,10 +27,11 @@ class Origami::CommissionsController < BaseOrigamiController
   # POST /commissions.json
   def create
     @commission = Commission.new(commission_params)
+    @commission.product_type = 'menu_item'
 
     respond_to do |format|
       if @commission.save
-        format.html {redirect_to origami_commissions_path, notice: 'Commission was successfully created.'}
+        format.html {redirect_to settings_commissions_path, notice: 'Commission was successfully created.'}
         format.json {render :show, status: :created, location: @commission}
       else
         format.html {render :new}
@@ -44,7 +45,7 @@ class Origami::CommissionsController < BaseOrigamiController
   def update
     respond_to do |format|
       if @commission.update(commission_params)
-        format.html {redirect_to origami_commission_path(@commission), notice: 'Commission was successfully updated.'}
+        format.html {redirect_to settings_commission_path(@commission), notice: 'Commission was successfully updated.'}
         format.json {render :show, status: :ok, location: @commission}
       else
         format.html {render :edit}
@@ -58,7 +59,7 @@ class Origami::CommissionsController < BaseOrigamiController
   def destroy
     @commission.destroy
     respond_to do |format|
-      format.html {redirect_to origami_commissions_path, notice: 'Commission was successfully destroyed.'}
+      format.html {redirect_to settings_commissions_path, notice: 'Commission was successfully destroyed.'}
       format.json {head :no_content}
     end
   end
@@ -96,6 +97,6 @@ class Origami::CommissionsController < BaseOrigamiController
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def commission_params
-    params.require(:commission).permit(:product_id, :amount, :commission_type, :is_active)
+    params.require(:commission).permit(:product_type, :product_code, :amount, :commission_type, :is_active)
   end
 end
diff --git a/app/models/commission.rb b/app/models/commission.rb
index 943bb5c1..2a724d7e 100644
--- a/app/models/commission.rb
+++ b/app/models/commission.rb
@@ -1,5 +1,5 @@
 class Commission < ApplicationRecord
-  belongs_to :menu_item, foreign_key: 'product_id'
+  belongs_to :menu_item, foreign_key: 'product_code'
   has_many :commissioners
   has_many :product_commissions
 end
diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb
index 8bec411d..17fa2036 100644
--- a/app/models/commissioner.rb
+++ b/app/models/commissioner.rb
@@ -1,6 +1,6 @@
 class Commissioner < ApplicationRecord
   belongs_to :employee, foreign_key: 'emp_id'
-  belongs_to :commission, foreign_key: 'commission_type'
+  belongs_to :commission, foreign_key: 'commission_id'
   has_many :in_juties
   has_many :product_commissions
   scope :active, -> { where(is_active: true) }
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 7b094582..cdb2d51b 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -28,8 +28,8 @@
               <li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li>
               <hr class="hr_advance" />
               <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Commissions",   origami_commissions_path  , :tabindex =>"-1" %></li>
-              <li><%= link_to "Commissioners",   origami_commissioners_path  , :tabindex =>"-1" %></li>
+              <li><%= link_to "Commissions",   settings_commissions_path  , :tabindex =>"-1" %></li>
+              <li><%= link_to "Commissioners",   settings_commissioners_path  , :tabindex =>"-1" %></li>
               <hr class="hr_advance" />
               <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
               <hr class="hr_advance" />
diff --git a/app/views/origami/commissioners/_form.html.erb b/app/views/origami/commissioners/_form.html.erb
deleted file mode 100644
index b72be528..00000000
--- a/app/views/origami/commissioners/_form.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="col-md-3">
-  <%= simple_form_for([:origami, @commissioner]) do |f| %>
-      <%= f.error_notification %>
-
-      <div class="form-inputs">
-        <%= f.input :name %>
-        <%=	f.label :emp_id %>
-        <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %><br/>
-         <%= f.label :commission_type %>
-         <%= f.select :commission_type, Commission.all.map{ |l| [l.menu_item.name, l.id] } %>
-          <br/>
-          <label><%= f.check_box :is_active %> Active </label>
-      </div><br/>
-
-
-      <div class="form-actions">
-        <%= link_to 'Back', origami_commissioners_path, class: 'btn btn-success' %>
-        <%= f.button :submit, class: 'btn btn-info' %>
-      </div>
-  <% end %>
-</div>
diff --git a/app/views/origami/commissioners/_commissioner.json.jbuilder b/app/views/settings/commissioners/_commissioner.json.jbuilder
similarity index 100%
rename from app/views/origami/commissioners/_commissioner.json.jbuilder
rename to app/views/settings/commissioners/_commissioner.json.jbuilder
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb
new file mode 100644
index 00000000..c17e59a3
--- /dev/null
+++ b/app/views/settings/commissioners/_form.html.erb
@@ -0,0 +1,22 @@
+<div class="col-md-3">
+  <%= simple_form_for([:settings, @commissioner]) do |f| %>
+      <%= f.error_notification %>
+
+      <div class="form-inputs">
+        <%= f.input :name %>
+        <%= f.label :emp_id, 'Employee' %>
+        <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
+        <br/>
+        <%= 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/>
+        <label><%= f.check_box :is_active %> Active </label>
+      </div>
+      <br/>
+
+      <div class="form-actions">
+        <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %>
+        <%= f.button :submit, class: 'btn btn-info' %>
+      </div>
+  <% end %>
+</div>
diff --git a/app/views/origami/commissioners/edit.html.erb b/app/views/settings/commissioners/edit.html.erb
similarity index 57%
rename from app/views/origami/commissioners/edit.html.erb
rename to app/views/settings/commissioners/edit.html.erb
index ea5c44cd..a495cbac 100644
--- a/app/views/origami/commissioners/edit.html.erb
+++ b/app/views/settings/commissioners/edit.html.erb
@@ -1,8 +1,8 @@
 <div class="span12">
 	<div class="page-header">
 	 <ul class="breadcrumb">
-	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%=  origami_commissioners_path  %>">Commissioners</a></li>
+	   	<li><a href="<%= settings_commissioners_path %>">Home</a></li>
+			<li><a href="<%= settings_commissioners_path  %>">Commissioners</a></li>
 	  	<li>Edit</li>
 	 </ul>
 	</div>
diff --git a/app/views/origami/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb
similarity index 65%
rename from app/views/origami/commissioners/index.html.erb
rename to app/views/settings/commissioners/index.html.erb
index dfef0320..f0229432 100644
--- a/app/views/origami/commissioners/index.html.erb
+++ b/app/views/settings/commissioners/index.html.erb
@@ -1,9 +1,9 @@
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
+    <li><a href="<%= settings_commissioners_path %>">Home</a></li>
     <li>Commissioner</li>
     <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commissioner_path, :class => 'btn btn-primary btn-sm' %>
+    <%= link_to t('.new', :default => t("helpers.links.new")), new_settings_commissioner_path, :class => 'btn btn-primary btn-sm' %>
   </span>
   </ul>
 </div>
@@ -30,9 +30,9 @@
           </td>
           <td><%= commissioner.commission.menu_item.name rescue '-' %></td>
           <td><%= commissioner.is_active %></td>
-          <td><%= link_to 'Show', origami_commissioner_path(commissioner) %></td>
-          <td><%= link_to 'Edit', edit_origami_commissioner_path(commissioner) %></td>
-          <td><%= link_to 'Destroy', origami_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+          <td><%= link_to 'Show', settings_commissioner_path(commissioner) %></td>
+          <td><%= link_to 'Edit', edit_settings_commissioner_path(commissioner) %></td>
+          <td><%= link_to 'Destroy', settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'} %></td>
         </tr>
     <% end %>
     </tbody>
diff --git a/app/views/origami/commissioners/index.json.jbuilder b/app/views/settings/commissioners/index.json.jbuilder
similarity index 100%
rename from app/views/origami/commissioners/index.json.jbuilder
rename to app/views/settings/commissioners/index.json.jbuilder
diff --git a/app/views/origami/commissioners/new.html.erb b/app/views/settings/commissioners/new.html.erb
similarity index 53%
rename from app/views/origami/commissioners/new.html.erb
rename to app/views/settings/commissioners/new.html.erb
index ea737022..cfdbbe30 100644
--- a/app/views/origami/commissioners/new.html.erb
+++ b/app/views/settings/commissioners/new.html.erb
@@ -1,8 +1,8 @@
 <div class="span12">
 	<div class="page-header">
 	 <ul class="breadcrumb">
-	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%=  origami_commissioners_path  %>">Commissioners</a></li>
+	   	<li><a href="<%= settings_commissioners_path %>">Home</a></li>
+			<li><a href="<%=  settings_commissioners_path  %>">Commissioners</a></li>
 	  	<li>New</li>
 	 </ul>
 	</div>
diff --git a/app/views/origami/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb
similarity index 67%
rename from app/views/origami/commissioners/show.html.erb
rename to app/views/settings/commissioners/show.html.erb
index 6f248764..5af55c54 100644
--- a/app/views/origami/commissioners/show.html.erb
+++ b/app/views/settings/commissioners/show.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
-    <li><a href="<%= origami_commissioners_path %>">Commissioners</a></li>
+    <li><a href="<%= settings_commissioner_path %>">Home</a></li>
+    <li><a href="<%= settings_commissioner_path %>">Commissioners</a></li>
 
     <span style="float: right">
   </span>
@@ -38,9 +38,9 @@
       </tr>
       </tbody>
     </table>
-    <%= link_to 'Back', origami_commissioners_path, class: 'btn btn-success' %>
-    <%= link_to 'Edit', edit_origami_commissioner_path(@commissioner), class: 'btn btn-info' %>
-    <%= link_to 'Destroy', origami_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
+    <%= 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>
 
diff --git a/app/views/origami/commissioners/show.json.jbuilder b/app/views/settings/commissioners/show.json.jbuilder
similarity index 100%
rename from app/views/origami/commissioners/show.json.jbuilder
rename to app/views/settings/commissioners/show.json.jbuilder
diff --git a/app/views/origami/commissions/_commission.json.jbuilder b/app/views/settings/commissions/_commission.json.jbuilder
similarity index 100%
rename from app/views/origami/commissions/_commission.json.jbuilder
rename to app/views/settings/commissions/_commission.json.jbuilder
diff --git a/app/views/origami/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb
similarity index 58%
rename from app/views/origami/commissions/_form.html.erb
rename to app/views/settings/commissions/_form.html.erb
index 5077f946..2ec9c115 100644
--- a/app/views/origami/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -1,17 +1,17 @@
 <div class="col-md-3">
-<%= simple_form_for([:origami,@commission]) do |f| %>
+<%= simple_form_for([:settings,@commission]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.label :product_id %>
-    <%= f.collection_select :product_id, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>
-    <%= f.input :amount %>
+    <%= f.label :product_code, 'Product' %>
+    <%= f.collection_select :product_code, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>
     <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
+    <%= f.input :amount %>
     <label><%= f.check_box :is_active %> Active </label>
     
   </div><br>
   <div class="form-actions">
-    <%= link_to 'Back', origami_commissions_path, class: 'btn btn-success' %>
+    <%= link_to 'Back', settings_commissions_path, class: 'btn btn-success' %>
     <%= f.button :submit, class: 'btn btn-info' %>
   </div>
 <% end %>
diff --git a/app/views/origami/commissions/edit.html.erb b/app/views/settings/commissions/edit.html.erb
similarity index 54%
rename from app/views/origami/commissions/edit.html.erb
rename to app/views/settings/commissions/edit.html.erb
index f3b72f3d..ab93e2bc 100644
--- a/app/views/origami/commissions/edit.html.erb
+++ b/app/views/settings/commissions/edit.html.erb
@@ -1,8 +1,8 @@
 <div class="span12">
 	<div class="page-header">
 	 <ul class="breadcrumb">
-	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%= origami_commissions_path   %>">Commissions</a></li>
+	   	<li><a href="<%= settings_commissions_path %>">Home</a></li>
+			<li><a href="<%= settings_commissions_path   %>">Commissions</a></li>
 	  	<li>Edit</li>
 	 </ul>
 	</div>
diff --git a/app/views/origami/commissions/index.html.erb b/app/views/settings/commissions/index.html.erb
similarity index 65%
rename from app/views/origami/commissions/index.html.erb
rename to app/views/settings/commissions/index.html.erb
index da589347..63304d2f 100644
--- a/app/views/origami/commissions/index.html.erb
+++ b/app/views/settings/commissions/index.html.erb
@@ -1,9 +1,9 @@
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
+    <li><a href="<%= settings_commissions_path %>">Home</a></li>
     <li>Commissions</li>
     <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commission_path, :class => 'btn btn-primary btn-sm' %>
+    <%= link_to t('.new', :default => t("helpers.links.new")), new_settings_commission_path, :class => 'btn btn-primary btn-sm' %>
   </span>
   </ul>
 </div>
@@ -28,9 +28,9 @@
           <td><%= commission.amount rescue '-' %></td>
           <td><%= commission.commission_type rescue '-' %></td>
           <td><%= commission.is_active rescue '-' %></td>
-          <td><%= link_to 'Show', origami_commission_path(commission) %></td>
-          <td><%= link_to 'Edit', edit_origami_commission_path(commission) %></td>
-          <td><%= link_to 'Destroy', origami_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+          <td><%= link_to 'Show', settings_commissions_path(commission) %></td>
+          <td><%= link_to 'Edit', edit_settings_commission_path(commission) %></td>
+          <td><%= link_to 'Destroy', settings_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %></td>
         </tr>
     <% end %>
     </tbody>
diff --git a/app/views/origami/commissions/index.json.jbuilder b/app/views/settings/commissions/index.json.jbuilder
similarity index 100%
rename from app/views/origami/commissions/index.json.jbuilder
rename to app/views/settings/commissions/index.json.jbuilder
diff --git a/app/views/origami/commissions/load_commissioners.html.erb b/app/views/settings/commissions/load_commissioners.html.erb
similarity index 100%
rename from app/views/origami/commissions/load_commissioners.html.erb
rename to app/views/settings/commissions/load_commissioners.html.erb
diff --git a/app/views/origami/commissions/new.html.erb b/app/views/settings/commissions/new.html.erb
similarity index 54%
rename from app/views/origami/commissions/new.html.erb
rename to app/views/settings/commissions/new.html.erb
index a13c8cb3..35560940 100644
--- a/app/views/origami/commissions/new.html.erb
+++ b/app/views/settings/commissions/new.html.erb
@@ -1,8 +1,8 @@
 <div class="span12">
   <div class="page-header">
     <ul class="breadcrumb">
-      <li><a href="<%= origami_root_path %>">Home</a></li>
-      <li><a href="<%= origami_commissions_path %>">Commissions</a></li>
+      <li><a href="<%= settings_commissions_path %>">Home</a></li>
+      <li><a href="<%= settings_commissions_path %>">Commissions</a></li>
       <li>New</li>
     </ul>
   </div>
diff --git a/app/views/origami/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb
similarity index 63%
rename from app/views/origami/commissions/show.html.erb
rename to app/views/settings/commissions/show.html.erb
index 439e2c45..557c7465 100644
--- a/app/views/origami/commissions/show.html.erb
+++ b/app/views/settings/commissions/show.html.erb
@@ -2,8 +2,8 @@
 
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
-    <li><a href="<%= origami_commissions_path %>">Commissions</a></li>
+    <li><a href="<%= settings_commissions_path %>">Home</a></li>
+    <li><a href="<%= settings_commissions_path %>">Commissions</a></li>
 
     <span style="float: right">
   </span>
@@ -32,9 +32,9 @@
       </tr>
       </tbody>
     </table>
-    <%=	 link_to 'Back', origami_commissions_path, class: 'btn btn-success' %>
-    <%= link_to 'Edit', edit_origami_commission_path(@commission), class: 'btn btn-info' %>
-    <%= link_to 'Destroy', origami_commission_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %>
+    <%=	 link_to 'Back', settings_commissions_path, class: 'btn btn-success' %>
+    <%= link_to 'Edit', edit_settings_commission_path(@commission), class: 'btn btn-info' %>
+    <%= link_to 'Destroy', settings_commissions_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %>
   </div>
 </div>
 
diff --git a/app/views/origami/commissions/show.json.jbuilder b/app/views/settings/commissions/show.json.jbuilder
similarity index 100%
rename from app/views/origami/commissions/show.json.jbuilder
rename to app/views/settings/commissions/show.json.jbuilder
diff --git a/config/routes.rb b/config/routes.rb
index 83e7c150..17c315b7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,10 +11,10 @@ Rails.application.routes.draw do
 
   #--------- SmartSales Installation ------------#
   get 'install' => 'install#index'
-  post 'install' =>  'install#create'
+  post 'install' => 'install#create'
 
   #--------- Login/Authentication ------------#
-  get 'auth/:emp_id' => 'home#show' , as: :emp_login
+  get 'auth/:emp_id' => 'home#show', as: :emp_login
   patch "auth/:emp_id" => 'home#update', as: :emp_login_update
 
   post 'login' => 'home#create'
@@ -23,14 +23,14 @@ Rails.application.routes.draw do
 
 
   #--------- API Routes ------------#
-  namespace :api,  :defaults => { :format => 'json' } do
+  namespace :api, :defaults => {:format => 'json'} do
     #Session Login and Logout
-    post   'authenticate' => "authenticate#create"
+    post 'authenticate' => "authenticate#create"
     delete 'authenticate' => "authenticate#destroy"
 
     namespace :restaurant do
       get 'zones' => "zones#index"
-      resources :menu, only:[:index, :show]
+      resources :menu, only: [:index, :show]
       resources :menu_categories, only: [:index, :show]
       resources :menu_items, only: [:index, :show]
       resources :menu_item_attributes, only: [:index]
@@ -57,10 +57,10 @@ Rails.application.routes.draw do
     get "customers/get_order/:id" => "customers#get_customer_order"
 
     #Generating Invoice and making payments - output render @sale
-    resources :invoices, only: [:index, :show, :create, :update, :destroy ] do
-      resources :sale_items, only:[:create, :update, :destroy]
+    resources :invoices, only: [:index, :show, :create, :update, :destroy] do
+      resources :sale_items, only: [:create, :update, :destroy]
       resources :discounts, only: [:create, :update, :destroy]
-      resources :memberships, only:[:create]
+      resources :memberships, only: [:create]
       post "payment/:payment_method" => "payment#create"
       put "payment/:id" => "payment#update"
       resources :receipt, only: [:create, :show] #generate receipt, show receipt
@@ -72,8 +72,8 @@ Rails.application.routes.draw do
 
   #--------- Cashier ------------#
   namespace :origami do
-    resources :cash_ins, only:[:new, :create]
-    resources :cash_outs, only:[:new, :create]
+    resources :cash_ins, only: [:new, :create]
+    resources :cash_outs, only: [:new, :create]
     root "home#index"
     get "table/:dining_id" => "home#show" do #origami/:booking_id will show
       # resources :discounts, only: [:index,:new, :create ] #add discount type
@@ -87,16 +87,11 @@ Rails.application.routes.draw do
     post 'item_void_cancel' => "sale_edit#item_void_cancel"
     post 'cancel_all_void' => 'sale_edit#cancel_all_void'
     post 'apply_void' => 'sale_edit#apply_void'
-    # commissions
-    get '/table/:table_id/sale/:sale_id/load_commissioners' => 'commissions#load_commissioners', as: 'load_commissioners'
-    post 'select_sale_item' => 'commissions#select_sale_item'
-    # product_commission
-    post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item'
     # in_juties
     get '/table/:table_id/assign_in_juty' => 'in_juties#assign_in_juty', as: 'assign_in_juty'
     post 'assign_in_juty' => 'in_juties#create_for_in_juty', as: 'create_for_in_juty'
     get 'assign_in_juty/:table_id' => 'in_juties#index_in_juty', as: 'index_in_juty'
-    get 'table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty'
+    get 'table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty', as: 'edit_in_juty'
     put '/edit_in_juty/:id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty'
     delete 'table/:table_id/destroy_in_juty/:id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty'
 
@@ -122,8 +117,8 @@ Rails.application.routes.draw do
     # Discount for Member
     post "/:id/member_discount" => "discounts#member_discount"
 
-    get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
-    get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
+    get "/:id/request_bills" => "request_bills#print", :as => "request_bill"
+    get '/:sale_id/reprint' => 'payments#reprint', :defaults => {:format => 'json'}
 
     #---------Shift ---------------#
     resources :shifts, only: [:index, :new, :create, :edit]
@@ -141,11 +136,11 @@ Rails.application.routes.draw do
     #payment - Outing payments - Cash only [ *Misc expeness tracking]
 
     #--------- Payment ------------#
-    post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj',:as => "calculate_rouding_adjs"
-    get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
+    post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj', :as => "calculate_rouding_adjs"
+    get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => {:format => 'json'}
     get 'sale/:sale_id/payment' => 'payments#show'
 
-    post 'payment/foc' => 'payments#foc', :defaults => { :format => 'json' }
+    post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
@@ -168,43 +163,41 @@ Rails.application.routes.draw do
     post 'sale/:sale_id/void' => 'void#overall_void'
 
     #---------Multiple Invoices --------------#
-    get 'table/:table_id/table_invoices' => "table_invoices#index" , :as => "table_invoice_index"
-    get 'table/:table_id/table_invoice/:invoice_id' => "table_invoices#show" , :as => "table_invoice_show"
-    get 'room/:room_id/room_invoices' => "room_invoices#index" , :as => "room_invoice_index"
-    get 'room/:room_id/room_invoice/:invoice_id' => "room_invoices#show" , :as => "room_invoice_show"
+    get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
+    get 'table/:table_id/table_invoice/:invoice_id' => "table_invoices#show", :as => "table_invoice_show"
+    get 'room/:room_id/room_invoices' => "room_invoices#index", :as => "room_invoice_index"
+    get 'room/:room_id/room_invoice/:invoice_id' => "room_invoices#show", :as => "room_invoice_show"
 
     #---------Add Customer --------------#
     #resources :customers
     get '/:sale_id/customers', to: "customers#add_customer"
-    get '/:customer_id/get_customer' => 'home#get_customer',:as => "show_customer_details"
-    post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer" # update customer id in sale table
+    get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
+    post '/:sale_id/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 
     resources :addorders
-    resources :commissions
-    resources :commissioners
     resources :in_juties
   end
 
   #--------- Waiter/Ordering Station ------------#
   namespace :oishi do
-      #zones
-      #tables
-      #orders
+    #zones
+    #tables
+    #orders
   end
 
   #--------- Customer Relationship Management ------------#
   namespace :crm do
-      root "home#index"
-      resources :customers
-      resources :dining_queues
-      post "update_booking" , to: "bookings#update_booking", as: "update_booking"#assign and cancel
-      get '/print/:id', to: "home#print_order"#print order for crm
+    root "home#index"
+    resources :customers
+    resources :dining_queues
+    post "update_booking", to: "bookings#update_booking", as: "update_booking" #assign and cancel
+    get '/print/:id', to: "home#print_order" #print order for crm
 
-      get "/dining_queues/:id/assign"    =>"dining_queues#assign", :as => "assign"
-      post "/dining_queues/assign_table" =>"dining_queues#assign_table", :as => "assign_table"
-      post "/dining_queues/cancel_queue" =>"dining_queues#cancel_queue", :as => "cancel_queue"
+    get "/dining_queues/:id/assign" => "dining_queues#assign", :as => "assign"
+    post "/dining_queues/assign_table" => "dining_queues#assign_table", :as => "assign_table"
+    post "/dining_queues/cancel_queue" => "dining_queues#cancel_queue", :as => "cancel_queue"
 
   end
 
@@ -223,7 +216,7 @@ Rails.application.routes.draw do
     get 'print/print/:id', to: "print#print"
     get 'print/print_order_summary/:id', to: "print#print_order_summary"
 
-    get "/get_items/:id" =>"home#get_items_by_oqs", :as => "get_order_items_by_oqs"
+    get "/get_items/:id" => "home#get_items_by_oqs", :as => "get_order_items_by_oqs"
     #dashboard
     #
   end
@@ -235,7 +228,7 @@ Rails.application.routes.draw do
     #menu
     resources :menus do
       #menu_categories
-      resources :menu_categories, only: [:new, :create, :edit,:delete]
+      resources :menu_categories, only: [:new, :create, :edit, :delete]
     end
 
     resources :item_sets
@@ -299,16 +292,26 @@ Rails.application.routes.draw do
       resources :promotion_products
     end
 
+    # commission
+    resources :commissions
+    resources :commissioners
+
   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
     resources :orders
     resources :credit_notes
 
-    get "/sales/:sale_id/manual_complete_sale" =>"manual_sales#manual_complete_sale", :as => "manual_complete_sale"
-    get "/sales/:sale_id/void" =>"manual_sales#void", :as => "void"
+    get "/sales/:sale_id/manual_complete_sale" => "manual_sales#manual_complete_sale", :as => "manual_complete_sale"
+    get "/sales/:sale_id/void" => "manual_sales#void", :as => "void"
     post "sales/:sale_id/manual_void_sale", to: "manual_sales#manual_void_sale", :as => "manual_void_sale"
   end
 
diff --git a/db/migrate/20170818090115_create_commissioners.rb b/db/migrate/20170818090115_create_commissioners.rb
deleted file mode 100644
index b8c4bca3..00000000
--- a/db/migrate/20170818090115_create_commissioners.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateCommissioners < ActiveRecord::Migration[5.1]
-  def change
-    create_table :commissioners do |t|
-      t.string :name, :null => false
-      t.string :emp_id
-      t.string :created_by
-      t.string :commission_type
-      t.boolean :is_active
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20170823034141_create_product_commissions.rb b/db/migrate/20170823034141_create_product_commissions.rb
deleted file mode 100644
index cb0e5a3f..00000000
--- a/db/migrate/20170823034141_create_product_commissions.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class CreateProductCommissions < ActiveRecord::Migration[5.1]
-  # rake db:migrate:down VERSION=20170823034141
-  def change
-    create_table :product_commissions do |t|
-      t.string :product_id
-      t.integer :commission_id
-      t.integer :commissioner_id
-      t.decimal :qty, :precision => 10, :scale => 2, :default => 0.00
-      t.string :sale_id
-      t.string :sale_item_id
-      t.decimal :price, :precision => 10, :scale => 2, :default => 0.00
-      t.decimal :amount, :precision => 10, :scale => 2, :default => 0.00
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20170825034141_create_product_commissions.rb b/db/migrate/20170825034141_create_product_commissions.rb
new file mode 100644
index 00000000..d8686b69
--- /dev/null
+++ b/db/migrate/20170825034141_create_product_commissions.rb
@@ -0,0 +1,17 @@
+class CreateProductCommissions < ActiveRecord::Migration[5.1]
+  # rake db:migrate:down VERSION=20170825034141
+  def change
+    create_table :product_commissions do |t|
+      t.string :product_type
+      t.string :product_code
+      t.integer :commission_id
+      t.integer :commissioner_id
+      t.decimal :qty, precision: 10, scale: 2, default: 0.00
+      t.string :sale_id
+      t.string :sale_item_id
+      t.decimal :price, precision: 10, scale: 2, default: 0.00
+      t.decimal :amount, precision: 10, scale: 2, default: 0.00
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170825090115_create_commissioners.rb b/db/migrate/20170825090115_create_commissioners.rb
new file mode 100644
index 00000000..fe32a35a
--- /dev/null
+++ b/db/migrate/20170825090115_create_commissioners.rb
@@ -0,0 +1,15 @@
+class CreateCommissioners < ActiveRecord::Migration[5.1]
+  # rake db:migrate:down VERSION=20170825090115
+  def change
+    create_table :commissioners do |t|
+      t.string :name
+      t.string :emp_id
+      t.string :created_by
+      t.integer :commission_id
+      t.datetime :joined_date
+      t.datetime :resigned_date
+      t.boolean :is_active, default: true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170821093252_create_commissions.rb b/db/migrate/20170825093252_create_commissions.rb
similarity index 57%
rename from db/migrate/20170821093252_create_commissions.rb
rename to db/migrate/20170825093252_create_commissions.rb
index ebd7d8dd..74706f3a 100644
--- a/db/migrate/20170821093252_create_commissions.rb
+++ b/db/migrate/20170825093252_create_commissions.rb
@@ -1,10 +1,12 @@
 class CreateCommissions < ActiveRecord::Migration[5.1]
+  # rake db:migrate:down VERSION=20170825093252
   def change
     create_table :commissions do |t|
-      t.integer :product_id, null: false
-      t.integer :amount
+      t.string :product_type
+      t.string :product_code
       t.string :commission_type
-      t.boolean :is_active
+      t.integer :amount
+      t.boolean :is_active, default: true
       t.timestamps
     end
   end