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

change order reservation

Browse Source
This commit is contained in:
phyusin
2018-04-27 13:47:54 +06:30
parent 172c2136cc
commit 11473c7fcd
9 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/channels/order_reservation.js
View File

@@ -18,7 +18,14 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', {
var time = [date.getHours() - (isPM && !isMidday ? 12 : 0),
date.getMinutes() || '00'].join(':') +
(isPM ? ' PM' : 'AM');
var requested_date = date.getDate() + '-' + date.getMonth() + '-' + date.getFullYear()
var month = 0;
if(parseInt(newDate.getMonth()) > 10){
month = parseInt(newDate.getMonth()) + 1;
}
else{
month = '0' + (parseInt(newDate.getMonth()) + 1);
}
var requested_date = date.getFullYear() +'-'+ month +'-'+ date.getDate();
row = '<tr class="custom-tr first-'+rowCount+'" style="" data-id="'+order.order_reservation_id+'" data-sr-no="'+rowCount+'">'
+'<td width ="5%" class="align-left">'+rowCount

28
app/assets/javascripts/order_reservation.js
View File

@@ -63,6 +63,25 @@ $(function() {
var delivery = data["delivery"];
var items = data["order_items"];
var item_list = $('.summary-items');
var date = new Date(data.requested_time);
var newDate = new Date(date.getTime() + (date.getTimezoneOffset() * 60000));
var isPM = newDate.getHours() >= 12;
var isMidday = newDate.getHours() == 12;
var time = [newDate.getHours() - (isPM && !isMidday ? 12 : 0),
newDate.getMinutes() || '00'].join(':') +
(isPM ? ' PM' : 'AM');
var month = 0;
if(parseInt(newDate.getMonth()) > 10){
month = parseInt(newDate.getMonth()) + 1;
}
else{
month = '0' + (parseInt(newDate.getMonth()) + 1);
}
var requested_date = newDate.getFullYear() + '-' + month +'-'+ newDate.getDate() +' '+time;
item_list.empty();
if(items!=undefined && items!=""){
@@ -84,9 +103,10 @@ $(function() {
$('.summary-items').append(row);
}
$('#requested_date_time').text(requested_date);
$('#sub_total').text(data.total_amount);
$('#delivery_fee').text(delivery.delivery_fee);
$('#total_charges').text(0);
$('#delivery_fee').text(delivery.delivery_fee? delivery.delivery_fee : '0.0');
$('#total_charges').text(data.convenience_charge?data.convenience_charge : '0.0');
$('#total_tax').text(data.total_tax);
$('#grand_total').text(data.grand_total);
@@ -100,9 +120,9 @@ $(function() {
$('#callback_url').text(data.callback_url);
$('#order_id').text(data.order_reservation_id);
if(delivery.provider == "direct_delivery"){
if(delivery.delivery_type == "service"){
$("#delivery_info").text("(DELIVERY)");
}else if(delivery.provider == "self_pick_up"){
}else if(delivery.delivery_type == "self_pick_up"){
$("#delivery_info").text("(PICK-UP)");
}

3
app/assets/stylesheets/order_reservation.scss
View File

@@ -85,4 +85,7 @@
}
.tr-active{
background-color : #FFCDD2;
}
.div_order_margin {
margin: 0px 0px 0px -5px !important
}

3
app/controllers/concerns/token_verification.rb
View File

@@ -24,8 +24,7 @@ module TokenVerification
end
end
@user = Employee.
(token)
@user = Employee.authenticate_by_token(token)
if @user
return true
#Maybe log - login?

1
app/controllers/origami/order_reservation_controller.rb
View File

@@ -2,6 +2,7 @@ class Origami::OrderReservationController < BaseOrigamiController
def index
@order = OrderReservation.latest_order
@count_on_order = OrderReservation.get_count_on_order
end
def update

6
app/models/order_reservation.rb
View File

@@ -29,9 +29,11 @@ class OrderReservation < ApplicationRecord
order_reservation.payment_type = order_reserve[:payment_info][:payment_type]
order_reservation.payment_status = order_reserve[:payment_info][:payment_status]
order_reservation.payment_ref = order_reserve[:payment_info][:payment_ref]
order_reservation.taxes = order_reserve[:payment_info][:taxes]
order_reservation.total_amount = order_reserve[:payment_info][:sub_total]
order_reservation.total_tax = order_reserve[:payment_info][:total_tax]
order_reservation.discount_amount = order_reserve[:payment_info][:discount_amount]
order_reservation.convenience_charge = order_reserve[:payment_info][:convenience_charge]
order_reservation.grand_total = order_reserve[:payment_info][:grand_total]
order_reservation.order_remark = order_reserve[:order_info][:order_remark]
end
@@ -272,6 +274,10 @@ class OrderReservation < ApplicationRecord
order_reservation.save
end
def self.get_count_on_order
order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count, status").group("status")
end
private
def generate_custom_id
self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS")

77
app/views/origami/order_reservation/index.html.erb
View File

@@ -2,19 +2,47 @@
<%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %>
<div class="container-fluid">
<div class="row m-t--10">
<div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
<div class="col-lg-4 col-md-4 col-sm-4 div_order_margin">
<ul class="nav nav-tabs tab-col-teal" role="tablist">
<li class="nav-item active" data-color="#F44336" data-type="pending" style="background-color: #F44336;">
<a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">1</p> <%= t :pending %></a>
<li class="nav-item red" data-color="#F44336" data-type="pending">
<a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "new" %>
<%= count_order.count %>
<% end
end %>
<% end %></p> <%= t :pending %></a>
</li>
<li class="nav-item" data-color="#673AB7" data-type="processing" style="background-color: #673AB7;">
<a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">2</p> <%= t :processing %></a>
<li class="nav-item purple" data-color="#673AB7" data-type="processing">
<a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "accepted" %>
<%= count_order.count %>
<% end
end %>
<% end %></p> <%= t :processing %></a>
</li>
<li class="nav-item" data-color="#009688" data-type="delivery" style="background-color: #009688;">
<a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">3</p> <%= t :delivering %></a>
<li class="nav-item darkgreen" data-color="#009688" data-type="delivery" style="background-color: #009688;">
<a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "send_to_kitchen" %>
<%= count_order.count %>
<% end
end %>
<% end %></p> <%= t :delivering %></a>
</li>
<li class="nav-item" data-color="#03A9F4" data-type="completed" style="background-color: #03A9F4;">
<a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num">4</p> <%= t :completed %></a>
<a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "ready_to_delivery" %>
<%= count_order.count %>
<% end
end %>
<% end %></p> <%= t :completed %></a>
</li>
</ul>
@@ -32,10 +60,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%d-%m-%Y") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -67,10 +95,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -101,10 +129,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -135,10 +163,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -164,9 +192,9 @@
<div class="card-header custom-card-header" style="color:">
<table class="table">
<tr>
<td width ="30%" class="header-td align-left">
<b class="col-pink font-16"><span id="sr_number"></span> </b>
<span class="font-13"><span id="delivery_info"></span></span>
<td width ="50%" class="header-td align-left">
<b class="col-pink font-16"><span id="sr_number"></span> </b>
<b><span class="font-15" id="requested_date_time"></span></b>
</td>
<td class="header-td align-left"></td>
<td width ="50%" class="header-td font- align-right"><b><span id="contact_info"></span></b></td>
@@ -199,7 +227,7 @@
</tr>
<tr>
<td width ="70%" class="footer-td align-left">
DELIVERY FEES (PICK-UP)
DELIVERY FEES <span id="delivery_info"></span>
</td>
<td width ="30%" class="footer-td align-right" id="delivery_fee">0.00</td>
</tr>
@@ -227,9 +255,6 @@
</td>
<td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
</tr>
<tr>
<td colspan="2" id="order_remark"></td>
</tr>
<tr>
<td width ="50%" class="footer-td align-left col-blue">
<button type="button" class="btn btn-lg bg-red waves-effect" id="cancel" data-value="cancel">
@@ -294,6 +319,12 @@
<b id="delivery_to"></b>
</td>
</tr>
<tr>
<td class="body-td align-left">
<span class="font-13">REMARK</span><br>
<b id="order_remark"></b>
</td>
</tr>
</tbody>
</table>
</div>

2
config/secrets.yml
View File

@@ -13,7 +13,7 @@
development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: cloud
server_mode: application
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L

2
db/migrate/20180406080240_create_order_reservations.rb
View File

@@ -13,9 +13,11 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
t.string :payment_type
t.string :payment_status
t.string :payment_ref
t.json :taxes
t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :discount_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :convenience_charge, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.string :status, :null => false, :default => "new"
t.string :order_remark