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

Update

Browse Source
This commit is contained in:
Nweni
2017-06-12 13:26:09 +06:30
parent b6bba9ecd4
commit ee208a5dcd
7 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/origami.scss
View File

@@ -21,8 +21,9 @@
} }
.cashier_number{ .cashier_number{
height:60px; width: 33%;
line-height:60px; height:70px;
line-height:70px;
text-align:center; text-align:center;
background:#54A5AF; background:#54A5AF;
// float:left; // float:left;
@@ -34,8 +35,8 @@
.pay{ .pay{
width: 98%; width: 98%;
height:210px; height:211px;
line-height:210px; line-height:211px;
text-align:center; text-align:center;
font-size:20px; font-size:20px;
color:white; color:white;
@@ -46,7 +47,7 @@
} }
.long{ .long{
width:100%; width:49%;
} }
.sold { .sold {

5
app/controllers/api/orders_controller.rb
View File

@@ -38,9 +38,8 @@ class Api::OrdersController < Api::ApiController
#Create Table Booking or Room Booking #Create Table Booking or Room Booking
if !params["booking_id"].nil? && params[:booking_id].to_i > 0 if !params["booking_id"].nil?
#@order.new_booking = false @order.new_booking = false
@order.new_booking = true
@order.booking_id = params[:booking_id] @order.booking_id = params[:booking_id]
end end

5
app/models/dining_facility.rb
View File

@@ -9,10 +9,11 @@ class DiningFacility < ApplicationRecord
scope :active, -> {where(is_active: true)} scope :active, -> {where(is_active: true)}
def get_current_booking def get_current_booking
booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='occupied' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) puts "enter booking"
booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)
if booking.count > 0 then if booking.count > 0 then
return booking[0] return booking[0].booking_id
else else
return nil return nil
end end

10
app/models/order.rb
View File

@@ -28,11 +28,13 @@ class Order < ApplicationRecord
booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
:checkin_at => Time.now.utc, :checkin_by => self.employee_name, :checkin_at => Time.now.utc, :checkin_by => self.employee_name,
:booking_status => "assign" }) :booking_status => "assign" })
table = DiningFacility.find(self.table_id)
table.status = "occupied"
table.save
else else
if (self.booking_id.to_i > 0 ) if (self.booking_id.to_i > 0 )
booking = Booking.find(self.booking_id) booking = Booking.find(self.booking_id)
end end
end end
booking.save! booking.save!
@@ -242,7 +244,7 @@ class Order < ApplicationRecord
.joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join orders on orders.order_id = booking_orders.order_id")
.joins("left join sales on sales.sale_id = bookings.sale_id") .joins("left join sales on sales.sale_id = bookings.sale_id")
.where("sales.sale_status='complete'") .where("sales.sale_status='complete'")
.group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id")
end end
@@ -269,7 +271,7 @@ class Order < ApplicationRecord
.joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id")
.joins("left join sales on sales.sale_id = sale_orders.sale_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id")
.where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true)
.group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id")
end end
#Origami: Cashier : to view order type Room #Origami: Cashier : to view order type Room
@@ -298,7 +300,7 @@ class Order < ApplicationRecord
left join sale_orders on sale_orders.order_id = orders.order_id left join sale_orders on sale_orders.order_id = orders.order_id
left join sales on sales.sale_id = sale_orders.sale_id") left join sales on sales.sale_id = sale_orders.sale_id")
.where("sales.sale_status<>'complete' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) .where("sales.sale_status<>'complete' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
.group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id") .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id,orders.customer_id")
end end

2
app/models/sale_payment.rb
View File

@@ -211,11 +211,11 @@ class SalePayment < ApplicationRecord
sObj.sale_payments.each do |spay| sObj.sale_payments.each do |spay|
all_received_amount += spay.payment_amount.to_f all_received_amount += spay.payment_amount.to_f
end end
if (self.sale.grand_total <= all_received_amount) if (self.sale.grand_total <= all_received_amount)
self.sale.payment_status = "paid" self.sale.payment_status = "paid"
self.sale.sale_status = "completed" self.sale.sale_status = "completed"
self.sale.save! self.sale.save!
#TODO: table status
rebat() rebat()
end end

28
app/views/origami/discounts/index.html.erb
View File

@@ -112,10 +112,10 @@
<div class="col-md-12 cashier_number long" data-value="5" data-type="add">5%</div> <div class="col-md-12 cashier_number long" data-value="5" data-type="add">5%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row bottom">
<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div> <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div> <div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
<div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div> <div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
</div> </div>
</div> </div>
</div> </div>
@@ -125,10 +125,10 @@
<div class="col-md-12 cashier_number long" data-value="10" data-type="add">10%</div> <div class="col-md-12 cashier_number long" data-value="10" data-type="add">10%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row bottom">
<div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div> <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div> <div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
<div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div> <div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
</div> </div>
</div> </div>
</div> </div>
@@ -138,10 +138,10 @@
<div class="col-md-12 cashier_number long" data-value="20" data-type="add">20%</div> <div class="col-md-12 cashier_number long" data-value="20" data-type="add">20%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row bottom">
<div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div> <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div> <div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
<div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div> <div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
</div> </div>
</div> </div>
</div> </div>
@@ -151,10 +151,10 @@
<div class="col-md-12 cashier_number long" data-value="30" data-type="add">30%</div> <div class="col-md-12 cashier_number long" data-value="30" data-type="add">30%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row bottom">
<div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div> <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-3 cashier_number" data-value="." data-type="num">.</div> <div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
<div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div> <div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
</div> </div>
</div> </div>
</div> </div>
@@ -166,8 +166,8 @@
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row">
<div class="col-md-3 cashier_number"></div> <div class="col-md-3 cashier_number"></div>
<div class="col-md-3 cashier_number red" data-type="del">DEL</div> <div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 cashier_number green" data-type="clr">CLR</div> <div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
</div> </div>
</div> </div>
</div> </div>

9
app/views/origami/payments/show.html.erb
View File

@@ -130,7 +130,7 @@
<div class=" cashier_number left" data-value="00" data-type="num">00</div> <div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class=" cashier_number"></div> <div class=" cashier_number" data-type="nett">Nett</div>
<div class=" cashier_number red left" data-type="del">Del</div> <div class=" cashier_number red left" data-type="del">Del</div>
<div class=" cashier_number green left" data-type="clr">Clr</div> <div class=" cashier_number green left" data-type="clr">Clr</div>
</div> </div>
@@ -195,6 +195,10 @@ $(document).on('click', '.cashier_number', function(event){
$('#cash').text("0.0"); $('#cash').text("0.0");
update_balance(); update_balance();
break; break;
case 'nett':
$('#cash').text($('#amount_due').text());
update_balance();
break;
} }
event.handled = true; event.handled = true;
} else { } else {
@@ -216,7 +220,6 @@ $( document ).ready(function() {
}); });
$('#pay').click(function() { $('#pay').click(function() {
if($('#balance').text() > 0){ if($('#balance').text() > 0){
alert(" Insufficient Amount!") alert(" Insufficient Amount!")
}else{ }else{
@@ -230,7 +233,7 @@ $( document ).ready(function() {
data: "cash="+ cash + "&sale_id=" + sale_id, data: "cash="+ cash + "&sale_id=" + sale_id,
success:function(result){ success:function(result){
alert("Thank you") alert("Thank you")
window.location.href = '/origami'; // window.location.href = '/origami';
} }
}); });
} }