add font for print setting

This commit is contained in:
Yan
2017-10-11 15:16:40 +06:30
parent 2a9b44366a
commit 4ab89efaf2
16 changed files with 110 additions and 21 deletions

View File

@@ -39,18 +39,18 @@
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function () {
$(document).ready(function() {
$(".pin_pad").click(function(event) {
event.preventDefault();
event.preventDefault();
var old_value = $("#login_form_password").val();
var value = $(this).data("value");
console.log(old_value);
console.log(value);
if (value == "CLR") {
$("#login_form_password").val("");
} else if (value == "ENT") {
$("#new_login_form").submit();
} else {
var old_value = $("#login_form_password").val();
console.log(old_value);
} else {
$("#login_form_password").val(old_value + value);
}
});

View File

@@ -9,8 +9,6 @@
<title>SmartSales : Restaurant</title>
<%= csrf_meta_tags %>
<!-- oqs -->
<%= stylesheet_link_tag 'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
<!-- crm -->

View File

@@ -6,6 +6,7 @@
<%= f.input :unique_code %>
<%= f.input :template %>
<%= f.input :printer_name %>
<%= f.input :font %>
<%= f.input :api_settings %>
<%= f.input :page_width %>
<%= f.input :page_height %>

View File

@@ -1,2 +1,2 @@
json.extract! print_setting, :id, :name,, :unique_code,, :template,, :db_name,, :db_type,, :db_username,, :db_password,, :printer_name,, :api_settings,, :page_width, :page_height, :print_copies, :created_at, :updated_at
json.extract! print_setting, :id, :name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies, :created_at, :updated_at
json.url print_setting_url(print_setting, format: :json)

View File

@@ -18,6 +18,7 @@
<th>Unique code</th>
<th>Template</th>
<th>Printer name</th>
<th>Font</th>
<th>Api settings</th>
<th>Page width</th>
<th>Page height</th>
@@ -36,6 +37,7 @@
<td><%= print_setting.unique_code %></td>
<td><%= print_setting.template %></td>
<td><%= print_setting.printer_name %></td>
<td><%= print_setting.font %></td>
<td><%= print_setting.api_settings %></td>
<td><%= print_setting.page_width %></td>
<td><%= print_setting.page_height %></td>

View File

@@ -32,6 +32,10 @@
<tr>
<th>Printer name</th>
<td><%= @print_setting.printer_name %></td>
</tr>
<tr>
<th>Font</th>
<td><%= @print_setting.font %></td>
</tr>
<tr>
<th>Api settings</th>