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

update dashboard total credit and card

Browse Source
This commit is contained in:
Aung Myo
2017-10-24 11:42:48 +06:30
parent 59c38b2c96
commit f7d3920554
9 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/home_controller.rb
View File

@@ -76,10 +76,10 @@ class HomeController < ApplicationController
@total_sale = Sale.total_sale(today)
@total_count = Sale.total_count(today)
puts @grand_total.to_json
puts @total_count
puts "ssssssssssss"
@total_card = Sale.total_card_sale(today)
@total_credit = Sale.credit_payment(today)
puts "ssss"
puts @total_card.to_json
end
def destroy

19
app/models/sale.rb
View File

@@ -876,6 +876,25 @@ end
total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count
end
def self.total_card_sale(today)
payment_type = " and payment_method = 'mpu' or payment_method = 'visa' or payment_method = 'master' or payment_method = 'jcb' "
# query = Sale.select("SUM(tax_payable_amount) AS st_amount,tax_name")
# .where('sale_status = "completed" #{payment_type} and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
# .joins("join sale_payments on sale_id = sales.sale_id")
# .group("sales.sale_id")
query = SalePayment.where('s.sale_status = "completed" and payment_method = "mpu" or payment_method = "visa" or payment_method = "master" or payment_method = "jcb" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
.joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
.sum("payment_amount")
end
def self.credit_payment(today)
query = SalePayment.where('s.sale_status = "completed" and payment_method="creditnote" and DATE_FORMAT(s.receipt_date,"%Y-%m-%d") = ?',today)
.joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
.sum("payment_amount")
end
private
def generate_custom_id

39
app/views/home/dashboard.html.erb
View File

@@ -5,47 +5,48 @@
<!-- Widgets -->
<div class="row clearfix">
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="info-box bg-pink hover-expand-effect">
<div class="icon">
<i class="material-icons">attach_money</i>
</div>
<div class="content">
<div class="text">TODAY TOTAL SALE</div>
<div class="number count-to" data-from="0" data-to="<%= @total_sale%>" data-speed="15" data-fresh-interval="20"></div>
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="info-box bg-cyan hover-expand-effect">
<div class="icon">
<i class="material-icons">help</i>
</div>
<div class="content">
<div class="text">TODAY SALE COUNT</div>
<div class="text">SALE COUNT</div>
<div class="number count-to" data-from="0" data-to="<%= @total_count%>" data-speed="1000" data-fresh-interval="20"></div>
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="info-box bg-light-green hover-expand-effect">
<div class="info-box bg-pink hover-expand-effect">
<div class="icon">
<i class="material-icons">forum</i>
<i class="material-icons">attach_money</i>
</div>
<div class="content">
<div class="text">NEW COMMENTS</div>
<div class="number count-to" data-from="0" data-to="243" data-speed="1000" data-fresh-interval="20"></div>
<div class="text">TOTAL SALE</div>
<div class="number count-to" data-from="0" data-to="<%= @total_sale%>" data-speed="15" data-fresh-interval="20"></div>
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="info-box bg-light-green hover-expand-effect">
<div class="icon">
<i class="material-icons">person_add</i>
</div>
<div class="content">
<div class="text">TOTAL CREDIT</div>
<div class="number count-to" data-from="0" data-to="<%= @total_credit%>" data-speed="1000" data-fresh-interval="20"></div>
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="info-box bg-orange hover-expand-effect">
<div class="icon">
<i class="material-icons">person_add</i>
<i class="material-icons">credit_card</i>
</div>
<div class="content">
<div class="text">NEW VISITORS</div>
<div class="number count-to" data-from="0" data-to="1225" data-speed="1000" data-fresh-interval="20"></div>
<div class="text">TOTAL CARD</div>
<div class="number count-to" data-from="0" data-to="<%= @total_card%>" data-speed="1000" data-fresh-interval="20"></div>
</div>
</div>
</div>

27
app/views/settings/accounts/_form.html.erb
View File

@@ -1,7 +1,8 @@
<%= simple_form_for([:settings,@settings_account]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<%= simple_form_for([:settings,@settings_account]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs p-l-10">
<%= f.input :title %>
<%= f.input :account_type, :collection => Lookup.collection_of("account_type") %>
<%= f.input :discount %>
@@ -9,9 +10,19 @@
<%= f.input :bonus %>
<%= f.input :rebate %>
</div>
<div class="form-actions">
<%= f.submit "Create Account",:class => 'btn btn-primary btn-lg waves-effect' %>
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
</div>
<% end %>
<% end %>
</div>
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card">
<div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
</div>
</div>
</div>
</div>

12
app/views/settings/accounts/edit.html.erb
View File

@@ -1,20 +1,10 @@
<!-- <div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_accounts_path %>">Account</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_account: @settings_account %>
</div> -->
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
<li class="breadcrumb-item active">Edit</li>
<span class="float-right">
<%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
</span>
</ol>
</div>

2
app/views/settings/accounts/new.html.erb
View File

@@ -4,7 +4,7 @@
<li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to t('.new', :default => t("views.btn.new")), settings_accounts_path %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
</span>
</ol>
</div>

2
app/views/settings/accounts/show.html.erb
View File

@@ -36,7 +36,7 @@
<!-- <td><%= @settings_account.bonus %></td> -->
<td><%= @settings_account.rebate %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %>
<td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account),:class => 'btn btn-primary btn-sm waves-effect' %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(@settings_account)%>" data-method="delete">
<%= t("views.btn.delete") %>
</button>

4
app/views/settings/cashier_terminals/_form.html.erb
View File

@@ -3,7 +3,7 @@
<%= simple_form_for([:settings, @settings_cashier_terminal]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<div class="form-inputs p-l-10">
<%= f.input :name %>
<%= f.input :is_active %>
<%= f.input :is_currently_login %>
@@ -19,7 +19,7 @@
</div>
<div class="form-actions">
<%= f.submit "Create Cashier Terminal",:class => 'btn btn-primary btn-lg waves-effect' %>
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
</div>
<% end %>
</div>

2
app/views/settings/cashier_terminals/show.html.erb
View File

@@ -1,7 +1,7 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_cashier_terminal_path %>">Cashier Terminals</a></li>
<li class="breadcrumb-item"><a href="<%= settings_cashier_terminals_path %>">Cashier Terminals</a></li>
<li class="breadcrumb-item active">Details</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminal_path %>