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

membership settings UI

Browse Source
This commit is contained in:
phyusin
2018-11-08 10:37:41 +06:30
parent 9da751e6f5
commit ab10a50a68
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/origami/payments/show.html.erb
View File

@@ -707,8 +707,9 @@ var customer_name = "<%= @customer.name %>";
var pdf_view = '<%=@pdf_view%>'; var pdf_view = '<%=@pdf_view%>';
var trans_flag = <%= @trans_flag %>; var trans_flag = <%= @trans_flag %>;
var paymalcount = <%= @paymalcount %>; var paymalcount = <%= @paymalcount %>;
// console.log(pdf_view) // console.log(pdf_view)
$(document).ready(function(){ $(document).ready(function(){
$("#sxModal").hide();
if(cashier_type == "food_court" && paymalcount == 0.0){ if(cashier_type == "food_court" && paymalcount == 0.0){
$("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false}); $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
} }
@@ -1663,7 +1664,7 @@ var paymalcount = <%= @paymalcount %>;
} }
}); });
// Read Card Reader // Read Card Reader - Paymal payment for FoodCourt
$(".btn_paymal_member").on('click', function (){ $(".btn_paymal_member").on('click', function (){
var cardNo = ""; var cardNo = "";
var sale_id = $("#sale_id").text() || 0; var sale_id = $("#sale_id").text() || 0;

28
app/views/settings/membership_settings/show.html.erb
View File

@@ -1,12 +1,11 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ol class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li><a href="<%= settings_membership_settings_path %>">Membership Setting</a></li> <li class="breadcrumb-item"><%= t("views.right_panel.detail.membership_setting") %></li>
<span class="float-right">
<span style="float: right"> <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
</span> </span>
</ul> </ol>
</div> </div>
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
@@ -34,9 +33,16 @@
<td><%= @settings_membership_setting.auth_token %></td> <td><%= @settings_membership_setting.auth_token %></td>
<td><%= @settings_membership_setting.merchant_account rescue ''%></td> <td><%= @settings_membership_setting.merchant_account rescue ''%></td>
<td><%= @settings_membership_setting.created_by %></td> <td><%= @settings_membership_setting.created_by %></td>
<td> <td colspan="" align="">
<%= link_to t("views.btn.edit"), edit_settings_membership_setting_path(@settings_membership_setting) %> | <%= link_to t("views.btn.edit"), edit_settings_membership_setting_path(@settings_membership_setting),:class => 'btn btn-primary btn-sm waves-effect' %>
<%= link_to t('.new', :default => t("views.btn.new")), settings_membership_settings_path %> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_membership_settings_path(@settings_membership_setting)%>" data-method="delete" disabled>
<%= 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> </td>
</tr> </tr>
</tbody> </tbody>