fix conflit
This commit is contained in:
Zin Lin Phyo
356
.idea/workspace.xml
generated
356
.idea/workspace.xml
generated
@@ -2,21 +2,121 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb" />
|
||||
<change type="DELETED" beforePath="$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb" afterPath="" />
|
||||
<change type="DELETED" beforePath="$PROJECT_DIR$/db/migrate/20170822034139_create_product_commissions.rb" afterPath="" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sxrestaurant.iml" afterPath="$PROJECT_DIR$/.idea/sxrestaurant.iml" />
|
||||
<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/product_commissions_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/commission.rb" afterPath="$PROJECT_DIR$/app/models/commission.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/commissioner.rb" afterPath="$PROJECT_DIR$/app/models/commissioner.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/menu_item.rb" afterPath="$PROJECT_DIR$/app/models/menu_item.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/product_commission.rb" afterPath="$PROJECT_DIR$/app/models/product_commission.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/settings/promotions_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/settings/promotions_controller.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/promotion.rb" afterPath="$PROJECT_DIR$/app/models/promotion.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/promotion_product.rb" afterPath="$PROJECT_DIR$/app/models/promotion_product.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/sale.rb" afterPath="$PROJECT_DIR$/app/models/sale.rb" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/sale_item.rb" afterPath="$PROJECT_DIR$/app/models/sale_item.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/views/origami/home/index_bk.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/home/index_bk.html.erb" />
|
||||
<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/" />
|
||||
@@ -37,7 +137,7 @@
|
||||
<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="353">
|
||||
<caret line="174" column="74" lean-forward="true" selection-start-line="174" selection-start-column="74" selection-end-line="174" selection-end-column="74" />
|
||||
<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" />
|
||||
@@ -60,17 +160,27 @@
|
||||
<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="true" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
|
||||
<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="20170823034141_create_product_commissions.rb" pinned="false" current-in-tab="true">
|
||||
<file leaf-file-name="20170823034141_create_product_commissions.rb" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/db/migrate/20170823034141_create_product_commissions.rb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="18">
|
||||
<caret line="1" column="47" lean-forward="true" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
|
||||
<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>
|
||||
</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>
|
||||
@@ -86,16 +196,6 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="commission.rb" pinned="false" current-in-tab="false">
|
||||
<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>
|
||||
</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">
|
||||
@@ -110,8 +210,89 @@
|
||||
<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="true" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
|
||||
<folding />
|
||||
<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>
|
||||
@@ -203,7 +384,6 @@
|
||||
<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$/config/routes.rb" />
|
||||
<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" />
|
||||
@@ -214,6 +394,7 @@
|
||||
<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>
|
||||
@@ -674,12 +855,12 @@
|
||||
<workItem from="1503328001970" duration="20307000" />
|
||||
<workItem from="1503406983258" duration="261000" />
|
||||
<workItem from="1503457057830" duration="7166000" />
|
||||
<workItem from="1503472116907" duration="36775000" />
|
||||
<workItem from="1503472116907" duration="36940000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="117917000" />
|
||||
<option name="totallyTimeSpent" value="118082000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="1442" y="22" width="1920" height="721" extended-state="0" />
|
||||
@@ -1008,14 +1189,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="235">
|
||||
<caret line="92" column="85" lean-forward="true" selection-start-line="92" selection-start-column="85" selection-end-line="92" selection-end-column="85" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/models/promotion.rb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
@@ -1059,8 +1232,89 @@
|
||||
<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="true" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
|
||||
<folding />
|
||||
<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>
|
||||
@@ -1083,7 +1337,7 @@
|
||||
<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="353">
|
||||
<caret line="174" column="74" lean-forward="true" selection-start-line="174" selection-start-column="74" selection-end-line="174" selection-end-column="74" />
|
||||
<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" />
|
||||
@@ -1094,15 +1348,23 @@
|
||||
<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="true" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
|
||||
<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="18">
|
||||
<caret line="1" column="47" lean-forward="true" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user