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:
Moe Su
2017-06-12 18:18:32 +06:30
parent b47c983886 7a3957181c
commit 2db2be56d8
8 changed files with 122 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/order.rb
View File

@@ -231,20 +231,20 @@ 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("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true)
.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.order_id")
end end
#Origami: Cashier : to view booking order Table #Origami: Cashier : to view booking order Table
def self.get_completed_order def self.get_completed_order
completed_orders = Booking.select("sales.receipt_no,orders.status as order_status, completed_orders = Booking.select("sales.receipt_no,orders.status as order_status,orders.order_id,
bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id")
.joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .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 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 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='completed'") .where("sales.sale_status='completed'")
.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,sales.customer_id,orders.order_id")
end end
@@ -261,7 +261,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,orders.customer_id") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id")
end end

2
app/models/sale_item.rb
View File

@@ -12,7 +12,7 @@ class SaleItem < ApplicationRecord
def self.get_order_items_details(sale_id) def self.get_order_items_details(sale_id)
order_details = SaleItem.select("sales.total_tax as tax_amount, sales.grand_total as grand_total_amount , sales.total_discount as discount_amount,DATE_FORMAT(sales.receipt_date,'%Y-%m-%d %h:%m') as receipt_date, order_details = SaleItem.select("sales.total_tax as tax_amount, sales.grand_total as grand_total_amount , sales.total_discount as discount_amount,sales.receipt_date as receipt_date,
sales.cashier_name,sales.receipt_no,sale_items.product_name as item_name,sale_items.qty,sale_items.price,sale_items.unit_price as total_price") sales.cashier_name,sales.receipt_no,sale_items.product_name as item_name,sale_items.qty,sale_items.price,sale_items.unit_price as total_price")
.joins("left join sales on sales.sale_id = sale_items.sale_id") .joins("left join sales on sales.sale_id = sale_items.sale_id")
.where("sale_items.sale_id=?",sale_id) .where("sale_items.sale_id=?",sale_id)

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

@@ -27,12 +27,14 @@
@completed_orders.each do |cpo| @completed_orders.each do |cpo|
# ToDo no need check new # ToDo no need check new
# Assigned Id for new Order? Sale? # Assigned Id for new Order? Sale?
unique_id="" unique_id = ""
customer_id="" customer_id = ""
# For CSS- Class for Order? Sale? # For CSS- Class for Order? Sale?
sale_status="" sale_status=""
if cpo.order_status == 'new' if cpo.order_status == 'new'
unique_id=cpo.booking_id unique_id=cpo.booking_id
customer_id=cpo.order_customer_id customer_id=cpo.order_customer_id
# check selected item and assign # check selected item and assign
if @selected_item != nil if @selected_item != nil
@@ -54,6 +56,7 @@
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
<p class="hidden orders-id"><%= unique_id %></p> <p class="hidden orders-id"><%= unique_id %></p>
<p class="hidden customer-id"><%= customer_id %></p> <p class="hidden customer-id"><%= customer_id %></p>
<p class="hidden order-cid"><%= cpo.order_id %></p> <p class="hidden order-cid"><%= cpo.order_id %></p>

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

@@ -6,8 +6,8 @@
<div id="order-title"> <div id="order-title">
<table> <table>
<tr> <tr>
<td style="width:60%;"><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></td> <td style="width:55%;"><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></td>
<td style="width:40%;"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></td> <td style="width:45%;"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></td>
</tr> </tr>
<tr> <tr>
<td><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></td> <td><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></td>
@@ -232,7 +232,12 @@ $( document ).ready(function() {
url: "<%= origami_payment_cash_path %>", url: "<%= origami_payment_cash_path %>",
data: "cash="+ cash + "&sale_id=" + sale_id, data: "cash="+ cash + "&sale_id=" + sale_id,
success:function(result){ success:function(result){
alert("Thank you") if($('#balance').text() < 0){
alert("Changed amount " + $('#balance').text() * (-1) )
}else{
alert("Thank you")
}
window.location.href = '/origami'; window.location.href = '/origami';
} }
}); });

34
app/views/origami/redeem_payments/index.html.erb
View File

@@ -1,7 +1,7 @@
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-3">
<div class="card"> <div class="card" style="margin-top:10px;padding-top:20px;">
<div class="rebate-form"> <div class="rebate-form">
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -23,14 +23,14 @@
<div class="col-lg-7 col-md-7 col-sm-7"> <div class="col-lg-7 col-md-7 col-sm-7">
<div class="row"> <div class="row" style="margin-top:10px;">
<div class="col-md-12"> <div class="col-md-12">
<div class="row"> <div class="row">
<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 class="col-md-5"> <div class="col-md-5">
@@ -39,10 +39,10 @@
</div> </div>
<div class="row"> <div class="row">
<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 class="col-md-5"> <div class="col-md-5">
@@ -51,10 +51,10 @@
</div> </div>
<div class="row"> <div class="row">
<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 class="col-md-5"> <div class="col-md-5">
@@ -63,10 +63,10 @@
</div> </div>
<div class="row"> <div class="row">
<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 class="col-md-5"> <div class="col-md-5">
@@ -75,10 +75,10 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row bottom">
<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 class="col-md-5"> <div class="col-md-5">

5
db/seeds.rb
View File

@@ -155,11 +155,14 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance",
{membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
{membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"} {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}
]) ])
payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http//192.168.1.47:3006"})
payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http//192.168.1.47:3006"})
payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
# shop = Shop.create( # shop = Shop.create(
# {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", # {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon",
# country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", # country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license",
# activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"} # activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"}
# ) # )