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

update queue view

Browse Source
This commit is contained in:
Aung Myo
2017-11-16 19:26:52 +06:30
parent fd81cdf3ef
commit c0733d7c48
9 changed files with 233 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/stylesheets/CRM.scss
View File

@@ -87,3 +87,29 @@
}
.cashier_number{
width: 33%;
height:58px;
line-height:58px;
text-align:center;
background:#54A5AF;
// float:left;
// margin:2px;
font-size:20px;
color:white;
// cursor:pointer;
}
.red {
background-color:#F44336;
}
.green{
background-color: #009900;
}
.left{
margin-left:1px;
}
.bottom{
margin-bottom:1px;
}

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

@@ -33,7 +33,7 @@ class Crm::CustomersController < BaseCrmController
end
end
end
@crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
@crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(15)
@crm_customer = Customer.new
@count_customer = Customer.count_customer
@@ -70,7 +70,7 @@ class Crm::CustomersController < BaseCrmController
#get customer amount
@customer = Customer.find(params[:id])
@response = Customer.get_membership_transactions(@customer)
puts @response.to_json
# @response = ""
#end customer amount

1
app/controllers/crm/dining_queues_controller.rb
View File

@@ -7,6 +7,7 @@ class Crm::DiningQueuesController < BaseCrmController
def index
today = DateTime.now.strftime('%Y-%m-%d')
@dining_queues = DiningQueue.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and status is NULL ", today).order("queue_no asc")
@complete_queue = DiningQueue.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and status = 'Assign' ", today).order("queue_no asc")
end
# GET /crm/dining_queues/1

2
app/controllers/origami/discounts_controller.rb
View File

@@ -215,7 +215,7 @@ class Origami::DiscountsController < BaseOrigamiController
else
response = {"status": false, "message": "You have no selected discount item" }
end
puts "discount"
puts "discountttttttttttt"
puts response.to_json
# Re-calc All Amount in Sale
if response["status"] == true

10
app/views/crm/customers/_new_form.html.erb
View File

@@ -22,7 +22,7 @@
str="[\"#{msg['name']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end -%>
</div>
@@ -45,7 +45,7 @@
<% str="[\"#{msg['company']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end -%>
</div>
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
@@ -55,7 +55,7 @@
<% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end %>
</div>
@@ -66,7 +66,7 @@
<% str="[\"#{msg['email']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end %>
</div>
@@ -107,7 +107,7 @@
<% str="[\"#{msg['card_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<lable class="error" style="margin-top:-6px"><%= str %></lable>
<lable class="error col-red m-t--10" style="margin-top:-6px"><%= str %></lable>
<% end %>
</div>

18
app/views/crm/customers/show.html.erb
View File

@@ -36,6 +36,7 @@
</tr>
</thead>
<tbody>
<tr>
<td><%= @customer.card_no rescue '-'%></td>
@@ -43,9 +44,9 @@
<td><%= @customer.company rescue '-' %></td>
<td><%= @customer.contact_no %></td>
<td><%= @customer.email %></td>
<td><%= @customer.nrc_no %></td>
<td><%= @customer.address%></td>
<td><%= @customer.date_of_birth %></td>
<td><%= @customer.nrc_no rescue '-' %></td>
<td><%= @customer.address rescue '-'%></td>
<td><%= @customer.date_of_birth rescue '-'%></td>
<% if @customer.membership_type.to_f > 0%>
<td><%lookup= Lookup.find_by_value(@customer.membership_type) %>
<%= lookup.name %>
@@ -80,7 +81,7 @@
<tr>
<td><%= transaction["date"]%></td>
<!-- <td><%= transaction["redeem"]%></td> -->
<td><%= transaction["rebate"] %></td>
<td><%= transaction["deposit"] %></td>
<!-- <td><%= transaction["balance"] %></td> -->
<td><%= transaction["account_status"] %></td>
<td><%= transaction["status"] %></td>
@@ -104,7 +105,6 @@
<tr>
<th><%= t("views.right_panel.detail.order_id") %></th>
<th><%= t("views.right_panel.detail.type") %></th>
<th><%= t("views.right_panel.detail.type") %></th>
<th><%= t("views.right_panel.detail.order_status") %></th>
<th><%= t("views.right_panel.detail.order_date") %></th>
<th><%= t("views.right_panel.detail.items_count") %></th>
@@ -114,10 +114,10 @@
<tbody>
<% @orders.each do |order| %>
<tr>
<td><%= order.order_id %></td>
<td><%= link_to order.order_id, transactions_order_path(order) %></td>
<td><%= order.order_type %></td>
<td><%= order.status %></td>
<td><%= order.date.strftime("%d-%m-%Y") %> </td>
<td><%= order.date.strftime("%d-%m-%Y %I:%m %p") %> </td>
<td><%= order.item_count %> </td>
</tr>
<% end %>
@@ -146,13 +146,13 @@
<tbody>
<% @sales.each do |sale| %>
<tr>
<td><%= sale.sale_id %></td>
<td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
<td><%= sale.receipt_no %></td>
<td><%= sale.grand_total rescue '-' %></td>
<td><%= sale.total_tax %></td>
<td><%= sale.cashier_name rescue '-' %></td>
<td> <%= sale.sale_status %> </td>
<td> <%= sale.receipt_date.strftime("%d-%m-%Y") %> </td>
<td> <%= sale.receipt_date.strftime("%d-%m-%Y %I:%m %p") %> </td>
</tr>
<% end %>
</tbody>

120
app/views/crm/dining_queues/_form.html.erb
View File

@@ -1,27 +1,83 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<%= simple_form_for([:crm,@dining_queue]) do |f| %>
<%= f.error_notification %>
<p class="hidden generate_no"><%= @queue_no %></p>
<div class="col-md-6">
<!-- <div class="col-md-6"> -->
<div class="form-inputs">
<%= f.input :queue_no , :class => "dining",:id => "dining", :readonly => true%>
<%= f.input :name %>
<%= f.input :contact_no %>
<%= f.input :seater %>
<%= f.input :remark %>
</div>
<br>
<div class="form-actions">
<%= f.button :submit,"Create Queue" ,:class=>"btn btn-primary bg-blue btn-lg waves-effect"%>
<%= f.submit t('views.btn.submit'),:class => 'btn btn-primary btn-lg waves-effect' %>
</div>
</div>
<!-- </div> -->
<% end %>
</div>
<div class="col-xs-12 col-sm-12 col-md-93 col-lg-3">
<div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="p-l-20 m-t-60">
<div class="row bottom">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 m-l--5">
<div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
</div>
</div>
</div>
<div class="row bottom">
<div class="col-md-12 m-l--5">
<div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
</div>
</div>
</div>
<div class="row bottom">
<div class="col-md-12 m-l--5">
<div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
</div>
</div>
</div>
<div class="row bottom">
<div class="col-md-12 m-l--5">
<div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
<div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
</div>
</div>
</div>
<div class="row bottom">
<div class="col-md-12 m-l--5">
<div class="row m-l--5">
<div class="col-md-3 left cashier_number"></div>
<div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="card">
<div class="body">
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
@@ -50,9 +106,55 @@
<script type="text/javascript">
$(document).ready(function(){
if($('form').attr('id') == "new_dining_queue"){
if($('form').attr('id') == "new_dining_queue"){
var queue_no = $('.generate_no').text();
$('#dining_queue_queue_no').val(queue_no);
}
}
$( "input" ).focusin(function() {
$('.addfocus').removeClass('addfocus');
$( this ).addClass('addfocus');
});
$(".cashier_number").on('click', function(event){
if(event.handled !== true) {
var original_value='';
original_value = $('.addfocus').val();
var input_type = $(this).attr("data-type");
switch (input_type) {
case 'num':
var input_value = $(this).attr("data-value");
if (original_value == "0.0"){
$('.addfocus').val(input_value);
}
else{
$('.addfocus').val(original_value + '' + input_value);
}
break;
case 'add':
var input_value = $(this).attr("data-value");
amount = parseInt(input_value);
$('.addfocus').val(amount);
break;
case 'del' :
var discount_text=$('.addfocus').val();
$('.addfocus').val(discount_text.substr(0,discount_text.length-1));
break;
case 'clr':
$('.addfocus').val("");
break;
}
event.handled = true;
} else {
return false;
}
});
});
</script>

110
app/views/crm/dining_queues/index.html.erb
View File

@@ -11,42 +11,79 @@
<div class="row">
<!-- Column One -->
<div class="col-lg-11 col-md-11 col-sm-11">
<div class="col-lg-8 col-md-8 col-sm-8">
<div class="tab-content" style="max-height:670px; overflow-y:auto">
<!--- Panel 1 - Table Orders -->
<div class="active" role="tabpanel">
<div class="tab-pane" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @dining_queues.each do |queue| %>
<% if queue.status == "Assign"
@bg_color = "assign"
elsif queue.status == "Cancel"
@bg_color = "cancel"
else
@bg_color = "normal"
end
%>
<div class="card select-queue <%= @bg_color %>" data-id="<%= queue.id %>" style="width: 21.5rem;">
<div class="card-block">
<p class="hidden queue-id"><%= queue.id %></p>
<p class="hidden queue-status"><%= queue.status %></p>
<span class="card-title"><strong> Queue No : <%= queue.queue_no %></strong></span>
<span class="card-title pull-right"><strong> Seater : <%= queue.seater %></strong></span><br>
<span class="card-title"> Name : <%= queue.name %></span><br>
<span class="card-title"> Contact No : <%= queue.contact_no %></span>
<span class="card-title"> Remark : <%= queue.remark %></span>
</div>
</div>
<% end %>
</div>
</div>
<div class="tab-content" style="" id="custom-slimscroll">
<div class="card">
<div class="body">
<% if @dining_queues.count > 0 %>
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @dining_queues.each do |queue| %>
<% if queue.status == "Assign"
@bg_color = "assign"
elsif queue.status == "Cancel"
@bg_color = "cancel"
else
@bg_color = "normal"
end
%>
<div class="card select-queue <%= @bg_color %>" data-id="<%= queue.id %>" style="">
<div class="card-block">
<p class="hidden queue-id"><%= queue.id %></p>
<p class="hidden queue-status"><%= queue.status %></p>
<span class="card-title"><strong> Queue No : <%= queue.queue_no %></strong></span>
<span class="card-title float-right"><strong> Seater : <%= queue.seater %></strong></span><br>
<span class="card-title"> Name : <%= queue.name %></span><br>
<span class="card-title"> Contact No : <%= queue.contact_no %></span><br>
<span class="card-title"> Remark : <%= queue.remark %></span>
</div>
</div>
<% end %>
</div>
</div>
<% else %>
<p>There is no queue Now !</p>
<% end %>
</div>
</div>
</div>
<!-- tabs - End -->
</div>
<div class="col-md-3">
<div class="card">
<div class="body">
<h6><i class="material-icons md-18">view_headline QUEUE DETAILs</i> </h6>
<p>
1) Latest Queue No - <%= @complete_queue.last.queue_no%> <br>
2) Next Queue No - <% @next = @complete_queue.last.queue_no.to_i + 1%>
<%= @next%> <br>
3) Today Completed Queue - <strong> <%= @complete_queue.count %> </strong><br>
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
<p>
1) <%= t("views.right_panel.button.cancel") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.cancel_btn_txt") %>
<%= t("views.right_panel.detail.queue_txt") %> <br>
2) <%= t("views.btn.new") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.create_btn_txt") %>
<%= t("views.right_panel.detail.queue_txt") %><br>
2) <%= t("views.btn.assign") %>
<%= t("views.right_panel.button.queue") %> -
<%= t("views.right_panel.detail.assign_txt") %>
<%= t("views.right_panel.detail.queue_txt") %><br>
</p>
<h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
<p>
1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.home_txt") %> <br>
</p>
</div>
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block', 'data-no-turbolink' => true %>
@@ -112,3 +149,10 @@ function cancel_queue(id,url) {
}
</script>
<style type="text/css">
.card-columns {
-webkit-column-count: 4;
-moz-column-count: 4;
column-count: 4;
}
</style>

1
config/locales/en.yml
View File

@@ -91,6 +91,7 @@ en:
filter: "Filter"
del: "DEL"
clr: "CLR"
assign: "ASSIGN"
print_order_summary: "Print Order Summary"
memeber_card: "Member Card"