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

update fix conflic

Browse Source
This commit is contained in:
Aung Myo
2017-10-25 18:18:59 +06:30
parent d5141c30bb 1569e05b99
commit 5b7177ec97
25 changed files with 668 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/settings/dining_charges/_form.html.erb
View File

@@ -53,30 +53,34 @@
</div>
<div class="form-actions">
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
<%= f.submit "Create",:class => 'btn btn-primary btn-lg waves-effect' %>
</div>
<% end %>
</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 PAGE DETAIL</i></h5>
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
<p>
1) Item code - generated item code for extra charges <br>
2) Unit price - to write price for extra charges <br>
3) Taxable - checkbox for taxble or not <br>
4) Charge Type - to write type for extra charges <br>
5) Minimum free time - time for free <br>
6) Charge block - time for block <br>
7) Time rounding block - rounding time for block <br>
8) Time rounding block price - to write price for time rounding block <br>
1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.extra_charges_txt") %> <br>
2) <%= t("views.right_panel.detail.unit_price") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.extra_charges_txt") %> <br>
3) <%= t("views.right_panel.detail.taxable") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.taxable_txt") %> <br>
4) <%= t("views.right_panel.detail.charge_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br>
5) <%= t("views.right_panel.detail.minimum_free_time") %> - <%= t("views.right_panel.detail.minimum_free_time_txt") %> <br>
6) <%= t("views.right_panel.detail.charge_block") %> - <%= t("views.right_panel.detail.charge_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.block_txt") %> <br>
7) <%= t("views.right_panel.detail.time_rounding") %> - <%= t("views.right_panel.detail.time_rounding_txt") %> <br>
8) <%= t("views.right_panel.detail.time_rounding") %> <%= t("views.right_panel.detail.block_txt") %> - <%= t("views.right_panel.detail.time_rounding_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.block_txt") %> <br>
9) <%= t("views.right_panel.detail.time_rounding") %> <%= t("views.right_panel.detail.block_txt") %> <%= t("views.right_panel.detail.price_txt") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.time_rounding_txt2") %><br>
</p>
<h5><i class="material-icons md-18">list BUTTON LISTS</i> </h5>
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
<p>
1) SUBMIT - to create extra charges <br>
1) <%= t("views.right_panel.button.create") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.extra_charges_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.zone_txt") %> <%= t("views.right_panel.detail.detail_txt") %> <br>
</p>
<h5><i class="material-icons md-18">list LINK LISTS</i> </h5>
<p>1) Home / Back - go to dashboard</p>
</div>
</div>
</div>