Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

2017-08-25 18:49:02 +06:30
parent 57d668d122 ef9fe32b5b
commit 61817ce178
16 changed files with 680 additions and 425 deletions
--- a/.idea/sxrestaurant.iml
+++ b/.idea/sxrestaurant.iml
@@ -11,106 +11,6 @@
  </component>
  <component name="ModuleRunConfigurationManager">
    <shared />
    <local>
      <configuration default="false" name="test: 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)" />
        <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="test" />
        </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="test" />
        <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
        <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />
        <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" />
        <method />
      </configuration>
      <configuration default="false" 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)" />
        <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 />
        <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="spec" />
        <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
        <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />
        <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" />
        <method />
      </configuration>
      <configuration default="false" name="Production: sxrestaurant" type="RailsRunConfigurationType" factoryName="Rails">
        <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
        <module name="sxrestaurant" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
        <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="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>
        <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="DUMMY_APP" VALUE="test/dummy" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
        <method />
      </configuration>
      <configuration default="false" name="Development: sxrestaurant" type="RailsRunConfigurationType" factoryName="Rails">
        <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
        <module name="sxrestaurant" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
        <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="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>
        <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="DUMMY_APP" VALUE="test/dummy" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
        <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
        <method />
      </configuration>
    </local>
  </component>
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$">
@@ -164,6 +64,7 @@
    <orderEntry type="library" scope="PROVIDED" name="httparty (v0.15.5, rbenv: 2.3.3) [gem]" level="application" />
    <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.6, rbenv: 2.3.3) [gem]" level="application" />
    <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.7.0, rbenv: 2.3.3) [gem]" level="application" />
    <orderEntry type="library" scope="PROVIDED" name="jquery-datetimepicker-rails (v2.4.1.0, rbenv: 2.3.3) [gem]" level="application" />
    <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.3.1, rbenv: 2.3.3) [gem]" level="application" />
    <orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v6.0.1, rbenv: 2.3.3) [gem]" level="application" />
    <orderEntry type="library" scope="PROVIDED" name="kaminari (v1.0.1, rbenv: 2.3.3) [gem]" level="application" />
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,122 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissioners/_commissioners_form.html.erb" afterPath="" />
+      <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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb" />
+      <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/views/origami/commissions/load_commissioners.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.html.erb" />
+      <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$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
    </list>
    <ignored path="$PROJECT_DIR$/.bundle/" />
    <ignored path="$PROJECT_DIR$/components/" />
@@ -20,26 +131,16 @@
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="load_commissioners.html.erb" pinned="false" current-in-tab="true">
+      <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">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
+            <state relative-caret-position="353">
-              <caret line="212" column="33" lean-forward="false" selection-start-line="212" selection-start-column="33" selection-end-line="212" selection-end-column="33" />
+              <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 />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="_commissioners.html.erb" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="90">
              <caret line="5" column="44" lean-forward="false" selection-start-line="5" selection-start-column="44" selection-end-line="5" selection-end-column="44" />
              <folding>
-                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+                <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>
@@ -48,28 +149,169 @@
      <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="191">
+            <state relative-caret-position="605">
-              <caret line="78" column="0" lean-forward="true" selection-start-line="78" selection-start-column="0" selection-end-line="78" selection-end-column="0" />
+              <caret line="87" column="92" lean-forward="false" selection-start-line="87" selection-start-column="92" selection-end-line="87" selection-end-column="92" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
+      <file leaf-file-name="product_commissions_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb">
+        <entry file="file://$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-436">
+            <state relative-caret-position="356">
-              <caret line="64" column="18" lean-forward="false" selection-start-line="64" selection-start-column="18" selection-end-line="64" selection-end-column="18" />
+              <caret line="79" column="24" lean-forward="false" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
+      <file leaf-file-name="20170823034141_create_product_commissions.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
+        <entry file="file://$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="469">
+            <state relative-caret-position="288">
-              <caret line="334" column="12" lean-forward="false" selection-start-line="334" selection-start-column="12" selection-end-line="334" selection-end-column="12" />
+              <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="routes.rb" pinned="false" current-in-tab="true">
        <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" />
              <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">
          <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" />
              <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">
          <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" />
              <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">
          <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>
      </file>
      <file leaf-file-name="sale_item.rb" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/app/models/sale_item.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" />
              <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">
          <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>
@@ -92,6 +334,8 @@
      <find>sale_edit#edit</find>
      <find>@saleobj</find>
      <find>edit</find>
      <find>sale_item</find>
      <find>commissioner</find>
    </findStrings>
  </component>
  <component name="Git.Settings">
@@ -100,12 +344,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb" />
        <option value="$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb" />
        <option value="$PROJECT_DIR$/app/controllers/origami/void_controller.rb" />
        <option value="$PROJECT_DIR$/app/controllers/origami/home_controller.rb" />
        <option value="$PROJECT_DIR$/app/views/origami/payments/show.html.erb" />
        <option value="$PROJECT_DIR$/app/views/origami/home/index.html.erb" />
        <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" />
@@ -116,26 +354,21 @@
        <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$/app/models/sale.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$/db/migrate/20170822034139_create_product_commissions.rb" />
        <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/models/commissioner.rb" />
        <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/commission.rb" />
        <option value="$PROJECT_DIR$/app/models/product.rb" />
        <option value="$PROJECT_DIR$/app/models/menu_item.rb" />
        <option value="$PROJECT_DIR$/app/views/origami/commissions/_form.html.erb" />
        <option value="$PROJECT_DIR$/app/views/origami/commissions/index.html.erb" />
        <option value="$PROJECT_DIR$/app/views/origami/commissions/show.html.erb" />
@@ -145,12 +378,23 @@
        <option value="$PROJECT_DIR$/app/views/origami/commissioners/index.html.erb" />
        <option value="$PROJECT_DIR$/db/migrate/20170823075203_create_in_juties.rb" />
        <option value="$PROJECT_DIR$/db/migrate/20170823081747_create_in_juties.rb" />
        <option value="$PROJECT_DIR$/config/routes.rb" />
        <option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
        <option value="$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb" />
        <option value="$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb" />
        <option value="$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
        <option value="$PROJECT_DIR$/app/views/origami/home/index_bk.html.erb" />
        <option value="$PROJECT_DIR$/db/migrate/20170822034139_create_product_commissions.rb" />
        <option value="$PROJECT_DIR$/db/migrate/20170823034140_create_product_commissions.rb" />
        <option value="$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb" />
        <option value="$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb" />
        <option value="$PROJECT_DIR$/app/models/product_commission.rb" />
        <option value="$PROJECT_DIR$/app/models/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$/config/routes.rb" />
      </list>
    </option>
  </component>
@@ -211,6 +455,12 @@
              <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="models" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
@@ -605,24 +855,26 @@
      <workItem from="1503328001970" duration="20307000" />
      <workItem from="1503406983258" duration="261000" />
      <workItem from="1503457057830" duration="7166000" />
-      <workItem from="1503472116907" duration="9446000" />
+      <workItem from="1503472116907" duration="36940000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="90588000" />
+    <option name="totallyTimeSpent" value="118082000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="1442" y="22" width="1920" height="721" extended-state="0" />
    <editor active="true" />
    <layout>
      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.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="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="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.49160305" sideWeight="0.5" order="7" 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="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.33" 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.32977098" 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="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" />
@@ -631,7 +883,6 @@
      <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.3277439" 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>
@@ -646,50 +897,6 @@
    <watches-manager />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="303">
          <caret line="269" column="45" lean-forward="false" selection-start-line="269" selection-start-column="45" selection-end-line="269" selection-end-column="45" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/db/migrate/20170403155230_create_employees.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="270">
          <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/db/migrate/20170818090115_create_commissioners.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="126">
          <caret line="7" column="26" lean-forward="true" selection-start-line="3" selection-start-column="6" selection-end-line="7" selection-end-column="26" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/models/cashier_terminal.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" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/controllers/origami/cash_outs_controller.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="57" lean-forward="false" selection-start-line="0" selection-start-column="36" selection-end-line="0" selection-end-column="57" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/models/booking_order.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" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/.gitignore">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="471">
@@ -747,14 +954,6 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/db/migrate/20170822034139_create_product_commissions.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="108">
          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
          <folding />
        </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">
@@ -801,6 +1000,7 @@
      <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>
@@ -822,13 +1022,6 @@
      <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" />
        </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>
@@ -840,14 +1033,6 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/models/menu_item.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="68">
          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
          <folding />
        </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">
@@ -873,6 +1058,7 @@
      <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>
@@ -887,13 +1073,7 @@
      <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" />
-        </state>
+          <folding />
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/models/commission.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="18">
          <caret line="1" column="50" lean-forward="true" selection-start-line="1" selection-start-column="50" selection-end-line="1" selection-end-column="50" />
        </state>
      </provider>
    </entry>
@@ -901,13 +1081,6 @@
      <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" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/models/commissioner.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="90">
          <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
          <folding />
        </state>
      </provider>
@@ -936,14 +1109,6 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/config/routes.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="410">
          <caret line="176" column="15" lean-forward="false" selection-start-line="176" selection-start-column="15" selection-end-line="176" selection-end-column="15" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="18">
@@ -976,23 +1141,39 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/controllers/origami/commissions_controller.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="191">
          <caret line="78" column="0" lean-forward="true" selection-start-line="78" selection-start-column="0" selection-end-line="78" selection-end-column="0" />
          <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="-436">
+        <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">
      <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" />
@@ -1002,26 +1183,188 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="469">
+        <state relative-caret-position="80">
-          <caret line="334" column="12" lean-forward="false" selection-start-line="334" selection-start-column="12" selection-end-line="334" selection-end-column="12" />
+          <caret line="345" column="8" lean-forward="true" selection-start-line="345" selection-start-column="8" selection-end-line="345" selection-end-column="8" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb">
+    <entry file="file://$PROJECT_DIR$/app/models/promotion.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/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" />
          <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" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/models/menu_item.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/models/sale_item.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" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="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="44" lean-forward="false" selection-start-line="5" selection-start-column="44" selection-end-line="5" selection-end-column="44" />
+          <caret line="5" column="16" lean-forward="false" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
-          <folding>
+          <folding />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+        </state>
-          </folding>
+      </provider>
    </entry>
    <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" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/views/origami/commissions/load_commissioners.html.erb">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="353">
-          <caret line="212" column="33" lean-forward="false" selection-start-line="212" selection-start-column="33" selection-end-line="212" selection-end-column="33" />
+          <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" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb">
      <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" />
          <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" />
          <folding />
        </state>
      </provider>
--- a/app/controllers/origami/commissions_controller.rb
+++ b/app/controllers/origami/commissions_controller.rb
@@ -74,13 +74,18 @@ class Origami::CommissionsController < BaseOrigamiController
  def select_sale_item
    # byebug
    sale_item_id = params[:sale_item_id]
-    @sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
+    @selected_sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
    @product_commission = ProductCommission.find_by_sale_item_id(@selected_sale_item.id)
    unless @product_commission.nil?
      selected_commissioner = @product_commission.commissioner
    end
    @commissioners = Commissioner.active.all
-    respond_to do |format|
+    # respond_to do |format|
-      format.json {render json: @commissioners}
+    #   format.json {render json: {[@commissioners],[@selected_sale_item]}}
-      # format.html {render @commissioners}
+    #   # format.html {render @commissioners}
-    end
+    # end
    render json: {commissioner: @commissioners, selected_commissioner: selected_commissioner}
  end
  private
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -28,11 +28,11 @@ class Origami::ProductCommissionsController < ApplicationController
    respond_to do |format|
      if @product_commission.save
-        format.html { redirect_to @product_commission, notice: 'Product commission was successfully created.' }
+        format.html {redirect_to @product_commission, notice: 'Product commission was successfully created.'}
-        format.json { render :show, status: :created, location: @product_commission }
+        format.json {render :show, status: :created, location: @product_commission}
      else
-        format.html { render :new }
+        format.html {render :new}
-        format.json { render json: @product_commission.errors, status: :unprocessable_entity }
+        format.json {render json: @product_commission.errors, status: :unprocessable_entity}
      end
    end
  end
@@ -42,11 +42,11 @@ class Origami::ProductCommissionsController < ApplicationController
  def update
    respond_to do |format|
      if @product_commission.update(product_commission_params)
-        format.html { redirect_to @product_commission, notice: 'Product commission was successfully updated.' }
+        format.html {redirect_to @product_commission, notice: 'Product commission was successfully updated.'}
-        format.json { render :show, status: :ok, location: @product_commission }
+        format.json {render :show, status: :ok, location: @product_commission}
      else
-        format.html { render :edit }
+        format.html {render :edit}
-        format.json { render json: @product_commission.errors, status: :unprocessable_entity }
+        format.json {render json: @product_commission.errors, status: :unprocessable_entity}
      end
    end
  end
@@ -56,19 +56,62 @@ class Origami::ProductCommissionsController < ApplicationController
  def destroy
    @product_commission.destroy
    respond_to do |format|
-      format.html { redirect_to product_commissions_url, notice: 'Product commission was successfully destroyed.' }
+      format.html {redirect_to product_commissions_url, notice: 'Product commission was successfully destroyed.'}
-      format.json { head :no_content }
+      format.json {head :no_content}
    end
  end
  def set_commissioner_to_sale_item
    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
    @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
        deselect = true
      else
        @product_commission.commissioner_id = @commissioner.id
        deselect = false
      end
    else
      @product_commission = ProductCommission.new
      @product_commission.product_id = @menu_item.id
      unless @commission.nil?
        @product_commission.commission_id = @commission.id
        if @commission.commission_type == 'Percentage'
          @product_commission.price = @sale_item.unit_price * (@commission.amount / 100.0)
          @product_commission.amount = @product_commission.price * @sale_item.qty
        elsif @commission.commission_type == 'Net Amount'
          @product_commission.price = @commission.amount
          @product_commission.amount = @product_commission.price * @sale_item.qty
        end
      end
      @product_commission.commissioner_id = @commissioner.id
      @product_commission.qty = @sale_item.qty
      @product_commission.sale_id = @sale_item.sale_id
      @product_commission.sale_item_id = @sale_item.sale_item_id
    end
    if @product_commission.save
      render json: {status: true, deselect: deselect}
    else
      render json: {status: false, deselect: deselect}
    end
  end
  private
-    # Use callbacks to share common setup or constraints between actions.
+  # Use callbacks to share common setup or constraints between actions.
-    def set_product_commission
+  def set_product_commission
-      @product_commission = ProductCommission.find(params[:id])
+    @product_commission = ProductCommission.find(params[:id])
-    end
+  end
-    # Never trust parameters from the scary internet, only allow the white list through.
+  # Never trust parameters from the scary internet, only allow the white list through.
-    def product_commission_params
+  def product_commission_params
-      params.fetch(:product_commission, {})
+    params.fetch(:product_commission, {})
-    end
+  end
 end
--- a/app/models/commission.rb
+++ b/app/models/commission.rb
@@ -1,4 +1,5 @@
 class Commission < ApplicationRecord
  belongs_to :menu_item, foreign_key: 'product_id'
  has_many :commissioners
  has_many :product_commissions
 end
--- a/app/models/commissioner.rb
+++ b/app/models/commissioner.rb
@@ -2,5 +2,6 @@ class Commissioner < ApplicationRecord
  belongs_to :employee, foreign_key: 'emp_id'
  belongs_to :commission, foreign_key: 'commission_type'
  has_many :in_juties
  has_many :product_commissions
  scope :active, -> { where(is_active: true) }
 end
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -4,6 +4,7 @@ class MenuItem < ApplicationRecord
  belongs_to :menu_category, :optional => true
  has_many :menu_item_instances
  has_many :commissions
  has_many :product_commissions
  # belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true
  # has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id"
--- a/app/models/product_commission.rb
+++ b/app/models/product_commission.rb
@@ -1,2 +1,11 @@
 class ProductCommission < ApplicationRecord
  belongs_to :commission, foreign_key: 'commission_id'
  belongs_to :commissioner, foreign_key: 'commissioner_id'
  belongs_to :menu_item, foreign_key: 'product_id'
  belongs_to :sale_item, foreign_key: 'sale_item_id'
  belongs_to :sale, foreign_key: 'sale_id'
  def self.check_product_commission(sale_item_id)
  end
 end
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -13,6 +13,7 @@ class Sale < ApplicationRecord
  has_many :sale_payments
  has_many :sale_orders
  has_many :bookings
  has_many :product_commissions
  scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
  scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") }
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -5,6 +5,7 @@ class SaleItem < ApplicationRecord
  before_create :generate_custom_id
  belongs_to :sale
  has_many :product_commissions
  #compute items - discount, tax, price_change
  def compute_item
@@ -80,7 +81,7 @@ class SaleItem < ApplicationRecord
          account_price[:amount] = account_price[:amount] + si.price
           price = price + si.price
        end
-       
+
      end
      rebate_arr.push(account_price)
    end
--- a/app/views/origami/commissions/_commissioners.html.erb
+++ b/app/views/origami/commissions/_commissioners.html.erb
@@ -1,16 +0,0 @@
 <div class="card">
  <div class="card-header">
    <div><strong id="order-title">COMMISSIONERS </strong></div>
  </div>
  <div class="card-block">
    <div class="card-columns" id="commissioners" style="float: left; padding-top:10px; column-gap: 1.2rem; min-height:600px; max-height:600px; overflow-x:scroll;">
      <% @commissioners.each do |commissioner| %>
          <div class="card tables green text-white" data-id="<%= commissioner.id %>">
            <div class="card-block">
              <%= commissioner.name %>
            </div>
          </div>
      <% end %>
    </div>
  </div>
 </div>
--- a/app/views/origami/commissions/load_commissioners.html.erb
+++ b/app/views/origami/commissions/load_commissioners.html.erb
@@ -1,11 +1,26 @@
 <div class="row">
  <!-- Column One -->
  <div class="col-lg-5 col-md-5 col-sm-5" style="height: 100%">
-    <%= render 'origami/commissions/commissioners', commissioners: @commissioners %>
+    <div class="card">
      <div class="card-header">
        <div><strong id="order-title">COMMISSIONERS </strong></div>
      </div>
      <div class="card-block">
        <div class="card-columns" id="commissioners" style="float: left; padding-top:10px; column-gap: 1.2rem; min-height:600px; max-height:600px; overflow-x:scroll;">
          <% @commissioners.each do |commissioner| %>
              <div class="card tables green text-white commissioner" data-commissioner-id="<%= commissioner.id %>" data-commissioner-name="<%= commissioner.name %>">
                <div class="card-block">
                  <%= commissioner.name %>
                </div>
              </div>
          <% end %>
        </div>
      </div>
    </div>
  </div>
  <!-- Column Two -->
-  <div class="col-lg-5 col-md-5 col-sm-5">
+  <div class="col-lg-6 col-md-6 col-sm-6">
    <div class="card">
      <div class="card-header">
        <div><strong id="order-title">INVOICE DETAILS </strong></div>
@@ -34,11 +49,10 @@
            <thead>
            <tr>
              <th width="4%">#</th>
-              <th class="" width="60%">Items</th>
+              <th class="" width="40%">Items</th>
-              <th style="" width="20%">QTY
+              <th style="" width="20%">QTY</th>
-              </td>
+              <th class="" width="20%">Price</th>
-              <th class="" width="30%">Price
+              <th class="" width="20%">Commissioner</th>
              </td>
            </tr>
            </thead>
            <tbody>
@@ -49,22 +63,26 @@
                count += 1
                sub_total = sub_total + sale_item.price
            %>
-                <input type="hidden" id="sale_id" value="<%= @saleobj.sale_id %>">
+                <input type="hidden" id="sale_id" class="sale_id" value="<%= @saleobj.sale_id %>">
                <%
                  # Can't check for discount
                  unless sale_item.price == 0
                %>
-                    <tr id="sale_item" data-sale-item="<%= sale_item.sale_item_id %>">
+                    <tr id="sale_item" class="sale_item" data-sale-item="<%= sale_item.sale_item_id %>">
                      <td width="4%"><%= count %></td>
-                      <td class='' width="60%">
+                      <td class='product_name' width="40%">
                        <%= sale_item.product_name %>
                      </td>
-                      <td class='' width="20%">
+                      <td class='qty' width="20%">
                        <%= sale_item.qty %>
                      </td>
-                      <td class='' width="20%">
+                      <td class='unit_price' width="20%">
                        <%= sale_item.unit_price %>
                      </td>
                      <td class='commissioner' width="20%">
                        <% product_commission = ProductCommission.find_by_sale_item_id(sale_item.id) %>
                        <%= product_commission.commissioner.name rescue '-' %>
                      </td>
                    </tr>
                <%
                  end
@@ -87,135 +105,78 @@
  </div>
  <!-- Column Three -->
-  <div class="col-lg-2 col-md-2 col-sm-2">
+  <div class="col-lg-1 col-md-1 col-sm-1">
    <!-- Waiter Buttons -->
    <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
-    <button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>
+    <!--<button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>-->
  </div>
 </div>
 <script>
    // Bill Request
    $(document).ready(function () {
        var selected_sale_item = 0;
-        $(".update").on('click', function () {
+        $('.sale_item').on('click', function () {
-            var sale_item_id = $(this).attr('data-id');
+            $('#order-items-table tr').siblings().css( "background-color", "white" );
-            var qty = $('#' + sale_item_id + "_qty").val();
+            this.style.backgroundColor = 'lightgray';
-            var price = $('#' + sale_item_id + "_price").val();
+            var sale_item_id = this.getAttribute('data-sale-item');
-            console.log(qty + "|" + price)
+            var ajax_url = "/origami/select_sale_item";
-            var ajax_url = "/origami/item_edit";
+            selected_sale_item = sale_item_id;
            localStorage.setItem("selected_sale_item", selected_sale_item);
            $.ajax({
                type: "POST",
                url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price,
+                data: 'sale_item_id=' + sale_item_id,
                success: function (result) {
-                    $.confirm({
+                    if (result != null){
-                        title: 'Alert!',
+                        $('#commissioners').empty();
-                        content: 'Qty and Price was successfully Updated',
+                        result.commissioner.forEach(function (c) {
-                        buttons: {
+                            if (result.selected_commissioner != null){
-
+                                if (c.id == result.selected_commissioner.id){
-                            confirm: {
+                                    sale_item = "<div class=\"card tables blue text-white commissioner\" onclick=\"click_commissioner(this)\" data-commissioner-id=" + c.id + " data-commissioner-name=\"" + c.name + "\">" + "<div class=\"card-block\">" + c.name + "</div>" + "</div>"
-                                text: 'Ok',
+                                }else {
-                                btnClass: 'btn-green btn-lg',
+                                    sale_item = "<div class=\"card tables green text-white commissioner\" onclick=\"click_commissioner(this)\" data-commissioner-id=" + c.id + " data-commissioner-name=\"" + c.name + "\">" + "<div class=\"card-block\">" + c.name + "</div>" + "</div>"
                                action: function () {
                                    location.reload();
                                }
                            }else {
                                sale_item = "<div class=\"card tables green text-white commissioner\" onclick=\"click_commissioner(this)\" data-commissioner-id=" + c.id + " data-commissioner-name=\"" + c.name + "\">" + "<div class=\"card-block\">" + c.name + "</div>" + "</div>"
                            }
-                        }
+                            $('#commissioners').append(sale_item);
-                    });
+                        })
-
+                    }
                }
            });
        });
-        $('.void').on('click', function () {
+        $('#back').on('click', function () {
-            var sale_item_id = $(this).attr('data-id');
+            var table_id = '<%= @table_id %>';
-            var ajax_url = "/origami/item_void";
+            window.location.href = '/origami/table/' + table_id;
-            $.ajax({
+        });
                type: "POST",
                url: ajax_url,
                data: 'sale_item_id=' + sale_item_id,
                success: function (result) {
                    location.reload();
                }
            });
        })
-        $('.foc').on('click', function () {
+    });
            var sale_item_id = $(this).attr('data-id');
            var ajax_url = "/origami/item_foc";
            $.ajax({
                type: "POST",
                url: ajax_url,
                data: 'sale_item_id=' + sale_item_id,
                success: function (result) {
                    location.reload();
                }
            });
        })
-        $('.cancel').on('click', function () {
+    $('.commissioner').on('click', function () {
-            var sale_item_id = $(this).attr('data-id');
+        alert('click');
-            var ajax_url = "/origami/item_void_cancel";
+    });
            $.ajax({
                type: "POST",
                url: ajax_url,
                data: 'sale_item_id=' + sale_item_id,
                success: function (result) {
                    location.reload();
                }
            });
        })
-
+    function click_commissioner(commissioner) {
-    })
+        var commissioner_id = commissioner.getAttribute('data-commissioner-id');
-
+        var selected_sale_item = localStorage.getItem("selected_sale_item");
-    $('#back').on('click', function () {
+        $(commissioner).removeClass("green").addClass("blue");
-        var table_id = '<%= @table_id %>'
+        $(commissioner).siblings().removeClass("blue").addClass("green");
-        window.location.href = '/origami/table/' + table_id;
+        $("tr[data-sale-item=" + selected_sale_item + "] td.commissioner").text(commissioner.getAttribute('data-commissioner-name'));
-    })
+        var ajax_url = "/origami/select_commissioner";
-
+        var param_data = 'sale_item_id=' + selected_sale_item + '&commissioner_id=' + commissioner_id;
    $('#cancel_all_void').on('click', function () {
        var sale_id = "<%= @saleobj.sale_id %>"
        var ajax_url = "/origami/cancel_all_void";
        $.ajax({
            type: "POST",
            url: ajax_url,
-            data: 'sale_id=' + sale_id,
+            data: param_data,
            success: function (result) {
-                location.reload();
+                console.log(selected_sale_item + "," +commissioner_id);
                if(result.deselect == true){
                    $(commissioner).removeClass("blue").addClass("green");
                    $("tr[data-sale-item=" + selected_sale_item + "] td.commissioner").text('-');
                }
            }
        });
-    })
+    };
    $('#apply').on('click', function () {
        var sale_id = "<%= @saleobj.sale_id %>"
        var ajax_url = "/origami/apply_void";
        var table_id = '<%= @table_id %>'
        $.ajax({
            type: "POST",
            url: ajax_url,
            data: 'sale_id=' + sale_id,
            success: function (result) {
                window.location.href = '/origami/table/' + table_id;
            }
        });
    })
    $('#sale_item').on('click', function () {
        var sale_item_id = this.getAttribute('data-sale-item');
        var ajax_url = "/origami/select_sale_item";
        var table_id = '<%= @table_id %>'
        $.ajax({
            type: "POST",
            url: ajax_url,
            data: 'sale_item_id=' + sale_item_id,
            success: function (result) {
                $('#commissioners').empty();
                result.forEach(function (t) {
                    sale_item = "<div class=\"card tables green text-white\" data-id=" + t.id + ">" + "<div class=\"card-block\">" + t.name + "</div>" + "</div>"
                    $('#commissioners').append(sale_item);
                })
            }
        });
    })
 </script>
--- a/app/views/origami/home/index_bk.html.erb
+++ b/app/views/origami/home/index_bk.html.erb
@@ -243,7 +243,7 @@
              <p class="hidden orders-id"><%= unique_id  %></p>
              <p class="hidden customer-id"><%= customer_id  %></p>
              <p class="hidden order-cid"><%= odr.order_id  %></p>
-              <h4 class="card-title orders-table"><%= odr.table_name %></h4
+              <h4 class="card-title orders-table"><%= odr.table_name %></h4>
               <p class="card-text">
                Receipt No :
                <span class="orders-receipt-no">
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,6 +90,8 @@ Rails.application.routes.draw do
    # 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'
@@ -98,8 +100,6 @@ Rails.application.routes.draw do
    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'
    get 'table/:dining_id/movetable' => "movetable#move_dining"
    get 'table/:dining_id/moveroom' => "moveroom#move_dining"
    get 'sale/:sale_id' => 'sales#show'
--- a/db/migrate/20170822034139_create_product_commissions.rb
+++ b/db/migrate/20170822034139_create_product_commissions.rb
@@ -1,12 +0,0 @@
 class CreateProductCommissions < ActiveRecord::Migration[5.1]
  def change
    create_table :product_commissions do |t|
      t.string :product_code
      t.integer :commission_id
      t.integer :qty
      t.string :sale_id
      t.string :sale_item_id
      t.timestamps
    end
  end
 end
--- a/db/migrate/20170823034141_create_product_commissions.rb
+++ b/db/migrate/20170823034141_create_product_commissions.rb
@@ -0,0 +1,16 @@
 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