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

fixed conflic

Browse Source
This commit is contained in:
Aung Myo
2017-10-31 12:13:19 +06:30
parent 56940d7f00 e3b536d58c
commit cfa819f985
69 changed files with 618 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/settings/cashier_terminals/_form.html.erb
View File

@@ -54,8 +54,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

8
app/views/settings/commissioners/_form.html.erb
View File

@@ -55,11 +55,3 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('page:load', function() {
// $(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

7
app/views/settings/commissions/_form.html.erb
View File

@@ -43,10 +43,3 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/item_sets/_form.html.erb
View File

@@ -40,8 +40,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/lookups/_form.html.erb
View File

@@ -28,8 +28,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/membership_actions/_form.html.erb
View File

@@ -30,8 +30,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/membership_settings/_form.html.erb
View File

@@ -32,8 +32,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_categories/_form.html.erb
View File

@@ -44,8 +44,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_item_attributes/_form.html.erb
View File

@@ -36,8 +36,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_item_options/_form.html.erb
View File

@@ -37,8 +37,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_item_sets/_form.html.erb
View File

@@ -26,8 +26,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menus/_form.html.erb
View File

@@ -66,8 +66,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/order_queue_stations/_form.html.erb
View File

@@ -59,8 +59,4 @@ div.form-inputs span{
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/payment_method_settings/_form.html.erb
View File

@@ -46,8 +46,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/processing_items/_form.html.erb
View File

@@ -85,8 +85,4 @@
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

9
app/views/settings/products/_form.html.erb
View File

@@ -20,8 +20,7 @@
<% if f.object.image_path? %>
<p><%= f.object.name %></p>
<%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
<% else %>
<p>Sample Image</p>
<% else %>
<%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
<% end %>
</div>
@@ -63,8 +62,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/promotion_products/_form.html.erb
View File

@@ -45,8 +45,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/rooms/_form.html.erb
View File

@@ -77,8 +77,4 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/set_menu_items/_form.html.erb
View File

@@ -91,8 +91,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/simple_menu_items/_form.html.erb
View File

@@ -81,8 +81,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/tables/_form.html.erb
View File

@@ -72,8 +72,4 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/tax_profiles/_form.html.erb
View File

@@ -41,9 +41,5 @@
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

5
app/views/settings/zones/_form.html.erb
View File

@@ -35,8 +35,3 @@
</div>
</div>
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>