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

Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm

Browse Source
This commit is contained in:
Aung Myo
2017-06-22 09:34:45 +06:30
parent d95b7c7abc 2525bfbdd9
commit de38a50522
10 changed files with 599 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@
// min-height: 75rem; // min-height: 75rem;
// padding-top: 4.5rem; // padding-top: 4.5rem;
// } // }
.others-payment{ .others-payment{
line-height:100px; line-height:100px;
text-align:center; text-align:center;
@@ -41,12 +42,13 @@
.pay{ .pay{
width: 98%; width: 98%;
height:211px; height:211px;
line-height:211px; line-height:211px;
text-align:center; text-align:center;
font-size:20px; font-size:20px;
color:white; color:white;
} }
.payment{ .payment{
height:70px;line-height:70px;align:center;color:white;font-size:16px;margin-bottom:1px; height:70px;line-height:70px;align:center;color:white;font-size:16px;margin-bottom:1px;
} }
@@ -58,6 +60,7 @@
.credit-color{ .credit-color{
background-color:#FFCCBC; background-color:#FFCCBC;
} }
.other-payment-color{ .other-payment-color{
background-color:#E1BEE7; background-color:#E1BEE7;
} }
@@ -66,6 +69,19 @@
background:#A9F5F2; background:#A9F5F2;
} }
.action-btn {
height: 60px;
margin-bottom: 5px;
}
.bottom-5 {
margin-bottom: 5px;
}
.fluid {
width: 100%;
}
.style2 { .style2 {
border-top: 3px double #8c8b8b; border-top: 3px double #8c8b8b;
} }
@@ -87,6 +103,11 @@
background-color: blue !important; background-color: blue !important;
} }
.selected-account {
color: #fff !important;
background-color: blue !important;
}
/* Reciept Style */ /* Reciept Style */
#order-charges-table td { #order-charges-table td {
border-top: none !important; border-top: none !important;

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

@@ -6,52 +6,93 @@ class Origami::DiscountsController < BaseOrigamiController
if Sale.exists?(sale_id) if Sale.exists?(sale_id)
@sale_data = Sale.find(sale_id) @sale_data = Sale.find(sale_id)
end end
@accounts = Account.all
end
#discount page show from origami index with selected order
def create
sale_id = params[:sale_id]
discount_items = JSON.parse(params[:discount_items])
overall_discount = params[:overall_discount]
sub_total = params[:sub_total]
if Sale.exists?(sale_id)
sale = Sale.find(sale_id)
sale.total_discount = overall_discount.to_f
sale.total_amount = sub_total
sale.grand_total = (sub_total - overall_discount.to_f) + sale.total_tax;
if discount_items.length > 0
#save sale item for discount
discount_items.each do |di|
puts di
origin_sale_item = SaleItem.find(di["id"])
sale_item = SaleItem.new
sale_item.sale_id = sale_id
sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
sale_item.product_name = di["name"]
sale_item.remark = "Discount"
sale_item.qty = 1
sale_item.unit_price = di["price"]
sale_item.taxable_price = di["price"]
sale_item.is_taxable = 0
sale_item.price = di["price"]
sale_item.save
end
sale.save
end
end
end end
#discount for selected order #discount for selected order
def create # def create
sale_id = params[:sale_id] # sale_id = params[:sale_id]
sale_item_id = params[:sale_item_id] # sale_item_id = params[:sale_item_id]
discount_type = params[:discount_type] # discount_type = params[:discount_type]
discount_value = params[:discount_value] # discount_value = params[:discount_value]
discount_amount = params[:discount_amount] # discount_amount = params[:discount_amount]
grand_total = params[:grand_total] # grand_total = params[:grand_total]
product_name = "Overall Discount" # product_name = "Overall Discount"
if discount_type == 0 # if discount_type == 0
remark="Discount " + discount_amount + " as net" # remark="Discount " + discount_amount + " as net"
else # else
remark="Discount " + discount_amount + " as percentage" # remark="Discount " + discount_amount + " as percentage"
end # end
#update discount for sale # #update discount for sale
sale = Sale.find(sale_id) # sale = Sale.find(sale_id)
sale.total_discount = sale.total_discount + discount_amount.to_f # sale.total_discount = sale.total_discount + discount_amount.to_f
sale.grand_total = grand_total # sale.grand_total = grand_total
sale.save # sale.save
#save sale item for discount # #save sale item for discount
if sale_item_id != nil # if sale_item_id != nil
origin_sale_item = SaleItem.find(sale_item_id) # origin_sale_item = SaleItem.find(sale_item_id)
product_name = origin_sale_item.product_name + "-Disocunt" # product_name = origin_sale_item.product_name + "-Disocunt"
end # end
sale_item = SaleItem.new # sale_item = SaleItem.new
#pull # #pull
sale_item.sale_id = sale_id # sale_item.sale_id = sale_id
sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id # sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
sale_item.product_name = product_name # sale_item.product_name = product_name
sale_item.remark = remark # sale_item.remark = remark
sale_item.qty = 1 # sale_item.qty = 1
sale_item.unit_price = (0-discount_amount.to_f) # sale_item.unit_price = (0-discount_amount.to_f)
sale_item.taxable_price = discount_amount # sale_item.taxable_price = discount_amount
sale_item.is_taxable = 0 # sale_item.is_taxable = 0
sale_item.price = sale_item.qty * sale_item.unit_price # sale_item.price = sale_item.qty * sale_item.unit_price
sale_item.save # sale_item.save
redirect_to origami_path(sale_id) # redirect_to origami_path(sale_id)
end # end
end end

1
app/models/menu_item.rb
View File

@@ -24,6 +24,7 @@ class MenuItem < ApplicationRecord
if (!mt_instance.nil?) if (!mt_instance.nil?)
menu_item = MenuItem.find(mt_instance.menu_item_id) menu_item = MenuItem.find(mt_instance.menu_item_id)
menu_item_hash[:type] = menu_item.type menu_item_hash[:type] = menu_item.type
menu_item_hash[:account_id] = menu_item.account_id
menu_item_hash[:item_code] = menu_item.item_code menu_item_hash[:item_code] = menu_item.item_code
menu_item_hash[:item_instance_code] = mt_instance.item_instance_code menu_item_hash[:item_instance_code] = mt_instance.item_instance_code
menu_item_hash[:name] = menu_item.name.to_s + " - " + mt_instance.item_instance_name.to_s menu_item_hash[:name] = menu_item.name.to_s + " - " + mt_instance.item_instance_name.to_s

2
app/models/order.rb
View File

@@ -82,7 +82,7 @@ class Order < ApplicationRecord
set_order_items set_order_items
end end
OrderItem.processs_item(menu_item[:item_code], menu_item[:name], OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id],
item[:quantity],menu_item[:price], item[:options], set_order_items, self.id, item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
self.employee_name) self.employee_name)

3
app/models/order_item.rb
View File

@@ -20,12 +20,13 @@ class OrderItem < ApplicationRecord
# option_values : [], # option_values : [],
# sub_order_items : [], # sub_order_items : [],
# } # }
def self.processs_item (item_code, menu_name, qty,price, options, set_menu_items, order_id, item_order_by) def self.processs_item (item_code, menu_name, account_id, qty,price, options, set_menu_items, order_id, item_order_by)
orderitem = OrderItem.create do |oitem| orderitem = OrderItem.create do |oitem|
oitem.order_id = order_id oitem.order_id = order_id
oitem.item_code = item_code oitem.item_code = item_code
oitem.item_name = menu_name oitem.item_name = menu_name
oitem.account_id = account_id
oitem.qty = qty oitem.qty = qty
oitem.price = price oitem.price = price
oitem.options = options oitem.options = options

1
app/models/sale.rb
View File

@@ -141,6 +141,7 @@ class Sale < ApplicationRecord
#pull #pull
sale_item.product_code = item.item_code sale_item.product_code = item.item_code
sale_item.product_name = item.item_name sale_item.product_name = item.item_name
sale_item.account_id = item.account_id
sale_item.remark = item.remark sale_item.remark = item.remark
sale_item.qty = item.qty sale_item.qty = item.qty

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

@@ -1,7 +1,6 @@
<div class="row"> <div class="row">
<!-- Column One --> <!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<!-- Order Details --> <!-- Order Details -->
<div class="card" > <div class="card" >
<!-- <div class="card-header"> <!-- <div class="card-header">
@@ -31,8 +30,9 @@
<% sub_total = 0 %> <% sub_total = 0 %>
<% @sale_data.sale_items.each do |sale_item| %> <% @sale_data.sale_items.each do |sale_item| %>
<% sub_total += sale_item.qty*sale_item.unit_price%> <% sub_total += sale_item.qty*sale_item.unit_price%>
<tr class="discount-item-row" id=<%= sale_item.sale_item_id %> > <tr class="item-row" id=<%= sale_item.sale_item_id %> >
<td style="width:60%; text-align:left"> <td style="width:60%; text-align:left">
<span id="item-account-type" class="hidden"><%=sale_item.account_id%></span>
<span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span> <span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
</td> </td>
<td style="width:20%; text-align:right"> <td style="width:20%; text-align:right">
@@ -62,7 +62,7 @@
</tr> --> </tr> -->
<tr> <tr>
<td class="charges-name"><strong>Discount:</strong></td> <td class="charges-name"><strong>Discount:</strong></td>
<td class="item-attr"><strong id="order-discount">(<%=@sale_data.total_discount rescue 0%>)</strong></td> <td class="item-attr">(<strong id="order-discount"><%=@sale_data.total_discount rescue 0%></strong>)</td>
</tr> </tr>
<tr class="hidden"> <tr class="hidden">
<td class="charges-name"><strong>Tax:</strong></td> <td class="charges-name"><strong>Tax:</strong></td>
@@ -75,104 +75,476 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- Column One --> <!-- Column One -->
<!-- Column Two --> <!-- Column Two -->
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<!-- Discount Amount --> <!-- Discount Amount -->
<div class="card row"> <div class="card">
<div class="card-header"> <div class="card-header">
<div><strong id="order-title">Overall Discount</strong></div> <div><strong id="order-title">Discount Control</strong></div>
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title"> <div class="card-title">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"> <div class="col-md-12">
<div class="col-md-3"> <div class="form-group">
<select name="discount_type" id="discount-type" class="form-control">
<option value=0 >Net</option>
<option value=1 >Percentage</option>
</select>
</div>
<div class="col-md-9">
<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" /> <input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
</div> </div>
</div> <div class="form-group">
<button id="pay-discount" class="btn btn-primary long">Discount</button> <%
@accounts.each do |acc|
%>
<button id="account-<%= acc.id %>" class="accounts-type btn btn-default"><%= acc.title %></button>
<% end %>
</div>
</div>
</div> </div>
</div> </div>
<hr /> <hr />
<div class="col-md-12"> <div class="row">
<div class="row"> <div class="col-md-9">
<div class="col-md-5"> <div class="row bottom">
<div class="col-md-12 cashier_number long" data-value="5" data-type="add">5%</div> <div class="col-md-3">
</div> <div class="fluid cashier_number" data-value="5" data-type="add">5%</div>
<div class="col-md-7"> </div>
<div class="row bottom"> <div class="col-md-9">
<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div> <div class="col-md-4 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-4 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 class="col-md-4 left cashier_number" data-value="3" data-type="num">3</div>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row bottom">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="10" data-type="add">10%</div> <div class="fluid cashier_number" data-value="10" data-type="add">10%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row bottom"> <div class="col-md-4 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-4 left 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-4 left 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 class="row"> <div class="row bottom">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="20" data-type="add">20%</div> <div class="fluid cashier_number" data-value="20" data-type="add">20%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row bottom"> <div class="col-md-4 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-4 left 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-4 left 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 class="row"> <div class="row bottom">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="30" data-type="add">30%</div> <div class="fluid cashier_number" data-value="30" data-type="add">30%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row bottom"> <div class="col-md-4 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-4 left 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-4 left 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 class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-3">
<div class="col-md-12 cashier_number long" data-value="50" data-type="add">50%</div> <div class="fluid cashier_number" data-value="50" data-type="add">50%</div>
</div> </div>
<div class="col-md-7"> <div class="col-md-9">
<div class="row"> <div class="col-md-4 cashier_number"></div>
<div class="col-md-3 cashier_number"></div> <div class="col-md-4 left 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-4 left 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>
</div> <div class="col-md-3">
<div class="form-group">
<button id="net" class="btn btn-warning fluid action-btn">Net</button>
<button id="percentage" class="btn btn-primary fluid action-btn">Percentage</button>
<button id="pay-discount" class="btn btn-danger fluid action-btn">Enter</button>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).ready(function(){
$(".cashier_number").on('click', function(event){
if(event.handled !== true) {
var original_value=0;
original_value = $('#discount-amount').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"){
$('#discount-amount').val(input_value);
// update_balance();
}
else{
$('#discount-amount').val(original_value + '' + input_value);
// update_balance();
}
break;
case 'add':
var input_value = $(this).attr("data-value");
amount = parseInt(input_value);
$('#discount-amount').val(amount);
// update_balance();
break;
case 'del' :
var discount_text=$('#discount-amount').val();
$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));
// update_balance();
break;
case 'clr':
$('#discount-amount').val("0.0");
// update_balance();
break;
}
event.handled = true;
} else {
return false;
}
});
// Select Sale Item
$('.item-row').on('click',function(){
if($(this).hasClass('selected-item') == true){
$(this).removeClass('selected-item');
}
else {
$(this).addClass('selected-item');
}
});
// Select for account types
$(".accounts-type").on('click', function(e){
if($(this).hasClass('selected-account') == true){
$(this).removeClass('selected-account');
}
else {
$(this).addClass('selected-account');
}
});
// Calculate Net Discount for Payment
$("#net").on('click', function(e){
e.preventDefault();
var sale_id = $('#sale-id').text();
var discount_value = $('#discount-amount').val();
var ajax_url = "/origami/" + sale_id + "/discount";
// Selected Items
var sale_items = get_selected_sale_items();
// Selected Account
var account_types = get_selected_account_types();
if(sale_items.length == 0 && account_types.length == 0){
calculate_overall_discount(0, discount_value);
}
else {
calculate_item_discount(0, discount_value, sale_items, account_types);
}
});
// Calculate Percentage Discount for Payment
$("#percentage").on('click', function(e){
e.preventDefault();
var sale_id = $('#sale-id').text();
var discount_value = $('#discount-amount').val();
var ajax_url = "/origami/" + sale_id + "/discount";
// Selected Items
var sale_items = get_selected_sale_items();
// Selected Account
var account_types = get_selected_account_types();
if(sale_items.length == 0 && account_types.length == 0){
calculate_overall_discount(1, discount_value);
}
else {
calculate_item_discount(1, discount_value, sale_items, account_types);
}
});
// Pay Discount
// Pay Discount for Payment
$("#pay-discount").on('click', function(e){
e.preventDefault();
var sale_id = $('#sale-id').text();
var discount_items = JSON.stringify(get_discount_item_rows());
var overall_discount = $("#order-discount").text();
var sub_total = $('#order-sub-total').text();
// var sale_item_id = $('.selected-item').attr('id').substr(0,16);
// var sub_total = $('#order-sub-total').text();
// var grand_total = $('#order-grand-total').text();
// var discount_type = $('#discount-type').val();
// var discount_value = $('#discount-amount').val();
// var discount_amount = discount_value;
var ajax_url = "/origami/" + sale_id + "/discount";
var params = { 'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount };
$.ajax({
type: "POST",
url: ajax_url,
data: params,
success:function(result){
alert("Successfully Discount!");
window.history.back();
}
});
});
});
/* For Receipt - Update Balance */
function update_balance(){
var discount_amount = $('#discount-amount').val();
var sub_total = $('#order-sub-total').text();
var tax = $('#order-Tax').text();
// For Percentage Discount
// if(discount_type == 1){
// discount_amount=(sub_total*discount_amount)/100;
// }
var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount;
$('#order-discount').text(discount_amount);
$('#order-grand-total').text(total);
}
/* Get Item rows but not discount*/
function get_item_rows(){
var sale_items = [];
$('.item-row').not('.discount-item-row').each(function(i){
var sale_item = {};
sale_item.id = $(this).attr('id').substr(0,16);
sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
sale_item.account_id = $(this).find('#item-account-type').text();
sale_item.price = $(this).find('#item-total-price').text();
sale_items.push(sale_item);
});
return sale_items;
}
/* Get discount Item rows */
function get_discount_item_rows(){
var sale_items = [];
$('.discount-item-row').each(function(i){
var sale_item = {};
sale_item.id = $(this).attr('id');
sale_item.name = $(this).find('#item-name-price').text();
sale_item.account_id = $(this).find('#item_account_type').text();
sale_item.price = $(this).find('#item-total-price').text();
sale_items.push(sale_item);
});
return sale_items;
}
/* Get Selected Sale Item's ID and Price */
function get_selected_sale_items(){
var sale_items = [];
$('.selected-item').each(function(i){
var sale_item = {};
sale_item.id = $(this).attr('id').substr(0,16);
sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
sale_item.account_id = $(this).find('#item-account-type').text();
sale_item.price = $(this).find('#item-total-price').text();
sale_items.push(sale_item);
});
return sale_items;
}
/* Get Selected Accounts ID and Price */
function get_selected_account_types(){
var account_types = [];
$('.selected-account').each(function(i){
var account= {};
account.id = $(this).attr('id').substr(8);
account.name = $(this).text();
account_types.push(account);
});
return account_types;
}
/* Calculate Overall Discount*/
function calculate_overall_discount(type, amount){
var origin_sub_total = parseFloat($("#order-sub-total").text());
var dis_amount = 0;
var sub_total = 0;
var total_discount = 0;
// For Net Pay
if(type == 0){
total_discount = amount;
}
// For Percentage Pay
if(type == 1){
if(amount > 100 ){
aler("Percentage Value over 100!");
return;
}
total_discount = (origin_sub_total * amount)/100;
}
$("#order-discount").text(total_discount);
}
/* Calculate Items Discount*/
function calculate_item_discount(type, amount, sale_items, account_types){
var origin_sub_total = parseFloat($("#order-sub-total").text());
var dis_amount = 0;
var sub_total = 0;
var total_discount = 0;
// For Net Pay
if(type == 0){
dis_amount = (0 - amount);
if(sale_items.length > 0){
for(var i=0;i < sale_items.length;i++){
if(account_types.length > 0){
for(var j=0; j < account_types.length; j++){
if(sale_items[i].account_id != account_types[j].id){
// Discount Items
var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount);
$("#order-items-table tbody").append(discount_item_row);
total_discount = total_discount + amount;
}
}
}
else {
var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
$("#order-items-table tbody").append(discount_item_row);
total_discount = total_discount + amount;
}
}
}
if(account_types.length > 0){
var item_rows=get_item_rows();
if(item_rows.length > 0){
for(var k=0; k < item_rows.length; k++){
for(var j=0; j < account_types.length; j++){
if(item_rows[k].account_id == account_types[j].id){
// Discount Items
var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
$("#order-items-table tbody").append(discount_item_row);
total_discount = total_discount + amount;
}
}
}
}
else {
alert("No Items!");
}
}
sub_total = origin_sub_total - total_discount;
}
// For Percentage Pay
if(type == 1){
if(amount > 100 ){
aler("Percentage Value over 100!");
return;
}
// Check sale items exists
if(sale_items.length > 0){
for(var i=0;i < sale_items.length;i++){
if(account_types.length > 0){
for(var j=0; j < account_types.length; j++){
if(sale_items[i].account_id != account_types[j].id){
// Discount Items
dis_amount = 0 - ((sale_items[i].price * amount)/100);
var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
$("#order-items-table tbody").append(discount_item_row);
total_discount = total_discount + dis_amount;
}
}
}
else {
dis_amount = 0 - ((sale_items[i].price * amount)/100);
var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
$("#order-items-table tbody").append(discount_item_row);
total_discount = total_discount + dis_amount;
}
}
}
// Check account types exists
if(account_types.length > 0){
var item_rows=get_item_rows();
console.log(account_types);
if(item_rows.length > 0){
for(var k=0; k < item_rows.length; k++){
for(var j=0; j < account_types.length; j++){
if(item_rows[k].account_id == account_types[j].id){
// Discount Items
dis_amount = 0 - ((item_rows[k].price * amount)/100);
var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
$("#order-items-table tbody").append(discount_item_row);
total_discount = total_discount + dis_amount;
}
}
}
}
else {
alert("No Items!");
}
}
sub_total = origin_sub_total + total_discount;
}
$("#order-sub-total").text(sub_total);
}
function item_row_template(type, item, discount_amount, amount){
var dis_str = "-discount";
if(type == 1){
dis_str = dis_str + "(" + amount + "%)"
}
var discount_item_row = "<tr class='item-row discount-item-row' id='" + item.id + "'>" +
"<td style='width: 60%; text-align: left;'>" +
"<span id='item_account_type' class='hidden'>" +
item.account_id +
"</span>" +
"<span id='item-name-price'>" +
item.name + dis_str +
"</span>" +
"</td>" +
"<td style='width: 20%; text-align: right;'>" +
"<span id='item-qty'>1</span>" +
"</td>" +
"<td style='width: 20%; text-align: right;'>" +
"<span id='item-total-price'>" +
discount_amount +
"</span>" +
"</td>" +
"</tr>";
return discount_item_row;
}
</script>

46
app/views/origami/home/show.html.erb
View File

@@ -250,20 +250,58 @@ $(document).ready(function(){
$(".tables").on('click', function(){ $(".tables").on('click', function(){
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/' + dining_id; window.location.href = '/origami/table/' + dining_id;
}) });
$(".sales").on('click',function(){ $(".sales").on('click',function(){
var sale_id = $(this).attr("data-id"); var sale_id = $(this).attr("data-id");
window.location.href = '/origami/sale/' + sale_id; window.location.href = '/origami/sale/' + sale_id;
}) });
$(".rooms").on('click', function(){ $(".rooms").on('click', function(){
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
window.location.href = '/origami/room/' + dining_id; window.location.href = '/origami/room/' + dining_id;
}) });
$(".orders").on('click',function(){ $(".orders").on('click',function(){
var order_id = $(this).attr("data-id"); var order_id = $(this).attr("data-id");
window.location.href = '/origami/order/' + order_id; window.location.href = '/origami/order/' + order_id;
}) });
// bind customer to order or sale
$("#customer").on('click', function(){
var sale = $('#sale_id').val();
if (sale!="") {
var sale_id = sale
}else{
var sale_id = $('#save_order_id').attr('data-order');
}
window.location.href = '/origami/'+ sale_id + "/customers"
});
// Discount for Payment
$('#discount').click(function() {
var sale = $('#sale_id').val();
if (sale!="") {
var sale_id = sale
}else{
var sale_id = $('#save_order_id').attr('data-order');
}
if(sale_id!=""){
window.location.href = '/origami/' + sale_id + '/discount'
}
else {
alert("Please select an table!");
}
return false;
});
}); });
$('#pay').on('click',function() { $('#pay').on('click',function() {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
window.location.href = '/origami/sale/'+ sale_id + "/payment"; window.location.href = '/origami/sale/'+ sale_id + "/payment";

1
db/migrate/20170403140820_create_order_items.rb
View File

@@ -7,6 +7,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1]
t.string :item_order_by #person who order this t.string :item_order_by #person who order this
t.string :item_code, :null => false t.string :item_code, :null => false
t.string :item_name, :null => false t.string :item_name, :null => false
t.integer :account_id, :limit => 8, :null => false, :default => 1
t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.string :remark t.string :remark

1
db/migrate/20170403161857_create_sale_items.rb
View File

@@ -5,6 +5,7 @@ class CreateSaleItems < ActiveRecord::Migration[5.1]
t.string :sale_id, foreign_key: true, :limit => 16 t.string :sale_id, foreign_key: true, :limit => 16
t.string :product_code, :null => false t.string :product_code, :null => false
t.string :product_name, :null => false t.string :product_name, :null => false
t.integer :account_id, :limit => 8, :null => false, :default => 1
t.string :remark t.string :remark
t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00