customer sales report tax fixed

app/views/crm/customers/index.html.erb

@@ -165,13 +165,7 @@
     $("#member_acc_no").on('click', function(e){
       localStorage.setItem("member_card",true);
       $("#sxModal").show();
-<<<<<<< HEAD
-      setTimeout(function(){
-        getCardNo();
-      },100);
-=======
       getCardNo();
->>>>>>> r-1902001-01
     });
 
     // QR Code Reader

app/views/reports/customer/_shift_sale_report_filter.html.erb

@@ -31,7 +31,7 @@
 			<select name="membership_type" id="membership_type" class="form-control m-t-3" style="height: 32px;">
 				<option value="0">--- All Group ---</option>
 				<%  @membership_type.each do |mt| %>
-				<option class="<%=mt.name.downcase%>" value="<%=mt.value%>"><%=mt.name%></option>
+				<option class="<%=mt.name.downcase%>" value="<%=mt.value%>" <%= 'selected' if mt.value == params[:membership_type]%>><%=mt.name%></option>
 				<%end %>
 			</select>
 		</div>

app/views/settings/lookups/_form.html.erb

@@ -1,5 +1,3 @@
-<% breadcrumb_add 'LookUp', settings_lookups_path, settings_lookups_path, t("views.btn.#{action_name}") %>
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_lookup]) do |f| %>