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

change select box for item attribute in menu item instance and button UI for CRM/Queue

Browse Source
This commit is contained in:
phyusin
2017-11-27 13:33:20 +06:30
parent 98be8b37a4
commit 9ad9e9ae57
5 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/crm/dining_queues/index.html.erb
View File

@@ -100,8 +100,8 @@
<%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block', 'data-no-turbolink' => true %>
<hr>
<button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>
<button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" disabled>Cancel</button>
<button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" style="font-size: 11px" disabled>Assign</button>
<button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" style="font-size: 11px" disabled>Cancel</button>
<!-- <a href="<%= dashboard_path %>" class="btn btn-default btn-block waves-effect" role="button" aria-haspopup="true" aria-expanded="false"> Back </a> -->
</div>
</div>

2
app/views/crm/home/index.html.erb
View File

@@ -118,7 +118,7 @@
</button> -->
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button> -->
<button id="assign" value="" disabled="disabled" data-type="assign" class="btn assign btn-primary btn-lg btn-block">ASSIGN</button>
<button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCLE</button>
<button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCEL</button>
</div>
</div>

2
app/views/settings/menu_item_instances/_form.html.erb
View File

@@ -11,7 +11,7 @@
<%= f.input :item_instance_name %>
<%= f.input :price %>
<%= f.input :item_attributes, collection: @item.item_attributes, input_html: { multiple: true } %>
<%= f.input :item_attributes, collection: @item.item_attributes%>
<%= f.input :is_on_promotion %>
<%= f.input :promotion_price %>