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-14 16:46:26 +06:30
parent 7dae1c2c27 624617fc02
commit a01eaacbcb
21 changed files with 286 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
.idea/workspace.xml generated
View File

@@ -2,14 +2,28 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.rakeTasks" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sxrestaurant.iml" afterPath="$PROJECT_DIR$/.idea/sxrestaurant.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/db/migrate/20170814041543_remove_d_bcols_from_print_settings.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/voucher_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/voucher_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/print_settings_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/print_settings_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/settings/dining_charges_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/settings/dining_charges_controller.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/ability.rb" afterPath="$PROJECT_DIR$/app/models/ability.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/home/show.html.erb" afterPath="$PROJECT_DIR$/app/views/home/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/dining_charge.rb" afterPath="$PROJECT_DIR$/app/models/dining_charge.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/pdf/close_cashier_pdf.rb" afterPath="$PROJECT_DIR$/app/pdf/close_cashier_pdf.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/pdf/crm_order_pdf.rb" afterPath="$PROJECT_DIR$/app/pdf/crm_order_pdf.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/pdf/order_item_pdf.rb" afterPath="$PROJECT_DIR$/app/pdf/order_item_pdf.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/pdf/order_summary_pdf.rb" afterPath="$PROJECT_DIR$/app/pdf/order_summary_pdf.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/pdf/queue_no_pdf.rb" afterPath="$PROJECT_DIR$/app/pdf/queue_no_pdf.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/pdf/receipt_bill_pdf.rb" afterPath="$PROJECT_DIR$/app/pdf/receipt_bill_pdf.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/voucher/index.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/voucher/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/print_settings/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/print_settings/_form.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/print_settings/index.html.erb" afterPath="$PROJECT_DIR$/app/views/print_settings/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/print_settings/show.html.erb" afterPath="$PROJECT_DIR$/app/views/print_settings/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/employees/index.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/employees/index.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/employees/show.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/employees/show.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/rooms/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/rooms/_form.html.erb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/tables/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/tables/_form.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/" />
@@ -25,21 +39,21 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ability.rb" pinned="false" current-in-tab="false">
<file leaf-file-name="ability.rb" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/models/ability.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-80">
<caret line="6" column="30" lean-forward="true" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" />
<state relative-caret-position="194">
<caret line="273" column="46" lean-forward="false" selection-start-line="273" selection-start-column="46" selection-end-line="273" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="dashboard.html.erb" pinned="false" current-in-tab="true">
<file leaf-file-name="dashboard.html.erb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/home/dashboard.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-252">
<caret line="178" column="42" lean-forward="true" selection-start-line="178" selection-start-column="42" selection-end-line="178" selection-end-column="42" />
<caret line="178" column="42" lean-forward="false" selection-start-line="178" selection-start-column="42" selection-end-line="178" selection-end-column="42" />
<folding>
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#!!top" expanded="true" />
@@ -49,11 +63,21 @@
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="51" column="8" lean-forward="false" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/home/show.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -63,8 +87,34 @@
<entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3402">
<caret line="189" column="21" lean-forward="true" selection-start-line="189" selection-start-column="21" selection-end-line="189" selection-end-column="21" />
<folding />
<caret line="190" column="21" lean-forward="false" selection-start-line="190" selection-start-column="21" selection-end-line="190" selection-end-column="21" />
<folding>
<marker date="1502705673000" expanded="true" signature="111:227" ph="##..." />
<marker date="1502705673000" expanded="true" signature="2262:6816" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="3272:3334" ph="##..." />
<marker date="1502705673000" expanded="true" signature="4204:4354" ph="##..." />
<marker date="1502705673000" expanded="true" signature="4408:4685" ph="##..." />
<marker date="1502705673000" expanded="true" signature="6423:6487" ph="##..." />
<marker date="1502705673000" expanded="true" signature="6888:6937" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="6897:6931" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="7016:7548" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="7614:8021" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="7999:8015" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8088:9418" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8162:8266" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8338:8463" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8347:8388" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8498:8545" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8576:8623" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8884:8930" ph="##..." />
<marker date="1502705673000" expanded="true" signature="8967:9037" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9233:9411" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9274:9320" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9357:9403" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9495:9866" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9944:10338" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="10342:10652" ph="##..." />
</folding>
</state>
</provider>
</entry>
@@ -625,12 +675,12 @@
<updated>1498458293643</updated>
<workItem from="1498458295318" duration="2552000" />
<workItem from="1498465879846" duration="18792000" />
<workItem from="1502681128282" duration="11994000" />
<workItem from="1502681128282" duration="12098000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="37755000" />
<option name="totallyTimeSpent" value="37859000" />
</component>
<component name="ToolWindowManager">
<frame x="1440" y="22" width="1918" height="717" extended-state="0" />
@@ -640,7 +690,7 @@
<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.33" sideWeight="0.5" order="7" 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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287037" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32718894" sideWeight="0.5" order="7" 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="7" 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" />
@@ -947,14 +997,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="51" column="8" lean-forward="true" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/cancancan-1.17.0/lib/generators/cancan/ability/templates/ability.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
@@ -997,16 +1039,34 @@
<entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3402">
<caret line="189" column="21" lean-forward="true" selection-start-line="189" selection-start-column="21" selection-end-line="189" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/ability.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-80">
<caret line="6" column="30" lean-forward="true" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" />
<folding />
<caret line="190" column="21" lean-forward="false" selection-start-line="190" selection-start-column="21" selection-end-line="190" selection-end-column="21" />
<folding>
<marker date="1502705673000" expanded="true" signature="111:227" ph="##..." />
<marker date="1502705673000" expanded="true" signature="2262:6816" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="3272:3334" ph="##..." />
<marker date="1502705673000" expanded="true" signature="4204:4354" ph="##..." />
<marker date="1502705673000" expanded="true" signature="4408:4685" ph="##..." />
<marker date="1502705673000" expanded="true" signature="6423:6487" ph="##..." />
<marker date="1502705673000" expanded="true" signature="6888:6937" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="6897:6931" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="7016:7548" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="7614:8021" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="7999:8015" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8088:9418" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8162:8266" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8338:8463" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8347:8388" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8498:8545" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8576:8623" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="8884:8930" ph="##..." />
<marker date="1502705673000" expanded="true" signature="8967:9037" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9233:9411" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9274:9320" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9357:9403" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9495:9866" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="9944:10338" ph="do ... end" />
<marker date="1502705673000" expanded="true" signature="10342:10652" ph="##..." />
</folding>
</state>
</provider>
</entry>
@@ -1021,7 +1081,7 @@
<entry file="file://$PROJECT_DIR$/app/views/home/show.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -1029,7 +1089,7 @@
<entry file="file://$PROJECT_DIR$/app/views/home/dashboard.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-252">
<caret line="178" column="42" lean-forward="true" selection-start-line="178" selection-start-column="42" selection-end-line="178" selection-end-column="42" />
<caret line="178" column="42" lean-forward="false" selection-start-line="178" selection-start-column="42" selection-end-line="178" selection-end-column="42" />
<folding>
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#!!top" expanded="true" />
@@ -1038,5 +1098,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="51" column="8" lean-forward="false" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/ability.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="273" column="46" lean-forward="false" selection-start-line="273" selection-start-column="46" selection-end-line="273" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</component>
</project>