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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-06 10:26:01 +06:30
parent 038a3c1696 eaec6a39b4
commit 187a050c19
14 changed files with 389 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
app/assets/javascripts/origami/payment.js Normal file
View File

@@ -0,0 +1,113 @@
// $(document).on('touchstart click', '.keypad', function(event){
// event.stopPropagation();
// event.preventDefault();
// if(event.handled !== true) {
//
// // Do your magic here.
// var input_value = $(this).attr("data-value");
// switch (input_value) {
//
// case 'delete':
// process_delete_payment();
// break;
//
// case 'foc':
// remove_input_action();
// $(".foc").attr("data-action","true");
// if(customerName.toString() != " "){ //if already chosen customer
// if($("#foc_reason_lists").attr("foc_reason") == ' '){
// alert("Please! Choose or Add FOC reason");
// foc_additional_form();
// }
// else{
// process_foc_payment();
// }
// }
// else{
// alert("Please! Choose or Save Customer");
// foc_additional_form();
// }
// break;
//
// case 'nett':
// remove_input_action();
// $(".nett").attr("data-action","true");
// if($(".credit_note_payment").hasClass("payment_selected")){
// if(customerName == " "){
// alert("Please! Choose or Save Customer");
// showCustomer();
// }
// else{
// $("#accept_payment_btn").attr("data-payment","credit");
// process_nett_payment();
// }
// }
// else{
// process_nett_payment();
// }
// break;
//
// case 'edit':
// process_edit_invoice();
// break;
//
// case 'cancel':
// remove_input_action();
// var status = $("#label_amountdue").attr("data-status");
// if (status != 'completed' && status != 'void'){
// $(".cancel").attr("data-action","true");
// var message = confirm("Are you sure to void? Please, add reason!");
// if (message == true) {
// $(".additional_form").hide();
// $("#void_sale_additional_form").show();
// process_cancel_payment();
// }
// }
// else{
// $(".cancel").addClass("dim");
// }
// break;
//
// case 'ent':
// amount_due = parseFloat($("#label_amountdue").attr("data-original"));
// other_amt = parseFloat($("#label_cash_amount").attr("data-value"));
// credit_amount = parseFloat($("#label_credit_note").text());
// if ($(".credit_note_payment").hasClass("payment_selected") && credit_amount > 0){
// if(customerName.toString() != " "){
// if(credit_amount > (amount_due - other_amt)){
// alert("You shouldn't exceed the amount due.");
// }
// else{
// $("#accept_payment_btn").attr("data-payment","credit");
// update_balance_due();
// }
// }
// else{
// alert("Please! Choose or Save Customer");
// }
// }
// else{
// update_balance_due();
// }
//
// break;
// case 'clear':
// process_clear_payment();
// break;
//
// default:
//
// var existing_value = $(".payment_selected span").text();
//
// if (existing_value == "0" || existing_value == "0.00") { existing_value = ""; }
// existing_value = existing_value + input_value;
// $(".payment_selected span").text(existing_value);
//
// }
//
//
// event.handled = true;
// } else {
// return false;
// }
// });

18
app/assets/stylesheets/orgiami.scss
View File

@@ -7,3 +7,21 @@
// min-height: 75rem;
// padding-top: 4.5rem;
// }
.cashier_number{
height:76px;
line-height:80px;
text-align:center;
background:#54A5AF;
float:left;
margin:2px;
font-size:20px;
color:white;
cursor:pointer;
}
.cashier_number:hover{
background:#A9F5F2;
}
.long{
width:100%
}

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

@@ -4,9 +4,11 @@ class Origami::HomeController < BaseOrigamiController
@booking_rooms = Order.get_booking_order_rooms()
@orders = Order.get_orders()
end
def show
str = []
if !params[:sale_id].nil?
@order_details = SaleItem.get_order_items_details(params[:sale_id])
@order_details.each do |ord_detail|

8
app/controllers/origami/payments_controller.rb
View File

@@ -1,6 +1,14 @@
class Origami::PaymentsController < BaseOrigamiController
def index
end
def create
end
def show
end
end

12
app/controllers/origami/request_bills_controller.rb
View File

@@ -1,7 +1,9 @@
class Origami::RequestBillsController < BaseOrigamiController
def show
def create
@sale = Sale.new
booking_id = params[:id]
check_booking = Booking.find_by_booking_id(booking_id)
if check_booking.sale_id.nil?
@@ -15,13 +17,21 @@ class Origami::RequestBillsController < BaseOrigamiController
end
unique_code="ReceiptBillPdf"
print_settings=PrintSetting.find_by_unique_code(unique_code)
printer = Printer::ReceiptPrinter.new(print_settings)
printer.print_receipt_bill(print_settings,@sale_items,@sale,@sale_data)
end
def show
sale_id = params[:sale_id]
if Sale.exists?(sale_id)
@sale_data = Sale.find_by_id(sale_id)
end
end
end

1
app/models/booking.rb
View File

@@ -1,3 +1,4 @@
class Booking < ApplicationRecord
self.primary_key = "booking_id"

23
app/models/order.rb
View File

@@ -210,6 +210,18 @@ class Order < ApplicationRecord
#Origami: Cashier : to view order type Table
def self.get_order_table
order_table = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price,
order_items.id as order_items_id,dining_facilities.name as table_name")
.joins("left join booking_orders on booking_orders.order_id = orders.id
left join bookings on bookings.id = booking_orders.id
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
left join order_items on order_items.order_id = orders.id")
.where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
.group("orders.id, order_items.id,dining_facilities.name")
def self.get_booking_order_table
booking_orders = Booking.select("sales.receipt_no,orders.status as order_status,
bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
@@ -258,16 +270,9 @@ class Order < ApplicationRecord
left join sale_orders on sale_orders.order_id = orders.order_id
left join sales on sales.sale_id = sale_orders.sale_id")
.where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
.group("orders.order_id")
# Booking.select("sales.receipt_no,orders.status as order_status,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
# .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
# .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
# .joins("left join orders on orders.order_id = booking_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")
# .where("booking_orders.order_id IS NOT NULL and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
# .group("orders.order_id")
.group("orders.id,order_items.id,dining_facilities.name")
end

3
app/models/sale.rb
View File

@@ -31,7 +31,8 @@ class Sale < ApplicationRecord
end
booking.sale_id = sale_id
end
order = booking.booking_orders.take.order
link_order_sale(order.id)
return status
end
end

20
app/views/origami/home/index.html.erb
View File

@@ -22,6 +22,7 @@
<div class="tab-pane active" id="tables" role="tabpanel">
<!--- Booking Items -->
<div class="card-columns" style="padding-top:10px">
<% if @booking_orders %>
<% @booking_orders.each do |booking_order| %>
<% if !booking_order.order_status = 'new'%>
@@ -50,6 +51,7 @@
<div class="tab-pane" id="rooms" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:scroll">
<!--- Booking Items -->
<div class="card-columns" style="padding-top:10px">
<% if @booking_rooms %>
<% @booking_rooms.each do |booking_room| %>
<% if !booking_room.order_status = 'new'%>
@@ -82,6 +84,7 @@
<!--- Booking Items -->
<div class="card-columns" style="padding-top:10px">
<% if @orders %>
<% @orders.each do |order| %>
<% if !order.order_status = 'new'%>
@@ -193,7 +196,7 @@
<!-- Cashier Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Discount</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Pay</button>
<button type="button" id="pay" class="btn btn-primary btn-lg btn-block" >Pay</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div>
</div>
@@ -202,6 +205,7 @@
var old_table_name = ""
var table_or_order_id = 0
function callOrderDetails(sale_order_id){
var order_id = 0
var data_val = ""
@@ -225,6 +229,7 @@ function callOrderDetails(sale_order_id){
$("#table-order-"+order_id).addClass("selected_color")
old_order_id = order_id
}
$("#order-detail-header").html("")
$("#order-detail-header").append("Table Name : "+document.getElementById("table-name-"+order_id).innerHTML)
$("#sub-total").html("")
@@ -249,6 +254,7 @@ function callOrderDetails(sale_order_id){
+'<td style="width:20%; text-align:right"><span id="item-total-price">'+(parse_data.qty*parse_data.price)+'</span></td>'
+'</tr>>'
tbody += row
discount_amount = result[i].discount_amount;
tax_amount = result[i].tax_amount;
@@ -257,10 +263,10 @@ function callOrderDetails(sale_order_id){
receipt_no = result[i].receipt_no;
cashier_name = result[i].cashier_name;
receipt_date = result[i].receipt_date;
}
row = "</tbody>"
$("#append-table").append(tbody)
$("#sub-total").append((sub_total)+"<br/>")
if (discount_amount > 0 ) {
@@ -299,10 +305,18 @@ function callOrderDetails(sale_order_id){
$( document ).ready(function() {
$('#request_bills').click(function() {
window.location.href = '/origami/request_bills/'+table_or_order_id;
window.location.href = '/origami/request_bills/'+ table_or_order_id
return false;
});
});
$( document ).ready(function() {
$('#pay').click(function() {
window.location.href = '/origami/sale/'+ 10 + "/payment"
return false;
});
});
</script>
<style type="text/css">
.selected_color{

112
app/views/origami/request_bills/show.html.erb
View File

@@ -1,3 +1,4 @@
<div class="row">
<div class="col-lg-5 col-md-5 col-sm-3">
<div class="card" >
@@ -24,8 +25,7 @@
<table class="table" id="append-table">
<tbody>
<% sub_total = 0 %>
<% if @sale_items %>
<% @sale_items.each do |sale_item| %>
<% @sale_data.sale_items.each do |sale_item| %>
<% sub_total += sale_item.qty*sale_item.unit_price%>
<tr>
<td style="width:60%; text-align:left">
@@ -39,7 +39,6 @@
</td>
</tr>
<%end %>
<%end %>
</tbody>
</table>
</div>
@@ -70,4 +69,111 @@
</div>
</div>
</div>
<div class="col-lg-5 col-md-5 col-sm-3">
<div class="row">
<div class="col-md-8">AMOUNT DUE</div>
<div class="col-md-4"><%= @sale_data.grand_total %></div>
</div>
<hr>
<div class="row">
<div class="col-md-8">CASH</div>
<div class="col-md-4">0.0</div>
</div>
<hr>
<div class="row">
<div class="col-md-8">CREDIT</div>
<div class="col-md-4">0.0</div>
</div>
<hr>
<div class="row">
<div class="col-md-8">CARD</div>
<div class="col-md-4">0.0</div>
</div>
<hr>
<div class="row">
<div class="col-md-8">BALANCE</div>
<div class="col-md-4">0.0</div>
</div>
<hr>
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number" data-value="1">1</div>
<div class="col-md-3 cashier_number">2</div>
<div class="col-md-3 cashier_number">3</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">1000</div>
</div>
</div>
<div class="row">
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number">4</div>
<div class="col-md-3 cashier_number">5</div>
<div class="col-md-3 cashier_number">6</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">5000</div>
</div>
</div>
<div class="row">
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number">7</div>
<div class="col-md-3 cashier_number">8</div>
<div class="col-md-3 cashier_number">9</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">10000</div>
</div>
</div>
<div class="row">
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number">0</div>
<div class="col-md-3 cashier_number">.</div>
<div class="col-md-3 cashier_number">00</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">50000</div>
</div>
</div>
<div class="row">
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number"></div>
<div class="col-md-3 cashier_number">DEL</div>
<div class="col-md-3 cashier_number">CLR</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">ENTER</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).on('click', '.cashier_number', function(event){
event.stopPropagation();
event.preventDefault();
if(event.handled !== true) {
var input_value = $(this).attr("data-value");
switch (input_value) {
}
event.handled = true;
} else {
return false;
}
});
</script>

1
config/routes.rb
View File

@@ -73,6 +73,7 @@ Rails.application.routes.draw do
resources :customers, only: [:index,:new, :create ] #add customer type
end
resources :request_bills, only: [:show]
get 'sale/:sale_id/payment' => 'request_bills#show'
end
#--------- Waiter/Ordering Station ------------#

5
spec/models/print_setting_spec.rb~HEAD Normal file
View File

@@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe PrintSetting, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end

5
spec/models/print_setting_spec.rb~crm Normal file
View File

@@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe PrintSetting, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end