git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflit

Browse Source
This commit is contained in:
Zin Lin Phyo
2017-08-28 18:22:32 +06:30
parent 1cbea173df 0369cd6646
commit 63d97cce26
26 changed files with 644 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
.idea/workspace.xml generated
View File

@@ -2,23 +2,32 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sxrestaurant.iml" afterPath="$PROJECT_DIR$/.idea/sxrestaurant.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/javascripts/application.js" afterPath="$PROJECT_DIR$/app/assets/javascripts/application.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/commission.rb" afterPath="$PROJECT_DIR$/app/models/commission.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/product_commission.rb" afterPath="$PROJECT_DIR$/app/models/product_commission.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissioners/_form.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissioners/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/commissions/index.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/commissions/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/api/restaurant/menu_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/api/restaurant/menu_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/crm/customers_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/crm/customers_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/customers_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/customers_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/controllers/settings/simple_menu_items_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/settings/simple_menu_items_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/customer.rb" afterPath="$PROJECT_DIR$/app/models/customer.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/menu_item_attribute.rb" afterPath="$PROJECT_DIR$/app/models/menu_item_attribute.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/order.rb" afterPath="$PROJECT_DIR$/app/models/order.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/order_item.rb" afterPath="$PROJECT_DIR$/app/models/order_item.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/sale_payment.rb" afterPath="$PROJECT_DIR$/app/models/sale_payment.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/api/restaurant/menu/_menu.json.jbuilder" afterPath="$PROJECT_DIR$/app/views/api/restaurant/menu/_menu.json.jbuilder" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/api/restaurant/menu/_menu_item.json.jbuilder" afterPath="$PROJECT_DIR$/app/views/api/restaurant/menu/_menu_item.json.jbuilder" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/api/restaurant/menu/index.json.jbuilder" afterPath="$PROJECT_DIR$/app/views/api/restaurant/menu/index.json.jbuilder" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/crm/customers/_new_form.html.erb" afterPath="$PROJECT_DIR$/app/views/crm/customers/_new_form.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/crm/customers/index.html.erb" afterPath="$PROJECT_DIR$/app/views/crm/customers/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/addorders/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/addorders/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/customers/index.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/customers/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825034141_create_product_commissions.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825090115_create_commissioners.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" afterPath="$PROJECT_DIR$/db/migrate/20170825093252_create_commissions.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20170403140820_create_order_items.rb" afterPath="$PROJECT_DIR$/db/migrate/20170403140820_create_order_items.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/seeds.rb" afterPath="$PROJECT_DIR$/db/seeds.rb" />
</list>
<ignored path="$PROJECT_DIR$/.bundle/" />
<ignored path="$PROJECT_DIR$/components/" />
@@ -80,7 +89,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true">
<file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="65">
@@ -94,7 +103,7 @@
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="104" column="34" lean-forward="true" selection-start-line="104" selection-start-column="34" selection-end-line="104" selection-end-column="34" />
<caret line="104" column="34" lean-forward="false" selection-start-line="104" selection-start-column="34" selection-end-line="104" selection-end-column="34" />
<folding />
</state>
</provider>
@@ -104,7 +113,7 @@
<entry file="file://$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="151">
<caret line="75" column="27" lean-forward="true" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
<caret line="75" column="27" lean-forward="false" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
<folding />
</state>
</provider>
@@ -120,11 +129,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
<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="5184">
<caret line="288" column="0" lean-forward="false" selection-start-line="288" selection-start-column="0" selection-end-line="288" selection-end-column="0" />
<state relative-caret-position="381">
<caret line="96" column="32" lean-forward="true" selection-start-line="96" selection-start-column="32" selection-end-line="96" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index_in_juty.html.erb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="50" column="46" lean-forward="false" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="46" />
<folding />
</state>
</provider>
@@ -209,10 +228,10 @@
<option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
<option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
<option value="$PROJECT_DIR$/app/models/product_commission.rb" />
<option value="$PROJECT_DIR$/config/routes.rb" />
<option value="$PROJECT_DIR$/Gemfile" />
<option value="$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb" />
<option value="$PROJECT_DIR$/app/views/settings/commissioners/show.html.erb" />
<option value="$PROJECT_DIR$/config/routes.rb" />
</list>
</option>
</component>
@@ -410,6 +429,14 @@
<item name="origami" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
<item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="origami" type="462c0819:PsiDirectoryNode" />
<item name="in_juties" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
<item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
@@ -895,12 +922,12 @@
<workItem from="1503457057830" duration="7166000" />
<workItem from="1503472116907" duration="50209000" />
<workItem from="1503843212665" duration="21267000" />
<workItem from="1503909487511" duration="6539000" />
<workItem from="1503909487511" duration="6884000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="159157000" />
<option name="totallyTimeSpent" value="159502000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -947,13 +974,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/views/settings/commissions/edit.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="4" column="48" lean-forward="false" selection-start-line="4" selection-start-column="48" selection-end-line="4" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/settings/commissions/new.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
@@ -1278,14 +1298,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5184">
<caret line="288" column="0" lean-forward="false" selection-start-line="288" selection-start-column="0" selection-end-line="288" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/.rbenv/shims/bundle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1305,7 +1317,7 @@
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="104" column="34" lean-forward="true" selection-start-line="104" selection-start-column="34" selection-end-line="104" selection-end-column="34" />
<caret line="104" column="34" lean-forward="false" selection-start-line="104" selection-start-column="34" selection-end-line="104" selection-end-column="34" />
<folding />
</state>
</provider>
@@ -1313,7 +1325,7 @@
<entry file="file://$PROJECT_DIR$/app/controllers/settings/commissioners_controller.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="151">
<caret line="75" column="27" lean-forward="true" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
<caret line="75" column="27" lean-forward="false" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
<folding />
</state>
</provider>
@@ -1334,5 +1346,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="50" column="46" lean-forward="false" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="96" column="32" lean-forward="true" selection-start-line="96" selection-start-column="32" selection-end-line="96" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</component>
</project>