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

discount error

Browse Source
This commit is contained in:
Zoey
2019-04-24 11:28:55 +06:30
parent 050ebdd1f7 8f81eb8e4a
commit 1b3c4f358e
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/crm/customers_controller.rb
View File

@@ -6,8 +6,13 @@ class Crm::CustomersController < BaseCrmController
# GET /crm/customers.json # GET /crm/customers.json
def index def index
filter = params[:filter] filter = params[:filter]
filter_card_no = params[:filter_card_no]
type = params[:type] type = params[:type]
if filter.nil? if filter_card_no==""
@crm_customers = Customer.all
elsif !filter_card_no.nil?
@crm_customers=Customer.where("card_no=?",filter_card_no)
elsif filter.nil? || filter_card_no==""
@crm_customers = Customer.all @crm_customers = Customer.all
else else
@crm_customers = Customer.search(filter) @crm_customers = Customer.search(filter)

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

@@ -15,7 +15,7 @@
<div class="card"> <div class="card">
<div class="body"> <div class="body">
<div class="row p-l-20 p-t-20"> <div class="row p-l-20 p-t-20">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <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 %> <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
<div class="row clearfix"> <div class="row clearfix">
<div class="col-sm-5 col-md-5 col-lg-5"> <div class="col-sm-5 col-md-5 col-lg-5">
@@ -32,6 +32,20 @@
</div> </div>
<% end %> <% end %>
</div> </div>
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
<%= form_tag crm_customers_path, :method => :get do %>
<div class="row clearfix">
<div class="col-sm-5 col-md-5 col-lg-5">
<input type="text" name="filter_card_no" style="margin-right:10px" placeholder="Search by Card No" id="search" class="form-control">
</div>
<div class="col-sm-4 col-md-4 col-lg-4">
<!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
<button type="submit" class="btn btn-sm bg-blue waves-effect">SEARCH BY CARD NO</button>
<!-- </div> -->
</div>
</div>
<%end %>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-8"> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">

15
config/license.yml Normal file
View File

@@ -0,0 +1,15 @@
iv_key: 0zVzQvzlcJhc1d1EuA2HRg==
shop_name: aungcafe
email: devops@code2lab.com
telephone:
fax:
address:
dbhost: NGg7s8bJBfbDrkIeQhV+obOyEtgxtI3Dvf+b+eBm0P+r3aT+dBqHnwVEaIwsafXPFNXavhR/C0iyni1Lszkfyw==
dbschema: X+F4yj1eQlGPiMtsgZQCqWi2NIdBLUCEj35vF4XQDZc=
dbusername: 5CSlQR48ZAiRwWlTxzOZcw==
dbpassword: uzPlzsPjbWhJHcbStJSS0A==
api_token: RaZKWQwnKpvbdJvyAiMGGZPUKuJkWbE
app_token: dCKGOGvdFsCzOUrvhdrFqoOaAUzwtEUC
plan_sku: Qy0IoCIrNawRA2WjS3aLPg==
renewable_date: vGwTpixrL9biHkxdRdGctA==
plan_name: E9Njdqdou4eMpPaWDevpT95fpksDti2xvY+0u3PzKp0=

1
config/puma.rb
View File

@@ -8,4 +8,3 @@
# port ENV.fetch("PORT") { 62158 } # port ENV.fetch("PORT") { 62158 }
# workers 2 # workers 2
# preload_app! # preload_app!