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

conflict data remove

Browse Source
This commit is contained in:
phyusin
2018-05-14 15:46:34 +06:30
parent 39dce3424e 8fda04372d
commit 5ddfad7ef8
10 changed files with 69 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/order_reservation/index.html.erb
View File

@@ -463,7 +463,6 @@
</div>
</div>
</div>
<!-- <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order"></div>
<div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_notify_new_order"></div>
<div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_notify_order_send_to_kitchen"></div>
@@ -585,6 +584,7 @@
</div>
<div class="modal fade text-center" id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order" tabindex="-1" role="dialog">
>>>>>>> 8fda04372d3c2d7255bbd4c14ed3b3c8d9f5937e
<div class="modal-dialog modal-md" role="document">
<div class="modal-content">
<div class="modal-header">