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

fixed conflit

Browse Source
This commit is contained in:
NyanLinHtut
2019-09-11 13:30:45 +06:30
parent 90d0a4ebb1 a4e8869234
commit 26f537a42d
28 changed files with 262 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/crm/customers/index.html.erb
View File

@@ -29,7 +29,9 @@
</div>
</div>
<div class="row p-l-20 p-t-20">
<div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div>
</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
<%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
<div class="row clearfix">
@@ -124,7 +126,7 @@
<td><%= crm_customer.card_no rescue '-' %></td>
<td><%= crm_customer.paypar_account_no rescue '-' %></td>
<td>
<% if crm_customer.membership_id.nil? && !crm_customer.membership_type.nil? && !crm_customer.membership_type.blank? && !crm_customer.paypar_account_no.blank? && !crm_customer.paypar_account_no.nil? %>
<% if crm_customer.membership_id.nil? && !crm_customer.membership_type.nil? && !crm_customer.membership_type.blank? && !crm_customer.paypar_account_no.blank? && !crm_customer.paypar_account_no.nil? %>
<%= link_to t("views.btn.sync"), crm_customer_sync_path(crm_customer), :class => "btn btn-md bg-green waves-effect" %>
<% end %>
<% if @customer_update_phone_email_membertype %>
@@ -157,6 +159,7 @@
<script type="text/javascript">
$(document).ready(function () {
$("#oqs_loading_wrapper").show();
localStorage.setItem("member_card",false);
/*$('.datepicker').datepicker({
format : 'dd-mm-yyyy',
@@ -177,6 +180,7 @@
},100);
});
// QR Code Reader
$("#qr_code").on('click', function(e){
var code = "";
@@ -359,4 +363,8 @@
$("#sxModal .btn_cancel").on('click',function(){
$("#sxModal").hide();
});
$('#filter_form').submit(function() {
$("#oqs_loading_wrapper").show();
return true
});
</script>