update conflic from adminbsb_uidesign branch
This commit is contained in:
Aung Myo
@@ -26,10 +26,29 @@
|
||||
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
|
||||
<div class="card">
|
||||
<div class="body">
|
||||
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
|
||||
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
|
||||
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
|
||||
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
|
||||
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
|
||||
2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
|
||||
3) <%= t("views.right_panel.detail.is_currently_login") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_currently_login_txt") %> <br>
|
||||
4) <%= t("views.right_panel.detail.auto_print_receipt") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_receipt_txt") %> <br>
|
||||
5) <%= t("views.right_panel.detail.zone_txt") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
|
||||
6) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
|
||||
7) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
8) <%= t("views.right_panel.detail.font_size") %> - <%= t("views.right_panel.detail.font_size_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
9) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %> <br>
|
||||
10) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %> <br>
|
||||
11) <%= t("views.right_panel.detail.show_guest_info") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.guest_info_txt") %> <br>
|
||||
</p>
|
||||
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
</p>
|
||||
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
|
||||
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -52,10 +52,27 @@
|
||||
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
|
||||
<div class="card">
|
||||
<div class="body">
|
||||
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
|
||||
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
|
||||
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
|
||||
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
|
||||
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.cashier_terminal_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
|
||||
2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
3) <%= t("views.right_panel.detail.login") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.login_txt") %> <br>
|
||||
4) <%= t("views.right_panel.detail.auto_print") %> - <%= t("views.right_panel.detail.auto_print_txt") %> <br>
|
||||
5) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %> <br>
|
||||
6) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %> <br>
|
||||
7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
</p>
|
||||
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
</p>
|
||||
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
|
||||
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -10,86 +10,124 @@
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Cashier Terminal</h4>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td><strong>Name:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.name %><td>
|
||||
</tr>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Cashier Terminal</h4>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td><strong>Name:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.name %><td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Is active:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.is_active %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Is active:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.is_active %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Is currently login:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.is_currently_login %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Is currently login:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.is_currently_login %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Auto print receipt:</strong></td>
|
||||
<td>
|
||||
<%= @settings_cashier_terminal.auto_print_receipt %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Auto print receipt:</strong></td>
|
||||
<td>
|
||||
<%= @settings_cashier_terminal.auto_print_receipt %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Printer name:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.printer_name %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Printer name:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.printer_name %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Header:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.header %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Header:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.header %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Footer:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.footer %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Footer:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.footer %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Font:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.font %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Font:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.font %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Font size:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.font_size %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Font size:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.font_size %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Show tax:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.show_tax %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Show tax:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.show_tax %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Show cashier:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.show_cashier %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Show cashier:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.show_cashier %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><strong>Show guest info:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.show_guest_info %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Show guest info:</strong></td>
|
||||
<td><%= @settings_cashier_terminal.show_guest_info %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="2" align="right">
|
||||
<%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(@settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
<tr>
|
||||
<td colspan="2" align="right">
|
||||
<%= link_to t("views.btn.edit"), edit_settings_cashier_terminal_path(@settings_cashier_terminal),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_cashier_terminal_path(@settings_cashier_terminal) %>" data-method="delete">
|
||||
<%= t("views.btn.delete") %>
|
||||
</button>
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_cashier_terminal_path(@settings_cashier_terminal) %>" data-method="delete">
|
||||
<%= t("views.btn.delete") %>
|
||||
</button>
|
||||
|
||||
<span class="hidden" id="delete_text">
|
||||
<h6>Are you sure you want to delete this row ?</h6>
|
||||
<h6>This action can't be undo. </h6>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<span class="hidden" id="delete_text">
|
||||
<h6>Are you sure you want to delete this row ?</h6>
|
||||
<h6>This action can't be undo. </h6>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
|
||||
<div class="card">
|
||||
<div class="body">
|
||||
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.cashier_terminal_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
|
||||
2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
|
||||
3) <%= t("views.right_panel.detail.is_currently_login") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_currently_login_txt") %> <br>
|
||||
4) <%= t("views.right_panel.detail.auto_print_receipt") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.auto_print_receipt_txt") %> <br>
|
||||
5) <%= t("views.right_panel.detail.zone_txt") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
|
||||
6) <%= t("views.right_panel.detail.printer_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
|
||||
7) <%= t("views.right_panel.detail.header") %> - <%= t("views.right_panel.detail.header_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
|
||||
8) <%= t("views.right_panel.detail.footer") %> - <%= t("views.right_panel.detail.footer_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.printer_txt") %> <br>
|
||||
9) <%= t("views.right_panel.detail.font") %> - <%= t("views.right_panel.detail.font_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
10) <%= t("views.right_panel.detail.font_size") %> - <%= t("views.right_panel.detail.font_size_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
11) <%= t("views.right_panel.detail.show_tax") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.tax_txt") %> <br>
|
||||
12) <%= t("views.right_panel.detail.show_cashier") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.cashier_txt") %> <br>
|
||||
13) <%= t("views.right_panel.detail.show_guest_info") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.guest_info_txt") %> <br>
|
||||
</p>
|
||||
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
</p>
|
||||
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
|
||||
<p>
|
||||
1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
|
||||
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.cashier_terminal_txt") %> <br>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user